Merge branch 'ticket-14739-PackLogistic' into develop

Conflicts:
	modules/filtervp/filter.tpl
	modules/filtervp/filtervp.php

.gitignore

@@ -17,6 +17,7 @@ robots.txt
 /img_old/*
 !img/index.php
 !img/*/index.php
+!img/mails/
 
 #### ADMIN ####
 adm/backups/*
@@ -78,8 +79,8 @@ modules/*/es.php
 #### MAILS ####
 mails/*
 !mails/en
-!mails/fr
 !mails/es
+!mails/fr
 !mails/it
 modules/*/mails/*
 !modules/*/mails/en

adm/helpers/HelperFormBootstrap.php

@@ -348,7 +348,6 @@ class HelperFormBootstrap{
         $this->_html .='
         <div class="form-group">
             '.(isset($p['label']) && $p['label'] ?'<label class="'.(isset($p['label-class']) && $p['label-class'] ?$p['label-class']:'').'" for="'.(isset($p['id']) ? $p['id'] : $p['name']).'">'.$p['label'].'</label>':'').'
-
             <div class="input-group input-group-sm '.(isset($p['input-class'])?$p['input-class']:'').'">
                 '.(isset($p['before']) && $p['before'] ?'<div class="input-group-addon">'.$p['before'].'</div>':'').'
                 <input type="text" class="form-control" value="'.(isset($p['value'])?$p['value']:'').'" name="'.$p['name'].'" id="'.(isset($p['id']) ? $p['id'] : $p['name']).'" placeholder="'.((isset($p['placeholder']) && $p['placeholder'])?$p['placeholder']:'').'">

adm/helpers/includes/css/custom.css

@@ -290,19 +290,6 @@ div.tagsinput span.tag {
 div.tagsinput span.tag a {
     color: #fff;
 }
-.select2-container--default .select2-selection--multiple .select2-selection__choice{
-    border: 1px solid #504d8b;
-    background: #796dc7;
-    color: #fff;
-    padding: 3px;
-    border-radius: 2px;
-}
-.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{
-    color: #fff;
-}
-.select2-container--default .select2-selection--multiple .select2-selection__rendered li {
-    font-size: 12px;
-}
 
 /* Alert */
 #content .alert {
@@ -379,7 +366,6 @@ div.tagsinput span.tag a {
     opacity: 0.6;
 }
 
-
 /* form img */
 .form-control.image-preview-filename {
     height: 28px;
@@ -472,6 +458,19 @@ table.table.th-grey tr th {
 .select2-results ul li{
     text-align: left;
 }
+.select2-container--default .select2-selection--multiple .select2-selection__choice{
+    border: 1px solid #504d8b;
+    background: #796dc7;
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{
+    color: #fff;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+    font-size: 12px;
+}
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
     background-color: #504d8b;
     color: white;
@@ -481,6 +480,19 @@ table.table.th-grey tr th {
     margin-bottom: 2px;
 }
 
+/* Language choice box */
+.flags_custom{
+    float: left;
+    position: relative;
+}
+.language_flags.language_flags_custom{
+    position: absolute;
+    z-index: 999;
+    margin: 0;
+    width: 120px;
+    right: 0;
+}
+
 /* Smart Wizar */
 .form_wizard .stepContainer {
   display: block;
@@ -566,17 +578,3 @@ table.table.th-grey tr th {
   display: none; }
 .form_wizard .msgBox {
   display: none; }
-
-
-/* Language choice box */
-.flags_custom{
-    float: left;
-    position: relative;
-}
-.language_flags.language_flags_custom{
-    position: absolute;
-    z-index: 999;
-    margin: 0;
-    width: 120px;
-    right: 0;
-}

classes/Cookie.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -83,22 +83,33 @@ class	CookieCore
 	{
 		$r = '!(?:(\w+)://)?(?:(\w+)\:(\w+)@)?([^/:]+)?(?:\:(\d*))?([^#?]+)?(?:\?([^#]+))?(?:#(.+$))?!i';
 	    preg_match ($r, Tools::getHttpHost(false, false), $out);
-		if (preg_match('/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9]).)'. 
-         '{1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]).)'. 
-         '{2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/', $out[4]))
-			return false;
-		if (!strstr(Tools::getHttpHost(false, false), '.'))
+		if (preg_match('/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9]).)'.
+			'{1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]).)'.
+			'{2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/', $out[4])) {
+				return false;
+		}
+		
+		if (!strstr(Tools::getHttpHost(false, false), '.')) {
 			return false;
+		}
+		
 		$domain = $out[4];
 		$subDomains = SubDomain::getSubDomains();
-		if ($subDomains === false)
+		if ($subDomains === false) {
 			die(Tools::displayError('Bad SubDomain SQL query.'));
-		foreach ($subDomains AS $subDomain)
-		{
-			$subDomainLength = strlen($subDomain) + 1;
-			if (strncmp($subDomain.'.', $domain, $subDomainLength) == 0)
-				$domain = substr($domain, $subDomainLength);
 		}
+		
+		foreach ($subDomains AS $subDomain) {
+			// Isolate dev environnment
+			if (in_array($subDomain, array('local', 'localm', 'dev', 'devm', 'pp', 'ppm'))) {
+				break;
+			}
+			$subDomainLength = strlen($subDomain) + 1;
+			if (strncmp($subDomain.'.', $domain, $subDomainLength) == 0) {
+				$domain = substr($domain, $subDomainLength);
+			}
+		}
+		
 		return $domain;
 	}
 

config/autoload_lumen.php

@@ -26,6 +26,7 @@
 */
 
 spl_autoload_register(function($className) {
+
 	if (function_exists('smartyAutoload') AND smartyAutoload($className))
 		return true;
 

css/custom_admin.css

@@ -99,4 +99,52 @@ input.button[disabled=disabled]:hover{
     overflow: auto;
     color:#000;
 }
-.div_report h3 {text-align:center;}
+.div_report h3 {text-align:center;}
+
+.tab-row .tab {
+    padding: 10px 8px!important;
+    background: rgba(86,84,133,0.3)!important;
+}
+.tab-row .tab.selected{
+    background: #565485!important;
+    padding: 10px 8px!important;
+}
+.tab-row .tab.selected a{
+    color: #fff!important;
+}
+.tab-page{
+    background: #F1F1F1!important;
+}
+.tab-page#step7 fieldset,
+.tab-page#step8 fieldset{
+    background: rgba(86,84,133,0.3);
+}
+
+.categories-treeview{
+    background-color:rgba(86,84,133,0.3)!important;
+}
+
+#divAccessories{
+    box-sizing: border-box;
+    margin-bottom: 10px;
+}
+.item_accessory {
+    float: left;
+    width: 30%;
+    text-align: center;
+    margin-right: 5px;
+    margin-top: 5px;
+    background: #fff;
+    padding: 5px;
+}
+.item_accessory p {
+    color: #565485!important;
+}
+.item_accessory > img {
+    height: 77px;
+}
+#divAccessories:after{
+    content: '';
+    display: block;
+    clear: both;
+}

js/admin.js

@@ -341,7 +341,7 @@ function addAccessory(event, data, formatted)
 	var $imgAccessories = $('#imgAccessories');
 
 	/* delete product from select + add product line to the div, input_name, input_ids elements */
-	$divAccessories.html($divAccessories.html() + '<img src="'+productImg+'" /> ' + productName + ' <span onclick="delAccessory(' + productId + ');" style="cursor: pointer;"><img src="../img/admin/delete.gif" /></span><br />');
+	$divAccessories.html($divAccessories.html() + '<div class="item_accessory"><img src="'+productImg+'" /> <p>' + productName + ' <span onclick="delAccessory(' + productId + ');" style="cursor: pointer;"><img src="../img/admin/delete.gif" /></span></p></div>');
 	$nameAccessories.val($nameAccessories.val() + productName + '¤');
 	$inputAccessories.val($inputAccessories.val() + productId + '-');
 	$imgAccessories.val($imgAccessories.val() + productImg + ',');
@@ -384,7 +384,7 @@ function delAccessory(id)
 			input.value += inputCut[i] + '-';
 			name.value += nameCut[i] + '¤';
 			img.value += imgCut[i] + ';';
-			div.innerHTML += '<img src="'+imgCut[i]+'" /> '+nameCut[i] + ' <span onclick="delAccessory(' + inputCut[i] + ');" style="cursor: pointer;"><img src="../img/admin/delete.gif" /></span><br />';
+			div.innerHTML += '<div class="item_accessory"><img src="'+imgCut[i]+'" /> <p>'+nameCut[i] + ' <span onclick="delAccessory(' + inputCut[i] + ');" style="cursor: pointer;"><img src="../img/admin/delete.gif" /></span></p></div>';
 		}
 		else
 			$('#selectAccessories').append('<option selected="selected" value="' + inputCut[i] + '-' + nameCut[i] + '">' + inputCut[i] + ' - ' + nameCut[i] + '</option>');

modules/blockbestsellers/blockbestsellers.php

@@ -100,7 +100,11 @@ class BlockBestSellers extends Module
         if (Configuration::get('PS_CATALOG_MODE'))
             return ;
 
-        global $cookie, $smarty, $cart;
+        global $cookie, $smarty, $cart, $page_name;
+        if ($page_name == 'post') {
+            return;
+        }
+        
         $step = Tools::getValue('step');
         if(!$step || ($step && $step != 3 && $step != 4)) {
             $id_lang = $cookie->id_lang;

modules/blockcms/blockcms.php

@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -104,7 +104,7 @@ class BlockCms extends Module
 	}
 
 	public function getBlockCMS($id_cms_block)
-	{		
+	{
 		$cmsBlocks = Db::getInstance()->ExecuteS('
 		SELECT cb.`id_cms_category`, cb.`location`, cb.`display_store`, cbl.id_lang, cbl.name
 		FROM `'._DB_PREFIX_.'cms_block` cb
@@ -168,7 +168,7 @@ class BlockCms extends Module
 			elseif (!$ids[0])
 			{
 				$query = Db::getInstance()->getRow('
-				SELECT cl.`meta_title`, cl.`link_rewrite` 
+				SELECT cl.`meta_title`, cl.`link_rewrite`
 				FROM `'._DB_PREFIX_.'cms_lang` cl
 				INNER JOIN `'._DB_PREFIX_.'cms` c ON (cl.`id_cms` = c.`id_cms`)
 				WHERE cl.`id_cms` = '.(int)$ids[1].' AND c.`active` = 1
@@ -204,7 +204,7 @@ class BlockCms extends Module
 				
 				$content[$key]['cms'] = Db::getInstance()->ExecuteS('
 				SELECT cl.`id_cms`, cl.`meta_title`, cl.`link_rewrite`
-				FROM `'._DB_PREFIX_.'cms_block_page` bcp 
+				FROM `'._DB_PREFIX_.'cms_block_page` bcp
 				INNER JOIN `'._DB_PREFIX_.'cms_lang` cl ON (bcp.`id_cms` = cl.`id_cms`)
 				INNER JOIN `'._DB_PREFIX_.'cms` c ON (bcp.`id_cms` = c.`id_cms`)
 				WHERE bcp.`id_cms_block` = '.(int)$cmsCategory['id_cms_block'].' AND cl.`id_lang` = '.(int)$cookie->id_lang.' AND bcp.`is_category` = 0 AND c.`active` = 1
@@ -222,7 +222,7 @@ class BlockCms extends Module
 				
 				$content[$key]['categories'] = Db::getInstance()->ExecuteS('
 				SELECT bcp.`id_cms`, cl.`name`, cl.`link_rewrite`
-				FROM `'._DB_PREFIX_.'cms_block_page` bcp 
+				FROM `'._DB_PREFIX_.'cms_block_page` bcp
 				INNER JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (bcp.`id_cms` = cl.`id_cms_category`)
 				WHERE bcp.`id_cms_block` = '.(int)$cmsCategory['id_cms_block'].'
 				AND cl.`id_lang` = '.(int)$cookie->id_lang.'
@@ -257,7 +257,7 @@ class BlockCms extends Module
 		{
 			unset($title['categories'], $title['name'], $title['category_link'], $title['category_name']);
 			$titles[$key] = $title;
-		}		
+		}
 		return $titles;
 	}
 
@@ -350,7 +350,7 @@ class BlockCms extends Module
 							<img src="../img/admin/up.gif" alt="'.$this->l('Up').'" title="'.$this->l('Up').'" /></a>
 						</td>
 						<td width="10%" class="center">
-							<a href="'.$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&editBlockCMS&id_cms_block='.(int)($cms_block['id_cms_block']).'" title="'.$this->l('Edit').'"><img src="'._PS_ADMIN_IMG_.'edit.gif" alt="" /></a> 
+							<a href="'.$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&editBlockCMS&id_cms_block='.(int)($cms_block['id_cms_block']).'" title="'.$this->l('Edit').'"><img src="'._PS_ADMIN_IMG_.'edit.gif" alt="" /></a>
 							<a href="'.$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&deleteBlockCMS&id_cms_block='.(int)($cms_block['id_cms_block']).'" title="'.$this->l('Delete').'"><img src="'._PS_ADMIN_IMG_.'delete.gif" alt="" /></a>
 						</td>
 					</tr>';
@@ -393,7 +393,7 @@ class BlockCms extends Module
 							<img src="../img/admin/up.gif" alt="'.$this->l('Up').'" title="'.$this->l('Up').'" /></a>
 						</td>
 						<td width="10%" class="center">
-							<a href="'.$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&editBlockCMS&id_cms_block='.(int)($cms_block['id_cms_block']).'" title="'.$this->l('Edit').'"><img src="'._PS_ADMIN_IMG_.'edit.gif" alt="" /></a> 
+							<a href="'.$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&editBlockCMS&id_cms_block='.(int)($cms_block['id_cms_block']).'" title="'.$this->l('Edit').'"><img src="'._PS_ADMIN_IMG_.'edit.gif" alt="" /></a>
 							<a href="'.$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&deleteBlockCMS&id_cms_block='.(int)($cms_block['id_cms_block']).'" title="'.$this->l('Delete').'"><img src="'._PS_ADMIN_IMG_.'delete.gif" alt="" /></a>
 						</td>
 					</tr>';
@@ -546,8 +546,8 @@ class BlockCms extends Module
 	
 	private function changePosition()
 	{
-		if (!Validate::isInt(Tools::getValue('position')) OR 
-			(Tools::getValue('location') != self::LEFT_COLUMN AND Tools::getValue('location') != self::RIGHT_COLUMN) OR 
+		if (!Validate::isInt(Tools::getValue('position')) OR
+			(Tools::getValue('location') != self::LEFT_COLUMN AND Tools::getValue('location') != self::RIGHT_COLUMN) OR
 			(Tools::getValue('way') != 0 AND Tools::getValue('way') != 1))
 			Tools::displayError();
 		
@@ -586,21 +586,21 @@ class BlockCms extends Module
 		if (Tools::isSubmit('submitBlockCMS'))
 		{
 			$position = Db::getInstance()->getValue('
-			SELECT COUNT(*) 
-			FROM `'._DB_PREFIX_.'cms_block` 
+			SELECT COUNT(*)
+			FROM `'._DB_PREFIX_.'cms_block`
 			WHERE `location` = '.(int)Tools::getValue('block_location'));
 			$languages = Language::getLanguages(false);
 			if (Tools::isSubmit('addBlockCMS'))
 			{
 				Db::getInstance()->Execute('
-				INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`, `display_store`) 
-				VALUES('.(int)Tools::getValue('id_category').', '.(int)Tools::getValue('block_location').', 
+				INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`, `display_store`)
+				VALUES('.(int)Tools::getValue('id_category').', '.(int)Tools::getValue('block_location').',
 				'.(int)$position.', '.(int)Tools::getValue('PS_STORES_DISPLAY_CMS').')');
 				$id_cms_block = Db::getInstance()->Insert_ID();
 				foreach ($languages as $language)
 					Db::getInstance()->Execute('
-					INSERT INTO `'._DB_PREFIX_.'cms_block_lang` (`id_cms_block`, `id_lang`, `name`) 
-					VALUES('.(int)$id_cms_block.', '.(int)$language['id_lang'].', 
+					INSERT INTO `'._DB_PREFIX_.'cms_block_lang` (`id_cms_block`, `id_lang`, `name`)
+					VALUES('.(int)$id_cms_block.', '.(int)$language['id_lang'].',
 					"'.pSQL(Tools::getValue('block_name_'.$language['id_lang'])).'")');
 					
 				Db::getInstance()->Execute('
@@ -612,19 +612,19 @@ class BlockCms extends Module
 				$id_cms_block = Tools::getvalue('id_cms_block');
 
 				$old_block = Db::getInstance()->ExecuteS('
-				SELECT `location`, `position` 
-				FROM `'._DB_PREFIX_.'cms_block` 
+				SELECT `location`, `position`
+				FROM `'._DB_PREFIX_.'cms_block`
 				WHERE `id_cms_block` = '.(int)$id_cms_block);
 				
 				$location_change = ($old_block[0]['location'] != (int)Tools::getvalue('block_location'));
 				Db::getInstance()->Execute('
-				DELETE FROM `'._DB_PREFIX_.'cms_block_page` 
+				DELETE FROM `'._DB_PREFIX_.'cms_block_page`
 				WHERE `id_cms_block` = '.(int)$id_cms_block);
 
 				if ($location_change == true)
 					Db::getInstance()->Execute('
-					UPDATE `'._DB_PREFIX_.'cms_block` 
-					SET `position` = (`position` - 1) WHERE `position` > '.(int)$old_block[0]['position'].' 
+					UPDATE `'._DB_PREFIX_.'cms_block`
+					SET `position` = (`position` - 1) WHERE `position` > '.(int)$old_block[0]['position'].'
 					AND `location` = '.(int)$old_block[0]['location']);
 				
 				Db::getInstance()->Execute('
@@ -640,9 +640,9 @@ class BlockCms extends Module
 
 				foreach ($languages as $language)
 					Db::getInstance()->Execute('
-					UPDATE `'._DB_PREFIX_.'cms_block_lang` 
-					SET `name` = "'.pSQL(Tools::getValue('block_name_'.$language['id_lang'])).'" 
-					WHERE `id_cms_block` = '.(int)$id_cms_block.' 
+					UPDATE `'._DB_PREFIX_.'cms_block_lang`
+					SET `name` = "'.pSQL(Tools::getValue('block_name_'.$language['id_lang'])).'"
+					WHERE `id_cms_block` = '.(int)$id_cms_block.'
 					AND `id_lang`= '.(int)$language['id_lang']);
 			}
 			$cmsBoxes = Tools::getValue('cmsBox');
@@ -651,7 +651,7 @@ class BlockCms extends Module
 				{
 					$cms_properties = explode('_', $cmsBox);
 					Db::getInstance()->Execute('
-					INSERT INTO `'._DB_PREFIX_.'cms_block_page` (`id_cms_block`, `id_cms`, `is_category`) 
+					INSERT INTO `'._DB_PREFIX_.'cms_block_page` (`id_cms_block`, `id_cms`, `is_category`)
 					VALUES('.(int)$id_cms_block.', '.(int)$cms_properties[1].', '.(int)$cms_properties[0].')');
 				}
 			if (Tools::isSubmit('addBlockCMS'))
@@ -665,17 +665,17 @@ class BlockCms extends Module
 			if (sizeof($old_block))
 			{
 				Db::getInstance()->Execute('
-				UPDATE `'._DB_PREFIX_.'cms_block` 
-				SET `position` = (`position` - 1) 
-				WHERE `position` > '.(int)$old_block[0]['position'].' 
+				UPDATE `'._DB_PREFIX_.'cms_block`
+				SET `position` = (`position` - 1)
+				WHERE `position` > '.(int)$old_block[0]['position'].'
 				AND `location` = '.(int)$old_block[0]['location']);
 				
 				Db::getInstance()->Execute('
-				DELETE FROM `'._DB_PREFIX_.'cms_block` 
+				DELETE FROM `'._DB_PREFIX_.'cms_block`
 				WHERE `id_cms_block` = '.(int)(Tools::getValue('id_cms_block')));
 				
 				Db::getInstance()->Execute('
-				DELETE FROM `'._DB_PREFIX_.'cms_block_page` 
+				DELETE FROM `'._DB_PREFIX_.'cms_block_page`
 				WHERE `id_cms_block` = '.(int)(Tools::getValue('id_cms_block')));
 				
 				Tools::redirectAdmin($currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&deleteBlockCMSConfirmation');

modules/blocklinkmulti1/blocklinkmulti1.php

@@ -97,29 +97,43 @@ class BlockLinkMulti1 extends Module
 			// $result[$i]['url'] = ($link['url'] == ''? '': ((!$admin && substr($link['url'], 0, 4) != 'http') ? substr(__PS_BASE_URI__, 0, -1).$link['url'] : $link['url']));
 			$i++;
 		}
-
 	 	return $result;
 	}
 
 	public function addLink()
 	{
-	 	/* Url registration */
-	 	if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklinkmulti1 VALUES (\'\', \''.pSQL(isset($_POST['url']) && !empty($_POST['url'])? $_POST['url']: '').'\', '.((isset($_POST['newWindow']) AND $_POST['newWindow']) == 'on' ? 1 : 0).')') OR !$lastId = mysql_insert_id())
-	 		return false;
-	 	/* Multilingual text */
 	 	$languages = Language::getLanguages();
+	 	if (!$languages) {
+	 	    return false;
+	 	}
+	 	
 	 	$defaultLanguage = intval(Configuration::get('PS_LANG_DEFAULT'));
-	 	if (!$languages)
-	 		return false;
-	 	foreach ($languages AS $language)
-	 	 	if (!empty($_POST['text_'.$language['id_lang']]))
-	 	 	{
-	 	 		if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklinkmulti1_lang VALUES ('.intval($lastId).', '.intval($language['id_lang']).', \''.pSQL($_POST['text_'.$language['id_lang']]).'\')'))
-	 	 			return false;
-	 	 	}
-	 	 	else
-	 	 		if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklinkmulti1_lang VALUES ('.intval($lastId).', '.intval($language['id_lang']).', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')'))
-	 	 			return false;
+	 	
+	 	Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklinkmulti1 VALUES (\'\', \''.
+	 	    pSQL(isset($_POST['url']) && !empty($_POST['url'])? $_POST['url']: '').'\', '.
+	 	    ((isset($_POST['newWindow']) AND $_POST['newWindow']) == 'on' ? 1 : 0).')');
+	 	
+	 	/* Url registration */
+	 	if (!$lastId = mysql_insert_id()) {
+            return false;
+	 	}
+	 		
+	 	/* Multilingual text */
+	 	foreach ($languages AS $language) {
+	 	    if (empty($_POST['text_'.$language['id_lang']])) {
+	 	        $text = $_POST['text_'.$defaultLanguage];
+	 	        $url = $_POST['url_'.$defaultLanguage];
+	 	    } else {
+	 	        $text = $_POST['text_'.$language['id_lang']];
+	 	        $url = $_POST['url_'.$language['id_lang']];
+	 	    }
+	 	    
+	 	    if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklinkmulti1_lang VALUES ('.
+	 	        intval($lastId).', '.intval($language['id_lang']).', \''.pSQL($text).'\', \''.pSQL($url).'\')')) {
+                    return false;
+            }
+	 	}
+	 	 	
 	 	return true;
 	}
 
@@ -130,21 +144,21 @@ class BlockLinkMulti1 extends Module
 	 	$defaultLanguage = intval(Configuration::get('PS_LANG_DEFAULT'));
 	 	if (!$languages)
 			 return false;
-	 	foreach ($languages AS $language)			
+	 	foreach ($languages AS $language)
 	 	 	if (!empty($_POST['text_'.$language['id_lang']])
 	 	 		&& !empty($_POST['url_'.$language['id_lang']]))
 	 	 	{
-	 	 		if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'blocklinkmulti1_lang 
-	 	 			SET 
+	 	 		if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'blocklinkmulti1_lang
+	 	 			SET
 	 	 				`text` = \''.pSQL($_POST['text_'.$language['id_lang']]).'\' ,
-	 	 				`url` = \''.pSQL($_POST['url_'.$language['id_lang']]).'\' 
+	 	 				`url` = \''.pSQL($_POST['url_'.$language['id_lang']]).'\'
 	 	 				WHERE `id_link`='.intval($_POST['id']).' AND `id_lang`='.$language['id_lang']
  	 			))
 	 	 			return false;
 	 	 	}
 	 	 	else
 	 	 		if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'blocklinkmulti1_lang SET `text`=\''.pSQL($_POST['text_'.$defaultLanguage]).'\' WHERE `id_link`='.intval($_POST['id']).' AND `id_lang`='.$language['id_lang']))
-	 	 			return false;	 	 	
+	 	 			return false;
 	 	return true;
 	}
 
@@ -270,7 +284,7 @@ class BlockLinkMulti1 extends Module
 				$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'url', true);
 				$this->_html .= '
 					<div class="clear"></div>
-				</div>				
+				</div>
 				<label>'.$this->l('Open in a new window:').'</label>
 				<div class="margin-form"><input type="checkbox" name="newWindow" id="newWindow" '.(($this->error AND isset($_POST['newWindow'])) ? 'checked="checked"' : '').' /></div>
 				<div class="margin-form">
@@ -319,7 +333,7 @@ class BlockLinkMulti1 extends Module
 	 	$links = $this->getLinks(true);
 
 	 	global $currentIndex, $cookie, $adminObj;
-	 	$languages = Language::getLanguages(FALSE);	 	
+	 	$languages = Language::getLanguages(FALSE);
 	 	if ($links)
 	 	{
 	 		$this->_html .= '
@@ -331,7 +345,7 @@ class BlockLinkMulti1 extends Module
 	 		{
 	 			$this->_html .= '
 	 				links['.$link['id'].'] = new Array();
-	 				links['.$link['id'].']["newWindow"] = '.$link['newWindow'].'	
+	 				links['.$link['id'].']["newWindow"] = '.$link['newWindow'].'
 	 			';
 	 			foreach ($languages AS $language) {
 	 				$this->_html.= '

modules/blockordersummary/blockordersummary.php

@@ -202,7 +202,9 @@ class BlockOrderSummary extends Module {
                 LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = ppp.`id_order_detail`)
                 WHERE od.`id_order` ='. (int)$params['order']->id
             );
+
             $carrier_socol = explode(',',Configuration::get('ANT_CARRIERS_SOCOL'));
+
             echo '<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
                 <div id="blockordersummary">
                     <div style="margin:10px auto;" class="styled-select semi-square bg-purple-light">
@@ -340,7 +342,7 @@ class BlockOrderSummary extends Module {
                 $order_address = nl2br(preg_replace("/(\r\n){2,}/", "\r\n", implode("\r\n", array(
                     $socol['cefirstname'].' '.$socol['cename'],
                     $socol['cecompanyname'],
-                    $socol['prname'],
+                    ($socol['delivery_mode']=="DOM")?'':$socol['prname'],
                     $socol['prcompladress'],
                     $socol['pradress1'],
                     $socol['pradress2'],
@@ -353,6 +355,7 @@ class BlockOrderSummary extends Module {
                     !empty($socol['cedoorcode2'])? 'Code porte 2 : '.$socol['cedoorcode2']: '',
                     $socol['cedeliveryinformation'],
                 ))));
+                $is_socol = true;
             } else {
                 if($order) {
                     $order_address = nl2br(AddressFormat::generateAddress(new Address((int) $order->id_address_delivery)));
@@ -445,6 +448,7 @@ class BlockOrderSummary extends Module {
         return array(
             'order_address' => $order_address,
             'carrier_name' => $carrier_name,
+            'is_socol' => $is_socol,
             'delay_name' => $delay_name,
             'delivery_date' => (isset($delivery_date)?$delivery_date:null)
         );

modules/blockuserinfo/blockuserinfo.php

@@ -69,7 +69,7 @@ class BlockUserInfo extends Module
     	
     	global $smarty, $cookie, $cart;
     	
-    	if (!$cookie->logged) {
+    	if (!$cookie->isLogged()) {
     	    return;
     	}
     	
@@ -92,7 +92,6 @@ class BlockUserInfo extends Module
     	    'loyalties' => ($loyalties)?$loyalties:0,
     	    'cart' => $cart,
     	    'cart_qties' => $cart->nbProducts(),
-    	    'logged' => $cookie->isLogged(),
     	    'customerName' => ($cookie->logged ? $cookie->customer_firstname.' '.$cookie->customer_lastname : false),
     	    'firstName' => ($cookie->logged ? $cookie->customer_firstname : false),
     	    'lastName' => ($cookie->logged ? $cookie->customer_lastname : false),
@@ -119,7 +118,7 @@ class BlockUserInfo extends Module
 		$loyalties = null;
 		if ($this->disableCredits === false) {
     		$display_credits = true;
-    		if ($cookie->logged) {
+    		if ($cookie->isLogged()) {
 		        $display_credits = true;
 		        $sql = 'SELECT id_customer FROM `'._DB_PREFIX_.'customer_credits` WHERE id_customer  = ' .(int) $cookie->id_customer;
 		        if(Db::getInstance()->getValue($sql)){
@@ -137,7 +136,6 @@ class BlockUserInfo extends Module
 			'loyalties' => ($loyalties)?$loyalties:0,
 			'cart' => $cart,
 			'cart_qties' => $cart->nbProducts(),
-			'logged' => $cookie->isLogged(),
 			'customerName' => ($cookie->logged ? $cookie->customer_firstname.' '.$cookie->customer_lastname : false),
 			'firstName' => ($cookie->logged ? $cookie->customer_firstname : false),
 			'lastName' => ($cookie->logged ? $cookie->customer_lastname : false),

modules/categoryscroll/ajax.php

@@ -98,6 +98,14 @@ if ($id_category && $p && $id_category > 1) {
 						foreach($cat_products as $p) {
 							$id_products[] = $p['id_product'];
 						}
+						$sale_group_attributes = array();
+						foreach(Db::getInstance()->ExecuteS('
+							SELECT `id_attribute_group`
+							FROM `'._DB_PREFIX_.'attribute_group_ps`
+							WHERE `id_sale` = '.(int)$sale->id_sale.'
+						') as $row){
+							$sale_group_attributes[] = $row['id_attribute_group'];
+						}
 						$attributes = array();
 						$id_attributes = array();
 						foreach (Db::getInstance()->ExecuteS('
@@ -111,7 +119,7 @@ if ($id_category && $p && $id_category > 1) {
 							AND ag.`id_attribute_group` = a.`id_attribute_group`
 							AND ag.`id_lang` = '.(int) $cookie->id_lang.'
 							AND pa.`quantity` > 0
-							AND ag.`id_attribute_group` IN(75, 9, 272, 172)
+							AND ag.`id_attribute_group` IN('.implode(',', $sale_group_attributes).')
 							ORDER BY pa.`id_product` ASC, ag.`public_name` ASC, al.`name` ASC
 						') as $attr) {
 							if (!isset($attributes[$attr['id_product']])) {

modules/ganalytics/header.tpl

@@ -26,26 +26,26 @@
         ga('ecommerce:clear');
     {else}
         ga('require', 'ec');
-             
+
         {foreach from=$items item=item}
-		ga('ec:addProduct', {					// Provide product details in an productFieldObject.
-			'id': '{$item.SKU}',				// Product ID (string).
-			'name': '{$item.Product}',			// Product name (string).
-			'category': '{$item.Category}',		// Product category (string).
-			'brand': '{$item.Category}',		// Product brand (string).
-			'price': '{$item.Price}',			// Product price (currency).
-			'quantity': {$item.Quantity}		// Product quantity (number).
-		});
+            ga('ec:addProduct', {				// Provide product details in an productFieldObject.
+              'id': '{$item.SKU}',				// Product ID (string).
+              'name': '{$item.Product}',		// Product name (string).
+              'category': '{$item.Category}',	// Product category (string).
+              'brand': '{$item.Category}',		// Product brand (string).
+              'price': '{$item.Price}',			// Product price (currency).
+              'quantity': {$item.Quantity}		// Product quantity (number).
+            });
         {/foreach}
-        
+
 		{if $cookie->transCpt < 2}
-		ga('ec:setAction', 'purchase', {		// Transaction details are provided in an actionFieldObject.
-			'id': '{$trans.id}',				// (Required) Transaction id (string).
-			'affiliation': '{$trans.store}',	// Affiliation (string).
-			'revenue': '{$trans.total}',		// Revenue (currency).
-			'tax': '{$trans.tax}',				// Tax (currency).
-			'shipping': '{$trans.shipping}',	// Shipping (currency).
-		});
+        ga('ec:setAction', 'purchase', {		// Transaction details are provided in an actionFieldObject.
+          'id': '{$trans.id}',					// (Required) Transaction id (string).
+          'affiliation': '{$trans.store}',		// Affiliation (string).
+          'revenue': '{$trans.total}',			// Revenue (currency).
+          'tax': '{$trans.tax}',				// Tax (currency).
+          'shipping': '{$trans.shipping}',		// Shipping (currency).
+        });
 		{/if}
 
         {literal}

modules/invite/invite.php

@@ -1131,7 +1131,7 @@ RewriteRule ^invite/(.*)$ '.__PS_BASE_URI__.'modules/invite/sponsor.php?sponsor=
 	public function hookCreateAccountForm($params)
 	{
 		global $smarty, $site_version_front;
-	
+
 		if ($firstname = Tools::getValue('firstname')) {
 			$_POST['firstname'] = $firstname;
 		}
@@ -1149,9 +1149,9 @@ RewriteRule ^invite/(.*)$ '.__PS_BASE_URI__.'modules/invite/sponsor.php?sponsor=
 		} else {
 			$cipherTool = new Blowfish(_COOKIE_KEY_, _COOKIE_IV_);
 		}
-        
+
 		$customer = new Customer();
-		
+
 		$explodeResult = explode('|', $cipherTool->decrypt(rawurldecode(Tools::getValue('sponsor'))));
 		if ($explodeResult && count($explodeResult) > 1) {
             list($id_invite, $email) = $explodeResult;
@@ -1197,7 +1197,7 @@ RewriteRule ^invite/(.*)$ '.__PS_BASE_URI__.'modules/invite/sponsor.php?sponsor=
 				}
 			}
 		}
-
+		
 		// Cookie
 		$referal_email = '';
 		$cName = '4598484FDSFDSREFERAL8849FDS';
@@ -1206,15 +1206,16 @@ RewriteRule ^invite/(.*)$ '.__PS_BASE_URI__.'modules/invite/sponsor.php?sponsor=
 		} elseif (isset($_COOKIE[$cName])) {
 		    $referal_email = base64_decode($_COOKIE[$cName]);
 		}
-		
-		$smarty->assign('sponsor_email', $referal_email);
-		
 		// Init cookie
 		if ($_COOKIE[$cName] != base64_encode($referal_email)) {
 		    unset($_COOKIE[$cName]);
 		}
 		setcookie($cName, base64_encode($referal_email), time() + 3600 * 24, '/', 'bebeboutik.com');
-		
+		$smarty_value = $smarty->get_template_vars('sponsor_email');
+        if($smarty_value === null && $referal_email !== '') { //we prevent overwrite
+            $smarty->assign('sponsor_email', $referal_email);
+        }
+
 		return $this->display(__FILE__, 'authentication.tpl');
 	}
 

modules/landingpages/AdminLandingPages.php

@@ -27,7 +27,8 @@ class AdminLandingPages extends AdminTab {
 							"'.pSQL(Tools::str2url($name)).'",
 							"'.pSQL(Tools::getValue('text1')).'",
 							"'.pSQL(Tools::getValue('text2')).'",
-							"'.pSQL(Tools::getValue('tag')).'"
+							"'.pSQL(Tools::getValue('tag')).'",
+							"'.pSQL(Tools::getValue('parrain_email')).'"
 						)
 					');
 
@@ -41,7 +42,7 @@ class AdminLandingPages extends AdminTab {
 						}
 
 						if(isset($_FILES['img2_'.$language['id_lang']]) && $_FILES['img2_'.$language['id_lang']]['name'] != '') {
-							if(!copy($_FILES['img2_'.$language['id_lang']]['tmp_name'], _PS_ROOT_DIR_.'/modules/landingpages/img/'.$id_landing_page.'_2_'.$language['id_lang'].'.png')) {
+							if(!copy($_FILES['img2_'.$language['id_lang']]['tmp_name'], _PS_ROOT_DIR_.'/modules/landingpages/img/'.$id_landing_page.'_2_'.$language['id_lang'].'.jpg')) {
 								$this->_errors[] = $this->l('An error occured during the image upload.');
 							}
 						}
@@ -81,7 +82,8 @@ class AdminLandingPages extends AdminTab {
 						`name` = "'.pSQL(Tools::str2url($name)).'",
 						`text1` = "'.pSQL(Tools::getValue('text1')).'",
 						`text2` = "'.pSQL(Tools::getValue('text2')).'",
-						`tag` = "'.pSQL(Tools::getValue('tag'), true).'"
+						`tag` = "'.pSQL(Tools::getValue('tag'), true).'",
+						`parrain` = "'.pSQL(Tools::getValue('parrain_email'), true).'"
 						WHERE `id_landing_page` = '.$id_landing_page.'
 					');
 
@@ -93,7 +95,7 @@ class AdminLandingPages extends AdminTab {
 						}
 
 						if(isset($_FILES['img2_'.$language['id_lang']]) && $_FILES['img2_'.$language['id_lang']]['name'] != '') {
-							if(!copy($_FILES['img2_'.$language['id_lang']]['tmp_name'], _PS_ROOT_DIR_.'/modules/landingpages/img/'.$id_landing_page.'_2_'.$language['id_lang'].'.png')) {
+							if(!copy($_FILES['img2_'.$language['id_lang']]['tmp_name'], _PS_ROOT_DIR_.'/modules/landingpages/img/'.$id_landing_page.'_2_'.$language['id_lang'].'.jpg')) {
 								$this->_errors[] = $this->l('An error occured during the image upload.');
 							}
 						}
@@ -327,6 +329,13 @@ class AdminLandingPages extends AdminTab {
 				</div>
 				<div class="clear"></div>
 			  </div>';
+        echo '<label>'.$this->l('Email Parrain :').'</label>
+			  <div class="margin-form">
+				<div id="enabled" style="float: left;">
+					<input name="parrain_email" type="text" value="'.($this->curlp? $this->curlp['parrain']: '').'" />
+				</div>
+				<div class="clear"></div>
+			  </div>';
 
 		echo '<label>'.$this->l('Tag :').'</label>
 			  <div class="margin-form">
@@ -343,7 +352,8 @@ class AdminLandingPages extends AdminTab {
 					<input type="file" name="img1_'.$language['id_lang'].'" />
 					<p>'.$this->l('Size:').' '.$this->l('img1 size').'</p>';
 			if($this->curlp && file_exists(_PS_ROOT_DIR_.'/modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg')) {
-				echo '<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
+				echo '<img src="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg?v='.time().'" width="350" /><br>
+                <p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg?v='.time().'" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
 			}
 			echo '
 			</div>';
@@ -352,14 +362,15 @@ class AdminLandingPages extends AdminTab {
 		echo '<div class="clear"></div>
 		</div>';
 
-		echo '<label style="display: none;">'.$this->l('Brands image:').'</label>
-			<div class="margin-form" style="display: none;">';
+		echo '<label>'.$this->l('Header Mobile:').'</label>
+			<div class="margin-form">';
 		foreach($this->_languages as $language) {
 			echo '<div id="img2_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').'; float: left;">
 					<input type="file" name="img2_'.$language['id_lang'].'" />
 					<p>'.$this->l('Size:').' '.$this->l('img2 size').'</p>';
-			if($this->curlp && file_exists(_PS_ROOT_DIR_.'/modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.png')) {
-				echo '<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.png" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
+			if($this->curlp && file_exists(_PS_ROOT_DIR_.'/modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg')) {
+                echo '<img src="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg?v='.time().'" width="350" /><br>
+<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg?v='.time().'" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
 			}
 			echo '
 			</div>';

modules/landingpages/landingpages.php

@@ -72,9 +72,11 @@ class LandingPages extends Module {
 				`name` VARCHAR(255) NOT NULL,
 				`text1` VARCHAR(255) NOT NULL,
 				`text2` VARCHAR(255) NOT NULL,
+				`parrain` VARCHAR(255) NULL,
 				PRIMARY KEY(`id_landing_page`)
 			) ENGINE=MyIsam DEFAULT CHARSET=utf8
 		';
+        //ALTER TABLE ps_landing_page ADD parrain VARCHAR(255) NULL;
 	 	if(!Db::getInstance()->Execute($query)) {
 	 		return FALSE;
 		}
@@ -191,6 +193,7 @@ class LandingPages extends Module {
 		$id_landing_page = 0;
 		$lp_text1 = '';
 		$lp_text2 = '';
+        $email_parrain = '';
 
 		if($name = Tools::getValue('lp')) {
 			if($landing = Db::getInstance()->getRow('
@@ -203,19 +206,39 @@ class LandingPages extends Module {
 				$lp_text1 = $landing['text1'];
 				$lp_text2 = $landing['text2'];
 				$tag = $landing['tag'];
+				$email_parrain = $landing['parrain'];
 			}
 		}
 
-		if($id_landing_page > 0) {
-			if (file_exists(_PS_ROOT_DIR_.'/modules/landingpages/img/'.$id_landing_page.'_1_'.$cookie->id_lang.'.jpg')) {
-		 		$smarty->assign(array(
-					'landing' => 1,
-				));
-			} else {
-		 		$smarty->assign(array(
-					'landing' => 0,
-				));
-			}
+        if ($id_landing_page > 0) {
+            if ($email_parrain !== '') {
+                if($smarty->get_template_vars('sponsor_email') === null){ //we prevent overwrite
+                    $smarty->assign(array(
+                        'sponsor_email' => $email_parrain
+                    ));
+                }
+            }
+            if (_PS_MOBILE_) {
+                if (file_exists(_PS_ROOT_DIR_ . '/modules/landingpages/img/' . $id_landing_page . '_2_' . $cookie->id_lang . '.jpg')) {
+                    $smarty->assign(array(
+                                        'landing' => 1,
+                                    ));
+                } else {
+                    $smarty->assign(array(
+                                        'landing' => 0,
+                                    ));
+                }
+            } else {
+                if (file_exists(_PS_ROOT_DIR_ . '/modules/landingpages/img/' . $id_landing_page . '_1_' . $cookie->id_lang . '.jpg')) {
+                    $smarty->assign(array(
+                                        'landing' => 1,
+                                    ));
+                } else {
+                    $smarty->assign(array(
+                                        'landing' => 0,
+                                    ));
+                }
+            }
 
 			$smarty->assign(array(
 				'id_lp' => $id_landing_page,

modules/paybox/cgi.php

@@ -61,7 +61,7 @@ $PBX_BACKUP1  = trim(Tools::getValue('PBX_BACKUP1'));
 
 // construction de la chaîne de paramètres
 if (Configuration::get('PBX_DEMO_MODE') == 0)
-	$PBX = "PBX_MODE=$PBX_MODE PBX_SITE=$PBX_SITE PBX_RANG=$PBX_RANG PBX_IDENTIFIANT=$PBX_IDENTIFIANT PBX_WAIT=$PBX_WAIT PBX_TXT=$PBX_TXT PBX_BKGD=$PBX_BKGD PBX_LANGUE=$PBX_LANGUE PBX_TOTAL=$PBX_TOTAL PBX_DEVISE=$PBX_DEVISE PBX_CMD=$PBX_CMD PBX_PORTEUR=$PBX_PORTEUR PBX_EFFECTUE=$PBX_EFFECTUE PBX_REFUSE=$PBX_REFUSE PBX_ANNULE=$PBX_ANNULE PBX_RETOUR=$PBX_RETOUR PBX_REPONDRE_A=$PBX_REPONDRE_A PBX_PAYBOX=$PBX_PAYBOX PBX_BACKUP1=$PBX_BACKUP1";
+	$PBX = "PBX_MODE=$PBX_MODE PBX_SITE=$PBX_SITE PBX_RANG=$PBX_RANG PBX_IDENTIFIANT=$PBX_IDENTIFIANT PBX_WAIT=$PBX_WAIT PBX_TXT=$PBX_TXT PBX_BKGD=$PBX_BKGD PBX_LANGUE=$PBX_LANGUE PBX_TOTAL=$PBX_TOTAL PBX_DEVISE=$PBX_DEVISE PBX_CMD=$PBX_CMD PBX_PORTEUR=$PBX_PORTEUR PBX_EFFECTUE=$PBX_EFFECTUE PBX_REFUSE=$PBX_REFUSE PBX_ANNULE=$PBX_ANNULE PBX_RETOUR=$PBX_RETOUR PBX_REPONDRE_A=$PBX_REPONDRE_A PBX_PAYBOX=$PBX_PAYBOX PBX_BACKUP1=$PBX_BACKUP1 PBX_EMPREINTE=$PBX_EMPREINTE";
 else
 	$PBX = "PBX_MODE=$PBX_MODE PBX_SITE=$PBX_SITE PBX_RANG=$PBX_RANG PBX_IDENTIFIANT=$PBX_IDENTIFIANT PBX_WAIT=$PBX_WAIT PBX_TXT=$PBX_TXT PBX_BKGD=$PBX_BKGD PBX_LANGUE=$PBX_LANGUE PBX_TOTAL=$PBX_TOTAL PBX_DEVISE=$PBX_DEVISE PBX_CMD=$PBX_CMD PBX_PORTEUR=$PBX_PORTEUR PBX_EFFECTUE=$PBX_EFFECTUE PBX_REFUSE=$PBX_REFUSE PBX_ANNULE=$PBX_ANNULE PBX_RETOUR=$PBX_RETOUR PBX_REPONDRE_A=$PBX_REPONDRE_A";
 

modules/paybox/paybox.php

@@ -226,8 +226,13 @@ class Paybox extends PaymentModule
 		global $cart, $smarty;
 
 		$customer = new Customer((int)$cart->id_customer);
-		if (!Validate::isLoadedObject($customer))
+		if (!Validate::isLoadedObject($customer)) {
 			die(Tools::displayError());
+		}
+
+		if ($id_order = (int)Order::getOrderByCartId($cart->id)) {
+			Tools::redirect('order-detail.php?id_order='.$id_order);
+		}
 
 		// verif if there's at least one order with this delivery address
 		$orders_with_delivery_address = Db::getInstance()->getValue('

modules/paypal/paypal.php

@@ -552,6 +552,22 @@ class PayPal extends PaymentModule
 		elseif ($method == WPS || $method == ECS)
 		{
 			$cart = $this->context->cart;
+
+			$orders_with_delivery_address = Db::getInstance()->getValue('
+			    SELECT COUNT(`o.id_order`)
+			    FROM `'._DB_PREFIX_.'orders` o
+			    WHERE o.`id_address_delivery` = '.(int)$cart->id_address_delivery.'
+			    AND o.`id_customer` = '.(int)$cart->id_customer.'
+			    AND (
+	 		    	o.valid = 1
+	 				OR (
+	 					o.valid = 0
+	 					AND (SELECT h.id_order_state FROM `'._DB_PREFIX_.'order_history` h WHERE h.id_order = o.id_order ORDER BY h.date_add DESC LIMIT 1) NOT IN (6,8,15,16,18)
+	 				)
+	 			)
+			');
+			//$this->context->smarty->assign('accounts', (($orders_with_delivery_address==0)?array():$this->getBillingAgreement($cart->id_customer)));
+
 			$this->context->smarty->assign('accounts', $this->getBillingAgreement($cart->id_customer));
 			$this->getTranslations();
 			$this->context->smarty->assign(array(

modules/philea_magistor/script/send_commande.php

@@ -394,6 +394,7 @@ if($magistorModule->active) {
                     ');
                     $sales[(int)$other_sale_id] = (int)$other_sale_id;
                 }
+
                 /**
                  * @Override get pack items
                  */
@@ -445,7 +446,6 @@ if($magistorModule->active) {
                 $data .= str_pad($product[3], 14, ' ', STR_PAD_LEFT); // ean
                 $data .= PHP_EOL;
             }
-
             // Add pack items to data
             // foreach ($product_packs as $product) {
             //     $nb_ligne ++;
@@ -473,6 +473,7 @@ if($magistorModule->active) {
             if(count($sales)>1) {
                 $multi[] = (int) $order->id;
             }
+
         } //End if nbproducts
     }//End foreach
 

modules/privatesales/AdminPrivateSalesSales.php

@@ -43,8 +43,9 @@ class AdminPrivateSalesSales extends AdminTab {
 
         $helperForm->_js .='<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/privatesales/privatesale.js"></script>
         <script type="text/javascript">
-            i18n_delete = "'.$this->l('Are you sure you want to delete this sale?').'";
-            current_location = "'.$currentIndex.'&token='.Tools::getAdminTokenLite('AdminPrivateSalesSales').'";
+        i18n_delete = "'.$this->l('Are you sure you want to delete this sale?').'";
+        i18n_delete_img = "'.$this->l('Are you sure you want to delete this image?').'";
+        current_location = "'.$currentIndex.'&token='.Tools::getAdminTokenLite('AdminPrivateSalesSales').'";
         </script>
         <script type="text/javascript" src="'.__PS_BASE_URI__.'modules/privatesales/jquery.multiSelect.js"></script>';
 
@@ -1045,7 +1046,6 @@ class AdminPrivateSalesSales extends AdminTab {
             </script>
         ';
 
-
         echo '
         <div class="panel">
             <div class="panel-title">
@@ -1117,7 +1117,6 @@ class AdminPrivateSalesSales extends AdminTab {
                         <td class="text-center '.(in_array('es', $sale->versions) ? 'green' : 'rose').'">ES</td>
                         <td align="center">'.$delay.'</td>
                         <td align="center">'.(isset($sale_shipping[(int) $sale->id])? ($sale_shipping[(int) $sale->id] == 1? 'Philéa': ($sale_shipping[(int) $sale->id] == 2? 'Drop' : '')): '').'</td>
-
                         <td align="center">'. $sale->forward_news .'</td>
 
                         <td align="center" class="position">';
@@ -1262,7 +1261,6 @@ class AdminPrivateSalesSales extends AdminTab {
             if (Sale::getSaleFromCategory(Tools::getValue('id_category'))) {
                 return false;
             }
-
             $sql_position = 'SELECT MAX(position) FROM '. _DB_PREFIX_.'privatesale';
             $position = Db::getInstance()->getValue($sql_position);
 
@@ -1427,6 +1425,13 @@ class AdminPrivateSalesSales extends AdminTab {
                     }
                 }
             }
+        } elseif(isset($_GET['deleteImg']) && $id_sale = Tools::getValue('id') && $image = Tools::getValue('image')) {
+            if(file_exists(_PS_ROOT_DIR_.'/modules/privatesales/img/'.(int)Tools::getValue('id').'/'.$image.'.jpg')){
+                unlink(_PS_ROOT_DIR_.'/modules/privatesales/img/'.(int)Tools::getValue('id').'/'.$image.'.jpg');
+                Tools::redirectAdmin($currentIndex.'&token='.Tools::getAdminTokenLite('AdminPrivateSalesSales').'&edit&id='.(int)Tools::getValue('id'));
+            } else {
+                echo $this->displayError($this->l('This image doesn\'t exist.'));
+            }
         } elseif(isset($_GET['delete']) && $id_sale = Tools::getValue('id')) {
             Sale::deleteSale($id_sale);
             Tools::redirectAdmin($currentIndex.'&token='.Tools::getAdminTokenLite('AdminPrivateSalesSales'));

modules/privatesales/Sale.php

@@ -1883,7 +1883,8 @@ class Sale {
     }
 
     public function getProducts($order = FALSE) {
-        $categories = Sale::flatRecurseCategory($this->id_category);
+        //$categories = Sale::flatRecurseCategory($this->id_category);
+        $categories = Sale::getCategoriesFromCache($this->id);
 
         $products = array();
         foreach(Db::getInstance()->ExecuteS('

modules/privatesales/privatesale.js

@@ -3,9 +3,16 @@ function itemEdition(linkId) {
 }
 
 function itemDeletion(linkId) {
-	var ok = confirm(i18n_delete)
+    var ok = confirm(i18n_delete)
+    if(ok == true) {
+        document.location.href = current_location + "&id=" + linkId + "&delete=1";
+    }
+}
+
+function ImgDeletion(linkId, ImgId) {
+	var ok = confirm(i18n_delete_img)
 	if(ok == true) {
-		document.location.href = current_location + "&id=" + linkId + "&delete=1";
+		document.location.href = current_location + "&deleteImg=1&image=" + ImgId + "&id=" + linkId;
 	}
 }
 function itemLockPosition(linkId) {

modules/privatesales_family_menu/privatesales_family_menu.php

@@ -48,8 +48,18 @@ class Privatesales_Family_Menu extends Module {
 			}
 		}
 
+		// Purchase Guide
+		$purchaseguide = array();
+		if (count($menus) > 0) {
+            foreach ($menus as $m) {
+                $purchaseguide[$m['id_category_family']] = Module::hookExec('topMenuLink',
+                    array('id_category_family' => $m['id_category_family']));
+            }
+		}
+		
 		$smarty->assign(array(
-			'menus' => $menus
+			'menus' => $menus,
+		    'purchaseguide' => $purchaseguide,
 		));
 		return $this->display(__FILE__, 'menu.tpl');
 	}

modules/purchaseguide/AdminGuide.php

@@ -16,8 +16,11 @@ class AdminGuide extends AdminTab
 				'en' => 'guide',
 			);
 
-			$str_rewrite_rules = 'RewriteRule ^%s/([0-9]+)\-[a-zA-Z0-9-]*$ '.__PS_BASE_URI__.'modules/'.$module_name.'/page.php?id_guide_post=$1 [QSA,L]'."\n";
-
+			$str_rewrite_rules =
+                "RewriteRule ^guide$ ".__PS_BASE_URI__."modules/purchaseguide/rubrique.php [QSA,L]". "\n" .
+                "RewriteRule ^guide/([0-9]+)\-([a-zA-Z0-9-]*)$ ".__PS_BASE_URI__."modules/purchaseguide/rubrique.php?cid=$1 [QSA,L]". "\n" .
+                "RewriteRule ^guide/([0-9]+)\-([a-zA-Z0-9-]*)/([0-9]+)\-([a-zA-Z0-9-]*)$ ".__PS_BASE_URI__."modules/purchaseguide/rubrique.php?cid=$1&sid=$3 [QSA,L]". "\n" .
+                "RewriteRule ^guide/([0-9]+)\-([a-zA-Z0-9-]*)/([0-9]+)\-([a-zA-Z0-9-]*)/([0-9]+)\-([a-zA-Z0-9-]*)$ ".__PS_BASE_URI__."modules/purchaseguide/post.php?cid=$1&sid=$3&id=$5 [QSA,L]";
 
 			if(count($langs) > 1) {
 				$rewrite_rules = '';
@@ -41,7 +44,7 @@ class AdminGuide extends AdminTab
 			
 			$smarty->assign('rewrite_rules', htmlentities($rewrite_rules));
 
-			echo $smarty->fetch(__DIR__.'/templates/home_adminguide.tpl');
+			echo $smarty->fetch(__DIR__.'/views/templates/admin/home_adminguide.tpl');
 		}
 	}
 }

modules/purchaseguide/AdminGuideCategories.php

@@ -14,6 +14,7 @@ class AdminGuideCategories extends AdminTab
 	public function __construct()
 	{
 		global $cookie;
+		
 		$this->maxImageBytes = (Configuration::get('PS_LIMIT_UPLOAD_IMAGE_VALUE') * 1000000);
 
 		$this->table = 'guide_category';
@@ -23,61 +24,239 @@ class AdminGuideCategories extends AdminTab
 	 	$this->delete = true;
 	 	$this->view = true;
 
-
 		$this->fieldsDisplay = array(
 			'id_guide_category' => array(
-				'title' => $this->l('ID'), 
-				'align' => 'center', 
+				'title' => $this->l('ID'),
+				'align' => 'center',
 				'width' => 30
-				),
+            ),
 			'name' => array(
-				'title' => $this->l('Title'), 
+				'title' => $this->l('Title'),
 				'width' => 100
-				),
+			),
 			'description' => array(
-				'title' => $this->l('Description'), 
-				'width' => 500, 
-				'maxlength' => 90, 
+				'title' => $this->l('Description'),
+				'width' => 500,
+				'maxlength' => 90,
 				'orderby' => false
-				),
-			'position' => array(
-				'title' => $this->l('Position'), 
-				'width' => 40,
-				'filter_key' => 'position', 
-				'align' => 'center', 
-				'position' => 'position'
-				),
+			),
+		    'position' => array(
+		        'title' => $this->l('Position'),
+		        'width' => 40,
+		        'filter_key' => 'position',
+		        'align' => 'center',
+		        'position' => 'position'
+		    ),
 			'active' => array(
-				'title' => $this->l('Displayed'), 
-				'active' => 'status', 
-				'align' => 'center', 
-				'type' => 'bool', 
+				'title' => $this->l('Displayed'),
+				'active' => 'status',
+				'align' => 'center',
+				'type' => 'bool',
 				'orderby' => false
-				)
-			);
+			)
+        );
 		
 		if (isset($_GET['delete'.$this->table])) {
-			self::$current_category = new GuideCategory(
-				(int)(Tools::getValue('id_guide_category_parent', 0))
-				);
+			self::$current_category = new GuideCategory((int)(Tools::getValue('id_guide_category_parent', 0)));
 		}
 		else {
-			self::$current_category = new GuideCategory(
-				(int)(
-					Tools::getValue('id_guide_category', 
-						Tools::getValue('id_guide_category_parent', 0))
-					)
-				);
+			self::$current_category = new GuideCategory((int)(Tools::getValue('id_guide_category', Tools::getValue('id_guide_category_parent', 0))));
 		}
 
-		$this->_select = 'position ';
 		$this->_filter = 'AND a.`id_parent` = '.(int)(self::$current_category->id);
-		$this->_orderBy = 'position';
-		$this->_orderWay = 'DESC';
+		$this->_select = 'position ';
 		$this->identifiersDnd['id_guide_category'] = 'id_guide_category';
 
 		parent::__construct();
 	}
+	
+	public function postProcess()
+	{
+	    global $currentIndex, $cookie;
+	    
+	    if (isset($_GET['delete'.$this->table]) || Tools::getValue('submitDel'.$this->table)) {
+            $this->postProcessDelete();
+            return;
+        }
+	    
+        // set token
+        $token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
+        
+        if (isset($_GET['position']))
+        {
+            if ($this->tabAccess['edit'] !== '1'){
+                $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
+            }
+            elseif (!Validate::isLoadedObject($object = $this->loadObject())) {
+                $this->_errors[] = Tools::displayError('An error occurred while updating status for object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
+            } elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) {
+                $this->_errors[] = Tools::displayError('Failed to update the position.');
+            } else {
+                if ($object->id_parent == 0) {
+                    Tools::redirectAdmin($currentIndex.'&token='.$token);
+                } else {
+                    Tools::redirectAdmin($currentIndex.'&'.(($id_identifier = (int)($object->id_parent)) ? ('&'.$this->identifier.'='.$id_identifier) : '').'&token='.$token);
+                }
+            }
+        }
+        
+	    if (self::$current_category->id != 0) {
+	       $this->noLink = true;
+        }
+	        
+	    parent::postProcess();
+	}
+	
+	protected function afterUpdate()
+	{
+	    return $this->afterAdd();
+	}
+	
+	protected function afterAdd()
+	{
+	    if (isset($_FILES['image']['tmp_name']) && $_FILES['image']['tmp_name'] != NULL) {
+	        $object = $this->loadObject();
+	        $error = checkImage($_FILES['image'], $this->maxImageSize);
+	        if ($error) {
+	            $this->_errors[] = $error;
+	            return false;
+	        }
+	        
+	        $tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS');
+	        
+	        if (!$tmpName OR !move_uploaded_file($_FILES['image']['tmp_name'], $tmpName)) {
+	            $this->_errors[] = Tools::displayError('An error occurred during the image upload');
+	            return false;
+	        }
+	        
+	        $new_path = $object->getImageFilePath();
+	        
+	        if (file_exists($new_path)) {
+	            @unlink($new_path);
+	        }
+	        
+	        if (!imageResize($tmpName, $new_path, self::IMG_WIDTH, self::IMG_HEIGHT)) {
+	            $this->_errors[] = Tools::displayError('An error occurred while copying image.');
+	            return false;
+	        }
+	        
+	        @unlink($tmpName);
+	    }
+	    
+	    return true;
+	}
+	
+	private function postProcessDelete()
+	{
+	    global $currentIndex;
+	    
+	    if ($this->tabAccess['delete'] === '1')
+	    {
+	        if (isset($_GET['delete'.$this->table])) {
+	            $object = $this->loadObject();
+	            
+	            if (Validate::isLoadedObject($object)) {
+	                $result = $object->delete();
+	                
+	                if (!$result) {
+	                    if ($object->getDeleteError()==1) {
+	                        $this->_errors[] = Tools::displayError($this->l('The category has at least one sub category'));
+	                    }
+	                    else if ($object->getDeleteError()==2) {
+	                        $this->_errors[] = Tools::displayError($this->l('The category contains at least one page'));
+	                    }
+	                    else {
+	                        $this->_errors[] = Tools::displayError('An error occurred during deletion.');
+	                    }
+	                }
+	                else {
+	                    Tools::redirectAdmin($currentIndex.'&id_guide_category_parent='.self::$current_category->id.'&conf=1&token='.$this->token);
+	                }
+	            }
+	            else {
+	                $this->_errors[] = Tools::displayError('An error occurred while deleting object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
+	            }
+	            
+	            return;
+	        }
+	        elseif (Tools::getValue('submitDel'.$this->table)) {
+	            $object = new GuideCategory();
+	            $result = $object->deleteSelection(Tools::getValue($this->table.'Box'));
+	            
+	            if (!$result) {
+	                if ($object->getDeleteError()==1) {
+	                    $this->_errors[] = Tools::displayError($this->l('One of the selected categories has at least one sub category'));
+	                }
+	                elseif ($object->getDeleteError()==2) {
+	                    $this->_errors[] = Tools::displayError($this->l('One of the selected categories contains at least one page'));
+	                }
+	                else {
+	                    $this->_errors[] = Tools::displayError('An error occurred while deleting selection.');
+	                }
+	            }
+	            else {
+	                Tools::redirectAdmin($currentIndex.'&id_guide_category_parent='.self::$current_category->id.'&conf=1&token='.$this->token);
+	            }
+	            
+	            return;
+	        }
+	    }
+	}
+	
+	protected function _displayEditLink($token = NULL, $id)
+	{
+	    global $currentIndex;
+	    
+	    $_cacheLang['Edit'] = $this->l('Edit');
+	    
+	    echo '
+            <a href="'.$currentIndex.'&'.$this->identifier.'='.$id.'&update'.$this->table.
+            '&token='.($token!=NULL ? $token : $this->token).
+            (self::$current_category->id==0 ? '' : '&id_guide_category_parent='.self::$current_category->id).'">
+            <img src="../img/admin/edit.gif" alt="" title="'.$_cacheLang['Edit'].'" /></a>';
+	}
+	
+	protected function _displayDeleteLink($token = NULL, $id)
+	{
+	    global $currentIndex;
+	    
+	    $_cacheLang['Delete'] = $this->l('Delete');
+	    $_cacheLang['DeleteItem'] = $this->l('Delete item #', __CLASS__, TRUE, FALSE);
+	    
+	    echo '
+			<a href="'.$currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token!=NULL ? $token : $this->token).'&id_guide_category_parent='.self::$current_category->id.'" onclick="return confirm(\''.$_cacheLang['DeleteItem'].$id.' ?'.
+			(!is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : '').'\');">
+			<img src="../img/admin/delete.gif" alt="'.$_cacheLang['Delete'].'" title="'.$_cacheLang['Delete'].'" /></a>';
+	}
+		
+	protected function _displayViewLink($token = NULL, $id)
+	{
+	    $category = new GuideCategory($id);
+	    if ($category->id_parent != 0) {
+	       $this->_displayPostLink($token, $id);
+	    }
+	    
+	    global $currentIndex;
+	    
+	    $_cacheLang['View'] = $this->l('View');
+	    
+	    echo '
+			<a href="'._PS_BASE_URL_SSL_.'/modules/purchaseguide/post.php?cid='.$id.'" target="_blank">
+			<img src="../img/admin/details.gif" alt="'.$_cacheLang['View'].'" title="'.$_cacheLang['View'].'" /></a>';
+	}
+		
+	protected function _displayPostLink($token = NULL, $id)
+	{
+	    $_cacheLang['Post'] = $this->l('View Post');
+	    
+	    $currentIndex = '?tab=AdminGuidePosts';
+	    $token = Tools::getAdminTokenLite('AdminGuidePosts');
+	    
+	    echo '
+			<a href="'.$currentIndex.'&'.$this->identifier.'='.$id.
+                '&token='.($token!=NULL ? $token : $this->token).'">
+			<img src="../img/admin/arrow-right.png" alt="" title="'.$_cacheLang['Post'].'" /></a>';
+	}
 
 	public static function getCurrentCategory()
 	{
@@ -89,9 +268,9 @@ class AdminGuideCategories extends AdminTab
 		global $currentIndex, $cookie, $smarty;
 		parent::displayForm();
 
-		if (!($obj = $this->loadObject(true)))
-			return;
-
+		if (!($obj = $this->loadObject(true))) {
+            return;
+		}
 
 		$langs = Language::getLanguages(false);
 
@@ -105,28 +284,28 @@ class AdminGuideCategories extends AdminTab
 				'options_map' => ['id_guide_category', 'name', 'level'],
 				'empty_option' => ['value'=>'0', 'label'=>$this->l('No parent category')],
 				'initial_value' => $obj->id_parent?$obj->id_parent:self::$current_category->id
-				),		
+			),
 			'id_category_family' => array(
 				'title' => $this->l('Famille'),
 				'type' => 'select',
 				'options_raw' => GuideCategory::findFamiliesTree($cookie->id_lang),
 				'options_map' => ['id_category_family', 'name', 'level'],
 				'initial_value' => $obj->id_category_family
-				),			
+			),
 			'name' => array(
-				'title' => $this->l('Title'), 
+				'title' => $this->l('Title'),
 				'type' => 'text',
 				'required' => true,
 				'translatable' => true,
 				'attrs' => [
 					'onkeyup' =>  'copy2friendlyURL();'
-					]
-				),
+			     ]
+			),
 			'description' => array(
 				'title' => $this->l('Description'),
 				'type' => 'textarea',
 				'translatable' => true,
-				),
+            ),
 			'image' => array(
 				'title' => $this->l('Image'),
 				'type' => 'file',
@@ -135,29 +314,29 @@ class AdminGuideCategories extends AdminTab
 					'allowed_format' => 'JPEG',
 					'html_file' => "img",
 					'path' => $obj->getImageFileUrl().'?rand='.time()
-					]
-				),
+			     ]
+			),
 			'active' => array(
 				'title' => $this->l('Displayed'),
 				'type' => 'yesno',
 				'required' => true,
-				),
+			),
 			'link_rewrite' => array(
-				'title' => $this->l('Simplified URL'), 
+				'title' => $this->l('Simplified URL'),
 				'type' => 'text',
 				'required' => true,
-				),
+			),
 			'meta_title' => array(
-				'title' => $this->l('Title (META)'), 
+				'title' => $this->l('Title (META)'),
 				'type' => 'text',
 				'translatable' => true,
-				),
+			),
 			'meta_description' => array(
-				'title' => $this->l('Description (META)'), 
+				'title' => $this->l('Description (META)'),
 				'type' => 'textarea',
 				'translatable' => true,
-				),
-			);
+			),
+        );
 
         $form->setTitle($this->l('Purchase guide category'));
 		$form->setFields($this->fieldsForm);
@@ -191,174 +370,40 @@ class AdminGuideCategories extends AdminTab
 	public function displayList()
 	{
 		global $currentIndex;
-
 		
 		$this->displayTop();
 
-		if ($this->edit AND (!isset($this->noAdd) OR !$this->noAdd))
+		if ($this->edit AND (!isset($this->noAdd) OR !$this->noAdd)) {
 			echo '<br /><a href="'.$currentIndex.'&id_guide_category_parent='.self::$current_category->id.'&add'.$this->table.'&token='.$this->token.'"><img src="../img/admin/add.gif" border="0" /> '.$this->l('Add new').'</a><br /><br />';
+		}
+		
 		// Append when we get a syntax error in SQL query
-		if ($this->_list === false)
-		{
+		if ($this->_list === false) {
 			$this->displayWarning($this->l('Bad SQL query'));
 			return false;
 		}
 
 		// Display list header (filtering, pagination and column names)
 		$this->displayListHeader();
-		if (!sizeof($this->_list))
+		if (!sizeof($this->_list)) {
 			echo '<tr><td class="center" colspan="'.(sizeof($this->fieldsDisplay) + 2).'">'.$this->l('No items found').'</td></tr>';
-
+		}
+		
 		// Show the content of the table
 		$this->displayListContent();
 
 		// Close list table and submit button
 		$this->displayListFooter();
-		
-		
 	}
 
 
 	public function viewguide_category()
 	{
 		global $cookie;
-		$this->getList((int)($cookie->id_lang));
+		$this->getList((int)($cookie->id_lang), 'position');
 		$this->displayList();
 		$this->displayOptionsList();
 		$this->displayRequiredFields();
 		$this->includeSubTab('display');
 	}
-
-	protected function _displayEditLink($token = NULL, $id)
-	{
-		global $currentIndex;
-
-		$_cacheLang['Edit'] = $this->l('Edit');
-
-		echo '
-			<a href="'.$currentIndex.'&'.$this->identifier.'='.$id.'&update'.$this->table.'&token='.($token!=NULL ? $token : $this->token).'&id_guide_category_parent='.self::$current_category->id.'">
-			<img src="../img/admin/edit.gif" alt="" title="'.$_cacheLang['Edit'].'" /></a>';
-	}
-
-	protected function _displayDeleteLink($token = NULL, $id)
-	{
-		global $currentIndex;
-
-		$_cacheLang['Delete'] = $this->l('Delete');
-		$_cacheLang['DeleteItem'] = $this->l('Delete item #', __CLASS__, TRUE, FALSE);
-
-		echo '
-			<a href="'.$currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token!=NULL ? $token : $this->token).'&id_guide_category_parent='.self::$current_category->id.'" onclick="return confirm(\''.$_cacheLang['DeleteItem'].$id.' ?'.
-					(!is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : '').'\');">
-			<img src="../img/admin/delete.gif" alt="'.$_cacheLang['Delete'].'" title="'.$_cacheLang['Delete'].'" /></a>';
-	}
-
-
-	public function postProcess()
-	{	
-		if (isset($_GET['delete'.$this->table]) ||
-			Tools::getValue('submitDel'.$this->table)) {
-			$this->postProcessDelete();
-			return;
-	    }
-
-		parent::postProcess();
-	}
-
-
-	protected function afterUpdate()
-	{
-		return $this->afterAdd();
-	}
-
-
-	protected function afterAdd()
-	{
-		if (isset($_FILES['image']['tmp_name']) &&
-			$_FILES['image']['tmp_name'] != NULL) {
-			
-			$object = $this->loadObject();
-			$error = checkImage( $_FILES['image'], $this->maxImageSize);
-			if ($error) {
-	            $this->_errors[] = $error;
-	            return false;
-			}
-
-			$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS');
-
-            if (!$tmpName OR !move_uploaded_file($_FILES['image']['tmp_name'], $tmpName)) {
-                $this->_errors[] = Tools::displayError('An error occurred during the image upload');
-                return false;
-            }
-
-            $new_path = $object->getImageFilePath();
-
-            if (file_exists($new_path)) {
-            	@unlink($new_path);
-            }
-            if (!imageResize($tmpName, $new_path, self::IMG_WIDTH, self::IMG_HEIGHT)) {
-                $this->_errors[] = Tools::displayError('An error occurred while copying image.');
-                return false;
-            }
-
-            @unlink($tmpName);
-            
-		}
-        return true;
-	}
-
-	private function postProcessDelete()
-	{
-		global $currentIndex;
-		
-		if ($this->tabAccess['delete'] === '1')
-		{
-			if (isset($_GET['delete'.$this->table])) {
-				$object = $this->loadObject();
-
-				if (Validate::isLoadedObject($object)) {
-					$result = $object->delete();
-
-					if (!$result) {
-						if ($object->getDeleteError()==1) {
-							$this->_errors[] = Tools::displayError($this->l('The category has at least one sub category'));
-						}
-						else if ($object->getDeleteError()==2) {
-							$this->_errors[] = Tools::displayError($this->l('The category contains at least one page'));
-						}
-						else {
-							$this->_errors[] = Tools::displayError('An error occurred during deletion.');
-						}
-					}
-					else {
-						Tools::redirectAdmin($currentIndex.'&id_guide_category_parent='.self::$current_category->id.'&conf=1&token='.$this->token);
-					}
-				}	
-				else {
-					$this->_errors[] = Tools::displayError('An error occurred while deleting object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
-				}
-				return;
-			}
-			elseif (Tools::getValue('submitDel'.$this->table)) {
-				$object = new GuideCategory();
-				$result = $object->deleteSelection(Tools::getValue($this->table.'Box'));
-
-				if (!$result) {
-					if ($object->getDeleteError()==1) {
-						$this->_errors[] = Tools::displayError($this->l('One of the selected categories has at least one sub category'));
-					}
-					elseif ($object->getDeleteError()==2) {
-						$this->_errors[] = Tools::displayError($this->l('One of the selected categories contains at least one page'));
-					}
-					else {
-						$this->_errors[] = Tools::displayError('An error occurred while deleting selection.');						
-					}
-				}
-				else {
-					Tools::redirectAdmin($currentIndex.'&id_guide_category_parent='.self::$current_category->id.'&conf=1&token='.$this->token);
-				}
-				return;
-			}
-		}
-	}
 }

modules/purchaseguide/AdminGuidePosts.php

@@ -3,7 +3,6 @@ require_once(__DIR__.'/classes/GuidePost.php');
 require_once(__DIR__.'/classes/GuideCategory.php');
 require_once(__DIR__.'/classes/FormBuilder.php');
 
-
 class AdminGuidePosts extends AdminTab
 {
 	public function __construct()
@@ -18,62 +17,110 @@ class AdminGuidePosts extends AdminTab
 	 	$this->view = true;
 	 	$this->delete = true;
 		
-		$this->fieldsDisplay = array(
-			'id_guide_post' => array(
-				'title' => $this->l('ID'), 
-				'align' => 'center', 
-				'width' => 25
-				),
-			'name' => array(
-				'title' => $this->l('Category'),
-				'width' => 200,
-				),
-			'link_rewrite' => array(
-				'title' => $this->l('URL'), 
-				'width' => 200
-				),
-			'meta_title' => array(
-				'title' => $this->l('Title'), 
-				'width' => 300
-				),
-			'position' => array(
-				'title' => $this->l('Position'), 
-				'width' => 40,
-				'filter_key' => 'position', 
-				'align' => 'center', 
-				'position' => 'position'
-				),
-			'active' => array(
-				'title' => $this->l('Enabled'), 
-				'width' => 25, 
-				'align' => 'center', 
-				'active' => 'status', 
-				'type' => 'bool', 
-				'orderby' => false
-				)
-			);
-		$this->_select = 'a.position, gcl.name, a.id_guide_category ';
-		
-		$this->_join = '
-			LEFT JOIN `'._DB_PREFIX_.'guide_category` gc 
-			ON gc.`id_guide_category` = a.`id_guide_category`
-			LEFT JOIN `'._DB_PREFIX_.'guide_category_lang` gcl 
-			ON (gcl.`id_guide_category` = gc.`id_guide_category` AND gcl.`id_lang` = '.(int)($cookie->id_lang).')';
-
-		$this->_orderBy = 'position';
-		$this->_orderWay = 'ASC';
 		$this->identifiersDnd['id_guide_post'] = 'id_guide_post';
 
 		parent::__construct();
 	}
 	
+	protected function _displayViewLink($token = null, $id)
+	{
+	    $_cacheLang['View'] = $this->l('View');
+	    
+	    echo '
+			<a href="'._PS_BASE_URL_SSL_.'/modules/purchaseguide/post.php?pid='.$id.'" target="_blank">
+			<img src="../img/admin/details.gif" alt="'.$_cacheLang['View'].'" title="'.$_cacheLang['View'].'" /></a>';
+	}
+	
+	public function postProcess()
+	{
+	    global $cookie, $currentIndex;
+	    
+	    $this->fieldsDisplay = array(
+	        'id_guide_post' => array(
+	            'title' => $this->l('ID'),
+	            'align' => 'center',
+	            'width' => 25
+	        ),
+	        'name' => array(
+	            'title' => $this->l('Category'),
+	            'width' => 200,
+	        ),
+	        'link_rewrite' => array(
+	            'title' => $this->l('URL'),
+	            'width' => 200
+	        ),
+	        'meta_title' => array(
+	            'title' => $this->l('Title'),
+	            'width' => 300
+	        ),
+	        'active' => array(
+	            'title' => $this->l('Enabled'),
+	            'width' => 25,
+	            'align' => 'center',
+	            'active' => 'status',
+	            'type' => 'bool',
+	            'orderby' => false
+	        )
+	    );
+	    $this->_select = 'a.`position`, gcl.`name`, a.`id_guide_category` ';
+	    $this->_join = '
+			LEFT JOIN `'._DB_PREFIX_.'guide_category` gc
+			ON gc.`id_guide_category` = a.`id_guide_category`
+			LEFT JOIN `'._DB_PREFIX_.'guide_category_lang` gcl
+			ON (gcl.`id_guide_category` = gc.`id_guide_category` AND gcl.`id_lang` = '.(int)($cookie->id_lang).')';
+	    
+	    if (Tools::getIsset('id_guide_category')) {
+	        $this->fieldsDisplay['position'] = array(
+	            'title' => $this->l('Position'),
+	            'width' => 40,
+	            'filter_key' => 'position',
+	            'align' => 'center',
+	            'position' => 'position'
+	        );
+	        $this->_where = ' AND a.`id_guide_category`='.(int)Tools::getValue('id_guide_category');
+	        $currentIndex.= '&id_guide_category='.(int)Tools::getValue('id_guide_category');
+	    }
+	    
+	    parent::postProcess();
+	}
+	
+	public function displayTop()
+	{
+	    global $cookie;
+	    
+	    $id_guide_category = Tools::getValue('id_guide_category', 0);
+	    if ($id_guide_category == 0) {
+	        
+	    } else {
+	        $category = new GuideCategory($id_guide_category);
+	        
+	        $currentIndex = '?tab=AdminGuideCategories';
+	        $token = Tools::getAdminTokenLite('AdminGuideCategories');
+	        
+	        echo '<a href="'.$currentIndex.'&token='.$token.'&id_guide_category='.$category->id_parent.
+    	        '"><img src="../img/admin/arrow2.gif" /> '.$this->l('back to').' '.
+    	        $category->name[$cookie->id_lang].'</a><br /><br />';
+    	        
+            echo $this->l('Current category').' : '.$category->name[$cookie->id_lang].'<br /><br />';
+	    }
+	}
+	
+	public function displayList()
+	{
+	    if (Tools::getIsset('id_guide_category')) {
+	       $this->_orderBy = 'position';
+	    }
+	    parent::displayList();
+	}
+	
 	public function displayForm($token = NULL)
 	{
 		global $currentIndex, $cookie, $smarty;
 		parent::displayForm();
 
-		if (!($obj = $this->loadObject(true)))
-			return;
+		if (!($obj = $this->loadObject(true))) {
+		    return;
+		}
 
 		$langs = Language::getLanguages(false);
 
@@ -83,12 +130,12 @@ class AdminGuidePosts extends AdminTab
 			'id_guide_category' => array(
 				'title' => $this->l('Catégorie du guide'),
 				'type' => 'select',
-				'options_raw' => GuideCategory::findCategoriesTree($cookie->id_lang),
+				'options_raw' => GuideCategory::findCategoriesTree($cookie->id_lang, 2),
 				'options_map' => ['id_guide_category', 'name', 'level'],
 				'initial_value' => $obj->id_guide_category
-				),	
+				),
 			'meta_title' => array(
-				'title' => $this->l('Title (META)'), 
+				'title' => $this->l('Title (META)'),
 				'type' => 'text',
 				'translatable' => true,
 				'attrs' => [
@@ -96,12 +143,12 @@ class AdminGuidePosts extends AdminTab
 					]
 				),
 			'meta_description' => array(
-				'title' => $this->l('Description (META)'), 
+				'title' => $this->l('Description (META)'),
 				'type' => 'textarea',
 				'translatable' => true,
 				),
 			'link_rewrite' => array(
-				'title' => $this->l('Simplified URL'), 
+				'title' => $this->l('Simplified URL'),
 				'type' => 'text',
 				'required' => true,
 				),
@@ -121,33 +168,5 @@ class AdminGuidePosts extends AdminTab
 		$form->setFields($this->fieldsForm);
 		$form->setSubmitButton($this->l('Save'));
 		$form->display($smarty, $langs, $obj);
-
 	}
-
-	public function postProcess()
-	{
-		global $cookie, $currentIndex;
-		
-		$link = new Link();
-
-		if (Tools::isSubmit('viewguide_post') AND ($id_guide_post = (int)(Tools::getValue('id_guide_post'))) AND $guide_post = new GuidePost($id_guide_post, (int)($cookie->id_lang)) AND Validate::isLoadedObject($guide_post))
-		{
-			$redir = $link->getGuideLink($guide_post, null, null, 
-				$cookie->id_lang);
-			
-			if (!$guide_post->active)
-			{
-				$admin_dir = dirname($_SERVER['PHP_SELF']);
-				$admin_dir = substr($admin_dir, strrpos($admin_dir,'/') + 1);
-				$redir .= '?adtoken='.Tools::encrypt('PreviewGuidePost'.$guide_post->id).'&ad='.$admin_dir;
-			}
-			
-			Tools::redirectAdmin($redir);
-		}
-		else {
-			parent::postProcess();
-		}	
-	}
-
 }
-

modules/purchaseguide/classes/FormBuilder.php

@@ -1,7 +1,7 @@
 <?php
 
 if (!defined('FORM_DIR')) {
-	define('FORM_DIR', __DIR__.'/../templates/form/');
+	define('FORM_DIR', __DIR__.'/../views/templates/admin/form/');
 }
 
 class FormBuilder
@@ -31,7 +31,7 @@ class FormBuilder
 
 	public function setSubmitButton($title)
 	{
-		$this->submit_button_title = $title; 
+		$this->submit_button_title = $title;
 	}
 
 	public function setFields($fields)
@@ -56,7 +56,7 @@ class FormBuilder
 			'module_dir' => _MODULE_DIR_,
 			'button_submit' => [
 				'name' => $this->submitName($this->form_action),
-				'value' => $this->submit_button_title 
+				'value' => $this->submit_button_title
 				]
 			];
 		$smarty->assign($smarty_params);
@@ -124,8 +124,8 @@ class FormBuilder
 			$html_attrs = '';
 			foreach($field['attrs'] as $key => $value) {
 				$html_attrs .= " $key = \"".$value."\"";
-			}				
-			$field['html_attrs'] = $html_attrs;		
+			}
+			$field['html_attrs'] = $html_attrs;
 		}
 	}
 
@@ -168,11 +168,11 @@ class FormBuilder
 			foreach ($langs as $lang) {
 				$val = $this->getFieldValue($obj, $key, $field['initial_value'], $lang['id_lang']);
 				$value[$lang['id_lang']] = htmlentities(
-					$val, 
-					ENT_COMPAT, 
+					$val,
+					ENT_COMPAT,
 					'UTF-8'
 					);
-			}	
+			}
 		}
 		else {
 			$field['value'] = $this->getFieldValue($obj, $key, $field['initial_value'], null);

modules/purchaseguide/classes/GuideCategory.php

@@ -2,63 +2,81 @@
 
 class GuideCategory extends ObjectModel
 {
-	public 		$id;
-	public 		$id_guide_category;
-	public 		$name;
-	public 		$active = 1;
-	public 		$description;
-	public 		$id_parent;
-	public 		$id_category_family;
-	public 		$position;
-	public 		$level_depth;
-	public 		$link_rewrite;
-	public 		$meta_title;
-	public 		$meta_keywords;
-	public 		$meta_description;
+	public $id;
+	public $id_guide_category;
+	public $name;
+	public $active = 1;
+	public $description;
+	public $id_parent;
+	public $id_category_family;
+	public $position;
+	public $level_depth;
+	public $link_rewrite;
+	public $meta_title;
+	public $meta_keywords;
+	public $meta_description;
 	
-	protected 	$table = 'guide_category';
-	protected 	$identifier = 'id_guide_category';
+	protected $table = 'guide_category';
+	protected $identifier = 'id_guide_category';
 
-	protected 	$tables = array ('guide_category', 'guide_category_lang');
+	protected $tables = array (
+	    'guide_category',
+    	'guide_category_lang',
+	);
 
-	protected 	$fieldsRequired = array('id_parent', 'active');
- 	protected 	$fieldsSize = array('id_parent' => 10, 'active' => 1);
- 	protected 	$fieldsValidate = array('active' => 'isBool', 'id_parent' => 'isUnsignedInt');
-	protected 	$fieldsRequiredLang = array('name', 'link_rewrite');
- 	protected 	$fieldsSizeLang = array(
- 		'name' => 64, 
- 		'link_rewrite' => 64, 
- 		'meta_title' => 128, 
- 		'meta_description' => 255, 
+	protected $fieldsRequired = array(
+        'id_parent',
+        'active'
+	);
+ 	protected $fieldsSize = array(
+ 	    'id_parent' => 10,
+ 	    'active' => 1
+ 	);
+ 	protected $fieldsValidate = array(
+ 	    'active' => 'isBool',
+ 	    'id_parent' => 'isUnsignedInt'
+ 	);
+	protected $fieldsRequiredLang = array(
+	    'name',
+        'link_rewrite'
+	);
+ 	protected $fieldsSizeLang = array(
+ 		'name' => 64,
+ 		'link_rewrite' => 64,
+ 		'meta_title' => 128,
+ 		'meta_description' => 255,
  		'meta_keywords' => 255
- 		);
+    );
  	protected 	$fieldsValidateLang = array(
- 		'name' => 'isCatalogName', 
- 		'link_rewrite' => 'isLinkRewrite', 
+ 		'name' => 'isCatalogName',
+ 		'link_rewrite' => 'isLinkRewrite',
  		'description' => 'isCleanHtml',
- 		'meta_title' => 'isGenericName', 
- 		'meta_description' => 'isGenericName', 
+ 		'meta_title' => 'isGenericName',
+ 		'meta_description' => 'isGenericName',
  		'meta_keywords' => 'isGenericName'
- 		);
+ 	);
 
  	private $error;
 
 	public function getFields()
 	{
 		parent::validateFields();
-		if (isset($this->id))
-			$fields['id_guide_category'] = (int)($this->id);
+		
+		if (isset($this->id)) {
+		    $fields['id_guide_category'] = (int)($this->id);
+		}
 		$fields['id_category_family'] = (int)($this->id_category_family);
 		$fields['active'] = (int)($this->active);
 		$fields['id_parent'] = (int)($this->id_parent);
 		$fields['position'] = (int)($this->position);
 		$fields['level_depth'] = (int)($this->level_depth);
+		
 		return $fields;
 	}
 
 	public static function getSubPath()
 	{
-		return 'modules/purchaseguide/img';
+		return 'img/purchaseguide';
 	}
 
 	public function getImageFilePath()
@@ -66,6 +84,7 @@ class GuideCategory extends ObjectModel
 		if ($this->id) {
 			return _PS_ROOT_DIR_.'/'.self::getSubPath().'/'.$this->id.'.jpg';
 		}
+		
 		return '';
 	}
 
@@ -74,10 +93,11 @@ class GuideCategory extends ObjectModel
 		if ($this->id) {
 			return __PS_BASE_URI__.self::getSubPath().'/'.$this->id.'.jpg';
 		}
+		
 		return '';
 	}
 
-	public static function findCategoriesTree($id_lang, $exclude_id=0)
+	public static function findCategoriesTree($id_lang, $levelMax = null, $exclude_id=0)
 	{
 		$sql = "SELECT DISTINCT a.`id_guide_category` as id_guide_category, `name`
 				FROM `"._DB_PREFIX_."guide_category` a
@@ -86,23 +106,20 @@ class GuideCategory extends ObjectModel
 				WHERE b.id_lang = '".intval($id_lang)."'
 				AND a.`id_parent` = '%s'
 				";
-		if ($exclude_id!='0') {
+		if ($exclude_id != '0') {
 			$sql .= " AND a.`id_guide_category` <> '".intval($exclude_id)."'";
 		}
 		$rows = array();
-		self::findRecursiveData(
-			$rows, 
-			$sql,
-			array(
-				'id_parent' => 0,
-				'identifier' => 'id_guide_category',
-				'level' => -1
-				)
-			);
+		self::findRecursiveData($rows, $sql, $levelMax, array(
+            'id_parent' => 0,
+            'identifier' => 'id_guide_category',
+            'level' => -1
+        ));
+		
 		return $rows;
 	}
 
-	public static function findFamiliesTree($id_lang, $exclude_id=0)
+	public static function findFamiliesTree($id_lang, $levelMax = null, $exclude_id=0)
 	{
 		$sql = "SELECT DISTINCT a.`id_category_family` as id_category_family, `name`
 				FROM `"._DB_PREFIX_."category_family` a
@@ -115,53 +132,46 @@ class GuideCategory extends ObjectModel
 			$sql .= " AND a.`id_category_family` <> '".intval($exclude_id)."'";
 		}
 		$rows = array();
-		self::findRecursiveData(
-			$rows, 
-			$sql,
-			array(
-				'id_parent' => 0,
-				'identifier' => 'id_category_family',
-				'level' => -1
-				)
-			);		
+		self::findRecursiveData($rows, $sql, $levelMax, array(
+            'id_parent' => 0,
+            'identifier' => 'id_category_family',
+            'level' => 0
+        ));
+		
 		return $rows;
 	}
 
-
-	private static function findRecursiveData(
-		&$rows, 
-		$sql,
-		array $params
-		)
+	private static function findRecursiveData(&$rows, $sql, $levelMax = null, array $params)
 	{
 		$level = $params['level'];
 		$level++;
+		if ($levelMax !== null && $level >= $levelMax) {
+		    return;
+		}
 
-		$resuts = Db::getInstance()->ExecuteS(sprintf($sql, intval($params['id_parent'])));
-		foreach($resuts as &$row) {
+		$results = Db::getInstance()->ExecuteS(sprintf($sql, intval($params['id_parent'])));
+		foreach($results as &$row) {
 			$row['level'] = $level;
 			$rows[] = $row;
-			self::findRecursiveData(
-				$rows, 
-				$sql,
-				array(
-					'id_parent' => $row[$params['identifier']],
-					'identifier' => $params['identifier'],
-					'level' => $level
-					)
-				);
+			self::findRecursiveData($rows, $sql, $levelMax, array(
+			    'id_parent' => $row[$params['identifier']],
+                'identifier' => $params['identifier'],
+                'level' => $level
+            ));
 		}
 	}
-
-	/////
-	  // Check then return multilingual fields for database interaction
-	  //
-	  // @return array Multilingual fields
-	  ///
+	
 	public function getTranslationsFieldsChild()
 	{
 		parent::validateFieldsLang();
-		return parent::getTranslationsFields(array('name', 'description', 'link_rewrite', 'meta_title', 'meta_keywords', 'meta_description'));
+		return parent::getTranslationsFields(array(
+		    'name',
+		    'description',
+		    'link_rewrite',
+		    'meta_title',
+		    'meta_keywords',
+		    'meta_description'
+		));
 	}
 
 	public	function add($autodate = true, $nullValues = false)
@@ -172,7 +182,7 @@ class GuideCategory extends ObjectModel
 
 	public	function update($autodate = true, $nullValues = false)
 	{
-		$this->position = self::cleanupPositions((int)$this->id_parent);
+		self::cleanupPositions((int)$this->id_parent);
 		return parent::update($autodate, $nullValues);
 	}
 	
@@ -180,13 +190,12 @@ class GuideCategory extends ObjectModel
 	{
 		if ($this->getNbSubCategories($this->id)) {
 			$this->error = 1;
-			return FALSE; 
+			return FALSE;
 		}
 
-
 		if ($this->getNbPosts($this->id)) {
 			$this->error = 2;
-			return FALSE; 
+			return false;
 		}
 
 		if (!parent::delete()) {
@@ -203,11 +212,11 @@ class GuideCategory extends ObjectModel
 	
 	public function deleteSelection($selection)
 	{
-		if (!is_array($selection) OR !Validate::isTableOrIdentifier($this->identifier) OR !Validate::isTableOrIdentifier($this->table))
-			die(Tools::displayError());
+		if (!is_array($selection) OR !Validate::isTableOrIdentifier($this->identifier) OR !Validate::isTableOrIdentifier($this->table)) {
+		    die(Tools::displayError());
+		}
 		$result = true;
-		foreach ($selection AS $id)
-		{
+		foreach ($selection AS $id) {
 			$this->id = (int)($id);
 			$result2 = $this->delete();
 			$result = $result && $this->delete();
@@ -221,28 +230,33 @@ class GuideCategory extends ObjectModel
 	}
 
 	public function updatePosition($way, $position)
-	{	
+	{
 		if (!$res = Db::getInstance()->ExecuteS('
-			SELECT cp.`id_guide_category`, cp.`position`, cp.`id_parent` 
+			SELECT cp.`id_guide_category`, cp.`position`, cp.`id_parent`
 			FROM `'._DB_PREFIX_.'guide_category` cp
-			WHERE cp.`id_parent` = '.(int)$this->id_parent.' 
+			WHERE cp.`id_parent` = '.(int)$this->id_parent.'
 			ORDER BY cp.`position` ASC'
-		))
-			return false;
+		)) {
+		    return false;
+		}
 		
-		foreach ($res AS $category)
-			if ((int)($category['id_guide_category']) == (int)($this->id))
-				$movedCategory = $category;
+		foreach ($res AS $category) {
+		    if ((int)($category['id_guide_category']) == (int)($this->id)) {
+		        $movedCategory = $category;
+		    }
+		}
+		
+		if (!isset($movedCategory) || !isset($position)) {
+		    return false;
+		}
 		
-		if (!isset($movedCategory) || !isset($position))
-			return false;
 		// < and > statements rather than BETWEEN operator
 		// since BETWEEN is treated differently according to databases
 		return (Db::getInstance()->Execute('
 			UPDATE `'._DB_PREFIX_.'guide_category`
 			SET `position`= `position` '.($way ? '- 1' : '+ 1').'
-			WHERE `position` 
-			'.($way 
+			WHERE `position`
+			'.($way
 				? '> '.(int)($movedCategory['position']).' AND `position` <= '.(int)($position)
 				: '< '.(int)($movedCategory['position']).' AND `position` >= '.(int)($position)).'
 			AND `id_parent`='.(int)($movedCategory['id_parent']))
@@ -252,14 +266,33 @@ class GuideCategory extends ObjectModel
 			WHERE `id_parent` = '.(int)($movedCategory['id_parent']).'
 			AND `id_guide_category`='.(int)($movedCategory['id_guide_category'])));
 	}
-
+	
+	private function cleanupPositions($id_parent)
+	{
+	    $result = Db::getInstance()->ExecuteS('
+		SELECT `id_guide_category`
+		FROM `'._DB_PREFIX_.'guide_category`
+		WHERE `id_parent` = '.(int)($id_parent).'
+		ORDER BY `position`');
+	    $position = 0;
+	    foreach ($result as $row) {
+	        $position++;
+	        $sql = '
+				UPDATE `'._DB_PREFIX_.'guide_category`
+				SET `position` = '.(int)($position).'
+				WHERE `id_parent` = '.(int)($id_parent).'
+				AND `id_guide_category` = '.(int)($row['id_guide_category']);
+	        Db::getInstance()->Execute($sql);
+	    }
+	    return true;
+	}
 
 	public static function getLastPosition($id_parent)
 	{
-		return (Db::getInstance()->getValue('SELECT MAX(position)+1 FROM `'._DB_PREFIX_.'guide_category` WHERE `id_parent` = '.(int)($id_parent)));
+		return (Db::getInstance()->getValue('SELECT MAX(position)+1 FROM `'._DB_PREFIX_.
+		    'guide_category` WHERE `id_parent` = '.(int)($id_parent)));
 	}
 
-
 	private function getNbSubCategories($id_guide_category)
 	{
 		$sql = 'SELECT COUNT(*)
@@ -268,35 +301,125 @@ class GuideCategory extends ObjectModel
 		return Db::getInstance()->getValue($sql);
 	}
 
-
 	private function getNbPosts($id_guide_category)
 	{
 		$sql = 'SELECT COUNT(*)
 				FROM `'._DB_PREFIX_.'guide_post`
 				WHERE `id_guide_category` = '.intval($id_guide_category);
-		return Db::getInstance()->getValue($sql);			
+		return Db::getInstance()->getValue($sql);
 	}
-
-
-	private function cleanupPositions($id_parent)
+	
+	public function findByCategoryFamily($id, $id_lang)
 	{
-		$sql = 'SELECT `id_guide_category`
-				FROM `'._DB_PREFIX_.'guide_category`
-				WHERE `id_parent` = '.intval($id_parent).'
-				ORDER BY `position` ASC';
-		$rows = Db::getInstance()->ExecuteS($sql);
-		
-		$position = 1;
-		foreach($rows as $row) {
-			$sql = 'UPDATE `'._DB_PREFIX_.'guide_category`
-				SET `position` = '.$position.'
-				WHERE `id_guide_category` = '.$row['id_guide_category'];
-			Db::getInstance()->Execute($sql);
-			$position++;
-		}
-		return $position;
+	    $sql = "SELECT gc.*, gcl.name FROM `"._DB_PREFIX_."guide_category` gc, `"._DB_PREFIX_."guide_category_lang` gcl
+            WHERE gc.id_guide_category=gcl.id_guide_category AND gcl.id_lang=".$id_lang.
+            " AND gc.id_category_family=".$id;
+	    $row = Db::getInstance()->getRow($sql);
+	    
+	    return $row;
+	}
+	
+	public function getLinkRewrite($id_lang)
+	{
+	    if ($this->id) {
+	        return $this->id.'-'.$this->link_rewrite[$id_lang];
+	    }
+	    
+	    return '';
+	}
+	
+	/**
+	 * Get Parent category
+	 * @param int $id_category
+	 * @param int $id_lang
+	 * @return array
+	 */
+	public function getCategoryLang($id_category, $id_lang)
+	{
+        $sql = "SELECT gc.*, gcl.name, gcl.link_rewrite
+            FROM `"._DB_PREFIX_."guide_category` gc, `"._DB_PREFIX_."guide_category_lang` gcl
+            WHERE gc.id_guide_category=gcl.id_guide_category AND gcl.id_lang=".$id_lang.
+            " AND gc.id_guide_category=".$id_category;
+	    $result = Db::getInstance()->getRow($sql);
+	    
+	    return $result;
+	}
+	
+	public function getAutoCategoryLang($id_category, $id_lang, $all = false)
+	{
+	    $sql = "SELECT * FROM ps_guide_category gc, ps_guide_category_lang gcl
+            WHERE ".($all===false?' gc.active=1 ':' 1 ')." AND gc.id_guide_category=gcl.id_guide_category
+            AND gc.id_parent=".$id_category." AND gcl.id_lang=".$id_lang.
+            " ORDER BY position ASC";
+	    $result = Db::getInstance()->getRow($sql);
+	    
+	    return $result;
+	}
+	
+	/**
+	 * Gest All main categories
+	 * @param int $id_lang
+	 * @param boolean $all
+	 * @return array
+	 */
+	public static function getRoot($id_lang, $all = false)
+	{
+	    $sql = "SELECT gc.id_guide_category, gcl.name, gcl.link_rewrite, gcl.meta_title,
+                gcl.meta_description, gcl.meta_keywords
+            FROM ps_guide_category gc, ps_guide_category_lang gcl
+            WHERE ".($all===false?' gc.active=1 ':' 1 ')." AND gc.id_guide_category=gcl.id_guide_category
+                AND gc.id_parent=0 AND gcl.id_lang=".$id_lang;
+	    $result = Db::getInstance()->ExecuteS($sql);
+	    
+	    return $result;
 	}
 
+	/**
+	 * Get category with children
+	 * @param int $id_lang
+	 * @param int $active
+	 * @return array
+	 */
+	public function getTree($id_lang, $all = false)
+	{
+        return $this->recurseData(0, $id_lang, $all);
+	}
+
+	/**
+	 * Recurse data
+	 * @param int $id_category
+	 * @param int $id_lang
+	 * @param boolean $all
+	 * @return array
+	 */
+	protected function recurseData($id_category, $id_lang, $all = false)
+	{
+        $data = array();
+	    $sql = "SELECT gc.*, gcl.name, gcl.link_rewrite
+            FROM `"._DB_PREFIX_."guide_category` gc, `"._DB_PREFIX_."guide_category_lang` gcl
+            WHERE gc.id_guide_category=gcl.id_guide_category AND gcl.id_lang=".$id_lang.
+            ($all===false?' AND gc.active=1':'')." AND gc.id_parent=".$id_category.
+	       " ORDER BY position ASC";
+	    $result = Db::getInstance()->ExecuteS($sql);
+	    if (count($result) > 0) {
+	        foreach ($result as $c) {
+	            $rewrite = 'guide/';
+	            if ($c['id_parent'] != 0) {
+	                $parent = $this->getCategoryLang($c['id_parent'], $id_lang);
+	                $rewrite.= $parent['link_rewrite'].'/';
+	            }
+	            $rewrite.= $c['id_guide_category'].'-'.$c['link_rewrite'];
+	            
+	            $item = array(
+	                'id_guide_category' => $c['id_guide_category'],
+	                'name' => $c['name'],
+	                'rewrite' => $rewrite,
+	                'children' => $this->recurseData($c['id_guide_category'], $id_lang),
+	            );
+	            $data[] = $item;
+	        }
+	    }
+
+	    return $data;
+	}
 }
-
-

modules/purchaseguide/classes/GuidePost.php

@@ -1,5 +1,4 @@
 <?php
-
 class GuidePost extends ObjectModel
 {
 	public $id;
@@ -13,27 +12,49 @@ class GuidePost extends ObjectModel
 	public $content;
 	public $link_rewrite;
 
- 	protected $fieldsValidate = array('id_guide_category' => 'isUnsignedInt');
-	protected $fieldsRequiredLang = array('meta_title', 'link_rewrite');
-	protected $fieldsSizeLang = array('meta_description' => 255, 'meta_keywords' => 255, 'meta_title' => 128, 'link_rewrite' => 128, 'content' => 3999999999999);
-	protected $fieldsValidateLang = array('meta_description' => 'isGenericName', 'meta_keywords' => 'isGenericName', 'meta_title' => 'isGenericName', 'link_rewrite' => 'isLinkRewrite', 'content' => 'isString');
+ 	protected $fieldsValidate = array(
+ 	    'id_guide_category' => 'isUnsignedInt'
+ 	);
+ 	
+	protected $fieldsRequiredLang = array(
+	    'meta_title',
+	    'link_rewrite',
+	);
+	
+	protected $fieldsSizeLang = array(
+	    'meta_description' => 255,
+	    'meta_keywords' => 255,
+	    'meta_title' => 128,
+	    'link_rewrite' => 128,
+	    'content' => 3999999999999,
+	);
+	
+	protected $fieldsValidateLang = array(
+	    'meta_description' => 'isGenericName',
+	    'meta_keywords' => 'isGenericName',
+	    'meta_title' => 'isGenericName',
+	    'link_rewrite' => 'isLinkRewrite',
+	    'content' => 'isString',
+	);
 
 	protected $table = 'guide_post';
 	protected $identifier = 'id_guide_post';
 	
-	protected	$webserviceParameters = array(
+	protected $webserviceParameters = array(
 		'objectNodeName' => 'content',
 		'objectsNodeName' => 'content_management_system',
 	);
 	
-	public function getFields() 
-	{ 
+	public function getFields()
+	{
 		parent::validateFields();
+		
 		$fields['id_guide_post'] = (int)($this->id);
 		$fields['id_guide_category'] = (int)($this->id_guide_category);
 		$fields['position'] = (int)($this->position);
 		$fields['active'] = (int)($this->active);
-		return $fields;	 
+		
+		return $fields;
 	}
 	
 	public function getTranslationsFieldsChild()
@@ -67,9 +88,9 @@ class GuidePost extends ObjectModel
 	public function updatePosition($way, $position)
 	{
 		if (!$res = Db::getInstance()->ExecuteS('
-			SELECT cp.`id_guide_post`, cp.`position`, cp.`id_guide_category` 
+			SELECT cp.`id_guide_post`, cp.`position`, cp.`id_guide_category`
 			FROM `'._DB_PREFIX_.'guide_post` cp
-			WHERE cp.`id_guide_category` = '.(int)$this->id_guide_category.' 
+			WHERE cp.`id_guide_category` = '.(int)$this->id_guide_category.'
 			ORDER BY cp.`position` ASC'
 		))
 			return false;
@@ -86,8 +107,8 @@ class GuidePost extends ObjectModel
 		return (Db::getInstance()->Execute('
 			UPDATE `'._DB_PREFIX_.'guide_post`
 			SET `position`= `position` '.($way ? '- 1' : '+ 1').'
-			WHERE `position` 
-			'.($way 
+			WHERE `position`
+			'.($way
 				? '> '.(int)($movedPost['position']).' AND `position` <= '.(int)($position)
 				: '< '.(int)($movedPost['position']).' AND `position` >= '.(int)($position)).'
 			AND `id_guide_category`='.(int)($movedPost['id_guide_category']))
@@ -106,7 +127,7 @@ class GuidePost extends ObjectModel
 
 	public	function update($autodate = true, $nullValues = false)
 	{
-		$this->position = self::cleanupPositions((int)$this->id_guide_category);
+		self::cleanupPositions((int)$this->id_guide_category);
 		return parent::update($autodate, $nullValues);
 	}
 
@@ -145,5 +166,72 @@ class GuidePost extends ObjectModel
 		}
 		return $position;
 	}
+	
+	public function getLinkRewrite()
+	{
+	    if ($this->id) {
+	        return $this->id.'-'.$this->link_rewrite[2];
+	    }
+	    
+	    return '';
+	}
+	
+
+	public function getUrlRewriteFull(){}
+	
+	/**
+	 * Get Post with one language
+	 * @param int $id_category
+	 * @param int $id_lang
+	 * @param boolean $all
+	 * @return array
+	 */
+	public function getPostLang($id_post, $id_lang, $id_category = null, $all = false)
+	{
+	    $sql = "SELECT * FROM ps_guide_post gp, ps_guide_post_lang gpl
+                WHERE ".($all===false?' gp.active=1 ':' 1 ')." AND gp.id_guide_post=gpl.id_guide_post
+                ".($id_category===null?"":" AND gp.id_guide_category=".$id_category).
+                " AND gp.id_guide_post=".$id_post." AND gpl.id_lang=".$id_lang;
+        $result = Db::getInstance()->getRow($sql);
+	    
+	    return $result;
+	}
+	
+	/**
+	 * Auto select post
+	 * @param int $id_category
+	 * @param int $id_lang
+	 * @param boolean $all
+	 * @return array
+	 */
+	public function getAutoPostLang($id_category, $id_lang, $all = false)
+	{
+	    $sql = "SELECT * FROM ps_guide_post gp, ps_guide_post_lang gpl
+            WHERE ".($all===false?' gp.active=1 ':' 1 ')." AND gp.id_guide_post=gpl.id_guide_post
+            AND gp.id_guide_category=".$id_category.
+            " AND gpl.id_lang=".$id_lang." ORDER BY position ASC";
+	    $result = Db::getInstance()->getRow($sql);
+	    
+	    return $result;
+	}
+	
+	/**
+	 * Find posts filter by category
+	 * @param int $id_category
+	 * @param int $id_lang
+	 * @param boolean $active
+	 * @return array
+	 */
+	public function findByCategory($id_category, $id_lang, $all = false)
+	{
+	    $sql = "SELECT * FROM ps_guide_post gp, ps_guide_post_lang gpl
+            WHERE ".($all===false?' gp.active=1 ':' 1 ')." AND gp.id_guide_post=gpl.id_guide_post
+                AND gp.id_guide_category=".$id_category.
+                " AND gpl.id_lang=".$id_lang." ORDER BY position ASC";
+	    $result = Db::getInstance()->ExecuteS($sql);
+	    
+	    return $result;
+	}
+	
 }
 

modules/purchaseguide/controllers/front/CategoryController.php

@@ -0,0 +1,48 @@
+<?php
+require_once(__DIR__.'/../../classes/GuideCategory.php');
+
+class CategoryController extends FrontController
+{
+    public function preProcess()
+    {
+        parent::preProcess();
+        
+        $id_lang = self::$cookie->id_lang;
+        $isEmployee = self::$cookie->isLoggedBack();
+        $categories = array();
+        
+        // Get main categories
+        $catResult = GuideCategory::getRoot($id_lang);
+        if (count($catResult) > 0) {
+            foreach ($catResult as $c) {
+                $categories[] = $c;
+            }
+        }
+
+        self::$smarty->assign(array(
+            'path' => 'Guide',
+            'categories' => $categories,
+        ));
+        
+        $metaTags = Tools::completeMetaTags(array(
+            'meta_description' => "Guide d'achat",
+            'meta_keywords' => "Guide d'achat",
+        ), "Guide d'achat");
+        self::$smarty->assign($metaTags);
+    }
+    
+    // displayContent
+    public function displayContent()
+    {
+        parent::displayContent();
+        
+        if (is_file(_PS_THEME_DIR_ . 'modules/purchaseguide/views/front/category.tpl')) {
+            $tplFile = _PS_THEME_DIR_ . 'modules/purchaseguide/views/front/category.tpl';
+        }
+        else {
+            $tplFile =  _PS_MODULE_DIR_ . 'purchaseguide/views/templates/front/category.tpl';
+        }
+        
+        self::$smarty->display($tplFile);
+    }
+}

modules/purchaseguide/controllers/front/PostController.php

@@ -0,0 +1,135 @@
+<?php
+require_once(__DIR__.'/../../classes/GuideCategory.php');
+require_once(__DIR__.'/../../classes/GuidePost.php');
+
+class PostController extends FrontController
+{
+    public function canonicalRedirection() {}
+    
+    public function preProcess()
+    {
+        parent::preProcess();
+        
+        $id_lang = self::$cookie->id_lang;
+        
+        $id_category = Tools::getValue('cid', 0);
+        $id_post = Tools::getValue('pid', 0);
+        $content = null;
+        
+        global $cookie;
+        $isEmployee = $cookie->isLoggedBack();
+        
+        // Start form post
+        $postModel = new GuidePost();
+        if ($id_post != 0) {
+            $content = $postModel->getPostLang($id_post, $id_lang, null, $isEmployee);
+            $id_category = $content['id_guide_category'];
+        }
+        
+        // Categories
+        if ($id_category == 0) {
+            Tools::display404Error('404.php');
+        }
+        else {
+            // Category
+            $categoryModel = new GuideCategory();
+            $category = $categoryModel->getCategoryLang($id_category, $id_lang);
+            
+            // Get Parent category
+            $isSubCategory = false;
+            if ($category['id_parent'] != 0) {
+                $isSubCategory = true;
+            }
+            
+            if ($isSubCategory) {
+                // Get Parent category
+                $parentCategory = $categoryModel->getCategoryLang($category['id_parent'], $id_lang);
+            }
+            else {
+                $parentCategory = $category;
+                // Auto Select category
+                $category = $categoryModel->getAutoCategoryLang($id_category, $id_lang, $isEmployee);
+            }
+        }
+        
+        // Post
+        if ($content === null) {
+            if ($id_post != 0) {
+                $content = $postModel->getPostLang($id_post, $id_lang, $category['id_guide_category'], $isEmployee);
+            }
+            // Auto Select Post
+            else {
+                $content = $postModel->getAutoPostLang($category['id_guide_category'], $id_lang, $isEmployee);
+            }
+        }
+        
+        // Liste des Posts
+        $postList = $postModel->findByCategory($category['id_guide_category'], $id_lang, $isEmployee);
+        
+        $parentCategoryModel = new GuideCategory($parentCategory['id_guide_category']);
+        $parentCategoryLink = $parentCategoryModel->getLinkRewrite($id_lang);
+
+        $categoryModel = new GuideCategory($category['id_guide_category']);
+        $categoryLink = $categoryModel->getLinkRewrite($id_lang);
+        
+        $pipe = " > ";
+        
+        $path = '<a href="'.Tools::getShopDomainSsl(true).'/guide">Guide</a>';
+        
+        if ($parentCategoryModel !== null) {
+            $path.= '<span class="navigation-pipe">'.$pipe.'</span>'.
+                '<a href="'.Tools::getShopDomainSsl(true).'/guide/'.$parentCategoryLink.'">'
+                .htmlentities($parentCategoryModel->name[$id_lang], ENT_NOQUOTES, 'UTF-8').'</a>';
+        }
+        
+        if ($categoryModel !== null) {
+            $path.= '<span class="navigation-pipe">'.$pipe.'</span>'.
+                '<a href="'.Tools::getShopDomainSsl(true).'/guide/'.$parentCategoryModel->link_rewrite[$id_lang].'/'.$categoryLink.'">'.
+                htmlentities($categoryModel->name[$id_lang], ENT_NOQUOTES, 'UTF-8').'</a>';
+                
+            $path.= '<span class="navigation-pipe">'.$pipe.'</span>'.
+                '<span>'.$content['meta_title'].'</span>';
+        }
+        
+        self::$smarty->assign(array(
+            'path' => $path,
+            'id_category' => $parentCategory['id'],
+            'categoryTitle' => $parentCategory['name'],
+            'categoryLink' => $parentCategoryLink,
+            'categoryRewrite' => $parentCategory['link_rewrite'],
+            
+            'subcategoryTitle' => $category['name'],
+            'subcategoryContent' => $category['description'],
+            'subcategoryImg' => $categoryModel->getImageFileUrl(),
+            'subcategoryLink' => $categoryLink,
+            'subcategoryRewrite' => $category['link_rewrite'],
+            
+            'postList' => $postList,
+            'postTitle' => $content['meta_title'],
+            'postContent' => $content['content'],
+            'postLink' => '',
+            
+            'id_guide_post_select' => $content['id_guide_post'],
+        ));
+        
+        $metaTags = Tools::completeMetaTags(array(
+            'meta_description' => $content['meta_description'],
+            'meta_keywords' => $content['meta_keywords'],
+        ), $content['meta_title']);
+        self::$smarty->assign($metaTags);
+    }
+    
+    public function displayContent()
+    {
+        parent::displayContent();
+        
+        if (is_file(_PS_THEME_DIR_ . 'modules/purchaseguide/views/front/content.tpl')) {
+            $tplFile = _PS_THEME_DIR_ . 'modules/purchaseguide/views/front/content.tpl';
+        }
+        else {
+            $tplFile =  _PS_MODULE_DIR_ . 'purchaseguide/views/templates/front/content.tpl';
+        }
+        
+        self::$smarty->display($tplFile);
+    }
+}

modules/purchaseguide/post.php

@@ -0,0 +1,6 @@
+<?php
+require_once dirname(__FILE__).'/../../config/config.inc.php';
+require_once dirname(__FILE__).'/controllers/front/PostController.php';
+
+$controller = new PostController();
+$controller->run();

modules/purchaseguide/purchaseguide.php

@@ -1,12 +1,14 @@
 <?php
-if (!defined('_PS_VERSION_'))
-  exit;
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
 
 require_once(__DIR__.'/classes/GuideCategory.php');
 
-class PurchaseGuide extends Module 
+class PurchaseGuide extends Module
 {
-	public function __construct() {
+	public function __construct()
+	{
 		$this->name = 'purchaseguide';
 		$this->tab = 'front_office_features';
 		$this->author = 'Antadis';
@@ -18,22 +20,24 @@ class PurchaseGuide extends Module
 	}
 
 
-	public function install() 
+	public function install()
 	{
 		if(!parent::install()
 			|| !$this->installTabs()
 			|| !$this->createTables()
 			|| !$this->installImageAddon()
-			) {
-			$this->uninstall();
-			return FALSE;
+        ) {
+			return false;
 		}
 
-		return TRUE;
+		$this->registerHook('leftColumn');
+		$this->registerHook('TopMenuLink');
+		
+		return true;
 	}
 
 
-	public function uninstall() 
+	public function uninstall()
 	{
 		$this->uninstallTabs();
 		$this->dropTables();
@@ -239,4 +243,71 @@ class PurchaseGuide extends Module
 		');
 	}
 
+	public function hookTopMenuLink($params)
+	{
+	    global $cookie, $smarty;
+	    
+	    $id_category_family = $params['id_category_family'];
+	    $rewrite = '';
+	    
+	    $loadedCategory = GuideCategory::findByCategoryFamily($id_category_family, $cookie->id_lang);
+	    if (!empty($loadedCategory)) {
+	        $link_rewrite = '';
+	        $category = new GuideCategory($loadedCategory['id_guide_category']);
+	        $rewrite = 'guide/'.$category->getLinkRewrite($cookie->id_lang);
+	    }
+
+        $smarty->assign(array(
+            'link_rewrite' => $rewrite,
+        ));
+	    
+	    return $this->display(dirname(__FILE__), '/views/templates/hook/topmenulink.tpl');
+	}
+	
+	public function hookLeftColumn($params)
+	{
+	    global $cookie, $smarty, $site_version, $page_name;
+	    
+	    if (!in_array($page_name, array('module-purchaseguide-rubrique', 'rubrique',
+	        'module-purchaseguide-post', 'post'))) {
+	        return false;
+	    }
+	    
+	    $isEmployee = $cookie->isLoggedBack();
+	    $id_category = Tools::getValue('cid', 0);
+	    $id_post = Tools::getValue('pid', 0);
+	    $content = null;
+	    
+        // Get from post
+	    if ($id_post != 0) {
+	        $postModel = new GuidePost($id_post);
+	        $id_category = $postModel->id_guide_category;
+	    }
+    
+	    if($id_category == 0) {
+	        $model = new GuideCategory();
+	        $id_main_category = $id_child_category = 0;
+	    }
+	    else {
+	        // Get selected categories
+	        $model = new GuideCategory($id_category);
+	        if ($model->id_parent == 0) {
+	            $id_main_category = $id_category;
+	            $id_child_category = 0;
+	        } else {
+	            $mainCategory = $model->getCategoryLang($model->id_parent, $cookie->id_lang);
+	            $id_main_category = $mainCategory['id_guide_category'];
+	            $id_child_category = $id_category;
+	        }
+	    }
+        $tree = $model->getTree($cookie->id_lang, $isEmployee);
+        
+        $smarty->assign(array(
+            'id_guide_category_select_main' => $id_main_category,
+            'id_guide_category_select_child' => $id_child_category,
+            'menu' => $tree,
+        ));
+        
+	    return $this->display(__FILE__, '/views/templates/hook/leftcolumn.tpl');
+	}
 }

modules/purchaseguide/rubrique.php

@@ -0,0 +1,6 @@
+<?php
+require_once dirname(__FILE__).'/../../config/config.inc.php';
+require_once dirname(__FILE__).'/controllers/front/CategoryController.php';
+
+$controller = new CategoryController();
+$controller->run();

modules/purchaseguide/views/templates/admin/form/file.tpl

@@ -19,7 +19,7 @@
 					{/if}
 
 					{if $input.max_size}
-					File size'} : 
+					{l s='File size'} : 
 					{$input.max_size} {l s='max'}.
 					{/if}
 					</p>

modules/purchaseguide/views/templates/admin/home_adminguide.tpl

@@ -3,7 +3,7 @@
 			<fieldset>
 				<legend><img src="../img/admin/tab-tools.gif" alt="" />{l s='URL Rewriting settings'}</legend>
 
-				<p>{l s='Add the following text to the custom rewriting rules (Tools &gt; Generators'} :</p>
+				<p>{l s='Add the following text to the custom rewriting rules (Tools > Generators)'} :</p>
 				<p> </p>
 				<textarea style="width: 850px; height: 120px;" readonly="true">{$rewrite_rules}</textarea>
 			</fieldset>

modules/purchaseguide/views/templates/admin/index.php

@@ -24,13 +24,13 @@
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
-                        
+				    	
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
 header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-                        
+						
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
-                        
+						
 header("Location: ../");
 exit;

modules/purchaseguide/views/templates/front/category.tpl

@@ -0,0 +1,17 @@
+{include file="$tpl_dir./breadcrumb.tpl"}
+
+<h1>Guide d'achat</h1>
+<div class="rte{if $content_only} content_only{/if}">
+
+<div class="row">
+	{foreach from=$categories item=c}
+	<div class="guide-content-category">
+		<a href="guide/{$c.id_guide_category}-{$c.link_rewrite}">
+			<img alt="{if $c.meta_title==''}{$c.name}{else}{$c.meta_title}{/if}" src="./img/purchaseguide/{$c.id_guide_category}.jpg">
+			<div class="guide-content-category-title"><h4>{$c.name}</h4></div>
+		</a>
+	</div>
+	{/foreach}
+</div>
+
+</div>

modules/purchaseguide/views/templates/front/content.tpl

@@ -0,0 +1,38 @@
+{include file="$tpl_dir./breadcrumb.tpl"}
+
+<h1>Guide d'achat - {$categoryTitle}</h1>
+<div class="content-guide rte{if $content_only} content_only{/if}">
+
+{if $subcategoryTitle !== null}
+<div class="guide-intro">
+	<div class="guide-intro-left">
+		<h2>{$subcategoryTitle}</h2>
+		<div>
+			<p>{$subcategoryContent}</p>
+		</div>
+	</div>
+	<div class="guide-intro-right">
+		<img alt="" src="{$subcategoryImg}"/>
+	</div>
+</div>
+
+<div class="guide-content">
+<div class="guide-content-menu">
+<ul>
+{foreach from=$postList item=p}
+<li{if $p.id_guide_post==$id_guide_post_select} class="selected"{/if}>
+	<a href="{$base_dir_ssl}guide/{$categoryRewrite}/{$subcategoryRewrite}/{$p.id_guide_post}-{$p.link_rewrite}">{$p.meta_title}</a>
+</li>
+{/foreach}
+</ul>
+</div>
+
+<div class="guide-content-txt">
+<h3 class="title">{$postTitle}</h3>
+<p>{$postContent}</p>
+</div>
+
+</div>
+{/if}
+
+</div>

modules/purchaseguide/views/templates/front/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 7233 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/purchaseguide/views/templates/hook/leftcolumn.tpl

@@ -0,0 +1,26 @@
+<div class="block-guide">
+<h4>Guide d'achat</h4>
+{foreach from=$menu item=c}
+	<h5><a{if $c.id_guide_category==$id_guide_category_select_main} class="selected"{/if} href="{$base_dir_ssl}{$c.rewrite}">
+		{$c.name}</a></h5>
+	{if $c.children|@count > 0}
+		<ul class="block_content">
+		{foreach from=$c.children item=children name=loopChild}
+			{assign var="class" value=""}
+			{if $id_guide_category_select_child==0 
+				&& $c.id_guide_category==$id_guide_category_select_main 
+				&& $smarty.foreach.loopChild.first}
+				{assign var="class" value="selected"}
+			{/if}
+			{if $children.id_guide_category==$id_guide_category_select_child}
+				{assign var="class" value="selected"}
+			{/if}			
+			<li class="{$class}">
+				<a href="{$base_dir_ssl}{$children.rewrite}"{if $children.meta_title!=''} alt="{$children.meta_title}"{/if}>
+				{$children.name}</a>
+			</li>
+		{/foreach}
+		</ul>
+	{/if}
+{/foreach}
+</div>

modules/purchaseguide/views/templates/hook/topmenulink.tpl

@@ -0,0 +1,4 @@
+{if $link_rewrite != ''}
+<span>Besoin d'aide ?</span><br/>
+<span>Consultez notre <a href="{$base_dir_ssl}{$link_rewrite}">Guide d'achat</a></span>
+{/if}

modules/purchaseguide/views/templates/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 7233 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

override/classes/FrontController.php

@@ -422,6 +422,8 @@ class FrontController extends FrontControllerCore
 			'module-ant_support_form-support',
 			'module-paypal-express_checkout-payment',
 			'module-paymentinfo-manage',
+		    'module-purchaseguide-category', 'rubrique',
+		    'module-purchaseguide-post', 'post',
 		);
 
 		$displayRight = array(

override/classes/Helper.php

@@ -55,14 +55,14 @@ class Helper extends HelperCore {
 		';
 
 		$html .= '
-		<div style="background-color:#F4E6C9; width:99%;padding:5px 0 5px 5px;">
-			<a href="#" id="collapse_all" >'.$trads['Collapse All'].'</a>
-			 - <a href="#" id="expand_all" >'.$trads['Expand All'].'</a>
+		<div class="categories-treeview" style="background-color:#F4E6C9; width:99%;padding:10px;">
+			<a href="#" id="collapse_all" class="button">'.$trads['Collapse All'].'</a>
+			 - <a href="#" id="expand_all" class="button">'.$trads['Expand All'].'</a>
 			'.(!$use_radio ? '
-			 - <a href="#" id="check_all" >'.$trads['Check All'].'</a>
-			 - <a href="#" id="uncheck_all" >'.$trads['Uncheck All'].'</a>
+			 - <a href="#" id="check_all" class="button">'.$trads['Check All'].'</a>
+			 - <a href="#" id="uncheck_all" class="button">'.$trads['Uncheck All'].'</a>
 			' : '').'
-			 - <a id="toggle_display" style="cursor: pointer;" >'.$trads['Toggle'].'</a>
+			 - <img src="../img/admin/details.gif"/> <a id="toggle_display" style="cursor: pointer;" >'.$trads['Toggle'].'</a>
 		</div>
 		';
 

override/classes/ProductSale.php

@@ -150,7 +150,6 @@ class ProductSale extends ProductSaleCore
 		}
 	}
 
-
 	public static function getFamilyBestSales($id_category_family, $id_lang, $nb_products_max = 3, $filter_price=0, $exclude_id_product)
 	{
 		if ($nb_products_max < 1) {

override/controllers/OrderConfirmationController.php

@@ -15,12 +15,12 @@ class OrderConfirmationController extends OrderConfirmationControllerCore
 		foreach ($products as $product) {
 			$productIds[] = (int) $product['product_id'];
 		}
-		
+
 		self::$smarty->assign(array(
 			'order' => $order,
 			'productIds' => $productIds,
 		    'currency' => Currency::getCurrency((int) $order->id_currency),
-		));
+        ));
 	}
 
 	public function displayContent()

themes/site/authentication.tpl

@@ -332,17 +332,17 @@ $(function(){ldelim}
 		</p>*}
 		<p class="required text">
 			<label for="customer_firstname">{l s='First name'}</label>
-			<input onkeyup="$('#firstname').val(this.value);" type="text" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.request.customer_firstname)}{$smarty.request.customer_firstname}{/if}" />
+			<input onkeyup="$('#firstname').val(this.value);" type="text" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.request.customer_firstname)}{$smarty.request.customer_firstname|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 			<sup>*</sup>
 		</p>
 		<p class="required text">
 			<label for="customer_lastname">{l s='Last name'}</label>
-			<input onkeyup="$('#lastname').val(this.value);" type="text" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.request.customer_lastname)}{$smarty.request.customer_lastname}{/if}" />
+			<input onkeyup="$('#lastname').val(this.value);" type="text" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.request.customer_lastname)}{$smarty.request.customer_lastname|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 			<sup>*</sup>
 		</p>
 		<p class="required text">
 			<label for="email">{l s='E-mail'}</label>
-			<input type="text" class="text" id="email" name="email" value="{if isset($smarty.request.email)}{$smarty.request.email}{/if}" />
+			<input type="text" class="text" id="email" name="email" value="{if isset($smarty.request.email)}{$smarty.request.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 			<sup>*</sup>
 		</p>
 		<p class="required password">
@@ -393,13 +393,20 @@ $(function(){ldelim}
 
 		<p class="required text">
 			<label for="dni">{l s='Identification number'}</label>
-			<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
+			<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 			<span class="form_info">{l s='DNI / NIF / NIE'}</span>
 			<sup>*</sup>
 		</p>
 	</fieldset>
 	{$HOOK_CREATE_ACCOUNT_FORM}
-	
+    {*MODULE invite / landingpage / referalprogram *}
+    <fieldset class="account_creation" {if isset($sponsor_email)} style="display:none;" {/if}>
+        <p>
+            <label for="referralprogram">{l s='E-mail address of your sponsor' mod='invite'}</label>
+            <input type="text" size="52" maxlength="128" class="text" id="referralprogram" name="invite" value="{if isset($sponsor_email)}{$sponsor_email|escape:'htmlall':'UTF-8'}{elseif isset($smarty.post.invite)}{$smarty.post.invite|escape:'htmlall':'UTF-8'}{elseif isset($referralprogram)}{$referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
+        </p>
+    </fieldset>
+    {*END MODULE invite / landingpage / referalprogram *}
 	<script type="text/javascript">
 		/* ANTADIS */
 		var input = document.getElementById("referralprogram");	

themes/site/css/style.css

@@ -1863,7 +1863,7 @@ body#page-404 .footer_links {
 /** SUBMENU **/
 .container_submenu {
   border-top: 4px solid #70bc2c;
-  height: 380px;
+  height: 400px;
   left: 0;
   position: absolute;
   overflow: hidden;
@@ -7576,7 +7576,6 @@ div.addresses ul.address.item {
 .ant_support {
   padding:0px!important;
 }
-
 #sensefuel {
   display: inline-block;
   vertical-align: top;
@@ -7623,4 +7622,132 @@ div.addresses ul.address.item {
   height: 30px;
   width: 100%; 
 }
+.container_submenu .content_footer {
+  display: block;
+  width: 100%;  
+  margin: 0 auto;
+  position: absolute;
+  bottom: 0;  
+  background-color: #fff;
+  padding:15px 0;
+  color: #666666;
+  font-size: 14px;
+  font-weight: bold;
+}
+.container_submenu .content_footer a,
+.container_submenu .content_footer a:hover,
+.container_submenu .content_footer a:visited {
+  color: #ec15ac;
+}
+.block-guide {
+  margin-bottom: 20px;
+  background: #f6f6f6;
+  background: #fff;
+  padding: 10px 20px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  background: #fff;
+  -moz-box-shadow: 2px 2px 5px #cccccc;
+  -webkit-box-shadow: 2px 2px 5px #CCC;
+  -ms-box-shadow: 2px 2px 5px #cccccc;
+  -o-box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px #ccc;
+  color: #1e1633;
+}
+.block-guide ul {
+  margin: 0px;
+  list-style: none outside;
+  margin-left: 5px; 
+}
+.block-guide h5 {
+  margin-top: 10px;
+}
+.block-guide h5 a {
+  font-style: normal;
+  font-weight: bold;
+  font-size: 14px;
+  line-height: 1.5em;
+  color: #000;
+}
+.block-guide h5 a.selected {
+  color: #796dc7;
+}
 
+.block-guide ul li a {
+  color: #000;
+}
+.block-guide ul li.selected a {
+  color: #796dc7;	
+}
+.guide-intro {}
+.guide-intro-left {
+  width: 430px;
+  float: left;
+  color: #1e1633;
+  background: #fff;
+  font-size: 26px;
+  text-transform: none;
+  line-height: 1.5em;
+  font-weight: normal;
+  text-align: left;
+  margin: 0px 5px 20px 0px;
+  min-height: 180px;
+  padding: 10px 0px 0px 20px;
+  -moz-box-shadow: 2px 2px 5px #cccccc;
+  -webkit-box-shadow: 2px 2px 5px #cccccc;
+  -ms-box-shadow: 2px 2px 5px #cccccc;
+  -o-box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px #cccccc;
+}
+.guide-intro-right {}
+.guide-content {
+  clear: both;
+}
+.guide-content-menu {
+  width: 160px;
+  float: left;
+  background: #fff;
+  font-size: 26px;
+  text-transform: none;
+  line-height: 1.5em;
+  font-weight: normal;
+  text-align: left;
+  margin: 0px 5px 0px 0px;
+  padding: 10px 0px 10px 0px;
+  -moz-box-shadow: 2px 2px 5px #cccccc;
+  -webkit-box-shadow: 2px 2px 5px #cccccc;
+  -ms-box-shadow: 2px 2px 5px #cccccc;
+  -o-box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px #cccccc;
+}
+.guide-content-category {
+  width:50%;
+  float:left;
+  text-align:center;
+}
+.guide-content-category-title {
+  clear:both;  
+}
+.guide-content-category-title h4 {
+  text-transform: uppercase;
+  font-style: normal;
+  font-weight: bold; 
+}	
+.guide-content ul {
+  margin: 0px;
+  list-style: none outside;
+}
+.guide-content ul li a,
+.guide-content ul li a:visited {
+  color: #000;
+}
+.guide-content ul li.selected a {
+  font-weight: bold;
+  color: #796dc7;
+}
+.guide-content-txt {
+  width:580px;
+  float: right;
+  padding: 0 5px;
+}

themes/site/header.tpl

@@ -27,416 +27,449 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://ogp.me/ns/fb#" xml:lang="{$lang_iso}">
     <head>
-        <title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
-{if isset($meta_description) AND $meta_description}
-        <meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
-{/if}
-{if isset($meta_keywords) AND $meta_keywords}
-        <meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
-{/if}
-{if isset($meta_fb_img) AND $meta_fb_img}
-        <meta property="og:image" content="{$meta_fb_img|escape:html:'UTF-8'}" />
-{/if}
-        <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
-        <meta name="robots" content="{if isset($nobots)}no{/if}index,follow" />
-        <link rel="icon" type="image/png" href="{$img_ps_dir}preview.png?{$img_update_time}" />
-        <link rel="icon" type="image/vnd.microsoft.icon" href="{$img_ps_dir}favicon.ico?{$img_update_time}" />
-        <link rel="shortcut icon" type="image/x-icon" href="{$img_ps_dir}favicon.ico?{$img_update_time}" />
-        {if isset($page_name) && $page_name == 'authentication'}
-        <link rel="canonical" href="{$link->getPageLink('authentication.php', TRUE)}" />
-        {/if}
-        <script type="text/javascript">
-            var baseDirSsl = '{$base_dir_ssl}';
-            var baseDir = '{$content_dir}';
-            var static_token = '{$static_token}';
-            var token = '{$token}';
-            var priceDisplayPrecision = {$priceDisplayPrecision*$currency->decimals};
-            var priceDisplayMethod = {$priceDisplay};
-            var roundMode = {$roundMode};
-            var isoLang = "{$lang_iso}";
-        </script>
-{if isset($css_files)}
+    <title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
+	{if isset($meta_description) AND $meta_description}
+    <meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
+	{/if}
+	{if isset($meta_keywords) AND $meta_keywords}
+    <meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
+	{/if}
+	{if isset($meta_fb_img) AND $meta_fb_img}
+    <meta property="og:image" content="{$meta_fb_img|escape:html:'UTF-8'}" />
+	{/if}
+	
+    <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
+    <meta name="robots" content="{if isset($nobots)}no{/if}index,follow" />
+    <link rel="icon" type="image/png" href="{$img_ps_dir}preview.png?{$img_update_time}" />
+    <link rel="icon" type="image/vnd.microsoft.icon" href="{$img_ps_dir}favicon.ico?{$img_update_time}" />
+    <link rel="shortcut icon" type="image/x-icon" href="{$img_ps_dir}favicon.ico?{$img_update_time}" />
+    {if isset($page_name) && $page_name == 'authentication'}
+    <link rel="canonical" href="{$link->getPageLink('authentication.php', TRUE)}" />
+    {/if}
+    <script type="text/javascript">
+        var baseDirSsl = '{$base_dir_ssl}';
+        var baseDir = '{$content_dir}';
+        var static_token = '{$static_token}';
+        var token = '{$token}';
+        var priceDisplayPrecision = {$priceDisplayPrecision*$currency->decimals};
+        var priceDisplayMethod = {$priceDisplay};
+        var roundMode = {$roundMode};
+        var isoLang = "{$lang_iso}";
+    </script>
+	{if isset($css_files)}
     {foreach from=$css_files key=css_uri item=media}
     <link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
     {/foreach}
-{/if}
-{if isset($js_files)}
+	{/if}
+	{if isset($js_files)}
     {foreach from=$js_files item=js_uri}
     <script type="text/javascript" src="{$js_uri}"></script>
     {/foreach}
-{/if}
-        <link rel="apple-touch-icon" href="{$base_dir_ssl}img/apple-touch-icon.png" />
-        {$HOOK_HEADER}
-        <!--[if IE 7]>
-        <link href="{$css_dir}ie7.css" rel="stylesheet" type="text/css" media="screen" />
-        <![endif]-->
-        <!--[if IE 8]>
-        <link href="{$css_dir}ie8.css" rel="stylesheet" type="text/css" media="screen" />
-        <![endif]-->
-        <!--[if IE 9]>
-        <link href="{$css_dir}ie9.css" rel="stylesheet" type="text/css" media="screen" />
-        <![endif]-->
+	{/if}
+    <link rel="apple-touch-icon" href="{$base_dir_ssl}img/apple-touch-icon.png" />
+    {$HOOK_HEADER}
+    <!--[if IE 7]>
+    <link href="{$css_dir}ie7.css" rel="stylesheet" type="text/css" media="screen" />
+    <![endif]-->
+    <!--[if IE 8]>
+    <link href="{$css_dir}ie8.css" rel="stylesheet" type="text/css" media="screen" />
+    <![endif]-->
+    <!--[if IE 9]>
+    <link href="{$css_dir}ie9.css" rel="stylesheet" type="text/css" media="screen" />
+    <![endif]-->
 
-        <!-- Google Tag Manager -->
-        {literal}
-        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-        })(window,document,'script','dataLayer','GTM-PT7ZGQF');</script>
-        {/literal}
-        <!-- End Google Tag Manager -->
+    <!-- Google Tag Manager -->
+    {literal}
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+	new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+	j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+	'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+	})(window,document,'script','dataLayer','GTM-PT7ZGQF');</script>
+    {/literal}
+    <!-- End Google Tag Manager -->
 
-        {assign var='isEC' value=Configuration::get('GANALYTICS_EC')}
-        {if $cookie->id_lang == 2}
-            {literal}
-                <script>
-                  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-                  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    {assign var='isEC' value=Configuration::get('GANALYTICS_EC')}
+	{if $cookie->id_lang == 2}
+		{literal}
+		<script>
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-                  ga('create', 'UA-30665119-1', 'auto');
+		ga('create', 'UA-30665119-1', 'auto');
+		{/literal}
+		{if isset($page_name) && $page_name == 'category'}
+		{literal}
+			ga('require', 'ec');
 
-                  {/literal}{if isset($page_name) && $page_name == 'category'}{literal}
-                    ga('require', 'ec');
+		{/literal}
+		{else if isset($page_name) && $page_name == 'product'}
+		{literal}
+			ga('require', 'ec');
+			ga('ec:addProduct', {
+			  'id': {/literal}{$product->id}{literal},
+			  'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
+			  'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
+			});
+			
+			ga('ec:setAction', 'detail');
 
-                  {/literal}{else if isset($page_name) && $page_name == 'product'}{literal}
-                    ga('require', 'ec');
-                    ga('ec:addProduct', {
-                      'id': {/literal}{$product->id}{literal},
-                      'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
-                      'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
-                    });
+		{/literal}
+		{else if isset($page_name) && $page_name == 'order'}
+		{literal}
+			ga('require', 'ec');
 
-                    ga('ec:setAction', 'detail');
+			{/literal}
+			{if $step == 0 || $step == 1}
+			    {if $cart}
+			        {assign var='cartProducts' value=$cart->getProducts()}
+			        {foreach from=$cartProducts item=cartProduct}
+			            {literal}
+			            ga('ec:addProduct', {
+			              'id': {/literal}{$cartProduct['id_product']}{literal},
+			              'name': "{/literal}{$cartProduct['name']}{literal}",
+			              'category': "{/literal}{$cartProduct['category']}{literal}",
+			              'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
+			              'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
+			            });
+			            {/literal}
+			        {/foreach}
+			    {/if}
+			{/if}
+			{literal}
 
-                  {/literal}{else if isset($page_name) && $page_name == 'order'}{literal}
-                    ga('require', 'ec');
+			{/literal}
+			{if $step == 0}{literal}
+			    //cart
+			    ga('ec:setAction','checkout', {
+			        'step': 1,
+			    });
+			{/literal}
+			{else if $step == 1}{literal}
+			    // address
+			    ga('ec:setAction','checkout', {
+			        'step': 2,
+			    });
+			{/literal}
+			{else if $step == 2}{literal}
+			    // carrier
+			    ga('ec:setAction','checkout', {
+			        'step': 3,
+			    });
+			{/literal}
+			{else if $step == 3}{literal}
+			    // payment
+			    ga('ec:setAction','checkout', {
+			        'step': 4,
+			    });
+			{/literal}
+			{/if}
+		{/if}
+		{literal}
 
-                    {/literal}
-                    {if $step == 0 || $step == 1}
-                        {if $cart}
-                            {assign var='cartProducts' value=$cart->getProducts()}
-                            {foreach from=$cartProducts item=cartProduct}
-                                {literal}
-                                ga('ec:addProduct', {
-                                  'id': {/literal}{$cartProduct['id_product']}{literal},
-                                  'name': "{/literal}{$cartProduct['name']}{literal}",
-                                  'category': "{/literal}{$cartProduct['category']}{literal}",
-                                  'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
-                                  'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
-                                });
-                                {/literal}
-                            {/foreach}
-                        {/if}
-                    {/if}
-                    {literal}
+		{/literal}
+		{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}
+		{literal}
+			// send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
+			var re = new RegExp("([?&])(email=)[^&#]*", "g");
+			var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
+			var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
+			if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
+			  // remove personal data from url before sending to GA
+			  url = window.location.search.replace(re, '$1$2');
+			  url = url.replace(re2, '$1$2');
+			  url = url.replace(re3, '$1$2');
+			  var page = window.location.pathname+url;
+			  ga('send', 'pageview', page);
+			} else {
+			  ga('send', 'pageview');
+			}
+           {/literal}
+		{/if}
+		{literal}
 
-                    {/literal}{if $step == 0}{literal}
-                        //cart
-                        ga('ec:setAction','checkout', {
-                            'step': 1,
-                        });
-                    {/literal}{else if $step == 1}{literal}
-                        // address
-                        ga('ec:setAction','checkout', {
-                            'step': 2,
-                        });
-                    {/literal}{else if $step == 2}{literal}
-                        // carrier
-                        ga('ec:setAction','checkout', {
-                            'step': 3,
-                        });
-                    {/literal}{else if $step == 3}{literal}
-                        // payment
-                        ga('ec:setAction','checkout', {
-                            'step': 4,
-                        });
-                    {/literal}{/if}
-                  {/if}{literal}
+		function onStepComplete(stepNumber, option, redirect, form) {
+		    ga('ec:setAction', 'checkout_option', {
+		      'step': stepNumber,
+		      'option': option
+		    });
+		    if (redirect != null) {
+		        ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              document.location = redirect;
+		           }
+		        });
+		    } else if (form != null) {
+		          ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              form.submit();
+		           }
+		        });
+		    } else {
+		      ga('send', 'event', 'Checkout', 'Option', {});
+		    }
+		}
+		function addToCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'add');
+		    ga('send', 'event', 'UX', 'click', 'add to cart');
+		}
+		function removeFromCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'remove');
+		    ga('send', 'event', 'UX', 'click', 'remove to cart');
+		}
+		</script>
+		{/literal}
+	{elseif $cookie->id_lang == 3}
+		{literal}
+		<script>
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-                  {/literal}{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}{literal}
-                    // send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
+		ga('create', 'UA-68580471-1', 'auto');
+		{/literal}
+		{if isset($page_name) && $page_name == 'category'}
+		{literal}
+			ga('require', 'ec');
 
-                    var re = new RegExp("([?&])(email=)[^&#]*", "g");
-                    var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
-                    var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
-                    if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
-                      // remove personal data from url before sending to GA
-                      url = window.location.search.replace(re, '$1$2');
-                      url = url.replace(re2, '$1$2');
-                      url = url.replace(re3, '$1$2');
-                      var page = window.location.pathname+url;
-                      ga('send', 'pageview', page);
-                    } else {
-                      ga('send', 'pageview');
-                    }
+		{/literal}
+		{else if isset($page_name) && $page_name == 'product'}
+		{literal}
+			ga('require', 'ec');
+			ga('ec:addProduct', {
+			  'id': {/literal}{$product->id}{literal},
+			  'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
+			  'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
+			});
+			
+			ga('ec:setAction', 'detail');
 
-                  {/literal}{/if}{literal}
+		{/literal}
+		{else if isset($page_name) && $page_name == 'order'}
+		{literal}
+			ga('require', 'ec');
 
-                  function onStepComplete(stepNumber, option, redirect, form) {
-                      ga('ec:setAction', 'checkout_option', {
-                        'step': stepNumber,
-                        'option': option
-                      });
-                      if (redirect != null) {
-                          ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                document.location = redirect;
-                             }
-                          });
-                      } else if (form != null) {
-                            ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                form.submit();
-                             }
-                          });
-                      } else {
-                        ga('send', 'event', 'Checkout', 'Option', {});
-                      }
-                  }
-                  function addToCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'add');
-                      ga('send', 'event', 'UX', 'click', 'add to cart');
-                  }
-                  function removeFromCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'remove');
-                      ga('send', 'event', 'UX', 'click', 'remove to cart');
-                  }
-                </script>
-            {/literal}
-        {elseif $cookie->id_lang == 3}
-            {literal}
-                <script>
-                  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-                  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-                  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+			{/literal}
+			{if $step == 0 || $step == 1}
+			    {if $cart}
+			        {assign var='cartProducts' value=$cart->getProducts()}
+			        {foreach from=$cartProducts item=cartProduct}
+			            {literal}
+			            ga('ec:addProduct', {
+			              'id': {/literal}{$cartProduct['id_product']}{literal},
+			              'name': "{/literal}{$cartProduct['name']}{literal}",
+			              'category': "{/literal}{$cartProduct['category']}{literal}",
+			              'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
+			              'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
+			            });
+			            {/literal}
+			        {/foreach}
+			    {/if}
+			{/if}
+			{literal}
+		
+			{/literal}
+			{if $step == 0}
+			{literal}
+			    //cart
+			    ga('ec:setAction','checkout', {
+			        'step': 1,
+			    });
+			{/literal}
+			{else if $step == 1}
+			{literal}
+			    // address
+			    ga('ec:setAction','checkout', {
+			        'step': 2,
+			    });
+			{/literal}
+			{else if $step == 2}
+			{literal}
+			    // carrier
+			    ga('ec:setAction','checkout', {
+			        'step': 3,
+			    });
+			{/literal}
+			else if $step == 3}
+			{literal}
+			    // payment
+			    ga('ec:setAction','checkout', {
+			        'step': 4,
+			    });
+			{/literal}
+			{/if}
+		{/if}
+		{literal}
 
-                  ga('create', 'UA-68580471-1', 'auto');
+		{/literal}
+		{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}
+		{literal}
+				// send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
+				var re = new RegExp("([?&])(email=)[^&#]*", "g");
+				var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
+				var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
+				if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
+					// remove personal data from url before sending to GA
+                    url = window.location.search.replace(re, '$1$2');
+                    url = url.replace(re2, '$1$2');
+                    url = url.replace(re3, '$1$2');
+                    var page = window.location.pathname+url;
+                    ga('send', 'pageview', page);
+				} else {
+					ga('send', 'pageview');
+				}
+		{/literal}
+		{/if}
+		{literal}
 
-                  {/literal}{if isset($page_name) && $page_name == 'category'}{literal}
-                    ga('require', 'ec');
+		function onStepComplete(stepNumber, option, redirect, form) {
+		    ga('ec:setAction', 'checkout_option', {
+		      'step': stepNumber,
+		      'option': option
+		    });
+		    if (redirect != null) {
+		        ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              document.location = redirect;
+		           }
+		        });
+		    } else if (form != null) {
+		          ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              form.submit();
+		           }
+		        });
+		    } else {
+		      ga('send', 'event', 'Checkout', 'Option', {});
+		    }
+		}
+		function addToCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'add');
+		    ga('send', 'event', 'UX', 'click', 'add to cart');
+		}
+		function removeFromCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'remove');
+		    ga('send', 'event', 'UX', 'click', 'remove to cart');
+		}
+		</script>
+		{/literal}
+	{/if}
 
-                  {/literal}{else if isset($page_name) && $page_name == 'product'}{literal}
-                    ga('require', 'ec');
-                    ga('ec:addProduct', {
-                      'id': {/literal}{$product->id}{literal},
-                      'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
-                      'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
-                    });
+	<!-- Facebook Pixel Code -->
+	{if $cookie->id_lang == 2}
+	    {literal}
+	    <script>
+        !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+        n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+        n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+        t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+        document,'script','//connect.facebook.net/en_US/fbevents.js');
 
-                    ga('ec:setAction', 'detail');
+        fbq('init', '585280634957856');
+        fbq('track', "PageView");
+	    </script>
+	    {/literal}
+	    <noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=585280634957856&amp;ev=PageView&amp;noscript=1"/></noscript>
+	{elseif $cookie->id_lang == 3}
+	    {literal}
+	    <script>
+        !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+        n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+        n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+        t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+        document,'script','//connect.facebook.net/en_US/fbevents.js');
 
-                  {/literal}{else if isset($page_name) && $page_name == 'order'}{literal}
-                    ga('require', 'ec');
-
-                    {/literal}
-                    {if $step == 0 || $step == 1}
-                        {if $cart}
-                            {assign var='cartProducts' value=$cart->getProducts()}
-                            {foreach from=$cartProducts item=cartProduct}
-                                {literal}
-                                ga('ec:addProduct', {
-                                  'id': {/literal}{$cartProduct['id_product']}{literal},
-                                  'name': "{/literal}{$cartProduct['name']}{literal}",
-                                  'category': "{/literal}{$cartProduct['category']}{literal}",
-                                  'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
-                                  'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
-                                });
-                                {/literal}
-                            {/foreach}
-                        {/if}
-                    {/if}
-                    {literal}
-
-                    {/literal}{if $step == 0}{literal}
-                        //cart
-                        ga('ec:setAction','checkout', {
-                            'step': 1,
-                        });
-                    {/literal}{else if $step == 1}{literal}
-                        // address
-                        ga('ec:setAction','checkout', {
-                            'step': 2,
-                        });
-                    {/literal}{else if $step == 2}{literal}
-                        // carrier
-                        ga('ec:setAction','checkout', {
-                            'step': 3,
-                        });
-                    {/literal}{else if $step == 3}{literal}
-                        // payment
-                        ga('ec:setAction','checkout', {
-                            'step': 4,
-                        });
-                    {/literal}{/if}
-                  {/if}{literal}
-
-                  {/literal}{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}{literal}
-                    // send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
-
-                    var re = new RegExp("([?&])(email=)[^&#]*", "g");
-                    var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
-                    var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
-                    if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
-                      // remove personal data from url before sending to GA
-                      url = window.location.search.replace(re, '$1$2');
-                      url = url.replace(re2, '$1$2');
-                      url = url.replace(re3, '$1$2');
-                      var page = window.location.pathname+url;
-                      ga('send', 'pageview', page);
-                    } else {
-                      ga('send', 'pageview');
-                    }
-                  {/literal}{/if}{literal}
-
-                  function onStepComplete(stepNumber, option, redirect, form) {
-                      ga('ec:setAction', 'checkout_option', {
-                        'step': stepNumber,
-                        'option': option
-                      });
-                      if (redirect != null) {
-                          ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                document.location = redirect;
-                             }
-                          });
-                      } else if (form != null) {
-                            ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                form.submit();
-                             }
-                          });
-                      } else {
-                        ga('send', 'event', 'Checkout', 'Option', {});
-                      }
-                  }
-                  function addToCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'add');
-                      ga('send', 'event', 'UX', 'click', 'add to cart');
-                  }
-                  function removeFromCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'remove');
-                      ga('send', 'event', 'UX', 'click', 'remove to cart');
-                  }
-                </script>
-            {/literal}
-        {/if}
-
-        <!-- Facebook Pixel Code -->
-        {if $cookie->id_lang == 2}
-            {literal}
-            <script>
-                !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-                n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-                n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-                t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-                document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-                fbq('init', '585280634957856');
-                fbq('track', "PageView");
-            </script>
-            {/literal}
-            <noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=585280634957856&amp;ev=PageView&amp;noscript=1"/></noscript>
-        {elseif $cookie->id_lang == 3}
-            {literal}
-            <script>
-                !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-                n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-                n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-                t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-                document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-                fbq('init', '778018572325168');
-                fbq('track', "PageView");
-            </script>
-            {/literal}
-            <noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=778018572325168&amp;ev=PageView&amp;noscript=1"/></noscript>
-        {/if}
-
-        {literal}
-        <script>
-            fbq('track', 'ViewContent', {
-                content_name:'{/literal}{$page_name|escape:'html':'UTF-8'}{literal}'
+        fbq('init', '778018572325168');
+        fbq('track', "PageView");
+	    </script>
+	    {/literal}
+	    <noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=778018572325168&amp;ev=PageView&amp;noscript=1"/></noscript>
+	{/if}
+	
+	{literal}
+	<script>
+    fbq('track', 'ViewContent', {
+        content_name:'{/literal}{$page_name|escape:'html':'UTF-8'}{literal}'
+    });
+	</script>
+	{/literal}
+	{if isset($facebook_validation) && $facebook_validation}
+	    {literal}
+	    <script>
+        fbq('track', 'CompleteRegistration');
+	    </script>
+	    {/literal}
+	{/if}
+	
+	{if isset($page_name)}
+	    {if $page_name == 'order-confirmation' && isset($order)}
+	        {literal}
+	        <script>
+            fbq('track', 'Purchase', {
+                value: '{/literal}{$order->total_paid}{literal}',
+                currency: "{/literal}{$currency['iso_code']}{literal}"
             });
-        </script>
-        {/literal}
-        {if isset($facebook_validation) && $facebook_validation}
-            {literal}
-            <script>
-                fbq('track', 'CompleteRegistration');
-            </script>
-            {/literal}
-        {/if}
-
-        {if isset($page_name)}
-            {if $page_name == 'order-confirmation' && isset($order)}
-                {literal}
-                <script>
-                    fbq('track', 'Purchase', {
-                        value: '{/literal}{$order->total_paid}{literal}',
-                		currency: "{/literal}{$currency['iso_code']}{literal}"
-                    });
-                </script>
-                {/literal}
-            {/if}
-        {/if}
-        <!-- End Facebook Pixel Code -->
-
-        <!-- crazyegg -->
-        {literal}
-        <script type="text/javascript">
-            setTimeout(function(){var a=document.createElement("script");
-            var b=document.getElementsByTagName("script")[0];
-            a.src=document.location.protocol+"//script.crazyegg.com/pages/scripts/0047/9841.js?"+Math.floor(new Date().getTime()/3600000);
-            a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
-        </script>
-        {/literal}
+	        </script>
+	        {/literal}
+	    {/if}
+	{/if}
+	<!-- End Facebook Pixel Code -->
+	
+	<!-- crazyegg -->
+	{literal}
+	<script type="text/javascript">
+    setTimeout(function(){var a=document.createElement("script");
+    var b=document.getElementsByTagName("script")[0];
+    a.src=document.location.protocol+"//script.crazyegg.com/pages/scripts/0047/9841.js?"+Math.floor(new Date().getTime()/3600000);
+    a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
+	</script>
+	{/literal}
 
     </head>
 
     <body {if $page_name}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if} class="{$bodyClass}{if $cookie->isLogged()} logged{/if}{if isset($smarty.get.content_only)} content_only{/if}{if isset($smarty.post.email_create) || isset($smarty.get.create_account)} create{/if} lang{$cookie->id_lang}">
 
 	<!-- Google Tag Manager (noscript) -->
-	<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PT7ZGQF" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+	<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PT7ZGQF"
+	 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 	<!-- End Google Tag Manager (noscript) -->
 
     {if !$content_only}

themes/site/lang/en.php

@@ -3,6 +3,7 @@
 global $_LANG;
 $_LANG = array();
 $_LANG['404_1d3ac0a5826e47e3c2761085e97877f6'] = 'Page not available';
+$_LANG['404_902b0d55fddef6f8d651fe1035b7d4bd'] = 'Error';
 $_LANG['404_4f4816c6984e3c832882b39d8fecbd2c'] = 'We\'re sorry, but the Web address you entered is no longer available';
 $_LANG['404_21dfea356c48679a5ce6671ee307d2a4'] = 'To find a product, please type its name in the field below';
 $_LANG['404_a68ba7d969d1294a35138fa501dfb078'] = 'Search our product catalog:';
@@ -11,7 +12,8 @@ $_LANG['404_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['address_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Your addresses';
 $_LANG['address_e9b6b3aa3cab28048d3879710882e1de'] = 'Modify address';
 $_LANG['address_d7f172af352aa5232de5295afeaa68e5'] = 'To add a new address, please fill out the form below.';
-$_LANG['address_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
+$_LANG['address_455175f3f5be6306247babb349c0515a'] = 'Your address';
+$_LANG['address_393d8c6bc7a04264bd9523dc8c92b818'] = 'New address';
 $_LANG['address_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Identification number';
 $_LANG['address_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
 $_LANG['address_7cb32e708d6b961d476baced73d362bb'] = 'VAT number';
@@ -32,6 +34,7 @@ $_LANG['address_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Assign an address title fo
 $_LANG['address_ae7bdef7fe2bbbbf02c11e92c5fceb40'] = 'My address';
 $_LANG['address_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
 $_LANG['address_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
+$_LANG['address_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
 $_LANG['addresses_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
 $_LANG['addresses_e45be0a0d4a0b62b15694c1a631e6e62'] = 'My addresses';
 $_LANG['addresses_f8fe2f1fff8cf1e32b1891fd7b4a65fe'] = 'Please configure the desired billing and delivery addresses to be preselected when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.';
@@ -41,13 +44,16 @@ $_LANG['addresses_06933067aafd48425d67bcb01bba5cb6'] = 'Update';
 $_LANG['addresses_729a51874fe901b092899e9e8b31c97a'] = 'Are you sure?';
 $_LANG['addresses_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
 $_LANG['addresses_b32dd33df738183cb85ab8ea714f8026'] = 'No addresses available.';
-$_LANG['addresses_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
+$_LANG['addresses_bed08e8af70a98c1a8361f13ec477be0'] = 'Add new address';
 $_LANG['addresses_3c7d34ae915c6664189dab2aebb02307'] = 'Add an address';
+$_LANG['addresses_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
+$_LANG['addresses_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['authentication_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
 $_LANG['authentication_bffe9a3c9a7e00ba00a11749e022d911'] = 'Log in';
 $_LANG['authentication_5bef23eb7efff2736c5583bda59e5eb7'] = 'Create your account';
-$_LANG['authentication_5f0258bf719ab828e20edf91e4fb24a7'] = 'Already registered?';
+$_LANG['authentication_d726bc5637e9f053917227ec02f6c9d7'] = 'Enter your e-mail address to create an account';
 $_LANG['authentication_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
+$_LANG['authentication_5f0258bf719ab828e20edf91e4fb24a7'] = 'Already registered?';
 $_LANG['authentication_dc647eb65e6711e155375218212b3964'] = 'Password';
 $_LANG['authentication_01a569ddc6cf67ddec2a683f0a5f5956'] = 'Forgot your password?';
 $_LANG['authentication_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant Checkout';
@@ -89,6 +95,15 @@ $_LANG['authentication_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Continue';
 $_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Your personal information';
 $_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
 $_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 characters min.)';
+$_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Your address';
+$_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Street address, P.O. box, company name, c/o';
+$_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Address (Line 2)';
+$_LANG['authentication_092daa39d2b825e4a7fe9b31c2080ecb'] = 'Apartment, suite, unit, building, floor, etc.';
+$_LANG['authentication_0f68b904e33d9ac04605aecc958bcf52'] = 'Additional information';
+$_LANG['authentication_39916f579f264041641c122e68e545d5'] = 'You must register at least one phone number';
+$_LANG['authentication_fe66abce284ec8589e7d791185b5c442'] = 'Home phone';
+$_LANG['authentication_41c2fff4867cc204120f001e7af20f7a'] = 'Mobile phone';
+$_LANG['authentication_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Assign an address alias for future reference';
 $_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'Register';
 $_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Top sellers';
 $_LANG['best-sales_32af07c9205de16855c50c3d20a51698'] = 'No top sellers.';
@@ -117,6 +132,7 @@ $_LANG['contact-form_4ec1c39345fe8820d68463eea8803b0f'] = 'Your message has been
 $_LANG['contact-form_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['contact-form_7c9d4636fc5ed97bb78bc2aac486beab'] = 'Your message has already been sent.';
 $_LANG['contact-form_0880266daff3ed4c441adb888658c47c'] = 'For questions about an order or for more information about our products';
+$_LANG['contact-form_cc5fd9b9f1cad59fcff97a1f21f34304'] = 'Send a message';
 $_LANG['contact-form_6c27c08f40e1b0d9901deb9ff5f722f7'] = 'Subject Heading';
 $_LANG['contact-form_7bc873cba11f035df692c3549366c722'] = '-- Choose --';
 $_LANG['contact-form_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
@@ -140,6 +156,7 @@ $_LANG['discount_93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
 $_LANG['discount_bafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
 $_LANG['discount_f4a0d7cb0cd45214c8ca5912c970de13'] = 'Tax included';
 $_LANG['discount_5b54dccf3cb10410cee693309f409324'] = 'You do not have any vouchers.';
+$_LANG['discount_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
 $_LANG['discount_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['errors_6357d3551190ec7e79371a8570121d3a'] = 'There are';
 $_LANG['errors_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
@@ -180,6 +197,7 @@ $_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
 $_LANG['history_27792947ed5d5da7c0d1f43327ed9dab'] = 'details';
 $_LANG['history_332c80b1838dc515f5031e09da3b7f3f'] = 'Reorder';
 $_LANG['history_5acc2ceeb883ba07cef2d02ea382f242'] = 'You have not placed any orders.';
+$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to Your Account';
 $_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['identity_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
 $_LANG['identity_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Your personal information';
@@ -213,6 +231,7 @@ $_LANG['identity_6f6162d3a052bb330e9c60285c74c6c9'] = 'Sign up for our newslette
 $_LANG['identity_ac135c86084a47630c9eadb4edd5ef75'] = 'Receive special offers from our partners';
 $_LANG['identity_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
 $_LANG['identity_b340f66ef028af40a01d073966d593a9'] = '[Insert customer data privacy clause or law here, if applicable]';
+$_LANG['identity_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
 $_LANG['identity_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['maintenance_e1d4f332b928d40fa3f9df3b7795da4f'] = 'In order to perform site maintenance, our online shop is closed temporarily. We apologize for the inconvenience and ask that you please try again later.';
 $_LANG['manufacturer-list_2377be3c2ad9b435ba277a73f0f1ca76'] = 'Manufacturers';
@@ -250,10 +269,10 @@ $_LANG['order-address_8a8c9edb5531fa2f822295d1830d090f'] = 'Your delivery addres
 $_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Update';
 $_LANG['order-address_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Addresses';
 $_LANG['order-address_d0748d2df4aed77bd7591b3ac6c52c83'] = 'Choose a delivery address:';
-$_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
-$_LANG['order-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Add a new address';
 $_LANG['order-address_d40f5cb3e1fbb5760a8d2a44a1241d4d'] = 'Use the delivery address as the billing address.';
 $_LANG['order-address_82a7d396bbd6f6fef648578b4ae2ea81'] = 'Choose a billing address:';
+$_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
+$_LANG['order-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Add a new address';
 $_LANG['order-address_617096c86d35478132502be00e12e016'] = 'If you would like to add a comment about your order, please write it below.';
 $_LANG['order-address_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
 $_LANG['order-address_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
@@ -352,6 +371,7 @@ $_LANG['order-follow_01abfc750a0c942167651c40d088531d'] = '#';
 $_LANG['order-follow_cc894fffb019b528d12951b74d6d2b6e'] = 'Order return';
 $_LANG['order-follow_daf51d7d9e10e6a469434ae548d9a173'] = 'Print out';
 $_LANG['order-follow_3976e0f730b236b1cf619dc80f78488e'] = 'You have no return merchandise authorizations.';
+$_LANG['order-follow_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
 $_LANG['order-follow_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['order-opc-new-account_08bd40c7543007ad06e4fce31618f6ec'] = 'Account';
 $_LANG['order-opc-new-account_db879b00e657fc85f7873343f11df21c'] = 'Already registered?';
@@ -470,6 +490,7 @@ $_LANG['order-slip_01abfc750a0c942167651c40d088531d'] = '#';
 $_LANG['order-slip_591286c3b4f075453e55532838ce0044'] = 'Order slip';
 $_LANG['order-slip_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
 $_LANG['order-slip_0ba830b7ca1513a4882ce5aac84030b8'] = 'You have not received any credit slips.';
+$_LANG['order-slip_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
 $_LANG['order-slip_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['order-steps_290612199861c31d1036b185b4e69b75'] = 'Summary';
 $_LANG['order-steps_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
@@ -486,6 +507,7 @@ $_LANG['password_10911a0ad07a041ea43230e25faad2d7'] = 'A confirmation e-mail has
 $_LANG['password_55ad28443587997ac4fa56386ec2fc1d'] = 'Please enter the e-mail address used to register. We will send your new password to that address.';
 $_LANG['password_df1555fe48479f594280a2e03f9a8186'] = 'E-mail:';
 $_LANG['password_0d0e2934af7d3bc4e7263fcb1f9bc51c'] = 'Retrieve Password';
+$_LANG['password_d28f8b8bba7b45bc5103b23b4f21b4fd'] = 'Return to Login';
 $_LANG['password_95e6faaba5e8b016e5f9bcf5ea6c8270'] = 'Back to Login';
 $_LANG['prices-drop_c8f312df214e2295809027c6ca79d232'] = 'Price drop';
 $_LANG['prices-drop_62e15ca272c14c03aa52b64c8caf2334'] = 'No price drop.';
@@ -494,14 +516,13 @@ $_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'You cannot add mor
 $_LANG['product-compare_1a3addc6c8dccf79752c39ca4a3b6423'] = 'product(s) to the product comparison';
 $_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Compare';
 $_LANG['product-list_03c2e7e41ffc181a4e84080b4710e81e'] = 'New';
-$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = 'Warning : 1 item in stock !';
-$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = 'Warning :';
 $_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
 $_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
 $_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = 'Online only!';
-$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
-$_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
 $_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Available';
+$_LANG['product-list_cb3c718c905f00adbb6735f55bfb38ef'] = 'Product available with different options';
+$_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
+$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
 $_LANG['product-list_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
 $_LANG['product-list_77798ad342555ffa834758a2aaa6fc11'] = 'Select to compare';
 $_LANG['product-sort_cfab1ba8c67c7c838db98d666f02a132'] = '--';
@@ -516,21 +537,19 @@ $_LANG['product_bc0f7082192ef02e934a036cf4991789'] = 'This product is no longer
 $_LANG['product_9173701581f0213f0104e064479e4ca3'] = 'with those attributes but is available with others';
 $_LANG['product_78a2d6a3d6741d9d2cbff658d5df7cd8'] = 'Uploading in progress, please wait...';
 $_LANG['product_c1f25211403ec7459f265788cdbee403'] = 'Please fill in all required fields, then save the customization.';
-$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = 'Warning : X items in stock!';
-$_LANG['product_62d6acaf1651581b3997c040ad383303'] = 'Warning : 1 item in stock!';
 $_LANG['product_f9ddd507fdf437437efdcb333a0f4ff0'] = 'This product is not visible to your customers.';
 $_LANG['product_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publish';
 $_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Back';
+$_LANG['product_9981d2af851e4b4a4ea612d59f08ab9c'] = 'Other views';
+$_LANG['product_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
+$_LANG['product_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
 $_LANG['product_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
 $_LANG['product_02ea084dc2ef3e9965dbba4ec87d2f9b'] = 'Display all pictures';
 $_LANG['product_13dba24862cf9128167a59100e154c8d'] = 'Print';
 $_LANG['product_c6beb9157a0e29e604ad5ec484488608'] = 'View full size';
 $_LANG['product_2b56b60f878922093facd42284848a0c'] = 'More details';
 $_LANG['product_e54a973d0c3342dac6ee7d9e145c6f83'] = 'Pack content';
-$_LANG['product_ea23e12cae068315b351f8d36d432d76'] = 'Reference:';
-$_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Quantity:';
-$_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'You must add';
-$_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = 'as a minimum quantity to buy this product.';
+$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Pick a color:';
 $_LANG['product_588907ab2d492aca0b07b5bf9c931eea'] = 'On sale';
 $_LANG['product_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
 $_LANG['product_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
@@ -543,12 +562,20 @@ $_LANG['product_d436eb0fd9de10b54a828ce6435f7e81'] = 'include';
 $_LANG['product_f85524c253c150e88136df3999ac3fd4'] = 'for green tax';
 $_LANG['product_a134618182b99ff9151d7e0b6b92410a'] = '(not impacted by the discount)';
 $_LANG['product_fe3838c7c11aa406dd956566e17360d5'] = 'per';
-$_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
+$_LANG['product_ea23e12cae068315b351f8d36d432d76'] = 'Reference:';
+$_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Quantity:';
+$_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'You must add';
+$_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = 'as a minimum quantity to buy this product.';
 $_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Availability:';
 $_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'item in stock';
 $_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'items in stock';
-$_LANG['product_d4c56106032bdc1466602ea78e753210'] = 'Warning :';
-$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Pick a color:';
+$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Warning: Last items in stock!';
+$_LANG['product_03de921a8ea82897e13d33d66c28b4db'] = 'Online only';
+$_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
+$_LANG['product_47f1a471a7f6a74053869cdb9cbf05bb'] = 'Quantity discount';
+$_LANG['product_8beee69f53dcd358f9e333de43a3f506'] = 'quantities';
+$_LANG['product_221d2a4bfdae13dbd5aeff3b02adb8c1'] = 'quantity';
+$_LANG['product_71948aa4f6e12cdaa5e2e63a5eb8f142'] = 'More info';
 $_LANG['product_7dcd185f890fd28f69d1ed210292d77f'] = 'Data sheet';
 $_LANG['product_801ab24683a4a8c433c6eb40c48bcd9d'] = 'Download';
 $_LANG['product_98edb85b00d9527ad5acebe451b3fae6'] = 'Accessories';
@@ -556,9 +583,6 @@ $_LANG['product_d3da97e2d9aee5c8fbe03156ad051c99'] = 'More';
 $_LANG['product_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
 $_LANG['product_cb3c718c905f00adbb6735f55bfb38ef'] = 'Product available with different options';
 $_LANG['product_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
-$_LANG['product_47f1a471a7f6a74053869cdb9cbf05bb'] = 'Quantity discount';
-$_LANG['product_8beee69f53dcd358f9e333de43a3f506'] = 'quantities';
-$_LANG['product_221d2a4bfdae13dbd5aeff3b02adb8c1'] = 'quantity';
 $_LANG['product_54c02ba7929b1fda4847991a45b58a48'] = 'Product customization';
 $_LANG['product_d5a90effea572da2df11559161c0930b'] = 'After saving your customized product, remember to add it to your cart.';
 $_LANG['product_e5a75e83f9fd2f5fdff337a46227b3c3'] = 'Allowed file formats are: GIF, JPG, PNG';
@@ -637,6 +661,7 @@ $_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
 $_LANG['shopping-cart_c8cd21bd2e33378f10611bc4498cf96f'] = 'Delete this customization';
 $_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
 $_LANG['shopping-cart_1d9baf077ee87921f57a8fe42d510b65'] = 'Subtract';
+$_LANG['shopping-cart_a82868319826fb092b73968e661b5b38'] = 'Vouchers';
 $_LANG['shopping-cart_bcc7582c9a66be8187578997794a9c1f'] = 'Code:';
 $_LANG['shopping-cart_f7b96335c6a33477579e43f3da368507'] = 'Take advantage of our offers:';
 $_LANG['shopping-cart_af0f5bdc5be121b9307687aeeae38c17'] = 'Delivery address';

themes/site/lang/fr.php

@@ -576,9 +576,6 @@ $_LANG['product-compare_1a3addc6c8dccf79752c39ca4a3b6423'] = 'produits dans le c
 $_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Comparer';
 $_LANG['product-list_f2d8873a73e15cc5accf7b99a1bc60e0'] = 'Bébé Boutik vous propose ce produit de façon aléatoire';
 $_LANG['product-list_03c2e7e41ffc181a4e84080b4710e81e'] = 'Nouveau';
-$_LANG['product-list_62d6acaf1651581b3997c040ad383303'] = 'Attention : 1 pièce en stock !';
-$_LANG['product-list_d4c56106032bdc1466602ea78e753210'] = 'Attention :';
-$_LANG['product-list_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces en stock';
 $_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = 'En solde !';
 $_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = 'Prix réduit !';
 $_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = 'Exclusivité web !';
@@ -599,8 +596,6 @@ $_LANG['product_bc0f7082192ef02e934a036cf4991789'] = 'Ce produit n\'est plus en
 $_LANG['product_9173701581f0213f0104e064479e4ca3'] = 'avec ces options mais reste disponible avec d\'autres options';
 $_LANG['product_78a2d6a3d6741d9d2cbff658d5df7cd8'] = 'Envoi en cours, merci de bien vouloir patienter...';
 $_LANG['product_c1f25211403ec7459f265788cdbee403'] = 'Merci de remplir tous les champs, ensuite enregistrez votre personnalisation';
-$_LANG['product_43c936b309c81e341da9c4e93acb2bb2'] = 'Attention : X pièces en stock!';
-$_LANG['product_62d6acaf1651581b3997c040ad383303'] = 'Attention : 1 pièce en stock!';
 $_LANG['product_f9ddd507fdf437437efdcb333a0f4ff0'] = 'Ce produit n\'est pas visible par vos clients.';
 $_LANG['product_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publier';
 $_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Retour';
@@ -629,7 +624,7 @@ $_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier';
 $_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Disponibilité :';
 $_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'pièce disponible';
 $_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'pièces disponibles';
-$_LANG['product_d4c56106032bdc1466602ea78e753210'] = 'Attention :';
+$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Attention : dernières pièces disponibles !';
 $_LANG['product_f1ff9682123b76dfd732618ad1891d1c'] = 'Coup de coeur';
 $_LANG['product_0da35a562542f7e441f8226c875375f5'] = 'Bébé Boutik aime ce produit : parce qu’il est innovant, pratique, parce qu’il éveille votre enfant par ses couleurs, sa texture, ses fonctions, ou parce qu’il l’habille avec douceur et originalité, Bébé Boutik vous le recommande !';
 $_LANG['product_f1ea0ec1c8e3da08b6fecae3af1d45b3'] = 'Bébé Boutik vous propose ce produit de façon aléatoire';

themes/site/modules/invite/authentication.tpl

@@ -1,7 +1 @@
-<fieldset class="account_creation" {if isset($sponsor_email)} style="display:none;" {/if}>
-	<p>
-		<label for="referralprogram">{l s='E-mail address of your sponsor' mod='invite'}</label>
-		<input type="text" size="52" maxlength="128" class="text" id="referralprogram" name="invite" value="{if isset($sponsor_email)}{$sponsor_email|escape:'htmlall':'UTF-8'}{elseif isset($smarty.post.invite)}{$smarty.post.invite|escape:'htmlall':'UTF-8'}{elseif isset($referralprogram)}{$referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
-	</p>
-</fieldset>
 {if isset($tag_auth)}{$tag_auth}{/if}

themes/site/modules/privatesales_family_menu/menu.tpl

@@ -53,12 +53,19 @@
 										{/foreach}
 									</ul>
 								</div>
-							</div>
+								
+							<div class="content_footer">
+							{$purchaseguide[$menu.id_category_family]}
+							</div>									
+								
+							</div>	
+							
+												
 						</div>
 					{/if}
 				</li>
 	 		{/foreach}
-		</ul>
+		</ul>		
 	</div>
 </div>
 

themes/site/order-payment.tpl

@@ -204,9 +204,7 @@
 		// 		$form = $input.parent().children('div.hidden').children('form');
 		// 		$form.submit();
 		// 	}
-
 		// });
-
 	});
 </script>
 {/literal}

themes/site_mobile/authentication.tpl

@@ -93,44 +93,6 @@ $(function(){ldelim}
 {/if}
 </script>
 
-{if $id_lp == NULL}
-<script type="text/javascript" src="{$js_dir}jquery-ui.min.js"></script>
-<script type="text/javascript">{literal}
-<!--
-$(document).ready(function() {
-	var img_list = [{/literal}"{$img_dir}auth.jpg", "{$img_dir}auth2.jpg", "{$img_dir}auth3.jpg"{literal}];
-
-	var preload = new Array();
-	for(var i=0; i<img_list.length; i++) {
-		preload[i] = new Image();
-		preload[i].src = img_list[i];
-	}
-
-	$("#columns").css("background", "none");
-
-	for(var i=0; i<img_list.length; i++) {
-		$("<div id=\"bg_" + i + "\" class=\"background\" style=\"background : #333333 url('"+ img_list[i] +"') no-repeat left top; z-index: " + (-1 - i) + "; display: none;\" />").appendTo($("#columns"));
-	}
-
-	var current_bg = 0;
-	$("#columns > #bg_0").show();
-
-	function rotateBackground(index) {
-		if(index && index > img_list.length) {
-			index = false;
-		}
-
-		$("#columns > #bg_" + current_bg).fadeOut(600);
-		$("#columns > #bg_" + (index? index - 1: (current_bg == img_list.length - 1? 0: current_bg + 1))).fadeIn(600);
-
-		index? current_bg = (index - 1 < 0? img_list.length - 1: index - 1): (current_bg == img_list.length - 1? current_bg = 0: current_bg++);
-	}
-
-	var timer = setInterval(function() { rotateBackground(); }, 10000);
-});
--->
-{/literal}</script>
-{/if}
 
 {*<h1>{if !isset($email_create)}{l s='Log in'}{else}{l s='Create your account'}{/if}</h1>
 {assign var='current_step' value='login'}
@@ -371,20 +333,20 @@ $(document).ready(function() {
 			<label for="id_gender2" class="top">{l s='Ms.'}</label>
 		</p>*}
 		<p class="required text">
-			<label for="customer_firstname">{l s='First name'} <sup>*</sup></label>
-			<input onkeyup="$('#firstname').val(this.value);" type="text" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.request.customer_firstname)}{$smarty.request.customer_firstname}{/if}" />
+			{*<label for="customer_firstname">{l s='First name'} <sup>*</sup></label>*}
+			<input placeholder="{l s='First name'}" onkeyup="$('#firstname').val(this.value);" type="text" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.request.customer_firstname)}{$smarty.request.customer_firstname|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 		</p>
 		<p class="required text">
-			<label for="customer_lastname">{l s='Last name'} <sup>*</sup></label>
-			<input onkeyup="$('#lastname').val(this.value);" type="text" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.request.customer_lastname)}{$smarty.request.customer_lastname}{/if}" />
+			{*<label for="customer_lastname">{l s='Last name'} <sup>*</sup></label>*}
+			<input placeholder="{l s='Last name'}" onkeyup="$('#lastname').val(this.value);" type="text" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.request.customer_lastname)}{$smarty.request.customer_lastname|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 		</p>
 		<p class="required text">
-			<label for="email">{l s='E-mail'} <sup>*</sup></label>
-			<input type="text" class="text" id="email" name="email" value="{if isset($smarty.request.email)}{$smarty.request.email}{/if}" />
+			{*<label for="email">{l s='E-mail'} <sup>*</sup></label>*}
+			<input placeholder="{l s='E-mail'}" type="text" class="text" id="email" name="email" value="{if isset($smarty.request.email)}{$smarty.request.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 		</p>
 		<p class="required password">
-			<label for="passwd">{l s='Password'} <sup>*</sup></label>
-			<input type="password" class="text" name="passwd" id="passwd" />
+			{*<label for="passwd">{l s='Password'} <sup>*</sup></label>*}
+			<input placeholder="{l s='Password'}" type="password" class="text" name="passwd" id="passwd" />
 			{*<span class="form_info">{l s='(5 characters min.)'}</span>*}
 		</p>
 		{*<p class="select">
@@ -429,13 +391,20 @@ $(document).ready(function() {
 
 		<p class="required text">
 			<label for="dni">{l s='Identification number'} <sup>*</sup></label>
-			<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
+			<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
 			<span class="form_info">{l s='DNI / NIF / NIE'}</span>
 			<sup>*</sup>
 		</p>
 	</fieldset>
 	{$HOOK_CREATE_ACCOUNT_FORM}
-	<fieldset>
+    {*MODULE invite / landingpage / referalprogram *}
+    <fieldset class="account_creation" {if isset($sponsor_email)} style="display:none;" {/if}>
+		<p class="text">
+			<input placeholder="{l s='E-mail address of your sponsor' mod='invite'}" type="text" size="52" maxlength="128" class="text" id="referralprogram" name="invite" value="{if isset($sponsor_email)}{$sponsor_email|escape:'htmlall':'UTF-8'}{elseif isset($smarty.post.invite)}{$smarty.post.invite|escape:'htmlall':'UTF-8'}{elseif isset($referralprogram)}{$referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
+        </p>
+    </fieldset>
+    {*END MODULE invite / landingpage / referalprogram *}
+    <fieldset>
 		{if isset($newsletter) && $newsletter}
 		<p class="checkbox" >
 			<span class="input">
@@ -451,7 +420,7 @@ $(document).ready(function() {
 		</p>*}
 		{/if}
 	</fieldset>
-	<div class="cart_navigation required submit clearfix">
+	<div class="required submit clearfix">
 		<input type="hidden" name="email_create" value="1" />
 		<input type="hidden" name="is_new_customer" value="1" />
 		<input type="hidden" class="hidden" name="back" value="{$smarty.const.__PS_BASE_URI__}validation.php" />
@@ -459,11 +428,13 @@ $(document).ready(function() {
 			<sup>*</sup>{l s='Required field'}
 		</span>
 		<div class="gradient">
-			<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register'}" class="exclusive" onclick="if($('#newsletter:checked').length == 0) { alert('{l s='Please accept our terms of use to continue' js=1}'); return false; }" />
+			{*<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register'}" class="exclusive" onclick="if($('#newsletter:checked').length == 0) { alert('{l s='Please accept our terms of use to continue' js=1}'); return false; }" />*}
+            <button type="submit" name="submitAccount" id="submitAccount" class="exclusive" onclick="if($('#newsletter:checked').length == 0) { alert('{l s='Please accept our terms of use to continue' js=1}'); return false; }">{l s='Register'}<strong>&nbsp;&gt;</strong></button>
 		</div>
 	</div>
 	{$HOOK_CREATE_ACCOUNT_FORM_BOTTOM}
 
 </form>
+	<div class="already_member"><a href="{$link->getPageLink('authentication.php', true)}" title="{l s='Already member'}">{l s='Already member'}</a></div>
 </div>
 {/if}

themes/site_mobile/css/style.css

@@ -1120,6 +1120,9 @@ div#page #header .content .top #header_user ul li {
 	float:left;
 	padding: 3px 10px;
 }
+#authentication div#page #header .content .top #header_user ul li {
+	display: none;
+}
 div#page #header .content .top #header_user ul li a {
 	line-height: auto;
 	height: auto;
@@ -2176,7 +2179,6 @@ body#product #primary_block #more_info_block {
 	padding:0px 0px 20px 0px;
 	font-size:12px;
 }
-body#authentication #columns .content #center_column #account-creation_form h3,
 body#password #columns .content #center_column h3,
 body#order-follow #columns .content #center_column h1,
 body#module-advsendtoafriend-sendtoafriend-form #columns .content #center_column h1{
@@ -2184,13 +2186,12 @@ body#module-advsendtoafriend-sendtoafriend-form #columns .content #center_column
 	text-align:right;
 	padding-right:7px;
 }
-
-body#authentication #columns .content #center_column #account-creation_form h3 span,
 body#password #columns .content #center_column h3 span,
 body#order-follow #columns .content #center_column h1 span,
 body#module-advsendtoafriend-sendtoafriend-form #columns .content #center_column h1 span{
 	float:left;
 }
+
 body#order-follow #columns .content #center_column > p/*,
 /*body#history #columns .content #center_column > p*/{
 	display:none;
@@ -2252,7 +2253,7 @@ body#module-advsendtoafriend-sendtoafriend-form p.submit{
 	overflow: auto;
 }
 body#module-advsendtoafriend-sendtoafriend-form input#submitAddtoafriend,
-body#authentication input#submitAccount,
+body#authentication button#submitAccount,
 body#identity .submit input[type=submit],
 body#module-invite-invite-program input#revive,
 body#module-invite-invite-program input[type=submit],
@@ -2265,7 +2266,7 @@ body#module-invite-invite-program input[type=submit],
 	border:0px none;
 	position:relative;
 	right:0px;
-	border-radius:0px !important;
+	border-radius:0px;
 	background: #565485
 }
 body#addresses .footer_links a{
@@ -3226,13 +3227,16 @@ body#module-invite-invite-program #idTab1 p.bold.message{
 	border-bottom:2px solid #e36ea2;
 	padding:10px;
 }
-body#authentication #columns .content #center_column #account-creation_form p.checkbox,
 body#password p.checkbox,
 body#identity p.checkbox,
 body#order p.checkbox,
 body#module-invite-invite-program #idTab1 p.checkbox{
 	display: table-row;
 }
+body#authentication #columns .content #center_column #account-creation_form p.checkbox{
+	display: block;
+	margin: 17px 0;
+}
 body#authentication #columns .content #center_column #account-creation_form p.checkbox span,
 body#password p.checkbox span,
 body#identity p.checkbox span,
@@ -3386,17 +3390,19 @@ body#authentication #columns .content #center_column #account-creation_form .acc
 body#authentication #columns .content #center_column #account-creation_form{
 	font-size:14px;
 }
-body#authentication #columns .content #center_column #account-creation_form p.checkbox .input,
-body#authentication #columns .content #center_column #account-creation_form p.checkbox .condition{
+body#authentication #columns .content #center_column #account-creation_form p.checkbox .input{
 	padding-top:10px;
+}
+body#authentication #columns .content #center_column #account-creation_form p.checkbox .condition{
+
+
 }
 body#authentication span.required_info{
-	display: block;
-	color:#e36ea2;
-	padding-bottom:20px;
+	display: none;
 }
 body#authentication form#account-creation_form .cart_navigation div.gradient{
-	float:right;
+	text-align: center;
+	width: 60%;
 }
 
 body#discount table.discount tr{
@@ -5348,11 +5354,9 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
   height: 30px;
   width: 100%; 
 }
-
 #product_list li div.expresscart_container {
 	float: right;
 }
-
 #product_list li div.expresscart_container a.button.expresscart {
   padding-left: 36px;
   background: url("../img/add_to_cart.png") no-repeat left center #fb66a9;
@@ -5366,3 +5370,59 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
   right: 0;
   z-index: 8;
 }
+
+#authentication #account-creation_container{
+	width: 80%;
+	margin: 0 auto;
+}
+
+#authentication #account-creation_container input[type=email],
+#authentication #account-creation_container input[type=text],
+#authentication #account-creation_container input[type=password]{
+	background: #f0f0f0;
+	border: none;
+	font-family: Century Gothic,CenturyGothic,AppleGothic,sans-serif;
+}
+
+#authentication #account-creation_container input::placeholder
+{
+	color: #a6a6a6;
+}
+
+#authentication #account-creation_container p.text,
+#authentication #account-creation_container p.password{
+	border-bottom: 1px solid #565385;
+	margin-bottom: 12px;
+	padding-bottom: 1px;
+}
+#authentication #account-creation_container p.checkbox .condition label{
+	color: #565385;
+	font-family: Century Gothic,CenturyGothic,AppleGothic,sans-serif;
+	text-align: justify;
+	text-justify: inter-word;
+	font-size: smaller;
+}
+
+#authentication #account-creation_container div.already_member {
+	text-align: center;
+}
+
+#authentication #account-creation_container div.already_member a,
+#authentication #account-creation_container div.already_member a:hover{
+	color: #565385;
+	font-family: Century Gothic,CenturyGothic,AppleGothic,sans-serif;
+	margin: 20px 0;
+	display: block;
+	text-decoration: underline;
+	font-size: 15px;
+
+}
+
+body#authentication .gradient button#submitAccount{
+	background:#e36ea2;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	text-transform: uppercase;
+	font-weight: bold;
+}

themes/site_mobile/header.tpl

@@ -83,372 +83,398 @@
     <!-- Google Tag Manager -->
     {literal}
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','GTM-PT7ZGQF');</script>
+	new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+	j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+	'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+	})(window,document,'script','dataLayer','GTM-PT7ZGQF');</script>
     {/literal}
     <!-- End Google Tag Manager -->
 
     {assign var='isEC' value=Configuration::get('GANALYTICS_EC')}
-		{if $cookie->id_lang == 2}
-			{literal}
-				<script>
-				  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-				  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-				  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-				  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-				  ga('create', 'UA-30665119-1', 'auto');
-				  {/literal}{if isset($page_name) && $page_name == 'category'}{literal}
-                    ga('require', 'ec');
-
-                  {/literal}{else if isset($page_name) && $page_name == 'product'}{literal}
-                    ga('require', 'ec');
-                    ga('ec:addProduct', {
-                      'id': {/literal}{$product->id}{literal},
-                      'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
-                      'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
-                    });
-
-                    ga('ec:setAction', 'detail');
-
-                  {/literal}{else if isset($page_name) && $page_name == 'order'}{literal}
-                    ga('require', 'ec');
-
-                    {/literal}
-                    {if $step == 0 || $step == 1}
-                        {if $cart}
-                            {assign var='cartProducts' value=$cart->getProducts()}
-                            {foreach from=$cartProducts item=cartProduct}
-                                {literal}
-                                ga('ec:addProduct', {
-                                  'id': {/literal}{$cartProduct['id_product']}{literal},
-                                  'name': "{/literal}{$cartProduct['name']}{literal}",
-                                  'category': "{/literal}{$cartProduct['category']}{literal}",
-                                  'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
-                                  'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
-                                });
-                                {/literal}
-                            {/foreach}
-                        {/if}
-                    {/if}
-                    {literal}
-
-                    {/literal}{if $step == 0}{literal}
-                        //cart
-                        ga('ec:setAction','checkout', {
-                            'step': 1,
-                        });
-                    {/literal}{else if $step == 1}{literal}
-                        // address
-                        ga('ec:setAction','checkout', {
-                            'step': 2,
-                        });
-                    {/literal}{else if $step == 2}{literal}
-                        // carrier
-                        ga('ec:setAction','checkout', {
-                            'step': 3,
-                        });
-                    {/literal}{else if $step == 3}{literal}
-                        // payment
-                        ga('ec:setAction','checkout', {
-                            'step': 4,
-                        });
-                    {/literal}{/if}
-                  {/if}{literal}
-
-                  {/literal}{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}{literal}
-                    // send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
-
-                    var re = new RegExp("([?&])(email=)[^&#]*", "g");
-                    var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
-                    var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
-                    if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
-                      // remove personal data from url before sending to GA
-                      url = window.location.search.replace(re, '$1$2');
-                      url = url.replace(re2, '$1$2');
-                      url = url.replace(re3, '$1$2');
-                      var page = window.location.pathname+url;
-                      ga('send', 'pageview', page);
-                    } else {
-                      ga('send', 'pageview');
-                    }
-                  {/literal}{/if}{literal}
-
-                  function onStepComplete(stepNumber, option, redirect, form) {
-                      ga('ec:setAction', 'checkout_option', {
-                        'step': stepNumber,
-                        'option': option
-                      });
-                      if (redirect != null) {
-                          ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                document.location = redirect;
-                             }
-                          });
-                      } else if (form != null) {
-                            ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                form.submit();
-                             }
-                          });
-                      } else {
-                        ga('send', 'event', 'Checkout', 'Option', {});
-                      }
-                  }
-                  function addToCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'add');
-                      ga('send', 'event', 'UX', 'click', 'add to cart');
-                  }
-                  function removeFromCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'remove');
-                      ga('send', 'event', 'UX', 'click', 'remove to cart');
-                  }
-				</script>
-			{/literal}
-		{elseif $cookie->id_lang == 3}
-			{literal}
-				<script>
-				  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-				  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-				  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-				  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-				  ga('create', 'UA-68580471-1', 'auto');
-				  {/literal}{if isset($page_name) && $page_name == 'category'}{literal}
-                    ga('require', 'ec');
-
-                  {/literal}{else if isset($page_name) && $page_name == 'product'}{literal}
-                    ga('require', 'ec');
-                    ga('ec:addProduct', {
-                      'id': {/literal}{$product->id}{literal},
-                      'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
-                      'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
-                    });
-
-                    ga('ec:setAction', 'detail');
-
-                  {/literal}{else if isset($page_name) && $page_name == 'order'}{literal}
-                    ga('require', 'ec');
-
-                    {/literal}
-                    {if $step == 0 || $step == 1}
-                        {if $cart}
-                            {assign var='cartProducts' value=$cart->getProducts()}
-                            {foreach from=$cartProducts item=cartProduct}
-                                {literal}
-                                ga('ec:addProduct', {
-                                  'id': {/literal}{$cartProduct['id_product']}{literal},
-                                  'name': "{/literal}{$cartProduct['name']}{literal}",
-                                  'category': "{/literal}{$cartProduct['category']}{literal}",
-                                  'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
-                                  'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
-                                });
-                                {/literal}
-                            {/foreach}
-                        {/if}
-                    {/if}
-                    {literal}
-
-                    {/literal}{if $step == 0}{literal}
-                        //cart
-                        ga('ec:setAction','checkout', {
-                            'step': 1,
-                        });
-                    {/literal}{else if $step == 1}{literal}
-                        // address
-                        ga('ec:setAction','checkout', {
-                            'step': 2,
-                        });
-                    {/literal}{else if $step == 2}{literal}
-                        // carrier
-                        ga('ec:setAction','checkout', {
-                            'step': 3,
-                        });
-                    {/literal}{else if $step == 3}{literal}
-                        // payment
-                        ga('ec:setAction','checkout', {
-                            'step': 4,
-                        });
-                    {/literal}{/if}
-                  {/if}{literal}
-
-                  {/literal}{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}{literal}
-                    // send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
-
-                    var re = new RegExp("([?&])(email=)[^&#]*", "g");
-                    var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
-                    var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
-                    if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
-                      // remove personal data from url before sending to GA
-                      url = window.location.search.replace(re, '$1$2');
-                      url = url.replace(re2, '$1$2');
-                      url = url.replace(re3, '$1$2');
-                      var page = window.location.pathname+url;
-                      ga('send', 'pageview', page);
-                    } else {
-                      ga('send', 'pageview');
-                    }
-                  {/literal}{/if}{literal}
-
-                  function onStepComplete(stepNumber, option, redirect, form) {
-                      ga('ec:setAction', 'checkout_option', {
-                        'step': stepNumber,
-                        'option': option
-                      });
-                      if (redirect != null) {
-                          ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                document.location = redirect;
-                             }
-                          });
-                      } else if (form != null) {
-                            ga('send', 'event', 'Checkout', 'Option', {
-                             hitCallback: function() {
-                                form.submit();
-                             }
-                          });
-                      } else {
-                        ga('send', 'event', 'Checkout', 'Option', {});
-                      }
-                  }
-                  function addToCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'add');
-                      ga('send', 'event', 'UX', 'click', 'add to cart');
-                  }
-                  function removeFromCartToGA(product) {
-                      ga('ec:addProduct', {
-                        'id': product.id,
-                        'name': product.name,
-                        'brand': product.category,
-                        'category': product.category,
-                        'variant' : product.variant,
-                        'price': product.price,
-                        'quantity': product.qty
-                      });
-                      ga('ec:setAction', 'remove');
-                      ga('send', 'event', 'UX', 'click', 'remove to cart');
-                  }
-				</script>
-			{/literal}
-		{/if}
-
-		<!-- Facebook Pixel Code -->
-		{if $cookie->id_lang == 2}
-			{literal}
-			<script>
-				!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-				n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-				n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-				t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-				document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-				fbq('init', '585280634957856');
-				fbq('track', "PageView");
-			</script>
-			{/literal}
-			<noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=585280634957856&amp;ev=PageView&amp;noscript=1"/></noscript>
-		{elseif $cookie->id_lang == 3}
-			{literal}
-			<script>
-				!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-				n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-				n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-				t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-				document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-				fbq('init', '778018572325168');
-				fbq('track', "PageView");
-			</script>
-			{/literal}
-			<noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=778018572325168&amp;ev=PageView&amp;noscript=1"/></noscript>
-		{/if}
-
+	{if $cookie->id_lang == 2}
 		{literal}
 		<script>
-			fbq('track', 'ViewContent', {
-				content_name:'{/literal}{$page_name|escape:'html':'UTF-8'}{literal}'
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+		ga('create', 'UA-30665119-1', 'auto');
+		{/literal}
+		{if isset($page_name) && $page_name == 'category'}
+		{literal}
+			ga('require', 'ec');
+
+		{/literal}
+		{else if isset($page_name) && $page_name == 'product'}
+		{literal}
+			ga('require', 'ec');
+			ga('ec:addProduct', {
+			  'id': {/literal}{$product->id}{literal},
+			  'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
+			  'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
 			});
+			
+			ga('ec:setAction', 'detail');
+
+		{/literal}
+		{else if isset($page_name) && $page_name == 'order'}
+		{literal}
+			ga('require', 'ec');
+
+			{/literal}
+			{if $step == 0 || $step == 1}
+			    {if $cart}
+			        {assign var='cartProducts' value=$cart->getProducts()}
+			        {foreach from=$cartProducts item=cartProduct}
+			            {literal}
+			            ga('ec:addProduct', {
+			              'id': {/literal}{$cartProduct['id_product']}{literal},
+			              'name': "{/literal}{$cartProduct['name']}{literal}",
+			              'category': "{/literal}{$cartProduct['category']}{literal}",
+			              'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
+			              'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
+			            });
+			            {/literal}
+			        {/foreach}
+			    {/if}
+			{/if}
+			{literal}
+
+			{/literal}
+			{if $step == 0}{literal}
+			    //cart
+			    ga('ec:setAction','checkout', {
+			        'step': 1,
+			    });
+			{/literal}
+			{else if $step == 1}{literal}
+			    // address
+			    ga('ec:setAction','checkout', {
+			        'step': 2,
+			    });
+			{/literal}
+			{else if $step == 2}{literal}
+			    // carrier
+			    ga('ec:setAction','checkout', {
+			        'step': 3,
+			    });
+			{/literal}
+			{else if $step == 3}{literal}
+			    // payment
+			    ga('ec:setAction','checkout', {
+			        'step': 4,
+			    });
+			{/literal}
+			{/if}
+		{/if}
+		{literal}
+
+		{/literal}
+		{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}
+		{literal}
+			// send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
+			var re = new RegExp("([?&])(email=)[^&#]*", "g");
+			var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
+			var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
+			if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
+			  // remove personal data from url before sending to GA
+			  url = window.location.search.replace(re, '$1$2');
+			  url = url.replace(re2, '$1$2');
+			  url = url.replace(re3, '$1$2');
+			  var page = window.location.pathname+url;
+			  ga('send', 'pageview', page);
+			} else {
+			  ga('send', 'pageview');
+			}
+           {/literal}
+		{/if}
+		{literal}
+
+		function onStepComplete(stepNumber, option, redirect, form) {
+		    ga('ec:setAction', 'checkout_option', {
+		      'step': stepNumber,
+		      'option': option
+		    });
+		    if (redirect != null) {
+		        ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              document.location = redirect;
+		           }
+		        });
+		    } else if (form != null) {
+		          ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              form.submit();
+		           }
+		        });
+		    } else {
+		      ga('send', 'event', 'Checkout', 'Option', {});
+		    }
+		}
+		function addToCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'add');
+		    ga('send', 'event', 'UX', 'click', 'add to cart');
+		}
+		function removeFromCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'remove');
+		    ga('send', 'event', 'UX', 'click', 'remove to cart');
+		}
 		</script>
 		{/literal}
+	{elseif $cookie->id_lang == 3}
+		{literal}
+		<script>
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-		{if isset($facebook_validation) && $facebook_validation}
+		ga('create', 'UA-68580471-1', 'auto');
+		{/literal}
+		{if isset($page_name) && $page_name == 'category'}
+		{literal}
+			ga('require', 'ec');
+
+		{/literal}
+		{else if isset($page_name) && $page_name == 'product'}
+		{literal}
+			ga('require', 'ec');
+			ga('ec:addProduct', {
+			  'id': {/literal}{$product->id}{literal},
+			  'name': "{/literal}{$product->name|escape:'htmlall':'UTF-8'}{literal}",
+			  'category': "{/literal}{$sale->title[$cookie->id_lang]}{literal}"
+			});
+			
+			ga('ec:setAction', 'detail');
+
+		{/literal}
+		{else if isset($page_name) && $page_name == 'order'}
+		{literal}
+			ga('require', 'ec');
+
+			{/literal}
+			{if $step == 0 || $step == 1}
+			    {if $cart}
+			        {assign var='cartProducts' value=$cart->getProducts()}
+			        {foreach from=$cartProducts item=cartProduct}
+			            {literal}
+			            ga('ec:addProduct', {
+			              'id': {/literal}{$cartProduct['id_product']}{literal},
+			              'name': "{/literal}{$cartProduct['name']}{literal}",
+			              'category': "{/literal}{$cartProduct['category']}{literal}",
+			              'price': {/literal}{Tools::ps_round(Product::getPriceStatic((int)$cartProduct['id_product'], true, ((isset($cartProduct['id_product_attribute']) AND !empty($cartProduct['id_product_attribute'])) ? (int)($cartProduct['id_product_attribute']) : NULL), 2), 2)}{literal},
+			              'quantity': {/literal}{$cartProduct['cart_quantity']}{literal}
+			            });
+			            {/literal}
+			        {/foreach}
+			    {/if}
+			{/if}
+			{literal}
+		
+			{/literal}
+			{if $step == 0}
+			{literal}
+			    //cart
+			    ga('ec:setAction','checkout', {
+			        'step': 1,
+			    });
+			{/literal}
+			{else if $step == 1}
+			{literal}
+			    // address
+			    ga('ec:setAction','checkout', {
+			        'step': 2,
+			    });
+			{/literal}
+			{else if $step == 2}
+			{literal}
+			    // carrier
+			    ga('ec:setAction','checkout', {
+			        'step': 3,
+			    });
+			{/literal}
+			else if $step == 3}
+			{literal}
+			    // payment
+			    ga('ec:setAction','checkout', {
+			        'step': 4,
+			    });
+			{/literal}
+			{/if}
+		{/if}
+		{literal}
+
+		{/literal}
+		{if isset($page_name) && (($page_name == 'order-confirmation' && $isEC==0) || $page_name != 'order-confirmation')}
+		{literal}
+				// send pageview via header.tpl du module GA si isEC=1 and $page_name == 'order-confirmation'
+				var re = new RegExp("([?&])(email=)[^&#]*", "g");
+				var re2 = new RegExp("([?&])(customer_lastname=)[^&#]*", "g");
+				var re3 = new RegExp("([?&])(customer_firstname=)[^&#]*", "g");
+				if (document.location.href.match(re) || document.location.href.match(re2) || document.location.href.match(re3)) {
+					// remove personal data from url before sending to GA
+                    url = window.location.search.replace(re, '$1$2');
+                    url = url.replace(re2, '$1$2');
+                    url = url.replace(re3, '$1$2');
+                    var page = window.location.pathname+url;
+                    ga('send', 'pageview', page);
+				} else {
+					ga('send', 'pageview');
+				}
+		{/literal}
+		{/if}
+		{literal}
+
+		function onStepComplete(stepNumber, option, redirect, form) {
+		    ga('ec:setAction', 'checkout_option', {
+		      'step': stepNumber,
+		      'option': option
+		    });
+		    if (redirect != null) {
+		        ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              document.location = redirect;
+		           }
+		        });
+		    } else if (form != null) {
+		          ga('send', 'event', 'Checkout', 'Option', {
+		           hitCallback: function() {
+		              form.submit();
+		           }
+		        });
+		    } else {
+		      ga('send', 'event', 'Checkout', 'Option', {});
+		    }
+		}
+		function addToCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'add');
+		    ga('send', 'event', 'UX', 'click', 'add to cart');
+		}
+		function removeFromCartToGA(product) {
+		    ga('ec:addProduct', {
+		      'id': product.id,
+		      'name': product.name,
+		      'brand': product.category,
+		      'category': product.category,
+		      'variant' : product.variant,
+		      'price': product.price,
+		      'quantity': product.qty
+		    });
+		    ga('ec:setAction', 'remove');
+		    ga('send', 'event', 'UX', 'click', 'remove to cart');
+		}
+		</script>
+		{/literal}
+	{/if}
+
+	<!-- Facebook Pixel Code -->
+	{if $cookie->id_lang == 2}
+		{literal}
+		<script>
+		!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+		n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+		n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+		t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+		document,'script','//connect.facebook.net/en_US/fbevents.js');
+
+		fbq('init', '585280634957856');
+		fbq('track', "PageView");
+		</script>
+		{/literal}
+		<noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=585280634957856&amp;ev=PageView&amp;noscript=1"/></noscript>
+	{elseif $cookie->id_lang == 3}
+		{literal}
+		<script>
+		!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+		n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+		n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+		t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+		document,'script','//connect.facebook.net/en_US/fbevents.js');
+
+		fbq('init', '778018572325168');
+		fbq('track', "PageView");
+		</script>
+		{/literal}
+		<noscript><img height="1" width="1" style="display:none" src="https://www.facebook.com/tr?id=778018572325168&amp;ev=PageView&amp;noscript=1"/></noscript>
+	{/if}
+
+	{literal}
+	<script>
+	fbq('track', 'ViewContent', {
+		content_name:'{/literal}{$page_name|escape:'html':'UTF-8'}{literal}'
+	});
+	</script>
+	{/literal}
+
+	{if isset($facebook_validation) && $facebook_validation}
+		{literal}
+		<script>
+		fbq('track', 'CompleteRegistration');
+		</script>
+		{/literal}
+	{/if}
+
+	{if isset($page_name)}
+		{if $page_name == 'order-confirmation'}
 			{literal}
 			<script>
-				fbq('track', 'CompleteRegistration');
+			fbq('track', 'Purchase', {
+				value: '{/literal}{$order->total_paid}{literal}',
+				currency: "{/literal}{$currency['iso_code']}{literal}"
+			});
 			</script>
 			{/literal}
 		{/if}
+	{/if}
+	<!-- End Facebook Pixel Code -->
 
-		{if isset($page_name)}
-			{if $page_name == 'order-confirmation'}
-				{literal}
-				<script>
-					fbq('track', 'Purchase', {
-						value: '{/literal}{$order->total_paid}{literal}',
-						currency: "{/literal}{$currency['iso_code']}{literal}"
-					});
-				</script>
-				{/literal}
-			{/if}
-		{/if}
-		<!-- End Facebook Pixel Code -->
-
-		<!-- crazyegg -->
-		{literal}
-		<script type="text/javascript">
-			setTimeout(function(){var a=document.createElement("script");
-			var b=document.getElementsByTagName("script")[0];
-			a.src=document.location.protocol+"//script.crazyegg.com/pages/scripts/0047/9841.js?"+Math.floor(new Date().getTime()/3600000);
-			a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
-		</script>
-		{/literal}  
-    
-    	{include file="$tpl_dir./header-meta-fb.tpl"}
+	<!-- crazyegg -->
+	{literal}
+	<script type="text/javascript">
+	setTimeout(function(){var a=document.createElement("script");
+	var b=document.getElementsByTagName("script")[0];
+	a.src=document.location.protocol+"//script.crazyegg.com/pages/scripts/0047/9841.js?"+Math.floor(new Date().getTime()/3600000);
+	a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
+	</script>
+	{/literal}  
+   
+   	{include file="$tpl_dir./header-meta-fb.tpl"}
 	</head>
 
 	<body {if $page_name}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if} class="{$bodyClass}{if $cookie->isLogged()} logged{/if}">
 
-	<!--[if lte IE 6]>
-	<div id="ie_notification" style="background: #FFFFE1; border-bottom: 1px solid #A0A0A0; padding: 10px;line-height: 1.4em; text-align: justify;">
-		<strong>{l s='Warning, you are currently using an obsolete browser.'}</strong>
-		{l s='It is a potential source of security breaches and may not display this website properly. Please update your browser to'} <a style="text-decoration: underline;" href="http://windows.microsoft.com/{$lang_iso}-{$lang_iso|strtoupper}/internet-explorer/downloads/ie" onclick="window.open(this.href); return false;">Microsoft Internet Explorer 8</a>.
-		{l s='You can also use an alternative browser, such as'} <a style="text-decoration: underline;" href="http://mozilla-europe.org/{$lang_iso}/" onclick="window.open(this.href); return false;">Mozilla Firefox</a>, <a style="text-decoration: underline;" href="http://www.opera.com/" onclick="window.open(this.href); return false;">Opera</a>, <a style="text-decoration: underline;" href="http://www.google.com/chrome" onclick="window.open(this.href); return false;">Google Chrome</a> {l s='or'} <a style="text-decoration: underline;" href="http://www.apple.com/{$lang_iso}/safari/" onclick="window.open(this.href); return false;">Safari</a>.
-		{l s='These softwares are free. If you don\'t have administrative rights on your computer to install programs, please contact your system administrator.'}
-	</div>
-	<![endif]-->
-
-  <!-- Google Tag Manager (noscript) -->
-  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PT7ZGQF" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <!-- End Google Tag Manager (noscript) -->
+	<!-- Google Tag Manager (noscript) -->
+	<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PT7ZGQF"
+	 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+	<!-- End Google Tag Manager (noscript) -->
 
 	{if !$content_only}
 		{if isset($restricted_country_mode) && $restricted_country_mode}

themes/site_mobile/lang/fr.php

@@ -97,8 +97,9 @@ $_LANG['authentication_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Continuer';
 $_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Inscrivez-vous, c\'est gratuit !';
 $_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
 $_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caractères min.)';
-$_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'S\'inscrire';
+$_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'Je crée mon compte';
 $_LANG['authentication_59e7ac55563a4f1fff63c9179e6c8937'] = 'Veuillez accepter nos conditions d\'utilisation pour continuer';
+$_LANG['authentication_925cc1fa40ed38377bcb2b77b5315d9c'] = 'Je suis déjà membre';
 $_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes';
 $_LANG['best-sales_32af07c9205de16855c50c3d20a51698'] = 'Pas de meilleure vente pour le moment.';
 $_LANG['breadcrumb_c75dacb862a2bb03903ade08898c9146'] = 'Vous êtes ici :';

themes/site_mobile/modules/blocklogo/blocklogo.tpl

@@ -1,6 +1,6 @@
 <!-- MODULE Block logo -->
 <div class="logo_block">
-    {if isset($smarty.get.sponsor) &&  isset($smarty.get.create_account)}
+    {if isset($smarty.get.sponsor) || isset($smarty.get.create_account)}
 		<a title="{l s='Return to the homepage' mod='blocklogo'}"><img src="{$img_dir}logo_mobile_{$cookie->id_lang}.png" alt="" /></a>
 	{else}
 		<a href="{$base_dir_ssl}" title="{l s='Return to the homepage' mod='blocklogo'}"><img src="{$img_dir}logo_mobile_{$cookie->id_lang}.png" alt="" /></a>

themes/site_mobile/modules/invite/authentication.tpl

@@ -1,7 +1 @@
-<fieldset class="account_creation" {if isset($sponsor_email)} style="display:none;" {/if}>
-	<p>
-		<label for="referralprogram">{l s='E-mail address of your sponsor' mod='invite'}</label>
-		<input type="text" size="52" maxlength="128" class="text" id="referralprogram" name="invite" value="{if isset($sponsor_email)}{$sponsor_email|escape:'htmlall':'UTF-8'}{elseif isset($smarty.post.invite)}{$smarty.post.invite|escape:'htmlall':'UTF-8'}{elseif isset($referralprogram)}{$referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
-	</p>
-</fieldset>
 {if isset($tag_auth)}{$tag_auth}{/if}

themes/site_mobile/modules/landingpages/authentication.tpl

@@ -0,0 +1,40 @@
+{if $landing}
+<style type="text/css">
+    body#authentication .insert_top_account_creation {
+        width: 100%;
+    }
+
+    body#authentication .insert_top_account_creation img {
+        width: 100%;
+        height: auto;
+    }
+
+    body#authentication span.subtitle_create_account {
+        display: none;
+    }
+
+    body#authentication #columns .content #center_column #account-creation_form h3{
+        display: none;
+    }
+
+    body#authentication div.paiement_logo_block a.payment{
+        display: none;
+    }
+
+</style>
+<script type="text/javascript">
+    {literal}
+    $(document).ready(function () {
+        $('#columns').before('<div class="insert_top_account_creation">' +
+            '<img src="{/literal}{$base_dir_ssl}modules/landingpages/img/{$id_lp}_2_{$cookie->id_lang}.jpg{literal}">' +
+            '</div>');
+    });
+    {/literal}
+</script>
+{/if}
+<div class="hidden" style="display: none !important;">
+    <input type="hidden" name="lp" value="{$smarty.request.lp|escape:'htmlall':'UTF-8'}"/>
+    {if isset($tag)}
+        {$tag}
+    {/if}
+</div>

themes/site_mobile/modules/purchaseguide/views/front/category.tpl

@@ -0,0 +1,17 @@
+{include file="$tpl_dir./breadcrumb.tpl"}
+
+<h1 class="title"><span>Guide d'achat</span></h1>
+<div class="rte{if $content_only} content_only{/if}">
+
+<div class="row">
+	{foreach from=$categories item=c}
+	<div class="guide-content-category">
+		<a href="guide/{$c.id_guide_category}-{$c.link_rewrite}">
+			<img alt="{$c.name}" src="./img/purchaseguide/{$c.id_guide_category}.jpg">
+			<div style="clear:both;"><span>{$c.meta_title}</span></div>
+		</a>
+	</div>
+	{/foreach}
+</div>
+
+</div>

themes/site_mobile/modules/purchaseguide/views/front/content.tpl

@@ -0,0 +1,35 @@
+{include file="$tpl_dir./breadcrumb.tpl"}
+
+<h1 class="title"><span>Guide d'achat - {$categoryTitle}</span></h1>
+<div class="content-guide rte{if $content_only} content_only{/if}">
+
+{if $subcategoryTitle !== null}
+<div class="guide-intro">
+	<div class="guide-intro-left">
+		<h2 class="title">{$subcategoryTitle}</h2>
+		<div>
+			<p>{$subcategoryContent}</p>
+		</div>
+	</div>
+</div>
+
+<div class="guide-content">
+<div class="guide-content-menu">
+<ul>
+{foreach from=$postList item=p}
+<li{if $p.id_guide_post==$id_guide_post_select} class="selected"{/if}>
+	<a href="{$base_dir_ssl}guide/{$categoryRewrite}/{$subcategoryRewrite}/{$p.id_guide_post}-{$p.link_rewrite}">{$p.meta_title}</a>
+</li>
+{/foreach}
+</ul>
+</div>
+
+<div class="guide-content-txt">
+	<h4>{$postTitle}</h4>
+	<div>{$postContent}</div>
+</div>
+
+</div>
+{/if}
+
+</div>

tools/smarty/compile/wrtWNv5QK

@@ -0,0 +1,27 @@
+<?php /* Smarty version Smarty-3.0.7, created on 2016-06-07 10:12:38
+         compiled from "/var/www/bebeboutik/themes/site/modules/loyalty/shopping-cart.tpl" */ ?>
+<?php /*%%SmartyHeaderCode:1219396196575681f608b0b0-82744630%%*/if(!defined('SMARTY_DIR')) exit('no direct access allowed');
+$_smarty_tpl->decodeProperties(array (
+  'file_dependency' => 
+  array (
+    '192d1063d1d559806c934b294559e0e0bfa73629' => 
+    array (
+      0 => '/var/www/bebeboutik/themes/site/modules/loyalty/shopping-cart.tpl',
+      1 => 1465230741,
+      2 => 'file',
+    ),
+  ),
+  'nocache_hash' => '1219396196575681f608b0b0-82744630',
+  'function' => 
+  array (
+  ),
+  'has_nocache_code' => false,
+)); /*/%%SmartyHeaderCode%%*/?>
+<?php if ($_smarty_tpl->getVariable('discount_value')->value>0){?>
+<p id="loyalty_cart">
+		<?php echo smartyTranslate(array('s'=>'En validant ce panier vous recevrez un crédit de '),$_smarty_tpl);?>
+ <b><?php echo Product::convertPrice(array('price'=>$_smarty_tpl->getVariable('voucher')->value),$_smarty_tpl);?>
+</b> <?php echo smartyTranslate(array('s'=>'à utiliser lors de vos prochaines commandes'),$_smarty_tpl);?>
+
+</p>
+<?php }?>

tools/swift/Swift/Message/Headers.php

@@ -425,7 +425,6 @@ class Swift_Message_Headers
         $encoded_value[$key] = preg_replace_callback('/<([^>]+)>/', function($matches) {
           return str_replace($this->LE, '', '<' . $matches[1] . '>');
         }, $encoded_value[$key]);
-
       }
 
       //Turn our header into an array of lines ready for wrapping around the encoding specification