Début des modifs

local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.txt

@@ -1,10 +1,6 @@
 {default_translation_domain domain='mondialrelay.email.default'}
 {default_locale locale={$locale}}
-<<<<<<< HEAD
-{loop type="order" name="order" id=$order_id}
-=======
 {loop type="order" name="order" customer="*" id=$order_id}
->>>>>>> origin/master
 {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
 {intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},<br>
 {/loop}
@@ -12,8 +8,4 @@
 {intl l="Details about this order are available in your customer account:  %account_url." account_url={url path="/account"}}<br>
 {intl l="See you soon at %store at the following address: %url" url={navigate to='index'} store={config key="store_name"}}<br>
 {intl l="The %store team." store={config key="store_name"}}
-<<<<<<< HEAD
-{/loop}
-=======
-{/loop}
->>>>>>> origin/master
+{/loop}

local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/assets/css/styles.css

@@ -66,4 +66,9 @@
 
 .text-center {
     text-align: right;
+}
+
+
+td.module-mondialrelay > img {
+    padding-left: 45px;
 }

local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html

@@ -23,8 +23,8 @@
                                 <span class="texte-complementaire-module">{$complementTexte}</span>
                                 <br>
                                 <span class="help-block">
-                                            {intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
-                                        </span>
+                                    {intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
+                                </span>
                             </label>
                             {/form_field}
                             {/form}