Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev

modules/erporder/Mocks/newOrder.php

@@ -14,8 +14,8 @@ class NewOrder
 		'order_policy' => 'manual',
 		'picking_policy' => 'direct',
 		'pricelist_id' => 1, // Euro
-		'warehouse_id' => 7, // Roykin
-		'origin' => 'Roykin Prestashop',
+		'warehouse_id' => 7, // Roykin/Levest
+		'origin' => 'Levest Prestashop',
 	);
 
 	private $line = array(

modules/erporder/erporder.php

@@ -160,11 +160,6 @@ class Erporder extends Module
 
 		$order_id = $newOrder->create('sale.order', $newOrder->order);
 
-		if ($invoice_adress->id_country != 8) {
-			// mail('simonet@antadis.com', 'Roykin LOG - alert commande', json_encode($newOrder->order));
-			// mail('thibault@antadis.com', 'Roykin LOG - alert commande', json_encode($newOrder->order));
-		}
-
 		if (!empty($order_id['faultCode'])) {
 			$a = array_merge($order_id, $newOrder->order);
 			ErpTools::logError($a, 'insert into sale.order');

override/classes/Mail.php

@@ -305,8 +305,8 @@ class Mail extends MailCore
 			$id_shop = Context::getContext()->shop->id;
 			$id_lang = Context::getContext()->cookie->id_lang;
 
-			$template_vars['{header_img}'] = 'http://pro.roykin.fr/themes/roykin/mails/header-mail.jpg';
-			$template_vars['{footer_img}'] = 'http://pro.roykin.fr/themes/roykin/mails/footer-mail.jpg';
+			$template_vars['{header_img}'] = Tools::getHttpHost(true).'/themes/roykin/mails/header-mail_levest.jpg';
+			$template_vars['{footer_img}'] = Tools::getHttpHost(true).'/themes/roykin/mails/footer-mail_levest.jpg';
 			
 			$template_vars['{box-border-color}'] = '#bfa56d';
 			$template_vars['{box-bg-color}'] = '#ffffff';

override/classes/controller/FrontController.php

@@ -23,13 +23,13 @@ class FrontController extends FrontControllerCore
                 $nb_customer_not_in_default_group = Db::getInstance()->getValue($sql);
                 if ($nb_customer_not_in_default_group!==FALSE && $nb_customer_not_in_default_group>0) {
                     error_log(
-                        'roykin check : '.$nb_customer_not_in_default_group.' customers are not associated with default group id : '.$id_customer_group,
+                        'check : '.$nb_customer_not_in_default_group.' customers are not associated with default group id : '.$id_customer_group,
                         0
                         );
                     error_log(
-                        'roykin check : '.$nb_customer_not_in_default_group.' customers are not associated with default group id : '.$id_customer_group,
+                        'check : '.$nb_customer_not_in_default_group.' customers are not associated with default group id : '.$id_customer_group,
                         1,
-                        'figaro+roykincheck@antadis.fr'
+                        'figaro+levestcheck@antadis.fr'
                         );
                 }
             }

themes/roykin/authentication.tpl

@@ -1,11 +1,11 @@
 {capture name=path}
-	{if !isset($email_create)}{l s='Espace professionnel Roykin'}{else}
-		<a href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Espace professionnel Roykin'}">{l s='Espace professionnel Roykin'}</a>
+	{if !isset($email_create)}{l s='Espace professionnel'}{else}
+		<a href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Espace professionnel'}">{l s='Espace professionnel'}</a>
 		{l s='Create your account'}
 	{/if}
 {/capture}
 
-{capture name=title}{if !isset($email_create)}{l s='Espace professionnel Roykin'}{else}{l s='Create an account'}{/if}{/capture}
+{capture name=title}{if !isset($email_create)}{l s='Espace professionnel'}{else}{l s='Create an account'}{/if}{/capture}
 
 {assign var='stateExist' value=false}
 {assign var="postCodeExist" value=false}

themes/roykin/css/global.css

@@ -68,7 +68,7 @@ body#index main, body#password main { background: #000 }
 		#header #header-cart {
 		}
 			#header #header-cart .shopping-cart {
-				background: url('../img/cart.png') no-repeat left top;
+				background: url('../img/cart_levest.png') no-repeat left top;
 				float: right;
 				height: 120px;
 				padding: 25px 0 0 81px;
@@ -378,7 +378,7 @@ body#index main, body#password main { background: #000 }
 					text-transform: uppercase;
 				}
 				#cart-bottom .resume {
-					background: url('../img/cart-footer.png') no-repeat left center;
+					background: url('../img/cart-footer_levest.png') no-repeat left center;
 					padding: 15px 15px 15px 80px;
 				}
 					#cart-bottom .price .shipping-cost {