diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 0124fb8d0..226909df4 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -199,7 +199,7 @@ class ContactControllerCore extends FrontController
Mail::Send(
$this->context->language->id,
'contact',
- Mail::l('Message from contact form').' [no_sync]',
+ Mail::l('Message from contact form'),
$var_list,
$contact->email,
$contact->name,
diff --git a/mails/en/account.html b/mails/en/account.html
index 574320227..c80631219 100644
--- a/mails/en/account.html
+++ b/mails/en/account.html
@@ -4,51 +4,51 @@
Message from {shop_name}
-
-
-
@@ -61,84 +61,82 @@
-
+
|
-
-
-
-
- Hi {firstname} {lastname},
- Thank you for creating a customer account at {shop_name}.
-
- |
-
-
-
-
-
-
-
-
- | |
-
-
-
- Your {shop_name} login details
-
- Here are your login details:
- E-mail address: {email}
-
-
- |
- |
-
-
- |
-
-
-
-
-
-
-
-
- | |
-
-
- Important Security Tips:
-
- - Always keep your account details safe.
- - Never disclose your login details to anyone.
- - Change your password regularly.
- - Should you suspect someone is using your account illegally, please notify us immediately.
-
-
- |
- |
-
-
- |
-
-
-
-
-
- |
-
- You can now place orders on our website: {shop_name}
-
- |
-
-
+
+
+
+ Hi {firstname} {lastname},
+ Thank you for creating a customer account at {shop_name}.
+
+ |
+
+
+
+
+
+
+
+
+ | |
+
+
+
+ Your {shop_name} login details
+
+ Here are your login details:
+ E-mail address: {email}
+
+
+ |
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+ | |
+
+
+ Important Security Tips:
+
+ - Always keep your account details safe.
+ - Never disclose your login details to anyone.
+ - Change your password regularly.
+ - Should you suspect someone is using your account illegally, please notify us immediately.
+
+
+ |
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+ You can now place orders on our website: {shop_name}
+
+ |
+
diff --git a/mails/en/awaiting_payment.html b/mails/en/awaiting_payment.html
index 482758ffa..3b36b3331 100644
--- a/mails/en/awaiting_payment.html
+++ b/mails/en/awaiting_payment.html
@@ -61,7 +61,7 @@
-
+
|
@@ -105,7 +105,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -113,7 +113,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -124,7 +124,7 @@
diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html
index 1eabbebf8..0b40f8b35 100644
--- a/mails/en/backoffice_order.html
+++ b/mails/en/backoffice_order.html
@@ -61,7 +61,7 @@
-
+
|
@@ -87,7 +87,7 @@
A new order has been generated on your behalf.
- Please go on {order_link} to finalize the payment.
+ Please go on {order_link} to finalize the payment.
|
@@ -102,7 +102,7 @@
diff --git a/mails/en/contact.html b/mails/en/contact.html
index 7b5e30715..3ebbf35d5 100644
--- a/mails/en/contact.html
+++ b/mails/en/contact.html
@@ -4,51 +4,51 @@
Message from {shop_name}
-
-
-
@@ -61,7 +61,7 @@
-
+
|
@@ -87,7 +87,6 @@
Customer e-mail address: {email}
Customer message: {message}
- Order ID: {order_name}
Attached file: {attached_file}
@@ -103,7 +102,7 @@
diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html
index 7feebeff6..73a8a7143 100644
--- a/mails/en/contact_form.html
+++ b/mails/en/contact_form.html
@@ -61,7 +61,7 @@
-
+
|
@@ -115,7 +115,7 @@
diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html
index 29a654f9b..6aee0c304 100644
--- a/mails/en/credit_slip.html
+++ b/mails/en/credit_slip.html
@@ -61,7 +61,7 @@
-
+
|
@@ -102,7 +102,7 @@
- You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our website.
+ You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our website.
|
@@ -112,7 +112,7 @@
diff --git a/mails/en/credit_slip_voucher.html b/mails/en/credit_slip_voucher.html
index 1a9da8f38..e864fd62b 100644
--- a/mails/en/credit_slip_voucher.html
+++ b/mails/en/credit_slip_voucher.html
@@ -63,7 +63,7 @@
-
+
|
@@ -108,7 +108,7 @@
diff --git a/mails/en/download_product.html b/mails/en/download_product.html
index d3e6a6b38..a9d6b6e9a 100644
--- a/mails/en/download_product.html
+++ b/mails/en/download_product.html
@@ -61,7 +61,7 @@
-
+
|
@@ -105,7 +105,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -113,7 +113,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -123,7 +123,7 @@
diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html
index 6c6ac6b59..7b1b059c9 100644
--- a/mails/en/employee_password.html
+++ b/mails/en/employee_password.html
@@ -61,7 +61,7 @@
-
+
|
@@ -106,7 +106,7 @@
diff --git a/mails/en/footer.html b/mails/en/footer.html
index 4dfdfa115..c2a71a11f 100644
--- a/mails/en/footer.html
+++ b/mails/en/footer.html
@@ -3,7 +3,7 @@
diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html
index 77eb6cfe1..07728db09 100644
--- a/mails/en/forward_msg.html
+++ b/mails/en/forward_msg.html
@@ -61,7 +61,7 @@
-
+
|
@@ -104,7 +104,7 @@
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html
index 0f3307c2d..0dc1e5c9a 100644
--- a/mails/en/guest_to_customer.html
+++ b/mails/en/guest_to_customer.html
@@ -61,7 +61,7 @@
-
+
|
@@ -124,7 +124,7 @@
diff --git a/mails/en/header.html b/mails/en/header.html
index d690de932..0e48e8437 100644
--- a/mails/en/header.html
+++ b/mails/en/header.html
@@ -61,7 +61,7 @@
-
+
|
diff --git a/mails/en/header_order_conf.html b/mails/en/header_order_conf.html
index 238b2486d..706451c33 100644
--- a/mails/en/header_order_conf.html
+++ b/mails/en/header_order_conf.html
@@ -63,7 +63,7 @@
-
+
|
diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html
index 594b31183..6c5318515 100644
--- a/mails/en/in_transit.html
+++ b/mails/en/in_transit.html
@@ -61,7 +61,7 @@
-
+
|
@@ -88,7 +88,7 @@
Order {order_name} - In transit
Your order with the reference {order_name} is currently in transit.
- You can track your package using the following link: {followup}
+ You can track your package using the following link: {followup}
@@ -104,7 +104,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -112,7 +112,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -122,7 +122,7 @@
diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html
index 1a77ff503..13766029f 100644
--- a/mails/en/log_alert.html
+++ b/mails/en/log_alert.html
@@ -61,7 +61,7 @@
-
+
|
@@ -102,7 +102,7 @@
diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html
index 16e34da6a..062b6e17b 100644
--- a/mails/en/newsletter.html
+++ b/mails/en/newsletter.html
@@ -61,7 +61,7 @@
-
+
|
@@ -83,7 +83,7 @@
diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html
index 718294de6..b4230bd54 100644
--- a/mails/en/order_canceled.html
+++ b/mails/en/order_canceled.html
@@ -61,7 +61,7 @@
-
+
|
@@ -85,7 +85,7 @@
- Order canceled - {order_name}
+ Order canceled - {order_name}
Your order with the reference {order_name} from {hotel_hotel_name} has been canceled.
@@ -139,7 +139,7 @@
|
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -147,7 +147,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -157,7 +157,7 @@
diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html
index 513f5825b..c224bc3ff 100644
--- a/mails/en/order_changed.html
+++ b/mails/en/order_changed.html
@@ -61,7 +61,7 @@
-
+
|
@@ -102,7 +102,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -110,7 +110,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -120,7 +120,7 @@
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index 763525bea..819729670 100755
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -63,7 +63,7 @@
-
+
|
@@ -315,7 +315,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -323,7 +323,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -333,7 +333,7 @@
diff --git a/mails/en/order_conf_admin.html b/mails/en/order_conf_admin.html
index 09bc78bdd..9c78a3d68 100755
--- a/mails/en/order_conf_admin.html
+++ b/mails/en/order_conf_admin.html
@@ -63,7 +63,7 @@
-
+
|
@@ -331,7 +331,7 @@
diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html
index dfb5202cb..83cb0223e 100644
--- a/mails/en/order_customer_comment.html
+++ b/mails/en/order_customer_comment.html
@@ -61,7 +61,7 @@
-
+
|
@@ -104,7 +104,7 @@
diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html
index 25e523a91..941533196 100644
--- a/mails/en/order_merchant_comment.html
+++ b/mails/en/order_merchant_comment.html
@@ -61,7 +61,7 @@
-
+
|
@@ -103,7 +103,7 @@
diff --git a/mails/en/order_refund_completed_admin.html b/mails/en/order_refund_completed_admin.html
index 8d46587e4..e9511e78f 100755
--- a/mails/en/order_refund_completed_admin.html
+++ b/mails/en/order_refund_completed_admin.html
@@ -63,7 +63,7 @@
-
+
|
@@ -144,7 +144,7 @@
diff --git a/mails/en/order_refund_completed_customer.html b/mails/en/order_refund_completed_customer.html
index 00e2b81fc..fb34b7f7d 100755
--- a/mails/en/order_refund_completed_customer.html
+++ b/mails/en/order_refund_completed_customer.html
@@ -63,7 +63,7 @@
diff --git a/mails/en/order_refund_denied_admin.html b/mails/en/order_refund_denied_admin.html
index 4a16973d2..31bc56282 100755
--- a/mails/en/order_refund_denied_admin.html
+++ b/mails/en/order_refund_denied_admin.html
@@ -63,7 +63,7 @@
-
+
|
@@ -141,7 +141,7 @@
diff --git a/mails/en/order_refund_denied_customer.html b/mails/en/order_refund_denied_customer.html
index 9d4fd6822..647d87e1a 100755
--- a/mails/en/order_refund_denied_customer.html
+++ b/mails/en/order_refund_denied_customer.html
@@ -63,7 +63,7 @@
diff --git a/mails/en/order_refund_pending_admin.html b/mails/en/order_refund_pending_admin.html
index 3c5a93547..8e9316723 100755
--- a/mails/en/order_refund_pending_admin.html
+++ b/mails/en/order_refund_pending_admin.html
@@ -63,7 +63,7 @@
-
+
|
@@ -142,7 +142,7 @@
diff --git a/mails/en/order_refund_pending_customer.html b/mails/en/order_refund_pending_customer.html
index 82fa782a6..8d284d28c 100755
--- a/mails/en/order_refund_pending_customer.html
+++ b/mails/en/order_refund_pending_customer.html
@@ -63,7 +63,7 @@
diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html
index a313e0dd1..fd3de585a 100644
--- a/mails/en/order_return_state.html
+++ b/mails/en/order_return_state.html
@@ -61,7 +61,7 @@
-
+
|
@@ -104,7 +104,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -114,7 +114,7 @@
diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html
index d005296c1..00ae86d8f 100755
--- a/mails/en/overbooking.html
+++ b/mails/en/overbooking.html
@@ -63,7 +63,7 @@
-
+
|
@@ -317,7 +317,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
|
@@ -325,7 +325,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
|
@@ -335,7 +335,7 @@
diff --git a/mails/en/overbooking_admin.html b/mails/en/overbooking_admin.html
index d06ff9a18..9492f67a1 100755
--- a/mails/en/overbooking_admin.html
+++ b/mails/en/overbooking_admin.html
@@ -63,7 +63,7 @@
-
+
|
@@ -334,7 +334,7 @@
diff --git a/mails/en/partial_payment_accepted.html b/mails/en/partial_payment_accepted.html
index 83a30133e..1da613ba5 100644
--- a/mails/en/partial_payment_accepted.html
+++ b/mails/en/partial_payment_accepted.html
@@ -61,7 +61,7 @@
-
+
|
@@ -108,7 +108,7 @@
- You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
+ You can review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our website.
|
@@ -116,7 +116,7 @@
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our website.
|
@@ -126,7 +126,7 @@
@@ -135,4 +135,4 @@