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

[15/04/2023] Pb d'emails de livraison : correction du mauvais IS_SENT récupéré

Browse Source
This commit is contained in:
TheCoreDev
2023-04-15 10:58:20 +02:00
parent db436c40bc
commit 79b3abb560
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
local/modules/OrderStatusNotify/EventListeners/OrderStatusListener.php
View File

@@ -46,7 +46,9 @@ class OrderStatusListener implements EventSubscriberInterface
if (null !== $is_order_status_to_notify) { if (null !== $is_order_status_to_notify) {
$delivery_module = $order->getModuleRelatedByDeliveryModuleId()->getCode(); $delivery_module = $order->getModuleRelatedByDeliveryModuleId()->getCode();
$new_status_is_sent = false;
if ($order_status_code === OrderStatus::CODE_SENT) { if ($order_status_code === OrderStatus::CODE_SENT) {
$new_status_is_sent = true;
switch ($delivery_module) { switch ($delivery_module) {
case "MondialRelay": case "MondialRelay":
$delivery_link = 'https://www.mondialrelay.fr/suivi-de-colis/' . $order->getDeliveryRef(); $delivery_link = 'https://www.mondialrelay.fr/suivi-de-colis/' . $order->getDeliveryRef();
@@ -76,6 +78,7 @@ class OrderStatusListener implements EventSubscriberInterface
'order_id' => $order->getId(), 'order_id' => $order->getId(),
'order_ref' => $order->getRef(), 'order_ref' => $order->getRef(),
'new_status' => $new_statut_label, 'new_status' => $new_statut_label,
'new_status_is_sent' => $new_status_is_sent,
'delivery_link'=> $delivery_link 'delivery_link'=> $delivery_link
] ]
); );

5
templates/email/default2020/order_status_changed.html
View File

@@ -36,7 +36,8 @@
{* Content *} {* Content *}
{block name="email-content"} {block name="email-content"}
{loop name="order.invoice" type="order" id=$order_id customer="*"}
{loop name="order.invoice" type="order" id=$order_id customer="*" backend_context=true}
{loop name="currency.order" type="currency" id=$CURRENCY} {loop name="currency.order" type="currency" id=$CURRENCY}
{assign var="orderCurrencyIsoCode" value=$ISOCODE} {assign var="orderCurrencyIsoCode" value=$ISOCODE}
{/loop} {/loop}
@@ -74,7 +75,7 @@
{intl l="Paid With:"} {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}<br /> {intl l="Paid With:"} {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}<br />
{intl l="Purchase Date:"} {format_date date=$CREATE_DATE output="datetime"}<br /> {intl l="Purchase Date:"} {format_date date=$CREATE_DATE output="datetime"}<br />
{intl l="Delivery method:"} {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}<br /> {intl l="Delivery method:"} {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}<br />
{if $IS_SENT} {if $new_status_is_sent}
{intl l="Follow your order here:" d="orderstatusnotify"} <strong>{intl l="Delivery link" d="orderstatusnotify" link={$delivery_link}}</strong><br /> {intl l="Follow your order here:" d="orderstatusnotify"} <strong>{intl l="Delivery link" d="orderstatusnotify" link={$delivery_link}}</strong><br />
{/if} {/if}
</p> </p>