From 324d9b2bd1da233eec4e25fdbbd41375c379eb76 Mon Sep 17 00:00:00 2001 From: TheCoreDev Date: Fri, 6 Jan 2023 13:52:57 +0100 Subject: [PATCH] =?UTF-8?q?[06/01/2023]=20Masquage=20du=20pav=C3=A9=20"Est?= =?UTF-8?q?imation=20des=20frais=20de=20livraison"=20dans=20l'=C3=A9tape?= =?UTF-8?q?=201=20du=20tunnnel=20de=20commande,=20et=20remplacement=20par?= =?UTF-8?q?=20un=20message=20explicatif=20pour=20les=20clients=20ne=20comp?= =?UTF-8?q?renant=20pas=20qu'il=20faut=20poursuivre=20la=20commande.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../email/default/mondial-relay-tracking-message.html | 2 -- templates/frontOffice/default2020/I18n/en_US.php | 1 + templates/frontOffice/default2020/I18n/fr_FR.php | 1 + .../frontOffice/default2020/assets/dist/css/custom.min.css | 2 +- templates/frontOffice/default2020/assets/src/css/custom.css | 5 +++++ templates/frontOffice/default2020/cart.html | 6 +++++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html index e34603f3..19182d50 100644 --- a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html +++ b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html @@ -15,8 +15,6 @@ {* Content *} {block name="email-content"} -{view_url} - {loop type="order" name="order" id=$order_id} {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}

{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},

diff --git a/templates/frontOffice/default2020/I18n/en_US.php b/templates/frontOffice/default2020/I18n/en_US.php index b488d822..87c007e4 100644 --- a/templates/frontOffice/default2020/I18n/en_US.php +++ b/templates/frontOffice/default2020/I18n/en_US.php @@ -264,4 +264,5 @@ return array( 'per page' => 'per page', 'update' => 'update', 'with:' => 'with:', + 'bypass-estimation' => 'Shipping cost will be calculated on step 2 : to proceed your order, press button ', ); diff --git a/templates/frontOffice/default2020/I18n/fr_FR.php b/templates/frontOffice/default2020/I18n/fr_FR.php index 496523cf..9329b32a 100644 --- a/templates/frontOffice/default2020/I18n/fr_FR.php +++ b/templates/frontOffice/default2020/I18n/fr_FR.php @@ -260,4 +260,5 @@ return array( 'update' => 'mettre à jour', 'with:' => 'avec :', '404' => '404', + 'bypass-estimation' => 'Les frais de livraison seront calculés à l\'étape 2 : pour poursuivre, cliquez sur le bouton ', ); diff --git a/templates/frontOffice/default2020/assets/dist/css/custom.min.css b/templates/frontOffice/default2020/assets/dist/css/custom.min.css index 71c38e85..11e958cb 100644 --- a/templates/frontOffice/default2020/assets/dist/css/custom.min.css +++ b/templates/frontOffice/default2020/assets/dist/css/custom.min.css @@ -1 +1 @@ -div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}h2.name{line-height:1}.logo-custom img{width:250px}.texte-complementaire-module{padding-left:30px;font-style:italic;font-weight:400}.table-delivery tbody>tr>td.module-mondialrelay{padding-left:0;padding-right:0;padding-top:0;width:67%}#delivery-method.panel .image.module-mondialrelay{text-align:left}body>div.bootbox.modal.fade.in>div>div>div>div>div>table>tbody>tr:nth-child(2)>td:nth-child(1)>img{width:300px} \ No newline at end of file +div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}h2.name{line-height:1}.logo-custom img{width:250px}.texte-complementaire-module{padding-left:30px;font-style:italic;font-weight:400}.table-delivery tbody>tr>td.module-mondialrelay{padding-left:0;padding-right:0;padding-top:0;width:67%}#delivery-method.panel .image.module-mondialrelay{text-align:left}body>div.bootbox.modal.fade.in>div>div>div>div>div>table>tbody>tr:nth-child(2)>td:nth-child(1)>img{width:300px}.table-cart tbody>tr>td.bypass-estimation{text-align:right;font-size:larger} \ No newline at end of file diff --git a/templates/frontOffice/default2020/assets/src/css/custom.css b/templates/frontOffice/default2020/assets/src/css/custom.css index eb6da3ca..44f96909 100644 --- a/templates/frontOffice/default2020/assets/src/css/custom.css +++ b/templates/frontOffice/default2020/assets/src/css/custom.css @@ -40,4 +40,9 @@ header .logo-custom { body > div.bootbox.modal.fade.in > div > div > div > div > div > table > tbody > tr:nth-child(2) > td:nth-child(1) > img { width: 300px; +} + +.table-cart tbody>tr>td.bypass-estimation { + text-align: right; + font-size: larger; } \ No newline at end of file diff --git a/templates/frontOffice/default2020/cart.html b/templates/frontOffice/default2020/cart.html index e703a460..848a8522 100644 --- a/templates/frontOffice/default2020/cart.html +++ b/templates/frontOffice/default2020/cart.html @@ -130,7 +130,7 @@ {if {cart attr="is_virtual"} != 1} {postage} {assign var="postageAmount" value=$postage } - + + + {intl l="bypass-estimation"}{intl l="Proceed checkout"} + {/postage} {else} {assign var="postageAmount" value=0 }