Suite à MAJ 2.3.4, il manquait des choses dans des templates

templates/frontOffice/default/I18n/en_US.php

@@ -49,7 +49,7 @@ return array(
     'Choose your delivery method' => 'Choose your delivery method',
     'Choose your payment method' => 'Choose your payment method',
     'Code :' => 'Code :',
-    'Connecting to the secure payment server, please wait a few seconds...' => 'Connection au serveur depaiement sécurisé, merci de patienter.',
+    'Connecting to the secure payment server, please wait a few seconds...' => 'Connecting to the secure payment server, please wait a few seconds...',
     'Contact Us' => 'Contact Us',
     'Contact page' => 'Contact page',
     'Continue Shopping' => 'Continue Shopping',
@@ -255,6 +255,7 @@ return array(
     'You want to subscribe to the newsletter? Please enter your email address below.' => 'You want to subscribe to the newsletter? Please enter your email address below.',
     'You will receive a link to reset your password.' => 'You will receive a link to reset your password.',
     'Your Cart' => 'Your Cart',
+    'Your customer account was successfully activated, you can now login.' => 'Your customer account was successfully activated, you can now login.',
     'Your order payment' => 'Your order payment',
     'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
     'Your subscription to our newsletter has been canceled.' => 'Your subscription to our newsletter has been canceled.',

templates/frontOffice/default/I18n/fr_FR.php

@@ -4,6 +4,7 @@ return array(
     '%nb Item' => '%nb élément',
     '%nb Items' => '%nb éléments',
     '+' => '+',
+    '404' => '404',
     '<strong>Sorry!</strong> We are not able to give you a delivery method for your order.' => '<strong>Désolé !</strong>Nous ne pouvons pas trouver de mode de livraison pour votre commande.',
     'A new password has been sent to your e-mail address. Please check your mailbox.' => 'Un nouveau mot de passe vient d\'être envoyé à votre adresse e-mail. Merci de vérifier votre boite de réception.',
     'A problem occured' => 'Un problème est survenu',
@@ -94,7 +95,7 @@ return array(
     'Invoice date' => 'Date de facturation',
     'Language' => 'Langue',
     'Latest' => 'Nouveautés',
-    'Latest products' => 'Top des ventes',
+    'Latest products' => 'Derniers produits',
     'List' => 'Liste',
     'List of orders' => 'Liste de mes commandes',
     'Login' => 'Connexion',
@@ -250,6 +251,7 @@ return array(
     'You want to subscribe to the newsletter? Please enter your email address below.' => 'Vous voulez vous inscrire à la newsletter ? Veuillez saisir votre adresse e-mail ci-dessous.',
     'You will receive a link to reset your password.' => 'Vous recevrez un lien pour réinitialiser votre mot de passe.',
     'Your Cart' => 'Votre panier',
+    'Your customer account was successfully activated, you can now login.' => 'Votre compte client a bien été activé, vous pouvez maintenant vous connecter.',
     'Your order payment' => 'Votre paiement',
     'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre paiement.',
     'Your subscription to our newsletter has been canceled.' => 'Votre inscription à notre newsletter a été annulée.',
@@ -259,5 +261,4 @@ return array(
     'per page' => 'par page',
     'update' => 'mettre à jour',
     'with:' => 'avec :',
-    '404' => '404',
 );

templates/frontOffice/default/account-order.html

@@ -192,6 +192,7 @@
                         {/loop}
                         </p>
                         {/ifloop}
+                        {hook name="account-order.product-list" order_id={$order_id} order_product_id={$ID} product={$PRODUCT_ID}}
                     </td>
                     <td class="unitprice"><p>{format_money number=$realPrice currency_id=$CURRENCY}</p></td>
                     <td class="unitprice"><p>{format_money number=$realTaxedPrice currency_id=$CURRENCY}</p></td>

templates/frontOffice/default/assets/src/css/thelia.css

@@ -5052,6 +5052,14 @@ a.thumbnail.active {
 .alert-danger .alert-link {
   color: #843534;
 }
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
 @keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;
@@ -5087,6 +5095,7 @@ a.thumbnail.active {
 }
 .progress.active .progress-bar,
 .progress-bar.active {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
   animation: progress-bar-stripes 2s linear infinite;
 }
 .progress-bar-success {
@@ -5797,11 +5806,14 @@ button.close {
   outline: 0;
 }
 .modal.fade .modal-dialog {
+  -webkit-transform: translate(0, -25%);
   -ms-transform: translate(0, -25%);
   transform: translate(0, -25%);
+  transition: -webkit-transform 0.3s ease-out;
   transition: transform 0.3s ease-out;
 }
 .modal.in .modal-dialog {
+  -webkit-transform: translate(0, 0);
   -ms-transform: translate(0, 0);
   transform: translate(0, 0);
 }
@@ -6158,23 +6170,29 @@ button.close {
 }
 @media all and (transform-3d), (-webkit-transform-3d) {
   .carousel-inner > .item {
+    transition: -webkit-transform 0.6s ease-in-out;
     transition: transform 0.6s ease-in-out;
+    -webkit-backface-visibility: hidden;
     backface-visibility: hidden;
+    -webkit-perspective: 1000px;
     perspective: 1000px;
   }
   .carousel-inner > .item.next,
   .carousel-inner > .item.active.right {
+    -webkit-transform: translate3d(100%, 0, 0);
     transform: translate3d(100%, 0, 0);
     left: 0;
   }
   .carousel-inner > .item.prev,
   .carousel-inner > .item.active.left {
+    -webkit-transform: translate3d(-100%, 0, 0);
     transform: translate3d(-100%, 0, 0);
     left: 0;
   }
   .carousel-inner > .item.next.left,
   .carousel-inner > .item.prev.right,
   .carousel-inner > .item.active {
+    -webkit-transform: translate3d(0, 0, 0);
     transform: translate3d(0, 0, 0);
     left: 0;
   }
@@ -6666,8 +6684,9 @@ button.close {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
 }
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
@@ -6727,41 +6746,60 @@ button.close {
   margin-left: .3em;
 }
 .fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
   animation: fa-spin 2s infinite linear;
 }
 .fa-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
   animation: fa-spin 1s infinite steps(8);
 }
-@keyframes fa-spin {
+@-webkit-keyframes fa-spin {
   0% {
+    -webkit-transform: rotate(0deg);
     transform: rotate(0deg);
   }
   100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
     transform: rotate(359deg);
   }
 }
 .fa-rotate-90 {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -webkit-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   transform: rotate(90deg);
 }
 .fa-rotate-180 {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -webkit-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
   transform: rotate(180deg);
 }
 .fa-rotate-270 {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -webkit-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
   transform: rotate(270deg);
 }
 .fa-flip-horizontal {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -webkit-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
 .fa-flip-vertical {
   filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -webkit-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
   transform: scale(1, -1);
 }
@@ -6770,7 +6808,8 @@ button.close {
 :root .fa-rotate-270,
 :root .fa-flip-horizontal,
 :root .fa-flip-vertical {
-  filter: none;
+  -webkit-filter: none;
+          filter: none;
 }
 .fa-stack {
   position: relative;
@@ -8556,8 +8595,9 @@ header .header .language-container .currency-switch .select {
     text-rendering: auto;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    -ms-transform: translate(0, 0);
-        transform: translate(0, 0);
+    -webkit-transform: translate(0, 0);
+        -ms-transform: translate(0, 0);
+            transform: translate(0, 0);
     content: "\f078";
   }
   .navbar .navbar-cart .dropdown > a:after,
@@ -8917,8 +8957,9 @@ header .header .language-container .currency-switch .select {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f071";
   display: block;
   font-size: 2.2em;
@@ -9046,8 +9087,9 @@ a {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f105";
 }
 .btn {
@@ -9278,8 +9320,9 @@ a {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f078";
 }
 .panel-heading {
@@ -9455,8 +9498,9 @@ a {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f071";
   display: block;
   font-size: 2.2em;
@@ -9514,8 +9558,9 @@ a {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f054";
   color: #f49a17;
   margin-left: -15px;
@@ -9568,8 +9613,9 @@ a {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f068";
 }
 .block-nav .block-content li a.accordion-toggle.collapsed:after {
@@ -9952,8 +9998,9 @@ a.label-delivered:focus {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f00d";
   margin-right: .3em;
 }
@@ -10001,6 +10048,7 @@ label {
   content: "\f002";
   color: #fff;
   text-align: center;
+  -webkit-transform: translate(0, 0);
   -ms-transform: translate(0, 0);
   transform: translate(0, 0);
   line-height: 0;
@@ -10015,6 +10063,7 @@ label {
 }
 .overlay:hover:after,
 .overlay:focus:after {
+  -webkit-transform: translate(0, 50%);
   -ms-transform: translate(0, 50%);
   transform: translate(0, 50%);
 }
@@ -10025,8 +10074,9 @@ label {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f015";
   color: #c9c9c9;
   font-size: 26px;
@@ -10042,8 +10092,9 @@ label {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f007";
   color: #f49a17;
   font-size: 19px;
@@ -10075,8 +10126,9 @@ label {
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f07a";
   color: #fff;
   font-size: 24px;
@@ -10197,6 +10249,7 @@ td.product .name > a:focus,
   text-decoration: line-through;
 }
 #products-new .products-grid .overlay:after {
+  -webkit-transform: translate(0, 40%);
   -ms-transform: translate(0, 40%);
   transform: translate(0, 40%);
 }
@@ -10412,8 +10465,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f005";
 }
 #product-details .product-promo .sale-period {
@@ -10493,8 +10547,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f002";
   font-size: 30px;
   float: left;
@@ -10562,8 +10617,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f0e0";
   color: #8b8b8b;
   font-size: 18px;
@@ -10603,8 +10659,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f041";
   font-size: 34px;
 }
@@ -10615,8 +10672,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f10b";
   font-size: 30px;
   margin-top: -8px;
@@ -10629,8 +10687,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f0e0";
   font-size: 17px;
   margin-left: 2px;
@@ -10648,8 +10707,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f1d8";
   font-size: 17px;
 }
@@ -10815,8 +10875,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f077";
   color: #f49a17;
   display: block;
@@ -10852,8 +10913,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f078";
   float: left;
   width: 20px;
@@ -10880,8 +10942,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f10b";
   font-size: 30px;
 }
@@ -10892,8 +10955,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f095";
   font-size: 22px;
 }
@@ -10904,8 +10968,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f0e0";
   font-size: 18px;
 }
@@ -10970,6 +11035,7 @@ td.product .name > a:focus,
   margin-bottom: 20px;
   width: 100%;
   height: 350px;
+  -webkit-filter: grayscale(100%);
   -moz-filter: grayscale(100%);
   -ms-filter: grayscale(100%);
   -o-filter: grayscale(100%);
@@ -10991,8 +11057,9 @@ td.product .name > a:focus,
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -ms-transform: translate(0, 0);
-      transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+          transform: translate(0, 0);
   content: "\f005";
 }
 #sale-details .sale-discount-information .sale-period {
@@ -11006,6 +11073,3 @@ td.product .name > a:focus,
 #sale-details .sale-information .description {
   margin-bottom: 10px;
 }
-.rev_slider_wrapper {
-  margin-bottom: 15px !important;
-}

templates/frontOffice/default/assets/src/js/thelia.js

@@ -47,8 +47,7 @@ var pseManager = (function($){
             "options": {},
             "pseId": null,
             "useFallback": false,
-            "fallback": $("#pse-options .pse-fallback"),
-            "thumbnails": $('#product-thumbnails')
+            "fallback": $("#pse-options .pse-fallback")
         };
     }
 
@@ -137,6 +136,7 @@ var pseManager = (function($){
             selection;
 
         if (PSE_COUNT > 1) {
+
             if ($pse.useFallback) {
                 pseId = $pse.fallback.val();
             } else {
@@ -149,14 +149,12 @@ var pseManager = (function($){
                     // not exists, revert
                     displayNotice();
                     setPseForm();
-                    selection = getFormSelection();
-                    pseId = pseExist(selection);
                 } else {
                     $pse.validity.hide();
                 }
             }
 
-            $pse.id.val(pseId).trigger('change.pse', pseId);
+            $pse.id.val(pseId);
             $pse.pseId = pseId;
         }
 
@@ -238,32 +236,6 @@ var pseManager = (function($){
             } else {
                 $pse.priceOld.html("");
                 $pse.price.html(pse.price);
-           }
-
-            // images
-            if (pse.images.length > 0) {
-                i = 0;
-                $pse.thumbnails.find('.thumbnail').each(function() {
-                    if (jQuery.inArray($(this).data('thumbId'), pse.images) !== -1) {
-                        $(this).filter('.disabled').removeClass('disabled');
-
-                        if (i === 0) {
-                            if (!$(this).hasClass('active')) {
-                                $pse.thumbnails.find('.thumbnail.active').removeClass('active');
-                                $('.product-image > img', $(this).closest("#product-gallery")).attr('src',$(this).attr('href'));
-                                $(this).addClass('active');
-                                if ($(this).filter(":visible").length != 1) {
-                                    $pse.thumbnails.carousel('next');
-                                }
-                            }
-                            i++;
-                        }
-                    } else {
-                        $(this).not('.disabled').addClass('disabled');
-                    }
-                });
-            } else {
-                $pse.thumbnails.find('.thumbnail.disabled').removeClass('disabled');
             }
         }
         else {
@@ -496,14 +468,13 @@ var pseManager = (function($){
             if (doAjax) {
                 var url_action  = $(this).attr("action"),
                     product_id  = $("input[name$='product_id']",this).val(),
-                    pse_id  = $("input.pse-id",this).val(),
-                    quantity  = $("#quantity",this).val();
+                    pse_id  = $("input.pse-id",this).val();
 
                 $.ajax({type: "POST", data: $(this).serialize(), url: url_action,
                     success: function(data){
                         $(".cart-container").html($(data).html());
                         // addCartMessageUrl is initialized in layout.tpl
-                        $.ajax({url:addCartMessageUrl, data:{ product_id: product_id, pse_id: pse_id, quantity: quantity },
+                        $.ajax({url:addCartMessageUrl, data:{ product_id: product_id, pse_id: pse_id },
                             success: function (data) {
                                 // Hide all currently active bootbox dialogs
                                 bootbox.hideAll();

templates/frontOffice/default/assets/src/less/custom.less

@@ -1,4 +0,0 @@
-
-.rev_slider_wrapper {
-    margin-bottom: 15px !important;
-}

templates/frontOffice/default/assets/src/less/thelia.less

@@ -8,6 +8,4 @@
 @import "thelia/import";
 
 // Import Thelia theme
-@import "theme/import";
-
-@import "custom";
+@import "theme/import";

templates/frontOffice/default/assets/src/less/thelia/product.less

@@ -42,9 +42,6 @@
                     margin: 0;
                     padding: 0;
                     width: 19%;
-                    .thumbnail.disabled {
-                        .opacity(.3);
-                    }
                 }
             }
         }

templates/frontOffice/default/brand.html

@@ -11,7 +11,7 @@
 {block name='no-return-functions' append}
 {if $brand_id}
     {loop name="brand.seo.title" type="brand" id=$brand_id limit="1"}
-    {$page_title = {$META_TITLE}}
+    {$page_title = $META_TITLE}
     {/loop}
 {/if}
 {/block}
@@ -131,7 +131,7 @@
                         <div class="products-content">
                             <ul class="list-unstyled row">
                                 {loop type="product" name="product_list" brand=$ID limit=$limit page=$product_page order=$product_order}
-                                    {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true hasQuickView=true width="720" height="482"}
+                                    {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true hasQuickView=true width="218" height="146"}
                                 {/loop}
                             </ul>
                         </div>

templates/frontOffice/default/cart.html

@@ -58,32 +58,46 @@
                     </thead>
                     <tbody>
                         {loop type="cart" name="cartloop"}
-                        <tr>
+                        <tr id="cart_item_id_{$ITEM_ID}">
                             <td class="image">
-                                {ifloop rel='product-image'}
                                 <a href="{$PRODUCT_URL nofilter}" class="thumbnail">
-                                    {assign "cart_count" $LOOP_COUNT}
-                                    {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"}
-                                        <img src="{$IMAGE_URL nofilter}" alt="Product #{$cart_count}">
+                                {assign var="product_image_url" value=null}
+                                {ifloop rel="pse-first-image"}
+                                    {loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id=$PRODUCT_SALE_ELEMENTS_ID limit="1"}
+                                        {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"}
+                                            {assign var="product_image_url" value=$IMAGE_URL}
+                                        {/loop}
                                     {/loop}
-                                </a>
                                 {/ifloop}
+                                {elseloop rel="pse-first-image"}
+                                    {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"}
+                                        {assign var="product_image_url" value=$IMAGE_URL}
+                                    {/loop}
+                                {/elseloop}
+                                {if $product_image_url}
+                                    <img itemprop="image" src="{$product_image_url nofilter}" alt="Product #{$LOOP_COUNT}">
+                                {else}
+                                    <img itemprop="image" src="{image file='assets/dist/img/product/1/118x85.png'}" alt="Product #{$LOOP_COUNT}">
+                                {/if}
+                                </a>
                             </td>
                             <td class="product" >
                                 <h3 class="name"><a href="{$PRODUCT_URL nofilter}">{$TITLE}</a></h3>
                                 <div class="product-options">
                                     <dl class="dl-horizontal">
-                                        <dt>{intl l="Available"} :</dt>
+                                        <dt class="stockView">{intl l="Available"} :</dt>
                                         {if $STOCK > 0}
                                             <dd>{intl l="In Stock"}</dd>
                                         {else}
                                             {$errorStock="TRUE"}
                                             <dd>{intl l="Out of Stock"}</dd>
                                         {/if}
-                                        <dt>{intl l="No."}</dt>
-                                        <dd>{$REF}</dd>
+                                        {loop type="product_sale_elements" name="ref" id=$PRODUCT_SALE_ELEMENTS_ID}
+                                            <dt class="refView">{intl l="No."}</dt>
+                                            <dd>{$REF}</dd>
+                                        {/loop}
                                         {loop type="attribute_combination" name="product_options" product_sale_elements="$PRODUCT_SALE_ELEMENTS_ID" order="manual"}
-                                            <dt>{$ATTRIBUTE_TITLE}</dt>
+                                            <dt class="attributeView">{$ATTRIBUTE_TITLE}</dt>
                                             <dd>{$ATTRIBUTE_AVAILABILITY_TITLE}</dd>
                                         {/loop}
                                     </dl>
@@ -249,7 +263,7 @@
                 <div class="products-content">
                     <ul class="products-grid list-unstyled row">
                         {loop name="product_upsell" type="product" promo="yes" limit="5"}
-                            {include file="includes/single-product.html" colClass="col-md-2" product_id=$ID hasBtn=false hasDescription=true width="720" height="482"}
+                            {include file="includes/single-product.html" colClass="col-md-2" product_id=$ID hasBtn=false hasDescription=true width="218" height="146"}
                         {/loop}
                     </ul>
                 </div>

templates/frontOffice/default/category.html

@@ -12,7 +12,7 @@
 {block name='no-return-functions' append}
 {if $category_id}
     {loop name="category.seo.title" type="category" id=$category_id limit="1"}
-        {$page_title = {$META_TITLE}}
+        {$page_title = $META_TITLE}
     {/loop}
 {/if}
 {/block}
@@ -56,7 +56,7 @@
 
         {hook name="category.main-top" category="$category_id"}
 
-        <article class="col-main col-md-12 {$smarty.get.mode|default:"grid"}" role="main">
+        <article class="col-main col-md-9 col-md-push-3 {$smarty.get.mode|default:"grid"}" role="main">
 
             {hook name="category.content-top" category="$category_id"}
 
@@ -82,43 +82,40 @@
             <hr/>
             {/if}
 
-
+            {if #category_display_subcategories#}
             {ifloop rel="subcategories"}
-
-
+                <div class="block-links">
+                    <div class="block-content">
+                        <ul>
                             {loop name="subcategories" type="category" parent=$category_id}
-<div id="category-products">
-
-
-                                    <hr>
-                                    <h3 id="main-label" class="page-header">{$TITLE}</h3>
-                                    <hr>
-</div>
-<div id="category-products">
-                <div class="products-content">
-<ul class="list-unstyled row">
-{loop type="product" name="my_product_loop" category="{$ID}" depth="2" order="min_price"}
-
-
- {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=false hasQuickView=false  width="720" height="482"}
-
-
-
-{/loop}
-</ul>
-                </div>
-            </div>
-
+                                <li>
+                                    <a href="{$URL}">{$TITLE}</a>
+                                </li>
                             {/loop}
-
-
+                        </ul>
+                    </div>
+                </div>
             {/ifloop}
-
+            {/if}
 
             {ifloop rel="product_list"}
                 {$amount={count type="product" category=$category_id}}
                 <div class="toolbar toolbar-top" role="toolbar">
                     <div class="sorter-container clearfix">
+                    <span class="amount">{if ($amount > 1)}{intl l="%nb Items" nb={$amount}}{else}{intl l="%nb Item" nb={$amount}}{/if}</span>
+
+                    <span class="limiter">
+                        <label for="limit-top">{intl l="Show"}</label>
+                        <select id="limit-top" name="limit">
+                            <option value="{url current="1" page=1 limit="4"}" {if $limit==4}selected{/if}>4</option>
+                            <option value="{url current="1" page=1 limit="8"}" {if $limit==8}selected{/if}>8</option>
+                            <option value="{url current="1" page=1 limit="12"}" {if $limit==12}selected{/if}>12</option>
+                            <option value="{url current="1" page=1 limit="50"}" {if $limit==50}selected{/if}>50</option>
+                            <option value="{url current="1" page=1 limit="100000"}" {if $limit==100000}selected{/if}>{intl l="All"}</option>
+                        </select>
+                        <span class="per-page">{intl l="per page"}</span>
+                    </span><!-- /.limiter -->
+
                     <span class="sort-by">
                         <label for="sortby-top">{intl l="Sort By"}</label>
                         <select id="sortby-top" name="sortby">
@@ -144,12 +141,11 @@
                 <div class="products-content">
                     <ul class="list-unstyled row">
                         {loop type="product" name="product_list" category=$category_id limit=$limit page=$product_page order=$product_order}
-                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true hasQuickView=true width="720" height="482"}
+                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true hasQuickView=true width="218" height="146"}
                         {/loop}
                     </ul>
                 </div>
-            </div>
-            <!-- /#category-products -->
+            </div><!-- /#category-products -->
             <div class="toolbar toolbar-bottom" role="toolbar">
                 {if $amount > $limit}
                     <div class="pagination-container clearfix" role="pagination" aria-labelledby="pagination-label-{$toolbar}}">
@@ -168,7 +164,6 @@
                             {pageloop rel="product_list"}
                                 <li{if $PAGE eq $CURRENT} class="active"{/if}>
                                     <a href="{url current="1" page=$PAGE }"> {$PAGE} </a>
-
                                 </li>
                                 {if $PAGE eq $LAST}
                                     {if $CURRENT eq $LAST}
@@ -187,14 +182,19 @@
                 {/if}
             </div><!-- /.toolbar toolbar-bottom -->
             {/ifloop}
+            {elseloop rel="product_list"}
+                <div class="alert alert-warning">
+                    {intl l="No products available in this category"}
+                </div>
+            {/elseloop}
 
             {hook name="category.content-bottom" category="$category_id"}
 
         </article>
 
-<!--
-
--->
+        <aside class="col-left col-md-3 col-md-pull-9" role="complementary" itemscope itemtype="http://schema.org/WPSideBar">
+            {include file="includes/menu.html"}
+        </aside>
 
         {hook name="category.main-bottom" category="$category_id"}
 

templates/frontOffice/default/contact.html

@@ -16,7 +16,7 @@
         {elsehook rel="contact.top"}
         <div id="google-map">
             {assign var="address" value="{config key="store_address1"} {config key="store_address2"} {config key="store_address3"}, {config key="store_city"}, {config key="store_country"}"}
-            <iframe class="map" width="100%" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&source=s_q&geocode=&q={$address|escape:'url'}&output=embed"></iframe>
+            <iframe class="map" width="100%" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?f=q&source=s_q&geocode=&q={$address|escape:'url'}&output=embed"></iframe>
         </div><!-- / #google-map-->
         {/elsehook}
 

templates/frontOffice/default/content.html

@@ -11,7 +11,7 @@
 {block name='no-return-functions' append}
     {if {$content_id}}
         {loop name="content.seo.title" type="content" id={$content_id} limit="1"}
-            {$page_title = {$META_TITLE}}
+            {$page_title = $META_TITLE}
         {/loop}
     {/if}
 {/block}

templates/frontOffice/default/folder.html

@@ -11,7 +11,7 @@
 {block name='no-return-functions' append}
     {if $folder_id}
         {loop name="folder.seo.title" type="folder" id=$folder_id limit="1"}
-        {$page_title = {$META_TITLE}}
+        {$page_title = $META_TITLE}
         {/loop}
     {/if}
 {/block}

templates/frontOffice/default/includes/addedToCart.html

@@ -11,16 +11,16 @@
             </td>
         </tr>
         <tr>
-            <td class="col-md-4">p={$ID}
+            <td class="col-md-4">
                 {ifloop rel="pse-first-image"}
                     {loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id={$smarty.get.pse_id} limit="1"}
-                        {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID source="product" limit="1" width="720" height="482" resize_mode="borders"}
+                        {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID product=$ID limit="1" width="218" height="146" resize_mode="borders"}
                             <img itemprop="image" src="{$IMAGE_URL nofilter}" alt="Product #{$LOOP_COUNT}">
                         {/loop}
                     {/loop}
                 {/ifloop}
                 {elseloop rel="pse-first-image"}
-                    {loop type="image" name="product-image" product=$ID limit="1" width="720" height="482" resize_mode="borders"}
+                    {loop type="image" name="product-image" product=$ID limit="1" width="218" height="146" resize_mode="borders"}
                         <img itemprop="image" src="{$IMAGE_URL nofilter}" alt="Product #{$LOOP_COUNT}">
                     {/loop}
                 {/elseloop}
@@ -33,19 +33,13 @@
             </td>
             <td class="col-md-4">
                 {loop type="product_sale_elements" name="product_price" id={$smarty.get.pse_id}}
-                    {$price = $TAXED_PRICE}
-                    {$promoPrice = $TAXED_PROMO_PRICE}
-
-                    {loop type="digressive" name="digressivePrice" pse_id={$smarty.get.pse_id} quantity={$smarty.get.quantity} limit=1}
-                        {$price = $TAXED_PRICE}
-                        {$promoPrice = $TAXED_PROMO_PRICE}
-                    {/loop}
-
                     {if $IS_PROMO == 1}
-                        <div class="special-price">{$smarty.get.quantity} x <span class="price">{format_money number=$promoPrice}</span></div>
-                        <small class="old-price"> <span class="price">{format_money number=$price}</span></small>
+                        {assign "real_price" $TAXED_PROMO_PRICE}
+                        <div class="special-price"><span class="price">{format_money number=$TAXED_PROMO_PRICE}</span></div>
+                        <small class="old-price"> <span class="price">{format_money number=$TAXED_PRICE}</span></small>
                     {else}
-                        <div class="special-price">{$smarty.get.quantity} x <span class="price">{format_money number=$price}</span></div>
+                        {assign "real_price" $TAXED_PRICE}
+                        <div class="special-price"><span class="price">{format_money number=$TAXED_PRICE}</span></div>
                     {/if}
                 {/loop}
             </td>
@@ -62,7 +56,7 @@
         <div class="products-content">
             <ul class="list-unstyled row products-grid">
                 {loop type="accessory" name="accessories" product="$ID" order="random" limit="3"}
-                    {include file="includes/single-product.html" product_id=$ACCESSORY_ID hasBtn=false hasDescription=false width="720" height="482"}
+                    {include file="includes/single-product.html" product_id=$ACCESSORY_ID hasBtn=false hasDescription=false width="218" height="146"}
                 {/loop}
             </ul>
         </div>

templates/frontOffice/default/includes/single-product.html

@@ -62,18 +62,7 @@
                     <span class="old-price col-xs-6"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_money number=$TAXED_PRICE}</span></span>
                     {/if}
                 {else}
-                    {$prix_mini=0}
-                    {loop type="digressive" name="digressiveLoop" product_id={$product_id}}
-                        {$prix_mini={$TAXED_PRICE}}
-                        {if {$TAXED_PRICE} < {$prix_mini}}
-                            {$prix_mini={$TAXED_PRICE}}
-                        {/if}
-                    {/loop}
-                    {if $prix_mini > 0}
-                    <span class="regular-price col-xs-12"><span itemprop="price" class="price">{intl l="From %price" price={format_money number=$prix_mini}}</span></span>
-                    {else}
                     <span class="regular-price col-xs-12"><span itemprop="price" class="price">{format_money number=$BEST_TAXED_PRICE}</span></span>
-                    {/if}
                 {/if}
             </div>
 

templates/frontOffice/default/layout.tpl

@@ -78,8 +78,15 @@ GNU General Public License : http://www.gnu.org/licenses/
     {block name="stylesheet"}{/block}
 
     {* Favicon *}
-    <link rel="shortcut icon" type="image/x-icon" href="{image file='assets/dist/img/favicon.ico'}">
-    <link rel="icon" type="image/png" href="{image file='assets/dist/img/favicon.png'}" />
+    {* PNG file favicons are not supported by IE 10 and lower. In this case, we use the default .ico file in the template. *}
+
+    <!--[if lt IE 11]>
+    <link rel="shortcut icon" type="image/x-icon" href="{image file='assets/dist/img/favicon.ico'}" />
+    <![endif]-->
+
+    {local_media type="favicon" width=32 height=32}
+    <link rel="icon" type="{$MEDIA_MIME_TYPE}" href="{$MEDIA_URL}" />
+    {/local_media}
 
     {* Feeds *}
     <link rel="alternate" type="application/rss+xml" title="{intl l='All products'}" href="{url path="/feed/catalog/%lang" lang=$lang_locale}" />
@@ -140,11 +147,9 @@ GNU General Public License : http://www.gnu.org/licenses/
                 <div class="header row">
                     <h1 class="logo container hidden-xs">
                         <a href="{navigate to="index"}" title="{$store_name}">
-                            {$image = {image file='assets/dist/img/logo.png' failsafe=true}}
-                            {if $image == null}
-                                {$image = {image file='assets/dist/img/logo.gif' failsafe=true}}
-                            {/if}
-                            <img src="{$image}" alt="{$store_name}">
+                            {local_media type="logo"}
+                            <img src="{$MEDIA_URL}" alt="{$store_name}">
+                            {/local_media}
                         </a>
                     </h1>
                     {hook name="main.navbar-primary"}
@@ -174,38 +179,26 @@ GNU General Public License : http://www.gnu.org/licenses/
                     </div>
                 </section>
             {/ifhook}
-<br>
-
-<!-- DEBUT CHOIX PAR COULEURS SUR PAGE D'ACCUEIL-->
-
-<!--<div class="container">
-<div class="row">
-  <div class="col-md-4" style="padding:0px">
-
-        {loop type="category" name="category.navigation" parent="188"}
-          <div class="col-xs-3" style="text-align:center">
-						<a href="{$URL}">
-                        {loop type="image" name="category.thumbnail" source="category" source_id="{$ID}"}
-                        <img src="{$IMAGE_URL}" alt="{$TITLE}" width="60px" border="0"/>
-                        {/loop}
-                        <br><font size= "1" color="#333333">{$TITLE}</font></a>
+            {elsehook rel="main.footer-top"}
+                <section class="footer-banner">
+                    <div class="container">
+                        <div class="banner row banner-col-3">
+                            <div class="col col-sm-4">
+                                <span class="fa fa-truck fa-flip-horizontal"></span>
+                                {intl l="Free shipping"} <small>{intl l="Orders over $50"}</small>
+                            </div>
+                            <div class="col col-sm-4">
+                                <span class="fa fa-credit-card"></span>
+                                {intl l="Secure payment"} <small>{intl l="Multi-payment platform"}</small>
+                            </div>
+                            <div class="col col-sm-4">
+                                <span class="fa fa-info"></span>
+                                {intl l="Need help ?"} <small>{intl l="Questions ? See our F.A.Q."}</small>
+                            </div>
                         </div>
-
-                    {if {$LOOP_COUNT} == 4}
-                    </div><div class="col-md-4" style="padding:0px">
-                    {/if}
-                     {if {$LOOP_COUNT} == 8}
-                     </div><div class="col-md-4" style="padding:0px">
-                    {/if}
-
-         {/loop}
-                   </div>
-         </div>
-
-    </div><!-- /.container -->
-
-<!-- FIN CHOIX PAR COULEURS SUR PAGE D'ACCUEIL-->
-
+                    </div>
+                </section><!-- /.footer-banner -->
+            {/elsehook}
 
             {ifhook rel="main.footer-body"}
                 <section class="footer-block">
@@ -250,7 +243,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                                 <ul class="list-unstyled list-inline">
                                     {$folder_information={config key="information_folder_id"}}
                                     {if $folder_information}
-                                        {loop name="footer_links" type="content" folder=$folder_information }
+                                        {loop name="footer_links" type="content" folder=$folder_information}
                                             <li><a href="{$URL nofilter}">{$TITLE}</a></li>
                                         {/loop}
                                     {/if}
@@ -287,6 +280,7 @@ GNU General Public License : http://www.gnu.org/licenses/
     {javascripts file="assets/dist/js/vendors/bootstrap.min.js"}
         <script>if(typeof($.fn.modal) === 'undefined') { document.write('<script src="{$asset_url}"><\/script>'); }</script>
     {/javascripts}
+
     {javascripts file="assets/dist/js/vendors/bootbox.js"}
         <script src="{$asset_url}"></script>
     {/javascripts}
@@ -305,11 +299,8 @@ GNU General Public License : http://www.gnu.org/licenses/
     {block name="javascript-initialization"}{/block}
 
     <!-- Custom scripts -->
-    <script src="{javascript file='assets/dist/js/thelia.min.js'}?v=1"></script>
+    <script src="{javascript file='assets/dist/js/thelia.min.js'}"></script>
 
     {hook name="main.body-bottom"}
 </body>
-
-
-
 </html>

templates/frontOffice/default/login.html

@@ -23,7 +23,12 @@
             <h1 id="main-label" class="page-header">{intl l="Login"}</h1>
             {form name="thelia.front.customer.login"}
             <form id="form-login" action="{url path="/login"}" method="post" {form_enctype} novalidate>
-                {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+                {if {$smarty.get.validation_done}}
+                    <div class="alert alert-success">{intl l="Your customer account was successfully activated, you can now login."}</div>
+                {else}
+                    {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+                {/if}
+    
                 {form_field field='success_url'}
                     <input type="hidden" name="{$name}" value="{navigate to="previous"}"> {* the url the user is redirected to on login success *}
                 {/form_field}
@@ -107,4 +112,4 @@
 
 {block name="javascript-initialization"}
 {hook name="login.javascript-initialization"}
-{/block}
+{/block}

templates/frontOffice/default/order-invoice.html

@@ -82,7 +82,8 @@
                     {loop type="cart" name="cartloop"}
                     <tr>
                         <td class="image">
-                            <a href="{$PRODUCT_URL nofilter}">{assign var="product_image_url" value=null}
+                            <a href="{$PRODUCT_URL nofilter}">
+                            {assign var="product_image_url" value=null}
                             {ifloop rel="pse-first-image"}
                                 {loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id=$PRODUCT_SALE_ELEMENTS_ID limit="1"}
                                     {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"}
@@ -114,8 +115,11 @@
                                     {else}
                                         <dd>{intl l="Out of Stock"}</dd>
                                     {/if}
-                                    <dt class="refView">{intl l="No."}</dt>
-                                    <dd>{$REF}</dd>
+                                    {loop type="product_sale_elements" name="ref" id=$PRODUCT_SALE_ELEMENTS_ID}
+                                        <dt class="refView">{intl l="No."}</dt>
+                                        <dd>{$REF}</dd>
+                                    {/loop}
+                                    
                                     {loop type="attribute_combination" name="product_options" product_sale_elements="$PRODUCT_SALE_ELEMENTS_ID"}
                                         <dt class="attributeView">{$ATTRIBUTE_TITLE}</dt>
                                         <dd>{$ATTRIBUTE_AVAILABILITY_TITLE}</dd>
@@ -223,6 +227,7 @@
                         </table>
                     </div>
                 </div>
+                {hook name="order-invoice.coupon-form"}
                 </form>
             {/form}
             
@@ -273,41 +278,39 @@
                         {/if}
 
                         <div class="panel-body">
-
-                        {loop type="address" name="invoice-address"}
-                            {assign var="isInvoiceAddressChecked" value="0"}
-                            {if $isPost}
-                                {if $value == $ID && $value != ""}
-                                    {assign var="isInvoiceAddressChecked" value="1"}
+                            {loop type="address" name="invoice-address"}
+                                {assign var="isInvoiceAddressChecked" value="0"}
+                                {if $isPost}
+                                    {if $value == $ID && $value != ""}
+                                        {assign var="isInvoiceAddressChecked" value="1"}
+                                    {elseif $DEFAULT}
+                                        {assign var="isInvoiceAddressChecked" value="1"}
+                                    {/if}
                                 {elseif $DEFAULT}
                                     {assign var="isInvoiceAddressChecked" value="1"}
                                 {/if}
-                            {elseif $DEFAULT}
-                                {assign var="isInvoiceAddressChecked" value="1"}
-                            {/if}
-
-                            <div class="radio">
-                                <label for="invoice-address_{$ID}">
-                                    <input type="radio" name="{$name}" id="invoice-address_{$ID}" value="{$ID}"{if $isInvoiceAddressChecked} checked="checked"{/if}>
-                                    <span class="fn">{loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords}</span>
-                                    <span class="org">{$COMPANY}</span>
-                                    <address class="adr">
-                                        <span class="street-address">{$ADDRESS1}</span><br>
-                                        {if $ADDRESS2 != ""}
-                                            <span class="street-address">{$ADDRESS2}</span><br>
-                                        {/if}
-                                        {if $ADDRESS3 != ""}
-                                            <span class="street-address">{$ADDRESS3}</span><br>
-                                        {/if}
-                                        <span class="postal-code">{$ZIPCODE}</span>
-                                        <span class="locality">{$CITY},
-                                        <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
-                                        {if $STATE}, <span class="state-name">{loop type="state" name="customer.state.info" id=$STATE}{$TITLE}{/loop}</span></span>{/if}
-                                    </address>
-                                </label>
-                            </div>
-                        {/loop}
 
+                                <div class="radio">
+                                    <label for="invoice-address_{$ID}">
+                                        <input type="radio" name="{$name}" id="invoice-address_{$ID}" value="{$ID}"{if $isInvoiceAddressChecked} checked="checked"{/if}>
+                                        <span class="fn">{loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords}</span>
+                                        <span class="org">{$COMPANY}</span>
+                                        <address class="adr">
+                                            <span class="street-address">{$ADDRESS1}</span><br>
+                                            {if $ADDRESS2 != ""}
+                                                <span class="street-address">{$ADDRESS2}</span><br>
+                                            {/if}
+                                            {if $ADDRESS3 != ""}
+                                                <span class="street-address">{$ADDRESS3}</span><br>
+                                            {/if}
+                                            <span class="postal-code">{$ZIPCODE}</span>
+                                            <span class="locality">{$CITY},
+                                            <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
+                                            {if $STATE}, <span class="state-name">{loop type="state" name="customer.state.info" id=$STATE}{$TITLE}{/loop}</span></span>{/if}
+                                        </address>
+                                    </label>
+                                </div>
+                            {/loop}
                             <a href="#" class="btn btn-change-address btn-link hidden"><i class="fa fa-pencil"></i> {intl l="Change address"}</a>
                         </div>
 
@@ -369,6 +372,8 @@
                 </div>
                 {/form_field}
 
+                {hook name="order-invoice.payment-form"}
+
                 <a href="{url path="/order/delivery"}" role="button" class="btn btn-default"><i class="fa fa-chevron-left"></i> {intl l="Back"}</a>
                 <button type="submit" class="btn btn-primary pull-right"><i class="fa fa-chevron-right"></i> {intl l="Next Step"}</button>
             </form>

templates/frontOffice/default/product.html

@@ -13,7 +13,7 @@
 {* Page Title *}
 {block name='no-return-functions' append}
     {loop name="product.seo.title" type="product" id=$product_id limit="1" with_prev_next_info="1"}
-    {$page_title = {$META_TITLE}}
+    {$page_title = $META_TITLE}
     {/loop}
 {/block}
 
@@ -79,7 +79,7 @@
                             <ul class="list-inline">
                                 {loop name="image.carousel" type="image" product={$ID} width="560" height="445" resize_mode="borders" limit="5"}
                                 <li>
-                                    <a href="{$IMAGE_URL nofilter}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}" data-thumb-id="{$ID}">
+                                    <a href="{$IMAGE_URL nofilter}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}">
                                         {loop type="image" name="image.thumbs" id={$ID} product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
                                             <img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
                                         {/loop}
@@ -93,7 +93,7 @@
                             <ul class="list-inline">
                                 {loop name="image.carouselsup" type="image" product={$ID} width="560" height="445" resize_mode="borders" offset="5"}
                                     <li>
-                                        <a href="{$IMAGE_URL nofilter}" class="thumbnail" data-thumb-id="{$ID}">
+                                        <a href="{$IMAGE_URL nofilter}" class="thumbnail">
                                             {loop type="image" name="image.thumbssup" id={$ID} product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
                                                 <img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
                                             {/loop}
@@ -125,7 +125,7 @@
                     {/loop}
 
                     {if $POSTSCRIPTUM}<div class="short-description">
-                        <p>{$POSTSCRIPTUM nofilter}</p>
+                        <p>{$POSTSCRIPTUM}</p>
                     </div>{/if}
                 </div>
 
@@ -180,6 +180,9 @@
                     {form_field field="append"}
                         <input type="hidden" name="{$name}" value="1">
                     {/form_field}
+                    {form_field form=$form field="success_url"}
+                        <input type="hidden" name="{$name}" value="{url path='/cart'}">
+                    {/form_field}
 
                     {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
@@ -357,11 +360,6 @@
         {$pse_combination[]=$ATTRIBUTE_AVAILABILITY_ID}
     {/loop}
     {$pse[$ID]["combinations"]=$pse_combination}
-    {$pse_images=[]}
-    {loop name="pse_images" type="product-sale-elements-image" product_sale_elements_id="$ID"}
-        {$pse_images[]=$PRODUCT_IMAGE_ID}
-    {/loop}
-    {$pse[$ID]["images"]=$pse_images}
 {/loop}
 
 <script type="text/javascript">

templates/frontOffice/default/sale.html

@@ -60,7 +60,7 @@
                     {ifloop rel="product_list"}
                         <ul class="list-unstyled row">
                         {loop type="product" sale={$ID} name="product_list" limit=$limit page=$product_page order=$product_order}
-                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="720" height="482"}
+                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="700" height="320"}
                         {/loop}
                         </ul>
                     {/ifloop}
@@ -107,4 +107,4 @@
 
 {block name="javascript-initialization"}
     {hook name="sale.javascript-initialization"}
-{/block}
+{/block}

templates/frontOffice/default/search.html

@@ -27,7 +27,7 @@
                 {ifloop rel="product_list"}
                     <ul class="list-unstyled row">
                         {loop type="product" name="product_list" title={$smarty.get.q}  limit=$limit page=$product_page order=$product_order}
-                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="720" height="482"}
+                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="369" height="247"}
                         {/loop}
                     </ul>
                 {/ifloop}

templates/frontOffice/default/view_all.html

@@ -32,7 +32,7 @@
                 {ifloop rel="product_list"}
                     <ul class="list-unstyled row">
                         {loop type="product" promo={$product_type == "offers"} new={$product_type == "new"} name="product_list" limit=$limit page=$product_page order=$product_order}
-                            {include file="includes/single-product.html" colClass="col-sm-4" product_id=$ID hasBtn=true hasDescription=true width="720" height="482"}
+                            {include file="includes/single-product.html" colClass="col-sm-4" product_id=$ID hasBtn=true hasDescription=true width="700" height="320"}
                         {/loop}
                     </ul>
                 {/ifloop}
@@ -63,4 +63,4 @@
 
 {block name="javascript-initialization"}
 {hook name="viewall.javascript-initialization"}
-{/block}
+{/block}