antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-11-15 17:39:37 +01:00
commit 68744ae6e0
13 changed files with 161 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
mails/es/account.html Executable file → Normal file
View File

@ -2,51 +2,80 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Mensaje desde {shop_name}</title>
<title>Mensage de {shop_name}</title>
<style>
img { float: left; line-height: 0; font-size: 0; }
</style>
</head>
<body>
<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#000000; width: 550px;">
<tbody>
<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#4d4b7d; width: 550px; border-collapse: collapse" border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Hola <strong>{firstname} {lastname}</strong>,</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: #514c8c; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Detalles de tu cuenta</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Email: <strong><span>{email}</span></strong> <br />Contrase&ntilde;a: <strong>{passwd}</strong></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left"><strong>Consejos de Seguridad:</strong> <br /><br />Mant&eacute;n los datos de tu cuenta en un lugar seguro. <br />No des los detalles de tu cuenta a nadie. <br />Cambia tu contrase&ntilde;a regularmente. <br />Si sospechas que alguien está usando ilegalmente tu cuenta, av&iacute;sanos inmediatamente.</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Ahora podr&aacute;s guardar y consultar tus pedidos en nuestra web: <a href="{shop_url}" style="color:#e26ea2">{shop_name}</a>.</td>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td align="center" style="font-size: 12px; border-top: 1px solid #cccccc; padding-top: 5px;">
{shop_name} - <a href="{shop_url}" style="color: #e26ea2;">{shop_url}</a>
<td align="left" colspan="3">
<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_url}img/mails/bienvenue-ES_01.jpg" style="border:none;" ></a>
</td>
</tr>
</tbody>
<tr>
<td align="left" colspan="3">
<img alt="Bienvenudo" src="{shop_url}img/mails/bienvenue-ES_02.jpg" style="border:none;" />
</td>
</tr>
<tr>
<td align="left"><img src="{shop_url}img/mails/bienvenue-ES_05.jpg" style="border:none;" /></td>
<td width="406" align="center" style="font-size: 13px; color: #4d4b7d;">
Hola {firstname},<br/><br/>
Tu cuenta ha sido creada correctamente: ya eres miembro de Bebé Boutik, ¡el club de ventas privadas para mamás, bebés y niños de hasta 12 años!
<br/>
Aprovecha a partir de ahora de las mejores marcas ¡hasta -70%!
<br/><br/>
<a href="{shop_url}" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">¡DESCUBRE!</a>
</td>
<td align="left"><img alt="grille" src="{shop_url}img/mails/bienvenue-ES_04.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3"><img alt="4 buenas rezonas" src="{shop_url}img/mails/bienvenue-ES_08.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3" align="center"><span style="color: #615e93; font-size: 20px;" >para aprovechar de las ventas privadas Bebé Boutik</span></td>
</tr>
<tr>
<td colspan="3" align="center" height="10"><span style="color: #615e93; font-size: 20px;" >&nbsp;</td>
</tr>
<tr>
<td colspan="3"><img alt="reasura" src="{shop_url}img/mails/bienvenue-ES_12.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3">
<table style="font-size: 12px;">
<tr align="center">
<td width="25">&nbsp;</td>
<td width="110"><span>Ofertas de <br/> hasta <strong color="#fb66a9" style="color: #fb66a9">-70%</strong></span></td>
<td width="185"><strong color="#fb66a9" style="color: #fb66a9">Devoluciones gratis </strong>: <br/>¡Hasta 14 días si cambias de opinión!</td>
<td width="130">Pago <strong color="#fb66a9" style="color: #fb66a9">seguro</strong> <br/>PayPal & Tarjeta</td>
<td width="150"><strong color="#fb66a9" style="color: #fb66a9">Un Servicio al <br/>Cliente</strong> disponible</td>
<td width="25">&nbsp;</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="3">&nbsp;</td>
</tr>
<tr>
<td colspan="3" align="center"><img alt="Apadrina a tus amigos..." src="{shop_url}img/mails/bienvenue-ES_18.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3" align="center">
<a href="{shop_url}" style="text-decoration: none;" title="Apadrina">
<img alt="y gana 10€" src="{shop_url}img/mails/bienvenue-ES_20.jpg" style="border:none;" />
</a>
</td>
</tr>
<tr>
<td>
&nbsp;
</td>
</tr>
</table>
</body>
</html>

26
mails/fr/account.html
View File

@ -11,16 +11,16 @@
<table style="font-family: tahoma,arial,sans-serif; font-size: 12px; color:#4d4b7d; width: 550px; border-collapse: collapse" border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="left" colspan="3">
<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="../../img/mails/bienvenue-FR_01.jpg" style="border:none;" ></a>
<a href="{shop_url}" title="{shop_name}"><img alt="{shop_name}" src="{shop_url}img/mails/bienvenue-FR_01.jpg" style="border:none;" ></a>
</td>
</tr>
<tr>
<td align="left" colspan="3">
<img alt="Bienvenue" src="../../img/mails/bienvenue-FR_02.jpg" style="border:none;" />
<img alt="Bienvenue" src="{shop_url}img/mails/bienvenue-FR_02.jpg" style="border:none;" />
</td>
</tr>
<tr>
<td align="left"><img alt="grille" src="../../img/mails/bienvenue-FR_05.jpg" style="border:none;" /></td>
<td align="left"><img alt="grille" src="{shop_url}img/mails/bienvenue-FR_05.jpg" style="border:none;" /></td>
<td width="406" align="center" style="font-size: 13px; color: #4d4b7d;">
Bonjour {firstname},<br/><br/>
Votre compte a bien été créé : vous êtes maintenant membre de Bébé Boutik, le site de ventes privées pour mamans, bébés et enfants jusqu'à 12 ans ! <br/><br/>
@ -28,16 +28,16 @@
<br/><br/>
<a href="{shop_url}" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">A toute suite</a>
</td>
<td align="left"><img alt="grille" src="../../img/mails/bienvenue-FR_04.jpg" style="border:none;" /></td>
<td align="left"><img alt="grille" src="{shop_url}img/mails/bienvenue-FR_04.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3"><img alt="4 bonnes raisons" src="../../img/mails/bienvenue-FR_08.jpg" style="border:none;" /></td>
<td colspan="3"><img alt="4 bonnes raisons" src="{shop_url}img/mails/bienvenue-FR_08.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3" align="center"><span style="color: #615e93; font-size: 20px;" >de profiter des ventes privées Bébé Boutik</span></td>
</tr>
<tr>
<td colspan="3"><img alt="réassurance" src="../../img/mails/bienvenue-FR_10.jpg" style="border:none;" /></td>
<td colspan="3"><img alt="réassurance" src="{shop_url}img/mails/bienvenue-FR_10.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3">
@ -54,7 +54,7 @@
</td>
</tr>
<tr>
<td colspan="3"><img alt="L'appli Bébé Boutik" src="../../img/mails/bienvenue-FR_12.jpg" style="border:none;" /></td>
<td colspan="3"><img alt="L'appli Bébé Boutik" src="{shop_url}img/mails/bienvenue-FR_12.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3" align="center"><span style="color: #615e93; font-size: 20px;" >Les meilleures offres dans votre poche !</span></td>
@ -66,27 +66,27 @@
<td colspan="3">
<table cellpadding="0" cellspacing="0">
<tr align="center">
<td><img alt="smartphone 1" src="../../img/mails/bienvenue-FR_14.jpg" style="border:none;" /></td>
<td><img alt="smartphone 1" src="{shop_url}img/mails/bienvenue-FR_14.jpg" style="border:none;" /></td>
<td>
<a href="#appli1" style="text-decoration: none;" title="App Store"><img alt="App Store" src="../../img/mails/bienvenue-FR_15.jpg" style="border:none;" /></a>
<a href="#appli1" style="text-decoration: none;" title="App Store"><img alt="App Store" src="{shop_url}img/mails/bienvenue-FR_15.jpg" style="border:none;" /></a>
</td>
</tr>
<tr align="center">
<td><img alt="smartphone 2" src="../../img/mails/bienvenue-FR_16.jpg" style="border:none;" /></td>
<td><img alt="smartphone 2" src="{shop_url}img/mails/bienvenue-FR_16.jpg" style="border:none;" /></td>
<td>
<a href="#appli2" style="text-decoration: none;" title="App Store"><img alt="Google Play" src="../../img/mails/bienvenue-FR_17.jpg" style="border:none;" /></a>
<a href="#appli2" style="text-decoration: none;" title="App Store"><img alt="Google Play" src="{shop_url}img/mails/bienvenue-FR_17.jpg" style="border:none;" /></a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="3" align="center"><img alt="Parrainez vos amis" src="../../img/mails/bienvenue-FR_18.jpg" style="border:none;" /></td>
<td colspan="3" align="center"><img alt="Parrainez vos amis" src="{shop_url}img/mails/bienvenue-FR_18.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3" align="center">
<a href="{shop_url}" style="text-decoration: none;" title="Parrainage">
<img alt="Et gagne 10€" src="../../img/mails/bienvenue-FR_20.jpg" style="border:none;" />
<img alt="Et gagne 10€" src="{shop_url}img/mails/bienvenue-FR_20.jpg" style="border:none;" />
</a>
</td>
</tr>

26
modules/invite/sponsor.php
View File

@ -20,17 +20,10 @@ if(($sponsor = Tools::getValue('sponsor')) && strlen($sponsor) > 12) {
$url = parse_url($_SERVER['REQUEST_URI']);
$gclid = Tools::getIsset('gclid')?'&gclid='.Tools::getValue('gclid'):'';
if(Tools::getIsset('lpes')) {
$lp = Tools::getValue('lpes');
if( _THEME_NAME_ !== 'site_mobile') {
Tools::redirect('?sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).(isset($lp)? '&lpes='.$lp: '').$gclid);
}
}
if(Tools::getIsset('lp')) {
$lp = Tools::getValue('lp');
}
/**
* @Override Antadis - Module ant_trackingtag
*/
if(!class_exists('AntTrackingTag')){
require_once(_PS_MODULE_DIR_.'/ant_trackingtag/models/AntTrackingTag.php');
}
@ -42,6 +35,19 @@ if(($sponsor = Tools::getValue('sponsor')) && strlen($sponsor) > 12) {
$url_tag .='&'.$tag['tag'].'='.$value;
}
}
/* @End Override */
if(Tools::getIsset('lpes')) {
$lp = Tools::getValue('lpes');
if( _THEME_NAME_ !== 'site_mobile') {
Tools::redirect('?sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).(isset($lp)? '&lpes='.$lp: '').$url_tag.$gclid);
}
}
if(Tools::getIsset('lp')) {
$lp = Tools::getValue('lp');
}
Tools::redirectLink($link->getPageLink('authentication.php').'?create_account=1&sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).(isset($url['query'])? '&'.$url['query']: '').(isset($lp)? '&lp='.$lp: '').$url_tag.$gclid);
// Tools::redirectLink($link->getPageLink('authentication.php').'?create_account=1&sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).(isset($url['query'])? '&'.$url['query']: ''));
}

9
modules/paypal/express_checkout/process.php
View File

@ -578,7 +578,7 @@ class PaypalExpressCheckout extends Paypal
return false;
}
public function redirectToAPI()
public function redirectToAPI($return_url = false)
{
$this->secure_key = $this->getSecureKey();
$this->_storeCookieInfo();
@ -588,7 +588,12 @@ class PaypalExpressCheckout extends Paypal
else
$url = '/websc&cmd=_express-checkout';
Tools::redirectLink('https://'.$this->getPayPalURL().$url.'&token='.urldecode($this->token));
$paypal_url = 'https://'.$this->getPayPalURL().$url.'&token='.urldecode($this->token);
if ($return_url !== false) {
return $paypal_url;
} else {
Tools::redirectLink($paypal_url);
}
exit(0);
}

5
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -571,6 +571,11 @@ class AdminPrivateSalesSales extends AdminTab {
'value' => 9,
'selected' => ($this->cursale!==NULL && $this->cursale->delivery_delay== 9?true:false)
),
array(
'label' => $this->l('Livraison 72h Noel'),
'value' => 10,
'selected' => ($this->cursale!==NULL && $this->cursale->delivery_delay== 10?true:false)
),
);
// Delivery delay
$input = array(

3
modules/privatesales/fr.php
View File

@ -31,7 +31,8 @@ $_MODULE['<{privatesales}prestashop>adminprivatesales_183bb2d49469e8906d2d94031b
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_22be8e87aa2ae16df199bbca070a7df6'] = 'Image de listing (active)';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_a9844201f7bc0805c3f1675877539032'] = 'Image de listing (inactive)';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_ed5d09bbe3dbdbad83e0da32e05d8858'] = 'Background de la vente';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_d50e4da0f6bd551881c5ad13986c7dac'] = 'Image de listing (App)';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_d6a356b4a6b253c0d875925e56d4814c'] = 'Image de listing App (active)';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_716079f6e7fa2466292b8f3647d8a902'] = 'Image de listing App (inactive)';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_b7c161bb87bb0308fb25e6f68d0a5632'] = 'Miniature';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_0a90d59c0e2fe29a2bab00ba2f143262'] = 'Image pour Facebook';
$_MODULE['<{privatesales}prestashop>adminprivatesalessales_293ca29cd02dea5aaf60ffc6fcba670e'] = 'Fond de la bande annonce';

12
modules/privatesales_delay/saledelay.php
View File

@ -161,6 +161,9 @@ if (!class_exists('SaleDelay')) {
case '8':
return '48h Noël';
break;
case '10':
return '72h Noël';
break;
case '9':
return 'Spé';
break;
@ -197,6 +200,9 @@ if (!class_exists('SaleDelay')) {
case '8':
return '48h Noël';
break;
case '10':
return '72h Noël';
break;
default:
return 'Unknown';
break;
@ -235,6 +241,9 @@ if (!class_exists('SaleDelay')) {
case '8':
return 'sous 48h';
break;
case '10':
return 'sous 72h';
break;
case '9':
return 'spécifique';
break;
@ -271,6 +280,9 @@ if (!class_exists('SaleDelay')) {
case '8':
return 'de 48h';
break;
case '10':
return 'de 72h';
break;
default:
return 'de un poco días';
break;

4
modules/privatesales_logistique/AdminPrivateSalesLogistique.php
View File

@ -421,6 +421,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
$total_sale_product[(int)$id_product]['total_ht'] = 0;
$total_sale_product[(int)$id_product]['quantiy'] = 0;
$total_sale_product[(int)$id_product]['name'] = $current_product->name[2];
$total_sale_product[(int)$id_product]['supplier_reference'] = $current_product->supplier_reference;
}
$total_sale_product[(int)$id_product]['total_ht'] += ($wholesale_price * $quantity_to_cmd);
@ -434,6 +435,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
$i = 1;
foreach ($bestsales_extract as $key => $bestsalesProduct) {
$stats->addToStats('bestsale_'.$i.'_product', $bestsalesProduct['name']);
$stats->addToStats('bestsale_'.$i.'_ref', $bestsalesProduct['supplier_reference']);
$stats->addToStats('bestsale_'.$i.'_quantity', $bestsalesProduct['quantiy']);
$stats->addToStats('bestsale_'.$i.'_ca', $bestsalesProduct['total_ht']);
$i++;
@ -534,7 +536,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
for ($i=1; $i <= 3; $i++) {
$html.= '<tr class="grey">';
$html.= '<td>'.$stats->lang['bestsale_'.$i.'_product'].'</td>';
$html.= '<td align="right">'.$stats->data_stats['bestsale_'.$i.'_product'].'</td>';
$html.= '<td align="right">'.$stats->data_stats['bestsale_'.$i.'_product'].' - '.$stats->data_stats['bestsale_'.$i.'_ref'].'</td>';
$html.= '</tr>';
$html.= '<tr>';
$html.= '<td>'.$stats->lang['bestsale_'.$i.'_quantity'].'</td>';

4
themes/site/delay.tpl
View File

@ -26,4 +26,8 @@
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/48h_noel_{$cookie->id_lang}.png" alt="72h">
</div>
{elseif $delivery_delay == 10}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/72h_noel_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}

4
themes/site/delay_product.tpl
View File

@ -26,4 +26,8 @@
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_48h_noel_{$cookie->id_lang}.png" alt="72h">
</div>
{elseif $delivery_delay == 10}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_72h_noel_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}

10
themes/site/product.tpl
View File

@ -298,10 +298,10 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{*{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}
<p id="reduction_percent">{l s='(price reduced by'} <span id="reduction_percent_display">{$product->specificPrice.reduction*100}</span> %{l s=')'}</p>
{/if}*}
{if $packItems|@count}
{* {if $packItems|@count}
<p class="pack_price">{l s='instead of'} <span style="text-decoration: line-through;">{convertPrice price=$product->getNoPackPrice()}</span></p>
<br class="clear" />
{/if}
{/if} *}
{if $product->ecotax != 0}
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
{if $product->specificPrice AND $product->specificPrice.reduction}*{/if}
@ -426,7 +426,8 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
|| $sale->delivery_delay == 5
|| $sale->delivery_delay == 6
|| $sale->delivery_delay == 7
|| $sale->delivery_delay == 8}
|| $sale->delivery_delay == 8
|| $sale->delivery_delay == 10}
<div class="delay_flag" {if !$product->online_only}style="top:55px;"{/if}>
{include file="./themes/site/delay_product.tpl" delivery_delay=$sale->delivery_delay}
</div>
@ -511,7 +512,8 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
|| $sale->delivery_delay == 5
|| $sale->delivery_delay == 6
|| $sale->delivery_delay == 7
|| $sale->delivery_delay == 8}
|| $sale->delivery_delay == 8
|| $sale->delivery_delay == 10}
{include file="./themes/site/delay.tpl" delivery_delay=$sale->delivery_delay}
{else}
<span class="picto"></span>

4
themes/site_mobile/delay.tpl
View File

@ -26,4 +26,8 @@
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/48h_noel_{$cookie->id_lang}.png" alt="72h">
</div>
{elseif $delivery_delay == 10}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/72h_noel_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}

7
themes/site_mobile/product.tpl
View File

@ -258,10 +258,10 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
</p>
{/if}
{if $packItems|@count}
{* {if $packItems|@count}
<p class="pack_price">{l s='instead of'} <span style="text-decoration: line-through;">{convertPrice price=$product->getNoPackPrice()}</span></p>
<br class="clear" />
{/if}
{/if} *}
{if $product->ecotax != 0}
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
{if $product->specificPrice AND $product->specificPrice.reduction}
@ -460,7 +460,8 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
|| $sale->delivery_delay == 5
|| $sale->delivery_delay == 6
|| $sale->delivery_delay == 7
|| $sale->delivery_delay == 8}
|| $sale->delivery_delay == 8
|| $sale->delivery_delay == 10}
{include file="./themes/site_mobile/delay.tpl" delivery_delay=$sale->delivery_delay}
{else}
<span class="picto"></span>