diff --git a/admin-dev/themes/default/template/controllers/stats/menu.tpl b/admin-dev/themes/default/template/controllers/stats/menu.tpl index d94a14790..28f0f1480 100644 --- a/admin-dev/themes/default/template/controllers/stats/menu.tpl +++ b/admin-dev/themes/default/template/controllers/stats/menu.tpl @@ -28,7 +28,7 @@ {if count($modules)} {foreach $modules as $module} {if $module_instance[$module.name]} - {$module_instance[$module.name]->displayName} + {$module_instance[$module.name]->displayName} {/if} {/foreach} {else} diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 511adead4..118823fb4 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -283,6 +283,11 @@ $('#bo_query').attr("placeholder",$(this).data('placeholder')); $('#bo_query').focus(); }); + {if isset($search_type) && $search_type} + $(document).ready(function() { + $('.search-option a[data-value='+{$search_type|intval}+']').click(); + }); + {/if} + + + Reference + Product + Unit price + Quantity + Total price + + + + + + {items} + + + + Products + {total_products} + + + Discounts + {total_discounts} + + + Gift-wrapping + {total_wrapping} + + + Shipping + {total_shipping} + + + Total Tax paid + {total_tax_paid} + + + Total paid + {total_paid} + + + + + + + +

+ Carrier:

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

+ Delivery address

+ + {delivery_block_html} + 		  +

+ Billing address

+ + {invoice_block_html} + +
+ + + +   + + + +

+ Customer message:

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

Current stock cover: {current_coverage}

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

+ {product} is almost out of stock.

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

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

Remaining stock: {qty}

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

+ {product} is nearly out of stock.

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

+ Remaining stock: {qty}

+ You are advised to open the product's admin Product Page in order to replenish your inventory. +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/mailalerts/mails/en/productoutofstock.txt b/modules/mailalerts/mails/en/productoutofstock.txt index a6ca33698..f8d85ce70 100644 --- a/modules/mailalerts/mails/en/productoutofstock.txt +++ b/modules/mailalerts/mails/en/productoutofstock.txt @@ -1,11 +1,16 @@ -Hi, - -The product {product} is nearly out of stock. -The remaining stock is now less than the specified minimum of {last_qty}. -Remaining stock : {qty} - -You are advised to open the product's admin Product Page in order to replenish your inventory. - - - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi, + +{product} is nearly out of stock. The remaining stock is now less +than the specified minimum of {LAST_QTY}. + +REMAINING STOCK: {qty} + +You are advised to open the product's admin Product Page in order to +replenish your inventory. + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/mailalerts/mails/en/src/customer_qty.php b/modules/mailalerts/mails/en/src/customer_qty.php index 3beb53872..ddf48d5da 100644 --- a/modules/mailalerts/mails/en/src/customer_qty.php +++ b/modules/mailalerts/mails/en/src/customer_qty.php @@ -11,7 +11,7 @@

- {product} +



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

- {product} +

- {warning_coverage}.

+ {warning_coverage}.

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

- {product} +

{last_qty}.

diff --git a/modules/referralprogram/mails/en/footer.html b/modules/referralprogram/mails/en/footer.html new file mode 100644 index 000000000..dd4e09026 --- /dev/null +++ b/modules/referralprogram/mails/en/footer.html @@ -0,0 +1,15 @@ + +   + + + + {shop_name} powered by PrestaShop™ + + + + +   + + + + \ No newline at end of file diff --git a/modules/referralprogram/mails/en/footer.txt b/modules/referralprogram/mails/en/footer.txt new file mode 100644 index 000000000..075985bd1 --- /dev/null +++ b/modules/referralprogram/mails/en/footer.txt @@ -0,0 +1,4 @@ + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/referralprogram/mails/en/header.html b/modules/referralprogram/mails/en/header.html new file mode 100644 index 000000000..3824b9a1a --- /dev/null +++ b/modules/referralprogram/mails/en/header.html @@ -0,0 +1,21 @@ + + + + + + Message from {shop_name} + + + + + + + + + + + + +
  + + + + diff --git a/modules/referralprogram/mails/en/header.txt b/modules/referralprogram/mails/en/header.txt new file mode 100644 index 000000000..9b4c415ee --- /dev/null +++ b/modules/referralprogram/mails/en/header.txt @@ -0,0 +1,3 @@ + +[{shop_url}] + diff --git a/modules/referralprogram/mails/en/referralprogram-congratulations.html b/modules/referralprogram/mails/en/referralprogram-congratulations.html index 70c65c205..787cb1cd4 100644 --- a/modules/referralprogram/mails/en/referralprogram-congratulations.html +++ b/modules/referralprogram/mails/en/referralprogram-congratulations.html @@ -1,46 +1,61 @@ + - - - Message from {shop_name} - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{shop_name}
 
Congratulations!
 
Your referred friend, {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!
 
We are pleased to offer you a voucher worth {discount_display} (voucher # {discount_name}) that you can use on your next order.
 
Best regards,
 
{shop_name} powered by PrestaShop™
- + + + Message from {shop_name} + + + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Congratulations! +
 
+ + Your referred friend {sponsored_firstname} {sponsored_lastname} has placed his or her first order on {shop_name}!

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

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

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

+ Referral Program

+ + We have created a voucher in your name for referring a friend.
+ Here is the code of your voucher: {voucher_num}, with an amount of {voucher_amount}.

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

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

+ + Click here to view this item: {product} + +
 
+ {shop_name} powered by PrestaShop™ +
+ 		 
+ \ No newline at end of file diff --git a/modules/sendtoafriend/mails/en/send_to_a_friend.txt b/modules/sendtoafriend/mails/en/send_to_a_friend.txt index 861755ddd..58c4a0d9f 100644 --- a/modules/sendtoafriend/mails/en/send_to_a_friend.txt +++ b/modules/sendtoafriend/mails/en/send_to_a_friend.txt @@ -1,13 +1,14 @@ -Hi {name}, - - -{customer} has sent you a link to a product that (s)he thinks may interest you. - -{product}: {product_link} - - -{shop_name} - {shop_url} - - - -{shop_url} powered by PrestaShop™ \ No newline at end of file + +[{shop_url}] + +Hi {name}, + +Thank you for creating a customer account at {shop_name}. + +{customer} has sent you a link to a product that (s)he thinks may +interest you. Click here to view this item: {product} +[{product_link}] + +{shop_name} [{shop_url}] powered by +PrestaShop(tm) [http://www.prestashop.com/] + diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index e24ebb4c0..7ec4ada40 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -75,7 +75,8 @@ class StatsPersonalInfos extends ModuleGraph

'; - if (count(Customer::getCustomers())) + $has_customers = (bool)Db::getInstance()->getValue('SELECT id_customer FROM '._DB_PREFIX_.'customer'); + if ($has_customers) { if (Tools::getValue('export')) if (Tools::getValue('exportType') == 'gender')