From b3768fcbde1eddd9f6ceaac88dcef5cb5329dfcb Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Sat, 10 Feb 2024 23:28:29 +0100
Subject: [PATCH] Finalisation

---
 .../default/custom-delivery-shipping.html     | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/local/modules/CustomDelivery/templates/email/default/custom-delivery-shipping.html b/local/modules/CustomDelivery/templates/email/default/custom-delivery-shipping.html
index 15024dc0..b239492e 100644
--- a/local/modules/CustomDelivery/templates/email/default/custom-delivery-shipping.html
+++ b/local/modules/CustomDelivery/templates/email/default/custom-delivery-shipping.html
@@ -1,5 +1,3 @@
-{extends file="email-layout.tpl"}
-
 {default_translation_domain domain="customdelivery.email.default"}
 
 {* Do not provide a "Open in browser" link  *}
@@ -14,19 +12,41 @@
 {block name="email-title"}{intl l="Your %ref order has been shipped" ref=$REF}{/block}
 
 {* Content  *}
-{block name="email-content"}
-    {loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}
-        <p>{intl l="Dear" } {$LASTNAME} {$FIRSTNAME},</p>
-    {/loop}
 
-    <p>{intl l="Thank you for your order on our online store %store_name" store_name={config key="store_name"}}</p>
-    <p>{intl l="Your order %order_ref (dated %order_date) has been shipped on {format_date date=$update_date output="date"}" order_ref={$order_ref} order_date={format_date date=$order_date} update_date={format_date date=$update_date}}</p>
-    {if $package}
-    <p>{intl l="The tracking number for this delivery is: %package" package={$package}}</p>
-        {if $tracking_url}
-        <p>{intl l="Please check <a href='%tracking_url'>this URL</a> to track your parcel" tracking_url={$tracking_url}}</p>
-        {/if}
-    {/if}
-    <p>{intl l="Feel free to contact us for any further information"}</p>
-    <p>{intl l="Best Regards."}</p>
+{block name="logo-header"}
+<tr>
+    <td align="center" valign="top" style="mso-table-lspace: 0pt;mso-table-rspace: 0pt;border-collapse: collapse !important;">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateHeader" style="mso-table-lspace: 0pt;mso-table-rspace: 0pt;background-color: #FFFFFF;border-top: 10px solid #f5f5f5;border-bottom: 0;border-collapse: collapse !important;">
+            <tr>
+                <td align="center" valign="top" style="mso-table-lspace: 0pt;mso-table-rspace: 0pt;border-collapse: collapse !important;">
+                    <table border="0" cellpadding="0" cellspacing="0" class="templateContainer" style="mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 600px;border-collapse: collapse !important;">
+                        <tr>
+                            <td class="headerContent" style="mso-table-lspace: 0pt;mso-table-rspace: 0pt;color: #202020;font-family: Helvetica;font-size: 20px;font-weight: bold;line-height: 100%;padding-top: 40px;padding-right: 0;padding-bottom: 20px;padding-left: 0;text-align: left;vertical-align: middle;border-collapse: collapse !important;">
+                                {$image = {image file='assets/img/logo.png' failsafe=true}}
+                                <img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 110px;width: 346px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="346" height="110">
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </td>
+</tr>
+{/block}
+
+{block name="email-content"}
+{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}
+<p>{intl l="Dear" } {$LASTNAME} {$FIRSTNAME},</p>
+{/loop}
+
+<p>{intl l="Thank you for your order on our online store %store_name" store_name={config key="store_name"}}</p>
+<p>{intl l="Your order %order_ref has been shipped on %update_date." order_ref={$order_ref} update_date={format_date date=$update_date}}</p>
+{if $package}
+<p>{intl l="The tracking number for this delivery is: %package" package={$package}}</p>
+{if $tracking_url}
+<p>{intl l="Please check <a href='%tracking_url'>this URL</a> to track your parcel" tracking_url={$tracking_url}}</p>
+{/if}
+{/if}
+<p>{intl l="Feel free to contact us for any further information"}</p>
+<p>{intl l="Best Regards."}</p>
 {/block}
\ No newline at end of file