diff --git a/mails/en/src/account.php b/mails/en/src/account.php index 057828130..1e5ecb762 100644 --- a/mails/en/src/account.php +++ b/mails/en/src/account.php @@ -2,9 +2,8 @@ - Hi {firstname} {lastname},
- Thank you for creating a customer account at {shop_name}.'); - ?> +
+ @@ -17,8 +16,8 @@


- E-mail address: {email}'); ?>
- Password: {passwd}'); ?> + {email}'); ?>
+ {passwd} @@ -36,9 +35,12 @@ + +   + - You can now place orders on our shop: {shop_name}'); ?>. + {shop_name}'); ?>. diff --git a/mails/en/src/backoffice_order.php b/mails/en/src/backoffice_order.php index 29b8c593e..016c84b87 100644 --- a/mails/en/src/backoffice_order.php +++ b/mails/en/src/backoffice_order.php @@ -2,7 +2,7 @@ - Hi {firstname} {lastname},'); ?> + diff --git a/mails/en/src/bankwire.php b/mails/en/src/bankwire.php index 1337e58f9..ddea4f0ec 100644 --- a/mails/en/src/bankwire.php +++ b/mails/en/src/bankwire.php @@ -2,9 +2,8 @@ - Hi {firstname} {lastname},
- Thank you for shopping at {shop_name}!'); - ?> +
+ @@ -30,21 +29,28 @@


- Amount: {total_paid}'); ?>
- Account owner: {bankwire_owner}'); ?>
- Account details: {bankwire_details}'); ?>
- Bank address: {bankwire_address}'); ?> + {total_paid}
+ {bankwire_owner}
+ {bankwire_details}
+ {bankwire_address} + + + + +   + + + + + "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.'); ?> - - - - - If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.'); ?> + + "Guest Tracking" section on our shop.'); ?> + diff --git a/mails/en/src/cheque.php b/mails/en/src/cheque.php index 6b766472f..12f3662b5 100644 --- a/mails/en/src/cheque.php +++ b/mails/en/src/cheque.php @@ -2,9 +2,8 @@ - Hi {firstname} {lastname},
- Thank you for shopping at {shop_name}!'); - ?> +
+ @@ -30,21 +29,28 @@


- Amount: {total_paid}'); ?>
- Payable to the order of: {cheque_name}'); ?>
- Please mail your check to: {cheque_address_html}'); ?> + {total_paid}
+ {cheque_name}
+ {cheque_address_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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> + diff --git a/mails/en/src/contact.php b/mails/en/src/contact.php index 0346561c1..543992551 100644 --- a/mails/en/src/contact.php +++ b/mails/en/src/contact.php @@ -2,8 +2,7 @@ - Hi {firstname} {lastname},'); - ?> + @@ -15,10 +14,10 @@

- Customer e-mail address: {email}'); ?>

- Customer message: {message}'); ?>

- Order ID: {order_name}'); ?>
- Attached file: {attached_file}'); ?> + {email}

+ {message}

+ {order_name}
+ {attached_file} diff --git a/mails/en/src/contact_form.php b/mails/en/src/contact_form.php index 4d0928076..a99c4515d 100644 --- a/mails/en/src/contact_form.php +++ b/mails/en/src/contact_form.php @@ -2,8 +2,7 @@ - Hi {firstname} {lastname},'); - ?> + @@ -16,16 +15,21 @@



- Message: {message}'); ?>

- Order ID: {order_name}'); ?>
- Product: {product_name}'); ?>
- Attached file: {attached_file}'); ?> + {message}

+ {order_name}
+ {product_name}
+ {attached_file} + +   + - We will answer as soon as possible.'); ?> + + + diff --git a/mails/en/src/credit_slip.php b/mails/en/src/credit_slip.php index 728eae627..ba1cc72c8 100644 --- a/mails/en/src/credit_slip.php +++ b/mails/en/src/credit_slip.php @@ -2,8 +2,7 @@ - Hi {firstname} {lastname},'); - ?> + @@ -19,9 +18,14 @@ + +   + - 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 shop.'); ?> + + "My credit slips" section of your account by clicking "My account" on our shop.'); ?> + diff --git a/mails/en/src/download_product.php b/mails/en/src/download_product.php index d60b50f0c..b77b22877 100644 --- a/mails/en/src/download_product.php +++ b/mails/en/src/download_product.php @@ -2,9 +2,8 @@ - Hi {firstname} {lastname},
- Thank you for your order from {shop_name}'); - ?> +
+ {shop_name}'); ?> @@ -16,19 +15,26 @@

- {nbProducts} product(s) now available for download using the following link(s):'); ?>

- + {nbProducts} product(s) now available for download using the following link(s):'); ?>

+ {virtualProducts} + + + + +   + + + + + "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.'); ?> - - - - - If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.'); ?> + + "Guest Tracking" section on our shop.'); ?> + diff --git a/mails/en/src/employee_password.php b/mails/en/src/employee_password.php index 7909a28c1..9e40fa6c8 100644 --- a/mails/en/src/employee_password.php +++ b/mails/en/src/employee_password.php @@ -2,8 +2,7 @@ - Hi {firstname} {lastname},'); - ?> + @@ -15,11 +14,11 @@

- {shop_name}:'); ?>
- First name: {firstname}'); ?>
- Last name: {lastname}'); ?>
- Password: {passwd}'); ?>
- E-mail address: {email}'); ?> + {shop_name}:'); ?>

+ {firstname}
+ {lastname}
+ {passwd}
+ {email} diff --git a/mails/en/src/footer.php b/mails/en/src/footer.php index 6c712228e..5c3f426c5 100644 --- a/mails/en/src/footer.php +++ b/mails/en/src/footer.php @@ -3,7 +3,7 @@ - {shop_name} powered by PrestaShop™'); ?> + {shop_name} powered by PrestaShop™'); ?> diff --git a/mails/en/src/forward_msg.php b/mails/en/src/forward_msg.php index 5e4f2323e..a1f3048f8 100644 --- a/mails/en/src/forward_msg.php +++ b/mails/en/src/forward_msg.php @@ -2,8 +2,7 @@ - Hi {firstname} {lastname},'); - ?> + @@ -15,9 +14,9 @@

- {employee} wanted to forward this discussion to you.'); ?>

- Discussion history: {messages}'); ?>

- {employee} added "{comment}"'); ?> + {employee}

+ {messages}

+ {employee} "{comment}" diff --git a/mails/en/src/guest_to_customer.php b/mails/en/src/guest_to_customer.php index d03af905c..7dcf1ecdb 100644 --- a/mails/en/src/guest_to_customer.php +++ b/mails/en/src/guest_to_customer.php @@ -2,8 +2,7 @@ - Hi {firstname} {lastname},'); - ?> + @@ -16,19 +15,26 @@

{shop_name} has been transformed into a customer account.'); ?>

- E-mail address: {email}'); ?>

- Password: {passwd}'); ?> + {email}

+ {passwd} + + + + +   + + + + + - Please be careful when sharing these login details with others.'); ?> - - - - - You can access your customer account on our shop: {shop_url}'); ?> + + {shop_url} + diff --git a/mails/en/src/header.php b/mails/en/src/header.php index 5deae05e9..861787045 100644 --- a/mails/en/src/header.php +++ b/mails/en/src/header.php @@ -1,18 +1,8 @@ - - <?php echo t('Message from {shop_name}'); ?> - - diff --git a/mails/en/src/in_transit.php b/mails/en/src/in_transit.php index 9758ddeb1..4b1005870 100644 --- a/mails/en/src/in_transit.php +++ b/mails/en/src/in_transit.php @@ -2,8 +2,7 @@ @@ -20,14 +19,21 @@ + + + diff --git a/mails/en/src/log_alert.php b/mails/en/src/log_alert.php index b71b8c98d..9d5bcd008 100644 --- a/mails/en/src/log_alert.php +++ b/mails/en/src/log_alert.php @@ -2,8 +2,7 @@ diff --git a/mails/en/src/newsletter.php b/mails/en/src/newsletter.php index 869455f4c..cadbedf74 100644 --- a/mails/en/src/newsletter.php +++ b/mails/en/src/newsletter.php @@ -2,13 +2,12 @@ diff --git a/mails/en/src/order_canceled.php b/mails/en/src/order_canceled.php index 26311ced8..40802554d 100644 --- a/mails/en/src/order_canceled.php +++ b/mails/en/src/order_canceled.php @@ -2,8 +2,7 @@ @@ -20,14 +19,21 @@ + + + diff --git a/mails/en/src/order_changed.php b/mails/en/src/order_changed.php index 63c0b732f..3256f3901 100644 --- a/mails/en/src/order_changed.php +++ b/mails/en/src/order_changed.php @@ -2,8 +2,7 @@ @@ -20,14 +19,21 @@ + + + diff --git a/mails/en/src/order_conf.php b/mails/en/src/order_conf.php index 2b6b997c4..c9cbee9ff 100644 --- a/mails/en/src/order_conf.php +++ b/mails/en/src/order_conf.php @@ -1,14 +1,13 @@ - - + -
- Hi {firstname} {lastname},'); - ?> +
 
- 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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
- Newsletter from {shop_name}'); - ?> +
- + {message}
- Hi {firstname} {lastname},'); - ?> +
 
- 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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
 
- 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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},
- Thank you for shopping at {shop_name}!'); - ?> + 		+
+
  
@@ -16,21 +15,21 @@

- Order: {order_name} placed on {date}'); ?>

- Payment: {payment}'); ?> + {order_name} {date}

+ {payment}
+ - - - - - + + + + + @@ -45,27 +44,27 @@ - + - + - + - + - + - + @@ -78,42 +77,55 @@

- Carrier: {carrier}'); ?>

- Payment: {payment}'); ?> + {carrier}

+ {payment} - + - + + + + + + - - + + - - - - - - \ No newline at end of file diff --git a/mails/en/src/order_customer_comment.php b/mails/en/src/order_customer_comment.php index 624e4d664..83d521e94 100644 --- a/mails/en/src/order_customer_comment.php +++ b/mails/en/src/order_customer_comment.php @@ -2,8 +2,7 @@ @@ -15,9 +14,9 @@

- {order_name}.'); ?>

- Customer: {firstname} {lastname} ({email})'); ?>

- + {order_name}.

+ {firstname} {lastname} ({email})

+ {message} diff --git a/mails/en/src/order_merchant_comment.php b/mails/en/src/order_merchant_comment.php index 0471c94af..280a2e27c 100644 --- a/mails/en/src/order_merchant_comment.php +++ b/mails/en/src/order_merchant_comment.php @@ -2,8 +2,7 @@ @@ -16,7 +15,7 @@

{shop_name} regarding order with the reference {order_name}.'); ?>

- Message: {message}'); ?> + {message} diff --git a/mails/en/src/order_return_state.php b/mails/en/src/order_return_state.php index 72f9cb8a7..7a28bf65e 100644 --- a/mails/en/src/order_return_state.php +++ b/mails/en/src/order_return_state.php @@ -2,8 +2,7 @@ @@ -15,14 +14,19 @@

- "{state_order_return}"'); ?>

- Message: {message}'); ?> + "{state_order_return}"

+ {message} + + + diff --git a/mails/en/src/outofstock.php b/mails/en/src/outofstock.php index 6ff545e79..e4cb5935d 100644 --- a/mails/en/src/outofstock.php +++ b/mails/en/src/outofstock.php @@ -2,9 +2,8 @@ @@ -20,14 +19,21 @@ + + + diff --git a/mails/en/src/password.php b/mails/en/src/password.php index 697f4b3fd..f99ddb560 100644 --- a/mails/en/src/password.php +++ b/mails/en/src/password.php @@ -2,8 +2,7 @@ @@ -15,19 +14,26 @@

- E-mail address: {email}'); ?>
- Password: {passwd}'); ?> + {email}
+ {passwd} + + + + + + + + - - - diff --git a/mails/en/src/password_query.php b/mails/en/src/password_query.php index 43416937f..908e03a4c 100644 --- a/mails/en/src/password_query.php +++ b/mails/en/src/password_query.php @@ -2,8 +2,7 @@ diff --git a/mails/en/src/payment.php b/mails/en/src/payment.php index ee44b9d8d..8926cf09b 100644 --- a/mails/en/src/payment.php +++ b/mails/en/src/payment.php @@ -2,9 +2,8 @@ @@ -20,14 +19,21 @@ + + + diff --git a/mails/en/src/payment_error.php b/mails/en/src/payment_error.php index 0e3f0b5c6..b6c681606 100644 --- a/mails/en/src/payment_error.php +++ b/mails/en/src/payment_error.php @@ -2,8 +2,7 @@ @@ -16,18 +15,25 @@

{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. '); ?> + + + + + + + + + - - - diff --git a/mails/en/src/preparation.php b/mails/en/src/preparation.php index 783591a1d..66306c961 100644 --- a/mails/en/src/preparation.php +++ b/mails/en/src/preparation.php @@ -2,8 +2,7 @@ @@ -19,14 +18,21 @@ + + + diff --git a/mails/en/src/refund.php b/mails/en/src/refund.php index ab836a258..fd680c25f 100644 --- a/mails/en/src/refund.php +++ b/mails/en/src/refund.php @@ -2,8 +2,7 @@ @@ -19,14 +18,21 @@ + + + diff --git a/mails/en/src/reply_msg.php b/mails/en/src/reply_msg.php index bd079cb87..d899be5da 100644 --- a/mails/en/src/reply_msg.php +++ b/mails/en/src/reply_msg.php @@ -2,8 +2,7 @@ @@ -11,17 +10,24 @@ + + + + + + - - - diff --git a/mails/en/src/shipped.php b/mails/en/src/shipped.php index 3bbc27cc9..7958f19f7 100644 --- a/mails/en/src/shipped.php +++ b/mails/en/src/shipped.php @@ -2,9 +2,8 @@ @@ -23,7 +22,9 @@ diff --git a/mails/en/src/test.php b/mails/en/src/test.php index db40019c7..a4ba33c96 100644 --- a/mails/en/src/test.php +++ b/mails/en/src/test.php @@ -2,8 +2,7 @@ @@ -11,7 +10,9 @@ diff --git a/mails/en/src/voucher.php b/mails/en/src/voucher.php index 26b586fb2..2888c4293 100644 --- a/mails/en/src/voucher.php +++ b/mails/en/src/voucher.php @@ -2,8 +2,7 @@ diff --git a/mails/en/src/voucher_new.php b/mails/en/src/voucher_new.php index a81432c6e..605fa7e02 100644 --- a/mails/en/src/voucher_new.php +++ b/mails/en/src/voucher_new.php @@ -2,8 +2,7 @@
ReferenceProductUnit priceQuantityTotal price
Products {total_products}
Discounts {total_discounts}
Gift-wrapping {total_wrapping}
Shipping {total_shipping}
Total Tax paid {total_tax_paid}
Total paid {total_paid}
  
-

- -

+ 		+ + + + + + +
+

+ +

+ + {delivery_block_html} + + 		  +

+ +

+ + {invoice_block_html} + +
+
 
- + "Order history" section of your customer account by clicking "My account" on our shop.'); ?>   -

- -

+
- + "Guest Tracking" section 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.'); ?> -
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.'); ?> -
- Hi {firstname} {lastname},'); - ?> +
- Hi {firstname} {lastname},'); - ?> +
- Hi {firstname} {lastname},'); - ?> +
 
- 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.'); ?> + + "Order history" section of your customer account by clicking "My account" on our shop.'); ?> +
- Hi {firstname} {lastname},
- Thanks for your order with the reference {order_name} from {shop_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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
 
+ + "Order history" section of your customer account by clicking "My account" on our shop.'); ?>
- Please be careful when sharing these login details with others.'); ?> -
- You can now order on our shop: {shop_url}'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
- Hi {firstname} {lastname},
- Thank you for shopping with {shop_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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
 
+ + "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.'); ?> -
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
 
- 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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
 
- 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.'); ?> + + "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.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},'); - ?> +
- {reply}'); ?> + {reply} +
 
+ + "Order history" section of your customer account by clicking "My account" on our shop.'); ?> +
- Please do not reply to this message, we will not receive it.'); ?> -
- In order to reply, please use the following link: {link}.'); ?> + + "Guest Tracking" section on our shop.'); ?> +
- Hi {firstname} {lastname},
- Thank you for shopping with {shop_name}!'); - ?> +
+
- You can now place orders on our shop: {shop_name}'); ?>. + + {shop_name}'); ?>. +
- Hello,'); - ?> +
- This is a test e-mail from your shop.

If you can read this, the test was successful!'); ?>. + + test e-mail from your shop.

If you can read this, the test was successful!'); ?>. +
- Hi {firstname} {lastname},'); - ?> +
- Hi {firstname} {lastname},'); - ?> +