From 3a749823bb7ea97c2c36d0e6f051af1fad64ccae Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 25 Oct 2013 12:29:39 +0000 Subject: [PATCH 1/8] // small fixes in English Email php templates --- mails/en/src/refund.php | 2 +- modules/blockwishlist/mails/en/src/wishlink.php | 2 +- modules/blockwishlist/mails/en/src/wishlist.php | 2 +- modules/mailalerts/mails/en/src/customer_qty.php | 2 +- modules/mailalerts/mails/en/src/productcoverage.php | 4 ++-- modules/mailalerts/mails/en/src/productoutofstock.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mails/en/src/refund.php b/mails/en/src/refund.php index a4e86338a..7791abcc0 100644 --- a/mails/en/src/refund.php +++ b/mails/en/src/refund.php @@ -14,7 +14,7 @@  - 

- {shop_name} refund for order with the reference {order_name}.'); ?> + {shop_name} refund for order with the reference {order_name}.'); ?> diff --git a/modules/blockwishlist/mails/en/src/wishlink.php b/modules/blockwishlist/mails/en/src/wishlink.php index 76a633612..2d6a830c1 100644 --- a/modules/blockwishlist/mails/en/src/wishlink.php +++ b/modules/blockwishlist/mails/en/src/wishlink.php @@ -14,7 +14,7 @@

- {shop_name} {wishlist}

+ {shop_name} invites you to send this link to your friends, so they can see your wishlist:'); ?> {wishlist}

{message} diff --git a/modules/blockwishlist/mails/en/src/wishlist.php b/modules/blockwishlist/mails/en/src/wishlist.php index 6d1eadb24..324b62d52 100644 --- a/modules/blockwishlist/mails/en/src/wishlist.php +++ b/modules/blockwishlist/mails/en/src/wishlist.php @@ -14,7 +14,7 @@

- {firstname} {lastname} {wishlist}

+ {firstname} {lastname} indicated you may want to see his/her wishlist:'); ?> {wishlist}

{wishlist} diff --git a/modules/mailalerts/mails/en/src/customer_qty.php b/modules/mailalerts/mails/en/src/customer_qty.php index 3beb53872..ddf48d5da 100644 --- a/modules/mailalerts/mails/en/src/customer_qty.php +++ b/modules/mailalerts/mails/en/src/customer_qty.php @@ -11,7 +11,7 @@

- {product} +



diff --git a/modules/mailalerts/mails/en/src/productcoverage.php b/modules/mailalerts/mails/en/src/productcoverage.php index 2cd2e5879..dc93ef036 100644 --- a/modules/mailalerts/mails/en/src/productcoverage.php +++ b/modules/mailalerts/mails/en/src/productcoverage.php @@ -11,10 +11,10 @@

- {product} +

- {warning_coverage}.

+ {warning_coverage}.

{current_coverage} diff --git a/modules/mailalerts/mails/en/src/productoutofstock.php b/modules/mailalerts/mails/en/src/productoutofstock.php index 6eda8bbee..74b0f59da 100644 --- a/modules/mailalerts/mails/en/src/productoutofstock.php +++ b/modules/mailalerts/mails/en/src/productoutofstock.php @@ -11,7 +11,7 @@

- {product} +

{last_qty}.

From 4f8d1534699b992b59b1acc94b12c8bf1c3e24ef Mon Sep 17 00:00:00 2001 From: djfm Date: Mon, 28 Oct 2013 08:47:30 +0000 Subject: [PATCH 2/8] // fixed links in new English mails --- mails/en/account.html | 2 +- mails/en/account.txt | 6 +- mails/en/backoffice_order.html | 4 +- mails/en/backoffice_order.txt | 9 +- mails/en/bankwire.html | 4 +- mails/en/bankwire.txt | 14 +- mails/en/cheque.html | 6 +- mails/en/cheque.txt | 16 +- mails/en/contact.txt | 4 +- mails/en/contact_form.txt | 4 +- mails/en/credit_slip.html | 2 +- mails/en/credit_slip.txt | 13 +- mails/en/download_product.html | 2 +- mails/en/download_product.txt | 13 +- mails/en/employee_password.txt | 4 +- mails/en/footer.txt | 2 +- mails/en/forward_msg.txt | 4 +- mails/en/guest_to_customer.txt | 4 +- mails/en/header.txt | 2 +- mails/en/in_transit.html | 3 +- mails/en/in_transit.txt | 12 +- mails/en/log_alert.txt | 4 +- mails/en/newsletter.txt | 4 +- mails/en/order_canceled.txt | 10 +- mails/en/order_changed.txt | 10 +- mails/en/order_conf.html | 2 +- mails/en/order_conf.txt | 12 +- mails/en/order_customer_comment.txt | 4 +- mails/en/order_merchant_comment.html | 2 +- mails/en/order_merchant_comment.txt | 6 +- mails/en/order_return_state.txt | 8 +- mails/en/outofstock.txt | 10 +- mails/en/password.txt | 10 +- mails/en/password_query.txt | 6 +- mails/en/payment.txt | 10 +- mails/en/payment_error.txt | 10 +- mails/en/preparation.txt | 10 +- mails/en/refund.html | 8 +- mails/en/refund.txt | 10 +- mails/en/reply_msg.txt | 10 +- mails/en/shipped.html | 2 +- mails/en/shipped.txt | 6 +- mails/en/test.txt | 4 +- mails/en/voucher.html | 2 +- mails/en/voucher.txt | 4 +- mails/en/voucher_new.txt | 4 +- modules/blocknewsletter/mails/en/footer.html | 15 ++ modules/blocknewsletter/mails/en/footer.txt | 4 + modules/blocknewsletter/mails/en/header.html | 21 ++ modules/blocknewsletter/mails/en/header.txt | 3 + .../mails/en/newsletter_conf.html | 68 +++--- .../mails/en/newsletter_conf.txt | 17 +- .../mails/en/newsletter_verif.html | 73 ++++--- .../mails/en/newsletter_verif.txt | 19 +- .../mails/en/newsletter_voucher.html | 89 ++++---- .../mails/en/newsletter_voucher.txt | 20 +- modules/blockwishlist/mails/en/footer.html | 15 ++ modules/blockwishlist/mails/en/footer.txt | 4 + modules/blockwishlist/mails/en/header.html | 21 ++ modules/blockwishlist/mails/en/header.txt | 3 + modules/blockwishlist/mails/en/wishlink.html | 90 ++++---- modules/blockwishlist/mails/en/wishlink.txt | 20 +- modules/blockwishlist/mails/en/wishlist.html | 90 ++++---- modules/blockwishlist/mails/en/wishlist.txt | 21 +- modules/followup/mails/en/followup_1.html | 108 ++++++---- modules/followup/mails/en/followup_1.txt | 35 +-- modules/followup/mails/en/followup_2.html | 95 +++++---- modules/followup/mails/en/followup_2.txt | 27 ++- modules/followup/mails/en/followup_3.html | 97 +++++---- modules/followup/mails/en/followup_3.txt | 28 ++- modules/followup/mails/en/followup_4.html | 106 +++++---- modules/followup/mails/en/followup_4.txt | 33 ++- modules/followup/mails/en/footer.html | 15 ++ modules/followup/mails/en/footer.txt | 4 + modules/followup/mails/en/header.html | 21 ++ modules/followup/mails/en/header.txt | 3 + modules/mailalerts/mails/en/customer_qty.html | 84 +++++--- modules/mailalerts/mails/en/customer_qty.txt | 27 +-- modules/mailalerts/mails/en/footer.html | 15 ++ modules/mailalerts/mails/en/footer.txt | 4 + modules/mailalerts/mails/en/header.html | 21 ++ modules/mailalerts/mails/en/header.txt | 3 + modules/mailalerts/mails/en/new_order.html | 201 ++++++++++++------ modules/mailalerts/mails/en/new_order.txt | 89 +++++--- .../mailalerts/mails/en/productcoverage.html | 84 +++++--- .../mailalerts/mails/en/productcoverage.txt | 23 +- .../mails/en/productoutofstock.html | 84 +++++--- .../mailalerts/mails/en/productoutofstock.txt | 27 ++- modules/referralprogram/mails/en/footer.html | 15 ++ modules/referralprogram/mails/en/footer.txt | 4 + modules/referralprogram/mails/en/header.html | 21 ++ modules/referralprogram/mails/en/header.txt | 3 + .../en/referralprogram-congratulations.html | 101 +++++---- .../en/referralprogram-congratulations.txt | 26 ++- .../mails/en/referralprogram-invitation.html | 115 +++++----- .../mails/en/referralprogram-invitation.txt | 36 ++-- .../mails/en/referralprogram-voucher.html | 96 +++++---- .../mails/en/referralprogram-voucher.txt | 29 +-- modules/sendtoafriend/mails/en/footer.html | 15 ++ modules/sendtoafriend/mails/en/footer.txt | 4 + modules/sendtoafriend/mails/en/header.html | 21 ++ modules/sendtoafriend/mails/en/header.txt | 3 + .../mails/en/send_to_a_friend.html | 90 ++++---- .../mails/en/send_to_a_friend.txt | 27 +-- 104 files changed, 1724 insertions(+), 1007 deletions(-) create mode 100644 modules/blocknewsletter/mails/en/footer.html create mode 100644 modules/blocknewsletter/mails/en/footer.txt create mode 100644 modules/blocknewsletter/mails/en/header.html create mode 100644 modules/blocknewsletter/mails/en/header.txt create mode 100644 modules/blockwishlist/mails/en/footer.html create mode 100644 modules/blockwishlist/mails/en/footer.txt create mode 100644 modules/blockwishlist/mails/en/header.html create mode 100644 modules/blockwishlist/mails/en/header.txt create mode 100644 modules/followup/mails/en/footer.html create mode 100644 modules/followup/mails/en/footer.txt create mode 100644 modules/followup/mails/en/header.html create mode 100644 modules/followup/mails/en/header.txt create mode 100644 modules/mailalerts/mails/en/footer.html create mode 100644 modules/mailalerts/mails/en/footer.txt create mode 100644 modules/mailalerts/mails/en/header.html create mode 100644 modules/mailalerts/mails/en/header.txt create mode 100644 modules/referralprogram/mails/en/footer.html create mode 100644 modules/referralprogram/mails/en/footer.txt create mode 100644 modules/referralprogram/mails/en/header.html create mode 100644 modules/referralprogram/mails/en/header.txt create mode 100644 modules/sendtoafriend/mails/en/footer.html create mode 100644 modules/sendtoafriend/mails/en/footer.txt create mode 100644 modules/sendtoafriend/mails/en/header.html create mode 100644 modules/sendtoafriend/mails/en/header.txt diff --git a/mails/en/account.html b/mails/en/account.html index df911e77e..65721d8ba 100644 --- a/mails/en/account.html +++ b/mails/en/account.html @@ -59,7 +59,7 @@ - You can now place orders on our shop: {shop_name}. + You can now place orders on our shop: {shop_name} diff --git a/mails/en/account.txt b/mails/en/account.txt index f42c6945c..941afd063 100644 --- a/mails/en/account.txt +++ b/mails/en/account.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -23,8 +23,8 @@ Important Security Tips: notify us immediately. You can now place orders on our shop: {shop_name} -[http://safe.shell.la/{shop_url}]. +[{shop_url}] -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{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 615c9f7aa..ff5f17dec 100644 --- a/mails/en/backoffice_order.html +++ b/mails/en/backoffice_order.html @@ -31,9 +31,9 @@

- A new command has been generated to you.

+ A new order has been generated on your behalf.

- Go on {order_link} to finalize the payment. + Please go on {order_link} to finalize the payment. diff --git a/mails/en/backoffice_order.txt b/mails/en/backoffice_order.txt index ddca7abc9..4db4629cb 100644 --- a/mails/en/backoffice_order.txt +++ b/mails/en/backoffice_order.txt @@ -1,11 +1,12 @@ -[http://safe.shell.la/{shop_url}] +[{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. +A new order has been generated on your behalf. Please go on +{order_link} [{order_link}] to finalize the +payment. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html index 0e580db61..cbd86eb3f 100644 --- a/mails/en/bankwire.html +++ b/mails/en/bankwire.html @@ -23,7 +23,7 @@ Hi {firstname} {lastname},
- Thank you for shopping at {shop_name}! + Thank you for shopping with {shop_name}! @@ -46,7 +46,7 @@

You have selected to pay by wire transfer.

- Here are the bank details for your wire or transfer:
+ Here are the bank details for your transfer:
Amount: {total_paid}
Account owner: {bankwire_owner}
Account details: {bankwire_details}
diff --git a/mails/en/bankwire.txt b/mails/en/bankwire.txt index 66e116a88..6742e6fdc 100644 --- a/mails/en/bankwire.txt +++ b/mails/en/bankwire.txt @@ -1,16 +1,16 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, -Thank you for shopping at {shop_name}! +Thank you for shopping with {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: +for your transfer: AMOUNT: {total_paid} @@ -21,14 +21,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/cheque.html b/mails/en/cheque.html index 78346631b..8fa0e852a 100644 --- a/mails/en/cheque.html +++ b/mails/en/cheque.html @@ -23,7 +23,7 @@ Hi {firstname} {lastname},
- Thank you for shopping at {shop_name}! + Thank you for shopping with {shop_name}! @@ -43,9 +43,9 @@

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

+ You have selected to pay by check.

- Here are the bank details for your wire or transfer:
+ Here are the bank details for your check:
Amount: {total_paid}
Payable to the order of: {cheque_name}
Please mail your check to: {cheque_address_html} diff --git a/mails/en/cheque.txt b/mails/en/cheque.txt index 59880f449..0dfab7da5 100644 --- a/mails/en/cheque.txt +++ b/mails/en/cheque.txt @@ -1,16 +1,16 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, -Thank you for shopping at {shop_name}! +Thank you for shopping with {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: +You have selected to pay by check. Here are the bank details for your +check: AMOUNT: {total_paid} @@ -19,14 +19,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/contact.txt b/mails/en/contact.txt index b146fae7f..fdfbabf78 100644 --- a/mails/en/contact.txt +++ b/mails/en/contact.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -11,6 +11,6 @@ ORDER ID: {order_name} ATTACHED FILE: {attached_file} -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/contact_form.txt b/mails/en/contact_form.txt index c32ac62f9..53ce27c72 100644 --- a/mails/en/contact_form.txt +++ b/mails/en/contact_form.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -16,6 +16,6 @@ ATTACHED FILE: {attached_file} We will answer as soon as possible. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{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 eaa690539..f663508cc 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -31,7 +31,7 @@

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

+ Order {order_name} - Credit slip created

We have generated a credit slip in your name for order with the reference {order_name}. diff --git a/mails/en/credit_slip.txt b/mails/en/credit_slip.txt index 81101eaf9..3f2a147c3 100644 --- a/mails/en/credit_slip.txt +++ b/mails/en/credit_slip.txt @@ -1,17 +1,16 @@ -[http://safe.shell.la/{shop_url}] +[{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}. +Order {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 +"My credit slips" [{history_url}] section of your account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{my_account_url}] on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{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 bca9ca7a4..0c3cabff8 100644 --- a/mails/en/download_product.html +++ b/mails/en/download_product.html @@ -23,7 +23,7 @@ Hi {firstname} {lastname},
- Thank you for your order from {shop_name} + Thank you for your order with the reference {order_name} from {shop_name} diff --git a/mails/en/download_product.txt b/mails/en/download_product.txt index 66cdc5a6b..603ab80bc 100644 --- a/mails/en/download_product.txt +++ b/mails/en/download_product.txt @@ -1,9 +1,10 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, -Thank you for your order from {SHOP_NAME} +Thank you for your order with the reference {order_name} from +{SHOP_NAME} Product(s) now available for download You have {NBPRODUCTS} product(s) now available for download using the following link(s): @@ -11,15 +12,15 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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}] +[{guest_tracking_url}?id_order={order_name}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/employee_password.txt b/mails/en/employee_password.txt index c2c44367f..6056693cc 100644 --- a/mails/en/employee_password.txt +++ b/mails/en/employee_password.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -14,6 +14,6 @@ PASSWORD: {passwd} E-MAIL ADDRESS: {email} -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/footer.txt b/mails/en/footer.txt index 80617d9d5..075985bd1 100644 --- a/mails/en/footer.txt +++ b/mails/en/footer.txt @@ -1,4 +1,4 @@ -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/forward_msg.txt b/mails/en/forward_msg.txt index 8a56c2562..c5f42a469 100644 --- a/mails/en/forward_msg.txt +++ b/mails/en/forward_msg.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,6 +10,6 @@ DISCUSSION HISTORY: {messages} {EMPLOYEE} added "{COMMENT}" -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/guest_to_customer.txt b/mails/en/guest_to_customer.txt index d693a5018..d7bcb43ce 100644 --- a/mails/en/guest_to_customer.txt +++ b/mails/en/guest_to_customer.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -14,6 +14,6 @@ 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 +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/header.txt b/mails/en/header.txt index 03c9678a3..9b4c415ee 100644 --- a/mails/en/header.txt +++ b/mails/en/header.txt @@ -1,3 +1,3 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html index b8e12fd4f..00735a63b 100755 --- a/mails/en/in_transit.html +++ b/mails/en/in_transit.html @@ -34,7 +34,8 @@ Order {order_name} - In transit

Your order with the reference {order_name} is currently in transit.

- You can track your package using the following link: {followup} + You can track your package using the following link: {followup} + diff --git a/mails/en/in_transit.txt b/mails/en/in_transit.txt index b170b32d3..f951aa790 100755 --- a/mails/en/in_transit.txt +++ b/mails/en/in_transit.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -7,17 +7,17 @@ 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}] +[{followup}] You can review your order and download your invoice from the -"Order history" [http://safe.shell.la/{history_url}] section of your +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/log_alert.txt b/mails/en/log_alert.txt index b49d23492..c7f4d547c 100755 --- a/mails/en/log_alert.txt +++ b/mails/en/log_alert.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -9,6 +9,6 @@ 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 +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/newsletter.txt b/mails/en/newsletter.txt index 1fd42e412..c2462b284 100644 --- a/mails/en/newsletter.txt +++ b/mails/en/newsletter.txt @@ -1,10 +1,10 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, {message} -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt index b2014fb34..83aa9ca16 100644 --- a/mails/en/order_canceled.txt +++ b/mails/en/order_canceled.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,14 +10,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/order_changed.txt b/mails/en/order_changed.txt index 07ab534d2..8b3851ee2 100644 --- a/mails/en/order_changed.txt +++ b/mails/en/order_changed.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,14 +10,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{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 1f89ef55b..2a164d32c 100644 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -23,7 +23,7 @@ Hi {firstname} {lastname},
- Thank you for shopping at {shop_name}! + Thank you for shopping with {shop_name}! diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt index 0b0d0fa3a..a6cd86a1b 100644 --- a/mails/en/order_conf.txt +++ b/mails/en/order_conf.txt @@ -1,9 +1,9 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, -Thank you for shopping at {shop_name}! +Thank you for shopping with {shop_name}! Order details ORDER: {order_name} Placed on {date} @@ -56,14 +56,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/order_customer_comment.txt b/mails/en/order_customer_comment.txt index 542c78bc5..907bf0fe5 100644 --- a/mails/en/order_customer_comment.txt +++ b/mails/en/order_customer_comment.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,6 +10,6 @@ CUSTOMER: {firstname} {lastname} ({email}) {message} -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{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 a5094541c..f40f14c84 100644 --- a/mails/en/order_merchant_comment.html +++ b/mails/en/order_merchant_comment.html @@ -31,7 +31,7 @@

- New message from {shop_name}

+ Message from {shop_name}

You have received a new message from {shop_name} regarding order with the reference {order_name}.

Message: {message} diff --git a/mails/en/order_merchant_comment.txt b/mails/en/order_merchant_comment.txt index 744001122..9b732936f 100644 --- a/mails/en/order_merchant_comment.txt +++ b/mails/en/order_merchant_comment.txt @@ -1,13 +1,13 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, -New message from {shop_name} You have received a new message from +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 +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/order_return_state.txt b/mails/en/order_return_state.txt index 913346e03..9bb80f9a0 100644 --- a/mails/en/order_return_state.txt +++ b/mails/en/order_return_state.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,10 +10,10 @@ your return #{id_order_return}, the new status is: MESSAGE: {message} You can review your order and download your invoice from the -"Order history" [http://safe.shell.la/{history_url}] section of your +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{my_account_url}] on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/outofstock.txt b/mails/en/outofstock.txt index fec0f654d..cd176e77f 100644 --- a/mails/en/outofstock.txt +++ b/mails/en/outofstock.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -12,14 +12,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/password.txt b/mails/en/password.txt index 5b04d4182..c69669948 100644 --- a/mails/en/password.txt +++ b/mails/en/password.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -8,14 +8,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/password_query.txt b/mails/en/password_query.txt index c66bbdaba..973e5e6c6 100644 --- a/mails/en/password_query.txt +++ b/mails/en/password_query.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,8 +10,8 @@ Please note that this will change your current password. To confirm this action, please use the following link: -{url} [http://safe.shell.la/{url}] +{url} [{url}] -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/payment.txt b/mails/en/payment.txt index a0a72a9ba..001a67a6a 100644 --- a/mails/en/payment.txt +++ b/mails/en/payment.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -9,14 +9,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/payment_error.txt b/mails/en/payment_error.txt index 0cead8764..ff4c5071c 100644 --- a/mails/en/payment_error.txt +++ b/mails/en/payment_error.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -10,14 +10,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/preparation.txt b/mails/en/preparation.txt index b25377fc7..8cf2fc4ba 100644 --- a/mails/en/preparation.txt +++ b/mails/en/preparation.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -7,14 +7,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/refund.html b/mails/en/refund.html index 935fa2f6a..401feaebb 100644 --- a/mails/en/refund.html +++ b/mails/en/refund.html @@ -30,10 +30,10 @@ -

+

Order {order_name} - Refund processed

- - We have processed your {shop_name} refund for order with the reference {order_name}. + + We have processed your {shop_name} refund for order with the reference {order_name}. @@ -62,7 +62,7 @@ -   +   diff --git a/mails/en/refund.txt b/mails/en/refund.txt index fd79689f4..4e6f608a6 100644 --- a/mails/en/refund.txt +++ b/mails/en/refund.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -7,14 +7,14 @@ 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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/reply_msg.txt b/mails/en/reply_msg.txt index 86c18fde4..91d792175 100644 --- a/mails/en/reply_msg.txt +++ b/mails/en/reply_msg.txt @@ -1,19 +1,19 @@ -[http://safe.shell.la/{shop_url}] +[{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 +"Order history" [{history_url}] section of your customer account by clicking "My account" -[http://safe.shell.la/{my_account_url}] on our shop. +[{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 +"Guest Tracking" [{guest_tracking_url}] section on our shop. -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/shipped.html b/mails/en/shipped.html index c4cae9a9c..343a4a81d 100644 --- a/mails/en/shipped.html +++ b/mails/en/shipped.html @@ -41,7 +41,7 @@ - You can now place orders on our shop: {shop_name}. + You can now place orders on our shop: {shop_name} diff --git a/mails/en/shipped.txt b/mails/en/shipped.txt index a42c158e9..d4d50d015 100644 --- a/mails/en/shipped.txt +++ b/mails/en/shipped.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -12,8 +12,8 @@ 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_url}] -{shop_name} [http://safe.shell.la/{shop_url}] powered by +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/test.txt b/mails/en/test.txt index 065364354..a3fc61534 100644 --- a/mails/en/test.txt +++ b/mails/en/test.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hello @@ -7,6 +7,6 @@ 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 +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/voucher.html b/mails/en/voucher.html index ab7e8957f..7f64baedb 100644 --- a/mails/en/voucher.html +++ b/mails/en/voucher.html @@ -34,7 +34,7 @@ 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}

+ Voucher code: {voucher_num} in the amount of {voucher_amount}

Simply copy/paste this code during the payment process for your next order. diff --git a/mails/en/voucher.txt b/mails/en/voucher.txt index a93c90ade..5e6884d50 100644 --- a/mails/en/voucher.txt +++ b/mails/en/voucher.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -11,6 +11,6 @@ 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 +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/mails/en/voucher_new.txt b/mails/en/voucher_new.txt index e66cae2d4..0cb1c1aba 100644 --- a/mails/en/voucher_new.txt +++ b/mails/en/voucher_new.txt @@ -1,5 +1,5 @@ -[http://safe.shell.la/{shop_url}] +[{shop_url}] Hi {firstname} {lastname}, @@ -9,6 +9,6 @@ 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 +{shop_name} [{shop_url}] powered by PrestaShop(tm) [http://www.prestashop.com/] diff --git a/modules/blocknewsletter/mails/en/footer.html b/modules/blocknewsletter/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/blocknewsletter/mails/en/footer.html @@ -0,0 +1,15 @@ + +   + + + + {shop_name} powered by PrestaShop™ + + + + +   + + + + \ No newline at end of file diff --git a/modules/blocknewsletter/mails/en/footer.txt b/modules/blocknewsletter/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/blocknewsletter/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/blocknewsletter/mails/en/header.html b/modules/blocknewsletter/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/blocknewsletter/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + + + + +
  + + + + diff --git a/modules/blocknewsletter/mails/en/header.txt b/modules/blocknewsletter/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/blocknewsletter/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html index bb6e23840..e7da65f7f 100644 --- a/modules/blocknewsletter/mails/en/newsletter_conf.html +++ b/modules/blocknewsletter/mails/en/newsletter_conf.html @@ -1,34 +1,52 @@ + - - - Message from {shop_name} - - -
- + + + Message from {shop_name} + + + +
+ + + + + + + + +
  + + + + + - + - + - + - - - - - - - - - - - - - -
{shop_name} + Hi, +
  
Hi, + + Thank you for subscribing to our newsletter. +
 
Thank you for subscribing to our newsletter
 
{shop_name} powered by PrestaShop™
- + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.txt b/modules/blocknewsletter/mails/en/newsletter_conf.txt index 444e7c21c..84fae8604 100644 --- a/modules/blocknewsletter/mails/en/newsletter_conf.txt +++ b/modules/blocknewsletter/mails/en/newsletter_conf.txt @@ -1,7 +1,10 @@ -Hi - -Thank you for subscribing to our newsletter. - - - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi, + +THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.html b/modules/blocknewsletter/mails/en/newsletter_verif.html index 6f8ded685..57e0276a0 100644 --- a/modules/blocknewsletter/mails/en/newsletter_verif.html +++ b/modules/blocknewsletter/mails/en/newsletter_verif.html @@ -1,37 +1,54 @@ + - - - Message from {shop_name} - - - - + + + Message from {shop_name} + + + +
+ + + + + + + + +
  + + + + + - + - + - + - - - - - - - - - - - - - - - - -
{shop_name} + Hi, +
  
Hi, + + Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :
+ {verif_url} + +
 
Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :
{verif_url}
 
{shop_name} Powered by PrestaShop™
- + +
 
+ {shop_name} powered by PrestaShop™ +
+ +   + + + \ No newline at end of file diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.txt b/modules/blocknewsletter/mails/en/newsletter_verif.txt index 13df8cd3f..5ce96a648 100644 --- a/modules/blocknewsletter/mails/en/newsletter_verif.txt +++ b/modules/blocknewsletter/mails/en/newsletter_verif.txt @@ -1,6 +1,13 @@ -Hi, - -Thank you for subscribing to our newsletter, please confirm your request by clicking the link below: -{verif_url} - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi, + +Thank you for subscribing to our newsletter, please confirm your +request by clicking the link below : + +{VERIF_URL} [HTTP://SAFE.SHELL.LA/{VERIF_URL}] + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html index 12b2b6513..54555978d 100644 --- a/modules/blocknewsletter/mails/en/newsletter_voucher.html +++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html @@ -1,40 +1,55 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi,
 
Newsletter subscription
 
Regarding your newsletter subscription, we are pleased to offer you the following voucher: {discount}
 
{shop_name} powered by PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi, +
 
+

+ Newsletter subscription

+ + Regarding your newsletter subscription, we are pleased to offer you the following voucher: {discount} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.txt b/modules/blocknewsletter/mails/en/newsletter_voucher.txt index 47933e376..1f23002f2 100644 --- a/modules/blocknewsletter/mails/en/newsletter_voucher.txt +++ b/modules/blocknewsletter/mails/en/newsletter_voucher.txt @@ -1,9 +1,11 @@ -Hi - -Regarding your newsletter subscription, we are pleased to offer you the following voucher: {discount} - -{shop_name} - {shop_url} - - - -{shop_url} Powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi, + +Newsletter subscription Regarding your newsletter subscription, we +are pleased to offer you the following voucher: {DISCOUNT} + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/blockwishlist/mails/en/footer.html b/modules/blockwishlist/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/blockwishlist/mails/en/footer.html @@ -0,0 +1,15 @@ + +   + + + + {shop_name} powered by PrestaShop™ + + + + +   + + + + \ No newline at end of file diff --git a/modules/blockwishlist/mails/en/footer.txt b/modules/blockwishlist/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/blockwishlist/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/blockwishlist/mails/en/header.html b/modules/blockwishlist/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/blockwishlist/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + + + + + + + +
  + + + + diff --git a/modules/blockwishlist/mails/en/header.txt b/modules/blockwishlist/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/blockwishlist/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/blockwishlist/mails/en/wishlink.html b/modules/blockwishlist/mails/en/wishlink.html index d82bfb660..d8eb6ff02 100644 --- a/modules/blockwishlist/mails/en/wishlink.html +++ b/modules/blockwishlist/mails/en/wishlink.html @@ -1,40 +1,56 @@ + - - - Message from {shop_name} - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi,
 
Message from {shop_name}
 
{shop_name} invites you to send this link to your friends, so they can see your wishlist {wishlist} :

{message}
 
{shop_name} realised with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi, +
 
+

+ Message from {shop_name}

+ + {shop_name} invites you to send this link to your friends, so they can see your wishlist: {wishlist}

+ {message} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/blockwishlist/mails/en/wishlink.txt b/modules/blockwishlist/mails/en/wishlink.txt index 23466e4bd..b547f2fcf 100644 --- a/modules/blockwishlist/mails/en/wishlink.txt +++ b/modules/blockwishlist/mails/en/wishlink.txt @@ -1,7 +1,13 @@ -Hi, - -{shop_name} invites you to send this link to your friends, so they can see your wishlist {wishlist} : - -{message} - -{shop_url} realised by PrestaShop™ + +[{shop_url}] + +Hi, + +Message from {shop_name} {SHOP_NAME} invites you to send this link to +your friends, so they can see your wishlist: {WISHLIST} + +{message} [{message}] + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/blockwishlist/mails/en/wishlist.html b/modules/blockwishlist/mails/en/wishlist.html index 6678d8224..d7a9b087f 100644 --- a/modules/blockwishlist/mails/en/wishlist.html +++ b/modules/blockwishlist/mails/en/wishlist.html @@ -1,40 +1,56 @@ + - - - Message from a customer of {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi,
 
Message from {shop_name}
 
{firstname} {lastname} indicated you may want to see his/her wishlist {wishlist} :

{wishlist}
 
{shop_name} Powered by PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi, +
 
+

+ Message from {shop_name}

+ + {firstname} {lastname} indicated you may want to see his/her wishlist: {wishlist}

+ {wishlist} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/blockwishlist/mails/en/wishlist.txt b/modules/blockwishlist/mails/en/wishlist.txt index 950c5b85d..0116998b8 100644 --- a/modules/blockwishlist/mails/en/wishlist.txt +++ b/modules/blockwishlist/mails/en/wishlist.txt @@ -1,8 +1,13 @@ -Hi, - -{firstname} {lastname} indicated you may want to see his/her wishlist {wishlist} : -{message} - - - -{shop_url} Powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi, + +Message from {shop_name} {FIRSTNAME} {LASTNAME} indicated you may +want to see his/her wishlist: {WISHLIST} + +{wishlist} [{message}] + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/followup/mails/en/followup_1.html b/modules/followup/mails/en/followup_1.html index d6518515b..e9218bad3 100644 --- a/modules/followup/mails/en/followup_1.html +++ b/modules/followup/mails/en/followup_1.html @@ -1,46 +1,68 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your cart at {shop_name}
 
We noticed that during your last visit on {shop_name}, you did not complete the order you had started.

Your cart has been saved, you can resume your order by visiting our shop:

{shop_url}

As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!
 
Here is your coupon: {voucher_num}

Enter this code in your shopping cart to get your discount.
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Your cart at {shop_name}

+ + We noticed that during your last visit on {shop_name}, you did not complete the order you had started.

+ Your cart has been saved, you can resume your order by visiting our shop: {shop_url}

+ As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment! +
 
+

+ Your {shop_name} login details

+ + Here is your coupon: {voucher_num}
+ Enter this code in your shopping cart to get your discount. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/followup/mails/en/followup_1.txt b/modules/followup/mails/en/followup_1.txt index 7a53e5fdf..648f49332 100644 --- a/modules/followup/mails/en/followup_1.txt +++ b/modules/followup/mails/en/followup_1.txt @@ -1,13 +1,22 @@ -Hello {firstname} {lastname}, - -We noticed that during your last visit on {shop_name}, you did not complete the order you had started. - -Your cart has been saved, you can resume your order by visiting our shop: - -{shop_url} - -As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment! - -Here is your coupon: {voucher_num} - -Enter this code in your shopping cart to get your discount. \ No newline at end of file + +[{shop_url}] + +Hi {firstname} {lastname}, + +Your cart at {shop_name} We noticed that during your last visit on +{shop_name}, you did not complete the order you had started. + +Your cart has been saved, you can resume your order by visiting our +shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}] + +As an incentive, we can give you a discount of {amount}% off your +next order! This offer is valid for {DAYS} days, so do not waste a +moment! + +Your {shop_name} login details HERE IS YOUR COUPON: {voucher_num} + +Enter this code in your shopping cart to get your discount. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/followup/mails/en/followup_2.html b/modules/followup/mails/en/followup_2.html index 963414077..12f5b5cf8 100644 --- a/modules/followup/mails/en/followup_2.html +++ b/modules/followup/mails/en/followup_2.html @@ -1,46 +1,55 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Thank you for your order at {shop_name}
 
As our way of saying thanks, we want to give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!

 
Here is your coupon: {voucher_num}

Enter this code in your shopping cart to get your discount.
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname},
+ Thank you for your order at {shop_name}. +
 
+ + As our way of saying thanks, we want to give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!

+ Here is your coupon: {voucher_num}

+ Enter this code in your shopping cart to get your discount. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/followup/mails/en/followup_2.txt b/modules/followup/mails/en/followup_2.txt index 33b52c673..0ba776207 100644 --- a/modules/followup/mails/en/followup_2.txt +++ b/modules/followup/mails/en/followup_2.txt @@ -1,9 +1,18 @@ -Hello {firstname} {lastname}, - -Thank you for your order at {shop_name} - -As our way of saying thanks, we want to give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment! - -Here is your coupon: {voucher_num} - -Enter this code in your shopping cart to get your discount. \ No newline at end of file + +[{shop_url}] + +Hi {firstname} {lastname}, + +Thank you for your order at {shop_name}. + +As our way of saying thanks, we want to give you a discount of +{AMOUNT}% off your next order! This offer is valid for {DAYS} days, so +do not waste a moment! + +HERE IS YOUR COUPON: {voucher_num} + +Enter this code in your shopping cart to get your discount. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/followup/mails/en/followup_3.html b/modules/followup/mails/en/followup_3.html index f6d033240..0ef3e9d6f 100644 --- a/modules/followup/mails/en/followup_3.html +++ b/modules/followup/mails/en/followup_3.html @@ -1,46 +1,57 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Thanks for your trust
 
You are one of our best customers and as such we want to thank you for your continued patronage.

As appreciation for your loyalty, we want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!
 
Here is your coupon: {voucher_num}

Enter this code in your shopping cart to get your discount.
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname},
+ Thanks for your trust. +
 
+

+ You are one of our best customers and as such we want to thank you for your continued patronage.

+ + As appreciation for your loyalty, we want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!

+ Here is your coupon: {voucher_num}

+ Enter this code in your shopping cart to get your discount. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/followup/mails/en/followup_3.txt b/modules/followup/mails/en/followup_3.txt index bcecf9baa..86dd82d02 100644 --- a/modules/followup/mails/en/followup_3.txt +++ b/modules/followup/mails/en/followup_3.txt @@ -1,9 +1,19 @@ -Hello {firstname} {lastname}, - -You are one of our best customers and as such we want to thank you for your continued patronage. - -As appreciation for your loyalty, we want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment! - -Here is your coupon: {voucher_num} - -Enter this code in your shopping cart to get your discount. \ No newline at end of file + +[{shop_url}] + +Hi {firstname} {lastname}, + +Thanks for your trust. + +You are one of our best customers and as such we want to thank you +for your continued patronage. As appreciation for your loyalty, we +want to give you a discount of {AMOUNT}% valid on your next order! +This offer is valid for {DAYS} days, so do not waste a moment! + +HERE IS YOUR COUPON: {voucher_num} + +Enter this code in your shopping cart to get your discount. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/followup/mails/en/followup_4.html b/modules/followup/mails/en/followup_4.html index ff59cd920..48810c43c 100644 --- a/modules/followup/mails/en/followup_4.html +++ b/modules/followup/mails/en/followup_4.html @@ -1,46 +1,66 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Your cart at {shop_name}
 
You are one of our best customers, however you have not placed an order in {days_threshold} days.

We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!
 
Here is your coupon: {voucher_num}

Enter this code in your shopping cart to get your discount.
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Your cart at {shop_name}

+ + You are one of our best customers, however you have not placed an order in {days_threshold} days.

+ Your cart has been saved, you can resume your order by visiting our shop: {shop_url}

+ We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment! +
 
+ + Here is your coupon: {voucher_num}

+ Enter this code in your shopping cart to get your discount. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/followup/mails/en/followup_4.txt b/modules/followup/mails/en/followup_4.txt index b1d78ce01..dd18b4384 100644 --- a/modules/followup/mails/en/followup_4.txt +++ b/modules/followup/mails/en/followup_4.txt @@ -1,11 +1,22 @@ -We miss you at {shop_name} - -Hello {firstname} {lastname}, - -You are one of our best customers, however you have not placed an order in {days_threshold} days. - -We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment! - -Here is your coupon: {voucher_num} - -Enter this code in your shopping cart to get your discount. \ No newline at end of file + +[{shop_url}] + +Hi {firstname} {lastname}, + +Your cart at {shop_name} You are one of our best customers, however +you have not placed an order in {days_threshold} days. + +Your cart has been saved, you can resume your order by visiting our +shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}] + +We wish to thank you for the trust you have placed in us and want to +give you a discount of {amount}% valid on your next order! This offer +is valid for {DAYS} days, so do not waste a moment! + +HERE IS YOUR COUPON: {voucher_num} + +Enter this code in your shopping cart to get your discount. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/followup/mails/en/footer.html b/modules/followup/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/followup/mails/en/footer.html @@ -0,0 +1,15 @@ +
 
+ {shop_name} powered by PrestaShop™ +
+ +   + + + + \ No newline at end of file diff --git a/modules/followup/mails/en/footer.txt b/modules/followup/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/followup/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/followup/mails/en/header.html b/modules/followup/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/followup/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + + + + + + + +
  + + + + diff --git a/modules/followup/mails/en/header.txt b/modules/followup/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/followup/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/mailalerts/mails/en/customer_qty.html b/modules/mailalerts/mails/en/customer_qty.html index d2f03253b..13669073e 100644 --- a/modules/mailalerts/mails/en/customer_qty.html +++ b/modules/mailalerts/mails/en/customer_qty.html @@ -1,34 +1,56 @@ + - - - [{shop_name}] Product available - - -
- - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
{product} is now available.
 
This item is once again in-stock.

You can access the product page by clicking on the link: {product}

You can order it right now from our online shop.
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi, +
 
+

+ {product} is now available.

+ + This item is once again in-stock.

+ You can access the product page by clicking on the link: {product}
+ You can order it right now from our online shop. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/en/customer_qty.txt b/modules/mailalerts/mails/en/customer_qty.txt index cd9881f13..41f6b83f4 100644 --- a/modules/mailalerts/mails/en/customer_qty.txt +++ b/modules/mailalerts/mails/en/customer_qty.txt @@ -1,12 +1,15 @@ -Hi, - -Product {product} is now available. -This item is once again in-stock. - -You can access the product page on: {product_link} - -You can order it right now from our online shop. - - - -{shop_url} powered by PrestaShop™ + +[{shop_url}] + +Hi, + +{product} is now available. This item is once again in-stock. + +You can access the product page by clicking on the link: {PRODUCT} +[HTTP://SAFE.SHELL.LA/{PRODUCT_LINK}] + +You can order it right now from our online shop. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/mailalerts/mails/en/footer.html b/modules/mailalerts/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/mailalerts/mails/en/footer.html @@ -0,0 +1,15 @@ +
 
+ {shop_name} powered by PrestaShop™ +
+ +   + + + + \ No newline at end of file diff --git a/modules/mailalerts/mails/en/footer.txt b/modules/mailalerts/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/mailalerts/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/mailalerts/mails/en/header.html b/modules/mailalerts/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/mailalerts/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + + + + + + + +
  + + + + diff --git a/modules/mailalerts/mails/en/header.txt b/modules/mailalerts/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/mailalerts/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/mailalerts/mails/en/new_order.html b/modules/mailalerts/mails/en/new_order.html index 9f150f596..a995ba134 100644 --- a/modules/mailalerts/mails/en/new_order.html +++ b/modules/mailalerts/mails/en/new_order.html @@ -1,74 +1,153 @@ + - [{shop_name}] New order + Message from {shop_name} + - -

{shop_name}

- Congratulations! A new order was placed on {shop_name} from the following customer:
{firstname} {lastname} ({email})

-
+ +
- +
-

Order Details

- -

Order: #{order_name} placed on {date}

-

Payment method: {payment}

- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReferenceProductPriceQuantityTotal Price
  + - + - - - - - - - - - - - - - - - - - - - - - - - - -
{items}
Products{total_products}
Discounts{total_discounts}
Gift-wrapping{total_wrapping}
Shipping{total_shipping}
Total Tax paid{total_tax_paid}
Total paid{total_paid}
- -

Carrier: {carrier}

- - - - - - - - - -
Delivery addressBilling address
{delivery_block_html}{invoice_block_html}
- -

Customer message: {message}

- -

{shop_name} powered with PrestaShop™

+
+ Congratulations! +
+ A new order was placed on {shop_name} from the following customer: {firstname} {lastname} ({email}) +
 
+

+ Order details

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

+ Payment: {payment} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ReferenceProductUnit priceQuantityTotal price
+ {items} +
Products{total_products}
Discounts{total_discounts}
Gift-wrapping{total_wrapping}
Shipping{total_shipping}
Total Tax paid{total_tax_paid}
Total paid{total_paid}
+
+

+ Carrier:

+ + {carrier} + +
 
+ + + + + + +
+

+ Delivery address

+ + {delivery_block_html} + 		  +

+ Billing address

+ + {invoice_block_html} + +
+
 
+

+ Customer message:

+ + {message} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
diff --git a/modules/mailalerts/mails/en/new_order.txt b/modules/mailalerts/mails/en/new_order.txt index 769cdb075..16274e4c6 100644 --- a/modules/mailalerts/mails/en/new_order.txt +++ b/modules/mailalerts/mails/en/new_order.txt @@ -1,30 +1,59 @@ -Hi, - -You've a new order from {firstname} {lastname} ({email}) on {shop_name}. - -Order: {order_name} -Placed on : {date} -Carrier : {carrier} -Payment: {payment} -Discounts: {total_discounts} -Shipping: {total_shipping} -Total Tax paid: {total_tax_paid} -Products: {total_products} -Gift-wrapping: {total_wrapping} -Total paid: {total_paid} - -Delivery address: - -{delivery_block_txt} - -Billing address: - -{invoice_block_txt} - -Customer message: - -{message} - - - -{shop_url} powered by PrestaShop™ + +[{shop_url}] + +Congratulations! + +A new order was placed on {shop_name} from the following customer: +{firstname} {lastname} ({email}) + +Order details ORDER: {order_name} Placed on {date} + +PAYMENT: {payment} + +REFERENCE + +PRODUCT + +UNIT PRICE + +QUANTITY + +TOTAL PRICE + +{items} + +PRODUCTS + +{total_products} + +DISCOUNTS + +{total_discounts} + +GIFT-WRAPPING + +{total_wrapping} + +SHIPPING + +{total_shipping} + +TOTAL TAX PAID + +{total_tax_paid} + +TOTAL PAID + +{total_paid} + +Carrier: {carrier} + +Delivery address {delivery_block_html} + +Billing address {invoice_block_html} + +Customer message: {message} + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/mailalerts/mails/en/productcoverage.html b/modules/mailalerts/mails/en/productcoverage.html index 1d709047c..c46f20119 100644 --- a/modules/mailalerts/mails/en/productcoverage.html +++ b/modules/mailalerts/mails/en/productcoverage.html @@ -1,34 +1,56 @@ + - - - [{shop_name}] Stock cover - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
{product} is almost out of stock.
 
The stock cover is now less than the specified minimum of {warning_coverage}.

Current stock cover: {current_coverage}

 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi, +
 
+

+ {product} is almost out of stock.

+ + The stock cover is now less than the specified minimum of: {warning_coverage}.

+ Current stock cover: {current_coverage} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/en/productcoverage.txt b/modules/mailalerts/mails/en/productcoverage.txt index ac413dbee..0bfe4718f 100644 --- a/modules/mailalerts/mails/en/productcoverage.txt +++ b/modules/mailalerts/mails/en/productcoverage.txt @@ -1,10 +1,13 @@ -Hi, - -The product {product} is almost out of stock. -The stock cover is now less than the specified minimum of {warning_coverage}. -Current stock cover : {current_coverage} - - - - -{shop_url} powered by PrestaShop™ + +[{shop_url}] + +Hi, + +{product} is almost out of stock. The stock cover is now less than +the specified minimum of: {WARNING_COVERAGE}. + +CURRENT STOCK COVER: {current_coverage} + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/mailalerts/mails/en/productoutofstock.html b/modules/mailalerts/mails/en/productoutofstock.html index 73d26bee3..93f21060a 100644 --- a/modules/mailalerts/mails/en/productoutofstock.html +++ b/modules/mailalerts/mails/en/productoutofstock.html @@ -1,34 +1,56 @@ + - - - [{shop_name}] Out of stock - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
{product} is nearly out of stock.
 
The remaining stock is now less than the specified minimum of {last_qty}.

Remaining stock: {qty}

You are advised to open the product's admin Product Page in order to replenish your inventory.
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi, +
 
+

+ {product} is nearly out of stock.

+ + The remaining stock is now less than the specified minimum of {last_qty}.

+ Remaining stock: {qty}

+ You are advised to open the product's admin Product Page in order to replenish your inventory. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/en/productoutofstock.txt b/modules/mailalerts/mails/en/productoutofstock.txt index a6ca33698..f8d85ce70 100644 --- a/modules/mailalerts/mails/en/productoutofstock.txt +++ b/modules/mailalerts/mails/en/productoutofstock.txt @@ -1,11 +1,16 @@ -Hi, - -The product {product} is nearly out of stock. -The remaining stock is now less than the specified minimum of {last_qty}. -Remaining stock : {qty} - -You are advised to open the product's admin Product Page in order to replenish your inventory. - - - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi, + +{product} is nearly out of stock. The remaining stock is now less +than the specified minimum of {LAST_QTY}. + +REMAINING STOCK: {qty} + +You are advised to open the product's admin Product Page in order to +replenish your inventory. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/referralprogram/mails/en/footer.html b/modules/referralprogram/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/referralprogram/mails/en/footer.html @@ -0,0 +1,15 @@ +
 
+ {shop_name} powered by PrestaShop™ +
+ +   + + + + \ No newline at end of file diff --git a/modules/referralprogram/mails/en/footer.txt b/modules/referralprogram/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/referralprogram/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/referralprogram/mails/en/header.html b/modules/referralprogram/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/referralprogram/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + + + + + + + +
  + + + + diff --git a/modules/referralprogram/mails/en/header.txt b/modules/referralprogram/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/referralprogram/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/referralprogram/mails/en/referralprogram-congratulations.html b/modules/referralprogram/mails/en/referralprogram-congratulations.html index 70c65c205..787cb1cd4 100644 --- a/modules/referralprogram/mails/en/referralprogram-congratulations.html +++ b/modules/referralprogram/mails/en/referralprogram-congratulations.html @@ -1,46 +1,61 @@ + - - - Message from {shop_name} - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Congratulations!
 
Your referred friend, {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!
 
We are pleased to offer you a voucher worth {discount_display} (voucher # {discount_name}) that you can use on your next order.
 
Best regards,
 
{shop_name} powered by PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Congratulations! +
 
+ + Your referred friend {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!

+ We are pleased to offer you a voucher worth {discount_display} (voucher # {discount_name}) that you can use on your next order. +
 
+ Best regards, +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/referralprogram/mails/en/referralprogram-congratulations.txt b/modules/referralprogram/mails/en/referralprogram-congratulations.txt index c52b7a6e2..bd1f23f92 100644 --- a/modules/referralprogram/mails/en/referralprogram-congratulations.txt +++ b/modules/referralprogram/mails/en/referralprogram-congratulations.txt @@ -1,9 +1,17 @@ -Congratulations! - -Your referred friend, {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_url} ! - -We are pleased to offer you a voucher worth {discount_display} (voucher # {discount_name}) that you can use on your next order. - - - -{shop_url} Powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Congratulations! + +Your referred friend {SPONSORED_FIRSTNAME} {SPONSORED_LASTNAME} has +placed his or her first order on {shop_name} +[{shop_url}]! + +We are pleased to offer you a voucher worth {DISCOUNT_DISPLAY} +(VOUCHER # {DISCOUNT_NAME}) that you can use on your next order. + +Best regards, + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/referralprogram/mails/en/referralprogram-invitation.html b/modules/referralprogram/mails/en/referralprogram-invitation.html index 667344a64..45524de20 100644 --- a/modules/referralprogram/mails/en/referralprogram-invitation.html +++ b/modules/referralprogram/mails/en/referralprogram-invitation.html @@ -1,58 +1,63 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
{firstname_friend} {lastname_friend}, join us!
 
Your friend {firstname} {lastname} wants to refer you on {shop_name}!
 
Get referred and earn a discount voucher of {discount}!
 
It's very easy to sign up. Just click here!
 
When signing up, don't forget to provide the e-mail address of your referring friend: {email}.
 
Best regards,
 
{shop_name} powered by PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {firstname_friend} {lastname_friend}, join us! +
 
+ + Your friend {firstname} {lastname} wants to refer you on {shop_name}!

+ We are pleased to offer you a voucher worth {discount_display} (voucher # {discount_name}) that you can use on your next order. + Get referred and earn a discount voucher of {discount}! It's very easy to sign up. Just click here! + +
 
+ When signing up, don't forget to provide the e-mail address of your referring friend: {email}.

+ Best regards,
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/referralprogram/mails/en/referralprogram-invitation.txt b/modules/referralprogram/mails/en/referralprogram-invitation.txt index 26ea98af6..7776bc0a3 100644 --- a/modules/referralprogram/mails/en/referralprogram-invitation.txt +++ b/modules/referralprogram/mails/en/referralprogram-invitation.txt @@ -1,15 +1,21 @@ -{firstname_friend} {lastname_friend}, join us! - -Your friend {firstname} {lastname} wants to refer you on {shop_url}. - -Get referred and earn a discount voucher of {discount}! - -It's very easy to sign up. Just click on the following link: - -{shop_url}{link} - -When signing up, don't forget to provide the e-mail address of your referring friend: {email}. - - - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +{firstname_friend} {lastname_friend}, join us! + +Your friend {FIRSTNAME} {LASTNAME} wants to refer you on {shop_name} +[{shop_url}]! + +We are pleased to offer you a voucher worth {DISCOUNT_DISPLAY} +(VOUCHER # {DISCOUNT_NAME}) that you can use on your next order. Get +referred and earn a discount voucher of {DISCOUNT}! It's very easy to +sign up. Just click here! [{link}] + +When signing up, don't forget to provide the e-mail address of your +referring friend: {EMAIL}. + +Best regards, + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/referralprogram/mails/en/referralprogram-voucher.html b/modules/referralprogram/mails/en/referralprogram-voucher.html index 499e189f7..5a16103b7 100644 --- a/modules/referralprogram/mails/en/referralprogram-voucher.html +++ b/modules/referralprogram/mails/en/referralprogram-voucher.html @@ -1,46 +1,56 @@ + - - - Message from {shop_name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {firstname} {lastname},
 
Referral Program
 
We have created a voucher in your name for referring a friend.
 
Here is the code of your voucher : {voucher_num}, with an amount of {voucher_amount}.
Simply copy/paste this code during the payment process for your next order.
 
{shop_name} powered by PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {firstname} {lastname}, +
 
+

+ Referral Program

+ + We have created a voucher in your name for referring a friend.
+ Here is the code of your voucher: {voucher_num}, with an 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/modules/referralprogram/mails/en/referralprogram-voucher.txt b/modules/referralprogram/mails/en/referralprogram-voucher.txt index 337b6826d..3029ac74e 100644 --- a/modules/referralprogram/mails/en/referralprogram-voucher.txt +++ b/modules/referralprogram/mails/en/referralprogram-voucher.txt @@ -1,12 +1,17 @@ -Hi {firstname} {lastname}, - -We have created a voucher in your name for referring a friend. - -Here is the code of your voucher : {voucher_num}, with an 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_url} powered by PrestaShop™ + +[{shop_url}] + +Hi {firstname} {lastname}, + +Referral Program We have created a voucher in your name for referring +a friend. + +Here is the code of your voucher: {VOUCHER_NUM}, with an amount of +{VOUCHER_AMOUNT}. + +Simply copy/paste this code during the payment process for your next +order. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/sendtoafriend/mails/en/footer.html b/modules/sendtoafriend/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/sendtoafriend/mails/en/footer.html @@ -0,0 +1,15 @@ +
 
+ {shop_name} powered by PrestaShop™ +
+ +   + + + + \ No newline at end of file diff --git a/modules/sendtoafriend/mails/en/footer.txt b/modules/sendtoafriend/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/sendtoafriend/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/sendtoafriend/mails/en/header.html b/modules/sendtoafriend/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/sendtoafriend/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + +
  + + + + diff --git a/modules/sendtoafriend/mails/en/header.txt b/modules/sendtoafriend/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/sendtoafriend/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/sendtoafriend/mails/en/send_to_a_friend.html b/modules/sendtoafriend/mails/en/send_to_a_friend.html index c14aa128e..e0cceb344 100644 --- a/modules/sendtoafriend/mails/en/send_to_a_friend.html +++ b/modules/sendtoafriend/mails/en/send_to_a_friend.html @@ -1,40 +1,56 @@ + - - - Message from {shop_name} - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Hi {name},
 
{customer} has sent you a link to a product that (s)he thinks may interest you.
 
Click here to view this item: {product}
 
{shop_name} powered with PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + +
+ Hi {name},
+ Thank you for creating a customer account at {shop_name}. +
 
+

+ {customer} has sent you a link to a product that (s)he thinks may interest you.

+ + Click here to view this item: {product} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/sendtoafriend/mails/en/send_to_a_friend.txt b/modules/sendtoafriend/mails/en/send_to_a_friend.txt index 861755ddd..58c4a0d9f 100644 --- a/modules/sendtoafriend/mails/en/send_to_a_friend.txt +++ b/modules/sendtoafriend/mails/en/send_to_a_friend.txt @@ -1,13 +1,14 @@ -Hi {name}, - - -{customer} has sent you a link to a product that (s)he thinks may interest you. - -{product}: {product_link} - - -{shop_name} - {shop_url} - - - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi {name}, + +Thank you for creating a customer account at {shop_name}. + +{customer} has sent you a link to a product that (s)he thinks may +interest you. Click here to view this item: {product} +[{product_link}] + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + From b6799d4f2f35902eaf2244d510d696dee3a2bdc3 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 28 Oct 2013 11:57:27 +0100 Subject: [PATCH 3/8] [*] BO : download attachments directly from the list --- controllers/admin/AdminAttachmentsController.php | 11 +++++++++++ index.php | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php index 4a84892ae..89cdc3ece 100644 --- a/controllers/admin/AdminAttachmentsController.php +++ b/controllers/admin/AdminAttachmentsController.php @@ -37,6 +37,7 @@ class AdminAttachmentsControllerCore extends AdminController $this->lang = true; $this->addRowAction('edit'); + $this->addRowAction('view'); $this->addRowAction('delete'); $this->_select = 'IFNULL(virtual.products, 0) as products'; @@ -76,6 +77,16 @@ class AdminAttachmentsControllerCore extends AdminController parent::initPageHeaderToolbar(); } + public function renderView() + { + if (($obj = $this->loadObject(true)) && Validate::isLoadedObject($obj)) + { + $link = $this->context->link->getPageLink('attachment', true, NULL, 'id_attachment='.$obj->id); + Tools::redirectLink($link); + } + return $this->displayWarning($this->l('File not found')); + } + public function renderForm() { if (($obj = $this->loadObject(true)) && Validate::isLoadedObject($obj)) diff --git a/index.php b/index.php index 752254a40..fcef8576a 100644 --- a/index.php +++ b/index.php @@ -26,4 +26,3 @@ require(dirname(__FILE__).'/config/config.inc.php'); Dispatcher::getInstance()->dispatch(); - From 08732eda50682cd39630bef0ea21240d11ccf38a Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 28 Oct 2013 12:08:46 +0100 Subject: [PATCH 4/8] // Fixed default selection in the stats submenu --- admin-dev/themes/default/template/controllers/stats/menu.tpl | 2 +- controllers/admin/AdminStatsTabController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/stats/menu.tpl b/admin-dev/themes/default/template/controllers/stats/menu.tpl index d94a14790..28f0f1480 100644 --- a/admin-dev/themes/default/template/controllers/stats/menu.tpl +++ b/admin-dev/themes/default/template/controllers/stats/menu.tpl @@ -28,7 +28,7 @@ {if count($modules)} {foreach $modules as $module} {if $module_instance[$module.name]} - {$module_instance[$module.name]->displayName} + {$module_instance[$module.name]->displayName} {/if} {/foreach} {else} diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index fc3d50156..96ed25d9c 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -166,7 +166,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor $tpl->assign(array( 'current' => self::$currentIndex, - 'current_module_name' => Tools::getValue('module'), + 'current_module_name' => Tools::getValue('module', 'statsforecast'), 'token' => $this->token, 'modules' => $modules, 'module_instance' => $module_instance From 9c54dcce66387a3a7038508b773259447c0bcf98 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 28 Oct 2013 12:15:35 +0100 Subject: [PATCH 5/8] // Fixed default stats graph engine --- install-dev/data/xml/configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml index bbdb372b8..57ae25ae3 100644 --- a/install-dev/data/xml/configuration.xml +++ b/install-dev/data/xml/configuration.xml @@ -567,7 +567,7 @@ 1 - graphxmlswfcharts + graphnvd3 never From 0aea146a4cdccf41382676ae8add72edf6c1c87b Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 28 Oct 2013 13:39:39 +0100 Subject: [PATCH 6/8] // Code cleaning stats modules --- install-dev/models/install.php | 5 +---- modules/statspersonalinfos/statspersonalinfos.php | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/install-dev/models/install.php b/install-dev/models/install.php index 30ccb0981..b064861a5 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.php @@ -538,10 +538,7 @@ class InstallModelInstall extends InstallAbstractModel 'dashtrends', 'dashgoals', 'dashproducts', - 'graphartichow', - 'graphgooglechart', - 'graphvisifire', - 'graphxmlswfcharts', + 'graphnvd3', 'gridhtml', 'homefeatured', 'homeslider', diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index e24ebb4c0..7ec4ada40 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -75,7 +75,8 @@ class StatsPersonalInfos extends ModuleGraph

'; - if (count(Customer::getCustomers())) + $has_customers = (bool)Db::getInstance()->getValue('SELECT id_customer FROM '._DB_PREFIX_.'customer'); + if ($has_customers) { if (Tools::getValue('export')) if (Tools::getValue('exportType') == 'gender') From 1454a0d26adc584283662893a4294689b6d56de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 28 Oct 2013 15:32:26 +0100 Subject: [PATCH 7/8] // search type in BO --- admin-dev/themes/default/template/header.tpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 511adead4..118823fb4 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -283,6 +283,11 @@ $('#bo_query').attr("placeholder",$(this).data('placeholder')); $('#bo_query').focus(); }); + {if isset($search_type) && $search_type} + $(document).ready(function() { + $('.search-option a[data-value='+{$search_type|intval}+']').click(); + }); + {/if}