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:
djfm committed 2013-11-04 16:58:17 +00:00
2 parents 5372f31b4c b650c349d5
commit 71e3a8a937
476 files changed
+13337 -10621
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/followup/mails/en/src/followup_1.php
-38
View File
@@ -1,38 +0,0 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('Your cart at {shop_name}'); ?>
</p>
<span>
<?php echo t('We noticed that during your last visit on {shop_name}, you did not complete the order you had started.'); ?><br /> <br />
<?php echo t('Your cart has been saved, you can resume your order by visiting our shop:'); ?> <span><strong><a title="{shop_name}" href="{shop_url}">{shop_url}</a></strong></span><br /><br />
<?php echo t('As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for <span><strong>{days}</strong></span> days, so do not waste a moment!'); ?>
</span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('Your {shop_name} login details'); ?>
</p>
<span>
<span><strong><?php echo t('Here is your coupon:'); ?></strong></span> {voucher_num}<br />
<?php echo t('Enter this code in your shopping cart to get your discount.'); ?>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/followup/mails/en/src/followup_2.php
-22
View File
@@ -1,22 +0,0 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
<span class="subtitle"><?php echo t('Thank you for your order at {shop_name}.'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<span>
<?php echo t('As our way of saying thanks, we want to give you a discount of <span><strong>{amount}</strong></span>% off your next order! This offer is valid for <span><strong>{days}</strong></span> days, so do not waste a moment!'); ?><br /> <br />
<span><strong><?php echo t('Here is your coupon:'); ?></strong></span> {voucher_num}<br /><br />
<?php echo t('Enter this code in your shopping cart to get your discount.'); ?>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/followup/mails/en/src/followup_3.php
-25
View File
@@ -1,25 +0,0 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
<span class="subtitle"><?php echo t('Thanks for your trust.'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('You are one of our best customers and as such we want to thank you for your continued patronage.'); ?>
</p>
<span>
<?php echo t('As appreciation for your loyalty, we want to give you a discount of <span><strong>{amount}</strong></span>% valid on your next order! This offer is valid for <span><strong>{days}</strong></span> days, so do not waste a moment!'); ?><br /> <br />
<span><strong><?php echo t('Here is your coupon:'); ?></strong></span> {voucher_num}<br /><br />
<?php echo t('Enter this code in your shopping cart to get your discount.'); ?>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/followup/mails/en/src/followup_4.php
-35
View File
@@ -1,35 +0,0 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('Your cart at {shop_name}'); ?>
</p>
<span>
<?php echo t('You are one of our best customers, however you have not placed an order in {days_threshold} days.'); ?><br /> <br />
<?php echo t('Your cart has been saved, you can resume your order by visiting our shop:'); ?> <span><strong><a title="{shop_name}" href="{shop_url}">{shop_url}</a></strong></span><br /><br />
<?php echo t('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 <span><strong>{days}</strong></span> days, so do not waste a moment!'); ?>
</span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<span>
<span><strong><?php echo t('Here is your coupon:'); ?></strong></span> {voucher_num}<br /><br />
<?php echo t('Enter this code in your shopping cart to get your discount.'); ?>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/followup/mails/en/src/footer.php
-15
View File
@@ -1,15 +0,0 @@
<tr>
<td class="space_footer">&nbsp;</td>
</tr>
<tr>
<td class="footer">
<span><?php echo t('<a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a>'); ?></span>
</td>
</tr>
</table>
</td>
<td class="space">&nbsp;</td>
</tr>
</table>
</body>
</html>
modules/followup/mails/en/src/header.php
-54
View File
@@ -1,54 +0,0 @@
<?php
if(!function_exists('t'))
{
function t($str)
{
return $str;
}
}
if(!function_exists('findRelativePathToAdminDir'))
{
function findRelativePathToAdminDir($maxDepth=6)
{
$path = '';
for($i=0; $i<$maxDepth; $i++)
{
foreach(scandir(dirname(__FILE__).'/'.$path) as $dir)
{
$candidate = $path.$dir.'/';
if(is_dir(dirname(__FILE__).'/'.$candidate.'tabs'))
{
return $candidate;
}
}
$path .= '../';
}
return false;
}
}
$admin = findRelativePathToAdminDir();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><?php echo t('Message from {shop_name}'); ?></title>
<link rel="stylesheet" type="text/css" href="<?php echo $admin ?>themes/default/css/admin-theme/email.css">
</head>
<body>
<table class="table table-mail">
<tr>
<td class="space">&nbsp;</td>
<td align="center">
<table class="table">
<tr>
<td align="center" class="logo">
<a title="{shop_name}" href="{shop_url}">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
</td>
</tr>
modules/followup/views/index.php
+35
View File
@@ -0,0 +1,35 @@
<?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
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
modules/followup/views/templates/admin/_configure/helpers/form/form.tpl
+32
View File
@@ -0,0 +1,32 @@
{*
* 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
*}
{extends file="helpers/form/form.tpl"}
{block name="field"}
{if $input.type == 'desc'}
<div class="alert alert-info">{$input.text}</div>
{/if}
{$smarty.block.parent}
{/block}
modules/followup/views/templates/hook/index.php
+35
View File
@@ -0,0 +1,35 @@
<?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
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
modules/followup/views/templates/hook/stats.tpl
+71
View File
@@ -0,0 +1,71 @@
{*
* 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
*}
<div class="panel" id="fieldset_4">
<h3><i class="icon-bar-chart"></i> {l s="Statistics"}</h3>
<p>{l s="Detailed statistics for last 30 days:"}</p>
<p style="font-size: 10px; font-weight: bold;">
{l s="S = Number of sent e-mails"}<br />
{l s="U = Number of discounts used (valid orders only)"}<br />
{l s="% = Conversion rate"}
</p>
<table class="table">
<tr>
<th rowspan="2" style="width: 75px;">{l s="Date"}</th>
<th colspan="3">{l s="Cancelled carts"}</th>
<th colspan="3">{l s="Re-order"}</th>
<th colspan="3">{l s="Best cust."}</th>
<th colspan="3">{l s="Bad cust."}</th>
</tr>
<tr>
<td class="center">{l s="S"}</td>
<td class="center">{l s="U"}</td>
<td class="center">%</td>
<td class="center">{l s="S"}</td>
<td class="center">{l s="U"}</td>
<td class="center">%</td>
<td class="center">{l s="S"}</td>
<td class="center">{l s="U"}</td>
<td class="center">%</td>
<td class="center">{l s="S"}</td>
<td class="center">{l s="U"}</td>
<td class="center">%</td>
</tr>
{foreach from=$stats_array key='date' item='stats'}
<tr>
<td class="center">{$date}</td>
{foreach from=$stats key='key' item='val'}
<td class="center">{$val.nb}</td>
<td class="center">{$val.nb_used}</td>
<td class="center">{$val.rate}</td>
{/foreach}
</tr>
{foreachelse}
<tr>
<td colspan="13" style="font-weight: bold; text-align: center;">{l s="No statistics at this time."}</td>
</tr>
{/foreach}
</table>
</div>
modules/followup/views/templates/index.php
+35
View File
@@ -0,0 +1,35 @@
<?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
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;