diff --git a/local/media/images/module/colissimo-45.png b/local/media/images/module/colissimo-45.png new file mode 100644 index 00000000..a319edd8 Binary files /dev/null and b/local/media/images/module/colissimo-45.png differ diff --git a/local/media/images/module/mondial-relay-46.png b/local/media/images/module/mondial-relay-46.png new file mode 100644 index 00000000..fdcdf2f9 Binary files /dev/null and b/local/media/images/module/mondial-relay-46.png differ diff --git a/local/media/images/module/ups-44.png b/local/media/images/module/ups-44.png new file mode 100644 index 00000000..57b21990 Binary files /dev/null and b/local/media/images/module/ups-44.png differ diff --git a/local/modules/CustomDelivery/templates/email/default/assets/img/logo.png b/local/modules/CustomDelivery/templates/email/default/assets/img/logo.png new file mode 100644 index 00000000..7383cc70 Binary files /dev/null and b/local/modules/CustomDelivery/templates/email/default/assets/img/logo.png differ 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..303fb368 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,13 +12,35 @@ {block name="email-title"}{intl l="Your %ref order has been shipped" ref=$REF}{/block} {* Content *} + +{block name="logo-header"} + + + + + + +
+ + + + +
+ {$image = {image file='assets/img/logo.png' failsafe=true}} + {$company_name} +
+
+ + +{/block} + {block name="email-content"} {loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}

{intl l="Dear" } {$LASTNAME} {$FIRSTNAME},

{/loop}

{intl l="Thank you for your order on our online store %store_name" store_name={config key="store_name"}}

-

{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}}

+

{intl l="Your order %order_ref has been shipped on %update_date." order_ref={$order_ref} update_date={format_date date=$update_date}}

{if $package}

{intl l="The tracking number for this delivery is: %package" package={$package}}

{if $tracking_url} diff --git a/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/assets/css/styles.css b/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/assets/css/styles.css index a0d8ba68..43182232 100644 --- a/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/assets/css/styles.css +++ b/local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/assets/css/styles.css @@ -68,7 +68,6 @@ text-align: right; } - td.module-mondialrelay > img { - padding-left: 45px; + /* padding-left: 45px; */ } \ No newline at end of file