@@ -400,7 +400,7 @@ $(document).ready(function () {
{foreach $productFeaturePrices as $featurePlan}
- {$featurePlan['id']}
+ {$featurePlan['id_feature_price']}
|
{$featurePlan['feature_price_name']}
@@ -637,19 +637,19 @@ $(document).ready(function () {
$(".adv_payment_active").on('change',function()
{
var adv_payment = $(".adv_payment_active:checked").val();
- if (adv_payment == 1)
+ if (adv_payment == 1)
$(".adv_payment_field").show();
- else if (adv_payment == 0)
+ else if (adv_payment == 0)
$(".adv_payment_field").hide();
});
var payment_type = $(".payment_type:checked").val();
- if (payment_type == 1)
+ if (payment_type == 1)
{
$("#type_percent").show();
$("#type_amount").hide();
}
- else if (payment_type == 2)
+ else if (payment_type == 2)
{
$("#type_percent").hide();
$("#type_amount").show();
@@ -658,12 +658,12 @@ $(document).ready(function () {
$(".payment_type").on('change',function()
{
var payment_type = $(".payment_type:checked").val();
- if (payment_type == 1)
+ if (payment_type == 1)
{
$("#type_percent").show();
$("#type_amount").hide();
}
- else if (payment_type == 2)
+ else if (payment_type == 2)
{
$("#type_percent").hide();
$("#type_amount").show();
diff --git a/admin/themes/default/template/controllers/themes/helpers/options/options.tpl b/admin/themes/default/template/controllers/themes/helpers/options/options.tpl
index 3fc03e8e7..3f25cb617 100644
--- a/admin/themes/default/template/controllers/themes/helpers/options/options.tpl
+++ b/admin/themes/default/template/controllers/themes/helpers/options/options.tpl
@@ -159,27 +159,7 @@
{block name="after"}
-
{/if}
{if (isset($tab_modules_open) && $tab_modules_open) || isset($tab_modules_list)}
-
|
diff --git a/mails/en/backoffice_order.txt b/mails/en/backoffice_order.txt
index 4c2acca96..a2466d586 100644
--- a/mails/en/backoffice_order.txt
+++ b/mails/en/backoffice_order.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-A new order has been generated on your behalf.
+A new order has been generated on your behalf.
Please go on {order_link} [{order_link}] to finalize
-the payment.
+the payment.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/bankwire.html b/mails/en/bankwire.html
index 4a074d3fc..c71cbd8b0 100644
--- a/mails/en/bankwire.html
+++ b/mails/en/bankwire.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/cheque.txt b/mails/en/cheque.txt
index 38d7768b4..73b880bd8 100644
--- a/mails/en/cheque.txt
+++ b/mails/en/cheque.txt
@@ -1,14 +1,14 @@
-[{shop_url}]
+[{shop_url}]
Hi {firstname} {lastname},
-Thank you for shopping with {shop_name}!
+Thank you for shopping with {shop_name}!
Your order with the reference {order_name} has been placed
-successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
+successfully and will be SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT.
-You have selected to pay by check.
+You have selected to pay by check.
Here are the bank details for your check:
@@ -16,17 +16,17 @@ AMOUNT: {total_paid}
PAYABLE TO THE ORDER OF: {cheque_name}
-PLEASE MAIL YOUR CHECK TO: {cheque_address}
+PLEASE MAIL YOUR CHECK TO: {cheque_address}
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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" [{guest_tracking_url}] section on
-our shop.
+our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/contact.html b/mails/en/contact.html
index 7ab0dd683..01f6ef897 100644
--- a/mails/en/contact.html
+++ b/mails/en/contact.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/contact.txt b/mails/en/contact.txt
index 1c8edb415..86ebdcd90 100644
--- a/mails/en/contact.txt
+++ b/mails/en/contact.txt
@@ -1,7 +1,7 @@
-[{shop_url}]
+[{shop_url}]
-Message from a {shop_name} customer
+Message from a {shop_name} customer
CUSTOMER E-MAIL ADDRESS: {email}
@@ -9,8 +9,8 @@ CUSTOMER MESSAGE: {message}
ORDER ID: {order_name}
-ATTACHED FILE: {attached_file}
+ATTACHED FILE: {attached_file}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/contact_form.html b/mails/en/contact_form.html
index 6a8f1bbc1..16bb0cd2d 100644
--- a/mails/en/contact_form.html
+++ b/mails/en/contact_form.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/contact_form.txt b/mails/en/contact_form.txt
index e04cf8351..fc41ab6d3 100644
--- a/mails/en/contact_form.txt
+++ b/mails/en/contact_form.txt
@@ -1,7 +1,7 @@
-[{shop_url}]
+[{shop_url}]
-Your message to {shop_name} Customer Service
+Your message to {shop_name} Customer Service
Your message has been sent successfully.
@@ -11,10 +11,10 @@ ORDER ID: {order_name}
PRODUCT: {product_name}
-ATTACHED FILE: {attached_file}
+ATTACHED FILE: {attached_file}
-We will answer as soon as possible.
+We will answer as soon as possible.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html
index acafeb40e..c96fe1301 100644
--- a/mails/en/credit_slip.html
+++ b/mails/en/credit_slip.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/credit_slip.txt b/mails/en/credit_slip.txt
index 1e782d95f..3b19c29a0 100644
--- a/mails/en/credit_slip.txt
+++ b/mails/en/credit_slip.txt
@@ -1,16 +1,16 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
We have generated a credit slip in your name for order with the
-reference {order_name}.
+reference {order_name}.
You can review this credit slip and download your invoice from the
"My credit slips" [{history_url}] section of your
account by clicking "My account" [{my_account_url}]
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/download_product.html b/mails/en/download_product.html
index 0bc2c75cc..0450ba1cd 100644
--- a/mails/en/download_product.html
+++ b/mails/en/download_product.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/download_product.txt b/mails/en/download_product.txt
index a7560f92f..785615c84 100644
--- a/mails/en/download_product.txt
+++ b/mails/en/download_product.txt
@@ -1,26 +1,26 @@
-[{shop_url}]
+[{shop_url}]
Hi {firstname} {lastname},
Thank you for your order with the reference {order_name} from
-{shop_name}
+{shop_name}
You have {nbproducts} product(s) now available for download using the
following link(s):
-{virtualproducts}
+{virtualproducts}
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html
index 56cc7b178..31d166ecd 100644
--- a/mails/en/employee_password.html
+++ b/mails/en/employee_password.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/employee_password.txt b/mails/en/employee_password.txt
index 5871c1243..fd27bb591 100644
--- a/mails/en/employee_password.txt
+++ b/mails/en/employee_password.txt
@@ -1,7 +1,7 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Here is your personal login information for {shop_name}:
@@ -11,8 +11,8 @@ LAST NAME: {lastname}
PASSWORD: {passwd}
-E-MAIL ADDRESS: {email}
+E-MAIL ADDRESS: {email}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/forward_msg.html b/mails/en/forward_msg.html
index b4713239e..b6a5d163d 100644
--- a/mails/en/forward_msg.html
+++ b/mails/en/forward_msg.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/forward_msg.txt b/mails/en/forward_msg.txt
index abd4ced81..74c2151a3 100644
--- a/mails/en/forward_msg.txt
+++ b/mails/en/forward_msg.txt
@@ -1,14 +1,14 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-{employee} wanted to forward this discussion to you.
+{employee} wanted to forward this discussion to you.
DISCUSSION HISTORY: {messages}
-{employee} added "{comment}"
+{employee} added "{comment}"
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html
index 80ac4e586..c736ad9d2 100644
--- a/mails/en/guest_to_customer.html
+++ b/mails/en/guest_to_customer.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/guest_to_customer.txt b/mails/en/guest_to_customer.txt
index ecd0fffb3..fd05317dc 100644
--- a/mails/en/guest_to_customer.txt
+++ b/mails/en/guest_to_customer.txt
@@ -1,19 +1,19 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Your guest account for {shop_name} was converted to a customer
-account.
+account.
E-MAIL ADDRESS: {email}
-PASSWORD: {passwd}
+PASSWORD: {passwd}
-Please be careful when sharing these login details with others.
+Please be careful when sharing these login details with others.
-You can access your customer account on our shop: {shop_url}
+You can access your customer account on our shop: {shop_url}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/in_transit.html b/mails/en/in_transit.html
index 3876b616e..5d07ec8ae 100644
--- a/mails/en/in_transit.html
+++ b/mails/en/in_transit.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/in_transit.txt b/mails/en/in_transit.txt
index f5df19c2b..b46d4fff2 100644
--- a/mails/en/in_transit.txt
+++ b/mails/en/in_transit.txt
@@ -1,23 +1,23 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-Your order with the reference {order_name} is currently in transit.
+Your order with the reference {order_name} is currently in transit.
You can track your package using the following link: {followup}
-[{followup}]
+[{followup}]
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/log_alert.html b/mails/en/log_alert.html
index 7642dca4a..068d1d2f0 100644
--- a/mails/en/log_alert.html
+++ b/mails/en/log_alert.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/log_alert.txt b/mails/en/log_alert.txt
index 81724f53c..bc7558e58 100644
--- a/mails/en/log_alert.txt
+++ b/mails/en/log_alert.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
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.
+Office.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/newsletter.html b/mails/en/newsletter.html
index 180aa9171..a766f8cdd 100644
--- a/mails/en/newsletter.html
+++ b/mails/en/newsletter.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/newsletter.txt b/mails/en/newsletter.txt
index c2462b284..a107febe3 100644
--- a/mails/en/newsletter.txt
+++ b/mails/en/newsletter.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-{message}
+{message}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/order_canceled.html b/mails/en/order_canceled.html
index a654fcb18..7b0b81c62 100644
--- a/mails/en/order_canceled.html
+++ b/mails/en/order_canceled.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt
index b55806737..3132ba819 100644
--- a/mails/en/order_canceled.txt
+++ b/mails/en/order_canceled.txt
@@ -1,21 +1,21 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Your order with the reference {order_name} from {shop_name} has
-been canceled.
+been canceled.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/order_changed.html b/mails/en/order_changed.html
index 0015987f9..9079f486d 100644
--- a/mails/en/order_changed.html
+++ b/mails/en/order_changed.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/order_changed.txt b/mails/en/order_changed.txt
index 57d4eb432..75f65b4c3 100644
--- a/mails/en/order_changed.txt
+++ b/mails/en/order_changed.txt
@@ -1,21 +1,21 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Your order with the reference {order_name} from {shop_name} has
-been changed by the merchant.
+been changed by the merchant.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
index 582e1f831..4490df08e 100644
--- a/mails/en/order_conf.html
+++ b/mails/en/order_conf.html
@@ -4,53 +4,53 @@
diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt
index aa12f7521..71ec1ad66 100644
--- a/mails/en/order_conf.txt
+++ b/mails/en/order_conf.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
Hi {firstname} {lastname},
-Thank you for selecting our hotel!
+Thank you for selecting our hotel!
ORDER: {order_name} Placed on {date}
-PAYMENT: {payment}
+PAYMENT: {payment}
Room Image
Room Description
@@ -18,45 +18,45 @@ Check-in Date
Check-out Date
Total
-{products_txt}
+{products_txt}
-{discounts}
+{discounts}
-Total Rooms Cost
+Total Rooms Cost
-{total_products}
+{total_products}
-DISCOUNTS
+DISCOUNTS
-{total_discounts}
+{total_discounts}
-TOTAL TAX PAID
+TOTAL TAX PAID
-{total_tax_paid}
+{total_tax_paid}
{adv_data_text}
-TOTAL PAID
+TOTAL PAID
-{total_paid}
+{total_paid}
CARRIER: {carrier}
-PAYMENT: {payment}
+PAYMENT: {payment}
-{delivery_block_txt}
+{delivery_block_txt}
-{invoice_block_txt}
+{invoice_block_txt}
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
\ No newline at end of file
+Webkul(tm) [https://webkul.com/]
\ No newline at end of file
diff --git a/mails/en/order_customer_comment.html b/mails/en/order_customer_comment.html
index 6ea8d0cae..7dc419232 100644
--- a/mails/en/order_customer_comment.html
+++ b/mails/en/order_customer_comment.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/order_customer_comment.txt b/mails/en/order_customer_comment.txt
index fb58f272d..59fc11eef 100644
--- a/mails/en/order_customer_comment.txt
+++ b/mails/en/order_customer_comment.txt
@@ -1,15 +1,15 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
You have received a new message regarding order with the reference
{order_name}.
CUSTOMER: {firstname} {lastname} ({email})
-{message}
+{message}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/order_merchant_comment.html b/mails/en/order_merchant_comment.html
index 742631264..2d64ac785 100644
--- a/mails/en/order_merchant_comment.html
+++ b/mails/en/order_merchant_comment.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/order_merchant_comment.txt b/mails/en/order_merchant_comment.txt
index 5d98d6332..be5a20560 100644
--- a/mails/en/order_merchant_comment.txt
+++ b/mails/en/order_merchant_comment.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
You have received a new message from {shop_name} regarding order with
the reference {order_name}.
-MESSAGE: {message}
+MESSAGE: {message}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/order_return_state.html b/mails/en/order_return_state.html
index 957980e83..64df7729a 100644
--- a/mails/en/order_return_state.html
+++ b/mails/en/order_return_state.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/order_return_state.txt b/mails/en/order_return_state.txt
index 1e67d9d03..e01de27a1 100644
--- a/mails/en/order_return_state.txt
+++ b/mails/en/order_return_state.txt
@@ -1,7 +1,7 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
We have updated the progress on your return #{id_order_return}, the
new status is: "{state_order_return}"
@@ -9,8 +9,8 @@ new status is: "{state_order_return}"
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{my_account_url}] on our shop.
+[{my_account_url}] on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/outofstock.html b/mails/en/outofstock.html
index 0d3bde267..6d7146891 100644
--- a/mails/en/outofstock.html
+++ b/mails/en/outofstock.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/outofstock.txt b/mails/en/outofstock.txt
index 9d02b4f49..ba7c8a675 100644
--- a/mails/en/outofstock.txt
+++ b/mails/en/outofstock.txt
@@ -1,25 +1,25 @@
-[{shop_url}]
+[{shop_url}]
Hi {firstname} {lastname},
Thanks for your order with the reference {order_name} from
-{shop_name}.
+{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.
+and rest assured that we are working hard to rectify this.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/password.html b/mails/en/password.html
index 5bad06899..5976d6abc 100644
--- a/mails/en/password.html
+++ b/mails/en/password.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/password.txt b/mails/en/password.txt
index 51994c849..21be55a47 100644
--- a/mails/en/password.txt
+++ b/mails/en/password.txt
@@ -1,22 +1,22 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
E-MAIL ADDRESS: {email}
-PASSWORD: {passwd}
+PASSWORD: {passwd}
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/password_query.html b/mails/en/password_query.html
index eae4b2634..7c050f750 100644
--- a/mails/en/password_query.html
+++ b/mails/en/password_query.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/password_query.txt b/mails/en/password_query.txt
index caf9fa5fd..8042f6f09 100644
--- a/mails/en/password_query.txt
+++ b/mails/en/password_query.txt
@@ -1,16 +1,16 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+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:
+To confirm this action, please use the following link:
-{url} [{url}]
+{url} [{url}]
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/payment.html b/mails/en/payment.html
index 2ce07ad59..6fdeaabf5 100644
--- a/mails/en/payment.html
+++ b/mails/en/payment.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/payment.txt b/mails/en/payment.txt
index 12a467363..3e5002ac9 100644
--- a/mails/en/payment.txt
+++ b/mails/en/payment.txt
@@ -1,23 +1,23 @@
-[{shop_url}]
+[{shop_url}]
Hi {firstname} {lastname},
-Thank you for shopping with {shop_name}!
+Thank you for shopping with {shop_name}!
Your payment for order with the reference {order_name} was
-successfully processed.
+successfully processed.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/payment_error.html b/mails/en/payment_error.html
index 2451cedf5..ebb64295d 100644
--- a/mails/en/payment_error.html
+++ b/mails/en/payment_error.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/payment_error.txt b/mails/en/payment_error.txt
index 11d1a7cd1..014c9db78 100644
--- a/mails/en/payment_error.txt
+++ b/mails/en/payment_error.txt
@@ -1,24 +1,24 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+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.
+WE CANNOT SHIP YOUR ORDER UNTIL WE RECEIVE YOUR PAYMENT.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/preparation.html b/mails/en/preparation.html
index 6a6897a82..5016c3b1f 100644
--- a/mails/en/preparation.html
+++ b/mails/en/preparation.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/preparation.txt b/mails/en/preparation.txt
index ff3f62e24..a91422390 100644
--- a/mails/en/preparation.txt
+++ b/mails/en/preparation.txt
@@ -1,21 +1,21 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
We are currently processing your {shop_name} order with the
-reference {order_name}.
+reference {order_name}.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/refund.html b/mails/en/refund.html
index 72aa955cf..8930026af 100644
--- a/mails/en/refund.html
+++ b/mails/en/refund.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/refund.txt b/mails/en/refund.txt
index 9f42f6a1f..d31202c6b 100644
--- a/mails/en/refund.txt
+++ b/mails/en/refund.txt
@@ -1,21 +1,21 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
We have processed your {shop_name} refund for order with the
-reference {order_name}.
+reference {order_name}.
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{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"
[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
+on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/reply_msg.html b/mails/en/reply_msg.html
index f2eb1bfa6..f15dcfe97 100644
--- a/mails/en/reply_msg.html
+++ b/mails/en/reply_msg.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/reply_msg.txt b/mails/en/reply_msg.txt
index 7539aa540..2ac841a6e 100644
--- a/mails/en/reply_msg.txt
+++ b/mails/en/reply_msg.txt
@@ -1,15 +1,15 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
-{reply}
+{reply}
-Please do not reply directly to this email, we will not receive it.
+Please do not reply directly to this email, we will not receive it.
In order to reply, please use the following link: {link}
-[{link}]
+[{link}]
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/shipped.html b/mails/en/shipped.html
index 1c4ce1132..9a357f498 100644
--- a/mails/en/shipped.html
+++ b/mails/en/shipped.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/shipped.txt b/mails/en/shipped.txt
index 78f3bc5ef..2db12e544 100644
--- a/mails/en/shipped.txt
+++ b/mails/en/shipped.txt
@@ -1,19 +1,19 @@
-[{shop_url}]
+[{shop_url}]
Hi {firstname} {lastname},
-Your order has been shipped
+Your order has been shipped
Your order with the reference {order_name} has been shipped.
-Thank you for shopping with {shop_name}!
+Thank you for shopping with {shop_name}!
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
-[{my_account_url}] on our shop.
+[{my_account_url}] on our shop.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/test.html b/mails/en/test.html
index e2c9cc073..0fcbaa6f8 100644
--- a/mails/en/test.html
+++ b/mails/en/test.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/test.txt b/mails/en/test.txt
index a3fc61534..c66e20f26 100644
--- a/mails/en/test.txt
+++ b/mails/en/test.txt
@@ -1,12 +1,12 @@
-[{shop_url}]
+[{shop_url}]
-Hello
+Hello
This is a TEST E-MAIL from your shop.
-If you can read this, the test was successful!.
+If you can read this, the test was successful!.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/voucher.html b/mails/en/voucher.html
index 6ed347678..cdc869290 100644
--- a/mails/en/voucher.html
+++ b/mails/en/voucher.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/voucher.txt b/mails/en/voucher.txt
index d548df8f1..88da1b875 100644
--- a/mails/en/voucher.txt
+++ b/mails/en/voucher.txt
@@ -1,7 +1,7 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
A voucher has been created in your name as a result of your order
with the reference {order_name}.
@@ -9,8 +9,8 @@ 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.
+order.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/en/voucher_new.html b/mails/en/voucher_new.html
index 3db8269c6..1379753a6 100644
--- a/mails/en/voucher_new.html
+++ b/mails/en/voucher_new.html
@@ -4,51 +4,51 @@
diff --git a/mails/en/voucher_new.txt b/mails/en/voucher_new.txt
index f32c3ab4a..12b437a49 100644
--- a/mails/en/voucher_new.txt
+++ b/mails/en/voucher_new.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hi {firstname} {lastname},
+Hi {firstname} {lastname},
Here is the code of your voucher: {voucher_num}
Simply copy/paste this code during the payment process for your next
-order.
+order.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/mails/es/account.html b/mails/es/account.html
deleted file mode 100644
index 42cf07c21..000000000
--- a/mails/es/account.html
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/account.txt b/mails/es/account.txt
deleted file mode 100644
index 609072482..000000000
--- a/mails/es/account.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Gracias por crear una cuenta de cliente en {shop_name}.
-
-Estos son sus datos de acceso:
-
-DIRECCIÓN EMAIL: {email}
-
-CONTRASEÑA: {passwd}
-
-Consejos de Seguridad:
-
-* Mantenga los datos de su cuenta en un lugar seguro.
-
-* No comparta los detalles de su cuenta con otras personas.
-
-* Cambie su clave regularmente.
-
-* Si sospecha que alguien está usando ilegalmente su cuenta,
-avísenos inmediatamente.
-
-Ahora podrá realizar pedidos en nuestra tienda: {shop_name}
-[{shop_url}]
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/advanced-book-data.tpl b/mails/es/advanced-book-data.tpl
deleted file mode 100644
index 84ecd5775..000000000
--- a/mails/es/advanced-book-data.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{if !empty($list)}
-
-{/if}
\ No newline at end of file
diff --git a/mails/es/advanced-book-data.txt b/mails/es/advanced-book-data.txt
deleted file mode 100644
index 869c0fd65..000000000
--- a/mails/es/advanced-book-data.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-{if !empty($list)}
-
-TOTAL PAID
-
-{$list['total_paid_amount']}
-
-TOTAL DUE
-
-{$list['total_due_amount']}
-
-{/if}
\ No newline at end of file
diff --git a/mails/es/backoffice_order.html b/mails/es/backoffice_order.html
deleted file mode 100644
index 2b4d0de24..000000000
--- a/mails/es/backoffice_order.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/backoffice_order.txt b/mails/es/backoffice_order.txt
deleted file mode 100644
index 1fc11478e..000000000
--- a/mails/es/backoffice_order.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Una nueva orden ha sido generada.
-
-Por favor, vaya a {order_link} [{order_link}] para
-finalizar el pago.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/bankwire.html b/mails/es/bankwire.html
deleted file mode 100644
index ac16776be..000000000
--- a/mails/es/bankwire.html
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/bankwire.txt b/mails/es/bankwire.txt
deleted file mode 100644
index de18435c2..000000000
--- a/mails/es/bankwire.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Le agradecemos por realizar sus compras en {shop_name}!
-
-Su pedido con la referencia {order_name} se ha realizado con
-éxito y será ENVIADO TAN PRONTO COMO RECIBAMOS SU PAGO.
-
-Por favor, recuerde que ha seleccionado transferencia bancaria como
-forma de pago.
-
-Detalles para la consignación:
-
-IMPORTE: {total_paid}
-
-TITULAR DE LA CUENTA: {bankwire_owner}
-
-DETALLES DE LA CUENTA: {bankwire_details}
-
-DIRECCIÓN DEL BANCO: {bankwire_address}
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si usted tiene una cuenta de invitado, puede seguir su pedido a
-través del "Tracking Invitado"
-[{guest_tracking_url}] sección de nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/cheque.html b/mails/es/cheque.html
deleted file mode 100644
index 4d224e2cb..000000000
--- a/mails/es/cheque.html
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/cheque.txt b/mails/es/cheque.txt
deleted file mode 100644
index ed7718569..000000000
--- a/mails/es/cheque.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Le agradecemos por realizar sus compras en {shop_name}!
-
-Su pedido con la referencia {order_name} se ha realizado con
-éxito y será ENVIADO TAN PRONTO COMO RECIBAMOS SU PAGO.
-
-Por favor recuerde que ha seleccionado cheque como forma de pago.
-
-Rellénelo con:
-
-IMPORTE: {total_paid}
-
-PÁGUESE A LA ORDEN DE: {cheque_name}
-
-POR FAVOR ENVÍE EL CHEQUE A: {cheque_address}
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si usted tiene una cuenta de invitado, puede seguir su pedido a
-través del "Tracking Invitado"
-[{guest_tracking_url}] sección de nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/contact.html b/mails/es/contact.html
deleted file mode 100644
index c55eb52f0..000000000
--- a/mails/es/contact.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/contact.txt b/mails/es/contact.txt
deleted file mode 100644
index cfc49aae8..000000000
--- a/mails/es/contact.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Mensaje de un cliente de {shop_name}
-
-DIRECCIÓN DE E-MAIL: {email}
-
-MENSAJE: {message}
-
-ID DEL PEDIDO: {order_name}
-
-ARCHIVO ADJUNTO: {attached_file}
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/contact_form.html b/mails/es/contact_form.html
deleted file mode 100644
index e57068cb8..000000000
--- a/mails/es/contact_form.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/contact_form.txt b/mails/es/contact_form.txt
deleted file mode 100644
index ed058aa89..000000000
--- a/mails/es/contact_form.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Su mensaje al centro de atención al cliente de {shop_name}.
-
-Su mensaje se envio exitósamente.
-
-MENSAJE: {message}
-
-ID DEL PEDIDO: {order_name}
-
-PRODUCTO: {product_name}
-
-ARCHIVO ADJUNTO: {attached_file}
-
-Le responderemos en el menor tiempo posible
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/credit_slip.html b/mails/es/credit_slip.html
deleted file mode 100644
index 19afb20b8..000000000
--- a/mails/es/credit_slip.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/credit_slip.txt b/mails/es/credit_slip.txt
deleted file mode 100644
index e83eeaf7c..000000000
--- a/mails/es/credit_slip.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Hemos generado un crédito a su nombre para el pedido con la
-referencia {order_name}.
-
-Puede revisar este crédito y descargar la factura desde "Mi
-historial de pedidos" [{history_url}] de su cuenta
-haciendo clic "Mi cuenta " [{my_account_url}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/download-product.tpl b/mails/es/download-product.tpl
deleted file mode 100644
index 3ad0101b8..000000000
--- a/mails/es/download-product.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/mails/es/download_product.html b/mails/es/download_product.html
deleted file mode 100644
index 338aac66d..000000000
--- a/mails/es/download_product.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/download_product.txt b/mails/es/download_product.txt
deleted file mode 100644
index c0a226f31..000000000
--- a/mails/es/download_product.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Gracias por su pedido con la referencia {order_name} de {shop_name}
-
-Usted tiene {nbproducts} producto(s) disponibles para su descarga en
-el siguiente enlace(s):
-
-{virtualproducts}
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/employee_password.html b/mails/es/employee_password.html
deleted file mode 100644
index 6d20bdfa1..000000000
--- a/mails/es/employee_password.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/employee_password.txt b/mails/es/employee_password.txt
deleted file mode 100644
index 80306b23b..000000000
--- a/mails/es/employee_password.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Aquí está su información de acceso personal para {shop_name}:
-
-NOMBRE: {firstname}
-
-APELLIDO: {lastname}
-
-CONTRASEÑA: {passwd}
-
-DIRECCIÓN EMAIL: {email}
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/forward_msg.html b/mails/es/forward_msg.html
deleted file mode 100644
index 7c98fa1ad..000000000
--- a/mails/es/forward_msg.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/forward_msg.txt b/mails/es/forward_msg.txt
deleted file mode 100644
index 759cbea8b..000000000
--- a/mails/es/forward_msg.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-{employee} quería enviar este mensaje para usted.
-
-HISTORIAL DE LA CONVERSACIÓN: {messages}
-
-{employee} añadido "{comment}"
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/guest_to_customer.html b/mails/es/guest_to_customer.html
deleted file mode 100644
index 7efb59c24..000000000
--- a/mails/es/guest_to_customer.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/guest_to_customer.txt b/mails/es/guest_to_customer.txt
deleted file mode 100644
index e6a142d2f..000000000
--- a/mails/es/guest_to_customer.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Su cuenta de invitado en {shop_name} se ha transformado en una cuenta
-de cliente.
-
-DIRECCIÓN EMAIL: {email}
-
-CONTRASEÑA: {passwd}
-
-No comparta los detalles de su cuenta con otras personas.
-
-Puede acceder con su cuenta a través de nuestra página web:
-{shop_url}
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/hotel-booking-cart-data.tpl b/mails/es/hotel-booking-cart-data.tpl
deleted file mode 100644
index c79ef93df..000000000
--- a/mails/es/hotel-booking-cart-data.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
- {/foreach}
- {/foreach}
-{/if}
diff --git a/mails/es/hotel-booking-cart-data.txt b/mails/es/hotel-booking-cart-data.txt
deleted file mode 100644
index 33320c2db..000000000
--- a/mails/es/hotel-booking-cart-data.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
-
-
- {$data_v['name']}
-
- {$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'}
-
- {convertPrice price=$data_v['unit_price']}
-
- {$rm_v['num_rm']}
-
- {$rm_v['data_form']|date_format:"%d-%b-%G"}
-
- {$rm_v['data_to']|date_format:"%d-%b-%G"}
-
- {$rm_v['amount']}
-
- {/foreach}
- {/foreach}
-{/if}
-
diff --git a/mails/es/in_transit.html b/mails/es/in_transit.html
deleted file mode 100644
index a9c5868db..000000000
--- a/mails/es/in_transit.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/in_transit.txt b/mails/es/in_transit.txt
deleted file mode 100644
index efffca687..000000000
--- a/mails/es/in_transit.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Su pedido con la referencia {order_name} se encuentra actualmente en
-tránsito.
-
-Para seguir la ubicación actual de su paquete utilice este enlace:
-{followup} [{followup}]
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/lang.php b/mails/es/lang.php
deleted file mode 100644
index 96cedca33..000000000
--- a/mails/es/lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/log_alert.txt b/mails/es/log_alert.txt
deleted file mode 100644
index 0d06a6aae..000000000
--- a/mails/es/log_alert.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-ATENCIÓN: ha recibido un nuevo registro en su Back Office.
-
-Puede comprobarlo en "HERRAMIENTAS"> "REGISTROS" de su Back Office.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/newsletter.html b/mails/es/newsletter.html
deleted file mode 100644
index 2a159d17c..000000000
--- a/mails/es/newsletter.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/newsletter.txt b/mails/es/newsletter.txt
deleted file mode 100644
index 9d656ace1..000000000
--- a/mails/es/newsletter.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-{message}
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/order_canceled.html b/mails/es/order_canceled.html
deleted file mode 100644
index c6b587a2c..000000000
--- a/mails/es/order_canceled.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/order_canceled.txt b/mails/es/order_canceled.txt
deleted file mode 100644
index fed0c4658..000000000
--- a/mails/es/order_canceled.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Su pedido con la referencia {order_name} de {shop_name} ha sido
-cancelado.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/order_changed.html b/mails/es/order_changed.html
deleted file mode 100644
index 2ab013184..000000000
--- a/mails/es/order_changed.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/order_changed.txt b/mails/es/order_changed.txt
deleted file mode 100644
index 1247ca4ff..000000000
--- a/mails/es/order_changed.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Su pedido con la referencia {order_name} de {shop_name} ha sido
-modificado por la tienda.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/order_conf.html b/mails/es/order_conf.html
deleted file mode 100644
index 582e1f831..000000000
--- a/mails/es/order_conf.html
+++ /dev/null
@@ -1,408 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/order_conf.txt b/mails/es/order_conf.txt
deleted file mode 100644
index aa12f7521..000000000
--- a/mails/es/order_conf.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for selecting our hotel!
-
-ORDER: {order_name} Placed on {date}
-
-PAYMENT: {payment}
-
-Room Image
-Room Description
-Room Capcity
-Unit Price
-Rooms Qty
-Check-in Date
-Check-out Date
-Total
-
-{products_txt}
-
-{discounts}
-
-Total Rooms Cost
-
-{total_products}
-
-DISCOUNTS
-
-{total_discounts}
-
-TOTAL TAX PAID
-
-{total_tax_paid}
-
-{adv_data_text}
-
-TOTAL PAID
-
-{total_paid}
-
-CARRIER: {carrier}
-
-PAYMENT: {payment}
-
-{delivery_block_txt}
-
-{invoice_block_txt}
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
\ No newline at end of file
diff --git a/mails/es/order_conf_cart_rules.tpl b/mails/es/order_conf_cart_rules.tpl
deleted file mode 100644
index 742554d72..000000000
--- a/mails/es/order_conf_cart_rules.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{foreach $list as $cart_rule}
-
-{/foreach}
\ No newline at end of file
diff --git a/mails/es/order_conf_cart_rules.txt b/mails/es/order_conf_cart_rules.txt
deleted file mode 100644
index 72a6970da..000000000
--- a/mails/es/order_conf_cart_rules.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{foreach $list as $cart_rule}
- {$cart_rule['voucher_name']} {$cart_rule['voucher_reduction']}
-{/foreach}
\ No newline at end of file
diff --git a/mails/es/order_conf_product_list.tpl b/mails/es/order_conf_product_list.tpl
deleted file mode 100644
index 104b21dbf..000000000
--- a/mails/es/order_conf_product_list.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-{foreach $list as $product}
-
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/es/order_conf_product_list.txt b/mails/es/order_conf_product_list.txt
deleted file mode 100644
index 0ffd7db7a..000000000
--- a/mails/es/order_conf_product_list.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{foreach $list as $product}
- {$product['reference']}
-
- {$product['name']}
-
- {$product['price']}
-
- {$product['quantity']}
-
- {$product['price']}
-
- {foreach $product['customization'] as $customization}
- {$product['name']} {$customization['customization_text']}
-
- {$product['price']}
-
- {$product['customization_quantity']}
-
- {$product['quantity']}
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/es/order_customer_comment.html b/mails/es/order_customer_comment.html
deleted file mode 100644
index 4984d3c83..000000000
--- a/mails/es/order_customer_comment.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/order_customer_comment.txt b/mails/es/order_customer_comment.txt
deleted file mode 100644
index 6796711ac..000000000
--- a/mails/es/order_customer_comment.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Ha recibido un mensaje respecto al pedido con la referencia:
-{order_name}.
-
-CLIENTE: {firstname} {lastname} ({email})
-
-{message}
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/order_merchant_comment.html b/mails/es/order_merchant_comment.html
deleted file mode 100644
index ad133747a..000000000
--- a/mails/es/order_merchant_comment.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/es/order_merchant_comment.txt b/mails/es/order_merchant_comment.txt
deleted file mode 100644
index 83b2cb1b1..000000000
--- a/mails/es/order_merchant_comment.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Ha recibido un nuevo mensaje de {shop_name} en relación al pedido
-con la referencia {order_name}.
-
-MENSAJE: {message}
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/order_return_state.html b/mails/es/order_return_state.html
deleted file mode 100644
index 13d752434..000000000
--- a/mails/es/order_return_state.html
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/order_return_state.txt b/mails/es/order_return_state.txt
deleted file mode 100644
index d0cd3b283..000000000
--- a/mails/es/order_return_state.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-El estado de su devolución #{id_order_return} ha cambiado a
-"{state_order_return}"
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/outofstock.html b/mails/es/outofstock.html
deleted file mode 100644
index 30a211574..000000000
--- a/mails/es/outofstock.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/outofstock.txt b/mails/es/outofstock.txt
deleted file mode 100644
index 1eef72f6e..000000000
--- a/mails/es/outofstock.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Gracias por su pedido con la referencia {order_name} de{shop_name}.
-
-Uno o más productos de su pedido no están en el inventario. Esto
-puede originar un retraso en el envío. Trabajeremos lo más rápido
-posible para solucionarlo. Por favor acepte nuestras disculpas.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/password.html b/mails/es/password.html
deleted file mode 100644
index ec591116c..000000000
--- a/mails/es/password.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/password.txt b/mails/es/password.txt
deleted file mode 100644
index c68b29115..000000000
--- a/mails/es/password.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-DIRECCIÓN EMAIL: {email}
-
-CONTRASEÑA: {passwd}
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/password_query.html b/mails/es/password_query.html
deleted file mode 100644
index 0413c86b9..000000000
--- a/mails/es/password_query.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/password_query.txt b/mails/es/password_query.txt
deleted file mode 100644
index f4a44c808..000000000
--- a/mails/es/password_query.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Ha solicitado reiniciar los accesos de conexión de {shop_name}.
-
-Note que esta acción cambiará su clave actual.
-
-Si usted realmente desea cambiarla, por favor haga clic en este
-enlace:
-
-{url} [{url}]
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/payment.html b/mails/es/payment.html
deleted file mode 100644
index b5322cca4..000000000
--- a/mails/es/payment.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/es/payment.txt b/mails/es/payment.txt
deleted file mode 100644
index b365ff6ae..000000000
--- a/mails/es/payment.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Le agradecemos por realizar sus compras en {shop_name}!
-
-El pago para el pedido y la refencia {order_name} ha sido
-procesado correctamente.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/payment_error.html b/mails/es/payment_error.html
deleted file mode 100644
index fd8d4de2e..000000000
--- a/mails/es/payment_error.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/payment_error.txt b/mails/es/payment_error.txt
deleted file mode 100644
index c0c32dc43..000000000
--- a/mails/es/payment_error.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Hay un problema con el pago del pedido de la tienda {shop_name} para
-la referencia {order_name}. Por favor, contactenos.
-
-AGRADECEMOS SU COMPRENSIÓN.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/preparation.html b/mails/es/preparation.html
deleted file mode 100644
index 9fb6973f2..000000000
--- a/mails/es/preparation.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/preparation.txt b/mails/es/preparation.txt
deleted file mode 100644
index 6709c2df9..000000000
--- a/mails/es/preparation.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Estamos tratando su pedido en {shop_name} con la referencia
-{order_name}.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/refund.html b/mails/es/refund.html
deleted file mode 100644
index 37f074e1b..000000000
--- a/mails/es/refund.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/es/refund.txt b/mails/es/refund.txt
deleted file mode 100644
index e5ce64802..000000000
--- a/mails/es/refund.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Hemos tratado el reembolso de {shop_name} para el pedido con la
-referencia {order_name}.
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-Si tiene una cuenta de invitado, puede seguir su pedido desde la
-sección: "Seguimiento de invitado"
-[{guest_tracking_url}?id_order={order_name}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/reply_msg.html b/mails/es/reply_msg.html
deleted file mode 100644
index 7b829fae6..000000000
--- a/mails/es/reply_msg.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/reply_msg.txt b/mails/es/reply_msg.txt
deleted file mode 100644
index 81ffe3573..000000000
--- a/mails/es/reply_msg.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-{reply}
-
-Por favor, no conteste a este correo electrónico, no recibiremos su
-respuesta.
-
-Si desea contestar, por favor, use el siguiente enlace: {link}
-[{link}]
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/shipped.html b/mails/es/shipped.html
deleted file mode 100644
index 936040190..000000000
--- a/mails/es/shipped.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/shipped.txt b/mails/es/shipped.txt
deleted file mode 100644
index bba94f3ff..000000000
--- a/mails/es/shipped.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Su pedido ha sido enviado
-
-El pedido con la referencia {order_name} ha sido enviado.
-
-Le agradecemos por realizar sus compras en {shop_name}!
-
-Usted puede revisar su pedido y descargar la factura desde
-"Historial de pedidos" [{history_url}] de su cuenta
-de cliente, haga clic en [{my_account_url}] en
-nuestra tienda.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/test.html b/mails/es/test.html
deleted file mode 100644
index c3ba220d3..000000000
--- a/mails/es/test.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/test.txt b/mails/es/test.txt
deleted file mode 100644
index 8962f3cbd..000000000
--- a/mails/es/test.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[{shop_url}]
-
-Hola
-
-Esto es un E-MAIL DE TEST desde su tienda.
-
-Si puede leerlo, es que ¡el test ha sido realizado con éxito!.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/voucher.html b/mails/es/voucher.html
deleted file mode 100644
index 028e5db2e..000000000
--- a/mails/es/voucher.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/voucher.txt b/mails/es/voucher.txt
deleted file mode 100644
index 7617c1170..000000000
--- a/mails/es/voucher.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Se ha creado un vale a su nombre por haber realizado un pedido con la
-referencia {order_name}.
-
-CÓDIGO DEL VALE: {voucher_num} de un montante de {voucher_amount}
-
-Copia y pegue este código durante el proceso de pago de su próxima
-orden.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/es/voucher_new.html b/mails/es/voucher_new.html
deleted file mode 100644
index b71e1516e..000000000
--- a/mails/es/voucher_new.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/es/voucher_new.txt b/mails/es/voucher_new.txt
deleted file mode 100644
index 4c02e2dab..000000000
--- a/mails/es/voucher_new.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hola {firstname} {lastname},
-
-Código del cupón: {voucher_num}
-
-Copia y pegue este código durante el proceso de pago de su próxima
-orden.
-
-{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/account.html b/mails/fr/account.html
deleted file mode 100644
index ecf5a89cc..000000000
--- a/mails/fr/account.html
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/account.txt b/mails/fr/account.txt
deleted file mode 100644
index a9fccfab4..000000000
--- a/mails/fr/account.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Merci d'avoir créé votre compte client sur {shop_name}.
-
-Vos codes d'accès :
-
-ADRESSE E-MAIL : {email}
-
-MOT DE PASSE : {passwd}
-
-Conseils de sécurité importants :
-
-* Vos informations de compte doivent rester confidentielles.
-
-* Ne les communiquez jamais à qui que ce soit.
-
-* Changez votre mot de passe régulièrement.
-
-* Si vous pensez que quelqu'un utilise votre compte illégalement,
-veuillez nous prévenir immédiatement.
-
-Vous pouvez dès à présent passer commande sur notre boutique :
-{shop_name} [{shop_url}]
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/advanced-book-data.tpl b/mails/fr/advanced-book-data.tpl
deleted file mode 100644
index 84ecd5775..000000000
--- a/mails/fr/advanced-book-data.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{if !empty($list)}
-
-{/if}
\ No newline at end of file
diff --git a/mails/fr/advanced-book-data.txt b/mails/fr/advanced-book-data.txt
deleted file mode 100644
index 869c0fd65..000000000
--- a/mails/fr/advanced-book-data.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-{if !empty($list)}
-
-TOTAL PAID
-
-{$list['total_paid_amount']}
-
-TOTAL DUE
-
-{$list['total_due_amount']}
-
-{/if}
\ No newline at end of file
diff --git a/mails/fr/backoffice_order.html b/mails/fr/backoffice_order.html
deleted file mode 100644
index d2e7ad423..000000000
--- a/mails/fr/backoffice_order.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/backoffice_order.txt b/mails/fr/backoffice_order.txt
deleted file mode 100644
index bf1d68550..000000000
--- a/mails/fr/backoffice_order.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Une nouvelle commande a été générée à votre demande.
-
-Veuillez vous rendre sur {order_link} [{order_link}]
-pour finaliser votre paiement.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/bankwire.html b/mails/fr/bankwire.html
deleted file mode 100644
index 577f72394..000000000
--- a/mails/fr/bankwire.html
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/bankwire.txt b/mails/fr/bankwire.txt
deleted file mode 100644
index d6daf74ed..000000000
--- a/mails/fr/bankwire.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Merci d'avoir effectué vos achats sur {shop_name}!
-
-Nous avons bien enregistré votre commande ayant pour référence
-{order_name}. Celle-ci vous sera ENVOYÉE DÈS RÉCEPTION DE VOTRE
-PAIEMENT.
-
-Pour rappel, vous avez sélectionné le mode de paiement par virement
-bancaire.
-
-Voici les informations dont vous avez besoin pour effectuer votre
-virement :
-
-MONTANT : {total_paid}
-
-TITULAIRE DU COMPTE : {bankwire_owner}
-
-DÉTAILS DU COMPTE : {bankwire_details}
-
-ADRESSE DE LA BANQUE : {bankwire_address}
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-via la section "Guest Tracking"
-[{guest_tracking_url}] sur notre boutique.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/cheque.html b/mails/fr/cheque.html
deleted file mode 100644
index 35887a6e5..000000000
--- a/mails/fr/cheque.html
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/cheque.txt b/mails/fr/cheque.txt
deleted file mode 100644
index c97794c1d..000000000
--- a/mails/fr/cheque.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Merci d'avoir effectué vos achats sur {shop_name}!
-
-Nous avons bien enregistré votre commande ayant pour référence
-{order_name}. Celle-ci vous sera ENVOYÉE DÈS RÉCEPTION DE VOTRE
-PAIEMENT.
-
-Vous avez choisi de payer par chèque.
-
-Voici les informations dont vous avez besoin pour effectuer le
-paiement :
-
-MONTANT : {total_paid}
-
-À L'ORDRE DE : {cheque_name}
-
-VEUILLEZ ENVOYER VOTRE CHÈQUE À L'ADRESSE SUIVANTE :
-{cheque_address}
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-via la section "Guest Tracking"
-[{guest_tracking_url}] sur notre boutique.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/contact.html b/mails/fr/contact.html
deleted file mode 100644
index d67d31b7c..000000000
--- a/mails/fr/contact.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/contact.txt b/mails/fr/contact.txt
deleted file mode 100644
index 6176baab3..000000000
--- a/mails/fr/contact.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Message de la part d'un client de {shop_name}
-
-ADRESSE E-MAIL DU CLIENT : {email}
-
-MESSAGE DU CLIENT : {message}
-
-COMMANDE # : {order_name}
-
-PIÈCE JOINTE : {attached_file}
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/contact_form.html b/mails/fr/contact_form.html
deleted file mode 100644
index d4be09ad0..000000000
--- a/mails/fr/contact_form.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/contact_form.txt b/mails/fr/contact_form.txt
deleted file mode 100644
index 7d22b337a..000000000
--- a/mails/fr/contact_form.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Votre message à l'attention du service client de {shop_name}
-
-Votre message a bien été envoyé à notre service client.
-
-MESSAGE : {message}
-
-COMMANDE # : {order_name}
-
-PRODUIT : {product_name}
-
-PIÈCE JOINTE : {attached_file}
-
-Nous vous répondrons dans les meilleurs délais.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/credit_slip.html b/mails/fr/credit_slip.html
deleted file mode 100644
index 9354a63df..000000000
--- a/mails/fr/credit_slip.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/credit_slip.txt b/mails/fr/credit_slip.txt
deleted file mode 100644
index fcfc04478..000000000
--- a/mails/fr/credit_slip.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Nous vous informons de la génération d'un avoir à votre nom
-relatif à votre commande ayant pour référence {order_name}.
-
-Vous pouvez accéder à cet avoir et télécharger votre facture
-dans "Historique des commandes" [{history_url}] de la
-rubrique "Mon compte" [{my_account_url}] sur notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/download-product.tpl b/mails/fr/download-product.tpl
deleted file mode 100644
index 3ad0101b8..000000000
--- a/mails/fr/download-product.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/mails/fr/download_product.html b/mails/fr/download_product.html
deleted file mode 100644
index 0c83e299e..000000000
--- a/mails/fr/download_product.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/download_product.txt b/mails/fr/download_product.txt
deleted file mode 100644
index 0b4ea13ec..000000000
--- a/mails/fr/download_product.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Merci pour votre commande portant la référence {order_name} sur
-{shop_name}
-
-Vous avez {nbproducts} produit(s) à télécharger.
-
-{virtualproducts}
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/employee_password.html b/mails/fr/employee_password.html
deleted file mode 100644
index 15224e0fe..000000000
--- a/mails/fr/employee_password.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/employee_password.txt b/mails/fr/employee_password.txt
deleted file mode 100644
index 5c757b4c3..000000000
--- a/mails/fr/employee_password.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Voici vos informations d'identification sur {shop_name} :
-
-PRÉNOM : {firstname}
-
-NOM : {lastname}
-
-MOT DE PASSE : {passwd}
-
-ADRESSE E-MAIL : {email}
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/forward_msg.html b/mails/fr/forward_msg.html
deleted file mode 100644
index e43196e87..000000000
--- a/mails/fr/forward_msg.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/forward_msg.txt b/mails/fr/forward_msg.txt
deleted file mode 100644
index b0d336e4e..000000000
--- a/mails/fr/forward_msg.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-{employee} souhaite vous transférer cette discussion.
-
-HISTORIQUE DE LA DISCUSSION : {messages}
-
-{employee} a ajouté "{comment}"
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/guest_to_customer.html b/mails/fr/guest_to_customer.html
deleted file mode 100644
index a92b253c5..000000000
--- a/mails/fr/guest_to_customer.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/guest_to_customer.txt b/mails/fr/guest_to_customer.txt
deleted file mode 100644
index bf8f8b4d4..000000000
--- a/mails/fr/guest_to_customer.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Votre compte invité sur {shop_name} a été transformé en compte
-client.
-
-ADRESSE E-MAIL : {email}
-
-MOT DE PASSE : {passwd}
-
-Conservez ces informations confidentielles.
-
-Vous pouvez accéder à votre compte sur notre site Internet :
-{shop_url}
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/hotel-booking-cart-data.tpl b/mails/fr/hotel-booking-cart-data.tpl
deleted file mode 100644
index c79ef93df..000000000
--- a/mails/fr/hotel-booking-cart-data.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
- {/foreach}
- {/foreach}
-{/if}
diff --git a/mails/fr/hotel-booking-cart-data.txt b/mails/fr/hotel-booking-cart-data.txt
deleted file mode 100644
index 33320c2db..000000000
--- a/mails/fr/hotel-booking-cart-data.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
-
-
- {$data_v['name']}
-
- {$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'}
-
- {convertPrice price=$data_v['unit_price']}
-
- {$rm_v['num_rm']}
-
- {$rm_v['data_form']|date_format:"%d-%b-%G"}
-
- {$rm_v['data_to']|date_format:"%d-%b-%G"}
-
- {$rm_v['amount']}
-
- {/foreach}
- {/foreach}
-{/if}
-
diff --git a/mails/fr/in_transit.html b/mails/fr/in_transit.html
deleted file mode 100644
index 4e1dbb3e1..000000000
--- a/mails/fr/in_transit.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/in_transit.txt b/mails/fr/in_transit.txt
deleted file mode 100644
index 5a50d3256..000000000
--- a/mails/fr/in_transit.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-La livraison de votre commande ayant pour référence {order_name}
-est en cours.
-
-Vous pouvez suivre la progression de votre livraison à l'adresse
-suivante: {followup} [{followup}]
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/lang.php b/mails/fr/lang.php
deleted file mode 100644
index 3e4cd6b76..000000000
--- a/mails/fr/lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/log_alert.txt b/mails/fr/log_alert.txt
deleted file mode 100644
index 3ac0d618a..000000000
--- a/mails/fr/log_alert.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-ATTENTION : vous avez reçu un nouveau message d'alerte dans votre
-Back-Office.
-
-Vous pouvez voir ce message dans votre Panneau d'administration dans
-OUTILS > LOG.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/newsletter.html b/mails/fr/newsletter.html
deleted file mode 100644
index 0755f147c..000000000
--- a/mails/fr/newsletter.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/newsletter.txt b/mails/fr/newsletter.txt
deleted file mode 100644
index d3135c8f4..000000000
--- a/mails/fr/newsletter.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-{message}
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/order_canceled.html b/mails/fr/order_canceled.html
deleted file mode 100644
index 7b06ab3d6..000000000
--- a/mails/fr/order_canceled.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/order_canceled.txt b/mails/fr/order_canceled.txt
deleted file mode 100644
index 0bde0b729..000000000
--- a/mails/fr/order_canceled.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Votre commande sur {shop_name} ayant pour référence {order_name}
-a été annulée.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/order_changed.html b/mails/fr/order_changed.html
deleted file mode 100644
index 0cb7bc8c4..000000000
--- a/mails/fr/order_changed.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/order_changed.txt b/mails/fr/order_changed.txt
deleted file mode 100644
index e918a5c54..000000000
--- a/mails/fr/order_changed.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Votre commande sur {shop_name} ayant pour référence {order_name}
-a été modifiée par le marchand.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/order_conf.html b/mails/fr/order_conf.html
deleted file mode 100644
index 582e1f831..000000000
--- a/mails/fr/order_conf.html
+++ /dev/null
@@ -1,408 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/order_conf.txt b/mails/fr/order_conf.txt
deleted file mode 100644
index aa12f7521..000000000
--- a/mails/fr/order_conf.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for selecting our hotel!
-
-ORDER: {order_name} Placed on {date}
-
-PAYMENT: {payment}
-
-Room Image
-Room Description
-Room Capcity
-Unit Price
-Rooms Qty
-Check-in Date
-Check-out Date
-Total
-
-{products_txt}
-
-{discounts}
-
-Total Rooms Cost
-
-{total_products}
-
-DISCOUNTS
-
-{total_discounts}
-
-TOTAL TAX PAID
-
-{total_tax_paid}
-
-{adv_data_text}
-
-TOTAL PAID
-
-{total_paid}
-
-CARRIER: {carrier}
-
-PAYMENT: {payment}
-
-{delivery_block_txt}
-
-{invoice_block_txt}
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
\ No newline at end of file
diff --git a/mails/fr/order_conf_cart_rules.tpl b/mails/fr/order_conf_cart_rules.tpl
deleted file mode 100644
index 742554d72..000000000
--- a/mails/fr/order_conf_cart_rules.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{foreach $list as $cart_rule}
-
-{/foreach}
\ No newline at end of file
diff --git a/mails/fr/order_conf_cart_rules.txt b/mails/fr/order_conf_cart_rules.txt
deleted file mode 100644
index 72a6970da..000000000
--- a/mails/fr/order_conf_cart_rules.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{foreach $list as $cart_rule}
- {$cart_rule['voucher_name']} {$cart_rule['voucher_reduction']}
-{/foreach}
\ No newline at end of file
diff --git a/mails/fr/order_conf_product_list.tpl b/mails/fr/order_conf_product_list.tpl
deleted file mode 100644
index 104b21dbf..000000000
--- a/mails/fr/order_conf_product_list.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-{foreach $list as $product}
-
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/fr/order_conf_product_list.txt b/mails/fr/order_conf_product_list.txt
deleted file mode 100644
index 0ffd7db7a..000000000
--- a/mails/fr/order_conf_product_list.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{foreach $list as $product}
- {$product['reference']}
-
- {$product['name']}
-
- {$product['price']}
-
- {$product['quantity']}
-
- {$product['price']}
-
- {foreach $product['customization'] as $customization}
- {$product['name']} {$customization['customization_text']}
-
- {$product['price']}
-
- {$product['customization_quantity']}
-
- {$product['quantity']}
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/fr/order_customer_comment.html b/mails/fr/order_customer_comment.html
deleted file mode 100644
index 405c0ad94..000000000
--- a/mails/fr/order_customer_comment.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/order_customer_comment.txt b/mails/fr/order_customer_comment.txt
deleted file mode 100644
index 5f753d76d..000000000
--- a/mails/fr/order_customer_comment.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Vous avez reçu un nouveau message concernant la commande ayant pour
-référence : {order_name}.
-
-CLIENT : {firstname} {lastname} ({email})
-
-{message}
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/order_merchant_comment.html b/mails/fr/order_merchant_comment.html
deleted file mode 100644
index 2e08a3e15..000000000
--- a/mails/fr/order_merchant_comment.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/fr/order_merchant_comment.txt b/mails/fr/order_merchant_comment.txt
deleted file mode 100644
index 216bfad1b..000000000
--- a/mails/fr/order_merchant_comment.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Vous avez reçu un nouveau message de {shop_name} concernant la
-commande ayant pour référence {order_name}.
-
-MESSAGE : {message}
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/order_return_state.html b/mails/fr/order_return_state.html
deleted file mode 100644
index 3e0a7665f..000000000
--- a/mails/fr/order_return_state.html
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/order_return_state.txt b/mails/fr/order_return_state.txt
deleted file mode 100644
index 67d73214a..000000000
--- a/mails/fr/order_return_state.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Votre bon de retour #{id_order_return} est passé à l'état :
-"{state_order_return}"
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/outofstock.html b/mails/fr/outofstock.html
deleted file mode 100644
index 3ef642946..000000000
--- a/mails/fr/outofstock.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/outofstock.txt b/mails/fr/outofstock.txt
deleted file mode 100644
index f07abfeb7..000000000
--- a/mails/fr/outofstock.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Merci pour votre commande ayant pour référence {order_name} sur
-{shop_name}
-
-Malheureusement, un ou plusieurs des produits que vous avez
-commandés sont actuellement en rupture de stock. Ceci peut entraîner
-un léger retard de livraison. Veuillez nous excuser pour ce délai et
-soyez assurés que nous faisons nos meilleurs efforts pour rectifier
-la situation rapidement.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/password.html b/mails/fr/password.html
deleted file mode 100644
index f377f287c..000000000
--- a/mails/fr/password.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/password.txt b/mails/fr/password.txt
deleted file mode 100644
index 444315e9e..000000000
--- a/mails/fr/password.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-ADRESSE E-MAIL : {email}
-
-MOT DE PASSE : {passwd}
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/password_query.html b/mails/fr/password_query.html
deleted file mode 100644
index 1fdd1dae3..000000000
--- a/mails/fr/password_query.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/password_query.txt b/mails/fr/password_query.txt
deleted file mode 100644
index 4c5dc2023..000000000
--- a/mails/fr/password_query.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Vous avez demandé à récupérer vos codes d'accès sur {shop_name}.
-
-Cette opération vous attribuera un nouveau mot de passe.
-
-Si vous souhaitez confirmer cette demande, cliquez sur le lien
-suivant :
-
-{url} [{url}]
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/payment.html b/mails/fr/payment.html
deleted file mode 100644
index 82dd9100a..000000000
--- a/mails/fr/payment.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/fr/payment.txt b/mails/fr/payment.txt
deleted file mode 100644
index ef0320c48..000000000
--- a/mails/fr/payment.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Merci d'avoir effectué vos achats sur {shop_name}!
-
-Le paiement pour votre commande ayant pour référence
-{order_name} a été accepté.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/payment_error.html b/mails/fr/payment_error.html
deleted file mode 100644
index 9ff05834a..000000000
--- a/mails/fr/payment_error.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/payment_error.txt b/mails/fr/payment_error.txt
deleted file mode 100644
index 5a3ec2563..000000000
--- a/mails/fr/payment_error.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Un problème a été constaté pour le paiement de votre commande sur
-{shop_name} ayant pour référence {order_name}. Veuillez nous
-contacter le plus rapidement possible.
-
-NOUS NE POUVONS MALHEUREUSEMENT PAS EXPÉDIER VOTRE COMMANDE TANT QUE
-NOUS N'AVONS PAS REÇU VOTRE PAIEMENT.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/preparation.html b/mails/fr/preparation.html
deleted file mode 100644
index 063e94fa1..000000000
--- a/mails/fr/preparation.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/preparation.txt b/mails/fr/preparation.txt
deleted file mode 100644
index 04c5ec2c6..000000000
--- a/mails/fr/preparation.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Votre commande sur {shop_name} ayant pour référence {order_name}
-est en cours de préparation.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/refund.html b/mails/fr/refund.html
deleted file mode 100644
index dacc8a684..000000000
--- a/mails/fr/refund.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/fr/refund.txt b/mails/fr/refund.txt
deleted file mode 100644
index f053d4ddc..000000000
--- a/mails/fr/refund.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Nous avons procédé au remboursement de votre commande sur
-{shop_name} portant la référence {order_name}.
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-Si vous avez un compte invité, vous pouvez suivre votre commande
-dans la section "Suivi invité"
-[{guest_tracking_url}?id_order={order_name}] de notre
-site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/reply_msg.html b/mails/fr/reply_msg.html
deleted file mode 100644
index 7184cdaed..000000000
--- a/mails/fr/reply_msg.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/reply_msg.txt b/mails/fr/reply_msg.txt
deleted file mode 100644
index 3b30ff6ff..000000000
--- a/mails/fr/reply_msg.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-{reply}
-
-Veuillez ne pas répondre directement à ce message, nous ne
-recevrons pas votre réponse.
-
-Pour répondre, veuillez utiliser le lien suivant : {link}
-[{link}]
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/shipped.html b/mails/fr/shipped.html
deleted file mode 100644
index 20cc40885..000000000
--- a/mails/fr/shipped.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/shipped.txt b/mails/fr/shipped.txt
deleted file mode 100644
index 5a4d30be7..000000000
--- a/mails/fr/shipped.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Votre commande a été expédiée
-
-Votre commande ayant la référence {order_name} vient d'être
-expédiée.
-
-Merci d'avoir effectué vos achats sur {shop_name}!
-
-Vous pouvez accéder à tout moment au suivi de votre commande et
-télécharger votre facture dans "Historique des commandes"
-[{history_url}] de la rubrique "Mon compte"
-[{my_account_url}] sur notre site.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/test.html b/mails/fr/test.html
deleted file mode 100644
index 1095b1dca..000000000
--- a/mails/fr/test.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/test.txt b/mails/fr/test.txt
deleted file mode 100644
index 77aac01cf..000000000
--- a/mails/fr/test.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[{shop_url}]
-
-Bonjour
-
-Voici un E-MAIL de test de votre boutique.
-
-Si vous parvenez à lire ceci, le test a réussi!.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/voucher.html b/mails/fr/voucher.html
deleted file mode 100644
index 91d0fc002..000000000
--- a/mails/fr/voucher.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/voucher.txt b/mails/fr/voucher.txt
deleted file mode 100644
index ec9b2d6d5..000000000
--- a/mails/fr/voucher.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Nous vous informons de la génération d'un bon de réduction à
-votre nom relatif à votre commande ayant pour référence
-{order_name}.
-
-CODE DU BON DE RÉDUCTION : {voucher_num} Montant: {voucher_amount}
-
-Copiez-collez ce numéro dans le panier de votre prochain achat avant
-de régler la commande.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/fr/voucher_new.html b/mails/fr/voucher_new.html
deleted file mode 100644
index b32e54220..000000000
--- a/mails/fr/voucher_new.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/fr/voucher_new.txt b/mails/fr/voucher_new.txt
deleted file mode 100644
index 7c9420afa..000000000
--- a/mails/fr/voucher_new.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Bonjour {firstname} {lastname},
-
-Voici le numéro de votre bon de réduction : {voucher_num}
-
-Copiez-collez ce numéro dans le panier de votre prochain achat avant
-de régler la commande.
-
-{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/account.html b/mails/gl/account.html
deleted file mode 100644
index ae0339eab..000000000
--- a/mails/gl/account.html
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/account.txt b/mails/gl/account.txt
deleted file mode 100644
index c8c84d8cd..000000000
--- a/mails/gl/account.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for creating a customer account at {shop_name}.
-
-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}
-[{shop_url}]
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/backoffice_order.html b/mails/gl/backoffice_order.html
deleted file mode 100644
index 3f60829fb..000000000
--- a/mails/gl/backoffice_order.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/backoffice_order.txt b/mails/gl/backoffice_order.txt
deleted file mode 100644
index 4c2acca96..000000000
--- a/mails/gl/backoffice_order.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-A new order has been generated on your behalf.
-
-Please go on {order_link} [{order_link}] to finalize
-the payment.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/bankwire.html b/mails/gl/bankwire.html
deleted file mode 100644
index 4a074d3fc..000000000
--- a/mails/gl/bankwire.html
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/bankwire.txt b/mails/gl/bankwire.txt
deleted file mode 100644
index 324fb5e16..000000000
--- a/mails/gl/bankwire.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for shopping with {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 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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking" [{guest_tracking_url}] section on
-our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/cheque.html b/mails/gl/cheque.html
deleted file mode 100644
index b5b19154f..000000000
--- a/mails/gl/cheque.html
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/cheque.txt b/mails/gl/cheque.txt
deleted file mode 100644
index 38d7768b4..000000000
--- a/mails/gl/cheque.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for shopping with {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.
-
-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}
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking" [{guest_tracking_url}] section on
-our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/contact.html b/mails/gl/contact.html
deleted file mode 100644
index 7ab0dd683..000000000
--- a/mails/gl/contact.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/contact.txt b/mails/gl/contact.txt
deleted file mode 100644
index 1c8edb415..000000000
--- a/mails/gl/contact.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Message from a {shop_name} customer
-
-CUSTOMER E-MAIL ADDRESS: {email}
-
-CUSTOMER MESSAGE: {message}
-
-ORDER ID: {order_name}
-
-ATTACHED FILE: {attached_file}
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/contact_form.html b/mails/gl/contact_form.html
deleted file mode 100644
index 6a8f1bbc1..000000000
--- a/mails/gl/contact_form.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/contact_form.txt b/mails/gl/contact_form.txt
deleted file mode 100644
index e04cf8351..000000000
--- a/mails/gl/contact_form.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-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} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/credit_slip.txt b/mails/gl/credit_slip.txt
deleted file mode 100644
index 1e782d95f..000000000
--- a/mails/gl/credit_slip.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-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" [{history_url}] section of your
-account by clicking "My account" [{my_account_url}]
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/download-product.tpl b/mails/gl/download-product.tpl
deleted file mode 100644
index 3ad0101b8..000000000
--- a/mails/gl/download-product.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/mails/gl/download_product.html b/mails/gl/download_product.html
deleted file mode 100644
index 0bc2c75cc..000000000
--- a/mails/gl/download_product.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/download_product.txt b/mails/gl/download_product.txt
deleted file mode 100644
index a7560f92f..000000000
--- a/mails/gl/download_product.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for your order with the reference {order_name} 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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/employee_password.html b/mails/gl/employee_password.html
deleted file mode 100644
index 56cc7b178..000000000
--- a/mails/gl/employee_password.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/employee_password.txt b/mails/gl/employee_password.txt
deleted file mode 100644
index 5871c1243..000000000
--- a/mails/gl/employee_password.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[{shop_url}]
-
-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}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/forward_msg.html b/mails/gl/forward_msg.html
deleted file mode 100644
index b4713239e..000000000
--- a/mails/gl/forward_msg.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/forward_msg.txt b/mails/gl/forward_msg.txt
deleted file mode 100644
index abd4ced81..000000000
--- a/mails/gl/forward_msg.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-{employee} wanted to forward this discussion to you.
-
-DISCUSSION HISTORY: {messages}
-
-{employee} added "{comment}"
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/guest_to_customer.html b/mails/gl/guest_to_customer.html
deleted file mode 100644
index bdfeab5cc..000000000
--- a/mails/gl/guest_to_customer.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/guest_to_customer.txt b/mails/gl/guest_to_customer.txt
deleted file mode 100644
index fd6816d26..000000000
--- a/mails/gl/guest_to_customer.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-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} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/hotel-booking-cart-data.tpl b/mails/gl/hotel-booking-cart-data.tpl
deleted file mode 100644
index c79ef93df..000000000
--- a/mails/gl/hotel-booking-cart-data.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
- {/foreach}
- {/foreach}
-{/if}
diff --git a/mails/gl/hotel-booking-cart-data.txt b/mails/gl/hotel-booking-cart-data.txt
deleted file mode 100644
index 33320c2db..000000000
--- a/mails/gl/hotel-booking-cart-data.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
-
-
- {$data_v['name']}
-
- {$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'}
-
- {convertPrice price=$data_v['unit_price']}
-
- {$rm_v['num_rm']}
-
- {$rm_v['data_form']|date_format:"%d-%b-%G"}
-
- {$rm_v['data_to']|date_format:"%d-%b-%G"}
-
- {$rm_v['amount']}
-
- {/foreach}
- {/foreach}
-{/if}
-
diff --git a/mails/gl/in_transit.html b/mails/gl/in_transit.html
deleted file mode 100644
index 3876b616e..000000000
--- a/mails/gl/in_transit.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/in_transit.txt b/mails/gl/in_transit.txt
deleted file mode 100644
index f5df19c2b..000000000
--- a/mails/gl/in_transit.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Your order with the reference {order_name} is currently in transit.
-
-You can track your package using the following link: {followup}
-[{followup}]
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/lang.php b/mails/gl/lang.php
deleted file mode 100644
index 4467a48ec..000000000
--- a/mails/gl/lang.php
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/log_alert.txt b/mails/gl/log_alert.txt
deleted file mode 100644
index 81724f53c..000000000
--- a/mails/gl/log_alert.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-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}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/newsletter.html b/mails/gl/newsletter.html
deleted file mode 100644
index 180aa9171..000000000
--- a/mails/gl/newsletter.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/newsletter.txt b/mails/gl/newsletter.txt
deleted file mode 100644
index c2462b284..000000000
--- a/mails/gl/newsletter.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-{message}
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/order_canceled.html b/mails/gl/order_canceled.html
deleted file mode 100644
index a654fcb18..000000000
--- a/mails/gl/order_canceled.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/order_canceled.txt b/mails/gl/order_canceled.txt
deleted file mode 100644
index b55806737..000000000
--- a/mails/gl/order_canceled.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Your order with the reference {order_name} from {shop_name} has
-been canceled.
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/order_changed.html b/mails/gl/order_changed.html
deleted file mode 100644
index 0015987f9..000000000
--- a/mails/gl/order_changed.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/order_changed.txt b/mails/gl/order_changed.txt
deleted file mode 100644
index 57d4eb432..000000000
--- a/mails/gl/order_changed.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/order_conf.html b/mails/gl/order_conf.html
deleted file mode 100644
index 582e1f831..000000000
--- a/mails/gl/order_conf.html
+++ /dev/null
@@ -1,408 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/order_conf.txt b/mails/gl/order_conf.txt
deleted file mode 100644
index aa12f7521..000000000
--- a/mails/gl/order_conf.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for selecting our hotel!
-
-ORDER: {order_name} Placed on {date}
-
-PAYMENT: {payment}
-
-Room Image
-Room Description
-Room Capcity
-Unit Price
-Rooms Qty
-Check-in Date
-Check-out Date
-Total
-
-{products_txt}
-
-{discounts}
-
-Total Rooms Cost
-
-{total_products}
-
-DISCOUNTS
-
-{total_discounts}
-
-TOTAL TAX PAID
-
-{total_tax_paid}
-
-{adv_data_text}
-
-TOTAL PAID
-
-{total_paid}
-
-CARRIER: {carrier}
-
-PAYMENT: {payment}
-
-{delivery_block_txt}
-
-{invoice_block_txt}
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
\ No newline at end of file
diff --git a/mails/gl/order_conf_cart_rules.tpl b/mails/gl/order_conf_cart_rules.tpl
deleted file mode 100644
index 742554d72..000000000
--- a/mails/gl/order_conf_cart_rules.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{foreach $list as $cart_rule}
-
-{/foreach}
\ No newline at end of file
diff --git a/mails/gl/order_conf_cart_rules.txt b/mails/gl/order_conf_cart_rules.txt
deleted file mode 100644
index 72a6970da..000000000
--- a/mails/gl/order_conf_cart_rules.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{foreach $list as $cart_rule}
- {$cart_rule['voucher_name']} {$cart_rule['voucher_reduction']}
-{/foreach}
\ No newline at end of file
diff --git a/mails/gl/order_conf_product_list.tpl b/mails/gl/order_conf_product_list.tpl
deleted file mode 100644
index 104b21dbf..000000000
--- a/mails/gl/order_conf_product_list.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-{foreach $list as $product}
-
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/gl/order_conf_product_list.txt b/mails/gl/order_conf_product_list.txt
deleted file mode 100644
index 0ffd7db7a..000000000
--- a/mails/gl/order_conf_product_list.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{foreach $list as $product}
- {$product['reference']}
-
- {$product['name']}
-
- {$product['price']}
-
- {$product['quantity']}
-
- {$product['price']}
-
- {foreach $product['customization'] as $customization}
- {$product['name']} {$customization['customization_text']}
-
- {$product['price']}
-
- {$product['customization_quantity']}
-
- {$product['quantity']}
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/gl/order_customer_comment.html b/mails/gl/order_customer_comment.html
deleted file mode 100644
index 6ea8d0cae..000000000
--- a/mails/gl/order_customer_comment.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/order_customer_comment.txt b/mails/gl/order_customer_comment.txt
deleted file mode 100644
index fb58f272d..000000000
--- a/mails/gl/order_customer_comment.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-You have received a new message regarding order with the reference
-{order_name}.
-
-CUSTOMER: {firstname} {lastname} ({email})
-
-{message}
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/order_merchant_comment.html b/mails/gl/order_merchant_comment.html
deleted file mode 100644
index 742631264..000000000
--- a/mails/gl/order_merchant_comment.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/gl/order_merchant_comment.txt b/mails/gl/order_merchant_comment.txt
deleted file mode 100644
index 5d98d6332..000000000
--- a/mails/gl/order_merchant_comment.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-You have received a new message from {shop_name} regarding order with
-the reference {order_name}.
-
-MESSAGE: {message}
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/order_return_state.txt b/mails/gl/order_return_state.txt
deleted file mode 100644
index 1e67d9d03..000000000
--- a/mails/gl/order_return_state.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/outofstock.html b/mails/gl/outofstock.html
deleted file mode 100644
index 0d3bde267..000000000
--- a/mails/gl/outofstock.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/outofstock.txt b/mails/gl/outofstock.txt
deleted file mode 100644
index 9d02b4f49..000000000
--- a/mails/gl/outofstock.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/password.html b/mails/gl/password.html
deleted file mode 100644
index 5bad06899..000000000
--- a/mails/gl/password.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/password.txt b/mails/gl/password.txt
deleted file mode 100644
index 51994c849..000000000
--- a/mails/gl/password.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-E-MAIL ADDRESS: {email}
-
-PASSWORD: {passwd}
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/password_query.html b/mails/gl/password_query.html
deleted file mode 100644
index eae4b2634..000000000
--- a/mails/gl/password_query.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/password_query.txt b/mails/gl/password_query.txt
deleted file mode 100644
index caf9fa5fd..000000000
--- a/mails/gl/password_query.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-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} [{url}]
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/payment.html b/mails/gl/payment.html
deleted file mode 100644
index 2ce07ad59..000000000
--- a/mails/gl/payment.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/gl/payment.txt b/mails/gl/payment.txt
deleted file mode 100644
index 12a467363..000000000
--- a/mails/gl/payment.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/payment_error.html b/mails/gl/payment_error.html
deleted file mode 100644
index 2451cedf5..000000000
--- a/mails/gl/payment_error.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/payment_error.txt b/mails/gl/payment_error.txt
deleted file mode 100644
index 11d1a7cd1..000000000
--- a/mails/gl/payment_error.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/preparation.html b/mails/gl/preparation.html
deleted file mode 100644
index 6a6897a82..000000000
--- a/mails/gl/preparation.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/preparation.txt b/mails/gl/preparation.txt
deleted file mode 100644
index ff3f62e24..000000000
--- a/mails/gl/preparation.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/refund.html b/mails/gl/refund.html
deleted file mode 100644
index 72aa955cf..000000000
--- a/mails/gl/refund.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/gl/refund.txt b/mails/gl/refund.txt
deleted file mode 100644
index 9f42f6a1f..000000000
--- a/mails/gl/refund.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-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" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/reply_msg.html b/mails/gl/reply_msg.html
deleted file mode 100644
index f2eb1bfa6..000000000
--- a/mails/gl/reply_msg.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/reply_msg.txt b/mails/gl/reply_msg.txt
deleted file mode 100644
index 7539aa540..000000000
--- a/mails/gl/reply_msg.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-{reply}
-
-Please do not reply directly to this email, we will not receive it.
-
-In order to reply, please use the following link: {link}
-[{link}]
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/shipped.html b/mails/gl/shipped.html
deleted file mode 100644
index 1c4ce1132..000000000
--- a/mails/gl/shipped.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/shipped.txt b/mails/gl/shipped.txt
deleted file mode 100644
index 78f3bc5ef..000000000
--- a/mails/gl/shipped.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Your order has been shipped
-
-Your order with the reference {order_name} has been shipped.
-
-Thank you for shopping with {shop_name}!
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/test.html b/mails/gl/test.html
deleted file mode 100644
index e2c9cc073..000000000
--- a/mails/gl/test.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/test.txt b/mails/gl/test.txt
deleted file mode 100644
index a3fc61534..000000000
--- a/mails/gl/test.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[{shop_url}]
-
-Hello
-
-This is a TEST E-MAIL from your shop.
-
-If you can read this, the test was successful!.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/voucher.html b/mails/gl/voucher.html
deleted file mode 100644
index 6ed347678..000000000
--- a/mails/gl/voucher.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/voucher.txt b/mails/gl/voucher.txt
deleted file mode 100644
index d548df8f1..000000000
--- a/mails/gl/voucher.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-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.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/gl/voucher_new.html b/mails/gl/voucher_new.html
deleted file mode 100644
index 3db8269c6..000000000
--- a/mails/gl/voucher_new.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/gl/voucher_new.txt b/mails/gl/voucher_new.txt
deleted file mode 100644
index f32c3ab4a..000000000
--- a/mails/gl/voucher_new.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Here is the code of your voucher: {voucher_num}
-
-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/mails/nl/account.html b/mails/nl/account.html
deleted file mode 100644
index 6df2077c0..000000000
--- a/mails/nl/account.html
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/account.txt b/mails/nl/account.txt
deleted file mode 100644
index 8e641d0e3..000000000
--- a/mails/nl/account.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Bedankt voor het aanmaken van uw klantaccount bij {shop_name}.
-
-Hier zijn uw aanmeldgegevens
-
-E-MAILADRES: {email}
-
-WACHTWOORD: {passwd}
-
-Belangrijke veiligheidstips
-
-* Bewaar uw accountgegevens op een veilige plaats.
-
-* Verstrek uw aanmeldgegevens nooit aan derden.
-
-* Wijzig uw wachtwoord regelmatig.
-
-* Als u vermoedt dat iemand anders uw account illegaal gebruikt,
-neem dan onmiddellijk contact met ons op.
-
-U kunt nu bestellingen op onze website plaatsen: {shop_name}
-[{shop_url}]
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/backoffice_order.html b/mails/nl/backoffice_order.html
deleted file mode 100644
index c679d2fcd..000000000
--- a/mails/nl/backoffice_order.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/backoffice_order.txt b/mails/nl/backoffice_order.txt
deleted file mode 100644
index 664c810ca..000000000
--- a/mails/nl/backoffice_order.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Een nieuwe bestelling is voor u aangemaakt.
-
-Ga naar: {order_link} [{order_link}] om uw betaling
-af te ronden.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/bankwire.html b/mails/nl/bankwire.html
deleted file mode 100644
index 155ba58bc..000000000
--- a/mails/nl/bankwire.html
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/bankwire.txt b/mails/nl/bankwire.txt
deleted file mode 100644
index 1213bc719..000000000
--- a/mails/nl/bankwire.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Bedankt voor het winkelen bij {shop_name}!
-
-Uw bestelling met referentie nr. {order_name} is succesvol
-geplaatst EN WORDT VERZONDEN NA ONTVANGST VAN UW BETALING.
-
-U heeft gekozen om via een bankoverschrijving te betalen.
-
-Gebruik hiervoor de volgende gegevens:
-
-BEDRAG: {total_paid}
-
-TEN NAME VAN: {bankwire_owner}
-
-REKENINGGEGEVENS: {bankwire_details}
-
-BANKGEGEVENS: {bankwire_address}
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Met een gastaccount kunt u de bestelling volgen via "Bestelling
-volgen" [{guest_tracking_url}] in onze webshop.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/cheque.html b/mails/nl/cheque.html
deleted file mode 100644
index 7e704a4b1..000000000
--- a/mails/nl/cheque.html
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/cheque.txt b/mails/nl/cheque.txt
deleted file mode 100644
index 330907b87..000000000
--- a/mails/nl/cheque.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Bedankt voor het winkelen bij {shop_name}!
-
-Uw bestelling met referentie nr. {order_name} is succesvol
-geplaatst EN WORDT VERZONDEN NA ONTVANGST VAN UW BETALING.
-
-U heeft gekozen om via een cheque te betalen.
-
-Gebruik hiervoor de volgende gegevens:
-
-BEDRAG: {total_paid}
-
-TOTAALBEDRAG BESTELLING: {cheque_name}
-
-VERSCHULDIGD I.V.M. EEN BESTELLING AAN: {cheque_address}
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Met een gastaccount kunt u de bestelling volgen via "Bestelling
-volgen" [{guest_tracking_url}] in onze webshop.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/contact.html b/mails/nl/contact.html
deleted file mode 100644
index 56884771d..000000000
--- a/mails/nl/contact.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/contact.txt b/mails/nl/contact.txt
deleted file mode 100644
index 1af262e90..000000000
--- a/mails/nl/contact.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Bericht van een {shop_name} klant
-
-KLANT E-MAILADRES: {email}
-
-KLANT BERICHT: {message}
-
-ORDER NUMMER: {order_name}
-
-BIJLAGE: {attached_file}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/contact_form.html b/mails/nl/contact_form.html
deleted file mode 100644
index 332518ab4..000000000
--- a/mails/nl/contact_form.html
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/contact_form.txt b/mails/nl/contact_form.txt
deleted file mode 100644
index a7a204708..000000000
--- a/mails/nl/contact_form.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Uw bericht is succesvol verzonden aan {shop_name} klantenservice.
-
-Uw bericht is succesvol verzonden.
-
-BERICHT: {message}
-
-ORDER NUMMER: {order_name}
-
-PRODUCT: {product_name}
-
-BIJLAGE: {attached_file}
-
-We zullen zo spoedig mogelijk antwoorden.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/credit_slip.txt b/mails/nl/credit_slip.txt
deleted file mode 100644
index 7eecbaf3d..000000000
--- a/mails/nl/credit_slip.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Voor uw bestelling met nummer {order_name} hebben we een
-creditnota aangemaakt.
-
-U kunt uw creditnota bekijken en downloaden via "Mijn
-creditnota's" [{history_url}] in het "Mijn account"
-[{my_account_url}] gedeelte in onze webshop.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/download-product.tpl b/mails/nl/download-product.tpl
deleted file mode 100644
index 3ad0101b8..000000000
--- a/mails/nl/download-product.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/mails/nl/download_product.html b/mails/nl/download_product.html
deleted file mode 100644
index 2d7206c7d..000000000
--- a/mails/nl/download_product.html
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/download_product.txt b/mails/nl/download_product.txt
deleted file mode 100644
index 0c9931c5c..000000000
--- a/mails/nl/download_product.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Bedankt voor uw bestelling {order_name} op {shop_name}
-
-{nbproducts} product(en) beschikbaar om te downloaden via de volgende
-link(s):
-
-{virtualproducts}
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/employee_password.html b/mails/nl/employee_password.html
deleted file mode 100644
index f440d67e3..000000000
--- a/mails/nl/employee_password.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/employee_password.txt b/mails/nl/employee_password.txt
deleted file mode 100644
index a3719ade0..000000000
--- a/mails/nl/employee_password.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw persoonlijke login informatie voor strong>{shop_name}:
-
-VOORNAAM: {firstname}
-
-ACHTERNAAM: {lastname}
-
-WACHTWOORD: {passwd}
-
-E-MAILADRES: {email}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/forward_msg.html b/mails/nl/forward_msg.html
deleted file mode 100644
index 5a1aad090..000000000
--- a/mails/nl/forward_msg.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/forward_msg.txt b/mails/nl/forward_msg.txt
deleted file mode 100644
index 3a2b5306b..000000000
--- a/mails/nl/forward_msg.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-{employee} heeft dit bericht naar je doorgestuurd.
-
-BERICHT GESCHIEDENIS: {messages}
-
-{employee} heeft het volgende bericht achtergelaten: {comment}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/guest_to_customer.html b/mails/nl/guest_to_customer.html
deleted file mode 100644
index 2c86fcc9b..000000000
--- a/mails/nl/guest_to_customer.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/guest_to_customer.txt b/mails/nl/guest_to_customer.txt
deleted file mode 100644
index 439d8d288..000000000
--- a/mails/nl/guest_to_customer.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw gast account voor {shop_name} is omgezet naar een klant account.
-
-E-MAILADRES: {email}
-
-WACHTWOORD: {passwd}
-
-Wees alstublieft voorzichtig wanneer u deze aanmeldgegevens deelt
-met anderen.
-
-U hebt toegang tot uw account op onze website: {shop_url}
-{shop_url}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/hotel-booking-cart-data.tpl b/mails/nl/hotel-booking-cart-data.tpl
deleted file mode 100644
index c79ef93df..000000000
--- a/mails/nl/hotel-booking-cart-data.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
- {/foreach}
- {/foreach}
-{/if}
diff --git a/mails/nl/hotel-booking-cart-data.txt b/mails/nl/hotel-booking-cart-data.txt
deleted file mode 100644
index 33320c2db..000000000
--- a/mails/nl/hotel-booking-cart-data.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{if isset($list)}
- {foreach from=$list key=data_k item=data_v}
- {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
-
-
-
- {$data_v['name']}
-
- {$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'}
-
- {convertPrice price=$data_v['unit_price']}
-
- {$rm_v['num_rm']}
-
- {$rm_v['data_form']|date_format:"%d-%b-%G"}
-
- {$rm_v['data_to']|date_format:"%d-%b-%G"}
-
- {$rm_v['amount']}
-
- {/foreach}
- {/foreach}
-{/if}
-
diff --git a/mails/nl/in_transit.html b/mails/nl/in_transit.html
deleted file mode 100644
index c91f537ae..000000000
--- a/mails/nl/in_transit.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/in_transit.txt b/mails/nl/in_transit.txt
deleted file mode 100644
index 11315f740..000000000
--- a/mails/nl/in_transit.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw bestelling met de referentie {order_name} bevindt zich momenteel
-in het verzendproces.
-
-U kunt uw pakket volgen door op de volgende link te klikken:
-{followup} [{followup}]
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/lang.php b/mails/nl/lang.php
deleted file mode 100644
index b8454279f..000000000
--- a/mails/nl/lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/log_alert.txt b/mails/nl/log_alert.txt
deleted file mode 100644
index 1e165bc79..000000000
--- a/mails/nl/log_alert.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-WAARSCHUWING: er is een nieuwe log alert in de Back Office.
-
-Controleer het via "GEAVANCEERDE INSTELLINGEN" > "LOGBOEKEN" in de
-Back Office.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/newsletter.html b/mails/nl/newsletter.html
deleted file mode 100644
index 524aa5cf5..000000000
--- a/mails/nl/newsletter.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/newsletter.txt b/mails/nl/newsletter.txt
deleted file mode 100644
index 57edaf939..000000000
--- a/mails/nl/newsletter.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-{message}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/order_canceled.html b/mails/nl/order_canceled.html
deleted file mode 100644
index 010c24581..000000000
--- a/mails/nl/order_canceled.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/order_canceled.txt b/mails/nl/order_canceled.txt
deleted file mode 100644
index ab8222862..000000000
--- a/mails/nl/order_canceled.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw bestelling {order_name} van {shop_name} is geannuleerd.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/order_changed.html b/mails/nl/order_changed.html
deleted file mode 100644
index 61c025c9b..000000000
--- a/mails/nl/order_changed.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/order_changed.txt b/mails/nl/order_changed.txt
deleted file mode 100644
index aea18214b..000000000
--- a/mails/nl/order_changed.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw bestelling {order_name} bij {shop_name} is gewijzigd door de
-verkoper.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/order_conf.html b/mails/nl/order_conf.html
deleted file mode 100644
index 582e1f831..000000000
--- a/mails/nl/order_conf.html
+++ /dev/null
@@ -1,408 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/order_conf.txt b/mails/nl/order_conf.txt
deleted file mode 100644
index aa12f7521..000000000
--- a/mails/nl/order_conf.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-
-[{shop_url}]
-
-Hi {firstname} {lastname},
-
-Thank you for selecting our hotel!
-
-ORDER: {order_name} Placed on {date}
-
-PAYMENT: {payment}
-
-Room Image
-Room Description
-Room Capcity
-Unit Price
-Rooms Qty
-Check-in Date
-Check-out Date
-Total
-
-{products_txt}
-
-{discounts}
-
-Total Rooms Cost
-
-{total_products}
-
-DISCOUNTS
-
-{total_discounts}
-
-TOTAL TAX PAID
-
-{total_tax_paid}
-
-{adv_data_text}
-
-TOTAL PAID
-
-{total_paid}
-
-CARRIER: {carrier}
-
-PAYMENT: {payment}
-
-{delivery_block_txt}
-
-{invoice_block_txt}
-
-You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
-[{my_account_url}] on our shop.
-
-If you have a guest account, you can follow your order via the
-"Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop.
-
-{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
\ No newline at end of file
diff --git a/mails/nl/order_conf_cart_rules.tpl b/mails/nl/order_conf_cart_rules.tpl
deleted file mode 100644
index 742554d72..000000000
--- a/mails/nl/order_conf_cart_rules.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{foreach $list as $cart_rule}
-
-{/foreach}
\ No newline at end of file
diff --git a/mails/nl/order_conf_cart_rules.txt b/mails/nl/order_conf_cart_rules.txt
deleted file mode 100644
index 72a6970da..000000000
--- a/mails/nl/order_conf_cart_rules.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{foreach $list as $cart_rule}
- {$cart_rule['voucher_name']} {$cart_rule['voucher_reduction']}
-{/foreach}
\ No newline at end of file
diff --git a/mails/nl/order_conf_product_list.tpl b/mails/nl/order_conf_product_list.tpl
deleted file mode 100644
index 104b21dbf..000000000
--- a/mails/nl/order_conf_product_list.tpl
+++ /dev/null
@@ -1,126 +0,0 @@
-{foreach $list as $product}
-
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/nl/order_conf_product_list.txt b/mails/nl/order_conf_product_list.txt
deleted file mode 100644
index 0ffd7db7a..000000000
--- a/mails/nl/order_conf_product_list.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{foreach $list as $product}
- {$product['reference']}
-
- {$product['name']}
-
- {$product['price']}
-
- {$product['quantity']}
-
- {$product['price']}
-
- {foreach $product['customization'] as $customization}
- {$product['name']} {$customization['customization_text']}
-
- {$product['price']}
-
- {$product['customization_quantity']}
-
- {$product['quantity']}
- {/foreach}
-{/foreach}
\ No newline at end of file
diff --git a/mails/nl/order_customer_comment.html b/mails/nl/order_customer_comment.html
deleted file mode 100644
index 04ea46e1d..000000000
--- a/mails/nl/order_customer_comment.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/order_customer_comment.txt b/mails/nl/order_customer_comment.txt
deleted file mode 100644
index 57ca5c764..000000000
--- a/mails/nl/order_customer_comment.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-U heeft een bericht ontvangen betreffende een bestelling met de
-referentie: {order_name}.
-
-KLANT: {firstname} {lastname} ({email})
-
-{message}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/order_merchant_comment.html b/mails/nl/order_merchant_comment.html
deleted file mode 100644
index 178deab9a..000000000
--- a/mails/nl/order_merchant_comment.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/nl/order_merchant_comment.txt b/mails/nl/order_merchant_comment.txt
deleted file mode 100644
index db57849ce..000000000
--- a/mails/nl/order_merchant_comment.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Nieuw bericht van {shop_name} omtrent bestelling {order_name}.
-
-BERICHT: {message}
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/order_return_state.html b/mails/nl/order_return_state.html
deleted file mode 100644
index 0f16da4b7..000000000
--- a/mails/nl/order_return_state.html
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/order_return_state.txt b/mails/nl/order_return_state.txt
deleted file mode 100644
index 01e1f4aae..000000000
--- a/mails/nl/order_return_state.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw retourzending (#{id_order_return}) status is bijgewerkt, de nieuwe
-status is: "{state_order_return}" "{state_order_return}"
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/outofstock.html b/mails/nl/outofstock.html
deleted file mode 100644
index 8d0bdf339..000000000
--- a/mails/nl/outofstock.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/outofstock.txt b/mails/nl/outofstock.txt
deleted file mode 100644
index 1dcb4b247..000000000
--- a/mails/nl/outofstock.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Bedankt voor uw bestelling {order_name} op {shop_name}!
-
-Helaas zijn één of meer items van uw bestelling momenteel niet
-op voorraad. Dit kan enige vertraging opleveren bij de verzending.
-Onze excuses voor het ongemak, we verzekeren u dat we er hard aan
-werken om dit recht te zetten.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/password.html b/mails/nl/password.html
deleted file mode 100644
index 8877775f0..000000000
--- a/mails/nl/password.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/password.txt b/mails/nl/password.txt
deleted file mode 100644
index 870dd4aef..000000000
--- a/mails/nl/password.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-E-MAILADRES: {email}
-
-WACHTWOORD: {passwd}
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/password_query.html b/mails/nl/password_query.html
deleted file mode 100644
index e42341d36..000000000
--- a/mails/nl/password_query.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/password_query.txt b/mails/nl/password_query.txt
deleted file mode 100644
index 5c74ba902..000000000
--- a/mails/nl/password_query.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Verzoek tot het herstellen van de logingegevens voor {shop_name}.
-
-Let op: door deze actie zal uw huidige wachtwoord wijzigen.
-
-Bevestig deze actie door te klikken op de volgende link:
-
-{url} [{url}]
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/payment.html b/mails/nl/payment.html
deleted file mode 100644
index 02b4a09bd..000000000
--- a/mails/nl/payment.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/nl/payment.txt b/mails/nl/payment.txt
deleted file mode 100644
index 18d59bd4d..000000000
--- a/mails/nl/payment.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Bedankt voor het winkelen bij {shop_name}!
-
-Uw betaling voor de bestelling met de referentie {order_name} is
-met succes verwerkt.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/payment_error.html b/mails/nl/payment_error.html
deleted file mode 100644
index 6da8ae005..000000000
--- a/mails/nl/payment_error.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/payment_error.txt b/mails/nl/payment_error.txt
deleted file mode 100644
index 85a48ea02..000000000
--- a/mails/nl/payment_error.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Er is een probleem met uw betaling voor {shop_name} bestelling met
-referentie {order_name}. Neemt u a.u.b. contact met ons op.
-
-UW BESTELLING ZAL PAS VERWERKT WORDEN ALS DIT PROBLEEM IS OPGELOST.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/preparation.html b/mails/nl/preparation.html
deleted file mode 100644
index 7d0ee8405..000000000
--- a/mails/nl/preparation.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/preparation.txt b/mails/nl/preparation.txt
deleted file mode 100644
index b748237f5..000000000
--- a/mails/nl/preparation.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-We verwerken momenteel uw {shop_name} bestelling met als
-referentie {order_name}.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/refund.html b/mails/nl/refund.html
deleted file mode 100644
index b16f6a8ac..000000000
--- a/mails/nl/refund.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
diff --git a/mails/nl/refund.txt b/mails/nl/refund.txt
deleted file mode 100644
index dd3fdd049..000000000
--- a/mails/nl/refund.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-We hebben uw {shop_name} teruggave verwerkt voor de bestelling met
-als referentie {order_name}.
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-Indien u hebt afgerekend zonder het aanmaken van een account, dan
-kunt u deze bestelling volgen via "deze link"
-[{guest_tracking_url}?id_order={order_name}].
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/reply_msg.html b/mails/nl/reply_msg.html
deleted file mode 100644
index 76d823ace..000000000
--- a/mails/nl/reply_msg.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/reply_msg.txt b/mails/nl/reply_msg.txt
deleted file mode 100644
index 35028760a..000000000
--- a/mails/nl/reply_msg.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-{reply}
-
-Geautomatiseerde mailbox: Aub niet direct antwoorden op deze mail
-want we zullen deze niet ontvangen.
-
-Om te reageren, gebruik de volgende link: {link}
-[{link}]
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/shipped.html b/mails/nl/shipped.html
deleted file mode 100644
index 87cae234e..000000000
--- a/mails/nl/shipped.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/shipped.txt b/mails/nl/shipped.txt
deleted file mode 100644
index 4eb9f6bd1..000000000
--- a/mails/nl/shipped.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Uw bestelling is verzonden
-
-Uw bestelling {order_name} is verzonden.
-
-Bedankt voor het winkelen bij {shop_name}!
-
-U kunt uw bestelling bekijken en de factuur downloaden vanuit de
-sectie "Bestelgeschiedenis" [{history_url}] op de
-klantportal, door te klikken op de link "Mijn account"
-[{my_account_url}] in onze winkel.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/test.html b/mails/nl/test.html
deleted file mode 100644
index 5420eccc7..000000000
--- a/mails/nl/test.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/test.txt b/mails/nl/test.txt
deleted file mode 100644
index 5d1f25643..000000000
--- a/mails/nl/test.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-[{shop_url}]
-
-Hallo
-
-Dit is een TEST E-MAIL van uw webshop.
-
-Indien u deze kan lezen, dan was de test succesvol!.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/voucher.html b/mails/nl/voucher.html
deleted file mode 100644
index a3a419217..000000000
--- a/mails/nl/voucher.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/voucher.txt b/mails/nl/voucher.txt
deleted file mode 100644
index 70e095716..000000000
--- a/mails/nl/voucher.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Een waardebon werd op uw naam aangemaakt als gevolg op uw bestelling
-met referentie {order_name}.
-
-WAARDEBON CODE: {voucher_num} ter waarde van {voucher_amount}
-
-Plaats bij uw volgende bestelling de code in uw winkelwagen voordat u
-de bestelling gaat betalen.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/mails/nl/voucher_new.html b/mails/nl/voucher_new.html
deleted file mode 100644
index 7a0625fa8..000000000
--- a/mails/nl/voucher_new.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mails/nl/voucher_new.txt b/mails/nl/voucher_new.txt
deleted file mode 100644
index a1be35644..000000000
--- a/mails/nl/voucher_new.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[{shop_url}]
-
-Hallo {firstname} {lastname},
-
-Hier is de code van uw waardebon: {voucher_num}
-
-Plaats bij uw volgende bestelling de code in uw winkelwagen voordat u
-de bestelling gaat betalen.
-
-{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
-
diff --git a/modules/blockcart/CHANGELOG.txt b/modules/blockcart/CHANGELOG.txt
index 462e36d7c..4b976c4bf 100644
--- a/modules/blockcart/CHANGELOG.txt
+++ b/modules/blockcart/CHANGELOG.txt
@@ -1,3 +1,16 @@
+-----------------------------
+# V1.6.0 to V1.6.1
+-----------------------------
+
+## Improved/Changed Features:
+
+* [CO] : Compatible with php 7.x.x
+
+## Bug/Issues Resolved:
+
+[-] FO : Resolved :: Undefined index: total_rooms_in_cart at blockcart.tpl.
+
+______________________________________________________________________________________________
2014-04-22 18:56:55 +0200 // Changelog updated
2014-03-26 10:01:27 +0100 [-] MO : removed cart rule description from the name in the blockcart
2014-03-24 11:43:28 +0100 / MO blockcart : ps_versions_compliancy modified (1.5.6.1 => 1.6)
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index b5d5a6eb9..db4c38868 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -34,7 +34,7 @@ public function __construct()
{
$this->name = 'blockcart';
$this->tab = 'front_office_features';
- $this->version = '1.6.0';
+ $this->version = '1.6.1';
$this->author = 'PrestaShop';
$this->need_instance = 0;
@@ -147,7 +147,7 @@ public function assignContentVars($params)
'static_token' => Tools::getToken(false),
'free_shipping' => $total_free_shipping,
));
- if (count($errors)) {
+ if (is_array($errors) && count($errors)) {
$this->smarty->assign('errors', $errors);
}
if (isset($this->context->cookie->ajax_blockcart_display)) {
@@ -199,16 +199,12 @@ public function hookRightColumn($params)
if (Configuration::get('PS_CATALOG_MODE')) {
return;
}
-
+ $total_rooms = 0;
if ($this->context->cart->id) {
- $result = $this->getHotelCartBookingData();
- $cart_htl_data = $result['cart_htl_data'];
- $total_rooms = $result['total_rooms_in_cart'];
- $this->smarty->assign(array(
- 'cart_htl_data' => $cart_htl_data,
- 'total_rooms_in_cart' => $total_rooms,
- )
- );
+ if ($result = $this->getHotelCartBookingData()) {
+ $this->smarty->assign('cart_htl_data', $result['cart_htl_data']);
+ $total_rooms = $result['total_rooms_in_cart'];
+ }
}
$warning_num = Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER');
@@ -235,6 +231,7 @@ public function hookRightColumn($params)
// @todo this variable seems not used
$this->smarty->assign(array(
+ 'total_rooms_in_cart' => $total_rooms,
'max_order_date' => $max_order_date,
'warning_num' => $warning_num,
'module_dir' => _MODULE_DIR_,
@@ -487,7 +484,7 @@ public function getHotelCartBookingData()
$cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = date('Y-m-d', strtotime($data_v['date_from']));
$cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = date('Y-m-d', strtotime($data_v['date_to']));
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days;
-
+
// By webkul New way to calculate product prices with feature Prices
$roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice($type_value['id_product'], $data_v['date_from'], $data_v['date_to']);
if (!$price_tax) {
diff --git a/modules/blockcart/config.xml b/modules/blockcart/config.xml
deleted file mode 100644
index 91edd511f..000000000
--- a/modules/blockcart/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php
index 29dc5695e..8646e1f0e 100644
--- a/modules/blockcms/blockcms.php
+++ b/modules/blockcms/blockcms.php
@@ -340,7 +340,7 @@ protected function displayForm()
'query' => array(
array(
'id' => 'on',
- 'name' => $this->l('Display "Powered by PrestaShop" in the footer'),
+ 'name' => $this->l('Display "powered by Webkul" in the footer'),
'val' => '1'
),
),
diff --git a/modules/blockcms/translations/br.php b/modules/blockcms/translations/br.php
index 495618f3e..cb93ef616 100644
--- a/modules/blockcms/translations/br.php
+++ b/modules/blockcms/translations/br.php
@@ -22,7 +22,7 @@
$_MODULE['<{blockcms}prestashop>blockcms_edeab890c4f02138691d67eefcbfe7e8'] = 'Exibir link dos "Mais vendidos" no rodapé';
$_MODULE['<{blockcms}prestashop>blockcms_45bc5fe3bf5717315e42a831ba7da748'] = 'Exibir o link "Fale conosco" no rodapé';
$_MODULE['<{blockcms}prestashop>blockcms_68b7b9e603633d155941fb1d665c3997'] = 'Exibir o link "Mapa do site" no rodapé';
-$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Exibir "Powered by PrestaShop" no rodapé';
+$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Exibir "powered by Webkul" no rodapé';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Salvar';
$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'Configuração do bloco CMS';
$_MODULE['<{blockcms}prestashop>blockcms_0eb46571f3ff926d8b2408cafcfc17e3'] = 'Editar bloco CMS';
diff --git a/modules/blockcms/translations/ca.php b/modules/blockcms/translations/ca.php
index 048bd98b8..3f358e969 100644
--- a/modules/blockcms/translations/ca.php
+++ b/modules/blockcms/translations/ca.php
@@ -22,7 +22,7 @@
$_MODULE['<{blockcms}prestashop>blockcms_edeab890c4f02138691d67eefcbfe7e8'] = 'Mostrar un enllaç a "Els més venuts" al peu';
$_MODULE['<{blockcms}prestashop>blockcms_45bc5fe3bf5717315e42a831ba7da748'] = 'Mostrar un enllaç a "Contacteu-nos" al peu';
$_MODULE['<{blockcms}prestashop>blockcms_68b7b9e603633d155941fb1d665c3997'] = 'Mostrar un enllaç al mapa del web al peu';
-$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Mostrar "Powered by PrestaShop" al peu';
+$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Mostrar "powered by Webkul" al peu';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Desar';
$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'Configuració de bloc CMS';
$_MODULE['<{blockcms}prestashop>blockcms_0eb46571f3ff926d8b2408cafcfc17e3'] = 'Editar el bloc de CMS.';
diff --git a/modules/blockcms/translations/de.php b/modules/blockcms/translations/de.php
index a28b9ad28..1d1ee2211 100644
--- a/modules/blockcms/translations/de.php
+++ b/modules/blockcms/translations/de.php
@@ -22,7 +22,7 @@
$_MODULE['<{blockcms}prestashop>blockcms_edeab890c4f02138691d67eefcbfe7e8'] = 'Link "Verkaufshits" im Footer anzeigen';
$_MODULE['<{blockcms}prestashop>blockcms_45bc5fe3bf5717315e42a831ba7da748'] = 'Link "Kontakt" im Footer anzeigen';
$_MODULE['<{blockcms}prestashop>blockcms_68b7b9e603633d155941fb1d665c3997'] = 'Sitemap im Footer anzeigen';
-$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = '"Powered by PrestaShop" im Footer anzeigen';
+$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = '"powered by Webkul" im Footer anzeigen';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern';
$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'Block CMS konfigurieren';
$_MODULE['<{blockcms}prestashop>blockcms_0eb46571f3ff926d8b2408cafcfc17e3'] = 'Block CMS bearbeiten';
diff --git a/modules/blockcms/translations/en.php b/modules/blockcms/translations/en.php
index 8f8306e97..724e318b0 100644
--- a/modules/blockcms/translations/en.php
+++ b/modules/blockcms/translations/en.php
@@ -22,7 +22,7 @@
$_MODULE['<{blockcms}prestashop>blockcms_edeab890c4f02138691d67eefcbfe7e8'] = 'Display "Best sales" link in the footer';
$_MODULE['<{blockcms}prestashop>blockcms_45bc5fe3bf5717315e42a831ba7da748'] = 'Display "Contact us" link in the footer';
$_MODULE['<{blockcms}prestashop>blockcms_68b7b9e603633d155941fb1d665c3997'] = 'Display sitemap link in the footer';
-$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Display "Powered by PrestaShop" in the footer';
+$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Display "powered by Webkul" in the footer';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'CMS Block configuration';
$_MODULE['<{blockcms}prestashop>blockcms_0eb46571f3ff926d8b2408cafcfc17e3'] = 'Edit the CMS block.';
diff --git a/modules/blockcms/translations/id.php b/modules/blockcms/translations/id.php
index f5768d05d..5a87f8955 100644
--- a/modules/blockcms/translations/id.php
+++ b/modules/blockcms/translations/id.php
@@ -22,7 +22,7 @@
$_MODULE['<{blockcms}prestashop>blockcms_edeab890c4f02138691d67eefcbfe7e8'] = 'Tampilkan tautan ke halaman "Terlaris" di footer';
$_MODULE['<{blockcms}prestashop>blockcms_45bc5fe3bf5717315e42a831ba7da748'] = 'Tampilkan tautan ke halaman "Kontak kami" di footer';
$_MODULE['<{blockcms}prestashop>blockcms_68b7b9e603633d155941fb1d665c3997'] = 'Tampilkan tautan ke sitemap di footer';
-$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Tampilkan "Powered by PrestaShop" pada footer';
+$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Tampilkan "powered by Webkul" pada footer';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Simpan';
$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'Konfigurasi blok CMS';
$_MODULE['<{blockcms}prestashop>blockcms_0eb46571f3ff926d8b2408cafcfc17e3'] = 'Edit blok CMS';
diff --git a/modules/blockcms/translations/nl.php b/modules/blockcms/translations/nl.php
index 168536bbe..6a8b2e2cf 100644
--- a/modules/blockcms/translations/nl.php
+++ b/modules/blockcms/translations/nl.php
@@ -22,7 +22,7 @@
$_MODULE['<{blockcms}prestashop>blockcms_edeab890c4f02138691d67eefcbfe7e8'] = 'Laat "Top sellers" link zien in de footer';
$_MODULE['<{blockcms}prestashop>blockcms_45bc5fe3bf5717315e42a831ba7da748'] = 'Laat "Neem contact op" link zien in de footer';
$_MODULE['<{blockcms}prestashop>blockcms_68b7b9e603633d155941fb1d665c3997'] = 'Laat "Sitemap" link zien in de footer';
-$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Toon "Powered by Prestashop" in de footer';
+$_MODULE['<{blockcms}prestashop>blockcms_573a06e2ae339eeb4fb19e7f689bd3d8'] = 'Toon "powered by Webkul" in de footer';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Opslaan';
$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'CMS blok configuratie';
$_MODULE['<{blockcms}prestashop>blockcms_0eb46571f3ff926d8b2408cafcfc17e3'] = 'Wijzig CMS blok';
diff --git a/modules/blocknavigationmenu/logo.gif b/modules/blocknavigationmenu/logo.gif
new file mode 100644
index 000000000..64e83850e
Binary files /dev/null and b/modules/blocknavigationmenu/logo.gif differ
diff --git a/modules/blocknewsletter/CHANGELOG.txt b/modules/blocknewsletter/CHANGELOG.txt
index ea03ab038..de055c4bb 100644
--- a/modules/blocknewsletter/CHANGELOG.txt
+++ b/modules/blocknewsletter/CHANGELOG.txt
@@ -1,3 +1,18 @@
+-------------------------------
+# Change Log V2.2.0 to V2.2.1
+-------------------------------
+
+## Added features:
+
+- [+]CO : Module is now GDPR complient to Qloapps GDPR module.
+
+
+## Update Policy
+
+- Mobule need only file update, can be updated only by UPLOADING new version on module
+
+_____________________________________________________________________________________________________
+
2014-04-22 18:57:30 +0200 // Changelog updated
2014-04-18 17:47:09 +0200 // Add search form
2014-04-18 15:54:32 +0200 [*] Merged PR #3 from @marcinsz101
diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php
index 3fb01b26c..99593bb09 100644
--- a/modules/blocknewsletter/blocknewsletter.php
+++ b/modules/blocknewsletter/blocknewsletter.php
@@ -24,482 +24,536 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-if (!defined('_PS_VERSION_'))
- exit;
+if (!defined('_PS_VERSION_')) {
+ exit;
+}
class Blocknewsletter extends Module
{
- const GUEST_NOT_REGISTERED = -1;
- const CUSTOMER_NOT_REGISTERED = 0;
- const GUEST_REGISTERED = 1;
- const CUSTOMER_REGISTERED = 2;
-
- public function __construct()
- {
- $this->name = 'blocknewsletter';
- $this->tab = 'front_office_features';
- $this->need_instance = 0;
-
- $this->controllers = array('verification');
-
- $this->bootstrap = true;
- parent::__construct();
-
- $this->displayName = $this->l('Newsletter block');
- $this->description = $this->l('Adds a block for newsletter subscription.');
- $this->confirmUninstall = $this->l('Are you sure that you want to delete all of your contacts?');
- $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
-
- $this->version = '2.2.0';
- $this->author = 'PrestaShop';
- $this->error = false;
- $this->valid = false;
- $this->_files = array(
- 'name' => array('newsletter_conf', 'newsletter_voucher'),
- 'ext' => array(
- 0 => 'html',
- 1 => 'txt'
- )
- );
-
- $this->_searched_email = null;
-
- $this->_html = '';
- }
-
- public function install()
- {
- if (!parent::install() || !$this->registerHook(array('header', 'footer', 'displayFooterNotificationHook', 'actionCustomerAccountAdd')))
- return false;
-
- Configuration::updateValue('NW_SALT', Tools::passwdGen(16));
-
- return Db::getInstance()->execute('
- CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'newsletter` (
- `id` int(6) NOT NULL AUTO_INCREMENT,
- `id_shop` INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
- `id_shop_group` INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
- `email` varchar(255) NOT NULL,
- `newsletter_date_add` DATETIME NULL,
- `ip_registration_newsletter` varchar(15) NOT NULL,
- `http_referer` VARCHAR(255) NULL,
- `active` TINYINT(1) NOT NULL DEFAULT \'0\',
- PRIMARY KEY(`id`)
- ) ENGINE='._MYSQL_ENGINE_.' default CHARSET=utf8');
- }
-
- public function uninstall()
- {
- Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'newsletter');
-
- return parent::uninstall();
- }
-
- public function getContent()
- {
- if (Tools::isSubmit('submitUpdate'))
- {
- Configuration::updateValue('NW_CONFIRMATION_EMAIL', (bool)Tools::getValue('NW_CONFIRMATION_EMAIL'));
- Configuration::updateValue('NW_VERIFICATION_EMAIL', (bool)Tools::getValue('NW_VERIFICATION_EMAIL'));
-
- $voucher = Tools::getValue('NW_VOUCHER_CODE');
- if ($voucher && !Validate::isDiscountName($voucher))
- $this->_html .= $this->displayError($this->l('The voucher code is invalid.'));
- else
- {
- Configuration::updateValue('NW_VOUCHER_CODE', pSQL($voucher));
- $this->_html .= $this->displayConfirmation($this->l('Settings updated'));
- }
- }
- elseif (Tools::isSubmit('subscribedmerged'))
- {
- $id = Tools::getValue('id');
-
- if(preg_match('/(^N)/', $id))
- {
- $id = (int)substr($id, 1);
- $sql = 'UPDATE '._DB_PREFIX_.'newsletter SET active = 0 WHERE id = '.$id;
- Db::getInstance()->execute($sql);
- }
- else
- {
- $c = new Customer((int)$id);
- $c->newsletter = (int)!$c->newsletter;
- $c->update();
- }
- Tools::redirectAdmin($this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&conf=4&token='.Tools::getAdminTokenLite('AdminModules'));
-
- }
- elseif (Tools::isSubmit('exportSubscribers'))
- {
- $header = array('id', 'shop_name', 'gender', 'lastname', 'firstname', 'email', 'subscribed', 'subscribed_on'); // TODO
- $array_to_export = array_merge(array($header), $this->getSubscribers());
-
- $file_name = time().'.csv';
- $fd = fopen($this->getLocalPath().$file_name, 'w+');
- foreach ($array_to_export as $tab)
- {
- $line = implode(';', $tab);
- $line .= "\n";
- fwrite($fd, $line, 4096);
- }
- fclose($fd);
- Tools::redirect(_PS_BASE_URL_.__PS_BASE_URI__.'modules/'.$this->name.'/'.$file_name);
- }
- elseif(Tools::isSubmit('exportOnlyBlockNews'))
- {
- $array_to_export = $this->getBlockNewsletterSubscriber();
-
- $file_name = time().'.csv';
- $fd = fopen($this->getLocalPath().$file_name, 'w+');
- foreach ($array_to_export as $tab)
- {
- $line = implode(';', $tab);
- $line .= "\n";
- fwrite($fd, $line, 4096);
- }
- fclose($fd);
- Tools::redirect(_PS_BASE_URL_.__PS_BASE_URI__.'modules/'.$this->name.'/'.$file_name);
- }
- elseif (Tools::isSubmit('searchEmail'))
- $this->_searched_email = Tools::getValue('searched_email');
-
- $this->_html .= $this->renderForm();
- $this->_html .= $this->renderSearchForm();
- $this->_html .= $this->renderList();
-
- $this->_html .= '
';
-
- $this->_html .= $this->renderExportForm();
-
- return $this->_html;
- }
-
- public function renderList()
- {
- $fields_list = array(
-
- 'id' => array(
- 'title' => $this->l('ID'),
- 'search' => false,
- ),
- 'shop_name' => array(
- 'title' => $this->l('Shop'),
- 'search' => false,
- ),
- 'gender' => array(
- 'title' => $this->l('Gender'),
- 'search' => false,
- ),
- 'lastname' => array(
- 'title' => $this->l('Lastname'),
- 'search' => false,
- ),
- 'firstname' => array(
- 'title' => $this->l('Firstname'),
- 'search' => false,
- ),
- 'email' => array(
- 'title' => $this->l('Email'),
- 'search' => false,
- ),
- 'subscribed' => array(
- 'title' => $this->l('Subscribed'),
- 'type' => 'bool',
- 'active' => 'subscribed',
- 'search' => false,
- ),
- 'newsletter_date_add' => array(
- 'title' => $this->l('Subscribed on'),
- 'type' => 'date',
- 'search' => false,
- )
- );
-
- if (!Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE'))
- unset($fields_list['shop_name']);
-
- $helper_list = New HelperList();
- $helper_list->module = $this;
- $helper_list->title = $this->l('Newsletter registrations');
- $helper_list->shopLinkType = '';
- $helper_list->no_link = true;
- $helper_list->show_toolbar = true;
- $helper_list->simple_header = false;
- $helper_list->identifier = 'id';
- $helper_list->table = 'merged';
- $helper_list->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name;
- $helper_list->token = Tools::getAdminTokenLite('AdminModules');
- $helper_list->actions = array('viewCustomer');
- $helper_list->toolbar_btn['export'] = array(
- 'href' => $helper_list->currentIndex.'&exportSubscribers&token='.$helper_list->token,
- 'desc' => $this->l('Export')
- );
-
- /* Before 1.6.0.7 displayEnableLink() could not be overridden in Module class
- we declare another row action instead */
- if (version_compare(_PS_VERSION_, '1.6.0.7', '<'))
- {
- unset($fields_list['subscribed']);
- $helper_list->actions = array_merge($helper_list->actions, array('unsubscribe'));
- }
-
- // This is needed for displayEnableLink to avoid code duplication
- $this->_helperlist = $helper_list;
-
- /* Retrieve list data */
- $subscribers = $this->getSubscribers();
- $helper_list->listTotal = count($subscribers);
-
- /* Paginate the result */
- $page = ($page = Tools::getValue('submitFilter'.$helper_list->table)) ? $page : 1;
- $pagination = ($pagination = Tools::getValue($helper_list->table.'_pagination')) ? $pagination : 50;
- $subscribers = $this->paginateSubscribers($subscribers, $page, $pagination);
-
- return $helper_list->generateList($subscribers, $fields_list);
- }
-
- public function displayViewCustomerLink($token = null, $id, $name = null)
- {
- $this->smarty->assign(array(
- 'href' => 'index.php?controller=AdminCustomers&id_customer='.(int)$id.'&updatecustomer&token='.Tools::getAdminTokenLite('AdminCustomers'),
- 'action' => $this->l('View'),
- 'disable' => !((int)$id > 0),
- ));
-
- return $this->display(__FILE__, 'views/templates/admin/list_action_viewcustomer.tpl');
- }
-
- public function displayEnableLink($token, $id, $value, $active, $id_category = null, $id_product = null, $ajax = false)
- {
- $this->smarty->assign(array(
- 'ajax' => $ajax,
- 'enabled' => (bool)$value,
- 'url_enable' => $this->_helperlist->currentIndex.'&'.$this->_helperlist->identifier.'='.$id.'&'.$active.$this->_helperlist->table.($ajax ? '&action='.$active.$this->_helperlist->table.'&ajax='.(int)$ajax : '').((int)$id_category && (int)$id_product ? '&id_category='.(int)$id_category : '').'&token='.$token
- ));
-
- return $this->display(__FILE__, 'views/templates/admin/list_action_enable.tpl');
- }
-
- public function displayUnsubscribeLink($token = null, $id, $name = null)
- {
- $this->smarty->assign(array(
- 'href' => $this->_helperlist->currentIndex.'&subscribedcustomer&'.$this->_helperlist->identifier.'='.$id.'&token='.$token,
- 'action' => $this->l('Unsubscribe'),
- ));
-
- return $this->display(__FILE__, 'views/templates/admin/list_action_unsubscribe.tpl');
- }
-
- /**
- * Check if this mail is registered for newsletters
- *
- * @param string $customer_email
- *
- * @return int -1 = not a customer and not registered
- * 0 = customer not registered
- * 1 = registered in block
- * 2 = registered in customer
- */
- protected function isNewsletterRegistered($customer_email)
- {
- $sql = 'SELECT `email`
+ const GUEST_NOT_REGISTERED = -1;
+ const CUSTOMER_NOT_REGISTERED = 0;
+ const GUEST_REGISTERED = 1;
+ const CUSTOMER_REGISTERED = 2;
+
+ public function __construct()
+ {
+ $this->name = 'blocknewsletter';
+ $this->tab = 'front_office_features';
+ $this->need_instance = 0;
+
+ $this->controllers = array('verification');
+
+ $this->bootstrap = true;
+ parent::__construct();
+
+ $this->displayName = $this->l('Newsletter block');
+ $this->description = $this->l('Adds a block for newsletter subscription.');
+ $this->confirmUninstall = $this->l('Are you sure that you want to delete all of your contacts?');
+ $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
+
+ $this->version = '2.2.1';
+ $this->author = 'PrestaShop';
+ $this->error = false;
+ $this->valid = false;
+ $this->_files = array(
+ 'name' => array('newsletter_conf', 'newsletter_voucher'),
+ 'ext' => array(
+ 0 => 'html',
+ 1 => 'txt'
+ )
+ );
+
+ $this->_searched_email = null;
+
+ $this->_html = '';
+ }
+
+ public function registerHooks()
+ {
+ return $this->registerHook(
+ array(
+ 'header',
+ 'footer',
+ 'displayFooterNotificationHook',
+ 'actionCustomerAccountAdd',
+ 'registerGDPRConsent',
+ 'actionExportGDPRData',
+ 'actionDeleteGDPRCustomer'
+ )
+ );
+ }
+
+ public function hookActionExportGDPRData($customer)
+ {
+ if (!Tools::isEmpty($customer['email']) && Validate::isEmail($customer['email'])) {
+ $sql = "SELECT * FROM "._DB_PREFIX_."newsletter WHERE email = '".pSQL($customer['email'])."'";
+ if ($res = Db::getInstance()->ExecuteS($sql)) {
+ return json_encode($res);
+ }
+ return json_encode($this->l('Newsletter block : Unable to export customer using email.'));
+ }
+ }
+
+ public function hookActionDeleteGDPRCustomer($customer)
+ {
+ if (!empty($customer['email']) && Validate::isEmail($customer['email'])) {
+ $sql = "DELETE FROM "._DB_PREFIX_."newsletter WHERE email = '".pSQL($customer['email'])."'";
+ if (Db::getInstance()->execute($sql)) {
+ return json_encode(true);
+ }
+ return json_encode($this->l('Newsletter block : Unable to delete customer using email.'));
+ }
+ }
+
+ public function install()
+ {
+ if (!parent::install() || !$this->registerHooks()) {
+ return false;
+ }
+ Configuration::updateValue('NW_SALT', Tools::passwdGen(16));
+ return Db::getInstance()->execute(
+ 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'newsletter` (
+ `id` int(6) NOT NULL AUTO_INCREMENT,
+ `id_shop` INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
+ `id_shop_group` INTEGER UNSIGNED NOT NULL DEFAULT \'1\',
+ `email` varchar(255) NOT NULL,
+ `newsletter_date_add` DATETIME NULL,
+ `ip_registration_newsletter` varchar(15) NOT NULL,
+ `http_referer` VARCHAR(255) NULL,
+ `active` TINYINT(1) NOT NULL DEFAULT \'0\',
+ PRIMARY KEY(`id`)
+ ) ENGINE='._MYSQL_ENGINE_.' default CHARSET=utf8'
+ );
+ }
+
+ public function uninstall()
+ {
+ Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'newsletter');
+ return parent::uninstall();
+ }
+
+ public function getContent()
+ {
+ if (Tools::isSubmit('submitUpdate')) {
+ Configuration::updateValue('NW_CONFIRMATION_EMAIL', (bool)Tools::getValue('NW_CONFIRMATION_EMAIL'));
+ Configuration::updateValue('NW_VERIFICATION_EMAIL', (bool)Tools::getValue('NW_VERIFICATION_EMAIL'));
+
+ $voucher = Tools::getValue('NW_VOUCHER_CODE');
+ if ($voucher && !Validate::isDiscountName($voucher)) {
+ $this->_html .= $this->displayError($this->l('The voucher code is invalid.'));
+ } else {
+ Configuration::updateValue('NW_VOUCHER_CODE', pSQL($voucher));
+ $this->_html .= $this->displayConfirmation($this->l('Settings updated'));
+ }
+ } elseif (Tools::isSubmit('subscribedmerged')) {
+ $id = Tools::getValue('id');
+
+ if (preg_match('/(^N)/', $id)) {
+ $id = (int)substr($id, 1);
+ $sql = 'UPDATE '._DB_PREFIX_.'newsletter SET active = 0 WHERE id = '.$id;
+ Db::getInstance()->execute($sql);
+ } else {
+ $c = new Customer((int)$id);
+ $c->newsletter = (int)!$c->newsletter;
+ $c->update();
+ }
+ Tools::redirectAdmin(
+ $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&conf=4&token='.
+ Tools::getAdminTokenLite('AdminModules')
+ );
+ } elseif (Tools::isSubmit('exportSubscribers')) {
+ $header = array('id', 'shop_name', 'gender', 'lastname', 'firstname', 'email', 'subscribed', 'subscribed_on'); // TODO
+ $array_to_export = array_merge(array($header), $this->getSubscribers());
+
+ $file_name = time().'.csv';
+ $fd = fopen($this->getLocalPath().$file_name, 'w+');
+ foreach ($array_to_export as $tab) {
+ $line = implode(';', $tab);
+ $line .= "\n";
+ fwrite($fd, $line, 4096);
+ }
+ fclose($fd);
+ Tools::redirect(_PS_BASE_URL_.__PS_BASE_URI__.'modules/'.$this->name.'/'.$file_name);
+ } elseif (Tools::isSubmit('exportOnlyBlockNews')) {
+ $array_to_export = $this->getBlockNewsletterSubscriber();
+
+ $file_name = time().'.csv';
+ $fd = fopen($this->getLocalPath().$file_name, 'w+');
+ foreach ($array_to_export as $tab) {
+ $line = implode(';', $tab);
+ $line .= "\n";
+ fwrite($fd, $line, 4096);
+ }
+ fclose($fd);
+ Tools::redirect(_PS_BASE_URL_.__PS_BASE_URI__.'modules/'.$this->name.'/'.$file_name);
+ } elseif (Tools::isSubmit('searchEmail')) {
+ $this->_searched_email = Tools::getValue('searched_email');
+ }
+
+ $this->_html .= $this->renderForm();
+ $this->_html .= $this->renderSearchForm();
+ $this->_html .= $this->renderList();
+
+ $this->_html .= '
';
+
+ $this->_html .= $this->renderExportForm();
+
+ return $this->_html;
+ }
+
+ public function renderList()
+ {
+ $fields_list = array(
+
+ 'id' => array(
+ 'title' => $this->l('ID'),
+ 'search' => false,
+ ),
+ 'shop_name' => array(
+ 'title' => $this->l('Shop'),
+ 'search' => false,
+ ),
+ 'gender' => array(
+ 'title' => $this->l('Gender'),
+ 'search' => false,
+ ),
+ 'lastname' => array(
+ 'title' => $this->l('Lastname'),
+ 'search' => false,
+ ),
+ 'firstname' => array(
+ 'title' => $this->l('Firstname'),
+ 'search' => false,
+ ),
+ 'email' => array(
+ 'title' => $this->l('Email'),
+ 'search' => false,
+ ),
+ 'subscribed' => array(
+ 'title' => $this->l('Subscribed'),
+ 'type' => 'bool',
+ 'active' => 'subscribed',
+ 'search' => false,
+ ),
+ 'newsletter_date_add' => array(
+ 'title' => $this->l('Subscribed on'),
+ 'type' => 'date',
+ 'search' => false,
+ )
+ );
+
+ if (!Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')) {
+ unset($fields_list['shop_name']);
+ }
+
+ $helper_list = new HelperList();
+ $helper_list->module = $this;
+ $helper_list->title = $this->l('Newsletter registrations');
+ $helper_list->shopLinkType = '';
+ $helper_list->no_link = true;
+ $helper_list->show_toolbar = true;
+ $helper_list->simple_header = false;
+ $helper_list->identifier = 'id';
+ $helper_list->table = 'merged';
+ $helper_list->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name;
+ $helper_list->token = Tools::getAdminTokenLite('AdminModules');
+ $helper_list->actions = array('viewCustomer');
+ $helper_list->toolbar_btn['export'] = array(
+ 'href' => $helper_list->currentIndex.'&exportSubscribers&token='.$helper_list->token,
+ 'desc' => $this->l('Export')
+ );
+
+ /* Before 1.6.0.7 displayEnableLink() could not be overridden in Module class
+ we declare another row action instead */
+ if (version_compare(_PS_VERSION_, '1.6.0.7', '<')) {
+ unset($fields_list['subscribed']);
+ $helper_list->actions = array_merge($helper_list->actions, array('unsubscribe'));
+ }
+
+ // This is needed for displayEnableLink to avoid code duplication
+ $this->_helperlist = $helper_list;
+
+ /* Retrieve list data */
+ $subscribers = $this->getSubscribers();
+ $helper_list->listTotal = count($subscribers);
+
+ /* Paginate the result */
+ $page = ($page = Tools::getValue('submitFilter'.$helper_list->table)) ? $page : 1;
+ $pagination = ($pagination = Tools::getValue($helper_list->table.'_pagination')) ? $pagination : 50;
+ $subscribers = $this->paginateSubscribers($subscribers, $page, $pagination);
+
+ return $helper_list->generateList($subscribers, $fields_list);
+ }
+
+ public function displayViewCustomerLink($token = null, $id, $name = null)
+ {
+ $this->smarty->assign(
+ array(
+ 'href' => 'index.php?controller=AdminCustomers&id_customer='.(int)$id.'&updatecustomer&token='.
+ Tools::getAdminTokenLite('AdminCustomers'),
+ 'action' => $this->l('View'),
+ 'disable' => !((int)$id > 0),
+ )
+ );
+ return $this->display(__FILE__, 'views/templates/admin/list_action_viewcustomer.tpl');
+ }
+
+ public function displayEnableLink($token, $id, $value, $active, $id_category = null, $id_product = null, $ajax = false)
+ {
+ $this->smarty->assign(
+ array(
+ 'ajax' => $ajax,
+ 'enabled' => (bool)$value,
+ 'url_enable' => $this->_helperlist->currentIndex.'&'.$this->_helperlist->identifier.'='.$id.'&'.$active.
+ $this->_helperlist->table.($ajax ? '&action='.$active.$this->_helperlist->table.'&ajax='.
+ (int)$ajax : '').((int)$id_category && (int)$id_product ? '&id_category='.(int)$id_category : '').
+ '&token='.$token
+ )
+ );
+ return $this->display(__FILE__, 'views/templates/admin/list_action_enable.tpl');
+ }
+
+ public function displayUnsubscribeLink($token = null, $id, $name = null)
+ {
+ $this->smarty->assign(
+ array(
+ 'href' => $this->_helperlist->currentIndex.'&subscribedcustomer&'.$this->_helperlist->identifier.'='.
+ $id.'&token='.$token,
+ 'action' => $this->l('Unsubscribe'),
+ )
+ );
+ return $this->display(__FILE__, 'views/templates/admin/list_action_unsubscribe.tpl');
+ }
+
+ /**
+ * Check if this mail is registered for newsletters
+ *
+ * @param string $customer_email
+ *
+ * @return int -1 = not a customer and not registered
+ * 0 = customer not registered
+ * 1 = registered in block
+ * 2 = registered in customer
+ */
+ protected function isNewsletterRegistered($customer_email)
+ {
+ $sql = 'SELECT `email`
FROM '._DB_PREFIX_.'newsletter
WHERE `email` = \''.pSQL($customer_email).'\'
AND id_shop = '.$this->context->shop->id;
- if (Db::getInstance()->getRow($sql))
- return self::GUEST_REGISTERED;
+ if (Db::getInstance()->getRow($sql)) {
+ return self::GUEST_REGISTERED;
+ }
- $sql = 'SELECT `newsletter`
+ $sql = 'SELECT `newsletter`
FROM '._DB_PREFIX_.'customer
WHERE `email` = \''.pSQL($customer_email).'\'
AND id_shop = '.$this->context->shop->id;
- if (!$registered = Db::getInstance()->getRow($sql))
- return self::GUEST_NOT_REGISTERED;
-
- if ($registered['newsletter'] == '1')
- return self::CUSTOMER_REGISTERED;
-
- return self::CUSTOMER_NOT_REGISTERED;
- }
-
- /**
- * Register in block newsletter
- */
- protected function newsletterRegistration()
- {
- if (empty($_POST['email']) || !Validate::isEmail($_POST['email']))
- return $this->error = $this->l('Invalid email address.');
-
- /* Unsubscription */
- else if ($_POST['action'] == '1')
- {
- $register_status = $this->isNewsletterRegistered($_POST['email']);
-
- if ($register_status < 1)
- return $this->error = $this->l('This email address is not registered.');
-
- if (!$this->unregister($_POST['email'], $register_status))
- return $this->error = $this->l('An error occurred while attempting to unsubscribe.');
-
- return $this->valid = $this->l('Unsubscription successful.');
- }
- /* Subscription */
- else if ($_POST['action'] == '0')
- {
- $register_status = $this->isNewsletterRegistered($_POST['email']);
- if ($register_status > 0)
- return $this->error = $this->l('This email address is already registered.');
-
- $email = pSQL($_POST['email']);
- if (!$this->isRegistered($register_status))
- {
- if (Configuration::get('NW_VERIFICATION_EMAIL'))
- {
- // create an unactive entry in the newsletter database
- if ($register_status == self::GUEST_NOT_REGISTERED)
- $this->registerGuest($email, false);
-
- if (!$token = $this->getToken($email, $register_status))
- return $this->error = $this->l('An error occurred during the subscription process.');
-
- $this->sendVerificationEmail($email, $token);
-
- return $this->valid = $this->l('A verification email has been sent. Please check your inbox.');
- }
- else
- {
- if ($this->register($email, $register_status))
- $this->valid = $this->l('You have successfully subscribed to this newsletter.');
- else
- return $this->error = $this->l('An error occurred during the subscription process.');
-
- if ($code = Configuration::get('NW_VOUCHER_CODE'))
- $this->sendVoucher($email, $code);
-
- if (Configuration::get('NW_CONFIRMATION_EMAIL'))
- $this->sendConfirmationEmail($email);
- }
- }
- }
- }
-
- public function getSubscribers()
- {
- $dbquery = new DbQuery();
- $dbquery->select('c.`id_customer` AS `id`, s.`name` AS `shop_name`, gl.`name` AS `gender`, c.`lastname`, c.`firstname`, c.`email`, c.`newsletter` AS `subscribed`, c.`newsletter_date_add`');
- $dbquery->from('customer', 'c');
- $dbquery->leftJoin('shop', 's', 's.id_shop = c.id_shop');
- $dbquery->leftJoin('gender', 'g', 'g.id_gender = c.id_gender');
- $dbquery->leftJoin('gender_lang', 'gl', 'g.id_gender = gl.id_gender AND gl.id_lang = '.(int)$this->context->employee->id_lang);
- $dbquery->where('c.`newsletter` = 1');
- if ($this->_searched_email)
- $dbquery->where('c.`email` LIKE \'%'.pSQL($this->_searched_email).'%\' ');
-
- $customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
-
- $dbquery = new DbQuery();
- $dbquery->select('CONCAT(\'N\', n.`id`) AS `id`, s.`name` AS `shop_name`, NULL AS `gender`, NULL AS `lastname`, NULL AS `firstname`, n.`email`, n.`active` AS `subscribed`, n.`newsletter_date_add`');
- $dbquery->from('newsletter', 'n');
- $dbquery->leftJoin('shop', 's', 's.id_shop = n.id_shop');
- $dbquery->where('n.`active` = 1');
- if ($this->_searched_email)
- $dbquery->where('n.`email` LIKE \'%'.pSQL($this->_searched_email).'%\' ');
-
- $non_customers = Db::getInstance()->executeS($dbquery->build());
-
- $subscribers = array_merge($customers, $non_customers);
-
- return $subscribers;
- }
-
- public function paginateSubscribers($subscribers, $page = 1, $pagination = 50)
- {
- if(count($subscribers) > $pagination)
- $subscribers = array_slice($subscribers, $pagination * ($page - 1), $pagination);
-
- return $subscribers;
- }
-
- /**
- * Return true if the registered status correspond to a registered user
- *
- * @param int $register_status
- *
- * @return bool
- */
- protected function isRegistered($register_status)
- {
- return in_array(
- $register_status,
- array(self::GUEST_REGISTERED, self::CUSTOMER_REGISTERED)
- );
- }
-
-
- /**
- * Subscribe an email to the newsletter. It will create an entry in the newsletter table
- * or update the customer table depending of the register status
- *
- * @param string $email
- * @param int $register_status
- */
- protected function register($email, $register_status)
- {
- if ($register_status == self::GUEST_NOT_REGISTERED)
- return $this->registerGuest($email);
-
- if ($register_status == self::CUSTOMER_NOT_REGISTERED)
- return $this->registerUser($email);
-
- return false;
- }
-
- protected function unregister($email, $register_status)
- {
- if ($register_status == self::GUEST_REGISTERED)
- $sql = 'DELETE FROM '._DB_PREFIX_.'newsletter WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.$this->context->shop->id;
- else if ($register_status == self::CUSTOMER_REGISTERED)
- $sql = 'UPDATE '._DB_PREFIX_.'customer SET `newsletter` = 0 WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.$this->context->shop->id;
-
- if (!isset($sql) || !Db::getInstance()->execute($sql))
- return false;
-
- return true;
- }
-
- /**
- * Subscribe a customer to the newsletter
- *
- * @param string $email
- *
- * @return bool
- */
- protected function registerUser($email)
- {
- $sql = 'UPDATE '._DB_PREFIX_.'customer
- SET `newsletter` = 1, newsletter_date_add = NOW(), `ip_registration_newsletter` = \''.pSQL(Tools::getRemoteAddr()).'\'
- WHERE `email` = \''.pSQL($email).'\'
- AND id_shop = '.$this->context->shop->id;
-
- return Db::getInstance()->execute($sql);
- }
-
- /**
- * Subscribe a guest to the newsletter
- *
- * @param string $email
- * @param bool $active
- *
- * @return bool
- */
- protected function registerGuest($email, $active = true)
- {
- $sql = 'INSERT INTO '._DB_PREFIX_.'newsletter (id_shop, id_shop_group, email, newsletter_date_add, ip_registration_newsletter, http_referer, active)
+ if (!$registered = Db::getInstance()->getRow($sql)) {
+ return self::GUEST_NOT_REGISTERED;
+ }
+
+ if ($registered['newsletter'] == '1') {
+ return self::CUSTOMER_REGISTERED;
+ }
+
+ return self::CUSTOMER_NOT_REGISTERED;
+ }
+
+ /**
+ * Register in block newsletter
+ */
+ protected function newsletterRegistration()
+ {
+ if (empty($_POST['email']) || !Validate::isEmail($_POST['email'])) {
+ return $this->error = $this->l('Invalid email address.');
+ }
+
+ /* Unsubscription */
+ elseif ($_POST['action'] == '1') {
+ $register_status = $this->isNewsletterRegistered($_POST['email']);
+
+ if ($register_status < 1) {
+ return $this->error = $this->l('This email address is not registered.');
+ }
+
+ if (!$this->unregister($_POST['email'], $register_status)) {
+ return $this->error = $this->l('An error occurred while attempting to unsubscribe.');
+ }
+
+ return $this->valid = $this->l('Unsubscription successful.');
+ }
+ /* Subscription */
+ elseif ($_POST['action'] == '0') {
+ $register_status = $this->isNewsletterRegistered($_POST['email']);
+ if ($register_status > 0) {
+ return $this->error = $this->l('This email address is already registered.');
+ }
+
+ $email = pSQL($_POST['email']);
+ if (!$this->isRegistered($register_status)) {
+ if (Configuration::get('NW_VERIFICATION_EMAIL')) {
+ // create an unactive entry in the newsletter database
+ if ($register_status == self::GUEST_NOT_REGISTERED) {
+ $this->registerGuest($email, false);
+ }
+
+ if (!$token = $this->getToken($email, $register_status)) {
+ return $this->error = $this->l('An error occurred during the subscription process.');
+ }
+
+ $this->sendVerificationEmail($email, $token);
+
+ return $this->valid = $this->l('A verification email has been sent. Please check your inbox.');
+ } else {
+ if ($this->register($email, $register_status)) {
+ $this->valid = $this->l('You have successfully subscribed to this newsletter.');
+ } else {
+ return $this->error = $this->l('An error occurred during the subscription process.');
+ }
+
+ if ($code = Configuration::get('NW_VOUCHER_CODE')) {
+ $this->sendVoucher($email, $code);
+ }
+
+ if (Configuration::get('NW_CONFIRMATION_EMAIL')) {
+ $this->sendConfirmationEmail($email);
+ }
+ }
+ }
+ }
+ }
+
+ public function getSubscribers()
+ {
+ $dbquery = new DbQuery();
+ $dbquery->select('c.`id_customer` AS `id`, s.`name` AS `shop_name`, gl.`name` AS `gender`, c.`lastname`, c.`firstname`, c.`email`, c.`newsletter` AS `subscribed`, c.`newsletter_date_add`');
+ $dbquery->from('customer', 'c');
+ $dbquery->leftJoin('shop', 's', 's.id_shop = c.id_shop');
+ $dbquery->leftJoin('gender', 'g', 'g.id_gender = c.id_gender');
+ $dbquery->leftJoin(
+ 'gender_lang', 'gl', 'g.id_gender = gl.id_gender AND gl.id_lang = '.(int)$this->context->employee->id_lang
+ );
+ $dbquery->where('c.`newsletter` = 1');
+ if ($this->_searched_email) {
+ $dbquery->where('c.`email` LIKE \'%'.pSQL($this->_searched_email).'%\' ');
+ }
+
+ $customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
+
+ $dbquery = new DbQuery();
+ $dbquery->select(
+ 'CONCAT(\'N\', n.`id`) AS `id`, s.`name` AS `shop_name`, NULL AS `gender`, NULL AS `lastname`, NULL
+ AS `firstname`, n.`email`, n.`active` AS `subscribed`, n.`newsletter_date_add`'
+ );
+ $dbquery->from('newsletter', 'n');
+ $dbquery->leftJoin('shop', 's', 's.id_shop = n.id_shop');
+ $dbquery->where('n.`active` = 1');
+ if ($this->_searched_email) {
+ $dbquery->where('n.`email` LIKE \'%'.pSQL($this->_searched_email).'%\' ');
+ }
+
+ $non_customers = Db::getInstance()->executeS($dbquery->build());
+
+ $subscribers = array_merge($customers, $non_customers);
+
+ return $subscribers;
+ }
+
+ public function paginateSubscribers($subscribers, $page = 1, $pagination = 50)
+ {
+ if (count($subscribers) > $pagination) {
+ $subscribers = array_slice($subscribers, $pagination * ($page - 1), $pagination);
+ }
+ return $subscribers;
+ }
+
+ /**
+ * Return true if the registered status correspond to a registered user
+ *
+ * @param int $register_status
+ *
+ * @return bool
+ */
+ protected function isRegistered($register_status)
+ {
+ return in_array(
+ $register_status,
+ array(self::GUEST_REGISTERED, self::CUSTOMER_REGISTERED)
+ );
+ }
+
+
+ /**
+ * Subscribe an email to the newsletter. It will create an entry in the newsletter table
+ * or update the customer table depending of the register status
+ *
+ * @param string $email
+ * @param int $register_status
+ */
+ protected function register($email, $register_status)
+ {
+ if ($register_status == self::GUEST_NOT_REGISTERED) {
+ return $this->registerGuest($email);
+ }
+
+ if ($register_status == self::CUSTOMER_NOT_REGISTERED) {
+ return $this->registerUser($email);
+ }
+
+ return false;
+ }
+
+ protected function unregister($email, $register_status)
+ {
+ if ($register_status == self::GUEST_REGISTERED) {
+ $sql = 'DELETE FROM '._DB_PREFIX_.'newsletter WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.
+ $this->context->shop->id;
+ } elseif ($register_status == self::CUSTOMER_REGISTERED) {
+ $sql = 'UPDATE '._DB_PREFIX_.'customer SET `newsletter` = 0 WHERE `email` = \''.pSQL($_POST['email']).
+ '\' AND id_shop = '.$this->context->shop->id;
+ }
+
+ if (!isset($sql) || !Db::getInstance()->execute($sql)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Subscribe a customer to the newsletter
+ *
+ * @param string $email
+ *
+ * @return bool
+ */
+ protected function registerUser($email)
+ {
+ $sql = 'UPDATE '._DB_PREFIX_.'customer SET `newsletter` = 1, newsletter_date_add = NOW(),
+ `ip_registration_newsletter` = \''.pSQL(Tools::getRemoteAddr()).'\' WHERE `email` = \''.pSQL($email).
+ '\' AND id_shop = '.$this->context->shop->id;
+
+ return Db::getInstance()->execute($sql);
+ }
+
+ /**
+ * Subscribe a guest to the newsletter
+ *
+ * @param string $email
+ * @param bool $active
+ *
+ * @return bool
+ */
+ protected function registerGuest($email, $active = true)
+ {
+ $sql = 'INSERT INTO '._DB_PREFIX_.'newsletter (id_shop, id_shop_group, email, newsletter_date_add,
+ ip_registration_newsletter, http_referer, active)
VALUES
('.$this->context->shop->id.',
'.$this->context->shop->id_shop_group.',
@@ -515,433 +569,436 @@ protected function registerGuest($email, $active = true)
'.(int)$active.'
)';
- return Db::getInstance()->execute($sql);
- }
+ return Db::getInstance()->execute($sql);
+ }
- public function activateGuest($email)
- {
- return Db::getInstance()->execute(
- 'UPDATE `'._DB_PREFIX_.'newsletter`
+ public function activateGuest($email)
+ {
+ return Db::getInstance()->execute(
+ 'UPDATE `'._DB_PREFIX_.'newsletter`
SET `active` = 1
WHERE `email` = \''.pSQL($email).'\''
- );
- }
-
- /**
- * Returns a guest email by token
- *
- * @param string $token
- *
- * @return string email
- */
- protected function getGuestEmailByToken($token)
- {
- $sql = 'SELECT `email`
+ );
+ }
+
+ /**
+ * Returns a guest email by token
+ *
+ * @param string $token
+ *
+ * @return string email
+ */
+ protected function getGuestEmailByToken($token)
+ {
+ $sql = 'SELECT `email`
FROM `'._DB_PREFIX_.'newsletter`
- WHERE MD5(CONCAT( `email` , `newsletter_date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\')) = \''.pSQL($token).'\'
+ WHERE MD5(CONCAT( `email` , `newsletter_date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\')) = \''.
+ pSQL($token).'\'
AND `active` = 0';
- return Db::getInstance()->getValue($sql);
- }
-
- /**
- * Returns a customer email by token
- *
- * @param string $token
- *
- * @return string email
- */
- protected function getUserEmailByToken($token)
- {
- $sql = 'SELECT `email`
+ return Db::getInstance()->getValue($sql);
+ }
+
+ /**
+ * Returns a customer email by token
+ *
+ * @param string $token
+ *
+ * @return string email
+ */
+ protected function getUserEmailByToken($token)
+ {
+ $sql = 'SELECT `email`
FROM `'._DB_PREFIX_.'customer`
- WHERE MD5(CONCAT( `email` , `date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\')) = \''.pSQL($token).'\'
- AND `newsletter` = 0';
-
- return Db::getInstance()->getValue($sql);
- }
-
- /**
- * Return a token associated to an user
- *
- * @param string $email
- * @param string $register_status
- */
- protected function getToken($email, $register_status)
- {
- if (in_array($register_status, array(self::GUEST_NOT_REGISTERED, self::GUEST_REGISTERED)))
- {
- $sql = 'SELECT MD5(CONCAT( `email` , `newsletter_date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\')) as token
+ WHERE MD5(CONCAT( `email` , `date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\')) = \''.
+ pSQL($token).'\' AND `newsletter` = 0';
+
+ return Db::getInstance()->getValue($sql);
+ }
+
+ /**
+ * Return a token associated to an user
+ *
+ * @param string $email
+ * @param string $register_status
+ */
+ protected function getToken($email, $register_status)
+ {
+ if (in_array($register_status, array(self::GUEST_NOT_REGISTERED, self::GUEST_REGISTERED))) {
+ $sql = 'SELECT MD5(CONCAT( `email` , `newsletter_date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\')) as token
FROM `'._DB_PREFIX_.'newsletter`
WHERE `active` = 0
AND `email` = \''.pSQL($email).'\'';
- }
- else if ($register_status == self::CUSTOMER_NOT_REGISTERED)
- {
- $sql = 'SELECT MD5(CONCAT( `email` , `date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\' )) as token
+ } elseif ($register_status == self::CUSTOMER_NOT_REGISTERED) {
+ $sql = 'SELECT MD5(CONCAT( `email` , `date_add`, \''.pSQL(Configuration::get('NW_SALT')).'\' )) as token
FROM `'._DB_PREFIX_.'customer`
WHERE `newsletter` = 0
AND `email` = \''.pSQL($email).'\'';
- }
-
- return Db::getInstance()->getValue($sql);
- }
-
- /**
- * Ends the registration process to the newsletter
- *
- * @param string $token
- *
- * @return string
- */
- public function confirmEmail($token)
- {
- $activated = false;
-
- if ($email = $this->getGuestEmailByToken($token))
- $activated = $this->activateGuest($email);
- else if ($email = $this->getUserEmailByToken($token))
- $activated = $this->registerUser($email);
-
- if (!$activated)
- return $this->l('This email is already registered and/or invalid.');
-
- if ($discount = Configuration::get('NW_VOUCHER_CODE'))
- $this->sendVoucher($email, $discount);
-
- if (Configuration::get('NW_CONFIRMATION_EMAIL'))
- $this->sendConfirmationEmail($email);
-
- return $this->l('Thank you for subscribing to our newsletter.');
- }
-
- /**
- * Send the confirmation mails to the given $email address if needed.
- *
- * @param string $email Email where to send the confirmation
- *
- * @note the email has been verified and might not yet been registered. Called by AuthController::processCustomerNewsletter
- *
- */
- public function confirmSubscription($email)
- {
- if ($email)
- {
- if ($discount = Configuration::get('NW_VOUCHER_CODE'))
- $this->sendVoucher($email, $discount);
-
- if (Configuration::get('NW_CONFIRMATION_EMAIL'))
- $this->sendConfirmationEmail($email);
- }
- }
-
- /**
- * Send an email containing a voucher code
- *
- * @param $email
- * @param $code
- *
- * @return bool|int
- */
- protected function sendVoucher($email, $code)
- {
- return Mail::Send($this->context->language->id, 'newsletter_voucher', Mail::l('Newsletter voucher', $this->context->language->id), array('{discount}' => $code), $email, null, null, null, null, null, dirname(__FILE__).'/mails/', false, $this->context->shop->id);
- }
-
- /**
- * Send a confirmation email
- *
- * @param string $email
- *
- * @return bool
- */
- protected function sendConfirmationEmail($email)
- {
- return Mail::Send($this->context->language->id, 'newsletter_conf', Mail::l('Newsletter confirmation', $this->context->language->id), array(), pSQL($email), null, null, null, null, null, dirname(__FILE__).'/mails/', false, $this->context->shop->id);
- }
-
- /**
- * Send a verification email
- *
- * @param string $email
- * @param string $token
- *
- * @return bool
- */
- protected function sendVerificationEmail($email, $token)
- {
- $verif_url = Context::getContext()->link->getModuleLink(
- 'blocknewsletter', 'verification', array(
- 'token' => $token,
- )
- );
-
- return Mail::Send($this->context->language->id, 'newsletter_verif', Mail::l('Email verification', $this->context->language->id), array('{verif_url}' => $verif_url), $email, null, null, null, null, null, dirname(__FILE__).'/mails/', false, $this->context->shop->id);
- }
-
- public function hookDisplayRightColumn($params)
- {
- return $this->hookDisplayLeftColumn($params);
- }
-
- protected function _prepareHook($params)
- {
- if (Tools::isSubmit('submitNewsletter'))
- {
- $this->newsletterRegistration();
- if ($this->error)
- {
- $this->smarty->assign(
- array(
- 'color' => 'red',
- 'msg' => $this->error,
- 'nw_value' => isset($_POST['email']) ? pSQL($_POST['email']) : false,
- 'nw_error' => true,
- 'action' => $_POST['action']
- )
- );
- }
- else if ($this->valid)
- {
- $this->smarty->assign(
- array(
- 'color' => 'green',
- 'msg' => $this->valid,
- 'nw_error' => false
- )
- );
- }
- }
- $this->smarty->assign('this_path', $this->_path);
- }
-
- public function hookDisplayLeftColumn($params)
- {
- if (!isset($this->prepared) || !$this->prepared)
- $this->_prepareHook($params);
- $this->prepared = true;
- return $this->display(__FILE__, 'blocknewsletter.tpl');
- }
-
- // by webkul
- public function hookDisplayFooterNotificationHook($params)
- {
- return $this->hookDisplayLeftColumn($params);
- }
-
- // By webkul
- // public function hookFooter($params)
- // {
- // return $this->hookDisplayLeftColumn($params);
- // }
-
- public function hookdisplayMaintenance($params)
- {
- return $this->hookDisplayLeftColumn($params);
- }
-
- public function hookDisplayHeader($params)
- {
- $this->context->controller->addJS(_PS_JS_DIR_.'validate.js');
-
- $this->context->controller->addCSS($this->_path.'blocknewsletter.css', 'all');
- $this->context->controller->addJS($this->_path.'blocknewsletter.js');
- }
-
- /**
- * Deletes duplicates email in newsletter table
- *
- * @param $params
- *
- * @return bool
- */
- public function hookActionCustomerAccountAdd($params)
- {
- //if e-mail of the created user address has already been added to the newsletter through the blocknewsletter module,
- //we delete it from blocknewsletter table to prevent duplicates
- $id_shop = $params['newCustomer']->id_shop;
- $email = $params['newCustomer']->email;
- if (Validate::isEmail($email))
- return (bool)Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'newsletter WHERE id_shop='.(int)$id_shop.' AND email=\''.pSQL($email)."'");
-
- return true;
- }
-
- public function renderForm()
- {
- $fields_form = array(
- 'form' => array(
- 'legend' => array(
- 'title' => $this->l('Settings'),
- 'icon' => 'icon-cogs'
- ),
- 'input' => array(
- array(
- 'type' => 'switch',
- 'label' => $this->l('Would you like to send a verification email after subscription?'),
- 'name' => 'NW_VERIFICATION_EMAIL',
- 'values' => array(
- array(
- 'id' => 'active_on',
- 'value' => 1,
- 'label' => $this->l('Yes')
- ),
- array(
- 'id' => 'active_off',
- 'value' => 0,
- 'label' => $this->l('No')
- )
- ),
- ),
- array(
- 'type' => 'switch',
- 'label' => $this->l('Would you like to send a confirmation email after subscription?'),
- 'name' => 'NW_CONFIRMATION_EMAIL',
- 'values' => array(
- array(
- 'id' => 'active_on',
- 'value' => 1,
- 'label' => $this->l('Yes')
- ),
- array(
- 'id' => 'active_off',
- 'value' => 0,
- 'label' => $this->l('No')
- )
- ),
- ),
- array(
- 'type' => 'text',
- 'label' => $this->l('Welcome voucher code'),
- 'name' => 'NW_VOUCHER_CODE',
- 'class' => 'fixed-width-md',
- 'desc' => $this->l('Leave blank to disable by default.')
- ),
- ),
- 'submit' => array(
- 'title' => $this->l('Save'),
- )
- ),
- );
-
- $helper = new HelperForm();
- $helper->show_toolbar = false;
- $helper->table = $this->table;
- $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
- $helper->default_form_language = $lang->id;
- $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
- $helper->identifier = $this->identifier;
- $helper->submit_action = 'submitUpdate';
- $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
- $helper->token = Tools::getAdminTokenLite('AdminModules');
- $helper->tpl_vars = array(
- 'fields_value' => $this->getConfigFieldsValues(),
- 'languages' => $this->context->controller->getLanguages(),
- 'id_language' => $this->context->language->id
- );
-
- return $helper->generateForm(array($fields_form));
- }
-
- public function renderExportForm()
- {
- $fields_form = array(
- 'form' => array(
- 'legend' => array(
- 'title' => $this->l('Export Newsletter Subscribers'),
- 'icon' => 'icon-envelope'
- ),
- 'desc' => array(
- array('text' => $this->l('Generate a .CSV file based on BlockNewsletter subscribers data. Only subscribers without an account on the shop will be exported.'))
- ),
- 'submit' => array(
- 'title' => $this->l('Export .CSV file'),
- 'class' => 'btn btn-default pull-right',
- 'name' => 'submitExportmodule',
- )
- ),
- );
-
- $helper = new HelperForm();
- $helper->table = $this->table;
- $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
- $helper->default_form_language = $lang->id;
- $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
- $helper->identifier = $this->identifier;
- $helper->submit_action = 'exportOnlyBlockNews';
- $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
- $helper->token = Tools::getAdminTokenLite('AdminModules');
- $helper->tpl_vars = array(
- 'fields_value' => $this->getConfigFieldsValues(),
- 'languages' => $this->context->controller->getLanguages(),
- 'id_language' => $this->context->language->id
- );
- return $helper->generateForm(array($fields_form));
- }
-
- public function renderSearchForm()
- {
- $fields_form = array(
- 'form' => array(
- 'legend' => array(
- 'title' => $this->l('Search for addresses'),
- 'icon' => 'icon-search'
- ),
- 'input' => array(
- array(
- 'type' => 'text',
- 'label' => $this->l('Email address to search'),
- 'name' => 'searched_email',
- 'class' => 'fixed-width-xxl',
- 'desc' => $this->l('Example: contact@prestashop.com or @prestashop.com')
- ),
- ),
- 'submit' => array(
- 'title' => $this->l('Search'),
- 'icon' => 'process-icon-refresh',
- )
- ),
- );
-
- $helper = new HelperForm();
- $helper->table = $this->table;
- $helper->identifier = $this->identifier;
- $helper->submit_action = 'searchEmail';
- $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
- $helper->token = Tools::getAdminTokenLite('AdminModules');
- $helper->tpl_vars = array(
- 'fields_value' => array('searched_email' => $this->_searched_email),
- 'languages' => $this->context->controller->getLanguages(),
- 'id_language' => $this->context->language->id
- );
-
- return $helper->generateForm(array($fields_form));
- }
-
- public function getConfigFieldsValues()
- {
- return array(
- 'NW_VERIFICATION_EMAIL' => Tools::getValue('NW_VERIFICATION_EMAIL', Configuration::get('NW_VERIFICATION_EMAIL')),
- 'NW_CONFIRMATION_EMAIL' => Tools::getValue('NW_CONFIRMATION_EMAIL', Configuration::get('NW_CONFIRMATION_EMAIL')),
- 'NW_VOUCHER_CODE' => Tools::getValue('NW_VOUCHER_CODE', Configuration::get('NW_VOUCHER_CODE')),
- );
- }
-
- public function getBlockNewsletterSubscriber()
- {
- $rq_sql = 'SELECT `id`, `email`, `newsletter_date_add`, `ip_registration_newsletter`
+ }
+
+ return Db::getInstance()->getValue($sql);
+ }
+
+ /**
+ * Ends the registration process to the newsletter
+ *
+ * @param string $token
+ *
+ * @return string
+ */
+ public function confirmEmail($token)
+ {
+ $activated = false;
+
+ if ($email = $this->getGuestEmailByToken($token)) {
+ $activated = $this->activateGuest($email);
+ } elseif ($email = $this->getUserEmailByToken($token)) {
+ $activated = $this->registerUser($email);
+ }
+
+ if (!$activated) {
+ return $this->l('This email is already registered and/or invalid.');
+ }
+
+ if ($discount = Configuration::get('NW_VOUCHER_CODE')) {
+ $this->sendVoucher($email, $discount);
+ }
+
+ if (Configuration::get('NW_CONFIRMATION_EMAIL')) {
+ $this->sendConfirmationEmail($email);
+ }
+
+ return $this->l('Thank you for subscribing to our newsletter.');
+ }
+
+ /**
+ * Send the confirmation mails to the given $email address if needed.
+ *
+ * @param string $email Email where to send the confirmation
+ *
+ * @note the email has been verified and might not yet been registered. Called by AuthController::processCustomerNewsletter
+ *
+ */
+ public function confirmSubscription($email)
+ {
+ if ($email) {
+ if ($discount = Configuration::get('NW_VOUCHER_CODE')) {
+ $this->sendVoucher($email, $discount);
+ }
+
+ if (Configuration::get('NW_CONFIRMATION_EMAIL')) {
+ $this->sendConfirmationEmail($email);
+ }
+ }
+ }
+
+ /**
+ * Send an email containing a voucher code
+ *
+ * @param $email
+ * @param $code
+ *
+ * @return bool|int
+ */
+ protected function sendVoucher($email, $code)
+ {
+ return Mail::Send($this->context->language->id, 'newsletter_voucher', Mail::l('Newsletter voucher', $this->context->language->id), array('{discount}' => $code), $email, null, null, null, null, null, dirname(__FILE__).'/mails/', false, $this->context->shop->id);
+ }
+
+ /**
+ * Send a confirmation email
+ *
+ * @param string $email
+ *
+ * @return bool
+ */
+ protected function sendConfirmationEmail($email)
+ {
+ return Mail::Send($this->context->language->id, 'newsletter_conf', Mail::l('Newsletter confirmation', $this->context->language->id), array(), pSQL($email), null, null, null, null, null, dirname(__FILE__).'/mails/', false, $this->context->shop->id);
+ }
+
+ /**
+ * Send a verification email
+ *
+ * @param string $email
+ * @param string $token
+ *
+ * @return bool
+ */
+ protected function sendVerificationEmail($email, $token)
+ {
+ $verif_url = Context::getContext()->link->getModuleLink(
+ 'blocknewsletter', 'verification', array(
+ 'token' => $token,
+ )
+ );
+
+ return Mail::Send($this->context->language->id, 'newsletter_verif', Mail::l('Email verification', $this->context->language->id), array('{verif_url}' => $verif_url), $email, null, null, null, null, null, dirname(__FILE__).'/mails/', false, $this->context->shop->id);
+ }
+
+ public function hookDisplayRightColumn($params)
+ {
+ return $this->hookDisplayLeftColumn($params);
+ }
+
+ protected function _prepareHook($params)
+ {
+ if (Tools::isSubmit('submitNewsletter')) {
+ $this->newsletterRegistration();
+ if ($this->error) {
+ $this->smarty->assign(
+ array(
+ 'color' => 'red',
+ 'msg' => $this->error,
+ 'nw_value' => isset($_POST['email']) ? pSQL($_POST['email']) : false,
+ 'nw_error' => true,
+ 'action' => $_POST['action']
+ )
+ );
+ } elseif ($this->valid) {
+ $this->smarty->assign(
+ array(
+ 'color' => 'green',
+ 'msg' => $this->valid,
+ 'nw_error' => false
+ )
+ );
+ }
+ }
+ $this->smarty->assign('this_path', $this->_path);
+ }
+
+ public function hookDisplayLeftColumn($params)
+ {
+ if (!isset($this->prepared) || !$this->prepared) {
+ $this->_prepareHook($params);
+ }
+ $this->prepared = true;
+ $this->smarty->assign(array('id_module' => $this->id));
+ return $this->display(__FILE__, 'blocknewsletter.tpl');
+ }
+
+ // by webkul
+ public function hookDisplayFooterNotificationHook($params)
+ {
+ return $this->hookDisplayLeftColumn($params);
+ }
+
+ // By webkul
+ // public function hookFooter($params)
+ // {
+ // return $this->hookDisplayLeftColumn($params);
+ // }
+
+ public function hookdisplayMaintenance($params)
+ {
+ return $this->hookDisplayLeftColumn($params);
+ }
+
+ public function hookDisplayHeader($params)
+ {
+ $this->context->controller->addJS(_PS_JS_DIR_.'validate.js');
+
+ $this->context->controller->addCSS($this->_path.'blocknewsletter.css', 'all');
+ $this->context->controller->addJS($this->_path.'blocknewsletter.js');
+ }
+
+ /**
+ * Deletes duplicates email in newsletter table
+ *
+ * @param $params
+ *
+ * @return bool
+ */
+ public function hookActionCustomerAccountAdd($params)
+ {
+ //if e-mail of the created user address has already been added to the newsletter through the blocknewsletter module,
+ //we delete it from blocknewsletter table to prevent duplicates
+ $id_shop = $params['newCustomer']->id_shop;
+ $email = $params['newCustomer']->email;
+ if (Validate::isEmail($email)) {
+ return (bool)Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'newsletter WHERE id_shop='.(int)$id_shop.' AND email=\''.pSQL($email)."'");
+ }
+
+ return true;
+ }
+
+ public function renderForm()
+ {
+ $fields_form = array(
+ 'form' => array(
+ 'legend' => array(
+ 'title' => $this->l('Settings'),
+ 'icon' => 'icon-cogs'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Would you like to send a verification email after subscription?'),
+ 'name' => 'NW_VERIFICATION_EMAIL',
+ 'values' => array(
+ array(
+ 'id' => 'active_on',
+ 'value' => 1,
+ 'label' => $this->l('Yes')
+ ),
+ array(
+ 'id' => 'active_off',
+ 'value' => 0,
+ 'label' => $this->l('No')
+ )
+ ),
+ ),
+ array(
+ 'type' => 'switch',
+ 'label' => $this->l('Would you like to send a confirmation email after subscription?'),
+ 'name' => 'NW_CONFIRMATION_EMAIL',
+ 'values' => array(
+ array(
+ 'id' => 'active_on',
+ 'value' => 1,
+ 'label' => $this->l('Yes')
+ ),
+ array(
+ 'id' => 'active_off',
+ 'value' => 0,
+ 'label' => $this->l('No')
+ )
+ ),
+ ),
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Welcome voucher code'),
+ 'name' => 'NW_VOUCHER_CODE',
+ 'class' => 'fixed-width-md',
+ 'desc' => $this->l('Leave blank to disable by default.')
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Save'),
+ )
+ ),
+ );
+
+ $helper = new HelperForm();
+ $helper->show_toolbar = false;
+ $helper->table = $this->table;
+ $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+ $helper->default_form_language = $lang->id;
+ $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+ $helper->identifier = $this->identifier;
+ $helper->submit_action = 'submitUpdate';
+ $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+ $helper->token = Tools::getAdminTokenLite('AdminModules');
+ $helper->tpl_vars = array(
+ 'fields_value' => $this->getConfigFieldsValues(),
+ 'languages' => $this->context->controller->getLanguages(),
+ 'id_language' => $this->context->language->id
+ );
+
+ return $helper->generateForm(array($fields_form));
+ }
+
+ public function renderExportForm()
+ {
+ $fields_form = array(
+ 'form' => array(
+ 'legend' => array(
+ 'title' => $this->l('Export Newsletter Subscribers'),
+ 'icon' => 'icon-envelope'
+ ),
+ 'desc' => array(
+ array('text' => $this->l('Generate a .CSV file based on BlockNewsletter subscribers data. Only subscribers without an account on the shop will be exported.'))
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Export .CSV file'),
+ 'class' => 'btn btn-default pull-right',
+ 'name' => 'submitExportmodule',
+ )
+ ),
+ );
+
+ $helper = new HelperForm();
+ $helper->table = $this->table;
+ $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+ $helper->default_form_language = $lang->id;
+ $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+ $helper->identifier = $this->identifier;
+ $helper->submit_action = 'exportOnlyBlockNews';
+ $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+ $helper->token = Tools::getAdminTokenLite('AdminModules');
+ $helper->tpl_vars = array(
+ 'fields_value' => $this->getConfigFieldsValues(),
+ 'languages' => $this->context->controller->getLanguages(),
+ 'id_language' => $this->context->language->id
+ );
+ return $helper->generateForm(array($fields_form));
+ }
+
+ public function renderSearchForm()
+ {
+ $fields_form = array(
+ 'form' => array(
+ 'legend' => array(
+ 'title' => $this->l('Search for addresses'),
+ 'icon' => 'icon-search'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Email address to search'),
+ 'name' => 'searched_email',
+ 'class' => 'fixed-width-xxl',
+ 'desc' => $this->l('Example: contact@qloapps.com or @qloapps.com')
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Search'),
+ 'icon' => 'process-icon-refresh',
+ )
+ ),
+ );
+
+ $helper = new HelperForm();
+ $helper->table = $this->table;
+ $helper->identifier = $this->identifier;
+ $helper->submit_action = 'searchEmail';
+ $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+ $helper->token = Tools::getAdminTokenLite('AdminModules');
+ $helper->tpl_vars = array(
+ 'fields_value' => array('searched_email' => $this->_searched_email),
+ 'languages' => $this->context->controller->getLanguages(),
+ 'id_language' => $this->context->language->id
+ );
+
+ return $helper->generateForm(array($fields_form));
+ }
+
+ public function getConfigFieldsValues()
+ {
+ return array(
+ 'NW_VERIFICATION_EMAIL' => Tools::getValue('NW_VERIFICATION_EMAIL', Configuration::get('NW_VERIFICATION_EMAIL')),
+ 'NW_CONFIRMATION_EMAIL' => Tools::getValue('NW_CONFIRMATION_EMAIL', Configuration::get('NW_CONFIRMATION_EMAIL')),
+ 'NW_VOUCHER_CODE' => Tools::getValue('NW_VOUCHER_CODE', Configuration::get('NW_VOUCHER_CODE')),
+ );
+ }
+
+ public function getBlockNewsletterSubscriber()
+ {
+ $rq_sql = 'SELECT `id`, `email`, `newsletter_date_add`, `ip_registration_newsletter`
FROM `'._DB_PREFIX_.'newsletter`
WHERE `active` = 1';
- if (Context::getContext()->cookie->shopContext)
- $rq_sql .= ' AND `id_shop` = '.(int)Context::getContext()->shop->id;
+ if (Context::getContext()->cookie->shopContext) {
+ $rq_sql .= ' AND `id_shop` = '.(int)Context::getContext()->shop->id;
+ }
- $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($rq_sql);
+ $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($rq_sql);
- $header = array('id_customer', 'email', 'newsletter_date_add', 'ip_address', 'http_referer');
- $result = (is_array($rq) ? array_merge(array($header), $rq) : $header);
+ $header = array('id_customer', 'email', 'newsletter_date_add', 'ip_address', 'http_referer');
+ $result = (is_array($rq) ? array_merge(array($header), $rq) : $header);
- return $result;
- }
+ return $result;
+ }
}
diff --git a/modules/blocknewsletter/config.xml b/modules/blocknewsletter/config.xml
deleted file mode 100644
index e7c7b1ec0..000000000
--- a/modules/blocknewsletter/config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/blocknewsletter/mails/ag/newsletter_conf.html b/modules/blocknewsletter/mails/ag/newsletter_conf.html
index 5c8c73da3..71b49ef0c 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/ag/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_conf.txt b/modules/blocknewsletter/mails/ag/newsletter_conf.txt
index d4971747a..6530ede34 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/ag/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hola,
+Hola,
-GRACIAS POR SUSCRIBIRSE A NUESTRO BOLETÍN.
+GRACIAS POR SUSCRIBIRSE A NUESTRO BOLETÍN.
{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ag/newsletter_verif.html b/modules/blocknewsletter/mails/ag/newsletter_verif.html
index 2cc4cf422..9786376c7 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/ag/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_verif.txt b/modules/blocknewsletter/mails/ag/newsletter_verif.txt
index ce98eae33..f38c71d0e 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/ag/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hola,
+Hola,
Gracias por suscribirse a nuestro boletín de noticias, confirmar su
solicitud haciendo clic en enlace de té abajo:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ag/newsletter_voucher.html b/modules/blocknewsletter/mails/ag/newsletter_voucher.html
index 48884b6d4..639c3dd2d 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/ag/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ag/newsletter_voucher.txt b/modules/blocknewsletter/mails/ag/newsletter_voucher.txt
index 36fd084fc..3b6959801 100644
--- a/modules/blocknewsletter/mails/ag/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/ag/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Hola,
+Hola,
Después de su suscripción a nuestro boletín, nos complace
-ofrecerle el siguiente cupón: {discount}
+ofrecerle el siguiente cupón: {discount}
{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ar/newsletter_conf.html b/modules/blocknewsletter/mails/ar/newsletter_conf.html
index 6051b0b51..8ca160dcd 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/ar/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ar/newsletter_conf.txt b/modules/blocknewsletter/mails/ar/newsletter_conf.txt
index 613527534..8ede9ed49 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/ar/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-مرحباً
+مرحباً
-شكراً لإشتراكك في النشرة البريدية.
+شكراً لإشتراكك في النشرة البريدية.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ar/newsletter_verif.html b/modules/blocknewsletter/mails/ar/newsletter_verif.html
index 5833dfe29..7cd02e4e2 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/ar/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ar/newsletter_verif.txt b/modules/blocknewsletter/mails/ar/newsletter_verif.txt
index b9f4defd6..3145b3341 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/ar/newsletter_verif.txt
@@ -1,15 +1,15 @@
-[{shop_url}]
+[{shop_url}]
-مرحباً
+مرحباً
شكرا لك لانضمامك الى خدمة الرسائل
الاخبارية، الرجاء تأكيد طلب الانضمام
الى الخدمة من خلال الضعط على الرابط
التالي:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ar/newsletter_voucher.html b/modules/blocknewsletter/mails/ar/newsletter_voucher.html
index ff69cbbcd..08542310a 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/ar/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ar/newsletter_voucher.txt b/modules/blocknewsletter/mails/ar/newsletter_voucher.txt
index ccb1ebe07..f255e32d6 100644
--- a/modules/blocknewsletter/mails/ar/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/ar/newsletter_voucher.txt
@@ -1,12 +1,12 @@
-[{shop_url}]
+[{shop_url}]
-مرحباً
+مرحباً
لانضمامك الى خدمة الرسائل
الاخبارية، يسعدنا ات تقدم لك القسيمة
-التالية: {discount}
+التالية: {discount}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/bg/newsletter_conf.html b/modules/blocknewsletter/mails/bg/newsletter_conf.html
index 9702e16df..e5a3cfba0 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/bg/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/bg/newsletter_conf.txt b/modules/blocknewsletter/mails/bg/newsletter_conf.txt
index edb369cb5..c764f0dbc 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/bg/newsletter_conf.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Здрасти,
+Здрасти,
БЛАГОДАРИМ ВИ ЗА АБОНИРАНЕТО ЗА
-НАШИЯТ БЮЛЕТИН.
+НАШИЯТ БЮЛЕТИН.
{shop_name} [{shop_url}] се управлява
-с PrestaShop(tm) [http://www.prestashop.com/]
+с Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/bg/newsletter_verif.html b/modules/blocknewsletter/mails/bg/newsletter_verif.html
index 138c819a6..405623925 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/bg/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/bg/newsletter_verif.txt b/modules/blocknewsletter/mails/bg/newsletter_verif.txt
index 467fbbf5e..ef5131dda 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/bg/newsletter_verif.txt
@@ -1,14 +1,14 @@
-[{shop_url}]
+[{shop_url}]
-Здрасти,
+Здрасти,
Благодарим Ви, че се абонирахте за
нашият бюлетин, моля потвърдете
Вашето желание с линка по-долу:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] се управлява
-с PrestaShop(tm) [http://www.prestashop.com/]
+с Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/bg/newsletter_voucher.html b/modules/blocknewsletter/mails/bg/newsletter_voucher.html
index b6ca8be92..327ef35ae 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/bg/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/bg/newsletter_voucher.txt b/modules/blocknewsletter/mails/bg/newsletter_voucher.txt
index 175319e03..c4939cf2c 100644
--- a/modules/blocknewsletter/mails/bg/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/bg/newsletter_voucher.txt
@@ -1,12 +1,12 @@
-[{shop_url}]
+[{shop_url}]
-Здрасти,
+Здрасти,
Взимайки предвид абонамента ви за
бюлетин, имаме удоволствието да Ви
-предложим следният ваучер: {discount}
+предложим следният ваучер: {discount}
{shop_name} [{shop_url}] се управлява
-с PrestaShop(tm) [http://www.prestashop.com/]
+с Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/br/newsletter_conf.html b/modules/blocknewsletter/mails/br/newsletter_conf.html
index 7d29ade49..4b1145311 100644
--- a/modules/blocknewsletter/mails/br/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/br/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/br/newsletter_conf.txt b/modules/blocknewsletter/mails/br/newsletter_conf.txt
index 5ba9b6c7f..47369d82d 100644
--- a/modules/blocknewsletter/mails/br/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/br/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Olá,
+Olá,
-OBRIGADO POR ASSINAR A NOSSA NEWSLETTER.
+OBRIGADO POR ASSINAR A NOSSA NEWSLETTER.
{shop_name} [{shop_url}] baseado em
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/br/newsletter_verif.html b/modules/blocknewsletter/mails/br/newsletter_verif.html
index 225f6eda3..d3b6c8612 100644
--- a/modules/blocknewsletter/mails/br/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/br/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/br/newsletter_verif.txt b/modules/blocknewsletter/mails/br/newsletter_verif.txt
index a9e444846..1d0d4507e 100644
--- a/modules/blocknewsletter/mails/br/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/br/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Olá,
+Olá,
Obrigado por se cadastrar na nossa newsletter, por favor confirme sua
solicitação clicando no link abaixo:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] baseado em
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/br/newsletter_voucher.html b/modules/blocknewsletter/mails/br/newsletter_voucher.html
index dcc81b43c..2c620769f 100644
--- a/modules/blocknewsletter/mails/br/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/br/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/br/newsletter_voucher.txt b/modules/blocknewsletter/mails/br/newsletter_voucher.txt
index 3ab752d13..4905f3267 100644
--- a/modules/blocknewsletter/mails/br/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/br/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Olá,
+Olá,
Por se cadastrar na nossa newsletter, nós temos o prazer de lhe
-oferecer o seguinte cupom de desconto: {discount}
+oferecer o seguinte cupom de desconto: {discount}
{shop_name} [{shop_url}] baseado em
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ca/newsletter_conf.html b/modules/blocknewsletter/mails/ca/newsletter_conf.html
index 567118d64..f80694709 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/ca/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ca/newsletter_conf.txt b/modules/blocknewsletter/mails/ca/newsletter_conf.txt
index 316af3cb3..8ec54e5c4 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/ca/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Ei,
+Ei,
-GRÀCIES PER SUBSCRIURE-US A LA NOSTRA NEWSLETTER.
+GRÀCIES PER SUBSCRIURE-US A LA NOSTRA NEWSLETTER.
{shop_name} [{shop_url}] desenvolupat amb
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ca/newsletter_verif.html b/modules/blocknewsletter/mails/ca/newsletter_verif.html
index add526eda..19a3eb061 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/ca/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ca/newsletter_verif.txt b/modules/blocknewsletter/mails/ca/newsletter_verif.txt
index 56283f6e5..254474ba6 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/ca/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Ei,
+Ei,
Gràcies per subscriure-us al nostre butlletí, si us plau confirmeu
la petició fent clic sobre l'enllaç de sota:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] desenvolupat amb
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/ca/newsletter_voucher.html b/modules/blocknewsletter/mails/ca/newsletter_voucher.html
index 1d3134ddb..bd2f7e413 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/ca/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/ca/newsletter_voucher.txt b/modules/blocknewsletter/mails/ca/newsletter_voucher.txt
index 57bea55fc..64443b924 100644
--- a/modules/blocknewsletter/mails/ca/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/ca/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Ei,
+Ei,
Quant a la subscripció a la newsletter, ens plau oferir-vos el
-següent cupó de descompte: {discount}
+següent cupó de descompte: {discount}
{shop_name} [{shop_url}] desenvolupat amb
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/de/newsletter_conf.html b/modules/blocknewsletter/mails/de/newsletter_conf.html
index 233ea3e10..90c4bf029 100644
--- a/modules/blocknewsletter/mails/de/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/de/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/de/newsletter_conf.txt b/modules/blocknewsletter/mails/de/newsletter_conf.txt
index 352da3d54..cb4a2e9d0 100644
--- a/modules/blocknewsletter/mails/de/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/de/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hallo,
+Hallo,
-VIELEN DANK FÜR IHRE ANMELDUNG ZU UNSEREM NEWSLETTER.
+VIELEN DANK FÜR IHRE ANMELDUNG ZU UNSEREM NEWSLETTER.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/de/newsletter_verif.html b/modules/blocknewsletter/mails/de/newsletter_verif.html
index 74f4a59f0..fab17c27a 100644
--- a/modules/blocknewsletter/mails/de/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/de/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/de/newsletter_verif.txt b/modules/blocknewsletter/mails/de/newsletter_verif.txt
index e42f9e868..d4e820bd3 100644
--- a/modules/blocknewsletter/mails/de/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/de/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hallo,
+Hallo,
Sie haben sich soeben für unseren Newsletter angemeldet. Bitte
bestätigen Sie Ihre Anmeldung durch Klick auf den folgenden Link:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/de/newsletter_voucher.html b/modules/blocknewsletter/mails/de/newsletter_voucher.html
index 8f6aefa52..b73bf0095 100644
--- a/modules/blocknewsletter/mails/de/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/de/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/de/newsletter_voucher.txt b/modules/blocknewsletter/mails/de/newsletter_voucher.txt
index 249f876ca..d0906aba3 100644
--- a/modules/blocknewsletter/mails/de/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/de/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Hallo,
+Hallo,
Sie haben unseren Newsletter abonniert. Als Dankeschön erhalten
-Sie den folgenden Gutschein: {discount}
+Sie den folgenden Gutschein: {discount}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.html b/modules/blocknewsletter/mails/en/newsletter_conf.html
index 64e32760e..7f61bd741 100644
--- a/modules/blocknewsletter/mails/en/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/en/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/en/newsletter_conf.txt b/modules/blocknewsletter/mails/en/newsletter_conf.txt
index 84fae8604..06aedc7a5 100644
--- a/modules/blocknewsletter/mails/en/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/en/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hi,
+Hi,
-THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
+THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.html b/modules/blocknewsletter/mails/en/newsletter_verif.html
index c307e98d4..334242ed4 100644
--- a/modules/blocknewsletter/mails/en/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/en/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/en/newsletter_verif.txt b/modules/blocknewsletter/mails/en/newsletter_verif.txt
index 995296d07..0ccad6a66 100644
--- a/modules/blocknewsletter/mails/en/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/en/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hi,
+Hi,
Thank you for subscribing to our newsletter, please confirm your
request by clicking the link below :
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.html b/modules/blocknewsletter/mails/en/newsletter_voucher.html
index 4841b6266..9340e71c7 100644
--- a/modules/blocknewsletter/mails/en/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/en/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/en/newsletter_voucher.txt b/modules/blocknewsletter/mails/en/newsletter_voucher.txt
index b7d7994e1..e0ffda37b 100644
--- a/modules/blocknewsletter/mails/en/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/en/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Hi,
+Hi,
Regarding your newsletter subscription, we are pleased to offer
-you the following voucher: {discount}
+you the following voucher: {discount}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/es/newsletter_conf.html b/modules/blocknewsletter/mails/es/newsletter_conf.html
index 5c8c73da3..71b49ef0c 100644
--- a/modules/blocknewsletter/mails/es/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/es/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/es/newsletter_conf.txt b/modules/blocknewsletter/mails/es/newsletter_conf.txt
index d4971747a..6530ede34 100644
--- a/modules/blocknewsletter/mails/es/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/es/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hola,
+Hola,
-GRACIAS POR SUSCRIBIRSE A NUESTRO BOLETÍN.
+GRACIAS POR SUSCRIBIRSE A NUESTRO BOLETÍN.
{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/es/newsletter_verif.html b/modules/blocknewsletter/mails/es/newsletter_verif.html
index 2cc4cf422..9786376c7 100644
--- a/modules/blocknewsletter/mails/es/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/es/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/es/newsletter_verif.txt b/modules/blocknewsletter/mails/es/newsletter_verif.txt
index ce98eae33..f38c71d0e 100644
--- a/modules/blocknewsletter/mails/es/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/es/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hola,
+Hola,
Gracias por suscribirse a nuestro boletín de noticias, confirmar su
solicitud haciendo clic en enlace de té abajo:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/es/newsletter_voucher.html b/modules/blocknewsletter/mails/es/newsletter_voucher.html
index 48884b6d4..639c3dd2d 100644
--- a/modules/blocknewsletter/mails/es/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/es/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/es/newsletter_voucher.txt b/modules/blocknewsletter/mails/es/newsletter_voucher.txt
index 36fd084fc..3b6959801 100644
--- a/modules/blocknewsletter/mails/es/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/es/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Hola,
+Hola,
Después de su suscripción a nuestro boletín, nos complace
-ofrecerle el siguiente cupón: {discount}
+ofrecerle el siguiente cupón: {discount}
{shop_name} [{shop_url}] creado por
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/fr/newsletter_conf.html b/modules/blocknewsletter/mails/fr/newsletter_conf.html
index 4199d4f60..927469d8f 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/fr/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/fr/newsletter_conf.txt b/modules/blocknewsletter/mails/fr/newsletter_conf.txt
index fac96ab6e..7bbb2f737 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/fr/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Bonjour,
+Bonjour,
-MERCI DE VOUS ÊTRE INSCRIT À NOTRE NEWSLETTER.
+MERCI DE VOUS ÊTRE INSCRIT À NOTRE NEWSLETTER.
{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/fr/newsletter_verif.html b/modules/blocknewsletter/mails/fr/newsletter_verif.html
index aa5bf6f51..7963737d7 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/fr/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/fr/newsletter_verif.txt b/modules/blocknewsletter/mails/fr/newsletter_verif.txt
index 0906968b3..ba1c66f84 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/fr/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Bonjour,
+Bonjour,
Merci de vous être inscrit à notre newsletter, veuillez confirmer
votre inscription en cliquant sur le lien ci-dessous :
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/fr/newsletter_voucher.html b/modules/blocknewsletter/mails/fr/newsletter_voucher.html
index 5e774c47d..03509f156 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/fr/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/fr/newsletter_voucher.txt b/modules/blocknewsletter/mails/fr/newsletter_voucher.txt
index f262f61dd..a6e7383ec 100644
--- a/modules/blocknewsletter/mails/fr/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/fr/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Bonjour,
+Bonjour,
En remerciement pour votre inscription à notre newsletter nous
-avons le plaisir de vous offrir un bon de réduction : {discount}
+avons le plaisir de vous offrir un bon de réduction : {discount}
{shop_name} [{shop_url}] réalisé avec
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/gl/newsletter_conf.html b/modules/blocknewsletter/mails/gl/newsletter_conf.html
index 64e32760e..7f61bd741 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/gl/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/gl/newsletter_conf.txt b/modules/blocknewsletter/mails/gl/newsletter_conf.txt
index 84fae8604..06aedc7a5 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/gl/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hi,
+Hi,
-THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
+THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER.
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/gl/newsletter_verif.html b/modules/blocknewsletter/mails/gl/newsletter_verif.html
index c307e98d4..334242ed4 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/gl/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/gl/newsletter_verif.txt b/modules/blocknewsletter/mails/gl/newsletter_verif.txt
index 995296d07..0ccad6a66 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/gl/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hi,
+Hi,
Thank you for subscribing to our newsletter, please confirm your
request by clicking the link below :
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/gl/newsletter_voucher.html b/modules/blocknewsletter/mails/gl/newsletter_voucher.html
index 4841b6266..9340e71c7 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/gl/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/gl/newsletter_voucher.txt b/modules/blocknewsletter/mails/gl/newsletter_voucher.txt
index b7d7994e1..e0ffda37b 100644
--- a/modules/blocknewsletter/mails/gl/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/gl/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Hi,
+Hi,
Regarding your newsletter subscription, we are pleased to offer
-you the following voucher: {discount}
+you the following voucher: {discount}
{shop_name} [{shop_url}] powered by
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/id/newsletter_conf.html b/modules/blocknewsletter/mails/id/newsletter_conf.html
index 4916e5e8c..87d9d1171 100644
--- a/modules/blocknewsletter/mails/id/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/id/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/id/newsletter_conf.txt b/modules/blocknewsletter/mails/id/newsletter_conf.txt
index 5acf91e55..f34b37d00 100644
--- a/modules/blocknewsletter/mails/id/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/id/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Halo,
+Halo,
-TERIMA KASIH TELAH BERLANGGANAN NEWSLETTER KAMI.
+TERIMA KASIH TELAH BERLANGGANAN NEWSLETTER KAMI.
{shop_name} [{shop_url}] didukung oleh
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/id/newsletter_verif.html b/modules/blocknewsletter/mails/id/newsletter_verif.html
index eb62b290c..a01eca993 100644
--- a/modules/blocknewsletter/mails/id/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/id/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/id/newsletter_verif.txt b/modules/blocknewsletter/mails/id/newsletter_verif.txt
index ff2e5b5c7..043de7f3a 100644
--- a/modules/blocknewsletter/mails/id/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/id/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Halo,
+Halo,
Terima kasih telah berlangganan newsletter, silahkan konfirmasi
dengan klik pada tautan berikut :
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] didukung oleh
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/id/newsletter_voucher.html b/modules/blocknewsletter/mails/id/newsletter_voucher.html
index 11ee6a1a9..4445bd468 100644
--- a/modules/blocknewsletter/mails/id/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/id/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/id/newsletter_voucher.txt b/modules/blocknewsletter/mails/id/newsletter_voucher.txt
index 8f14d2535..ed063e8f0 100644
--- a/modules/blocknewsletter/mails/id/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/id/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Halo,
+Halo,
Karena telah berlangganan newsletter, kami dengan senang hati
-menawarkan voucher berikut: {discount}
+menawarkan voucher berikut: {discount}
{shop_name} [{shop_url}] didukung oleh
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/nl/newsletter_conf.html b/modules/blocknewsletter/mails/nl/newsletter_conf.html
index 6016ba388..8415c5f61 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_conf.html
+++ b/modules/blocknewsletter/mails/nl/newsletter_conf.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/nl/newsletter_conf.txt b/modules/blocknewsletter/mails/nl/newsletter_conf.txt
index 430e5a55f..bc0247a31 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_conf.txt
+++ b/modules/blocknewsletter/mails/nl/newsletter_conf.txt
@@ -1,10 +1,10 @@
-[{shop_url}]
+[{shop_url}]
-Hallo,
+Hallo,
-BEDANKT VOOR UW INSCHRIJVING OP ONZE NIEUWSBRIEF
+BEDANKT VOOR UW INSCHRIJVING OP ONZE NIEUWSBRIEF
{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/nl/newsletter_verif.html b/modules/blocknewsletter/mails/nl/newsletter_verif.html
index 07b8ce18f..cffdf6e46 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_verif.html
+++ b/modules/blocknewsletter/mails/nl/newsletter_verif.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/nl/newsletter_verif.txt b/modules/blocknewsletter/mails/nl/newsletter_verif.txt
index 8f539036d..f3caf4f4e 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_verif.txt
+++ b/modules/blocknewsletter/mails/nl/newsletter_verif.txt
@@ -1,13 +1,13 @@
-[{shop_url}]
+[{shop_url}]
-Hallo,
+Hallo,
Hartelijk dank voor uw inschrijving op onze nieuwsbrief. Bevestig uw
aanvraag door te klikken op de volgende link:
-{verif_url} [{verif_url}]
+{verif_url} [{verif_url}]
{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/mails/nl/newsletter_voucher.html b/modules/blocknewsletter/mails/nl/newsletter_voucher.html
index 5280c81bb..f2d88e1b0 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_voucher.html
+++ b/modules/blocknewsletter/mails/nl/newsletter_voucher.html
@@ -4,51 +4,51 @@
diff --git a/modules/blocknewsletter/mails/nl/newsletter_voucher.txt b/modules/blocknewsletter/mails/nl/newsletter_voucher.txt
index f48e8fdd0..d56179cc7 100644
--- a/modules/blocknewsletter/mails/nl/newsletter_voucher.txt
+++ b/modules/blocknewsletter/mails/nl/newsletter_voucher.txt
@@ -1,11 +1,11 @@
-[{shop_url}]
+[{shop_url}]
-Hallo,
+Hallo,
Naar aanleiding van uw nieuwsbrief inschrijving bieden wij u graag
-de volgende waardebon aan: {discount}
+de volgende waardebon aan: {discount}
{shop_name} [{shop_url}] gebouwd met
-PrestaShop(tm) [http://www.prestashop.com/]
+Webkul(tm) [https://webkul.com/]
diff --git a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
index d9aad3071..be560aac7 100644
--- a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
+++ b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
@@ -22,27 +22,31 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
+
-