From 0603c54756a1da13f116f1ccb34ff06afe18fe98 Mon Sep 17 00:00:00 2001 From: djfm Date: Thu, 24 Oct 2013 14:14:29 +0000 Subject: [PATCH 1/7] [*] LO : New English E-Mail templates by SuperSarah --- mails/en/account.html | 55 +---------- mails/en/account.txt | 49 ++++++---- mails/en/backoffice_order.html | 41 +------- mails/en/backoffice_order.txt | 20 ++-- mails/en/bankwire.html | 56 +---------- mails/en/bankwire.txt | 60 ++++++------ mails/en/cheque.html | 56 +---------- mails/en/cheque.txt | 55 ++++++----- mails/en/contact.html | 39 +------- mails/en/contact.txt | 31 ++++--- mails/en/contact_form.html | 41 +------- mails/en/contact_form.txt | 38 ++++---- mails/en/credit_slip.html | 47 +--------- mails/en/credit_slip.txt | 28 +++--- mails/en/download_product.html | 56 +---------- mails/en/download_product.txt | 38 +++++--- mails/en/employee_password.html | 41 +------- mails/en/employee_password.txt | 31 ++++--- mails/en/footer.html | 1 + mails/en/footer.txt | 4 + mails/en/forward_msg.html | 29 +----- mails/en/forward_msg.txt | 15 +++ mails/en/guest_to_customer.html | 53 +---------- mails/en/guest_to_customer.txt | 31 ++++--- mails/en/header.html | 1 + mails/en/header.txt | 3 + mails/en/in_transit.html | 50 +--------- mails/en/in_transit.txt | 38 +++++--- mails/en/log_alert.html | 47 +--------- mails/en/log_alert.txt | 23 +++-- mails/en/newsletter.html | 35 +------ mails/en/newsletter.txt | 15 ++- mails/en/order_canceled.html | 50 +--------- mails/en/order_canceled.txt | 34 ++++--- mails/en/order_changed.html | 50 +--------- mails/en/order_changed.txt | 34 ++++--- mails/en/order_conf.html | 134 +-------------------------- mails/en/order_conf.txt | 98 ++++++++++++++------ mails/en/order_customer_comment.html | 41 +------- mails/en/order_customer_comment.txt | 25 +++-- mails/en/order_merchant_comment.html | 41 +------- mails/en/order_merchant_comment.txt | 21 +++-- mails/en/order_return_state.html | 47 +--------- mails/en/order_return_state.txt | 28 ++++-- mails/en/outofstock.html | 50 +--------- mails/en/outofstock.txt | 40 +++++--- mails/en/password.html | 47 +--------- mails/en/password.txt | 33 ++++--- mails/en/password_query.html | 47 +--------- mails/en/password_query.txt | 27 ++++-- mails/en/payment.html | 50 +--------- mails/en/payment.txt | 35 ++++--- mails/en/payment_error.html | 56 +---------- mails/en/payment_error.txt | 36 ++++--- mails/en/preparation.html | 50 +--------- mails/en/preparation.txt | 31 ++++--- mails/en/refund.html | 50 +--------- mails/en/refund.txt | 31 ++++--- mails/en/reply_msg.html | 17 +--- mails/en/reply_msg.txt | 24 ++++- mails/en/shipped.html | 50 +--------- mails/en/shipped.txt | 34 ++++--- mails/en/test.html | 23 +---- mails/en/test.txt | 20 ++-- mails/en/voucher.html | 47 +--------- mails/en/voucher.txt | 29 +++--- mails/en/voucher_new.html | 41 +------- mails/en/voucher_new.txt | 28 +++--- 68 files changed, 717 insertions(+), 1909 deletions(-) create mode 100644 mails/en/footer.html create mode 100644 mails/en/footer.txt create mode 100644 mails/en/header.html create mode 100644 mails/en/header.txt diff --git a/mails/en/account.html b/mails/en/account.html index a7e86c404..89b236e8c 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -1,54 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your {shop_name} login details
 
Thank you for creating a customer account at {shop_name}.

Here are your login details:

E-mail address: {email}
Password: {passwd}
 
Important Security Tips:
    -
  1. Always keep your account details safe.
    2. -
  2. Never disclose your login details to anyone.
    3. -
  3. Change your password regularly.
    4. -
  4. Should you suspect someone is using your account illegally, please notify us immediately.
    5. -
You can now place orders on our shop: {shop_name}.
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {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}
Password: {passwd}
 

Important Security Tips:

  1. Always keep your account details safe.
  2. Never disclose your login details to anyone.
  3. Change your password regularly.
  4. Should you suspect someone is using your account illegally, please notify us immediately.
 
You can now place orders on our shop: {shop_name}.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/account.txt b/mails/en/account.txt index 0cce9680f..f42c6945c 100644 --- a/mails/en/account.txt +++ b/mails/en/account.txt @@ -1,19 +1,30 @@ -Hi {firstname} {lastname}, - -Thank you for creating a customer account at {shop_name}. - -Here are your login details: - -E-mail address: {email} -Password: {passwd} - -You can now place orders on our shop: {shop_url} - -Important Security Tips: - -1. Always keep your account details safe. -2. Never disclose your login details to anyone. -3. Change your password regularly. -4. Should you suspect someone is using your account illegally, please notify us immediately. - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[http://safe.shell.la/{shop_url}] + +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} + +PASSWORD: {passwd} + +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 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/backoffice_order.html b/mails/en/backoffice_order.html index cd5bd4286..659f6de71 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -1,40 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
A new command has been generated to you.
 
Go on {order_link} to finalize the payment.
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

A new command has been generated to you.

Go on {order_link} to finalize the payment.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/backoffice_order.txt b/mails/en/backoffice_order.txt index 1f334e954..ddca7abc9 100644 --- a/mails/en/backoffice_order.txt +++ b/mails/en/backoffice_order.txt @@ -1,9 +1,11 @@ -Hi {firstname} {lastname}, - -A new command has been generated to you. - -Go on {order_link} to finalize the payment. - -{shop_name} - {shop_url} - -{shop_url} powered by PrestaShop™ + +[http://safe.shell.la/{shop_url}] + +Hi {firstname} {lastname}, + +A new command has been generated to you. Go on {order_link} +[http://safe.shell.la/{order_link}] to finalize the payment. + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index 624ed99f3..b3762cac8 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -1,55 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your order with the reference {order_name} - Awaiting wire payment
 
Thank you for shopping at {shop_name}!

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 
You have selected to pay by wire transfer.

Here are the bank details for your wire or transfer:

Amount: {total_paid}

Account owner: {bankwire_owner}

Account details:

{bankwire_details}

Bank address: {bankwire_address}
 
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 at {shop_name}!
 

Order {order_name} - Awaiting wire payment

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 

You have selected to pay by wire transfer.

Here are the bank details for your wire or transfer:
Amount: {total_paid}
Account owner: {bankwire_owner}
Account details: {bankwire_details}
Bank address: {bankwire_address}
 
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 diff --git a/mails/en/bankwire.txt b/mails/en/bankwire.txt index 4454874a7..66e116a88 100644 --- a/mails/en/bankwire.txt +++ b/mails/en/bankwire.txt @@ -1,26 +1,34 @@ -Hi {firstname} {lastname}, - -Thank you for shopping at {shop_name}! - -Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment. - -You have selected to pay by wire transfer. - -Here are the bank details for your wire or transfer: - -Amount: {total_paid} - -Account owner: {bankwire_owner} - -Account details: -{bankwire_details} - -Bank address: {bankwire_address} - -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 at {shop_name}! + +Order {order_name} - Awaiting wire payment Your order with the +reference {ORDER_NAME} has been placed successfully and will be +SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. + +You have selected to pay by wire transfer. Here are the bank details +for your wire or transfer: + +AMOUNT: {total_paid} + +ACCOUNT OWNER: {bankwire_owner} + +ACCOUNT DETAILS: {bankwire_details} + +BANK ADDRESS: {bankwire_address} + +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/cheque.html b/mails/en/cheque.html index 80b88796a..1ada58d0b 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -1,55 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your order with the reference {order_name} - Awaiting check payment
 
Thank you for shopping at {shop_name}!

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 
You have selected to pay by check. Please include on your check:

- Amount: {total_paid}

- Payable to the order of: {cheque_name}

Please mail your check to:

{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.

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 at {shop_name}!
 

Order {order_name} - Awaiting check payment

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 

You have selected to pay by check. Please include on your check.

Here are the bank details for your wire or transfer:
Amount: {total_paid}
Payable to the order of: {cheque_name}
Please mail your check to: {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.
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 diff --git a/mails/en/cheque.txt b/mails/en/cheque.txt index 93cf68194..59880f449 100644 --- a/mails/en/cheque.txt +++ b/mails/en/cheque.txt @@ -1,23 +1,32 @@ -Hi {firstname} {lastname}, - -Thank you for shopping at {shop_name}! - -Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment. - -You have selected to pay by check. Please include on your check: - -Amount: {total_paid} - -Payable to the order of: {cheque_name} - -Please mail your check to: - -{cheque_address} - -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: {shop_url}?controller=guest-tracking - -{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 at {shop_name}! + +Order {order_name} - Awaiting check payment Your order with the +reference {ORDER_NAME} has been placed successfully and will be +SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. + +You have selected to pay by check. Please include on your check. Here +are the bank details for your wire or transfer: + +AMOUNT: {total_paid} + +PAYABLE TO THE ORDER OF: {cheque_name} + +PLEASE MAIL YOUR CHECK TO: {cheque_address_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/contact.html b/mails/en/contact.html index a122cab61..cbac22c87 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -1,38 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Message from a {shop_name} customer
 
Customer e-mail address: {email} -

Customer message: {message} -

Order ID : {order_name} -

Attached file : {attached_file} -
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

Message from a {shop_name} customer

Customer e-mail address: {email}

Customer message: {message}

Order ID: {order_name}
Attached file: {attached_file}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/contact.txt b/mails/en/contact.txt index d97039345..b146fae7f 100644 --- a/mails/en/contact.txt +++ b/mails/en/contact.txt @@ -1,15 +1,16 @@ -Dear merchant, - -You have received a message from a customer via your shop: {shop_name} - -Customer e-mail address: {email} - -Customer message: - -{message} - -Order reference : {order_name} - -Attached file : {attached_file} - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[http://safe.shell.la/{shop_url}] + +Hi {firstname} {lastname}, + +Message from a {shop_name} customer CUSTOMER E-MAIL ADDRESS: {EMAIL} + +CUSTOMER MESSAGE: {message} + +ORDER ID: {order_name} + +ATTACHED FILE: {attached_file} + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index e7c9018b2..b2a1d61ae 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -1,40 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Your message to {shop_name} Customer Service
 
Your message has been sent successfully.

Message: {message}

Order ID : {order_name}

Product : {product_name}

Attached file : {attached_file}
 
We will answer as soon as possible.
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your message to {shop_name} Customer Service

Your message has been sent successfully.

Message: {message}

Order ID: {order_name}
Product: {product_name}
Attached file: {attached_file}
 
We will answer as soon as possible.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/contact_form.txt b/mails/en/contact_form.txt index 198aadf8f..c32ac62f9 100644 --- a/mails/en/contact_form.txt +++ b/mails/en/contact_form.txt @@ -1,17 +1,21 @@ -Hello, - -Your message has been sent successfully to {shop_name} Customer Service. - -Your message: - -{message} - -Order reference : {order_name} - -Attached file : {attached_file} - -We will respond as soon as possible. - -Regards, - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[http://safe.shell.la/{shop_url}] + +Hi {firstname} {lastname}, + +Your message to {shop_name} Customer Service Your message has been +sent successfully. + +MESSAGE: {message} + +ORDER ID: {order_name} + +PRODUCT: {product_name} + +ATTACHED FILE: {attached_file} + +We will answer as soon as possible. + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 6e77a07ef..b91a1c4ab 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -1,46 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your order with the reference {order_name} - Credit slip created
 
We have generated a credit slip in your name for order with the reference {order_name}.
 
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.
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your order with the reference {order_name} - Credit slip created

We have generated a credit slip in your name for order with the reference {order_name}.
 
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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/credit_slip.txt b/mails/en/credit_slip.txt index 78542c4a3..81101eaf9 100644 --- a/mails/en/credit_slip.txt +++ b/mails/en/credit_slip.txt @@ -1,11 +1,17 @@ -Hi {firstname} {lastname}, - -Thank you for shopping at {shop_name}! - -We have generated a credit slip in your name for order with the reference {order_name}. - -You can review this credit slip and download the invoice from the "Order follow" section of your 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}, + +Your order with the reference {order_name} - Credit slip created We +have generated a credit slip in your name for order with the reference +{ORDER_NAME}. + +You can review this credit slip and download your invoice from the +"My credit slips" [http://safe.shell.la/{history_url}] section of your +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/download_product.html b/mails/en/download_product.html index 679f3826d..d5962f53f 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -1,55 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hello {firstname} {lastname}
 
Product(s) now available for download
 
Thank you for your order from {shop_name}!

You have {nbProducts} product(s) now available for download using the following link(s):
 
{virtualProducts}
 
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 your order from {shop_name}
 

Product(s) now available for download

You have {nbProducts} product(s) now available for download using the following link(s):

{virtualProducts}
 
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 diff --git a/mails/en/download_product.txt b/mails/en/download_product.txt index 1ea0b4bcc..66cdc5a6b 100644 --- a/mails/en/download_product.txt +++ b/mails/en/download_product.txt @@ -1,13 +1,25 @@ -Hi {firstname} {lastname}, - -Thank you for your order from {shop_name}! - -You have {nbProducts} product(s) now available for download using the following link(s): - -{virtualProducts} - -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 your order from {SHOP_NAME} + +Product(s) now available for download You have {NBPRODUCTS} +product(s) now available for download using the following link(s): + +{virtualProducts} + +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}?id_order={order_name}] +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/employee_password.html b/mails/en/employee_password.html index adcd4d689..bedaa95e8 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -1,40 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your {shop_name} login information
 
Here is your personal login information for {shop_name}:

First name: {firstname}
Last name: {lastname}
Password: {passwd}
E-mail address: {email}
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your {shop_name} login information

Here is your personal login information for {shop_name}:

First name: {firstname}
Last name: {lastname}
Password: {passwd}
E-mail address: {email}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/employee_password.txt b/mails/en/employee_password.txt index e722c9c01..c2c44367f 100644 --- a/mails/en/employee_password.txt +++ b/mails/en/employee_password.txt @@ -1,12 +1,19 @@ -Hi {firstname} {lastname}, - -Here is your personal login information for {shop_name}: - -First name: {firstname} -Last name: {lastname} -Password: {passwd} -E-mail address: {email} - -{shop_name} - {shop_url} - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[http://safe.shell.la/{shop_url}] + +Hi {firstname} {lastname}, + +Your {shop_name} login information Here is your personal login +information for {SHOP_NAME}: + +FIRST NAME: {firstname} + +LAST NAME: {lastname} + +PASSWORD: {passwd} + +E-MAIL ADDRESS: {email} + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/footer.html b/mails/en/footer.html new file mode 100644 index 000000000..2c74a30b4 --- /dev/null +++ b/mails/en/footer.html @@ -0,0 +1 @@ +   {shop_name} powered by PrestaShop™   \ No newline at end of file diff --git a/mails/en/footer.txt b/mails/en/footer.txt new file mode 100644 index 000000000..80617d9d5 --- /dev/null +++ b/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index 095308131..13ad59edc 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -1,28 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - -
Customer service - Forwarded discussion
 
{employee} wanted to forward this discussion to you.

Discussion history:
{messages}

{employee} added "{comment}"
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

Customer service - Forwarded discussion

{employee} wanted to forward this discussion to you.

Discussion history: {messages}

{employee} added "{comment}"
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/forward_msg.txt b/mails/en/forward_msg.txt index e69de29bb..8a56c2562 100644 --- a/mails/en/forward_msg.txt +++ b/mails/en/forward_msg.txt @@ -0,0 +1,15 @@ + +[http://safe.shell.la/{shop_url}] + +Hi {firstname} {lastname}, + +Customer service - Forwarded discussion {EMPLOYEE} wanted to forward +this discussion to you. + +DISCUSSION HISTORY: {messages} + +{EMPLOYEE} added "{COMMENT}" + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 1e04e69d2..3b4503759 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -1,52 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your customer account creation
 
Your guest account for {shop_name} has been transformed into a customer account.
 
E-mail address: {email}
Password: {passwd}
 
Please be careful when sharing these login details with others.

You can access your customer account on our shop: {shop_url}
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your customer account creation

Your guest account for {shop_name} has been transformed into a customer account.

E-mail address: {email}

Password: {passwd}
 
Please be careful when sharing these login details with others.
You can access your customer account on our shop: {shop_url}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file diff --git a/mails/en/guest_to_customer.txt b/mails/en/guest_to_customer.txt index 289eab171..d693a5018 100644 --- a/mails/en/guest_to_customer.txt +++ b/mails/en/guest_to_customer.txt @@ -1,12 +1,19 @@ - Hi {firstname} {lastname}, - -Your guest account for {shop_name} has been transformed into a customer account. - - E-mail address: {email} - Password: {passwd} - - You can access your account on our website: {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 customer account creation Your guest account for {SHOP_NAME} has +been transformed into a customer account. + +E-MAIL ADDRESS: {email} + +PASSWORD: {passwd} + +Please be careful when sharing these login details with others. + +You can access your customer account on our shop: {SHOP_URL} + +{shop_name} [http://safe.shell.la/{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/mails/en/header.html b/mails/en/header.html new file mode 100644 index 000000000..b86ea30b4 --- /dev/null +++ b/mails/en/header.html @@ -0,0 +1 @@ + Message from {shop_name}
  \ No newline at end of file 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..0dc14617d 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..1e7d69daf 100755 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -1,46 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..361e307cf 100644 --- a/mails/en/newsletter.html +++ b/mails/en/newsletter.html @@ -1,34 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Newsletter from {shop_name}
 
{message}
 
{shop_name} powered by PrestaShop™
- - \ No newline at end of file + Message from {shop_name}
 
Hi {firstname} {lastname},
{message}
 
{shop_name} powered by PrestaShop™
 
\ 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..e5991e216 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..0f935d2d8 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..991b232cd 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -1,133 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},

Thank you for shopping with {shop_name}!
 
Order details
 
Order: {order_name} placed on {date}
Payment: {payment}
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ReferenceProductUnit priceQuantityTotal 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 addressBilling 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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..74816a8ac 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -1,40 +1 @@ - - - - - Message from a client from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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}
 
{shop_name} powered by PrestaShop™
 
\ 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..ad7f09c3b 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -1,40 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file 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..004b9ecd3 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -1,46 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..4ac76272d 100644 --- a/mails/en/outofstock.html +++ b/mails/en/outofstock.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..6b72083c2 100644 --- a/mails/en/password.html +++ b/mails/en/password.html @@ -1,46 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..a8568a032 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -1,46 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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™
 
\ 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..ad1245220 100644 --- a/mails/en/payment.html +++ b/mails/en/payment.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file 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..f8e938108 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -1,55 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..fde5f0e63 100644 --- a/mails/en/preparation.html +++ b/mails/en/preparation.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..e17a78884 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file 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..5344a8a2f 100644 --- a/mails/en/reply_msg.html +++ b/mails/en/reply_msg.html @@ -1,16 +1 @@ - - - - - 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}.
- - \ No newline at end of file + Message from {shop_name}
 
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.
 
{shop_name} powered by PrestaShop™
 
\ 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..6a8fc9091 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -1,49 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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}.
 
{shop_name} powered by PrestaShop™
 
\ 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/test.html b/mails/en/test.html index 8e2a9b412..ab2b87b0c 100644 --- a/mails/en/test.html +++ b/mails/en/test.html @@ -1,22 +1 @@ - - - - - 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™
- - \ No newline at end of file + Message from {shop_name}
 
Hello
 
This is a test e-mail from your shop.

If you can read this, the test was successful!.
 
{shop_name} powered by PrestaShop™
 
\ 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..28b266bc0 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -1,46 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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.
 
{shop_name} powered by PrestaShop™
 
\ 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..1db312feb 100644 --- a/mails/en/voucher_new.html +++ b/mails/en/voucher_new.html @@ -1,40 +1 @@ - - - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{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™
- - \ No newline at end of file + 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 by PrestaShop™
 
\ 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/] + From c8e75eec03160755fb5ef38917bc712d8621c9c5 Mon Sep 17 00:00:00 2001 From: djfm Date: Thu, 24 Oct 2013 14:24:13 +0000 Subject: [PATCH 2/7] // fixed indentation in e-mail html templates --- mails/en/account.html | 81 +++++++++++++- mails/en/backoffice_order.html | 56 +++++++++- mails/en/bankwire.html | 88 ++++++++++++++- mails/en/cheque.html | 88 ++++++++++++++- mails/en/contact.html | 59 +++++++++- mails/en/contact_form.html | 69 +++++++++++- mails/en/credit_slip.html | 64 ++++++++++- mails/en/download_product.html | 73 +++++++++++- mails/en/employee_password.html | 60 +++++++++- mails/en/footer.html | 16 ++- mails/en/forward_msg.html | 58 +++++++++- mails/en/guest_to_customer.html | 74 ++++++++++++- mails/en/header.html | 22 +++- mails/en/in_transit.html | 71 +++++++++++- mails/en/log_alert.html | 56 +++++++++- mails/en/newsletter.html | 49 +++++++- mails/en/order_canceled.html | 71 +++++++++++- mails/en/order_changed.html | 71 +++++++++++- mails/en/order_conf.html | 160 ++++++++++++++++++++++++++- mails/en/order_customer_comment.html | 58 +++++++++- mails/en/order_merchant_comment.html | 57 +++++++++- mails/en/order_return_state.html | 66 ++++++++++- mails/en/outofstock.html | 71 +++++++++++- mails/en/password.html | 72 +++++++++++- mails/en/password_query.html | 58 +++++++++- mails/en/payment.html | 71 +++++++++++- mails/en/payment_error.html | 72 +++++++++++- mails/en/preparation.html | 70 +++++++++++- mails/en/refund.html | 70 +++++++++++- mails/en/reply_msg.html | 67 ++++++++++- mails/en/shipped.html | 64 ++++++++++- mails/en/test.html | 54 ++++++++- mails/en/voucher.html | 57 +++++++++- mails/en/voucher_new.html | 55 ++++++++- 34 files changed, 2214 insertions(+), 34 deletions(-) diff --git a/mails/en/account.html b/mails/en/account.html index 89b236e8c..df911e77e 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -1 +1,80 @@ - Message from {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}
Password: {passwd}
 

Important Security Tips:

  1. Always keep your account details safe.
  2. Never disclose your login details to anyone.
  3. Change your password regularly.
  4. Should you suspect someone is using your account illegally, please notify us immediately.
 
You can now place orders on our shop: {shop_name}.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {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}
+ Password: {passwd} + +
 
+

Important Security Tips:

+
    +
  1. Always keep your account details safe.
    2. +
  2. Never disclose your login details to anyone.
    3. +
  3. Change your password regularly.
    4. +
  4. Should you suspect someone is using your account illegally, please notify us immediately.
    5. +
+
 
+ You can now place orders on our shop: {shop_name}. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/backoffice_order.html b/mails/en/backoffice_order.html index 659f6de71..615c9f7aa 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -1 +1,55 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

A new command has been generated to you.

Go on {order_link} to finalize the payment.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ A new command has been generated to you.

+ + Go on {order_link} to finalize the payment. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index b3762cac8..0e580db61 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -1 +1,87 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
Thank you for shopping at {shop_name}!
 

Order {order_name} - Awaiting wire payment

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 

You have selected to pay by wire transfer.

Here are the bank details for your wire or transfer:
Amount: {total_paid}
Account owner: {bankwire_owner}
Account details: {bankwire_details}
Bank address: {bankwire_address}
 
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 at {shop_name}! +
 
+

+ Order {order_name} - Awaiting wire payment +

+ + Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment. +
 
+

+ You have selected to pay by wire transfer.

+ + Here are the bank details for your wire or transfer:
+ Amount: {total_paid}
+ Account owner: {bankwire_owner}
+ Account details: {bankwire_details}
+ Bank address: {bankwire_address} + +
 
+ + 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 diff --git a/mails/en/cheque.html b/mails/en/cheque.html index 1ada58d0b..78346631b 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -1 +1,87 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
Thank you for shopping at {shop_name}!
 

Order {order_name} - Awaiting check payment

Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment.
 

You have selected to pay by check. Please include on your check.

Here are the bank details for your wire or transfer:
Amount: {total_paid}
Payable to the order of: {cheque_name}
Please mail your check to: {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.
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 at {shop_name}! +
 
+

+ Order {order_name} - Awaiting check payment

+ + Your order with the reference {order_name} has been placed successfully and will be shipped as soon as we receive your payment. +
 
+

+ You have selected to pay by check. Please include on your check.

+ + Here are the bank details for your wire or transfer:
+ Amount: {total_paid}
+ Payable to the order of: {cheque_name}
+ Please mail your check to: {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. +
+ + 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 diff --git a/mails/en/contact.html b/mails/en/contact.html index cbac22c87..11c403026 100644 --- a/mails/en/contact.html +++ b/mails/en/contact.html @@ -1 +1,58 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

Message from a {shop_name} customer

Customer e-mail address: {email}

Customer message: {message}

Order ID: {order_name}
Attached file: {attached_file}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Message from a {shop_name} customer

+ + Customer e-mail address: {email}

+ Customer message: {message}

+ Order ID: {order_name}
+ Attached file: {attached_file} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html index b2a1d61ae..922b0a899 100644 --- a/mails/en/contact_form.html +++ b/mails/en/contact_form.html @@ -1 +1,68 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your message to {shop_name} Customer Service

Your message has been sent successfully.

Message: {message}

Order ID: {order_name}
Product: {product_name}
Attached file: {attached_file}
 
We will answer as soon as possible.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Your message to {shop_name} Customer Service

+ + Your message has been sent successfully.

+ Message: {message}

+ Order ID: {order_name}
+ Product: {product_name}
+ Attached file: {attached_file} + +
 
+ + We will answer as soon as possible. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index b91a1c4ab..eaa690539 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -1 +1,63 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your order with the reference {order_name} - Credit slip created

We have generated a credit slip in your name for order with the reference {order_name}.
 
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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Your order with the reference {order_name} - Credit slip created

+ + We have generated a credit slip in your name for order with the reference {order_name}. +
 
+ + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/download_product.html b/mails/en/download_product.html index d5962f53f..bca9ca7a4 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -1 +1,72 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
Thank you for your order from {shop_name}
 

Product(s) now available for download

You have {nbProducts} product(s) now available for download using the following link(s):

{virtualProducts}
 
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 your order from {shop_name} +
 
+

+ Product(s) now available for download

+ + You have {nbProducts} product(s) now available for download using the following link(s):

+ {virtualProducts} + +
 
+ + 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 diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html index bedaa95e8..60f12ca5a 100644 --- a/mails/en/employee_password.html +++ b/mails/en/employee_password.html @@ -1 +1,59 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your {shop_name} login information

Here is your personal login information for {shop_name}:

First name: {firstname}
Last name: {lastname}
Password: {passwd}
E-mail address: {email}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Your {shop_name} login information

+ + Here is your personal login information for {shop_name}:

+ First name: {firstname}
+ Last name: {lastname}
+ Password: {passwd}
+ E-mail address: {email} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/footer.html b/mails/en/footer.html index 2c74a30b4..dd4e09026 100644 --- a/mails/en/footer.html +++ b/mails/en/footer.html @@ -1 +1,15 @@ -
 
{shop_name} powered by PrestaShop™
  \ No newline at end of file + +   + + + + {shop_name} powered by PrestaShop™ + + + + +   + + + + \ No newline at end of file diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html index 13ad59edc..8c898d457 100644 --- a/mails/en/forward_msg.html +++ b/mails/en/forward_msg.html @@ -1 +1,57 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

Customer service - Forwarded discussion

{employee} wanted to forward this discussion to you.

Discussion history: {messages}

{employee} added "{comment}"
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Customer service - Forwarded discussion

+ + {employee} wanted to forward this discussion to you.

+ Discussion history: {messages}

+ {employee} added "{comment}" + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html index 3b4503759..4cbfc1e84 100644 --- a/mails/en/guest_to_customer.html +++ b/mails/en/guest_to_customer.html @@ -1 +1,73 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
 

Your customer account creation

Your guest account for {shop_name} has been transformed into a customer account.

E-mail address: {email}

Password: {passwd}
 
Please be careful when sharing these login details with others.
You can access your customer account on our shop: {shop_url}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Your customer account creation

+ + Your guest account for {shop_name} has been transformed into a customer account.

+ E-mail address: {email}

+ Password: {passwd} + +
 
+ + Please be careful when sharing these login details with others. +
+ + You can access your customer account on our shop: {shop_url} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/header.html b/mails/en/header.html index b86ea30b4..3824b9a1a 100644 --- a/mails/en/header.html +++ b/mails/en/header.html @@ -1 +1,21 @@ - Message from {shop_name}
  \ No newline at end of file + + + + + + Message from {shop_name} + + + +
+ + + @@ -40,7 +40,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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}'); ?>

From 087d0d82060e302058753aef39f62a421d416342 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 25 Oct 2013 11:25:00 +0200 Subject: [PATCH 6/7] // Fields resizing --- .../addresses/helpers/form/form.tpl | 2 +- .../default/template/helpers/form/form.tpl | 4 +- .../admin/AdminAddressesController.php | 14 +++++ controllers/admin/AdminContactsController.php | 3 + .../admin/AdminCustomersController.php | 55 +++++++++++-------- controllers/admin/AdminGendersController.php | 4 ++ controllers/admin/AdminGroupsController.php | 5 +- .../admin/AdminManufacturersController.php | 21 ++++++- .../admin/AdminSuppliersController.php | 11 ++++ 9 files changed, 90 insertions(+), 29 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl index c5517db46..94d5e8d1a 100644 --- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl @@ -85,7 +85,7 @@ }); -
+
{/if} diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 9ed66afbd..a4ed3ec76 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -76,7 +76,7 @@ {/block} {block name="field"} -
+
{block name="input"} {if $input.type == 'text' || $input.type == 'tags'} {if isset($input.lang) AND $input.lang} @@ -516,7 +516,7 @@ {elseif $input.type == 'birthday'}
{foreach $input.options as $key => $select} -
+
  + + + + diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index 0dc14617d..b8e12fd4f 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -1 +1,70 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html index 1e7d69daf..8b45ffc6d 100755 --- a/mails/en/log_alert.html +++ b/mails/en/log_alert.html @@ -1 +1,55 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html index 361e307cf..eb1e0af0a 100644 --- a/mails/en/newsletter.html +++ b/mails/en/newsletter.html @@ -1 +1,48 @@ - Message from {shop_name}
 
Hi {firstname} {lastname},
{message}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
+ {message} +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html index e5991e216..155e0a01c 100644 --- a/mails/en/order_canceled.html +++ b/mails/en/order_canceled.html @@ -1 +1,70 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html index 0f935d2d8..db374cb2f 100644 --- a/mails/en/order_changed.html +++ b/mails/en/order_changed.html @@ -1 +1,70 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 991b232cd..1f89ef55b 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -1 +1,159 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname},
+ Thank you for shopping at {shop_name}! +
 
+

+ Order details

+ + Order: {order_name} Placed on {date}

+ Payment: {payment} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReferenceProductUnit priceQuantityTotal 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html index 74816a8ac..d5e8b3dbb 100644 --- a/mails/en/order_customer_comment.html +++ b/mails/en/order_customer_comment.html @@ -1 +1,57 @@ - 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}
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html index ad7f09c3b..a5094541c 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -1 +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} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html index 004b9ecd3..9bac0ce0c 100644 --- a/mails/en/order_return_state.html +++ b/mails/en/order_return_state.html @@ -1 +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}"

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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html index 4ac76272d..ea48f4191 100644 --- a/mails/en/outofstock.html +++ b/mails/en/outofstock.html @@ -1 +1,70 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/password.html b/mails/en/password.html index 6b72083c2..b4ade5ab5 100644 --- a/mails/en/password.html +++ b/mails/en/password.html @@ -1 +1,71 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/password_query.html b/mails/en/password_query.html index a8568a032..65c06d038 100644 --- a/mails/en/password_query.html +++ b/mails/en/password_query.html @@ -1 +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™
 
\ No newline at end of file + + + + + + 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™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/payment.html b/mails/en/payment.html index ad1245220..75c5e013f 100644 --- a/mails/en/payment.html +++ b/mails/en/payment.html @@ -1 +1,70 @@ - 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.
 
{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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html index f8e938108..9cc3fafd7 100644 --- a/mails/en/payment_error.html +++ b/mails/en/payment_error.html @@ -1 +1,71 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/preparation.html b/mails/en/preparation.html index fde5f0e63..53b72ee28 100644 --- a/mails/en/preparation.html +++ b/mails/en/preparation.html @@ -1 +1,69 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/refund.html b/mails/en/refund.html index e17a78884..935fa2f6a 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -1 +1,69 @@ - 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.
 
{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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + diff --git a/mails/en/reply_msg.html b/mails/en/reply_msg.html index 5344a8a2f..37b9cff93 100644 --- a/mails/en/reply_msg.html +++ b/mails/en/reply_msg.html @@ -1 +1,66 @@ - Message from {shop_name}
 
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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/shipped.html b/mails/en/shipped.html index 6a8fc9091..c4cae9a9c 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -1 +1,63 @@ - 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}.
 
{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} - 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}. + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/test.html b/mails/en/test.html index ab2b87b0c..05ff987d3 100644 --- a/mails/en/test.html +++ b/mails/en/test.html @@ -1 +1,53 @@ - Message from {shop_name}
 
Hello
 
This is a test e-mail from your shop.

If you can read this, the test was successful!.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hello +
 
+ + This is a test e-mail from your shop.

If you can read this, the test was successful!. + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/voucher.html b/mails/en/voucher.html index 28b266bc0..ab7e8957f 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -1 +1,56 @@ - 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.
 
{shop_name} powered by PrestaShop™
 
\ No newline at end of file + + + + + + 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. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ + \ No newline at end of file diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html index 1db312feb..a85895bf5 100644 --- a/mails/en/voucher_new.html +++ b/mails/en/voucher_new.html @@ -1 +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 by PrestaShop™
 
\ No newline at end of file + + + + + + 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 by PrestaShop™ +
+ 		 
+ + \ No newline at end of file From 0ca5a24e84e2be17993c82c2637a783178f99a5c Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 25 Oct 2013 10:16:27 +0200 Subject: [PATCH 3/7] // Added field (bootstrap) size in helper form --- .../controllers/products/customization.tpl | 4 ++-- .../template/controllers/products/prices.tpl | 20 +++++++++---------- .../default/template/helpers/form/form.tpl | 2 +- .../admin/AdminAttributesGroupsController.php | 3 +++ .../admin/AdminCategoriesController.php | 7 +++++++ 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/products/customization.tpl b/admin-dev/themes/default/template/controllers/products/customization.tpl index cdf0ddbd7..24a7d46c5 100644 --- a/admin-dev/themes/default/template/controllers/products/customization.tpl +++ b/admin-dev/themes/default/template/controllers/products/customization.tpl @@ -60,7 +60,7 @@ -
+
{$display_file_labels}
@@ -71,7 +71,7 @@ -
+
{$display_text_labels}
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl index 80794f8f2..6b869c090 100644 --- a/admin-dev/themes/default/template/controllers/products/prices.tpl +++ b/admin-dev/themes/default/template/controllers/products/prices.tpl @@ -312,7 +312,7 @@ $(document).ready(function () {
- {shop_name}'); ?>. + {shop_name}

- +

- {order_link} to finalize the payment.'); ?> + {order_link} to finalize the payment.'); ?>

- +

- +

- +

-
+
{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}'); ?>

- +

- +

{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}.'); ?>
- {shop_name}'); ?>. + {shop_name}