Merge branch 'task-imgForMobile' into develop

2017-09-01 12:00:07 +02:00 · 2017-09-01 12:00:07 +02:00 · 379bec4ab4
commit 379bec4ab4
parent 8bb987a812 ec35cf0474
26 changed files with 57899 additions and 64365 deletions
--- a/adm/tabs/AdminCategories.php
+++ b/adm/tabs/AdminCategories.php
@ -520,6 +520,20 @@ class AdminCategories extends AdminTab
                        echo $this->displayError($this->l('An error occured during the image upload.'));
                    }
                }
+
+                if($id_lang == 3
+                    && (!isset($_FILES['image_mobile_'.$id_lang]) || $_FILES['image_mobile_'.$id_lang]['name'] == '')
+                    && (isset($_FILES['image_mobile_2']) && $_FILES['image_mobile_2']['name'] != '')
+                ){
+                    if(!copy($_FILES['image_mobile_2']['tmp_name'], _PS_CAT_IMG_DIR_.$id_category.'_mobile_vp_'.$id_lang.'.jpg')) {
+                        echo $this->displayError($this->l('An error occured during the image upload.'));
+                    }
+                }
+                elseif(isset($_FILES['image_mobile_'.$id_lang]) && $_FILES['image_mobile_'.$id_lang]['name'] != '') {
+                    if(!copy($_FILES['image_mobile_'.$id_lang]['tmp_name'], _PS_CAT_IMG_DIR_.$id_category.'_mobile_vp_'.$id_lang.'.jpg')) {
+                        echo $this->displayError($this->l('An error occured during the image upload.'));
+                    }
+                }
            }
        }
        // @End Antadis
@ -541,6 +555,13 @@ class AdminCategories extends AdminTab
            unlink(_PS_ROOT_DIR_.'/img/c/'.$object->id.'_thumb_vp_'.(int)$id_lang.'.jpg');
        }
    }
+
+    public function deleteImageMobile($object, $id_lang)
+    {
+        if(file_exists(_PS_ROOT_DIR_.'/img/c/'.$object->id.'_mobile_vp_'.(int)$id_lang.'.jpg')) {
+            unlink(_PS_ROOT_DIR_.'/img/c/'.$object->id.'_mobile_vp_'.(int)$id_lang.'.jpg');
+        }
+    }
    // @End Antadis

    public function displayForm($token = NULL)
@ -660,6 +681,26 @@ class AdminCategories extends AdminTab
        echo '<p class="clear"></p>
            </div>';

+        // @Override Antadis
+        echo '<label>'.$this->l('Image app mobile:').'</label>
+              <div class="margin-form translatable">';
+            foreach($this->_languages as $language) {
+                echo '
+                <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').'; float: left;">';
+                    if(file_exists(_PS_ROOT_DIR_.'/img/c/'.$obj->id.'_mobile_vp_'.$language['id_lang'].'.jpg')) {
+                        echo '<div id="image">
+                            <img src="'.__PS_BASE_URI__.'img/c/'.$obj->id.'_mobile_vp_'.$language['id_lang'].'.jpg" alt="" class="imgm">
+                            <p></p>
+                            <a href="'.$currentIndex.'&id_category='.$obj->id.'&token='.Tools::getAdminTokenLite('AdminCatalog').'&deleteImageMobile=1&id_lang='.$language['id_lang'].'">
+                            <img src="../img/admin/delete.gif" alt="Supprimer"> Supprimer</a>
+                        </div>';
+                    }
+                    echo '<input id="image_thumb_'.$language['id_lang'].'" type="file" name="image_mobile_'.$language['id_lang'].'" />
+                </div>';
+            }
+        echo '<p class="clear"></p>
+            </div>';
+
        // echo '  <label>'.$this->l('Image logo:').' </label>
        //         <div class="margin-form">';
        //         if(file_exists(_PS_ROOT_DIR_.'/img/c/'.$obj->id.'_thumb_vp.jpg')) {
--- a/mails/fr/order_return_2.html
+++ b/mails/fr/order_return_2.html
@ -41,7 +41,7 @@
            <br /><br />
            Vous devez coller l'&eacute;tiquette fournie par Mondial Relay sur une face bien visible du colis.
            <br /><br /><br />
-            Le d&eacute;p&ocirc;t des colis se fait dans l'un des 4 500 Point Relais&reg; de France.
+            Le d&eacute;p&ocirc;t des colis se fait dans l'un de nos nombreux Points Relais&reg;.
            <br />
            Vous pouvez retrouver la liste des points relais près de chez vous en <a href="http://www.mondialrelay.fr/trouver-le-point-relais-le-plus-proche-de-chez-moi/" target="_blank" style="color: #5082f5; text-decoration: none;">cliquant sur ce lien</a>
            <br />
--- a/modules/ant_alert/ant_alert.php
+++ b/modules/ant_alert/ant_alert.php
@ -103,13 +103,13 @@ class Ant_Alert extends Module
                );
                if ((int)$open_messages['total'] >= (int)$alert->limit) {
                    // dev
-                    $to = array('marion@antadis.com');
+                    //$to = array('marion@antadis.com');
                    // prod
-                    // $to = array(
-                    //     'frederic@bebeboutik.com',
-                    //     'jacques@bebeboutik.com',
-                    //     'valentin@bebeboutik.com',
-                    // );
+                    $to = array(
+                        'frederic@bebeboutik.com',
+                        'jacques@bebeboutik.com',
+                        'valentin@bebeboutik.com',
+                    );
                    $contact = new Contact((int)$alert->id_contact,2);
                    $data = array(
                        '{limit}' => (int)$alert->limit,
--- a/modules/ant_promobanner/img/img_bmobile_2.jpg
+++ b/modules/ant_promobanner/img/img_bmobile_2.jpg
--- a/modules/ant_promobanner/img/img_bmobile_3.jpg
+++ b/modules/ant_promobanner/img/img_bmobile_3.jpg
--- a/modules/criteo_bbb/criteo_sales.fr.xml
+++ b/modules/criteo_bbb/criteo_sales.fr.xml
--- a/modules/emarsys_rss/flux.xml
+++ b/modules/emarsys_rss/flux.xml
--- a/modules/emarsys_rss/flux_es.xml
+++ b/modules/emarsys_rss/flux_es.xml
--- a/modules/labelgenerate/models/generatebarcode.php
+++ b/modules/labelgenerate/models/generatebarcode.php
@ -82,7 +82,7 @@ class GenerateBarcode {
        $this->directory = self::$barcode_directory.$name;
    }

-    public function generateBarcode($id_product, $id_product_attribute = NULL, $reference = NULL, $ean = NULL) {
+    public function generateBarcode($id_product, $id_product_attribute = NULL, $reference = NULL, $ean = NULL, $big_label = false) {
        if($ean == null) {
            $ean = $this->_getEanNumber();
        }
@ -95,7 +95,11 @@ class GenerateBarcode {
        $white  = ImageColorAllocate($im, 0xff, 0xff, 0xff);
        imagefilledrectangle($im, 0, 0, $width, $height, $white);
        Barcode::gd($im, $black, $width / 2, $height / 2 - 10 , 0, "code128", $str, 3, 50);
-        //imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$reference.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$reference.'*' );
+        if(!$big_label && $reference!=NULL) {
+            imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$reference.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$reference.'*' );
+        } elseif(!$big_label) {
+            imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$str.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$str.'*' );
+        }

        if ($id_product_attribute) {
            imagegif($im, $this->directory.'/ean-'.$id_product.'-'.$id_product_attribute.'.gif');
--- a/modules/landingpages/img/10_1_2.jpg
+++ b/modules/landingpages/img/10_1_2.jpg
--- a/modules/landingpages/img/10_1_3.jpg
+++ b/modules/landingpages/img/10_1_3.jpg
--- a/modules/landingpages/img/7_1_2.jpg
+++ b/modules/landingpages/img/7_1_2.jpg
--- a/modules/logistics/carriers/mondialrelay/pltri.txt
+++ b/modules/logistics/carriers/mondialrelay/pltri.txt
--- a/modules/logistics/carriers/mondialrelay/relais.txt
+++ b/modules/logistics/carriers/mondialrelay/relais.txt
--- a/modules/paypal/api/paypal_connect.php
+++ b/modules/paypal/api/paypal_connect.php
@ -28,7 +28,7 @@ class PayPalConnect
 {
 	private	$_logs = array();
 	private $paypal = null;
-	
+
 	public function __construct()
 	{
 		$this->paypal = new PayPal();
@ -83,8 +83,8 @@ class PayPalConnect
 			@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			@curl_setopt($ch, CURLOPT_HEADER, false);
 			@curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-			@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+			@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+			@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
 			@curl_setopt($ch, CURLOPT_SSLVERSION, defined(CURL_SSLVERSION_TLSv1) ? CURL_SSLVERSION_TLSv1 : 1);
 			@curl_setopt($ch, CURLOPT_VERBOSE, false);

--- a/modules/privatesales/Sale.php
+++ b/modules/privatesales/Sale.php
@ -936,6 +936,7 @@ class Sale {
            $order_sales = array();

            foreach ($_orders as $key => $order) {
+                $added_sale = false;

                // supprime les orders avec plus de 2 ventes pour les multi only
                if($multi_only) {
@ -958,6 +959,7 @@ class Sale {
                            if((int)$row['p_quantity'] != 0) {
                                continue 3;
                            }
+                            $added_sale = true;
                        }
                    }
                }
@ -973,7 +975,7 @@ class Sale {
                        $order_print[] = $key;
                    }
                } else {
-                    if (count($diff) >= 2) {
+                    if (count($diff) >= 2 || $added_sale) {
                        $order_print[] = $key;
                    }
                }
--- a/modules/privatesales/lastupdate.txt
+++ b/modules/privatesales/lastupdate.txt
@ -1 +1 @@
-20160818 155601
+20170901 110601
--- a/modules/privatesales_logistique/exportOrderForm.php
+++ b/modules/privatesales_logistique/exportOrderForm.php
@ -844,19 +844,20 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
                $ref = array();
                $decli = array();
                foreach ($lines_attributes as $key => $row) {
+                    // si le produit n'apparait pas dans une commande, on affiche pas la ligne
+                    if (!isset($row['total_m']) || $row['total_m'] == 0) {
+                        unset($lines_attributes[$key]);
+                        continue;
+                    }
                    $ref[$key] = $row['line']['product_reference'];
                    $decli[$key] = $row['line']['product_attribute_name_base'];
                }
                array_multisort($ref, SORT_ASC, $decli, SORT_ASC, $lines_attributes);
                foreach($lines_attributes as $key => $values)
                {
-                    // si le produit n'apparait pas dans une commande, on affiche pas la ligne
-                    if (!isset($values['total_m']) || $values['total_m'] == 0) {
-                        continue;
-                    }

-                    if ((is_array($lines_attributes[$key+1]) && isset($lines_attributes[$key+1]['total_m']) && $lines_attributes[$key+1]['total_m'] != 0)
-                         || ($lines2[$k+1][0]['line']['product_reference'] == $values['line']['product_reference'] && isset($lines2[$k+1][0]['line']['total_m']) && $lines2[$k+1][0]['line']['total_m'] != 0)) {
+                    if (is_array($lines_attributes[$key+1])
+                        || $lines2[$k+1][0]['line']['product_reference'] == $values['line']['product_reference']) {
                        $borders_style = array(
                            'borders' => array(
                                'right' => array(
--- a/modules/soflexibilite/classes/SoFlexibiliteDelivery.php
+++ b/modules/soflexibilite/classes/SoFlexibiliteDelivery.php
@ -356,6 +356,9 @@ class SoFlexibiliteDelivery
        } else {
            $result = Db::getInstance()->autoExecute(_DB_PREFIX_.$table_name, $values, 'UPDATE', $where);
        }
+        if($values['type'] == "DOM" || $values['type']== "BOM") {
+            mail('marion@antadis.com', '[BBB] So Colissimo', json_encode($values).' '.$result);
+        }

        return ($result);
    }
@ -454,7 +457,9 @@ class SoFlexibiliteDelivery
        } else {
            $result = Db::getInstance()->autoExecute(_DB_PREFIX_.$table_name, $values, 'INSERT');
        }
-
+        if($values['type'] == "DOM" || $values['type']== "BOM") {
+            mail('marion@antadis.com', '[BBB] So Colissimo', json_encode($values).' '.$result);
+        }
        return ($result);
    }

--- a/modules/stats_logistic/AdminStatsLogistic.php
+++ b/modules/stats_logistic/AdminStatsLogistic.php
@ -85,9 +85,9 @@ class AdminStatsLogistic extends AdminTab {
                        $result[(int)$sale['id_sale']]['nb_pole_1'] = 0;
                        $result[(int)$sale['id_sale']]['nb_pole_2'] = 0;
                        $result[(int)$sale['id_sale']]['nb_pole_3'] = 0;
-                        $result[(int)$sale['id_sale']]['nb_pole_4'] = 0;
-                        $result[(int)$sale['id_sale']]['nb_pole_5'] = 0;
-                        $result[(int)$sale['id_sale']]['nb_pole_6'] = 0;
+                        // $result[(int)$sale['id_sale']]['nb_pole_4'] = 0;
+                        // $result[(int)$sale['id_sale']]['nb_pole_5'] = 0;
+                        // $result[(int)$sale['id_sale']]['nb_pole_6'] = 0;

                        foreach($products as $row) {
                            if (!in_array((int)$row['id_order'],$id_orders)) {
@ -166,28 +166,16 @@ class AdminStatsLogistic extends AdminTab {
                        foreach ($shipping_numbers as $id_employee => $value) {
                            $nb_package += count($value);
                            switch ($id_employee) {
-                                case '52':
+                                case '22':
+                                case '35':
                                    $result[(int)$sale['id_sale']]['nb_pole_1'] += count($value);
                                    break;
-                                case '22':
-                                case '24':
+                                case '66':
+                                case '36':
                                    $result[(int)$sale['id_sale']]['nb_pole_2'] += count($value);
                                    break;
-                                case '25':
-                                case '44':
-                                    $result[(int)$sale['id_sale']]['nb_pole_3'] += count($value);
-                                    break;
-                                case '47':
-                                case '48':
-                                    $result[(int)$sale['id_sale']]['nb_pole_4'] += count($value);
-                                    break;
-                                case '35':
-                                case '36':
-                                    $result[(int)$sale['id_sale']]['nb_pole_5'] += count($value);
-                                    break;
-                                case '28':
                                default:
-                                    $result[(int)$sale['id_sale']]['nb_pole_6'] += count($value);
+                                    $result[(int)$sale['id_sale']]['nb_pole_3'] += count($value);
                                    break;
                            }
                        }
@ -195,9 +183,9 @@ class AdminStatsLogistic extends AdminTab {
                        $result[(int)$sale['id_sale']]['nb_pole_1'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_1'] / $nb_package)*100,2);
                        $result[(int)$sale['id_sale']]['nb_pole_2'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_2'] / $nb_package)*100,2);
                        $result[(int)$sale['id_sale']]['nb_pole_3'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_3'] / $nb_package)*100,2);
-                        $result[(int)$sale['id_sale']]['nb_pole_4'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_4'] / $nb_package)*100,2);
-                        $result[(int)$sale['id_sale']]['nb_pole_5'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_5'] / $nb_package)*100,2);
-                        $result[(int)$sale['id_sale']]['nb_pole_6'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_6'] / $nb_package)*100,2);
+                        // $result[(int)$sale['id_sale']]['nb_pole_4'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_4'] / $nb_package)*100,2);
+                        // $result[(int)$sale['id_sale']]['nb_pole_5'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_5'] / $nb_package)*100,2);
+                        // $result[(int)$sale['id_sale']]['nb_pole_6'] = number_format(($result[(int)$sale['id_sale']]['nb_pole_6'] / $nb_package)*100,2);
                    }
                }
                if ($result) {
@ -324,7 +312,7 @@ class AdminStatsLogistic extends AdminTab {

        $stats = $this->getStats();
        $poles = array();
-        for ($i=0; $i < 6; $i++) {
+        for ($i=0; $i < 3; $i++) {
            $poles[] = array(
                'recap' => array(
                    'quantity' => 0,
@ -333,13 +321,13 @@ class AdminStatsLogistic extends AdminTab {
                'employee' => array(),
            );
        }
-        $poles[0]['name'] = 'Pôle 1 : Petites marques';
-        $poles[1]['name'] = 'Pôle 2 : Marques moyennes';
-        $poles[2]['name'] = 'Pôle 3 : Grosses marques';
-        $poles[3]['name'] = 'Pôle 4 : Multi';
-        $poles[4]['name'] = 'Pôle 5 : Mondial Relay';
-        $poles[5]['name'] = 'Pôle 6 : Braderie';
-        $poles[6]['name'] = 'Pôle 7 : Postes complémentaires';
+        $poles[0]['name'] = 'LA POSTE';
+        $poles[1]['name'] = 'MONDIAL RELAY';
+        $poles[2]['name'] = 'AUTRES';
+        // $poles[3]['name'] = 'Pôle 4 : Multi';
+        // $poles[4]['name'] = 'Pôle 5 : Mondial Relay';
+        // $poles[5]['name'] = 'Pôle 6 : Braderie';
+        // $poles[6]['name'] = 'Pôle 7 : Postes complémentaires';
        $total_quantity = 0;

        /**
@ -365,46 +353,22 @@ class AdminStatsLogistic extends AdminTab {
            switch ((int)$stat['id_employee']) {
                //case '52':
                case '22':
+                case '35':
                    $poles[0]['recap']['quantity'] += $stat['quantity'];
                    $poles[0]['recap']['nb_package'] += $stat['nb_package'];
                    $poles[0]['employee'][] = $stat;
                    break;
-                case '24':
-                case '25':
+                case '66':
+                case '36':
                    $poles[1]['recap']['quantity'] += $stat['quantity'];
                    $poles[1]['recap']['nb_package'] += $stat['nb_package'];
                    $poles[1]['employee'][] = $stat;
                    break;
-                case '44':
-                case '47':
+                default:
                    $poles[2]['recap']['quantity'] += $stat['quantity'];
                    $poles[2]['recap']['nb_package'] += $stat['nb_package'];
                    $poles[2]['employee'][] = $stat;
                    break;
-                case '35':
-                case '36':
-                    $poles[3]['recap']['quantity'] += $stat['quantity'];
-                    $poles[3]['recap']['nb_package'] += $stat['nb_package'];
-                    $poles[3]['employee'][] = $stat;
-                    break;
-                case '61':
-                case '66':
-                    $poles[4]['recap']['quantity'] += $stat['quantity'];
-                    $poles[4]['recap']['nb_package'] += $stat['nb_package'];
-                    $poles[4]['employee'][] = $stat;
-                    break;
-                case '56':
-                case '58':
-                    $poles[5]['recap']['quantity'] += $stat['quantity'];
-                    $poles[5]['recap']['nb_package'] += $stat['nb_package'];
-                    $poles[5]['employee'][] = $stat;
-                    break;
-                case '28':
-                default:
-                    $poles[6]['recap']['quantity'] += $stat['quantity'];
-                    $poles[6]['recap']['nb_package'] += $stat['nb_package'];
-                    $poles[6]['employee'][] = $stat;
-                    break;
            }
            $total_quantity += $stat['quantity'];
        }
@ -419,18 +383,18 @@ class AdminStatsLogistic extends AdminTab {
                        <th>Prénom</th>
                        <th>Nom</th>
                        <th>Email</th>
-                        <th>Quantité</th>
-                        <th>Nombre de colis</th>
-                        <th>% total</th>
+                        <th style="text-align:center">Quantité</th>
+                        <th style="text-align:center">Nombre de colis</th>
+                        <th style="text-align:center">% total</th>
                    </tr>
                </thead>
                <tbody>';
                foreach ($poles as $k => $pole) {
                    echo '<tr style="background:#99cef7;">
                            <td colspan="4" style="color:#fff;">'.$pole['name'].'</td>
-                            <td style="color:#fff;">'.$pole['recap']['quantity'].'</td>
-                            <td style="color:#fff;">'.$pole['recap']['nb_package'].'</td>
-                            <td style="color:#fff;">'. number_format(($pole['recap']['nb_package']* 100 / $total_colis), 2) .' %</td>
+                            <td style="color:#fff;text-align:center">'.$pole['recap']['quantity'].'</td>
+                            <td style="color:#fff;text-align:center">'.$pole['recap']['nb_package'].'</td>
+                            <td style="color:#fff;text-align:center">'. number_format(($pole['recap']['nb_package']* 100 / $total_colis), 2) .' %</td>
                        </tr>';
                    foreach ($pole['employee'] as $key => $stat) {
                        echo '<tr>
@ -438,9 +402,9 @@ class AdminStatsLogistic extends AdminTab {
                            <td>'.(isset($stat['firstname'])?$stat['firstname']:"").'</td>
                            <td>'.(isset($stat['lastname'])?$stat['lastname']:"").'</td>
                            <td>'.(isset($stat['email'])?$stat['email']:"").'</td>
-                            <td>'.$stat['quantity'].'</td>
-                            <td>'.$stat['nb_package'].'</td>
-                            <td>'. number_format(($stat['nb_package']* 100 / $total_colis), 2) .' %</td>
+                            <td style="text-align:center">'.$stat['quantity'].'</td>
+                            <td style="text-align:center">'.$stat['nb_package'].'</td>
+                            <td style="text-align:center">'. number_format(($stat['nb_package']* 100 / $total_colis), 2) .' %</td>
                        </tr>';
                    }
                }
@ -448,9 +412,9 @@ class AdminStatsLogistic extends AdminTab {
            <tfoot style="font-weight:bold">
                <tr>
                    <td colspan="4">Total :</td>
-                    <td style="background:#f1f1f1;">'.$total_quantity.'</td>
-                    <td style="background:#f1f1f1;">'.$total_colis.'</td>
-                    <td style="background:#f1f1f1;">100 %</td>
+                    <td style="background:#f1f1f1;text-align:center">'.$total_quantity.'</td>
+                    <td style="background:#f1f1f1;text-align:center">'.$total_colis.'</td>
+                    <td style="background:#f1f1f1;text-align:center">100 %</td>
                </tr>
            </tfoot>
        </table>';
@ -650,6 +614,7 @@ class AdminStatsLogistic extends AdminTab {
                WHERE s.`date` BETWEEN "'.pSQL($this->date_begin).'"  AND "'.pSQL($this->date_end).'"
                AND e.`id_employee` IS NOT NULL
                GROUP BY s.`id_employee`
+                ORDER BY e.`firstname` ASC
        ');
    }

--- a/override/classes/Customer.php
+++ b/override/classes/Customer.php
@ -23,6 +23,6 @@ class Customer extends CustomerCore
 		Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_customer` = '.(int)($this->id));
 		Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customer_thread` SET `id_customer` = 0 WHERE `id_customer` = '.(int)($this->id));
 		Discount::deleteByIdCustomer((int)($this->id));
-		return parent::delete();
+		return ObjectModel::delete();
 	}
 }
--- a/themes/site/img/register.png
+++ b/themes/site/img/register.png
--- a/themes/site/img/register_3.png
+++ b/themes/site/img/register_3.png
--- a/themes/site/modules/blockuserinfo/blockuserinfo.tpl
+++ b/themes/site/modules/blockuserinfo/blockuserinfo.tpl
@ -44,7 +44,7 @@
 								<li><a href="{$link->getPageLink('history.php', true)}" title="{l s='Orders' mod='blockuserinfo'}">{l s='History and details of my orders' mod='blockuserinfo'}</a></li>
 								<li><a href="{$link->getPageLink('identity.php', true)}" title="{l s='Information' mod='blockuserinfo'}">{l s='My personal information' mod='blockuserinfo'}</a></li>
 								<li><a href="{$base_dir_ssl}modules/loyalty/loyalty-program.php" title="{l s='Loyalty program' mod='blockuserinfo'}">{l s='Loyalty program' mod='blockuserinfo'}</a></li>
-								<li><a href="{$link->getPageLink('order-slip.php', true)}" title="{l s='Credit slips' mod='blockuserinfo'}">{l s='My credit slips' mod='blockuserinfo'}</a></li>
+								<li><a href="{$link->getPageLink('discount.php', true)}" title="{l s='Credit slips' mod='blockuserinfo'}">{l s='My credit slips' mod='blockuserinfo'}</a></li>
 								<li><a title="Referral program" href="{$base_dir_ssl}modules/invite/invite-program.php">{l s='Programme de parrainage' mod='blockuserinfo'}</a></li>
 								<li class="logout">
 									<a href="{$link->getPageLink('index.php')}?mylogout" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Log out' mod='blockuserinfo'}</a>
--- a/themes/site_mobile/lang/es.php
+++ b/themes/site_mobile/lang/es.php
@ -663,6 +663,8 @@ $_LANG['shopping-cart_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Transportista:';
 $_LANG['shopping-cart_914419aa32f04011357d3b604a86d7eb'] = 'Transportista';
 $_LANG['shopping-cart_300225ee958b6350abc51805dab83c24'] = 'Continuar la compra';
 $_LANG['shopping-cart_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Siguiente';
+$_LANG['shopping-cart_ea3bd794dfeb4537c194ee43899516ed'] = 'Mi pedido es un regalo. Esta opción, genera una factura sin los precios indicados y permite añadir una pequeña dedicatoria sobre esta. ¡Ideal para enviar tu regalo directamente a casa de tus familiares o amigos! ';
+$_LANG['shopping-cart_b4e59f3a4554655a099738382ebedbff'] = 'Si lo desea, puede añadir una nota al regalo:';
 $_LANG['sitemap_5813ce0ec7196c492c97596718f71969'] = 'Mapa del sitio';
 $_LANG['sitemap_24cc85476cb8ec1a03192f09231e742b'] = 'Nuestras ofertas';
 $_LANG['sitemap_9ff0635f5737513b1a6f559ac2bff745'] = 'Nuevos productos';
--- a/themes/site_mobile/lang/fr.php
+++ b/themes/site_mobile/lang/fr.php
@ -664,6 +664,8 @@ $_LANG['shopping-cart_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Transporteur :';
 $_LANG['shopping-cart_914419aa32f04011357d3b604a86d7eb'] = 'Transporteur';
 $_LANG['shopping-cart_300225ee958b6350abc51805dab83c24'] = 'Retour aux ventes';
 $_LANG['shopping-cart_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
+$_LANG['shopping-cart_ea3bd794dfeb4537c194ee43899516ed'] = 'Ma commande est un cadeau. Elle me permet de bénéficier d\'une facture sans prix et d\'insérer un petit mot sur cette dernière. C\'est idéal pour expédier votre cadeau directement chez vos proches !';
+$_LANG['shopping-cart_b4e59f3a4554655a099738382ebedbff'] = 'Vous pouvez ajouter un message d\'accompagnement à votre commande.';
 $_LANG['sitemap_5813ce0ec7196c492c97596718f71969'] = 'Plan du site';
 $_LANG['sitemap_24cc85476cb8ec1a03192f09231e742b'] = 'Nos offres';
 $_LANG['sitemap_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits';