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

Merge branch 'ticket-14456-BugBaliseEd' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-11-15 12:41:22 +01:00
commit d2acbed313
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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']: ''));
}

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';

4
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}

4
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}