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

Merge pull request 'Module-pour-UPS' (#2) from Module-pour-UPS into main

Browse Source 
Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
TheCoreDev
2024-02-10 19:15:24 +01:00
parent c81ed7bfdb 43757f1a0c
commit 7811a66373
15 changed files with 2769 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
local/media/images/module/666-40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 0 B

BIN
local/media/images/module/colissimo-35.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 0 B

2
local/modules/BrandsOnHome/templates/frontOffice/default/assets/style.css
View File

@@ -29,4 +29,4 @@
.list .brands-content > ul .item > article .product-image {
margin-bottom: 15px;
padding: 0;
}
}

7
local/modules/CustomDelivery/I18n/email/default/fr_FR.php
View File

@@ -2,10 +2,13 @@
return array(
'Best Regards.' => 'Cordialement.',
'Dear' => 'Chère',
'Feel free to contact us for any further information' => 'Vous pouvez nous contacter pour toutes informations complémentaires',
'Dear' => 'Cher/Chère',
'Feel free to contact us for any further information' => 'Vous pouvez nous contacter pour toute information complémentaire.',
'Please check <a href=\'%tracking_url\'>this URL</a> to track your parcel' => ' Vous pouvez suivre l\'envoi via <a href=\'%tracking_url\'>ce lien</a>',
'Please check this URL to track your parcel : %tracking_url' => 'Vous pouvez suivre votre colis en ligne à cette adresse : %tracking_url',
'Thank you for your order on our online store %store_name' => 'Merci pour votre commande sur notre boutique en ligne %store_name',
'The tracking number for this delivery is: %package' => 'Le numéro de suivi pour cette commande est: %package',
'Your %ref order has been shipped' => 'Votre commande %ref vient d\'être expédiée.',
'Your order %order_ref (dated %order_date) has been shipped on {format_date date=$update_date output=' => 'Votre commande %order_ref (datée du %order_date) a été expédiée le {format_date date=$update_date output="date"}',
'Your order %order_ref dated %order_date has been shipped on %update_date' => 'Votre commande %order_ref datée du %order_date a été expédié le %update_date',
);

41
local/modules/CustomDelivery/templates/email/default/custom-delivery-shipping.html
View File

@@ -1,17 +1,32 @@
{extends file="email-layout.tpl"}
{default_translation_domain domain="customdelivery.email.default"}
{loop type="customer" name="customer.order" current="false" id="$customer_id" backend_context="1"}
<p>{intl l="Dear" } {$LASTNAME} {$FIRSTNAME},</p>
{/loop}
{* Do not provide a "Open in browser" link *}
{block name="browser"}{/block}
{* No pre-header *}
{block name="pre-header"}{/block}
<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 %update_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 this URL to track your parcel : %tracking_url" tracking_url={$tracking_url}}</p>
{/if}
{/if}
<p>{intl l="Feel free to contact us for any further information"}</p>
{* Subject *}
{block name="email-subject"}{intl l="Your %ref order has been shipped" ref=$REF}{/block}
<p>{intl l="Best Regards."}</p>
{* Title *}
{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}

10
local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.txt
View File

@@ -1,10 +1,6 @@
{default_translation_domain domain='mondialrelay.email.default'}
{default_locale locale={$locale}}
<<<<<<< HEAD
{loop type="order" name="order" id=$order_id}
=======
{loop type="order" name="order" customer="*" id=$order_id}
>>>>>>> origin/master
{loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},<br>
{/loop}
@@ -12,8 +8,4 @@
{intl l="Details about this order are available in your customer account: %account_url." account_url={url path="/account"}}<br>
{intl l="See you soon at %store at the following address: %url" url={navigate to='index'} store={config key="store_name"}}<br>
{intl l="The %store team." store={config key="store_name"}}
<<<<<<< HEAD
{/loop}
=======
{/loop}
>>>>>>> origin/master
{/loop}

5
local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/assets/css/styles.css
View File

@@ -66,4 +66,9 @@
.text-center {
text-align: right;
}
td.module-mondialrelay > img {
padding-left: 45px;
}

4
local/modules/MondialRelay/templates/frontOffice/default/mondialrelay/order-delivery-extra.html
View File

@@ -23,8 +23,8 @@
<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" }
</span>
{intl l="Expected delivery date: %delivery_date" delivery_date={format_date date=$DELIVERY_DATE output="date"} d="mondialrelay.fo.default" }
</span>
</label>
{/form_field}
{/form}