diff --git a/.gitignore b/.gitignore index 02845be2..8918a5ae 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ /templates/email/default.zip /core/vendor/wsdltophp.zip /local/session/ -/local/session/ /web/assets/ -/local/session/ +/web/.htaccess 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/I18n/email/default/fr_FR.php b/local/modules/CustomDelivery/I18n/email/default/fr_FR.php index 9a7feca2..cb7d980a 100644 --- a/local/modules/CustomDelivery/I18n/email/default/fr_FR.php +++ b/local/modules/CustomDelivery/I18n/email/default/fr_FR.php @@ -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 this URL to track your parcel' => ' Vous pouvez suivre l\'envoi via ce lien', '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}', ); 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 498c5ebf..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,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"} + + + + + + +
+ + + + +
+ {$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} -

{intl l="Please check this URL to track your parcel : %tracking_url" tracking_url={$tracking_url}}

+

{intl l="Please check this URL to track your parcel" tracking_url={$tracking_url}}

{/if} {/if}

{intl l="Feel free to contact us for any further information"}

{intl l="Best Regards."}

- {/block} \ No newline at end of file diff --git a/local/modules/DeliveryModulesInFooter/templates/frontOffice/default/assets/style.css b/local/modules/DeliveryModulesInFooter/templates/frontOffice/default/assets/style.css index 1aeda9de..abf52406 100644 --- a/local/modules/DeliveryModulesInFooter/templates/frontOffice/default/assets/style.css +++ b/local/modules/DeliveryModulesInFooter/templates/frontOffice/default/assets/style.css @@ -6,6 +6,6 @@ justify-content: space-between; } #delivery-modes img { - width: 85px; + height: 85px; vertical-align: center; } \ No newline at end of file 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 diff --git a/web/.htaccess b/web/.htaccess index 94db220e..8fa5e3a3 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -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 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$ diff --git a/web/index_dev.php b/web/index_dev.php index 34ee87f7..f839c66d 100644 --- a/web/index_dev.php +++ b/web/index_dev.php @@ -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();