Merge branch 'ticket-14735-NewExpe' into develop

This commit is contained in:
Marion Muszynski 2017-11-15 10:29:15 +01:00
commit d6d2cc5298
2 changed files with 6 additions and 3 deletions

View File

@ -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>

View File

@ -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>