+ | |
+
+
+
+
+
+ 
+
+ |
+
diff --git a/mails/en/header.txt b/mails/en/header.txt
new file mode 100644
index 000000000..03c9678a3
--- /dev/null
+++ b/mails/en/header.txt
@@ -0,0 +1,3 @@
+
+[http://safe.shell.la/{shop_url}]
+
diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html
index 5ea27e06b..b8e12fd4f 100755
--- a/mails/en/in_transit.html
+++ b/mails/en/in_transit.html
@@ -1,49 +1,70 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {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 review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ 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 review your order and download your invoice from the "Order history" section of your customer account by clicking "My account" on our shop.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/in_transit.txt b/mails/en/in_transit.txt
index 364fa479a..b170b32d3 100755
--- a/mails/en/in_transit.txt
+++ b/mails/en/in_transit.txt
@@ -1,15 +1,23 @@
-Hi {firstname} {lastname},
-
-Thank you for shopping with {shop_name}!
-
-Your order with the reference {order_name} is currently in transit.
-
-You can track your package using the following link: {followup}
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+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}
+[http://safe.shell.la/{followup}]
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html
index e6ca7b45e..8b45ffc6d 100755
--- a/mails/en/log_alert.html
+++ b/mails/en/log_alert.html
@@ -1,46 +1,55 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hello, |
-
-
-| |
-
-
-| You have received a new log alert |
-
-
-| |
-
-
-| Warning: you have received a new log alert in your Back Office. |
-
-
-| |
-
-
-| You can check for it in the "Tools" > "Logs" section of your Back Office. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ You have received a new log alert
+
+ Warning: you have received a new log alert in your Back Office.
+ You can check for it in the "Tools" > "Logs" section of your Back Office.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/log_alert.txt b/mails/en/log_alert.txt
index 3f5eaa6be..b49d23492 100755
--- a/mails/en/log_alert.txt
+++ b/mails/en/log_alert.txt
@@ -1,9 +1,14 @@
-Hello,
-
-Warning: you have received a new log alert in your Back Office.
-
-You can check for it in the "Tools" > "Logs" section of your Back Office.
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+You have received a new log alert WARNING: you have received a new
+log alert in your Back Office.
+
+You can check for it in the "TOOLS" > "LOGS" section of your Back
+Office.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html
index 02c6d14ac..eb1e0af0a 100644
--- a/mails/en/newsletter.html
+++ b/mails/en/newsletter.html
@@ -1,34 +1,48 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Newsletter from {shop_name} |
-
-
-| |
-
-
-| {message} |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ |
+ {message}
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/newsletter.txt b/mails/en/newsletter.txt
index 6a4e616f1..1fd42e412 100644
--- a/mails/en/newsletter.txt
+++ b/mails/en/newsletter.txt
@@ -1,5 +1,10 @@
-Newsletter from {shop_name}
-
-{message}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+{message}
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html
index 08d4d898f..155e0a01c 100644
--- a/mails/en/order_canceled.html
+++ b/mails/en/order_canceled.html
@@ -1,49 +1,70 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Order cancelled |
-
-
-| |
-
-
-| Your order with the reference {order_name} from {shop_name} has been cancelled. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Order cancelled
+
+ Your order with the reference {order_name} from {shop_name} has been cancelled.
+ You can check for it in the "Tools" > "Logs" section of your Back Office.
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt
index 19017eddc..b2014fb34 100644
--- a/mails/en/order_canceled.txt
+++ b/mails/en/order_canceled.txt
@@ -1,11 +1,23 @@
-Hi {firstname} {lastname},
-
-Your order with the reference {order_name} from {shop_name} has been cancelled.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Order {order_name} - Order cancelled Your order with the reference
+{ORDER_NAME} from {SHOP_NAME} has been cancelled.
+
+You can check for it in the "TOOLS" > "LOGS" section of your Back
+Office.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html
index 04ea9150c..db374cb2f 100644
--- a/mails/en/order_changed.html
+++ b/mails/en/order_changed.html
@@ -1,49 +1,70 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Order changed |
-
-
-| |
-
-
-| Your order with the reference {order_name} from {shop_name} has been changed by the merchant. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Order changed
+
+ Your order with the reference {order_name} from {shop_name} has been changed by the merchant.
+ You can check for it in the "Tools" > "Logs" section of your Back Office.
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/order_changed.txt b/mails/en/order_changed.txt
index c0c41f3d1..07ab534d2 100644
--- a/mails/en/order_changed.txt
+++ b/mails/en/order_changed.txt
@@ -1,11 +1,23 @@
-Hi {firstname} {lastname},
-
-Your order with the reference {order_name} from {shop_name} has been changed by the merchant.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Order {order_name} - Order changed Your order with the reference
+{ORDER_NAME} from {SHOP_NAME} has been changed by the merchant.
+
+You can check for it in the "TOOLS" > "LOGS" section of your Back
+Office.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index 7852f166f..1f89ef55b 100644
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -1,133 +1,159 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-Hi {firstname} {lastname},
Thank you for shopping with {shop_name}! |
-
-
-| |
-
-
-| Order details |
-
-
-| |
-
-
-Order: {order_name} placed on {date}
Payment: {payment} |
-
-
-| |
-
-
-
-
-
-
- | Reference |
- Product |
- Unit price |
- Quantity |
- Total price |
-
-
-|
-{products}
- |
-
-
-| {discounts} |
-
-
-| |
-Products |
-{total_products} |
-
-
-| |
-Discounts |
-{total_discounts} |
-
-
-| |
-Gift-wrapping |
-{total_wrapping} |
-
-
-| |
-Shipping |
-{total_shipping} |
-
-
-| |
-Total Tax paid |
-{total_tax_paid} |
-
-
-| |
-Total paid |
-{total_paid} |
-
-
-
- |
-
-
-| |
-
-
-| Shipping |
-
-
-| |
-
-
-| Carrier: {carrier} |
-
-
-| |
-
-
-
-
-
-| Delivery address | Billing address |
|---|
-
-| {delivery_block_html} |
-{invoice_block_html} |
-
-
-
- |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+ Hi {firstname} {lastname},
+ Thank you for shopping at {shop_name}!
+ |
+
+
+ | |
+
+
+ |
+
+ Order details
+
+ Order: {order_name} Placed on {date}
+ Payment: {payment}
+
+ |
+
+
+
+
+
+
+ | Reference |
+ Product |
+ Unit price |
+ Quantity |
+ Total price |
+
+
+
+
+ |
+ {products}
+ |
+
+
+ |
+ {discounts}
+ |
+
+
+ | Products |
+ {total_products} |
+
+
+ | Discounts |
+ {total_discounts} |
+
+
+ | Gift-wrapping |
+ {total_wrapping} |
+
+
+ | Shipping |
+ {total_shipping} |
+
+
+ | Total Tax paid |
+ {total_tax_paid} |
+
+
+ | Total paid |
+ {total_paid} |
+
+
+
+ |
+
+
+ |
+
+ Shipping
+
+ Carrier: {carrier}
+ Payment: {payment}
+
+ |
+
+
+ | |
+
+
+
+
+
+ |
+
+ Delivery address
+
+ {delivery_block_html}
+
+ |
+ |
+
+
+ Billing address
+
+ {invoice_block_html}
+
+ |
+
+
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt
index b5cba1f75..0b0d0fa3a 100644
--- a/mails/en/order_conf.txt
+++ b/mails/en/order_conf.txt
@@ -1,29 +1,69 @@
-Hi {firstname} {lastname},
-
-Thank you for your order on {shop_name}!
-
- Order: {order_name} placed on {date}
- Payment: {payment}
-
- Products: {total_products}
- Discounts: {total_discounts}
- Shipping: {total_shipping}
- Gift-wrapping: {total_wrapping}
- Total Tax paid: {total_tax_paid}
- Total paid: {total_paid}
-
- Carrier: {carrier}
-
- Delivery address:
-
- {delivery_block_txt}
-
- Billing address:
-
- {invoice_block_txt}
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Thank you for shopping at {shop_name}!
+
+Order details ORDER: {order_name} Placed on {date}
+
+PAYMENT: {payment}
+
+REFERENCE
+
+PRODUCT
+
+UNIT PRICE
+
+QUANTITY
+
+TOTAL PRICE
+
+{products}
+
+{discounts}
+
+PRODUCTS
+
+{total_products}
+
+DISCOUNTS
+
+{total_discounts}
+
+GIFT-WRAPPING
+
+{total_wrapping}
+
+SHIPPING
+
+{total_shipping}
+
+TOTAL TAX PAID
+
+{total_tax_paid}
+
+TOTAL PAID
+
+{total_paid}
+
+Shipping CARRIER: {carrier}
+
+PAYMENT: {payment}
+
+Delivery address {delivery_block_html}
+
+Billing address {invoice_block_html}
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html
index 671a97dfd..d5e8b3dbb 100644
--- a/mails/en/order_customer_comment.html
+++ b/mails/en/order_customer_comment.html
@@ -1,40 +1,57 @@
-
-
-
-
- Message from a client from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi, |
-
-
-| |
-
-
-| Message from a customer |
-
-
-| |
-
-
-You have received a new message regarding order with the reference {order_name}.
Customer: {firstname} {lastname} ({email})
{message} |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Message from a customer
+
+ You have received a new message regarding order with the reference {order_name}.
+ Customer: {firstname} {lastname} ({email})
+ {message}
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/order_customer_comment.txt b/mails/en/order_customer_comment.txt
index c5cc75d0d..542c78bc5 100644
--- a/mails/en/order_customer_comment.txt
+++ b/mails/en/order_customer_comment.txt
@@ -1,10 +1,15 @@
-Hello,
-
-You have received a new message from a customer regarding order with the reference {order_name}.
-
-Customer: {firstname} {lastname} ({email})
-
-Message:
-{message}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Message from a customer You have received a new message regarding
+order with the reference {ORDER_NAME}.
+
+CUSTOMER: {firstname} {lastname} ({email})
+
+{message}
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html
index 8b5c04615..a5094541c 100644
--- a/mails/en/order_merchant_comment.html
+++ b/mails/en/order_merchant_comment.html
@@ -1,40 +1,56 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| New message from {shop_name} |
-
-
-| |
-
-
-You have received a new message from {shop_name} regarding order with the reference {order_name}.
Message:
{message} |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ New message from {shop_name}
+
+ You have received a new message from {shop_name} regarding order with the reference {order_name}.
+ Message: {message}
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
diff --git a/mails/en/order_merchant_comment.txt b/mails/en/order_merchant_comment.txt
index 93817674f..744001122 100644
--- a/mails/en/order_merchant_comment.txt
+++ b/mails/en/order_merchant_comment.txt
@@ -1,8 +1,13 @@
-Hi {firstname} {lastname},
-
-You have received a new message from {shop_name} regarding your order with the reference {order_name}.
-
-Message:
-{message}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+New message from {shop_name} You have received a new message from
+{SHOP_NAME} regarding order with the reference {ORDER_NAME}.
+
+MESSAGE: {message}
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html
index 4ba720b7c..9bac0ce0c 100644
--- a/mails/en/order_return_state.html
+++ b/mails/en/order_return_state.html
@@ -1,46 +1,65 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Return #{id_order_return} - update |
-
-
-| |
-
-
-| We have updated the progress on your return #{id_order_return}, the new status is: "{state_order_return}" |
-
-
-| |
-
-
-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.
|
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Return #{id_order_return} - update
+
+ We have updated the progress on your return #{id_order_return}, the new status is: "{state_order_return}"
+ Message: {message}
+
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/order_return_state.txt b/mails/en/order_return_state.txt
index 77dec6668..913346e03 100644
--- a/mails/en/order_return_state.txt
+++ b/mails/en/order_return_state.txt
@@ -1,9 +1,19 @@
-Hi {firstname} {lastname},
-
-We have updated the progress on your return #{id_order_return}, the new status is: "{state_order_return}"
-
-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.
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Return #{id_order_return} - update We have updated the progress on
+your return #{id_order_return}, the new status is:
+"{STATE_ORDER_RETURN}"
+
+MESSAGE: {message}
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html
index 59e9d1b26..ea48f4191 100644
--- a/mails/en/outofstock.html
+++ b/mails/en/outofstock.html
@@ -1,49 +1,70 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Item(s) out of stock |
-
-
-| |
-
-
-Thanks for your order with the reference {order_name} from {shop_name}.
Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+ Hi {firstname} {lastname},
+ Thanks for your order with the reference {order_name} from {shop_name}.
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Item(s) out of stock
+
+ Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this.
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/outofstock.txt b/mails/en/outofstock.txt
index 1442706bb..fec0f654d 100644
--- a/mails/en/outofstock.txt
+++ b/mails/en/outofstock.txt
@@ -1,15 +1,25 @@
-Hi {firstname} {lastname},
-
-Thanks for your order with the reference {order_name} from {shop_name}.
-
-Unfortunately, one or more items are currently out of stock.
-This may cause a slight delay in your delivery.
-Please accept our apologies and rest assured that we are working hard to rectify this.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Thanks for your order with the reference {order_name} from
+{shop_name}.
+
+Order {order_name} - Item(s) out of stock Unfortunately, one or more
+items are currently out of stock. This may cause a slight delay in
+your delivery. Please accept our apologies and rest assured that we
+are working hard to rectify this.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/password.html b/mails/en/password.html
index fdfa0486f..b4ade5ab5 100644
--- a/mails/en/password.html
+++ b/mails/en/password.html
@@ -1,46 +1,71 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your new {shop_name} login details |
-
-
-| |
-
-
-E-mail address: {email}
Password: {passwd} |
-
-
-| |
-
-
-Please be careful when sharing these login details with others.
You can now order on our shop: {shop_url} |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Your new {shop_name} login details
+
+ E-mail address: {email}
+ Password: {passwd}
+
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/password.txt b/mails/en/password.txt
index c7187dd1c..5b04d4182 100644
--- a/mails/en/password.txt
+++ b/mails/en/password.txt
@@ -1,12 +1,21 @@
-Hello {firstname} {lastname},
-
-Here are your new {shop_name} login details:
-
-E-mail address: {email}
-Password: {passwd}
-
-You can now place an order on our shop: {shop_url}
-
-Please be careful when sharing these login details with others.
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Your new {shop_name} login details E-MAIL ADDRESS: {email}
+
+PASSWORD: {passwd}
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/password_query.html b/mails/en/password_query.html
index b85db5bb7..65c06d038 100644
--- a/mails/en/password_query.html
+++ b/mails/en/password_query.html
@@ -1,46 +1,57 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Password reset request for {shop_name} |
-
-
-| |
-
-
-You have requested to reset your {shop_name} login details.
Please note that this will change your current password. |
-
-
-| |
-
-
-To confirm this action, please use the following link:
{url} |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Password reset request for {shop_name}
+
+ You have requested to reset your {shop_name} login details.
+ Please note that this will change your current password.
+ To confirm this action, please use the following link:
{url}
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/password_query.txt b/mails/en/password_query.txt
index 846b974de..c66bbdaba 100644
--- a/mails/en/password_query.txt
+++ b/mails/en/password_query.txt
@@ -1,10 +1,17 @@
-Hi {firstname} {lastname},
-
-You have requested to reset your {shop_name} login details.
-
-Please note that this will change your current password.
-
-To confirm this action, please use the following link:
-{url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Password reset request for {shop_name} You have requested to reset
+your {SHOP_NAME} login details.
+
+Please note that this will change your current password.
+
+To confirm this action, please use the following link:
+
+{url} [http://safe.shell.la/{url}]
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/payment.html b/mails/en/payment.html
index 489b0063f..75c5e013f 100644
--- a/mails/en/payment.html
+++ b/mails/en/payment.html
@@ -1,49 +1,70 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Payment processed |
-
-
-| |
-
-
-Thank you for shopping with {shop_name}!
Your payment for order with the reference {order_name} was successfully processed. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+ Hi {firstname} {lastname},
+ Thank you for shopping with {shop_name}!
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Payment processed
+
+ Your payment for order with the reference {order_name} was successfully processed.
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
diff --git a/mails/en/payment.txt b/mails/en/payment.txt
index 2ddce2f23..a0a72a9ba 100644
--- a/mails/en/payment.txt
+++ b/mails/en/payment.txt
@@ -1,13 +1,22 @@
-Hi {firstname} {lastname},
-
-Thank you for shopping with {shop_name}!
-
-Your payment for order with the reference {order_name} was successfully processed.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Thank you for shopping with {shop_name}!
+
+Order {order_name} - Payment processed Your payment for order with
+the reference {ORDER_NAME} was successfully processed.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html
index c6e117334..9cc3fafd7 100644
--- a/mails/en/payment_error.html
+++ b/mails/en/payment_error.html
@@ -1,55 +1,71 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Payment processing error |
-
-
-| |
-
-
-| There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience. |
-
-
-| |
-
-
-| We cannot ship your order until we receive your payment. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Payment processing error
+
+ There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.
+ We cannot ship your order until we receive your payment.
+
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/payment_error.txt b/mails/en/payment_error.txt
index 486853b4f..0cead8764 100644
--- a/mails/en/payment_error.txt
+++ b/mails/en/payment_error.txt
@@ -1,13 +1,23 @@
-Hi {firstname} {lastname},
-
-There is a problem with your payment for {shop_name} order with the reference {order_name}. Please contact us at your earliest convenience.
-
-We cannot ship your order until we receive your payment.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Order {order_name} - Payment processing error There is a problem with
+your payment for {SHOP_NAME} order with the reference {ORDER_NAME}.
+Please contact us at your earliest convenience.
+
+WE CANNOT SHIP YOUR ORDER UNTIL WE RECEIVE YOUR PAYMENT.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/preparation.html b/mails/en/preparation.html
index c6e4be688..53b72ee28 100644
--- a/mails/en/preparation.html
+++ b/mails/en/preparation.html
@@ -1,49 +1,69 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order {order_name} - Processing |
-
-
-| |
-
-
-| We are currently processing your {shop_name} order with the reference {order_name}. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Processing
+
+ We are currently processing your {shop_name} order with the reference {order_name}.
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/preparation.txt b/mails/en/preparation.txt
index 96651c937..b25377fc7 100644
--- a/mails/en/preparation.txt
+++ b/mails/en/preparation.txt
@@ -1,11 +1,20 @@
-Hi {firstname} {lastname},
-
-We are currently processing your {shop_name} order with the reference {order_name}.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Order {order_name} - Processing We are currently processing your
+{SHOP_NAME} order with the reference {ORDER_NAME}.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/refund.html b/mails/en/refund.html
index 1e7236671..935fa2f6a 100644
--- a/mails/en/refund.html
+++ b/mails/en/refund.html
@@ -1,49 +1,69 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Refund processed for order with the reference {order_name} |
-
-
-| |
-
-
-| We have processed your {shop_name} refund for order with the reference {order_name}. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Refund processed
+
+ We have processed your {shop_name} refund for order with the reference {order_name}.
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
diff --git a/mails/en/refund.txt b/mails/en/refund.txt
index 694218d44..fd79689f4 100644
--- a/mails/en/refund.txt
+++ b/mails/en/refund.txt
@@ -1,11 +1,20 @@
-Hi {firstname} {lastname},
-
-We have processed your {shop_name} refund for order with the reference {order_name}.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Order {order_name} - Refund processed We have processed your
+{SHOP_NAME} refund for order with the reference {ORDER_NAME}.
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/reply_msg.html b/mails/en/reply_msg.html
index efc6ac070..37b9cff93 100644
--- a/mails/en/reply_msg.html
+++ b/mails/en/reply_msg.html
@@ -1,16 +1,66 @@
+
-
-
- Message from {shop_name}
-
-
-
-
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
-{reply}
Please do not reply to this message, we will not receive it.
In order to reply, please use the following link: {link}. |
+
+ Hi {firstname} {lastname},
+ |
-
-
-
+ |
+ | |
+
+
+ |
+ {reply}
+ |
+
+
+ | |
+
+
+ |
+
+ 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.
+ |
+
+
+ |
+
+ If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
+ |
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/reply_msg.txt b/mails/en/reply_msg.txt
index 2c53b19c2..86c18fde4 100644
--- a/mails/en/reply_msg.txt
+++ b/mails/en/reply_msg.txt
@@ -1,5 +1,19 @@
-{reply}
-
-Please do not reply to this message, we will not receive it.
-
-In order to reply, please use the following link: {link}
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+{reply}
+
+You can review your order and download your invoice from the
+"Order history" [http://safe.shell.la/{history_url}] section of your
+customer account by clicking "My account"
+[http://safe.shell.la/{my_account_url}] on our shop.
+
+If you have a guest account, you can follow your order via the
+"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+on our shop.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/shipped.html b/mails/en/shipped.html
index 9f17deb21..c4cae9a9c 100644
--- a/mails/en/shipped.html
+++ b/mails/en/shipped.html
@@ -1,49 +1,63 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Shipped |
-
-
-| |
-
-
-Thank you for shopping with {shop_name}!
Your order with the reference {order_name} has been shipped.
You will soon receive a URL to track the delivery progress of your package. |
-
-
-| |
-
-
-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.
|
-
-
-| If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+ Hi {firstname} {lastname},
+ Thank you for shopping with {shop_name}!
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Shipped
+
+ Your order with the reference {order_name} has been shipped.
+ You will soon receive a URL to track the delivery progress of your package.
+ |
+
+
+ |
+
+ You can now place orders on our shop: {shop_name}.
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/shipped.txt b/mails/en/shipped.txt
index 8b6e56066..a42c158e9 100644
--- a/mails/en/shipped.txt
+++ b/mails/en/shipped.txt
@@ -1,15 +1,19 @@
-Hi {firstname} {lastname},
-
-Thank you for shopping with {shop_name}!
-
-Your order with the reference {order_name} has just been shipped.
-
-You will soon receive a URL to track the delivery progress of your package.
-
-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.
-
-If you have guest account, you can follow your order using this link: {guest_tracking_url}
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Thank you for shopping with {shop_name}!
+
+Order {order_name} - Shipped Your order with the reference
+{ORDER_NAME} has been shipped.
+
+You will soon receive a URL to track the delivery progress of your
+package.
+
+You can now place orders on our shop: {shop_name}
+[http://safe.shell.la/{shop_url}].
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/src/account.php b/mails/en/src/account.php
index 1e5ecb762..dfb70476a 100644
--- a/mails/en/src/account.php
+++ b/mails/en/src/account.php
@@ -16,7 +16,7 @@
- {email}'); ?>
+ {email}
{passwd}
@@ -40,7 +40,7 @@
|
- {shop_name}'); ?>.
+ {shop_name}
|
diff --git a/mails/en/src/backoffice_order.php b/mails/en/src/backoffice_order.php
index 016c84b87..30d16ebda 100644
--- a/mails/en/src/backoffice_order.php
+++ b/mails/en/src/backoffice_order.php
@@ -11,10 +11,10 @@
|
-
+
- {order_link} to finalize the payment.'); ?>
+ {order_link} to finalize the payment.'); ?>
|
diff --git a/mails/en/src/bankwire.php b/mails/en/src/bankwire.php
index 1fea3a3a3..f43e955fb 100644
--- a/mails/en/src/bankwire.php
+++ b/mails/en/src/bankwire.php
@@ -3,7 +3,7 @@
-
+
|
@@ -28,7 +28,7 @@
-
+
{total_paid}
{bankwire_owner}
{bankwire_details}
diff --git a/mails/en/src/cheque.php b/mails/en/src/cheque.php
index 44c9e176d..ec29e147a 100644
--- a/mails/en/src/cheque.php
+++ b/mails/en/src/cheque.php
@@ -3,7 +3,7 @@
-
+
|
@@ -25,10 +25,10 @@
|
-
+
-
+
{total_paid}
{cheque_name}
{cheque_address_html}
diff --git a/mails/en/src/credit_slip.php b/mails/en/src/credit_slip.php
index ba1cc72c8..7e593a389 100644
--- a/mails/en/src/credit_slip.php
+++ b/mails/en/src/credit_slip.php
@@ -11,7 +11,7 @@
|
-
+ -
{order_name}.'); ?>
diff --git a/mails/en/src/download_product.php b/mails/en/src/download_product.php
index b528308c2..6a042973c 100644
--- a/mails/en/src/download_product.php
+++ b/mails/en/src/download_product.php
@@ -3,7 +3,7 @@
|
- {shop_name}'); ?>
+ {shop_name}'); ?>
|
diff --git a/mails/en/src/in_transit.php b/mails/en/src/in_transit.php
index 21621a37c..ce240d856 100644
--- a/mails/en/src/in_transit.php
+++ b/mails/en/src/in_transit.php
@@ -15,7 +15,7 @@
{order_name} is currently in transit.'); ?>
- {followup}'); ?>
+
diff --git a/mails/en/src/order_conf.php b/mails/en/src/order_conf.php
index 37e4dbdb8..5f502db50 100644
--- a/mails/en/src/order_conf.php
+++ b/mails/en/src/order_conf.php
@@ -3,7 +3,7 @@
-
+
|
diff --git a/mails/en/src/order_merchant_comment.php b/mails/en/src/order_merchant_comment.php
index 280a2e27c..8c3daa110 100644
--- a/mails/en/src/order_merchant_comment.php
+++ b/mails/en/src/order_merchant_comment.php
@@ -11,7 +11,7 @@
|
-
+
{shop_name} regarding order with the reference {order_name}.'); ?>
diff --git a/mails/en/src/refund.php b/mails/en/src/refund.php
index f3d4b6168..a4e86338a 100644
--- a/mails/en/src/refund.php
+++ b/mails/en/src/refund.php
@@ -14,7 +14,7 @@
-
- {shop_name} refund for order with the reference {order_name}.'); ?>
+ {shop_name} refund for order with the reference {order_name}.'); ?>
|
diff --git a/mails/en/src/shipped.php b/mails/en/src/shipped.php
index f69757895..c9eecba6f 100644
--- a/mails/en/src/shipped.php
+++ b/mails/en/src/shipped.php
@@ -23,7 +23,7 @@
|
- {shop_name}'); ?>.
+ {shop_name}
|
diff --git a/mails/en/src/voucher.php b/mails/en/src/voucher.php
index d184fb1af..6c7200009 100644
--- a/mails/en/src/voucher.php
+++ b/mails/en/src/voucher.php
@@ -15,7 +15,7 @@
{order_name}.'); ?>
- Voucher code: {voucher_num} in the amount of {voucher_amount}'); ?>
+ Voucher code: {voucher_num} in the amount of {voucher_amount}'); ?>
|
diff --git a/mails/en/test.html b/mails/en/test.html
index 8e2a9b412..05ff987d3 100644
--- a/mails/en/test.html
+++ b/mails/en/test.html
@@ -1,22 +1,53 @@
-
-
-
-
- Test mail
-
-
-
-
-
-Hello,
This is a test e-mail from your shop.
If you can read this, the test was successful! |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hello
+ |
+
+
+ | |
+
+
+
+
+ This is a test e-mail from your shop.
If you can read this, the test was successful!.
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/test.txt b/mails/en/test.txt
index 5e77884dd..065364354 100644
--- a/mails/en/test.txt
+++ b/mails/en/test.txt
@@ -1,8 +1,12 @@
-Hello,
-
-This is a test e-mail from your PrestaShop™ online shop.
-
-If you can read this, the test was successful!
-
-Regards,
-{shop_name} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hello
+
+This is a TEST E-MAIL from your shop.
+
+If you can read this, the test was successful!.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/voucher.html b/mails/en/voucher.html
index c9c04acb0..ab7e8957f 100644
--- a/mails/en/voucher.html
+++ b/mails/en/voucher.html
@@ -1,46 +1,56 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| Your order with the reference {order_name} - Voucher created |
-
-
-| |
-
-
-| A voucher has been created in your name as a result of your order with the reference {order_name}. |
-
-
-| |
-
-
-Voucher code: {voucher_num}, in the amount of {voucher_amount}.
Simply copy/paste this code during the payment process for your next order. |
-
-
-| |
-
-
-| {shop_name} powered by PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ Order {order_name} - Voucher created
+
+ A voucher has been created in your name as a result of your order with the reference {order_name}.
+ Voucher code: {voucher_num} in the amount of {voucher_amount}
+ Simply copy/paste this code during the payment process for your next order.
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/voucher.txt b/mails/en/voucher.txt
index 4993f4ccc..a93c90ade 100644
--- a/mails/en/voucher.txt
+++ b/mails/en/voucher.txt
@@ -1,13 +1,16 @@
-Hi {firstname} {lastname},
-
-A voucher has been created in your name as a result of your order with the reference {order_name}.
-
-Voucher code: {voucher_num}, in the amount of {voucher_amount}.
-
-Simply copy/paste this code during the payment process for your next order.
-
-Thank you for shopping at {shop_name}.
-
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+Order {order_name} - Voucher created A voucher has been created in
+your name as a result of your order with the reference {ORDER_NAME}.
+
+VOUCHER CODE: {VOUCHER_NUM} in the amount of {VOUCHER_AMOUNT}
+
+Simply copy/paste this code during the payment process for your next
+order.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html
index 3678364c5..a85895bf5 100644
--- a/mails/en/voucher_new.html
+++ b/mails/en/voucher_new.html
@@ -1,40 +1,54 @@
-
-
-
-
- Message from {shop_name}
-
-
-
-
-
- |
-
-
-| |
-
-
-| Hi {firstname} {lastname}, |
-
-
-| |
-
-
-| This is to inform you about the creation of a voucher. |
-
-
-| |
-
-
-Here is the code of your voucher : {voucher_num}.
Simply copy/paste this code during the payment process for your next order. |
-
-
-| |
-
-
-| {shop_name} powered with PrestaShop™ |
-
-
-
-
+
+
+
+
+
+ Message from {shop_name}
+
+
+
+
+
+ | |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ |
+ Hi {firstname} {lastname},
+ |
+
+
+ | |
+
+
+ |
+
+ This is to inform you about the creation of a voucher.
+
+ Here is the code of your voucher: {voucher_num}
+ Simply copy/paste this code during the payment process for your next order. |
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
\ No newline at end of file
diff --git a/mails/en/voucher_new.txt b/mails/en/voucher_new.txt
index b8324d82d..e66cae2d4 100644
--- a/mails/en/voucher_new.txt
+++ b/mails/en/voucher_new.txt
@@ -1,14 +1,14 @@
-Hi {firstname} {lastname},
-
-This is to inform you about the creation of a voucher.
-
-Here is the code of your voucher : {voucher_num}.
-
-Simply copy/paste this code during the payment process for your next order.
-
-Thank you for shopping at {shop_name}.
-
-{shop_name} - {shop_url}
-
-
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+
+[http://safe.shell.la/{shop_url}]
+
+Hi {firstname} {lastname},
+
+This is to inform you about the creation of a voucher. Here is the
+code of your voucher: {VOUCHER_NUM}
+
+Simply copy/paste this code during the payment process for your next
+order.
+
+{shop_name} [http://safe.shell.la/{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/]
+
|