From 882a65df45a1ce037d1b0326072871617fa18a6d Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Sat, 12 Nov 2022 21:53:52 +0100
Subject: [PATCH] =?UTF-8?q?[12/11/2022]=20Compl=C3=A9ment=20sur=20module?=
 =?UTF-8?q?=20MondialRelay=20(compl=C3=A9ment=20d'info=20sur=20pays=20de?=
 =?UTF-8?q?=20livraison)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 local/media/images/module/retrait-magasin-46.png | Bin 0 -> 5347 bytes
 .../I18n/frontOffice/default/en_US.php           |   5 +++++
 .../I18n/frontOffice/default/fr_FR.php           |   5 +++++
 .../mondialrelay/order-delivery-extra.html       |  11 +++++++----
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 local/media/images/module/retrait-magasin-46.png
 create mode 100644 local/modules/LocalPickup/I18n/frontOffice/default/en_US.php
 create mode 100644 local/modules/LocalPickup/I18n/frontOffice/default/fr_FR.php

diff --git a/local/media/images/module/retrait-magasin-46.png b/local/media/images/module/retrait-magasin-46.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8c63fa5016735719ec75e30468f2d0025065db
GIT binary patch
literal 5347
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
aHx3HaB1cWwRH&DJ06<5>5K#iR5BndO7-bd!

literal 0
HcmV?d00001

diff --git a/local/modules/LocalPickup/I18n/frontOffice/default/en_US.php b/local/modules/LocalPickup/I18n/frontOffice/default/en_US.php
new file mode 100644
index 00000000..cd0bafb0
--- /dev/null
+++ b/local/modules/LocalPickup/I18n/frontOffice/default/en_US.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'Engagement' => 'Your order must be withdrawn at our office in France.',
+);
diff --git a/local/modules/LocalPickup/I18n/frontOffice/default/fr_FR.php b/local/modules/LocalPickup/I18n/frontOffice/default/fr_FR.php
new file mode 100644
index 00000000..e40b3639
--- /dev/null
+++ b/local/modules/LocalPickup/I18n/frontOffice/default/fr_FR.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'Engagement' => 'Vous vous engagez à venir retirer votre commande directement dans nos locaux.',
+);
diff --git a/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html b/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
index d376c666..b13ffae9 100644
--- a/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
+++ b/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
@@ -1,7 +1,11 @@
 <script type="text/html" id="mondialrelay_ui">
     <td colspan="3">
         <input type="hidden" name="mondial-relay-selected-delivery-mode" value="none">
-        
+
+        {loop type="delivery" name="delivery-mondialrelay" code="MondialRelay"}
+            {assign var="complementTexte" value=$POSTSCRIPTUM}
+        {/loop}
+
         {$withHome = false}
         {loop type="mondialrelay.delivery-price" name="home-prices" mode="home" country_id=$country state_id=$state}
             {$withHome = true}
@@ -15,7 +19,7 @@
                             <label for="delivery-method_{$module_id}_home">
                                 <input type="radio" data-mondial-relay-delivery-mode="home" name="{$name}" id="delivery-method_{$module_id}_home" value="{$module_id}">
                                 <strong>{intl d="mondialrelay.fo.default" l="Mondial Relay home delivery"}</strong>
-                                <span class="texte-complementaire-module">(France/Europe)</span>
+                                <span class="texte-complementaire-module">{$complementTexte}</span>
                                 <br>
                                 <span class="help-block">
                                             {intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
@@ -71,7 +75,6 @@
         {/loop}
     
         {$withRelay = false}
-        
         {loop type="mondialrelay.delivery-price" name="relay-prices" mode="relay" country_id=$country state_id=$state}
  <!--           <div {if $withHome}class="pickup-home-separator"{/if}></div>    //-->
             
@@ -85,7 +88,7 @@
                                 <label for="delivery-method_{$module_id}_pickup">
                                     <input type="radio" data-mondial-relay-delivery-mode="pickup" name="{$name}" id="delivery-method_{$module_id}_pickup" value="{$module_id}">
                                     <strong>{intl d="mondialrelay.fo.default" l="Mondial Relay pickup location"}</strong>
-                                    <span class="texte-complementaire-module">(France/Europe)</span>
+                                    <span class="texte-complementaire-module">{$complementTexte}</span>
                                     <br>
                                     <span class="help-block">
                                             {intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }