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
This commit is contained in:
TheCoreDev
2023-04-03 20:54:02 +02:00
parent 415d3a8991 d96a470734
commit 82b58309e9
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
View File

@@ -16,13 +16,13 @@
{* Content *}
{block name="email-content"}
{loop type="order" name="order" id=$order_id}
{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}
<p>{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please <a href=\"https://www.mondialrelay.fr/suivi-de-colis\">click here</a> to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}</p>
<p>{intl l="Details about this order are available <a href=\"%account_url\">in your customer account</a>." account_url={url path="/account"}}</p>
<p>{intl l="See you soon at <a href=\"%url\">%store</a>" url={navigate to='index'} store={config key="store_name"}}</p>
<p>{intl l="The %store team." store={config key="store_name"}}</p>
{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}
{/block}
<p>{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please <a href=\"https://www.mondialrelay.fr/suivi-de-colis\">click here</a> to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}</p>
<p>{intl l="Details about this order are available <a href=\"%account_url\">in your customer account</a>." account_url={url path="/account"}}</p>
<p>{intl l="See you soon at <a href=\"%url\">%store</a>" url={navigate to='index'} store={config key="store_name"}}</p>
<p>{intl l="The %store team." store={config key="store_name"}}</p>
{/loop}
{/block}

2
local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.txt
View File

@@ -8,4 +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"}}
{/loop}
{/loop}

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

@@ -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,15 +15,14 @@
{* Content *}
{block name="email-content"}
{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}
{loop type="order" name="order" customer="*" id=$order_id 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>
<p>{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please <a href=\"https://www.mondialrelay.fr/suivi-de-colis\">click here</a> to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}</p>
<p>{intl l="Details about this order are available <a href=\"%account_url\">in your customer account</a>." account_url={url path="/account"}}</p>
<p>{intl l="See you soon at <a href=\"%url\">%store</a>" url={navigate to='index'} store={config key="store_name"}}</p>
<p>{intl l="The %store team." store={config key="store_name"}}</p>
{/loop}
<p>{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please <a href=\"https://www.mondialrelay.fr/suivi-de-colis\">click here</a> to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}</p>
<p>{intl l="Details about this order are available <a href=\"%account_url\">in your customer account</a>." account_url={url path="/account"}}</p>
<p>{intl l="See you soon at <a href=\"%url\">%store</a>" url={navigate to='index'} store={config key="store_name"}}</p>
<p>{intl l="The %store team." store={config key="store_name"}}</p>
{/loop}
{/block}
{/block}

8
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_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