push from prod

This commit is contained in:
root 2017-11-15 10:34:51 +01:00
parent 6ab7e66316
commit 43a085d4ec
3 changed files with 6 additions and 5 deletions

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

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}

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}