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

Module-pour-UPS #4

Closed
TheCoreDev wants to merge 2 commits from Module-pour-UPS into main
pull from: Module-pour-UPS
merge into: TheCoreDev:main
Conversation 0 Commits 2 Files Changed 11 +34 -17
11 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -6,6 +6,5 @@
/templates/email/default.zip
/core/vendor/wsdltophp.zip
/local/session/
/local/session/
/web/assets/
/local/session/
/web/.htaccess

BIN
local/media/images/module/colissimo-45.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
local/media/images/module/mondial-relay-46.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
local/media/images/module/ups-44.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

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

@@ -3,11 +3,12 @@
return array(
'Best Regards.' => 'Cordialement.',
'Dear' => 'Cher/Chère',
'Feel free to contact us for any further information' => 'Vous pouvez nous contacter pour toutes informations complémentaires',
'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',
'Your order %order_ref dated %order_date has been shipped on {format_date date=$update_date output=' => 'Votre commande %order_ref du %order_date vient d\'être expédiée le {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}',
);

BIN
local/modules/CustomDelivery/templates/email/default/assets/img/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

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

@@ -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,21 +12,41 @@
{block name="email-title"}{intl l="Your %ref order has been shipped" ref=$REF}{/block}
{* Content *}
{block name="email-content"}
{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 (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>
<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 this URL to track your parcel : %tracking_url" tracking_url={$tracking_url}}</p>
<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}

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

@@ -6,6 +6,6 @@
justify-content: space-between;
}
#delivery-modes img {
width: 85px;
height: 85px;
vertical-align: center;
}

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

@@ -68,7 +68,6 @@
text-align: right;
}
td.module-mondialrelay > img {
padding-left: 45px;
/* padding-left: 45px; */
}

6
web/.htaccess
View File

@@ -3,15 +3,15 @@ AddDefaultCharset UTF-8
Options +FollowSymlinks -Indexes
#Order Deny,Allow
#Allow from 80.13.219.222
#Allow from 92.108.30
#Deny from all
<IfModule mod_rewrite.c>
RewriteEngine On
# Forcer le HTTPS
RewriteCond %{SERVER_PORT} 80
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=302,L]
#RewriteCond %{SERVER_PORT} 80
#RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=302,L]
# Forcer le sous domaine
#RewriteCond %{HTTP_HOST} !^www.light-domotique.fr$

2
web/index_dev.php
View File

@@ -24,7 +24,7 @@ require __DIR__ . '/../core/vendor/autoload.php';
$trustedIp = array(
'::1',
'127.0.0.1',
'86.210.183.184',
'92.184.108.30'
);
$request = Request::createFromGlobals();