Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,6 @@
 {extends file="email-layout.tpl"}
 
-{default_translation_domain domain='mondialrelay.email.default'}
+{default_translation_domain domain='mondialrelay.email.default2020'}
 
 {* Do not provide a "Open in browser" link  *}
 {block name="browser"}{/block}
@@ -15,8 +15,7 @@
 
 {* Content  *}
 {block name="email-content"}
-
-{loop type="order" name="order" customer="*" id=$order_id backend_context=true}
+    {loop type="order" name="order" id=$order_id customer="*" backend_context=true}
         {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
             <p>{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},</p>
         {/loop}

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

@@ -1,6 +1,10 @@
 {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}
@@ -8,4 +12,8 @@
 {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