gros commit de la prod

classes/CartRule.php

@@ -563,9 +563,9 @@ class CartRuleCore extends ObjectModel
 
 			//@Override
 			$cartTotal = $context->cart->getOrderTotal($this->minimum_amount_tax, Cart::ONLY_PRODUCTS);
-			if ((int)(Tools::getValue('step')) == 0 && ($context->cart->id_customer == 94202 || $context->cart->id_customer == 221) )  {
+			/*if ((int)(Tools::getValue('step')) == 0 && ($context->cart->id_customer == 94202 || $context->cart->id_customer == 221) )  {
 				$cartTotal = $context->cart->getOrderTotal($this->minimum_amount_tax, Cart::ONLY_PRODUCTS)-$context->cart->getOrderTotal($this->minimum_amount_tax, Cart::ONLY_DISCOUNTS);
-			}
+			}*/
 			//@end override
 
 			if ($this->minimum_amount_shipping)

modules/ant_export_privatesales_newsletter/controllers/admin/AdminExportPrivatesalesNewsletterController.php

@@ -756,17 +756,24 @@
 
 			$namePosts = array('Banner','BannerFooter');
 			foreach ($namePosts as $key => $name) {
-				$random_name = '';
-				$namePost = 'image'.$name;
 				$count = 0;
-				$imgDate = date("Y-m-d", strtotime("now"));
+				
+				$imgDate = date("Y-m-d", strtotime($this->_params['date']));
+				$random_name = strtolower($name).'_'.$imgDate;
 				if(glob(_PS_MODULE_DIR_.'ant_export_privatesales_newsletter/img/'.strtolower($name).'/*.jpg')) {
-					$count = count(glob(_PS_MODULE_DIR_.'ant_export_privatesales_newsletter/img/'.strtolower($name).'/*.jpg'));
+					$filename_exist = file_exists(_PS_MODULE_DIR_.'ant_export_privatesales_newsletter/img/'.strtolower($name).'/'.$random_name.'.jpg');
+					if ($filename_exist) {
+						$count = count(glob(_PS_MODULE_DIR_.'ant_export_privatesales_newsletter/img/'.strtolower($name).'/'.$random_name.'*.jpg'));
+					}
 				}
+
+				$namePost = 'image'.$name;
 				if($this->_params['display_'.strtolower($name)] == 1){
 					if(isset($_FILES[$namePost]) && !empty($_FILES[$namePost]['tmp_name']) ){
-						//$random_name = strtolower($name).'_'.$count;
-						$random_name = strtolower($name).'_'.$imgDate;
+						//die('>>>> test en cours');
+						if ($filename_exist) {
+							$random_name .= '_'.$count;
+						}
 						$fileTemp = $_FILES[$namePost]['tmp_name'];
 						$fileParts = pathinfo($_FILES[$namePost]['name']);
 						if($fileParts['extension'] == 'jpg' || $fileParts['extension'] == 'png'){
@@ -791,10 +798,11 @@
 					}
 					else {
 						if ($name === 'Banner') {
-							if($count == 0) {
-								$random_name_top = strtolower($name).'_'.$count;
+							$dir = scandir(_PS_MODULE_DIR_.'ant_export_privatesales_newsletter/img/'.strtolower($name).'/', SCANDIR_SORT_DESCENDING);
+							if($dir) {
+								$random_name_top = str_replace('.jpg', '', $dir[0]);
 							} else {
-								$random_name_top = strtolower($name).'_'.date("Y-m-d", strtotime("-1 day"));
+								$random_name_top = strtolower($name).'_0';
 							}
 						} elseif ($name == 'BannerFooter') {
 							$random_name_footer = strtolower($name).'_0';

modules/atos/atos.php

@@ -434,8 +434,13 @@ class Atos extends PaymentModule
 		$custom = (int)Configuration::get('ATOS_ALLOW_CUSTOM');
 
 		$ps_url = 'http://'.htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__;
+		$ps_url_ssl = 'https://'.htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__;
 
 		$ipn_page = $ps_url.'modules/'.$this->name.'/validation.php';
+
+		// protocole https pour les adresses de retour mais pas pour l'ipn
+		$ps_url = $ps_url_ssl;
+
 		$cancel_page = $ps_url.'modules/'.$this->name.'/atos_return.php';
 		if (version_compare(_PS_VERSION_, '1.5', '>'))
 		{

modules/atos/atos_return.php

@@ -46,6 +46,14 @@ else
 			$return_page = 'order-confirmation.php?id_cart='.$cart->id.'&id_module='.$atos->id.'&key='.$customer->secure_key;
 		}
 		$cancel_page = (Configuration::get('ATOS_ERROR_BEHAVIOR') ? $back_url : $return_page);
+		
+		/*$authorized_ip = array(
+	      '88.163.22.99',
+	      '90.63.178.63',
+	    );
+	    if (in_array($_SERVER['REMOTE_ADDR'], $authorized_ip)) {
+	       $cancel_page = $back_url;
+	    }*/
 
 		Tools::redirect($cancel_page);
 	}

modules/extratabs/extratabs.php

@@ -807,6 +807,7 @@ class ExtraTabs extends Module
 			return false;
 		$extraTabs = ProductExtraTabModel::getByProductID((int)Tools::getValue('id_product'), $params['cart']->id_lang);
 		$this->smarty->assign('extraTabs', $extraTabs);
+		$this->smarty->assign('features', $params['product']->getFrontFeatures($this->context->language->id));
         
 		return $this->display(__FILE__, 'productextratabs_tab.tpl');
 	}

modules/followup/followup.php

@@ -238,6 +238,8 @@ class Followup extends Module
 				$cartText = '';
 				foreach($products as $product) 
 				{
+					$cover = Product::getCover($product['id_product']);
+					$product['id_image'] = $cover['id_image'];
 					$imagePath = Context::getContext()->link->getImageLink($product['link_rewrite'], $product['id_image'], 'block_cart'); // change the last parameters to get the size you need
 					$imagePath = str_replace('https:', 'http:', $imagePath);
 					if (!preg_match("/^(http):/", $imagePath)) {
@@ -322,6 +324,9 @@ class Followup extends Module
 				// coppee@antadis.com
 				// Mail::Send((int)$email['id_lang'], 'followup_1', Mail::l('Ne manquez pas les ventes privilégiées que vous aviez sélectionnées, validez votre panier!', (int)$email['id_lang']), $template_vars, 'coppee@antadis.com', $email['firstname'].' '.$email['lastname'], null, null, null, null, dirname(__FILE__).'/mails/');
 				
+				// marion@antadis.com
+				Mail::Send((int)$email['id_lang'], 'followup_J1', Mail::l('Ne manquez pas les ventes privilégiées que vous aviez sélectionnées, validez votre panier!', (int)$email['id_lang']), $template_vars, 'marion@antadis.com', $email['firstname'].' '.$email['lastname'], null, null, null, null, dirname(__FILE__).'/mails/');
+				
 				// clefebvre@privilegedemarque.com
 				// Mail::Send((int)$email['id_lang'], 'followup_1', Mail::l('Ne manquez pas les ventes privilégiées que vous aviez sélectionnées, validez votre panier!', (int)$email['id_lang']), $template_vars, 'clefebvre@privilegedemarque.com', $email['firstname'].' '.$email['lastname'], null, null, null, null, dirname(__FILE__).'/mails/');
 				
@@ -406,6 +411,8 @@ class Followup extends Module
 				$cartText = '';
 				foreach($products as $product) 
 				{
+					$cover = Product::getCover($product['id_product']);
+					$product['id_image'] = $cover['id_image'];
 					$imagePath = Context::getContext()->link->getImageLink($product['link_rewrite'], $product['id_image'], 'block_cart'); // change the last parameters to get the size you need
 					$imagePath = str_replace('https:', 'http:', $imagePath);
 					if (!preg_match("/^(http):/", $imagePath)) {
@@ -489,6 +496,9 @@ class Followup extends Module
 				// coppee@antadis.com
 				// Mail::Send((int)$email['id_lang'], 'followup_1', Mail::l('Ne manquez pas les ventes privilégiées que vous aviez sélectionnées, validez votre panier!', (int)$email['id_lang']), $template_vars, 'coppee@antadis.com', $email['firstname'].' '.$email['lastname'], null, null, null, null, dirname(__FILE__).'/mails/');
 				
+				// marion@antadis.com
+				Mail::Send((int)$email['id_lang'], 'followup_J3', Mail::l('Ne manquez pas les ventes privilégiées que vous aviez sélectionnées, validez votre panier!', (int)$email['id_lang']), $template_vars, 'marion@antadis.com', $email['firstname'].' '.$email['lastname'], null, null, null, null, dirname(__FILE__).'/mails/');
+				
 				// clefebvre@privilegedemarque.com
 				// Mail::Send((int)$email['id_lang'], 'followup_1', Mail::l('Ne manquez pas les ventes privilégiées que vous aviez sélectionnées, validez votre panier!', (int)$email['id_lang']), $template_vars, 'clefebvre@privilegedemarque.com', $email['firstname'].' '.$email['lastname'], null, null, null, null, dirname(__FILE__).'/mails/');
 
@@ -1439,6 +1449,10 @@ class Followup extends Module
 			$cover = Product::getCover($product['id_product']);
 			$product['id_image'] = $cover['id_image'];
 			$imagePath = Context::getContext()->link->getImageLink($product['link_rewrite'], $product['id_image'], 'block_cart'); // change the last parameters to get the size you need
+			$imagePath = str_replace('https:', 'http:', $imagePath);
+			if (!preg_match("/^(http):/", $imagePath)) {
+				$imagePath = 'http://'.$imagePath;
+			}
 			if(!empty($cartHtml))
 				$cartHtml .= '<tr style="height: 1px;"><td colspan="4" style="height: 1px;"><div style="border-top:1px dashed #778899;max-height: 1px;">&nbsp;</div>';
 

modules/mailjet_sync/mailjet_sync.php

@@ -503,12 +503,14 @@ class Mailjet_Sync extends Module
 			array(
 		        "Email"      =>  $customer->email, 
 		        "Properties" =>  array(
-                    "token"     => Customer::getUrlAutologin($customer->id, $customer->email),
-                    "frequence" => $frequence,
-                    "prenom"    => $customer->firstname,
-                    "nom"       => $customer->lastname,
-                    "fai"       => $email,
-                    "group"     => $isPro ? 'Pro' : 'Particulier',
+                    "token"            => Customer::getUrlAutologin($customer->id, $customer->email),
+                    "frequence"        => $frequence,
+                    "prenom"           => $customer->firstname,
+                    "nom"              => $customer->lastname,
+                    "fai"              => $email,
+                    "group"            => $isPro ? 'Pro' : 'Particulier',
+                   	"date_inscription" => date('Y-m-d\TH:i:s\Z',strtotime($customer->date_add)),
+                    "ref_inscription"  => (int)strtotime($customer->date_add),
 		        )
 		    )
 	    );
@@ -618,6 +620,7 @@ class Mailjet_Sync extends Module
 	public function hookActionObjectCustomerUpdateAfter($params)
 	{
 		$customer = $params['object'];
+
 		if (!Validate::isLoadedObject($customer))
 			return false;
 		if (!isset($customer->newsletter))

modules/paypal/paypal.php

@@ -546,13 +546,23 @@ class PayPal extends PaymentModule
 		}
 		elseif ($method == WPS || $method == ECS)
 		{
+			$back_url = $this->getCurrentUrl();
+			/*$authorized_ip = array(
+		      '88.163.22.99',
+		      '90.63.178.63',
+		    );
+		    if (in_array($_SERVER['REMOTE_ADDR'], $authorized_ip)) {
+		       $ps_url_ssl = 'https://'.htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__;
+		       $back_url = $ps_url.'index.php?controller=order&step=3&';
+		    }*/
+
 			$this->getTranslations();
 			$this->context->smarty->assign(array(
 				'PayPal_integral' => WPS,
 				'PayPal_express_checkout' => ECS,
 				'PayPal_payment_method' => $method,
 				'PayPal_payment_type' => 'payment_cart',
-				'PayPal_current_page' => $this->getCurrentUrl(),
+				'PayPal_current_page' => $back_url,
 				'PayPal_tracking_code' => $this->getTrackingCode($method)));
 
 			return $this->fetchTemplate('express_checkout_payment.tpl');