diff --git a/local/modules/ChronopostHomeDelivery/EventListeners/ShippingNotificationSender.php b/local/modules/ChronopostHomeDelivery/EventListeners/ShippingNotificationSender.php index 38864f1c..4de2c003 100644 --- a/local/modules/ChronopostHomeDelivery/EventListeners/ShippingNotificationSender.php +++ b/local/modules/ChronopostHomeDelivery/EventListeners/ShippingNotificationSender.php @@ -49,6 +49,9 @@ class ShippingNotificationSender extends BaseAction implements EventSubscriberI if ($event->getOrder()->isSent() && ( $event->getOrder()->getDeliveryModuleId() == ModuleQuery::create()->findOneByCode('ChronopostHomeDelivery')->getId())) { + /* TheCoreDev le 22/05/2023 : ajouté en attendant de résoudre le problème des emails qui partent même si la commande utilise un autre mode de livraison*/ + return; + $contactEmail = ConfigQuery::getStoreEmail(); if ($contactEmail) { diff --git a/local/modules/ChronopostHomeDelivery/templates/email/default/order_shipped.html b/local/modules/ChronopostHomeDelivery/templates/email/default/order_shipped.html index 0f54f214..89d5295e 100644 --- a/local/modules/ChronopostHomeDelivery/templates/email/default/order_shipped.html +++ b/local/modules/ChronopostHomeDelivery/templates/email/default/order_shipped.html @@ -25,7 +25,7 @@ {/loop} -

{intl l="We are pleased to inform you that your order number"} {$order_ref} {intl l="has been shipped on"} {format_date date=$update_date output="date"} {intl l="with the tracking number"} {$package}.

+

{intl l="We are pleased to inform you that your order number"} {$order_ref} {intl l="has been shipped on"} {format_date date=$update_date output="date"} {intl l="with the tracking number"} {$package}.

{intl l='Click here to track your shipment.' package=$package}

{intl l='Thank you for your shopping with us and hope to see you soon on www.yourshop.com'}

diff --git a/local/modules/ColissimoWs/EventListeners/ShippingNotificationSender.php b/local/modules/ColissimoWs/EventListeners/ShippingNotificationSender.php index e57cd148..ff66c16d 100644 --- a/local/modules/ColissimoWs/EventListeners/ShippingNotificationSender.php +++ b/local/modules/ColissimoWs/EventListeners/ShippingNotificationSender.php @@ -57,6 +57,10 @@ class ShippingNotificationSender extends BaseAction implements EventSubscriberIn $module = new ColissimoWs(); if ($event->getOrder()->isSent() && $order->getDeliveryModuleId() == $module->getModuleModel()->getId()) { + + /* TheCoreDev le 22/05/2023 : ajouté en attendant de résoudre le problème des emails qui partent même si la commande utilise un autre mode de livraison*/ + return; + $contact_email = ConfigQuery::getStoreEmail(); if ($contact_email) { diff --git a/local/modules/MondialRelay/EventListeners/SendDeliveryEmail.php b/local/modules/MondialRelay/EventListeners/SendDeliveryEmail.php index 165f9314..cda7a458 100644 --- a/local/modules/MondialRelay/EventListeners/SendDeliveryEmail.php +++ b/local/modules/MondialRelay/EventListeners/SendDeliveryEmail.php @@ -47,6 +47,9 @@ class SendDeliveryEmail implements EventSubscriberInterface && $order->getDeliveryModuleId() == MondialRelay::getModuleId() ) { + /* TheCoreDev le 22/05/2023 : ajouté en attendant de résoudre le problème des emails qui partent même si la commande utilise un autre mode de livraison*/ + return; + if (null !== $contactEmail = ConfigQuery::read('store_email')) { $this->mailer->sendEmailToCustomer( MondialRelay::TRACKING_MESSAGE_NAME, diff --git a/local/modules/MondialRelay/I18n/email/default/fr_FR.php b/local/modules/MondialRelay/I18n/email/default/fr_FR.php index c3955ff7..13176bef 100644 --- a/local/modules/MondialRelay/I18n/email/default/fr_FR.php +++ b/local/modules/MondialRelay/I18n/email/default/fr_FR.php @@ -12,4 +12,4 @@ return array( 'Your %ref order has been shipped' => 'Votre commande %ref a été expédiée.', 'Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please click here to track the delivery.' => 'Votre commande %order_ref vient de quitter nos entrepôts. Le numéro de suivi est %tracking_ref. Merci de cliquer ici pour obtenir les informations de suivi.', 'Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Tracking data is available at this address: https://www.mondialrelay.fr/suivi-de-colis' => 'Votre commande %order_ref vient de quitter nos entrepôts. Le numéro de suivi est %tracking_ref. Pour obtenir des informations sur l\'avancement de votre commande, merci de suivre ce lien: https://www.mondialrelay.fr/suivi-de-colis', -); +); \ No newline at end of file diff --git a/templates/email/default2020/email-layout.tpl b/templates/email/default2020/email-layout.tpl index 82103859..0071f383 100644 --- a/templates/email/default2020/email-layout.tpl +++ b/templates/email/default2020/email-layout.tpl @@ -504,11 +504,11 @@ {block name="image-header"} -{* *} -{* *} -{* *} + + + {/block}
*} -{* *} -{*
+ +
diff --git a/templates/email/default2020/email-layout.tpl.BKP b/templates/email/default2020/email-layout.tpl.BKP new file mode 100644 index 00000000..0071f383 --- /dev/null +++ b/templates/email/default2020/email-layout.tpl.BKP @@ -0,0 +1,563 @@ +{default_translation_domain domain='email.default2020'} +{default_locale locale={$locale}} +{declare_assets directory='assets'} +{assign var="url_site" value="{config key="url_site"}"} +{assign var="company_name" value="{config key="store_name"}"} +{if not $company_name} +{assign var="company_name" value="{intl l='Thelia V2'}"} +{/if} + + + + + + + {block name="email-subject"}{/block} + + + {hook name="email-html.layout.css"} + + + +
+ + + + +
+ + {block name="pre-header"} + + + + {/block} + + {block name="logo-header"} + + + + {/block} + + + + + + +
+ + + + +
+ + + + + + +
+ {block name="email-intro"}{/block} + + {block name="browser"}{intl l="Email not displaying correctly?"}
{intl l="View it in your browser"}.{/block} +
+
+
+ + + + +
+ + + + +
+ {$image = {image file='assets/img/logo.png' failsafe=true}} + {if $image == null} + {$image = {image file='assets/img/logo.gif' failsafe=true}} + {/if} + {$company_name} +
+
+
+ + + + +
+ + + + + + + +
+ + + + +
+ {block name="email-title"}{/block} +
+
+ + {block name="image-header"} + + + + {/block} + + + +
+ +
+ {block name="email-content"}{/block} +
+
+
+
+ + + + +
+ {hook name="email-html.layout.footer"} + {elsehook rel="email-html.layout.footer"} + + + + +
+ {intl l="Our mailing address is:"} +
+ {config key="store_address1"} {config key="store_address2"} {config key="store_address3"}
+ {config key="store_zipcode"} {config key="store_city"}, + {if {config key="store_country"} } + {loop type="country" name="address.country.title" id={config key="store_country"}}, {$TITLE}{/loop} + {/if} +
+
+ {intl l="Copyright"} © {'Y'|date} {$company_name}, {intl l="All rights reserved."} +
+ {/elsehook} +
+
+
+
+ + +