TheCoreDev/domokits
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.html
#	local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.txt
This commit is contained in:
TheCoreDev
2023-03-31 11:51:59 +02:00
parent 0877b786e7 fcd55fae39
commit d96a470734
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,10 @@
{default_translation_domain domain='mondialrelay.email.default'} {default_translation_domain domain='mondialrelay.email.default'}
{default_locale locale={$locale}} {default_locale locale={$locale}}
<<<<<<< HEAD
{loop type="order" name="order" id=$order_id} {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"} {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},<br> {intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},<br>
{/loop} {/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="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="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"}} {intl l="The %store team." store={config key="store_name"}}
{/loop} <<<<<<< HEAD
{/loop}
=======
{/loop}
>>>>>>> origin/master