Merge branch 'ticket/r13569-venteflash' into develop

This commit is contained in:
Nolwenn 2017-06-29 17:10:42 +02:00
commit 28c8d500af
2 changed files with 12 additions and 11 deletions

View File

@ -20,7 +20,7 @@
<!-- Image -->
<div class="row">
<div class="{if !isset($column)}col-sm-4 {else} col-sm-5 {/if}wrapImg">
{$product|d}
{if $percentReduction}
<span class="price-percent-reduction">
{if isset($product.isflash) && $product.isflash}<span class="blink">{/if}

View File

@ -219,7 +219,7 @@
{if $product->on_sale && !$isFlash}
<span class="solde">{l s='En solde !'}</span>
{else if $percentReduction}
<span class="price-percent-reduction">{if $isFlash}{l s='Vente Flash'}{else}{l s='Promo'}{/if} | -{$percentReduction}%</span>
{if !$isFlash}<span class="price-percent-reduction">{l s='Promo'} | -{$percentReduction}%</span>{/if}
{/if}
{if $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
<!-- prices -->
@ -389,16 +389,17 @@
{/if}
</span>
</p>
<p class="availlability">
{if $product->quantity <= 0}
{if $PS_STOCK_MANAGEMENT && $allow_oosp}
{$product->available_later}
{else}
{$product->available_later}
{*<p class="availlability">
{if $product->quantity <= 0}
{if $PS_STOCK_MANAGEMENT && $allow_oosp}
{$product->available_later}
{else}
{$product->available_later}
{/if}
{/if}
{/if}
</p>
</p>*}
</div>
</div> <!-- end box-cart-bottom -->
<div class="shipmentCost">