API MODIFICATIONS

Fix error PHP5.5

See merge request !2

adm/ajax_vp.php

@@ -85,7 +85,7 @@ if (isset($_GET['getSales'])){
 				<td class="text-center '.(in_array('fr', $sale->versions) ? 'green' : 'rose').'">FR</td>
 				<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? 'Philea': ''): '').'</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" class="position">';
 				if($sale->lock_position == 1){
                     echo '<span class="anticon anticon-lock"></span>';

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

@@ -235,19 +235,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 {
@@ -314,7 +301,6 @@ div.tagsinput span.tag a {
     opacity: 0.6;
 }
 
-
 /* form img */
 .form-control.image-preview-filename {
     height: 28px;
@@ -403,6 +389,19 @@ table.table 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;
@@ -412,6 +411,19 @@ table.table 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;
@@ -497,17 +509,3 @@ table.table 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;
-}

config/autoload.php

@@ -30,12 +30,17 @@ function __autoload($className)
 	if (function_exists('smartyAutoload') AND smartyAutoload($className))
 		return true;
 
+	if (function_exists('Predis\predisAutoload') AND Predis\predisAutoload($className)) {
+        return true;
+    }
+
+
 	$className = str_replace(chr(0), '', $className);
 	$classDir = dirname(__FILE__).'/../classes/';
 	$overrideDir = dirname(__FILE__).'/../override/classes/';
 	$file_in_override = file_exists($overrideDir.$className.'.php');
 	$file_in_classes = file_exists($classDir.$className.'.php');
-	
+
 	// This is a Core class and its name is the same as its declared name
 	if (substr($className, -4) == 'Core')
 		require_once($classDir.substr($className, 0, -4).'.php');

config/autoload_lumen.php

@@ -0,0 +1,63 @@
+<?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: 6874 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+spl_autoload_register(function($className) {
+    if (function_exists('smartyAutoload') AND smartyAutoload($className))
+        return true;
+
+    if (function_exists('Predis\predisAutoload') AND Predis\predisAutoload($className)) {
+        return true;
+    }
+
+    $className = str_replace(chr(0), '', $className);
+    $classDir = dirname(__FILE__).'/../classes/';
+    $overrideDir = dirname(__FILE__).'/../override/classes/';
+    $file_in_override = file_exists($overrideDir.$className.'.php');
+    $file_in_classes = file_exists($classDir.$className.'.php');
+
+    // This is a Core class and its name is the same as its declared name
+    if (substr($className, -4) == 'Core')
+        require_once($classDir.substr($className, 0, -4).'.php');
+    else
+    {
+        if ($file_in_override && $file_in_classes)
+        {
+            require_once($classDir.str_replace(chr(0), '', $className).'.php');
+            require_once($overrideDir.$className.'.php');
+        }
+        elseif (!$file_in_override && $file_in_classes)
+        {
+            require_once($classDir.str_replace(chr(0), '', $className).'.php');
+            $classInfos = new ReflectionClass($className.((interface_exists($className, false) or class_exists($className, false)) ? '' : 'Core'));
+            if (!$classInfos->isInterface() && substr($classInfos->name, -4) == 'Core')
+                eval(($classInfos->isAbstract() ? 'abstract ' : '').'class '.$className.' extends '.$className.'Core {}');
+        }
+        elseif ($file_in_override && !$file_in_classes)
+            require_once($overrideDir.$className.'.php');
+    }
+});
+

config/defines.inc.php

@@ -96,6 +96,7 @@ define('_PS_SWIFT_DIR_',            _PS_TOOL_DIR_.'swift/');
 define('_PS_FPDF_PATH_',            _PS_TOOL_DIR_.'fpdf/');
 define('_PS_TAASC_PATH_',            _PS_TOOL_DIR_.'taasc/');
 define('_PS_PEAR_XML_PARSER_PATH_', _PS_TOOL_DIR_.'pear_xml_parser/');
+define('_PS_PREDIS_DIR_',           _PS_TOOL_DIR_.'predis/');
 
 /* settings php */
 define('_PS_TRANS_PATTERN_',            '(.*[^\\\\])');

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>');

mails/fr/in_transit_dropshipping.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Message de {shop_name}</title>
+</head>
+<body>
+    <table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
+        <tr>
+            <td align="left">
+                <a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_logo}" style="border:none;" ></a>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">Bonjour <strong>{firstname} {lastname}</strong>,</td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                <b>Vous avez pass&eacute; commande r&eacute;cemment sur notre site B&eacute;b&eacute; Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n&#176;{id_order} vient d'être envoy&eacute; directement de chez notre fournisseur par le transporteur {carrier}.</b>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Voici votre num&eacute;ro de suivi : {tracking_number}
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+                Vous pourrez consulter l'acheminnement de votre colis à l'adresse suivante : <a href="{followup}" style="color: #e26ea2;">{followup}</a>
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               A très vite sur B&eacute;b&eacute; Boutik !
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="left">
+               Cordialement,
+            </td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <tr>
+            <td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
+                {shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>

mails/fr/in_transit_dropshipping.txt

@@ -0,0 +1,13 @@
+Bonjour {firstname} {lastname}
+
+Vous avez passé commande récemment sur notre site Bébé Boutik. Nous vous informons que le/les produits de la marque {sale} pour votre commande n°{id_order} vient d'être envoyé directement de chez notre fournisseur par le transporteur {carrier}.
+
+Voici votre numéro de suivi : {tracking_number}
+
+Vous pourrez consulter l'acheminnement de votre colis à l'adresse suivante : {followup}
+
+A très vite sur Bébé Boutik !
+
+Cordialement,
+
+{shop_name} - {shop_url}

modules/ant_dropshippingtracking/AdminAntDropshippingtracking.php

@@ -0,0 +1,312 @@
+<?php
+if(!defined('_PS_VERSION_')) {
+    exit;
+}
+include_once(_PS_ROOT_DIR_.'/modules/privatesales/Sale.php');
+require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php');
+
+class AdminAntDropshippingtracking extends AdminTab
+{
+    public function postProcess() {
+        if(Tools::isSubmit('submitOrderTracking') && Tools::getValue('id_sale')){
+            $id_sale = (int)Tools::getValue('id_sale');
+            $sale_names = array();
+            foreach(Db::getInstance()->ExecuteS('
+                SELECT c.`name`, c.`id_lang`
+                FROM `'._DB_PREFIX_.'privatesale` p
+                LEFT JOIN `'._DB_PREFIX_.'category_lang` c ON (c.`id_category` = p.`id_category`)
+                WHERE p.`id_sale` = '.(int)$id_sale.'
+            ') as $key => $row) {
+                $sale_names[(int)$row['id_lang']] = $row['name'];
+            }
+            $sale_products = array();
+            foreach(Db::getInstance()->ExecuteS('
+                SELECT DISTINCT `id_product`
+                FROM `'._DB_PREFIX_.'product_ps_cache`
+                WHERE `id_sale` = '.(int) $id_sale.'
+            ') as $key => $row) {
+                $sale_products[(int)$row['id_product']] = (int)$row['id_product'];
+            }
+
+            if(isset($_FILES['csvfile']) && $_FILES['csvfile']['name'] != '') {
+
+                $f = fopen($_FILES['csvfile']['tmp_name'], 'r');
+                fgetcsv($f, 0, ';');
+                $i = 1;
+
+                $orders = array();
+                while($line = fgetcsv($f, 0, ';')) {
+                    $i++;
+                    $orders[(int) $line[0]] = array(
+                        'id_order' => (int) $line[0],
+                        'tracking_number' => trim($line[1]),
+                        'carrier' => $line[2],
+                        'link' => trim($line[3]),
+                    );
+                }
+                if(!empty($orders)) {
+                    foreach ($orders as $id_order => $o) {
+                        $order = new Order((int)$id_order);
+                        $order_details = array();
+                        foreach(Db::getInstance()->ExecuteS('
+                            SELECT DISTINCT `id_order_detail`, `product_name`,`product_id`, `product_attribute_id`, `product_quantity` - GREATEST(`product_quantity_return`, `product_quantity_refunded`) AS `quantity`
+                            FROM `'._DB_PREFIX_.'order_detail`
+                            WHERE `id_order` = '.(int) $id_order.'
+                        ') as $key => $row) {
+                            $order_details[(int)$row['id_order_detail']] = $row;
+                        }
+
+                        $fully_sent     = false;
+                        $products_sent  = array();
+
+                        foreach(Db::getInstance()->ExecuteS('
+                            SELECT d.`id_order_detail`, IF(
+                                (d.`product_quantity` - IF(
+                                    d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+                                ) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+                            ) AS `remain`
+                            FROM `'._DB_PREFIX_.'order_detail` d
+                            LEFT OUTER JOIN `'._DB_PREFIX_.'lapostews` s
+                            ON s.`id_order_detail` = d.`id_order_detail`
+                            WHERE d.`id_order` = '.(int) $order->id.'
+                            GROUP BY d.`id_order_detail`
+                        ') as $quantity_remain) {
+                            if((int) $quantity_remain['remain'] == 0) {
+                                $products_sent[] = (int) $quantity_remain['id_order_detail'];
+                            }
+                        }
+
+                        foreach(Db::getInstance()->ExecuteS('
+                            SELECT d.`id_order_detail`, IF(
+                                (d.`product_quantity` - IF(
+                                    d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+                                ) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+                            ) AS `remain`
+                            FROM `'._DB_PREFIX_.'order_detail` d
+                            LEFT OUTER JOIN `'._DB_PREFIX_.'exapaqws` s
+                            ON s.`id_order_detail` = d.`id_order_detail`
+                            WHERE d.`id_order` = '.(int) $order->id.'
+                            GROUP BY d.`id_order_detail`
+                        ') as $quantity_remain) {
+                            if((int) $quantity_remain['remain'] == 0) {
+                                $products_sent[] = (int) $quantity_remain['id_order_detail'];
+                            }
+                        }
+
+                        foreach(Db::getInstance()->ExecuteS('
+                            SELECT d.`id_order_detail`, IF(
+                                (d.`product_quantity` - IF(
+                                    d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+                                ) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+                            ) AS `remain`
+                            FROM `'._DB_PREFIX_.'order_detail` d
+                            LEFT OUTER JOIN `'._DB_PREFIX_.'mondialrelay_parcel` s
+                                ON s.`id_order_detail` = d.`id_order_detail`
+                            WHERE d.`id_order` = '.(int) $order->id.'
+                            GROUP BY d.`id_order_detail`
+                        ') as $quantity_remain) {
+                            if((int) $quantity_remain['remain'] == 0) {
+                                $products_sent[] = (int) $quantity_remain['id_order_detail'];
+                            }
+                        }
+
+                        foreach(Db::getInstance()->ExecuteS('
+                            SELECT d.`id_order_detail`, IF(
+                                (d.`product_quantity` - IF(
+                                    d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+                                ) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+                            ) AS `remain`
+                            FROM `'._DB_PREFIX_.'order_detail` d
+                            LEFT OUTER JOIN `'._DB_PREFIX_.'philea_parcel` s
+                                ON s.`id_order_detail` = d.`id_order_detail`
+                            WHERE d.`id_order` = '.(int) $order->id.'
+                            GROUP BY d.`id_order_detail`
+                        ') as $quantity_remain) {
+                            if((int) $quantity_remain['remain'] == 0) {
+                                $products_sent[] = (int) $quantity_remain['id_order_detail'];
+                            }
+                        }
+
+                        foreach(Db::getInstance()->ExecuteS('
+                            SELECT d.`id_order_detail`, IF(
+                                (d.`product_quantity` - IF(
+                                    d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+                                ) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+                            ) AS `remain`
+                            FROM `'._DB_PREFIX_.'order_detail` d
+                            LEFT OUTER JOIN `'._DB_PREFIX_.'ant_dropshipping_parcel` s
+                                ON s.`id_order_detail` = d.`id_order_detail`
+                            WHERE d.`id_order` = '.(int) $order->id.'
+                            GROUP BY d.`id_order_detail`
+                        ') as $quantity_remain) {
+                            if((int) $quantity_remain['remain'] == 0) {
+                                $products_sent[] = (int) $quantity_remain['id_order_detail'];
+                            }
+                        }
+                        $remaining = array();
+                        $html_products_sent = '';
+                        foreach($order_details as $id_order_detail => $d) {
+                            if(!in_array($id_order_detail, $products_sent) && !in_array($d['product_id'],$sale_products)) {
+                                $remaining[] = (int)$id_order_detail;
+                            } elseif(!in_array($id_order_detail, $products_sent) && in_array((int)$d['product_id'],$sale_products)) {
+                                $html_products_sent .= '<br />'."\r\n".$d['quantity'] . 'x' . ' ' . $p['product_name'];
+                                Db::getInstance()->ExecuteS('
+                                    INSERT INTO `'._DB_PREFIX_.'ant_dropshipping_parcel`
+                                    VALUES (
+                                        '.(int) $id_order_detail.',
+                                        '.(int) $d['quantity'].',
+                                        "'.pSQL($o['tracking_number']).'",
+                                        "'.pSQL($o['carrier']).'",
+                                        "'.pSQL($o['link']).'",
+                                        NOW()
+                                    )
+                                ');
+                            }
+                        }
+
+                        if(count($remaining) == 0) {
+                            $fully_sent = true;
+                        } else {
+                            $fully_sent = false;
+                        }
+
+                        $customer = new Customer((int) $order->id_customer);
+                        $templateVars = array(
+                            '{followup}'            => $o['link'],
+                            '{carrier}'             => $o['carrier'],
+                            '{tracking_number}'     => $o['tracking_number'],
+                            '{sale}'                => $sale_names[(int)$order->id_lang],
+                            '{firstname}'           => $customer->firstname,
+                            '{lastname}'            => $customer->lastname,
+                            '{id_order}'            => (int) $order->id,
+                            // '{product_list}'        => !empty($html_products_sent)? $content_html.$html_products_sent: '',
+                            // '{product_list_txt}'    => !empty($html_products_sent)? $content_txt.strip_tags($html_products_sent): '',
+                        );
+
+                        $history = new OrderHistory();
+                        $history->id_order = (int) $order->id;
+                        $history->changeIdOrderState(($fully_sent? Configuration::get('PS_OS_SHIPPING'): 17), (int) $order->id);
+                        $history->id_employee = 0;
+                        $history->add();
+
+                        Db::getInstance()->ExecuteS('
+                            INSERT INTO `'._DB_PREFIX_.'shipping_history`
+                            VALUES (
+                                '.(int) $order->id.',
+                                "'.pSQL($o['shipping_number']).'",
+                                NOW(),
+                                0,
+                                '.(int)$id_sale.'
+                            )
+                        ');
+
+                        $order->shipping_number = $o['tracking_number'];
+                        $order->save();
+
+                        global $_LANGMAIL;
+                        $subject = 'Package in transit';
+                        Mail::Send(
+                            intval($order->id_lang),
+                            'in_transit_dropshipping',
+                            (
+                                (is_array($_LANGMAIL) && key_exists($subject, $_LANGMAIL))
+                                ? $_LANGMAIL[$subject]
+                                : $subject
+                            ),
+                            $templateVars,
+                            $customer->email,
+                            $customer->firstname.' '.$customer->lastname
+                        );
+                    }
+                    if(!isset($_COOKIE['logistics_sales'])){
+                        setcookie('logistics_sales', $id_sale, 0, __PS_BASE_URI__);
+                    } else {
+                        $sales = explode('-', $_COOKIE['logistics_sales']);
+                        if(!in_array($id_sale,$sales)){
+                            $sales[] = $id_sale;
+                        }
+                        setcookie('logistics_sales', implode('-', $sales), 0, __PS_BASE_URI__);
+                    }
+                }
+            }
+        }
+    }
+
+    public function display() {
+        global $cookie, $currentIndex;
+        $base_link = $currentIndex . '&token='.Tools::getAdminTokenLite('AdminAntDropshippingtracking');
+        $form = '';
+
+        $id_category_options = array();
+        foreach(Db::getInstance()->ExecuteS('
+            SELECT p.`id_sale`, c.`name`, c.`id_category`
+            FROM `'._DB_PREFIX_.'privatesale` p
+            LEFT JOIN `'._DB_PREFIX_.'category_lang` c ON (c.`id_category` = p.`id_category`)
+            LEFT JOIN `'._DB_PREFIX_.'privatesale_shipping_sale` s ON (s.`id_sale` = p.`id_sale`)
+            WHERE c.`id_lang` = '.$cookie->id_lang.'
+            AND s.id_shipping = 2
+            -- AND p.`date_start` > "2017-01-01 00:00:00"
+            ORDER BY p.`id_sale` DESC
+            LIMIT 1200
+        ') as $row) {
+            $extrafields = Category::getSalesInfos(array((int) $row['id_category']));
+            $id_category_options[] = array(
+                'label' => (int) $row['id_sale'].' (#'.(int) $row['id_category'].') - '.$row['name'].(empty($extrafields[(int) $row['id_category']]['sales'][1])?'':' - '.$extrafields[(int) $row['id_category']]['sales'][1]) ,
+                'value' => (int) $row['id_sale']
+            );
+        }
+
+        $helperForm = new HelperFormBootstrap();
+        $helperForm->_select2 = true;
+        $form .= $helperForm->renderStyle();
+
+        $form .= '
+        <div class="row">
+            <div class="col-md-12">
+                <div class="panel">
+                    <div class="panel-title">
+                        <h2 class=""><span class="text-rose anticon anticon-truck"></span> '.$this->l('Import information dropshipping').'</h2>
+                        <div class="clearfix"></div>
+                    </div>
+                    <div class="panel-content">
+                        <form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
+                            <div class="col-md-5 col-md-offset-4">';
+                                $help = '<br>
+                                <p class="help-block">'.$this->l('Format: id_order;tracking_number;carrier;tracking_link').'</p>
+                                <p class="help-block">'.$this->l('The subsequent columns and the first line are ignored.').'</p>
+                                ';
+                                $input = array(
+                                    'label'        => $this->l('Sale: '),
+                                    'type'         => 'select2',
+                                    'label-class'  => 'control-label',
+                                    'select-class' => 'input-class',
+                                    'name'         => 'id_sale',
+                                    'options'      => $id_category_options,
+                                );
+                                $form .= '<div class="clearfix"></div>'.$helperForm->generateInput($input);
+                                $input = array(
+                                    'type'  => 'file',
+                                    'label' => $this->l('File:'),
+                                    'name'  => 'csvfile',
+                                    'html'  => $help
+                                );
+                                $form .= $helperForm->generateInput($input);
+                            $form .= '
+                            </div>
+                            <div class="clearfix"></div>
+                            <div class="ln_solid"></div>
+                            <div class="form-group text-right">
+                                <button type="submit" class="btn btn-primary" name="submitOrderTracking">'.$this->l('Importer').'</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>';
+
+        $form .= $helperForm->renderScript();
+
+        echo $form;
+
+    }
+}

modules/ant_dropshippingtracking/ant_dropshippingtracking.php

@@ -0,0 +1,40 @@
+<?php
+if (!defined('_PS_VERSION_'))
+    exit;
+
+class Ant_Dropshippingtracking extends Module
+{
+
+    public function __construct()
+    {
+        $this->name = 'ant_dropshippingtracking';
+        $this->tab = 'administration';
+        $this->author = 'Antadis';
+        $this->version = '1.0';
+        $this->need_instance = 0;
+
+        parent::__construct();
+
+        $this->displayName = $this->l('Dropshipping tracking');
+        $this->description = $this->l('Allow to import information to track orders sent by dropshipping');
+    }
+
+    public function install()
+    {
+
+        if(!(parent::install())) {
+            return false;
+        }
+        return true;
+    }
+
+    public function uninstall() {
+
+        if(parent::uninstall() == false) {
+            return false;
+        }
+
+        return true;
+    }
+
+}

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/categoryscroll/ajax.php

@@ -79,6 +79,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('
@@ -92,7 +100,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/filtervp/filter.tpl

@@ -1,15 +1,23 @@
-{if count($sizes) > 0}
+{if count($attr) > 0}
 	<div class="block_filter">
 		<div class="content">
-			<h4 class="open">{l s='Recherche par' mod='filtervp'} {$name}</h4>
+			<h4 class="open">{l s='Recherche par' mod='filtervp'}</h4>
 
 			<div class="content_filter">
-				<ul id="filters">
-				{foreach from=$sizes item=size}
+				<h5>{$attr[0]['group']}</h5>
+				{assign var="current_name" value=$attr[0]['group']}
+				<ul class="filters" id="filters">
+				{foreach from=$attr key=key item=attribute}
+					{if $key!=0 && $current_name!=$attribute['group']}
+					</ul>
+					<h5>{$attribute['group']}</h5>
+					<ul class="filters">
+					{/if}
 					<li>
-						<input type="checkbox" name="size" value="{$size.id_attribute}" id="size_{$size.id_attribute}">
-						<label for="size_{$size.id_attribute}">{$size.name}</label>
+						<input type="checkbox" name="size" value="{$attribute['id_attribute']}" id="size_{$attribute['id_attribute']}">
+						<label for="size_{$attribute['id_attribute']}">{$attribute['name']}</label>
 					</li>
+					{assign var="current_name" value=$attribute['group']}
 				{/foreach}
 				</ul>
 			</div>

modules/filtervp/filtervp.php

@@ -1,7 +1,8 @@
 <?php
 class Filtervp extends Module {
-    const FILTER_ID = 75;
-	const FILTER_SIZE = 272;
+ //    const FILTER_ID = 75;
+    const FILTER_ID = 1;
+	// const FILTER_SIZE = 272;
 
 	public function __construct() {
 		$this->name = 'filtervp';
@@ -23,36 +24,98 @@ class Filtervp extends Module {
 		return TRUE;
 	}
 
-    public function hookdisplayLeftVP($params) {
-		global $smarty;
-		$sizes = self::getAllValueAttr(Filtervp::FILTER_ID, Tools::getValue('id_category'));
+    public function hookPrivateSales_Edit($params) {
 
-        if (empty($sizes)) {
-            $sizes = self::getAllValueAttr(self::FILTER_SIZE, Tools::getValue('id_category'));
-            $name = self::getAttrName(self::FILTER_SIZE);
-        } else {
-            $name = self::getAttrName(self::FILTER_ID);
+        $attr_groups = Db::getInstance()->ExecuteS('
+            SELECT
+                al.`name`,
+                a.`id_attribute_group`'.($params['sale'] !== NULL? ', (
+                SELECT IFNULL(s.`id_sale`, NULL)
+                FROM `'._DB_PREFIX_.'attribute_group_ps` s
+                WHERE a.`id_attribute_group` = s.`id_attribute_group` AND s.`id_sale` = '.$params['sale']->id.'
+            ) AS `id_sale`': '').'
+            FROM ps_attribute_group a
+            LEFT JOIN ps_attribute_group_lang al ON al.id_attribute_group = a.id_attribute_group
+            WHERE al.`id_lang` = 2
+        ');
+
+        echo '
+        <div class="form-group">
+            <label class="control-label">'.$this->l('Attribute groups:').'</label>
+            <div class="">
+                <select id="attr_groups" name="attr_groups[]" multiple="multiple" size="5" class="form-control">';
+            $all_opt = array();
+            foreach($attr_groups as $attribute) {
+                $all_opt[] = $attribute['id_attribute_group'];
+                echo '<option value="'.$attribute['id_attribute_group'].'"'.(isset($attribute['id_sale']) && $attribute['id_sale'] !== NULL?' selected="selected"':'').'>'.$attribute['name'].'</option>';
+            }
+            echo '
+                </select>
+            </div>
+            <div class="btn-group btn-group-sm" role="group">
+                <button type="button" class="select_all_for_attr_group btn btn-default">Tout</button>
+                <button type="button" class="clear_for_attr_group btn btn-default">Clear</button>
+            </div>
+            <script type="text/javascript">
+            $(document).ready(function() {
+                $("#attr_groups").select2({
+                    maximumSelectionLength: '.count($attr_groups).',
+                    placeholder: "'.$this->l('Select one or more attribute group:').'",
+                    allowClear: true
+                });
+                $(".select_all_for_attr_group").on("click", function () { $("#attr_groups").select2().val(["'.(implode('","',$all_opt)).'"]).trigger("change"); });
+                $(".clear_for_attr_group").on("click", function () { $("#attr_groups").select2().val(null).trigger("change"); });
+            });
+            </script>
+            <div class="clear"></div>
+        </div>';
+    }
+
+    public function hookPrivateSales_Delete($params) {
+        Db::getInstance()->Execute('
+            DELETE FROM `'._DB_PREFIX_.'attribute_group_ps`
+            WHERE `id_sale` = '.$params['sale']->id
+        );
+    }
+
+    public function hookPrivateSales_Create($params) {
+        if($attr_groups = Tools::getValue('attr_groups')) {
+            foreach($attr_groups as $group) {
+                Db::getInstance()->Execute('
+                    INSERT INTO `'._DB_PREFIX_.'attribute_group_ps` VALUES (
+                        '.(int) $group.', '.$params['sale']->id.'
+                    )
+                ');
+            }
         }
+    }
 
-        if($name == 'Tailles') { 
-            $name = 'Taille';
-        };
-        
+    public function hookPrivateSales_Update($params) {
+        Db::getInstance()->Execute('
+            DELETE FROM `'._DB_PREFIX_.'attribute_group_ps`
+            WHERE `id_sale` = '.$params['sale']->id
+        );
+        $this->hookPrivateSales_Create($params);
+    }
+
+    public function hookdisplayLeftVP($params) {
+        global $smarty;
+        $attributes = self::getAllAttrByGroup(Tools::getValue('id_category'));
         $smarty->assign(array(
-            'name' => $name,
-            'sizes' => $sizes,
+            'attr' => $attributes,
         ));
 
-		return $this->display(__FILE__, 'filter.tpl');
-	}
+        return $this->display(__FILE__, 'filter.tpl');
+    }
 
-  	public static function getAllValueAttr($id_attr, $id_cat){ 
+
+  	public static function getAllValueAttr($id_attr, $id_cat){
       	global $cookie;
-		
+
 		$id_lang = $cookie->id_lang;
         $results = Db::getInstance()->ExecuteS('
-            SELECT             
-                al.`name`, 
+            SELECT
+                al.`name`,
                 a.`id_attribute`
             FROM
                 `'._DB_PREFIX_.'attribute` a
@@ -61,23 +124,52 @@ class Filtervp extends Module {
                 LEFT JOIN '._DB_PREFIX_.'product p ON cp.id_product = p.id_product
                 INNER JOIN '._DB_PREFIX_.'product_attribute pa ON pa.id_product = cp.id_product
                 INNER JOIN '._DB_PREFIX_.'product_attribute_combination pac ON pac.id_attribute = a.id_attribute AND pac.id_product_attribute = pa.id_product_attribute
-            WHERE 
-                a.id_attribute_group = "'.$id_attr.'"                  
+            WHERE
+                a.id_attribute_group = "'.$id_attr.'"
             GROUP BY
                 a.`id_attribute`
             ORDER BY
-                al.`name` ASC  
+                al.`name` ASC
         ');
         return $results;
     }
 
-    public static function getAttrName($id_attr){ 
+    public function getAllAttrByGroup($id_cat)
+    {
+        global $cookie;
+
+        $id_lang = $cookie->id_lang;
+        $results = Db::getInstance()->ExecuteS('
+            SELECT
+                al.`name`,
+                a.`id_attribute`,
+                agl.`name` as `group`
+            FROM
+                `'._DB_PREFIX_.'attribute` a
+                LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON al.id_lang = '.(int)$id_lang.' AND al.id_attribute = a.id_attribute
+                LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON agl.id_attribute_group = a.id_attribute_group AND agl.id_lang = '.(int)$id_lang.'
+                LEFT JOIN '._DB_PREFIX_.'attribute_group_ps agp ON agp.id_attribute_group = agl.id_attribute_group
+                LEFT JOIN '._DB_PREFIX_.'privatesale_category pc ON pc.id_sale = agp.id_sale
+                LEFT JOIN '._DB_PREFIX_.'category_product cp ON cp.id_category = pc.id_category
+                LEFT JOIN '._DB_PREFIX_.'product p ON cp.id_product = p.id_product
+                INNER JOIN ps_product_attribute pa ON pa.id_product = cp.id_product
+                INNER JOIN ps_product_attribute_combination pac ON pac.id_attribute = a.id_attribute AND pac.id_product_attribute = pa.id_product_attribute
+            WHERE agp.id_sale IS NOT NULL AND pc.id_category = '.(int)$id_cat.'
+            GROUP BY
+                a.`id_attribute`
+            ORDER BY
+                agl.`name` ASC, al.`name` ASC
+        ');
+        return $results;
+    }
+
+    public static function getAttrName($id_attr){
         global $cookie;
         $id_lang = $cookie->id_lang;
-        return Db::getInstance()->getValue('   
-            SELECT 
-                `public_name` 
-            FROM `'._DB_PREFIX_.'attribute_group_lang` 
+        return Db::getInstance()->getValue('
+            SELECT
+                `public_name`
+            FROM `'._DB_PREFIX_.'attribute_group_lang`
             WHERE `id_attribute_group` = "'.(int)$id_attr.'"
             AND `id_lang` = "'.(int)$id_lang.'"
         ');

modules/logistics/carriers/laposte/laposte.php

@@ -1573,6 +1573,28 @@ class LaposteCarrier {
 				$to_send[] = (int) $quantity_remain['id_order_detail'];
 			}
 		}
+
+		foreach(Db::getInstance()->ExecuteS('
+			SELECT d.`id_order_detail`, IF(
+				(d.`product_quantity` - IF(
+					d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+				) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+			) AS `remain`, s.`shipping_number`
+			FROM `'._DB_PREFIX_.'order_detail` d
+			LEFT OUTER JOIN `'._DB_PREFIX_.'ant_dropshipping_parcel` s
+			ON s.`id_order_detail` = d.`id_order_detail`
+			WHERE d.`id_order` = '.(int) $order->id.'
+			GROUP BY d.`id_order_detail`
+		') as $quantity_remain) {
+			if($quantity_remain['shipping_number']) {
+				$shipping_numbers[] = pSQL($quantity_remain['shipping_number']);
+			}
+			if((int) $quantity_remain['remain'] > 0) {
+				$fully_sent = FALSE;
+				$to_send[] = (int) $quantity_remain['id_order_detail'];
+			}
+		}
+
 		$_to_send = array();
 		foreach($to_send as $p) {
 			$id_sale = (int) Db::getInstance()->getValue('

modules/logistics/carriers/mondialrelay/cron_trace.php

@@ -209,6 +209,26 @@ foreach ($iterator as $fileinfo) {
 			}
 		}
 
+		foreach(Db::getInstance()->ExecuteS('
+			SELECT d.`id_order_detail`, IF(
+				(d.`product_quantity` - IF(
+					d.`product_quantity_return` > 0, d.`product_quantity_return`, d.`product_quantity_refunded`
+				) - IFNULL(SUM(s.`quantity`), 0)) > 0, 1, 0
+			) AS `remain`
+			FROM `'._DB_PREFIX_.'order_detail` d
+			LEFT OUTER JOIN `'._DB_PREFIX_.'ant_dropshipping_parcel` s
+				ON s.`id_order_detail` = d.`id_order_detail`
+			WHERE d.`id_order` = '.(int) $order->id.'
+			GROUP BY d.`id_order_detail`
+		') as $quantity_remain) {
+			if((int) $quantity_remain['remain'] == 0) {
+				$products_sent[] = (int) $quantity_remain['id_order_detail'];
+			}  elseif ((int) $quantity_remain['remain'] == 1) {
+				$remaining[] = (int) $quantity_remain['id_order_detail'];
+			}
+		}
+
+		$remaining = array();
 		foreach($order_details as $d) {
 			if(!in_array($d, $products_sent) && !in_array($d, $remaining)) {
 				$remaining[] = (int) $d;

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/paypal/paypal.php

@@ -542,6 +542,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

@@ -42,8 +42,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>';
 
@@ -1023,7 +1024,6 @@ class AdminPrivateSalesSales extends AdminTab {
             </script>
         ';
 
-
         echo '
         <div class="panel">
             <div class="panel-title">
@@ -1093,8 +1093,7 @@ class AdminPrivateSalesSales extends AdminTab {
                         <td class="text-center '.(in_array('fr', $sale->versions) ? 'green' : 'rose').'">FR</td>
                         <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? 'Philea': ''): '').'</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">';
@@ -1238,7 +1237,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);
 
@@ -1403,6 +1401,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

@@ -3,6 +3,8 @@
 if (!class_exists('Sale')) {
 
 class Sale {
+    const CONTROLLER_NAME = 'sale';
+
     var $id;
     var $date_start;
     var $date_end;
@@ -1644,7 +1646,12 @@ class Sale {
             $query .= ' LIMIT '.$limit;
         }
 
-        if($sales = Db::getInstance()->ExecuteS($query)) {
+        if (false === ($sales = CacheRedis::getInstance()->getQuery($query, self::CONTROLLER_NAME))) {
+            $sales = Db::getInstance()->ExecuteS($query);
+            CacheRedis::getInstance()->setQuery($query, self::CONTROLLER_NAME, $sales);
+        }
+
+        if($sales) {
             if($lite) {
                 foreach($sales AS $sale) {
                     $result[] = $sale['id_sale'];
@@ -2090,11 +2097,12 @@ class Sale {
             return false;
         }
 
-        // Particular and classic but different shipping
+        // Particular and classic but different shipping (only dropshipping and default shipping can be combinable)
         if(
             ((int)$current_sale['delivery_delay'] == 1 || (int)$current_sale['delivery_delay'] == 9)
             && ((int)$adding_sale['delivery_delay'] == 1 || (int)$adding_sale['delivery_delay'] == 9)
-            && (int)$current_sale['shipping'] != (int)$adding_sale['shipping']
+            && ((int)$current_sale['shipping'] != (int)$adding_sale['shipping'])
+            && (!in_array((int)$current_sale['shipping'],array(0,2)) || !in_array((int)$adding_sale['shipping'],array(0,2)))
         ){
             return false;
         }

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

@@ -161,10 +161,10 @@ class Privatesales_Family_Menu extends Module {
 				}
 
 				// create new format image
-				$image_menu = imagecreatetruecolor(260, 211);
-				$image_cat = imagecreatefromjpeg($img_tmp);
-				imagecopyresampled($image_menu, $image_cat, 0, 0, 0, 0, 260, 211, 260, 211);
-				imagejpeg($image_menu, _PS_ROOT_DIR_.'/img/menu/'.$sale['id_category'].'.jpg',100);
+				// $image_menu = imagecreatetruecolor(260, 211);
+				// $image_cat = imagecreatefromjpeg($img_tmp);
+				// imagecopyresampled($image_menu, $image_cat, 0, 0, 0, 0, 260, 211, 260, 211);
+				// imagejpeg($image_menu, _PS_ROOT_DIR_.'/img/menu/'.$sale['id_category'].'.jpg',100);
 			}
 
 			$sales[$key_sale]['img'] = '/img/menu/'.$sale['id_category'].'.jpg';

modules/skinstatic/AdminSkinStatic.php

@@ -58,7 +58,7 @@ class AdminSkinStatic extends AdminTab {
                                         Configuration::get('SKINSTATIC_VERSION'),
                                     ),
 
-                            '<style type="text/css">body#index #columns { background: url("//www.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $id_lang.'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i)? 'fixed center 0px': 'scroll center 0px').' #F1F1F1}</style><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i)? '
+                            '<style type="text/css">body#index #columns { background: url("//www.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $id_lang.'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i)? 'fixed center 0px': 'scroll center 0px').' #FFFFFF}</style><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i)? '
                             <script type="text/javascript">
                             <!--
                             $(document).ready(function() { var scrolling = $("#skin-left, #skin-right"); var pos = scrolling.position(); var size = scrolling.height() + 80; var max_size = $(document).height() - $("#footer").height() - 45; $(window).scroll(function(event) { offset = parseFloat(scrolling.css("marginTop").replace("px", "")); margin = 170; height = 750; if($(document).scrollTop()==0){margin = 30;} if($(document).scrollTop()>130){height = $(window).height();}; scrolling.css({ "marginTop": Math.min($(document).scrollTop(), max_size)-margin + "px", "height" : height+"px" }); }); '.($i == 0 && substr(Tools::getValue('left_link_'.(int) $i), 0, 28) == 'http://www.privatesportshop.'? '$("#skin-left, #skin-right").unbind("click").removeAttr("href").removeAttr("onclick").click(function(event) { event.stopPropagation(); event.preventDefault(); $("#privatesales_block li > a").first().trigger("click"); });': '').'
@@ -78,7 +78,7 @@ class AdminSkinStatic extends AdminTab {
                                         Configuration::get('SKINSTATIC_VERSION'),
                                     ),
 
-                            '<style type="text/css">body#index #columns { background: url("//www.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $id_lang.'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i)? 'fixed center 0px': 'scroll center 0px').' #F1F1F1}</style><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i)? '
+                            '<style type="text/css">body#index #columns { background: url("//www.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $id_lang.'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i)? 'fixed center 0px': 'scroll center 0px').' #FFFFFF}</style><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i)? '
                             <script type="text/javascript">
                             <!--
                             $(document).ready(function() { var scrolling = $("#skin-left, #skin-right"); var pos = scrolling.position(); var size = scrolling.height() + 80; var max_size = $(document).height() - $("#footer").height() - 45; $(window).scroll(function(event) { offset = parseFloat(scrolling.css("marginTop").replace("px", "")); scrolling.css({ "marginTop": Math.min($(document).scrollTop(), max_size) + "px" }); }); '.($i == 0 && substr(Tools::getValue('left_link_'.(int) $i), 0, 28) == 'http://www.privatesportshop.'? '$("#skin-left, #skin-right").unbind("click").removeAttr("href").removeAttr("onclick").click(function(event) { event.stopPropagation(); event.preventDefault(); $("#privatesales_block li > a").first().trigger("click"); });': '').'

override/classes/CacheRedis.php

@@ -0,0 +1,287 @@
+<?php
+use Predis\Collection\Iterator;
+
+class CacheRedis
+{
+
+    /*
+     * remember to add a definition for the 4 following parameters in settings.inc.php
+    define('_REDIS_AUTH_STRING_','')
+    define('_REDIS_HOST_STRING_','127.0.0.1')
+    define('_REDIS_PORT_STRING_','6379')
+    define('_REDIS_DEFAULT_TTL_','60')
+
+     * remember to add this line in defines.inc.php
+    define('_PS_PREDIS_DIR_', _PS_TOOL_DIR_.'predis/')
+
+     * autoload call to should be in autoload.php
+
+     */
+
+    protected static $_instance;
+
+    private $auth;
+    private $port;
+    private $host;
+    private $db;
+    private $redis_client;
+    private $default_ttl;
+    private $short_ttl;
+    private $medium_ttl;
+    private $long_ttl;
+    private $is_connected = false;
+    const DEFAULT_CONTROLLER_NAME = "none";
+    const HASHING_ALGORITHM = "sha1";
+
+    const SHORT_TTL = '_REDIS_SHORT_TTL_';
+    const MEDIUM_TTL = '_REDIS_MEDIUM_TTL_';
+    const LONG_TTL = '_REDIS_LONG_TTL_';
+
+    public function __construct()
+    {
+        $this->auth = _REDIS_AUTH_STRING_;
+        $this->host = _REDIS_HOST_STRING_;
+        $this->port = _REDIS_PORT_STRING_;
+        $this->db = _REDIS_DB_STRING_;
+        $this->default_ttl = _REDIS_DEFAULT_TTL_;
+        $this->short_ttl = defined('_REDIS_SHORT_TTL_') ? _REDIS_SHORT_TTL_ : _REDIS_DEFAULT_TTL_;
+        $this->medium_ttl = defined('_REDIS_MEDIUM_TTL_') ? _REDIS_MEDIUM_TTL_ : _REDIS_DEFAULT_TTL_;
+        $this->long_ttl = defined('_REDIS_LONG_TTL_') ? _REDIS_LONG_TTL_ : _REDIS_DEFAULT_TTL_;
+
+        if ($this->auth !== '') {
+            $this->redis_client = new Predis\Client(['scheme'   => 'tcp',
+                                                     'host'     => $this->host,
+                                                     'port'     => $this->port,
+                                                     'password' => $this->auth,
+                                                    ],
+                                                    ['parameters' => [
+                                                            'database' => (int)$this->db,
+                                                        ],
+                                                    ]);
+        } else {
+            $this->redis_client = new Predis\Client(['scheme' => 'tcp',
+                                                     'host'   => $this->host,
+                                                     'port'   => $this->port,
+                                                    ],
+                                                    ['parameters' => [
+                                                            'database' => (int)$this->db,
+                                                        ],
+                                                    ]);
+        }
+        try {
+            $this->redis_client->connect();
+            $this->is_connected = $this->redis_client->isConnected();
+        } catch (Exception $e) {
+            $this->is_connected = false;
+        }
+    }
+
+    public static function getInstance()
+    {
+        if (!isset(self::$_instance)) {
+            self::$_instance = new CacheRedis();
+        }
+
+        return self::$_instance;
+    }
+
+    public function get($key, $controller, $ignoreCheckIp = false)
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+        if (!$ignoreCheckIp && $this->checkIpDisableCache()) {
+            return false;
+        }
+        if ($controller === '') {
+            $controller = self::DEFAULT_CONTROLLER_NAME;
+        }
+        $value = $this->redis_client->get($this->createKey($key, $controller));
+        if (null === $value) {
+            return false;
+        } else {
+            return $this->decode($value);
+        }
+    }
+
+    public function delete($key)
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+
+        return $this->redis_client->del($key);
+    }
+
+    public function del($key) {
+        return $this->delete($key);
+    }
+
+
+    public function set($key, $controller, $value, $expire = null)
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+        if ($controller === '') {
+            $controller = self::DEFAULT_CONTROLLER_NAME;
+        }
+        if (null === $expire) {
+            $expire = (int)$this->default_ttl;
+        } else {
+            switch ($expire) {
+                case self::SHORT_TTL:
+                    $expire = (int)$this->short_ttl;
+                    break;
+                case self::MEDIUM_TTL:
+                    $expire = (int)$this->medium_ttl;
+                    break;
+                case self::LONG_TTL:
+                    $expire = (int)$this->long_ttl;
+                    break;
+                default:
+                    $expire = (int)$expire;
+                    break;
+            }
+        }
+
+        $this->redis_client->setex($this->createKey($key, $controller), $expire, $this->encode($value));
+    }
+
+    public function expire($key, $controller, $expire)
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+        if ($controller === '') {
+            $controller = self::DEFAULT_CONTROLLER_NAME;
+        }
+        $this->redis_client->expire($this->createKey($key, $controller), $expire);
+    }
+
+    public function isConnected()
+    {
+        return $this->is_connected;
+    }
+
+    public function flush()
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+        $this->redis_client->flushall();
+    }
+
+    public function setQuery($query, $controller, $value, $expire = null)
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+        if (null === $expire) {
+            $expire = (int)$this->default_ttl;
+        } else {
+            switch ($expire) {
+                case self::SHORT_TTL:
+                    $expire = (int)$this->short_ttl;
+                    break;
+                case self::MEDIUM_TTL:
+                    $expire = (int)$this->medium_ttl;
+                    break;
+                case self::LONG_TTL:
+                    $expire = (int)$this->long_ttl;
+                    break;
+                default:
+                    $expire = (int)$expire;
+                    break;
+            }
+        }
+        if ($controller === '') {
+            $controller = self::DEFAULT_CONTROLLER_NAME;
+        }
+        if (is_string($query) && trim($query) !== '') {
+            $this->redis_client->setex($this->createKey($query, $controller), $expire, $this->encode($value));
+        }
+    }
+
+    public function getQuery($query, $controller, $ignoreCheckIp = false)
+    {
+        if (!$this->isConnected()) {
+            return false;
+        }
+        if (!$ignoreCheckIp && $this->checkIpDisableCache()) {
+            return false;
+        }
+        if ($controller === '') {
+            $controller = self::DEFAULT_CONTROLLER_NAME;
+        }
+        $value = null;
+        if (is_string($query) && trim($query) !== '') {
+            $value = $this->redis_client->get($this->createKey($query, $controller));
+        }
+        if (is_null($value)) {
+            return false;
+        } else {
+            return $this->decode($value);
+        }
+    }
+
+    public function scan($key, $count = 1024)
+    {
+        $result = array();
+
+        foreach (new Iterator\Keyspace(
+                     $this->redis_client,
+                     $key,
+                     $count
+                 ) as $result_key) {
+            $result[] = $result_key;
+        }
+
+        return $result;
+    }
+
+    public function clear($key)
+    {
+
+        $keys = $this->scan($key);
+        $replies = false;
+        foreach (array_chunk($keys, 256) as $data) {
+            $pipe = $this->redis_client->pipeline();
+            foreach ($data as $item) {
+                $pipe->del($item);
+            }
+            $replies = $pipe->execute();
+        }
+
+        return $replies;
+    }
+
+    private function encode($value)
+    {
+        return serialize($value);
+    }
+
+    private function decode($value)
+    {
+        return unserialize($value);
+    }
+
+    private function createKey($key, $controller)
+    {
+        return $controller . '-' . hash(self::HASHING_ALGORITHM, $key);
+    }
+
+    private function checkIpDisableCache()
+    {
+        $disableCache = false;
+        $no_cache_ip = Configuration::get('PS_REDIS_NOCACHE_IP');
+        if ($no_cache_ip) {
+            $no_cache_ip_list = explode(',', $no_cache_ip);
+            if (isset($_SERVER['REMOTE_ADDR']) && in_array($_SERVER['REMOTE_ADDR'], $no_cache_ip_list)) {
+                $disableCache = true;
+            }
+        }
+
+        return $disableCache;
+    }
+}

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/MySQL.php

@@ -0,0 +1,92 @@
+<?php
+
+class MySQL extends MySQLCore
+{
+
+    const REDIS_CONTROLLER_KEY_MAX_LENGTH = 16;
+    const DEFAULT_SLICE_QUERY_STEP = 1000;
+
+    /**
+     * ExecuteS return the result of $query as array,
+     * or as mysqli_result if $array set to FALSE
+     *
+     * @param string $query query to execute
+     * @param boolean $array return an array instead of a mysql_result object
+     * @param bool|int $use_cache if query has been already executed, use its result
+     * @param string|bool $controller name used to limit cache collision
+     * @return array or result object
+     */
+    public function ExecuteS($query, $array = TRUE, $use_cache = FALSE, $controller = FALSE, $cache_expire = null)
+    {
+        $this->_result = FALSE;
+        $this->_lastQuery = $query;
+        if ($controller) {
+            $controller = strtoupper(substr($controller, 0, self::REDIS_CONTROLLER_KEY_MAX_LENGTH));
+        }
+        if ($use_cache && $controller && class_exists('CacheRedis')) {
+            if (FALSE !== ($result = CacheRedis::getInstance()->getQuery($query, $controller))) {
+                return $result;
+            }
+        }
+        if ($this->_link && $this->_result = mysql_query($query, $this->_link)) {
+            $this->_lastCached = FALSE;
+            if (_PS_DEBUG_SQL_) {
+                $this->displayMySQLError($query);
+            }
+            if (!$array) {
+                return $this->_result;
+            }
+            $resultArray = array();
+            // Only SELECT queries and a few others return a valid resource usable with mysql_fetch_assoc
+            if ($this->_result !== TRUE) {
+                while ($row = mysql_fetch_assoc($this->_result)) {
+                    $resultArray[] = $row;
+                }
+            }
+            if ($use_cache && $controller && class_exists('CacheRedis')) {
+                CacheRedis::getInstance()->setQuery($query, $controller, $resultArray, $cache_expire);
+            }
+
+            return $resultArray;
+        }
+        if (_PS_DEBUG_SQL_) {
+            $this->displayMySQLError($query);
+        }
+
+        return FALSE;
+    }
+
+    public function getRow($query, $use_cache = FALSE, $controller = FALSE, $cache_expire = null)
+    {
+        $query .= ' LIMIT 1';
+        $this->_result = FALSE;
+        $this->_lastQuery = $query;
+        if ($controller) {
+            $controller = strtoupper(substr($controller, 0, self::REDIS_CONTROLLER_KEY_MAX_LENGTH));
+        }
+        if ($use_cache && $controller && class_exists('CacheRedis')) {
+            if (FALSE !== ($result = CacheRedis::getInstance()->getQuery($query, $controller))) {
+                return $result;
+            }
+        }
+        if ($this->_link) {
+            if ($this->_result = mysql_query($query, $this->_link)) {
+                $this->_lastCached = FALSE;
+                if (_PS_DEBUG_SQL_) {
+                    $this->displayMySQLError($query);
+                }
+                $result = mysql_fetch_assoc($this->_result);
+                if ($use_cache && $controller && class_exists('CacheRedis')) {
+                    CacheRedis::getInstance()->setQuery($query, $controller, $result, $cache_expire);
+                }
+
+                return $result;
+            }
+        }
+        if (_PS_DEBUG_SQL_) {
+            $this->displayMySQLError($query);
+        }
+
+        return FALSE;
+    }
+}

override/classes/PaymentModule.php

@@ -2,7 +2,7 @@
 	class PaymentModule extends PaymentModuleCore {
 		public function validateOrder($id_cart, $id_order_state, $amountPaid, $paymentMethod = 'Unknown', $message = NULL, $extraVars = array(), $currency_special = NULL, $dont_touch_amount = false, $secure_key = false)
 		{
-			global $cart;
+			global $cart, $cookie;
 
 			$cart = new Cart((int)($id_cart));
 			// Does order already exists ?

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/CategoryController.php

@@ -92,9 +92,7 @@ class CategoryController extends CategoryControllerCore {
 			foreach($this->cat_products as $key => $p) {
 				$id_products[] = $p['id_product'];
 			}
-			$attributes = array();
-			$id_attributes = array();
-			foreach(Db::getInstance()->ExecuteS('
+			$query = '
 				SELECT pa.`id_product`, pa.`quantity`, ag.`public_name` as `group`, al.`name`, al.`id_attribute`
 				FROM `'._DB_PREFIX_.'product_attribute` pa, `'._DB_PREFIX_.'product_attribute_combination` ac, `'._DB_PREFIX_.'attribute` a, `'._DB_PREFIX_.'attribute_lang` al, `'._DB_PREFIX_.'attribute_group_lang` ag
 				WHERE pa.`id_product` IN ('.implode(', ', $id_products).')
@@ -107,7 +105,16 @@ class CategoryController extends CategoryControllerCore {
 				AND pa.`quantity` > 0
 				AND ag.`id_attribute_group` IN(75, 9, 272, 172)
 				ORDER BY pa.`id_product` ASC, ag.`public_name` ASC, al.`name` ASC
-			') as $attr) {
+			';
+
+			if (false === ($result = CacheRedis::getInstance()->getQuery($query, "CategoryController"))) {
+                $result = Db::getInstance()->ExecuteS($query);
+                CacheRedis::getInstance()->setQuery($query, "CategoryController", $result);
+            }
+
+			$attributes = array();
+			$id_attributes = array();
+			foreach($result as $attr) {
 				if(!isset($attributes[$attr['id_product']])) {
 					$attributes[$attr['id_product']] = array();
 				}

themes/site/css/style.css

@@ -830,7 +830,7 @@ body {
   margin: 0;
   padding: 0;
   min-height: 100%;
-  background: #f3f3f3;
+  background: #ffffff;
   color: #1e1633;
 }
 article,
@@ -1698,6 +1698,7 @@ body#page-404 .footer_links {
   float: left;
   background-color: #b5b1b1;
 }
+
 #category .content #product_list .view_button:hover{  background-color: #f45bb7;}
 
 #header {
@@ -2197,10 +2198,10 @@ body#authentication.create{
   background-repeat: no-repeat;
 }
 body#authentication, body#index.singleCol, body#validation {
-  background: url("../img/hp.jpg") no-repeat center 62px #f3f3f3;
+  background: url("../img/hp.jpg") no-repeat center 62px #ffffff;
 }
 body#index, body#index.singleCol.logged, body#category {
-  background: url("../img/hp.jpg") no-repeat center 62px #f3f3f3;
+  background: url("../img/hp.jpg") no-repeat center 62px #ffffff;
 }
 body #page {
   position: relative;
@@ -2249,10 +2250,10 @@ body #columns {
   padding-top: 170px;
 }
 body #columns#authentication, body #columns#index.singleCol, body #columns#validation {
-  background: url("../img/hp2.jpg") no-repeat 0px 99px #f3f3f3;
+  background: url("../img/hp2.jpg") no-repeat 0px 99px #ffffff;
 }
 body #columns#index, body #columns#index.singleCol.logged, body #columns#category {
-  background: url("../img/hp2.jpg") no-repeat center 99px #f3f3f3;
+  background: url("../img/hp2.jpg") no-repeat center 99px #ffffff;
 }
 body #columns > .content {
   width: 980px;
@@ -5901,7 +5902,7 @@ table#carrierTable tbody td {
   color: #444d52;
   font-size: 12px;
   border-bottom: 0px;
-  border-top: 10px solid #f1f1f1;
+  border-top: 10px solid #ffffff;
   background: #FFF;
   line-height: 1.5em;
   padding: 5px 10px;
@@ -6076,7 +6077,6 @@ table#carrierTable tbody td {
 #header_nav .inner a.submenu_top_btn.credit {
   background: url('../img/picto_account.png') no-repeat 75px 11px #fff;
 }
-
 /** New product tpl **/
 #product #primary_block{
   margin-top: 20px;
@@ -6518,6 +6518,94 @@ table#carrierTable tbody td {
     color: #4F4E9A;
 }
 
+#loyalty_cart{
+  background: url("../img/fidelite.png") no-repeat left center;
+}
+#header_nav .inner a.submenu_top_btn.credit {
+    background: url('../img/picto_account.png') no-repeat 75px 11px #fff;
+}
+
+h3.carrier_title{
+  margin-bottom: 10px;
+}
+table#carrierTable tbody td {
+    color: #444d52;
+    font-size: 12px;
+    border-bottom: 0px;
+    border-top: 10px solid #f1f1f1;
+    background: #FFF;
+    line-height: 1.5em;
+    padding: 5px 10px;
+}
+#carrierTable thead {
+  background-color: #514c8c;
+}
+#carrierTable thead tr th{
+  color: #fff;
+}
+
+.soflexibiliteStar{
+  color: #e26ea2!important;
+}
+#adresseFinal .so-prez-libelle{
+  color: #514c8c!important;
+}
+#custMail, #sl_phone {
+    min-height: 20px!important;
+    font-size: 14px!important;
+}
+#soflexibilite_speech{
+  display: none!important
+}
+
+/******** Address autocomplete **********/
+#address_ac {
+    z-index: 5;
+    background: #FFF;
+    border-left: 1px solid #e4e4e4;
+    border-right: 1px solid #e4e4e4;
+    border-bottom: 1px solid #e4e4e4;
+    margin: 1px 0px 0px 0px;
+    min-width: 278px;
+    -moz-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
+    -webkit-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
+    -ms-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
+    -o-box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5);
+    box-shadow: 2px 10px 10px -8px rgba(0, 0, 0, .5));
+    list-style: outside none;
+    overflow: auto;
+    max-height: 300px;
+}
+#address_ac li {
+    font-size: 12px;
+    line-height: 1.4em;
+    padding: 5px 20px 5px 10px;
+    cursor: pointer;
+}
+#address_ac li:hover {
+    background: #EEE;
+}
+#address_ac strong {
+    padding: 0px 1px;
+}
+
+.paypal_account {
+    background: #fff none repeat scroll 0 0;
+    border: 1px solid #ccc;
+    margin: 10px 0 5px;
+    padding: 15px;
+    overflow: auto;
+}
+.paypal_account input[type="radio"] {
+   float: left;
+   margin-right: 7px;
+   position: relative;
+   top: 3px;
+}
+.paypal_account label {
+  float: left;
+}
+
 #product .expresscart_frame {
   display: none;
   height: 215px;
@@ -7350,4 +7438,11 @@ table#carrierTable tbody td {
 #cart_remove_gift_message{
   float:right;
   background: #e26ea2;
+}
+
+.block_filter .content_filter h5{
+    font-size: 15px;
+    text-decoration: underline;
+    color: #514E8C;
+    margin:10px 0px;
 }

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/es.php

@@ -639,7 +639,7 @@ $_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Añadir a la cesta';
 $_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Disponibilidad:';
 $_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'artículo disponible';
 $_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'artículos disponibles';
-$_LANG['product_d4c56106032bdc1466602ea78e753210'] = '¡Atención!';
+$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Advertencia: ¡Últimos artículos en stock!';
 $_LANG['product_0da35a562542f7e441f8226c875375f5'] = 'Bébé Boutik destaca este producto: porque es innovador y práctico, porque estimula a tus hijos gracias a su color, textura, y función, o porque lo viste de forma suave y original. ¡Bebé Boutik te lo recomienda!';
 $_LANG['product_f1ea0ec1c8e3da08b6fecae3af1d45b3'] = 'Bébé Boutik te propone este producto de forma aleatoria';
 $_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Elija un color:';

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/order-carrier.tpl

@@ -205,9 +205,9 @@
         {if count($carriers_ooh) > 0}
         <thead>
             <tr>
-                <th class="carrier_action first_item" colspan="2" style="border-top: 20px solid #f1f1f1;">{l s='At a relay point'}</th>
-                <th class="carrier_infos item" style="border-top: 20px solid #f1f1f1;">{l s='Information'}</th>
-                <th class="carrier_price last_item" style="border-top: 20px solid #f1f1f1;">{l s='Price'}</th>
+                <th class="carrier_action first_item" colspan="2" style="border-top: 20px solid #ffffff;">{l s='At a relay point'}</th>
+                <th class="carrier_infos item" style="border-top: 20px solid #ffffff;">{l s='Information'}</th>
+                <th class="carrier_price last_item" style="border-top: 20px solid #ffffff;">{l s='Price'}</th>
             </tr>
         </thead>
         <tbody>

themes/site/order-payment.tpl

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

themes/site_mobile/css/style.css

@@ -4685,6 +4685,39 @@ body#index .jqibuttons span.gradient{
 	background: #504d8b;
 }
 
+#cookiescontent { padding: 10px; font-size: 12px; }
+
+#product #more_info_tabs {
+    background: #FFF;
+}
+#product .idTabs {
+    margin: 0px;
+    list-style: none outside;
+    overflow: auto;
+}
+.block_hidden_only_for_screen {
+  display: none;
+}
+#product #more_info_block .idTabs li {
+    position: relative;
+    margin-left: 1px;
+    line-height: 12px;
+}
+#product #more_info_block .idTabs li a {
+    background: #fb66a9;
+    color: #fff;
+    display: block;
+    text-decoration: none;
+    padding: 20px 15px;
+    font-size: 17px;
+    text-align: center;
+}
+#product #more_info_block .idTabs li a.selected {
+    font-weight: bold;
+    background: #F3F3F3;
+    color: #fb66a9;
+}
+
 body#order #form {
     overflow-y: initial;
 }
@@ -4809,6 +4842,20 @@ body#addresses #center_column p.footer_links a.button.back_account {
     padding: 0px 1px;
 }
 
+body#product #primary_block  #more_info_block .sheets ul li,
+body#product #primary_block  #more_info_block .sheets p {
+    margin-bottom: 5px;
+    text-align: justify;
+    line-height: 16px;
+}
+body#product .flex-control-nav.flex-control-paging{
+	display: none;
+}
+
+body#product #best-sellers_block_product{
+	display: none;
+}
+
 #cookiescontent { padding: 10px; font-size: 12px; }
 
 h4.subtitle {
@@ -5060,6 +5107,26 @@ body#product #best-sellers_block_product{
 	text-align: center;
 	font-size: 13px;
 }
+
+/******* ticket-9890 *******/
+#product_list li div.productQuantityAlert{
+	text-align: center;
+	width: 250px;
+	margin: 0 !important;
+	padding: 5px 0 !important;
+	/* background-color: #f49cc3;
+	box-shadow: 0px 5px 8px -3px #b5b1b1; */
+	background-color: #fff;
+	position: absolute;
+	bottom: 0px;
+	left: 0;
+}
+.productQuantityAlert p{
+	color: #e36ea2;
+	font-size: 12px;
+	font-weight: 600;
+}
+
 .box_info_size .content .innerbox_info .show_info_size {
 	padding-top : 25px;
 }

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

@@ -69,7 +69,7 @@ class Swift_Message_Headers
    * @var string
    */
   protected $LE = "\r\n";
-  
+
   /**
    * Set the line ending character to use
    * @param string The line ending sequence
@@ -323,10 +323,10 @@ class Swift_Message_Headers
       "Cannot locate attribute '" . $name . "' for header '" . $header . "' as the header does not exist. " .
       "Consider using Swift_Message_Headers->has() to check.");
     }
-    
+
     $name = strtolower($name);
     $lheader = strtolower($header);
-    
+
     if ($this->hasAttribute($header, $name))
     {
       return $this->attributes[$lheader][$name];
@@ -371,24 +371,24 @@ class Swift_Message_Headers
     if (!$this->getCharset()) $this->setCharset("iso-8859-1");
     Swift_ClassLoader::load("Swift_Message_Encoder");
     //I'll try as best I can to walk through this...
-    
+
     $lname = strtolower($name);
-    
+
     if ($this->cached[$lname] !== null) return $this->cached[$lname];
-    
+
     $value = $this->get($name);
-    
+
     $is_email = in_array($name, $this->emailContainingHeaders);
-    
+
     $encoded_value = (array) $value; //Turn strings into arrays (just to make the following logic simpler)
-    
+
     //Look at each value in this header
     // There will only be 1 value if it was a string to begin with, and usually only address lists will be multiple
     foreach ($encoded_value as $key => $row)
     {
       $spec = ""; //The bit which specifies the encoding of the header (if any)
       $end = ""; //The end delimiter for an encoded header
-      
+
       //If the header is 7-bit printable it's at no risk of injection
       if (Swift_Message_Encoder::instance()->isHeaderSafe($row) && !$this->forceEncoding)
       {
@@ -402,11 +402,11 @@ class Swift_Message_Headers
         $end = "?=";
         //Calculate the length of, for example: "From: =?iso-8859-1?Q??="
         $used_length = strlen($name) + 2 + strlen($spec) + 2;
-        
+
         //Encode to QP, excluding the specification for now but keeping the lines short enough to be compliant
         $encoded_value[$key] = str_replace(" ", "_", Swift_Message_Encoder::instance()->QPEncode(
           $row, (75-(strlen($spec)+6)), ($key > 0 ? 0 : (75-$used_length)), true, $this->LE));
-        
+
       }
       elseif ($this->encoding == "B") //Need to Base64 encode
       {
@@ -417,16 +417,17 @@ class Swift_Message_Headers
         $encoded_value[$key] = Swift_Message_Encoder::instance()->base64Encode(
           $row, (75-(strlen($spec)+5)), ($key > 0 ? 0 : (76-($used_length+3))), true, $this->LE);
       }
-      
+
       if (false !== $p = strpos($encoded_value[$key], $this->LE))
       {
-        $cb = 'str_replace("' . $this->LE . '", "", "<$1>");';
-        $encoded_value[$key] = preg_replace("/<([^>]+)>/e", $cb, $encoded_value[$key]);
+        $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
       $lines = explode($this->LE, $encoded_value[$key]);
-      
+
       for ($i = 0, $len = count($lines); $i < $len; $i++)
       {
         //Don't allow commas in address fields without quotes unless they're encoded
@@ -444,9 +445,9 @@ class Swift_Message_Headers
             $lines[$i] = "\"" . $lines[$i] . "\"";
           }
         }
-        
+
         if ($this->encoding == "Q") $lines[$i] = rtrim($lines[$i], "=");
-        
+
         if ($lines[$i] == "" && $i > 0)
         {
           unset($lines[$i]); //Empty line, we'd rather not have these in the headers thank you!
@@ -467,13 +468,13 @@ class Swift_Message_Headers
       $encoded_value[$key] = implode($this->LE, $lines);
       $lines = null;
     }
-    
+
     //If there are multiple values in this header, put them on separate lines, cleared by commas
     $this->cached[$lname] = implode("," . $this->LE . " ", $encoded_value);
-    
+
     //Append attributes if there are any
     if (!empty($this->attributes[$lname])) $this->cached[$lname] .= $this->buildAttributes($this->cached[$lname], $lname);
-    
+
     return $this->cached[$lname];
   }
   /**
@@ -508,7 +509,7 @@ class Swift_Message_Headers
         if (preg_match("~[\\s\";,<>\\(\\)@:\\\\/\\[\\]\\?=]~", $line)) $lines[$i] = '"' . $line . '"';
       }
       $encoded = implode($this->LE, $lines);
-      
+
       //If we can fit this entire attribute onto the same line as the header then do it!
       if ((strlen($encoded) + $used_len + strlen($attribute) + 4) < 74)
       {