dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-07 16:48:56 +01:00
parent b51b388eaa 75171c77dd
commit 01d8376ee7
729 changed files with 8289 additions and 30730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bankwire/bankwire.php
+2 -1
View File
@@ -54,7 +54,8 @@ class BankWire extends PaymentModule
if (isset($config['BANK_WIRE_ADDRESS']))
$this->address = $config['BANK_WIRE_ADDRESS'];
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Bank Wire');
$this->description = $this->l('Accept payments for your products via bank wire.');
modules/blockadvertising/blockadvertising.php
+2 -1
View File
@@ -49,7 +49,8 @@ class BlockAdvertising extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Block advertising');
$this->description = $this->l('Adds an advertisement block to selected sections of your e-commerce webiste.');
modules/blockbestsellers/blockbestsellers.php
+2 -1
View File
@@ -41,7 +41,8 @@ class BlockBestSellers extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Top-seller block');
$this->description = $this->l('Add a block displaying your store\'s top-selling products.');
modules/blockcart/blockcart.php
+2 -1
View File
@@ -37,7 +37,8 @@ class BlockCart extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Cart block');
$this->description = $this->l('Adds a block containing the customer\'s shopping cart.');
modules/blockcategories/blockcategories.php
+2 -1
View File
@@ -36,7 +36,8 @@ class BlockCategories extends Module
$this->version = '2.2';
$this->author = 'PrestaShop';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Categories block');
$this->description = $this->l('Adds a block featuring product categories.');
modules/blockcms/blockcms.php
+2 -1
View File
@@ -43,7 +43,8 @@ class BlockCms extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('CMS Block');
$this->description = $this->l('Adds a block with several CMS links.');
modules/blockcontact/blockcontact.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

modules/blockcontact/blockcontact.php
+2 -1
View File
@@ -35,7 +35,8 @@ class Blockcontact extends Module
$this->tab = 'front_office_features';
$this->version = '1.0';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Contact Block');
$this->description = $this->l('Allows you to add additional information about your store\'s customer service.');
modules/blockcontact/logo.gif
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 983 B

modules/blockcontactinfos/blockcontactinfos.php
+2 -1
View File
@@ -39,7 +39,8 @@ class Blockcontactinfos extends Module
$this->tab = 'Blocks';
$this->version = '1.0';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Block contact info');
$this->description = $this->l('This module will allow you to display your e-store\'s contact information in a customizable block.');
modules/blockcustomerprivacy/blockcustomerprivacy.php
+2 -1
View File
@@ -40,7 +40,8 @@ class Blockcustomerprivacy extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Customer data privacy block.');
$this->description = $this->l('Adds a block displaying a message about a customer\'s privacy data. ');
modules/blocklink/blocklink.php
+2 -1
View File
@@ -40,7 +40,8 @@ class BlockLink extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Link block');
$this->description = $this->l('Adds a block with additional links.');
modules/blockmanufacturer/blockmanufacturer.php
+2 -1
View File
@@ -37,7 +37,8 @@ class BlockManufacturer extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Manufacturers block');
$this->description = $this->l('Displays a block listing product manufacturers and/or brands.');
modules/blocknewproducts/blocknewproducts.php
+2 -1
View File
@@ -37,7 +37,8 @@ class BlockNewProducts extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('New products block');
$this->description = $this->l('Displays a block featuring your store\'s newest products.');
modules/blocknewsletter/blocknewsletter.php
+2 -1
View File
@@ -40,7 +40,8 @@ class Blocknewsletter extends Module
$this->tab = 'front_office_features';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Newsletter block');
$this->description = $this->l('Adds a block for newsletter subscription.');
modules/blocknewsletter/mails/en/header.html
+4 -4
View File
@@ -6,14 +6,14 @@
<title>Message from {shop_name}</title>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
modules/blocknewsletter/mails/en/newsletter_conf.html
+66 -10
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,25 +77,25 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<span style="color:#777"><strong>
Thank you for subscribing to our newsletter. </strong></span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/blocknewsletter/mails/en/newsletter_verif.html
+66 -10
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,15 +77,15 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<span style="color:#777">
Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :<br/>
<span style="color:#333"><strong><a href="{verif_url}" style="color:#337ff1">{verif_url}</a></strong></span>
@@ -38,10 +94,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/blocknewsletter/mails/en/newsletter_verif.txt
+1 -1
View File
@@ -6,7 +6,7 @@ Hi,
Thank you for subscribing to our newsletter, please confirm your
request by clicking the link below :
{VERIF_URL} [HTTP://SAFE.SHELL.LA/{VERIF_URL}]
{verif_url} [HTTP://SAFE.SHELL.LA/{verif_url}]
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
modules/blocknewsletter/mails/en/newsletter_voucher.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Newsletter subscription </p>
<span style="color:#777">
Regarding your newsletter subscription, we are pleased to offer you the following voucher: <span style="color:#333"><strong>{discount}</strong></span>
@@ -39,10 +95,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/blocknewsletter/mails/en/newsletter_voucher.txt
+2 -2
View File
@@ -3,8 +3,8 @@
Hi,
Newsletter subscription Regarding your newsletter subscription, we
are pleased to offer you the following voucher: {DISCOUNT}
Regarding your newsletter subscription, we are pleased to offer
you the following voucher: {discount}
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
modules/blockpaymentlogo/blockpaymentlogo.php
+2 -1
View File
@@ -37,7 +37,8 @@ class BlockPaymentLogo extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Payment logo block.');
$this->description = $this->l('This block will display all of your payment logos.');
modules/blockreinsurance/blockreinsurance.php
+2 -1
View File
@@ -41,7 +41,8 @@ class Blockreinsurance extends Module
$this->tab = 'Blocks';
$this->version = '2.0';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Customer reassurance block');
$this->description = $this->l('Adds an information block aimed at offering helpful information to reassure customers that your store is trustworthy.');
modules/blockrss/blockrss.php
+2 -1
View File
@@ -41,7 +41,8 @@ class Blockrss extends Module
$this->tab = 'front_office_features';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('RSS feed block');
$this->description = $this->l('Adds a block displaying an RSS feed.');
modules/blocksocial/blocksocial.php
+2 -1
View File
@@ -35,7 +35,8 @@ class blocksocial extends Module
$this->tab = 'front_office_features';
$this->version = '1.0';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Social networking block');
$this->description = $this->l('Allows you to add information about your brand\'s social networking sites.');
modules/blocksocial/logo.gif
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 983 B

modules/blockspecials/blockspecials.php
+2 -1
View File
@@ -40,7 +40,8 @@ class BlockSpecials extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Specials block');
$this->description = $this->l('Adds a block displaying current product specials.');
modules/blockstore/blockstore.php
+2 -1
View File
@@ -37,7 +37,8 @@ class BlockStore extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Store locator block');
$this->description = $this->l('Displays a store locator link directly on your webiste.');
modules/blocksupplier/blocksupplier.php
+2 -1
View File
@@ -37,7 +37,8 @@ class BlockSupplier extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Suppliers block');
$this->description = $this->l('Adds a block displaying product suppliers.');
modules/blocktags/blocktags.php
+2 -1
View File
@@ -39,7 +39,8 @@ class BlockTags extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Tags block');
$this->description = $this->l('Adds a block containing product tags.');
modules/blocktopmenu/blocktopmenu.php
+2 -1
View File
@@ -55,7 +55,8 @@ class Blocktopmenu extends Module
$this->version = 1.6;
$this->author = 'PrestaShop';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Top horizontal menu');
$this->description = $this->l('Add a new horizontal menu to the top of your e-commerce website.');
modules/blockviewed/blockviewed.php
+2 -1
View File
@@ -40,7 +40,8 @@ class BlockViewed extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Viewed products block.');
$this->description = $this->l('Adds a block displaying recently viewed products.');
modules/blockwishlist/blockwishlist.php
+2 -1
View File
@@ -42,7 +42,8 @@ class BlockWishList extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Wishlist block');
$this->description = $this->l('Adds a block containing the customer\'s wishlists.');
modules/blockwishlist/mails/en/header.html
+4 -4
View File
@@ -6,14 +6,14 @@
<title>Message from {shop_name}</title>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
modules/blockwishlist/mails/en/wishlink.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Message from {shop_name} </p>
<span style="color:#777">
<span style="color:#333"><strong>{shop_name}</strong></span> invites you to send this link to your friends, so they can see your wishlist: <span style="color:#333"><strong>{wishlist}</strong></span><br /><br />
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/blockwishlist/mails/en/wishlink.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
Message from {shop_name} {SHOP_NAME} invites you to send this link to
your friends, so they can see your wishlist: {WISHLIST}
Message from {shop_name}
{shop_name} invites you to send this link to your friends, so they
can see your wishlist: {wishlist}
{message} [{message}]
modules/blockwishlist/mails/en/wishlist.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Message from {shop_name} </p>
<span style="color:#777">
<span style="color:#333"><strong>{firstname} {lastname}</strong></span> indicated you may want to see his/her wishlist: <span style="color:#333"><strong>{wishlist}</strong></span><br /><br />
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/blockwishlist/mails/en/wishlist.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
Message from {shop_name} {FIRSTNAME} {LASTNAME} indicated you may
want to see his/her wishlist: {WISHLIST}
Message from {shop_name}
{firstname} {lastname} indicated you may want to see his/her
wishlist: {wishlist}
{wishlist} [{message}]
modules/carriercompare/carriercompare.php
+2 -1
View File
@@ -40,7 +40,8 @@ class CarrierCompare extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Shipping Estimate');
$this->description = $this->l('Compares carrier choices before checkout.');
modules/cheque/cheque.php
+2 -1
View File
@@ -52,7 +52,8 @@ class Cheque extends PaymentModule
if (isset($config['CHEQUE_ADDRESS']))
$this->address = $config['CHEQUE_ADDRESS'];
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Payments by check');
$this->description = $this->l('This module allows you to accept payments by check.');
modules/crossselling/crossselling.php
+2 -1
View File
@@ -39,7 +39,8 @@ class CrossSelling extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Cross Selling');
$this->description = $this->l('Customers who bought this product also bought:');
modules/dashactivity/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1018 B

modules/dashactivity/views/js/dashactivity.js
+4 -4
View File
@@ -102,11 +102,11 @@ Date.prototype.format = function(format) {
}
$(document).ready(function() {
if (date_subtitle === undefined)
date_subtitle = '(from %s to %s)';
if (typeof date_subtitle === "undefined")
var date_subtitle = '(from %s to %s)';
if (date_format === undefined)
date_format = 'Y-m-d';
if (typeof date_format === "undefined")
var date_format = 'Y-m-d';
$('#date-start').change(function() {
start = Date.parseDate($('#date-start').val(), 'Y-m-d');
modules/dashgoals/controllers/admin/ajax.php → modules/dashgoals/controllers/admin/AdminDashgoalsController.php
+15 -6
View File
@@ -25,12 +25,21 @@
* International Registered Trademark & Property of PrestaShop SA
*/
class DashGoalsAjaxModuleAdminController extends ModuleAdminController
class AdminDashgoalsController extends ModuleAdminController
{
public function initContent()
{
parent::initContent();
die ('Todo');
public function ajaxProcessChangeConfYear()
{
$year = (int)Tools::getValue('year');
Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', $year);
$months = $this->module->setMonths($year);
$this->context->smarty->assign(array(
'currency' => $this->context->currency,
'goals_year' => $year,
'goals_months' => $months,
'link' => $this->context->link
));
echo $this->module->display(_PS_MODULE_DIR_.$this->module->name.DIRECTORY_SEPARATOR.$this->module->name.'.php', 'config.tpl');
}
}
modules/dashgoals/dashgoals.php
+40 -8
View File
@@ -60,6 +60,7 @@ class Dashgoals extends Module
public function install()
{
Configuration::updateValue('PS_DASHGOALS_CURRENT_YEAR', date('Y'));
for ($month = '01'; $month <= 12; $month = sprintf('%02d', $month + 1))
{
$key = strtoupper('dashgoals_traffic_'.$month.'_'.date('Y'));
@@ -73,23 +74,44 @@ class Dashgoals extends Module
ConfigurationKPI::updateValue($key, 80);
}
// Prepare tab
$tab = new Tab();
$tab->active = 1;
$tab->class_name = "AdminDashgoals";
$tab->name = array();
foreach (Language::getLanguages(true) as $lang)
$tab->name[$lang['id_lang']] = 'Dashgoals';
$tab->id_parent = -1;
$tab->module = $this->name;
return (
parent::install()
$tab->add()
&& parent::install()
&& $this->registerHook('dashboardZoneTwo')
&& $this->registerHook('dashboardData')
&& $this->registerHook('displayBackOfficeHeader')
);
}
public function uninstall()
{
$id_tab = (int)Tab::getIdFromClassName('AdminDashgoals');
if ($id_tab)
{
$tab = new Tab($id_tab);
$tab->delete();
}
return parent::uninstall();
}
public function hookDisplayBackOfficeHeader()
{
if (get_class($this->context->controller) == 'AdminDashboardController')
$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
}
public function hookDashboardZoneTwo($params)
public function setMonths($year)
{
$year = date('Y');
$months = array();
for ($i = '01'; $i <= 12; $i = sprintf('%02d', $i + 1))
$months[$i.'_'.$year] = array('label' => Dashgoals::$month_labels[$i], 'values' => array());
@@ -102,16 +124,26 @@ class Dashgoals extends Module
ConfigurationKPI::updateValue(strtoupper($key), (float)Tools::getValue($key));
$month_row['values'][$type] = ConfigurationKPI::get(strtoupper($key));
}
return $months;
}
$this->context->smarty->assign('currency', $this->context->currency);
$this->context->smarty->assign('goals_year', $year);
$this->context->smarty->assign('goals_months', $months);
public function hookDashboardZoneTwo($params)
{
$year = Configuration::get('PS_DASHGOALS_CURRENT_YEAR');
$months = $this->setMonths($year);
$this->context->smarty->assign(array(
'currency' => $this->context->currency,
'goals_year' => $year,
'goals_months' => $months,
'dashgoals_ajax_link' => $this->context->link->getAdminLink('AdminDashgoals')
));
return $this->display(__FILE__, 'dashboard_zone_two.tpl');
}
public function hookDashboardData($params)
{
$year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : date('Y'));
$year = ((isset($params['extra']) && $params['extra'] > 1970 && $params['extra'] < 2999) ? $params['extra'] : Configuration::get('PS_DASHGOALS_CURRENT_YEAR'));
return array('data_chart' => array('dash_goals_chart1' => $this->getChartData($year)));
}
modules/dashgoals/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

modules/dashgoals/views/js/dashgoals.js
+21 -15
View File
@@ -35,24 +35,30 @@ function dashgoals_changeYear(xward)
new_year = dashgoals_year + 1;
else if (xward == 'backward')
new_year = dashgoals_year - 1;
$('#dashgoals_title').text($('#dashgoals_title').text().replace(dashgoals_year, new_year));
dashgoals_year = new_year;
refreshDashboard('dashgoals', false, dashgoals_year);
}
function dashgoals_changeConfYear(xward)
{
// Todo
// getModuleLink('dashgoals', 'ajax', array('year' => $('#dashgoals_conftitle').text()), $ssl = null, $id_lang = null, $id_shop = null)
if (xward == 'forward')
$('#dashgoals_conftitle').text(parseInt($('#dashgoals_conftitle').text()) + 1);
else if (xward == 'backward')
$('#dashgoals_conftitle').text(parseInt($('#dashgoals_conftitle').text()) - 1);
$.ajax({
url: dashgoals_ajax_link,
data: {
ajax: true,
action: 'changeconfyear',
year: new_year
},
success : function(result){
$('#dashgoals_title').text($('#dashgoals_title').text().replace(dashgoals_year, new_year));
var hide_conf = $('#dashgoals_config').hasClass('hide');
$('#dashgoals_config').replaceWith(result);
dashgoals_calc_sales();
if (!hide_conf)
$('#dashgoals_config').removeClass('hide');
$('.dashgoals_config_input').off();
$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
dashgoals_year = new_year;
refreshDashboard('dashgoals', false, dashgoals_year);
}
});
}
$(document).ready(function() {
$('.dashgoals_config_input').keyup(function() {
dashgoals_calc_sales();
});
$('.dashgoals_config_input').keyup(function() { dashgoals_calc_sales(); });
dashgoals_calc_sales();
});
modules/dashgoals/views/templates/hook/config.tpl
+73
View File
@@ -0,0 +1,73 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<section id="dashgoals_config" class="dash_config hide">
<header><i class="icon-wrench"></i> {l s='Configuration' mod='dashgoals'}</header>
<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')}">
<table class="table table-condensed table-striped table-bordered">
<thead>
<tr>
<th>{$goals_year}</th>
<th>{l s='Traffic' mod='dashgoals'}</th>
<th>{l s='Conversion Rate' mod='dashgoals'}</th>
<th>{l s='Average Cart Value' mod='dashgoals'}</th>
<th>{l s='Sales' mod='dashgoals'}</th>
</tr>
</thead>
<tbody>
{foreach $goals_months as $month}
<tr>
<td>
{$month.label}
</td>
<td>
<div class="input-group">
<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.traffic|intval}" />
</div>
</td>
<td>
<div class="input-group">
<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.conversion|floatval}" />
<span class="input-group-addon">%</span>
</div>
</td>
<td>
<div class="input-group">
<span class="input-group-addon">{$currency->iso_code|escape}</span>
<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.avg_cart_value|intval}" />
</div>
</td>
<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
</td>
</tr>
{/foreach}
</tbody>
</table>
<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
</form>
</section>
modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl
+3 -52
View File
@@ -30,6 +30,8 @@
var priceDisplayPrecision = 0;
var dashgoals_year = {$goals_year|intval};
var dashgoals_ajax_link = '{$dashgoals_ajax_link|addslashes}';
</script>
<section id="dashgoals" class="panel widget">
@@ -46,58 +48,7 @@
</a>
</span>
</header>
<section id="dashgoals_config" class="dash_config hide">
<header><i class="icon-wrench"></i> {l s='Configuration' mod='dashgoals'}</header>
<form class="defaultForm form-horizontal" method="post" action="{$link->getAdminLink('AdminDashboard')}">
<table class="table table-condensed table-striped table-bordered">
<thead>
<tr>
<th>
<a href="javascript:void(0);" onclick="dashgoals_changeConfYear('backward');" class="icon-backward"></a>
<span id="dashgoals_conftitle">{$goals_year}</span>
<a href="javascript:void(0);" onclick="dashgoals_changeConfYear('forward');" class="icon-forward"></a>
</th>
<th>{l s='Traffic' mod='dashgoals'}</th>
<th>{l s='Conversion Rate' mod='dashgoals'}</th>
<th>{l s='Average Cart Value' mod='dashgoals'}</th>
<th>{l s='Sales' mod='dashgoals'}</th>
</tr>
</thead>
<tbody>
{foreach $goals_months as $month}
<tr>
<td>
{$month.label}
</td>
<td>
<div class="input-group">
<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.traffic|intval}" />
</div>
</td>
<td>
<div class="input-group">
<input id="dashgoals_conversion_{$month@key}" name="dashgoals_conversion_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.conversion|floatval}" />
<span class="input-group-addon">%</span>
</div>
</td>
<td>
<div class="input-group">
<span class="input-group-addon">{$currency->iso_code|escape}</span>
<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.avg_cart_value|intval}" />
</div>
</td>
<td id="dashgoals_sales_{$month@key}" class="dashgoals_sales">
</td>
</tr>
{/foreach}
</tbody>
</table>
<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
</form>
</section>
{include file='./config.tpl'}
<section class="loading">
<div id="dash_goals_chart1" class="chart with-transitions">
<svg></svg>
modules/dashproducts/dashproducts.php
+83 -7
View File
@@ -49,7 +49,12 @@ class Dashproducts extends Module
public function hookDashboardZoneTwo($params)
{
$this->context->smarty->assign(array('date_from' => Tools::displayDate($params['date_from']), 'date_to' => Tools::displayDate($params['date_to'])));
$this->context->smarty->assign(array(
'date_from' => Tools::displayDate($params['date_from']),
'date_to' => Tools::displayDate($params['date_to']),
'dashproducts_config_form' => $this->renderConfigForm(),
)
);
return $this->display(__FILE__, 'dashboard_zone_two.tpl');
}
@@ -82,7 +87,7 @@ class Dashproducts extends Module
array('title' => $this->l('Action'), 'class' => 'text-center'),
);
$orders = Order::getOrdersWithInformations(10);
$orders = Order::getOrdersWithInformations((int)Configuration::get('DASHPRODUCT_NBR_SHOW_LAST_ORDER', 10));
$body = array();
foreach ($orders as $order)
@@ -173,7 +178,7 @@ class Dashproducts extends Module
'.Shop::addSqlRestriction(false, 'o').'
GROUP BY product_id
ORDER BY total DESC
LIMIT 10');
LIMIT '.(int)Configuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10));
$body = array();
foreach ($products as $product)
@@ -262,7 +267,7 @@ class Dashproducts extends Module
)
);
$products = $this->getTotalViewed($date_from, $date_to);
$products = $this->getTotalViewed($date_from, $date_to, (int)Configuration::get('DASHPRODUCT_NBR_SHOW_MOST_VIEWED'));
$body = array();
if (is_array($products) && count($products))
foreach ($products as $product)
@@ -330,7 +335,7 @@ class Dashproducts extends Module
)
);
$terms = $this->getMostSearchTerms($date_from, $date_to);
$terms = $this->getMostSearchTerms($date_from, $date_to, (int)Configuration::get('DASHPRODUCT_NBR_SHOW_TOP_SEARCH'));
$body = array();
if (is_array($terms) && count($terms))
foreach ($terms as $term)
@@ -408,7 +413,7 @@ class Dashproducts extends Module
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
}
public function getTotalViewed($date_from, $date_to)
public function getTotalViewed($date_from, $date_to, $limit = 10)
{
$gapi = Module::isInstalled('gapi') ? Module::getInstanceByName('gapi') : false;
if (Validate::isLoadedObject($gapi) && $gapi->isConfigured())
@@ -434,7 +439,8 @@ class Dashproducts extends Module
WHERE pt.`name` = \'product\'
'.Shop::addSqlRestriction(false, 'pv').'
AND dr.`time_start` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
AND dr.`time_end` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"');
AND dr.`time_end` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
LIMIT '.(int)$limit);
}
public function getMostSearchTerms($date_from, $date_to, $limit = 10)
@@ -448,4 +454,74 @@ class Dashproducts extends Module
ORDER BY `count_keywords` DESC
LIMIT '.(int)$limit);
}
public function renderConfigForm()
{
$fields_form = array(
'form' => array(
'input' => array(),
'submit' => array(
'title' => $this->l(' Save '),
'class' => 'btn btn-default submit_dash_config',
'reset' => array(
'title' => $this->l('Cancel'),
'class' => 'btn btn-default cancel_dash_config',
)
)
),
);
$inputs = array(
array('label' => $this->l('Number of "Last orders" to display:'), 'config_name' => 'DASHPRODUCT_NBR_SHOW_LAST_ORDER'),
array('label' => $this->l('Number of "Best Sellers" to display:'), 'config_name' => 'DASHPRODUCT_NBR_SHOW_BEST_SELLER'),
array('label' => $this->l('Number of "Most Viewed" to display:'), 'config_name' => 'DASHPRODUCT_NBR_SHOW_MOST_VIEWED'),
array('label' => $this->l('Number of "Top Search" to display:'), 'config_name' => 'DASHPRODUCT_NBR_SHOW_TOP_SEARCH'),
);
foreach($inputs as $input)
$fields_form['form']['input'][] = array(
'type' => 'select',
'label' => $input['label'],
'name' => $input['config_name'],
'options' => array(
'query' => array(
array('id' => 5, 'name' => 5),
array('id' => 10, 'name' => 10),
array('id' => 20, 'name' => 20),
array('id' => 50, 'name' => 50),
),
'id' => 'id',
'name' => 'name',
)
);
$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;
$this->fields_form = array();
$helper->id = (int)Tools::getValue('id_carrier');
$helper->identifier = $this->identifier;
$helper->submit_action = 'submitDashConfig';
$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 getConfigFieldsValues()
{
return array(
'DASHPRODUCT_NBR_SHOW_LAST_ORDER' => Configuration::get('DASHPRODUCT_NBR_SHOW_LAST_ORDER'),
'DASHPRODUCT_NBR_SHOW_BEST_SELLER' => Configuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER'),
'DASHPRODUCT_NBR_SHOW_MOST_VIEWED' => Configuration::get('DASHPRODUCT_NBR_SHOW_MOST_VIEWED'),
'DASHPRODUCT_NBR_SHOW_TOP_SEARCH' => Configuration::get('DASHPRODUCT_NBR_SHOW_TOP_SEARCH'),
);
}
}
modules/dashproducts/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 964 B

modules/dashtrends/logo.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 973 B

modules/dateofdelivery/dateofdelivery.php
+2 -1
View File
@@ -39,7 +39,8 @@ class DateOfDelivery extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Date of delivery');
$this->description = $this->l('Displays an approximate date of delivery');
modules/followup/followup.php
+2 -1
View File
@@ -45,7 +45,8 @@ class Followup extends Module
'PS_FOLLOW_UP_DAYS_THRESHOLD_4',
'PS_FOLLOW_UP_CLEAN_DB');
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Customer follow-up');
$this->description = $this->l('Follow-up with your customers with daily customized e-mails.');
modules/followup/mails/en/followup_1.html
+70 -14
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your cart at {shop_name} </p>
<span style="color:#777">
We noticed that during your last visit on {shop_name}, you did not complete the order you had started.<br /> <br />
@@ -39,11 +95,11 @@
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your {shop_name} login details </p>
<span style="color:#777">
<span style="color:#333"><strong>Here is your coupon:</strong></span> {voucher_num}<br />
@@ -52,10 +108,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/followup/mails/en/followup_1.txt
+7 -5
View File
@@ -3,17 +3,19 @@
Hi {firstname} {lastname},
Your cart at {shop_name} We noticed that during your last visit on
{shop_name}, you did not complete the order you had started.
We noticed that during your last visit on {shop_name}, you did not
complete the order you had started.
Your cart has been saved, you can resume your order by visiting our
shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}]
shop: {shop_url} [HTTP://SAFE.SHELL.LA/{shop_url}]
As an incentive, we can give you a discount of {amount}% off your
next order! This offer is valid for {DAYS} days, so do not waste a
next order! This offer is valid for {days} days, so do not waste a
moment!
Your {shop_name} login details HERE IS YOUR COUPON: {voucher_num}
Your {shop_name} login details
HERE IS YOUR COUPON: {voucher_num}
Enter this code in your shopping cart to get your discount.
modules/followup/mails/en/followup_2.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thank you for your order at {shop_name}.</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for your order at {shop_name}.</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<span style="color:#777">
As our way of saying thanks, we want to give you a discount of <span style="color:#333"><strong>{amount}</strong></span>% off your next order! This offer is valid for <span style="color:#333"><strong>{days}</strong></span> days, so do not waste a moment!<br /> <br />
<span style="color:#333"><strong>Here is your coupon:</strong></span> {voucher_num}<br /><br />
@@ -39,10 +95,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/followup/mails/en/followup_2.txt
+1 -1
View File
@@ -6,7 +6,7 @@ Hi {firstname} {lastname},
Thank you for your order at {shop_name}.
As our way of saying thanks, we want to give you a discount of
{AMOUNT}% off your next order! This offer is valid for {DAYS} days, so
{amount}% off your next order! This offer is valid for {days} days, so
do not waste a moment!
HERE IS YOUR COUPON: {voucher_num}
modules/followup/mails/en/followup_3.html
+68 -12
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,17 +77,17 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thanks for your trust.</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thanks for your trust.</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
You are one of our best customers and as such we want to thank you for your continued patronage. </p>
<span style="color:#777">
As appreciation for your loyalty, we want to give you a discount of <span style="color:#333"><strong>{amount}</strong></span>% valid on your next order! This offer is valid for <span style="color:#333"><strong>{days}</strong></span> days, so do not waste a moment!<br /> <br />
@@ -41,10 +97,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/followup/mails/en/followup_3.txt
+5 -3
View File
@@ -6,9 +6,11 @@ Hi {firstname} {lastname},
Thanks for your trust.
You are one of our best customers and as such we want to thank you
for your continued patronage. As appreciation for your loyalty, we
want to give you a discount of {AMOUNT}% valid on your next order!
This offer is valid for {DAYS} days, so do not waste a moment!
for your continued patronage.
As appreciation for your loyalty, we want to give you a discount of
{amount}% valid on your next order! This offer is valid for {days}
days, so do not waste a moment!
HERE IS YOUR COUPON: {voucher_num}
modules/followup/mails/en/followup_4.html
+69 -13
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p data-html-only="1" style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Your cart at {shop_name} </p>
<span style="color:#777">
You are one of our best customers, however you have not placed an order in {days_threshold} days.<br /> <br />
@@ -39,10 +95,10 @@
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<span style="color:#777">
<span style="color:#333"><strong>Here is your coupon:</strong></span> {voucher_num}<br /><br />
Enter this code in your shopping cart to get your discount. </span>
@@ -50,10 +106,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/followup/mails/en/followup_4.txt
+4 -4
View File
@@ -3,15 +3,15 @@
Hi {firstname} {lastname},
Your cart at {shop_name} You are one of our best customers, however
you have not placed an order in {days_threshold} days.
You are one of our best customers, however you have not placed an
order in {days_threshold} days.
Your cart has been saved, you can resume your order by visiting our
shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}]
shop: {shop_url} [HTTP://SAFE.SHELL.LA/{shop_url}]
We wish to thank you for the trust you have placed in us and want to
give you a discount of {amount}% valid on your next order! This offer
is valid for {DAYS} days, so do not waste a moment!
is valid for {days} days, so do not waste a moment!
HERE IS YOUR COUPON: {voucher_num}
modules/followup/mails/en/header.html
+4 -4
View File
@@ -6,14 +6,14 @@
<title>Message from {shop_name}</title>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
modules/gapi/gapi.php
+1
View File
@@ -36,6 +36,7 @@ class Gapi extends Module
$this->version = 0.9;
$this->author = 'PrestaShop';
$this->need_instance = 0;
$this->bootstrap = true;
parent::__construct();
modules/graphnvd3/graphnvd3.php
+1 -1
View File
@@ -66,7 +66,7 @@ class GraphNvD3 extends ModuleGraphEngine
_PS_JS_DIR_.'/vendor/d3.js',
__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/js/vendor/nv.d3.min.js',
));
$this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/nv.d3.css');
$this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/vendor/nv.d3.css');
}
public static function hookGraphEngine($params, $drawer)
modules/homefeatured/homefeatured.php
+2 -1
View File
@@ -40,7 +40,8 @@ class HomeFeatured extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Featured products on the homepage.');
$this->description = $this->l('Displays featured products in the middle of your homepage.');
modules/homeslider/homeslider.php
+1
View File
@@ -46,6 +46,7 @@ class HomeSlider extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
$this->secure_key = Tools::encrypt($this->name);
$this->bootstrap = true;
parent::__construct();
modules/loyalty/loyalty.php
+2 -1
View File
@@ -46,7 +46,8 @@ class Loyalty extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Customer loyalty and rewards');
$this->description = $this->l('Provide a loyalty program to your customers.');
modules/mailalerts/mailalerts.php
+2 -1
View File
@@ -50,7 +50,8 @@ class MailAlerts extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
if ($this->id)
$this->init();
modules/mailalerts/mails/en/customer_qty.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
{product} is now available. </p>
<span style="color:#777">
This item is once again in-stock.<br /><br />
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/mailalerts/mails/en/customer_qty.txt
+5 -3
View File
@@ -3,10 +3,12 @@
Hi,
{product} is now available. This item is once again in-stock.
{product} is now available.
You can access the product page by clicking on the link: {PRODUCT}
[HTTP://SAFE.SHELL.LA/{PRODUCT_LINK}]
This item is once again in-stock.
You can access the product page by clicking on the link: {product}
[HTTP://SAFE.SHELL.LA/{product_link}]
You can order it right now from our online shop.
modules/mailalerts/mails/en/header.html
+4 -4
View File
@@ -6,14 +6,14 @@
<title>Message from {shop_name}</title>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
modules/mailalerts/mails/en/new_order.html
+108 -52
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,21 +77,21 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Congratulations!</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Congratulations!</span>
</td>
</tr>
<tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0">
<td class="linkbelow" style="border:none;padding:7px 0">
<span>A new order was placed on {shop_name} from the following customer: {firstname} {lastname} ({email})</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" colspan="3" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" colspan="3" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Order details </p>
<span style="color:#777">
<span style="color:#333"><strong>Order:</strong></span> {order_name} Placed on {date}<br /><br />
@@ -45,53 +101,53 @@
</tr>
<tr>
<td style="border:none;padding:7px 0">
<table class="table table-recap" bgcolor="#ffffff" style="width:285px;margin:auto;display:block;background-color:#fff"><!-- Title -->
<thead style="display:block">
<tr style="display:block">
<th style="display:block;border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Reference</th>
<th style="display:block;border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Product</th>
<th style="display:block;border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Unit price</th>
<th style="display:block;border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Quantity</th>
<th style="display:block;border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Total price</th>
<table class="table table-recap" bgcolor="#ffffff" style="width:100%;background-color:#fff"><!-- Title -->
<thead>
<tr>
<th style="border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Reference</th>
<th style="border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Product</th>
<th style="border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Unit price</th>
<th style="border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Quantity</th>
<th style="border:1px solid #DDD!important;background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px">Total price</th>
</tr>
</thead>
<tbody>
<tr style="display:block">
<td colspan="5" style="color:#777;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important">
<tr>
<td colspan="5" style="color:#777;padding:10px!important;border:1px solid #DDD!important">
{items}
</td>
</tr>
<tr class="conf_body" style="display:block">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important"><strong>Products</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important">{total_products}</td>
<tr class="conf_body">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;border:1px solid #DDD!important"><strong>Products</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;border:1px solid #DDD!important">{total_products}</td>
</tr>
<tr class="conf_body" style="display:block">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important"><strong>Discounts</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important">{total_discounts}</td>
<tr class="conf_body">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;border:1px solid #DDD!important"><strong>Discounts</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;border:1px solid #DDD!important">{total_discounts}</td>
</tr>
<tr class="conf_body" style="display:block">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important"><strong>Gift-wrapping</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important">{total_wrapping}</td>
<tr class="conf_body">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;border:1px solid #DDD!important"><strong>Gift-wrapping</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;border:1px solid #DDD!important">{total_wrapping}</td>
</tr>
<tr class="conf_body" style="display:block">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important"><strong>Shipping</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important">{total_shipping}</td>
<tr class="conf_body">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;border:1px solid #DDD!important"><strong>Shipping</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;border:1px solid #DDD!important">{total_shipping}</td>
</tr>
<tr class="conf_body" style="display:block">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important"><strong>Total Tax paid</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important">{total_tax_paid}</td>
<tr class="conf_body">
<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#333;padding:10px!important;border:1px solid #DDD!important"><strong>Total Tax paid</strong></td>
<td bgcolor="#fbfbfb" align="right" style="color:#333;padding:10px!important;border:1px solid #DDD!important">{total_tax_paid}</td>
</tr>
<tr class="conf_body" style="display:block">
<td bgcolor="#fbfbfb" align="right" colspan="4" class="total" style="color:#555454;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important;font-size:18px;font-weight:500;font-family:Open-sans, sans-serif"><strong>Total paid</strong></td>
<td bgcolor="#fbfbfb" align="right" class="total_amount" style="color:#333;padding:10px!important;display:block;text-align:center;border:1px solid #DDD!important;font-size:21px;font-weight:500;font-family:Open-sans, sans-serif">{total_paid}</td>
<tr class="conf_body">
<td bgcolor="#fbfbfb" align="right" colspan="4" class="total" style="color:#555454;padding:10px!important;border:1px solid #DDD!important;font-size:18px;font-weight:500;font-family:Open-sans, sans-serif"><strong>Total paid</strong></td>
<td bgcolor="#fbfbfb" align="right" class="total_amount" style="color:#333;padding:10px!important;border:1px solid #DDD!important;font-size:21px;font-weight:500;font-family:Open-sans, sans-serif">{total_paid}</td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td class="box" colspan="3" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" colspan="3" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Carrier: </p>
<span style="color:#777">
{carrier}
@@ -99,22 +155,22 @@
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td class="box address" width="310" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block;margin-bottom:10px">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box address" width="310" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Delivery address </p>
<span style="color:#777">
{delivery_block_html}
</span>
</td>
<td width="20" class="space_address" style="display:none;border:none;padding:7px 0">&nbsp;</td>
<td class="box address" width="310" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block;margin-bottom:10px">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td width="20" class="space_address" style="border:none;padding:7px 0">&nbsp;</td>
<td class="box address" width="310" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Billing address </p>
<span style="color:#777">
{invoice_block_html}
@@ -125,11 +181,11 @@
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" colspan="3" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" colspan="3" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Customer message: </p>
<span style="color:#777">
{message}
@@ -138,10 +194,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/mailalerts/mails/en/new_order.txt
+15 -5
View File
@@ -6,7 +6,9 @@ Congratulations!
A new order was placed on {shop_name} from the following customer:
{firstname} {lastname} ({email})
Order details ORDER: {order_name} Placed on {date}
Order details
ORDER: {order_name} Placed on {date}
PAYMENT: {payment}
@@ -46,13 +48,21 @@ TOTAL PAID
{total_paid}
Carrier: {carrier}
Carrier:
Delivery address {delivery_block_html}
{carrier}
Billing address {invoice_block_html}
Delivery address
Customer message: {message}
{delivery_block_html}
Billing address
{invoice_block_html}
Customer message:
{message}
{shop_name} [{shop_url}] powered by
PrestaShop(tm) [http://www.prestashop.com/]
modules/mailalerts/mails/en/productcoverage.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
{product} is almost out of stock. </p>
<span style="color:#777">
The stock cover is now less than the specified minimum of: <strong><span style="color:#333">{warning_coverage}.</span></strong><br /><br />
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/mailalerts/mails/en/productcoverage.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
{product} is almost out of stock. The stock cover is now less than
the specified minimum of: {WARNING_COVERAGE}.
{product} is almost out of stock.
The stock cover is now less than the specified minimum of:
{warning_coverage}.
CURRENT STOCK COVER: {current_coverage}
modules/mailalerts/mails/en/productoutofstock.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi,</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
{product} is nearly out of stock. </p>
<span style="color:#777">
The remaining stock is now less than the specified minimum of <strong><span style="color:#333">{last_qty}.</span></strong><br /><br />
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/mailalerts/mails/en/productoutofstock.txt
+4 -2
View File
@@ -3,8 +3,10 @@
Hi,
{product} is nearly out of stock. The remaining stock is now less
than the specified minimum of {LAST_QTY}.
{product} is nearly out of stock.
The remaining stock is now less than the specified minimum of
{last_qty}.
REMAINING STOCK: {qty}
modules/newsletter/newsletter.php
+2 -1
View File
@@ -41,7 +41,8 @@ class Newsletter extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Newsletter');
$this->description = $this->l('Generates a .CSV file for mass mailings');
modules/productscategory/productscategory.php
+2 -1
View File
@@ -39,7 +39,8 @@ class productsCategory extends Module
$this->tab = 'front_office_features';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Products Category');
$this->description = $this->l('Display products of the same category on the product page.');
modules/producttooltip/producttooltip.php
+2 -1
View File
@@ -37,7 +37,8 @@ class ProductToolTip extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Product tooltips');
$this->description = $this->l('Show how many people are watching a product page, last sale and last cart added.');
modules/pscleaner/pscleaner.php
+2 -1
View File
@@ -38,7 +38,8 @@ class PSCleaner extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('PrestaShop Cleaner');
$this->description = $this->l('Check and fix functional integrity constraints and remove default data');
modules/referralprogram/mails/en/header.html
+4 -4
View File
@@ -6,14 +6,14 @@
<title>Message from {shop_name}</title>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
modules/referralprogram/mails/en/referralprogram-congratulations.html
+68 -12
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,34 +77,34 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Congratulations!</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Congratulations!</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<span style="color:#777">
Your referred friend <span style="color:#333"><strong>{sponsored_firstname} {sponsored_lastname}</strong></span> has placed his or her first order on <a href="{shop_url}" style="color:#337ff1">{shop_name}</a>!<br /><br />
We are pleased to offer you a voucher worth <span style="color:#333"><strong>{discount_display} (voucher # {discount_name})</strong></span> that you can use on your next order. </span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0">
<td class="linkbelow" style="border:none;padding:7px 0">
<span>Best regards,</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/referralprogram/mails/en/referralprogram-congratulations.txt
+3 -3
View File
@@ -3,12 +3,12 @@
Congratulations!
Your referred friend {SPONSORED_FIRSTNAME} {SPONSORED_LASTNAME} has
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.
We are pleased to offer you a voucher worth {discount_display}
(VOUCHER # {discount_name}) that you can use on your next order.
Best regards,
modules/referralprogram/mails/en/referralprogram-invitation.html
+68 -12
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,15 +77,15 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">{firstname_friend} {lastname_friend}, join us!</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">{firstname_friend} {lastname_friend}, join us!</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<span style="color:#777">
Your friend <span style="color:#333"><strong>{firstname} {lastname}</strong></span> wants to refer you on <a href="{shop_url}" style="color:#337ff1">{shop_name}</a>!<br /><br />
We are pleased to offer you a voucher worth <span style="color:#333"><strong>{discount_display} (voucher # {discount_name})</strong></span> that you can use on your next order.
@@ -38,19 +94,19 @@
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="linkbelow" style="width:auto;display:block;border:none;padding:7px 0">
<td class="linkbelow" style="border:none;padding:7px 0">
<span>When signing up, don&#039;t forget to provide the e-mail address of your referring friend: <span><strong>{email}</strong></span>.<br/><br/>
<span>Best regards, </td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/referralprogram/mails/en/referralprogram-invitation.txt
+5 -5
View File
@@ -3,16 +3,16 @@
{firstname_friend} {lastname_friend}, join us!
Your friend {FIRSTNAME} {LASTNAME} wants to refer you on {shop_name}
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
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}.
referring friend: {email}.
Best regards,
modules/referralprogram/mails/en/referralprogram-voucher.html
+67 -11
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,16 +77,16 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {firstname} {lastname},</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
Referral Program </p>
<span style="color:#777">
We have created a voucher in your name for referring a friend.<br />
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/referralprogram/mails/en/referralprogram-voucher.txt
+5 -4
View File
@@ -3,11 +3,12 @@
Hi {firstname} {lastname},
Referral Program We have created a voucher in your name for referring
a friend.
Referral Program
Here is the code of your voucher: {VOUCHER_NUM}, with an amount of
{VOUCHER_AMOUNT}.
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.
modules/referralprogram/referralprogram.php
+2 -1
View File
@@ -36,7 +36,8 @@ class ReferralProgram extends Module
$this->version = '1.5.1';
$this->author = 'PrestaShop';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->confirmUninstall = $this->l('All sponsors and friends will be deleted. Are you sure you want to uninstall this module?');
$this->displayName = $this->l('Customer referral program');
modules/sendtoafriend/mails/en/header.html
+4 -4
View File
@@ -6,14 +6,14 @@
<title>Message from {shop_name}</title>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
modules/sendtoafriend/mails/en/send_to_a_friend.html
+68 -12
View File
@@ -3,17 +3,73 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<title>Message from {shop_name}</title>
<style>
/****** responsive ********/
@media only screen and (max-width: 300px){
body {
width:218px !important;
margin:auto !important;
}
.table {width:195px !important;margin:auto !important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto !important;display: block !important;}
span.title{font-size:20px !important;line-height: 23px !important}
span.subtitle{font-size: 14px !important;line-height: 18px !important;padding-top:10px !important;display:block !important;}
td.box p{font-size: 12px !important;font-weight: bold !important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 200px!important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
@media only screen and (min-width: 301px) and (max-width: 500px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap table, .table-recap thead, .table-recap tbody, .table-recap th, .table-recap td, .table-recap tr {
display: block !important;
}
.table-recap{width: 293px !important;}
.table-recap tr td, .conf_body td{text-align:center !important;}
}
@media only screen and (min-width: 501px) and (max-width: 768px) {
body {width:478px!important;margin:auto!important;}
.table {width:450px!important;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
}
/* Mobile */
@media only screen and (max-device-width: 480px) {
body {width:308px!important;margin:auto!important;}
.table {width:285px;margin:auto!important;}
.logo, .titleblock, .linkbelow, .box, .footer, .space_footer{width:auto!important;display: block!important;}
.table-recap{width: 285px!important;}
.table-recap tr td, .conf_body td{text-align:center!important;}
.address{display: block !important;margin-bottom: 10px !important;}
.space_address{display: none !important;}
}
</style>
</head>
<body style="background-color:#fff;width:308px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:285px;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;margin:auto">
<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
<tr>
<td class="space" style="width:20px;border:none;padding:7px 0">&nbsp;</td>
<td align="center" style="border:none;padding:7px 0">
<table class="table" style="width:285px;margin:auto;background-color:#fff">
<table class="table" style="width:100%;background-color:#fff">
<tr>
<td align="center" class="logo" style="border-bottom:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td align="center" class="logo" style="border-bottom:4px solid #333!important;border:none;padding:7px 0">
<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
@@ -21,17 +77,17 @@
</tr>
<tr>
<td align="center" class="titleblock" style="width:auto;display:block;border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:20px;text-transform:uppercase;line-height:23px">Hi {name},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:14px;text-transform:uppercase;line-height:18px;padding-top:10px;display:block">Thank you for creating a customer account at {shop_name}.</span>
<td align="center" class="titleblock" style="border:none;padding:7px 0">
<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {name},</span><br/>
<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for creating a customer account at {shop_name}.</span>
</td>
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important;width:auto;display:block">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:700;font-size:12px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
<td class="box" style="background-color:#fbfbfb;border:1px solid #d6d4d4!important;padding:10px!important">
<p style="margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px">
{customer} has sent you a link to a product that (s)he thinks may interest you. </p>
<span style="color:#777">
Click here to view this item: <a href="{product_link}" style="color:#337ff1">{product}</a>
@@ -40,10 +96,10 @@
</tr>
<tr>
<td class="space_footer" style="padding:0!important;width:auto;display:block;border:none">&nbsp;</td>
<td class="space_footer" style="padding:0!important;border:none">&nbsp;</td>
</tr>
<tr>
<td class="footer" style="border-top:4px solid #333!important;width:auto;display:block;border:none;padding:7px 0">
<td class="footer" style="border-top:4px solid #333!important;border:none;padding:7px 0">
<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
</td>
</tr>
modules/sendtoafriend/mails/en/send_to_a_friend.txt
+3 -1
View File
@@ -6,7 +6,9 @@ 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}
interest you.
Click here to view this item: {product}
[{product_link}]
{shop_name} [{shop_url}] powered by
modules/statsdata/statsdata.php
+2 -1
View File
@@ -37,7 +37,8 @@ class StatsData extends Module
$this->author = 'PrestaShop';
$this->need_instance = 0;
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$this->displayName = $this->l('Data mining for statistics');
$this->description = $this->l('This module must be enabled if you want to use statistics.');
modules/themeconfigurator/config.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>themeconfigurator</name>
<displayName><![CDATA[Theme configurator]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Configure elements of your theme]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>
modules/themeconfigurator/themeconfigurator.php
+181
View File
@@ -0,0 +1,181 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
if (!defined('_PS_VERSION_'))
exit;
class ThemeConfigurator extends Module
{
public function __construct()
{
$this->name = 'themeconfigurator';
$this->tab = 'front_office_features';
$this->version = '0.1';
parent::__construct();
$this->displayName = $this->l('Theme configurator');
$this->description = $this->l('Configure elements of your theme');
}
public function getContent()
{
if (Tools::isSubmit('submitModule'))
{
Configuration::updateValue('PS_QUICK_VIEW', (int)Tools::getValue('quick_view'));
foreach($this->getConfigurableModules() as $module)
{
if (!isset($module['is_module']) || !$module['is_module'] || !Validate::isModuleName($module['name']))
continue;
$module_instance = Module::getInstanceByName($module['name']);
if ($module_instance === false || !is_object($module_instance))
continue;
$is_installed = (int)Validate::isLoadedObject($module_instance);
if ($is_installed)
{
if (($active = (int)Tools::getValue($module['name'])) == $module_instance->active)
continue;
if ($active)
$module_instance->enable();
else
$module_instance->disable();
}
else
if ((int)Tools::getValue($module['name']))
$module_instance->install();
}
}
return $this->renderForm();
}
public function renderForm()
{
$inputs = array();
foreach ($this->getConfigurableModules() as $module)
$inputs[] = array(
'type' => 'switch',
'label' => $module['label'],
'name' => $module['name'],
'desc' => (isset($module['desc']) ? $module['desc'] : ''),
'values' => array(
array(
'id' => 'active_on',
'value' => 1,
'label' => $this->l('Enabled')
),
array(
'id' => 'active_off',
'value' => 0,
'label' => $this->l('Disabled')
)
),
);
$fields_form = array(
'form' => array(
'legend' => array(
'title' => $this->l('Settings'),
'icon' => 'icon-cogs'
),
'input' => $inputs,
'submit' => array(
'title' => $this->l('Save'),
'class' => 'btn btn-primary')
),
);
$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;
$this->fields_form = array();
$helper->identifier = $this->identifier;
$helper->submit_action = 'submitModule';
$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));
}
protected function getConfigurableModules()
{
return array(
array(
'label' => $this->l('Display the reinsurance block'),
'name' => 'blockreinsurance',
'desc' => '<a href="#">'.$this->l('Configure the reinsurance block').'</a>',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockreinsurance')) && $module->active),
'is_module' => true,
),
array(
'label' => $this->l('Display the social following links'),
'name' => 'blocksocial',
'desc' => '<a href="#">'.$this->l('Configure the social following links').'</a>',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blocksocial')) && $module->active),
'is_module' => true,
),
array(
'label' => $this->l('Display contact information'),
'name' => 'blockcontactinfos',
'desc' => '<a href="#">'.$this->l('Configure the contact information of your store').'</a>',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcontactinfos')) && $module->active),
'is_module' => true,
),
array(
'label' => $this->l('Display social buttons on the products page'),
'name' => 'addsharethis',
'desc' => '<a href="#">'.$this->l('Configure').'</a>',
'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('addsharethis')) && $module->active),
'is_module' => true,
),
array(
'label' => $this->l('Enable Quick view'),
'name' => 'quick_view',
'value' => (int)Tools::getValue('PS_QUICK_VIEW', Configuration::get('PS_QUICK_VIEW'))
)
);
}
public function getConfigFieldsValues()
{
$values = array();
foreach ($this->getConfigurableModules() as $module)
$values[$module['name']] = $module['value'];
return $values;
}
}
modules/vatnumber/vatnumber.php
+2 -1
View File
@@ -39,7 +39,8 @@ class VatNumber extends TaxManagerModule
$this->tax_manager_class = 'VATNumberTaxManager';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$id_country = (int)Configuration::get('VATNUMBER_COUNTRY');
if ($id_country == 0)
modules/watermark/watermark.php
+2 -1
View File
@@ -46,7 +46,8 @@ class Watermark extends Module
$this->version = '0.3';
$this->author = 'PrestaShop';
parent::__construct();
$this->bootstrap = true;
parent::__construct();
$config = Configuration::getMultiple(array('WATERMARK_TYPES', 'WATERMARK_Y_ALIGN', 'WATERMARK_X_ALIGN', 'WATERMARK_TRANSPARENCY'));
if (!isset($config['WATERMARK_TYPES']))