Merge branch 'product'

This commit is contained in:
Thibault UBUNTU 2016-07-01 13:00:12 +02:00
commit 900e7efa2b

View File

@ -138,13 +138,13 @@
{if $use_taxes && $total_shipping_tax_exc != $total_shipping}
{if $priceDisplay}
<div class="line"{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<div class="col-offset-md-1 col-md-5 col-offset-sm-0 col-sm-6 ">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</div>
<div class="col-md-6 col-sm-6 col-xs-6">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</div>
<div class="col-md-6 col-sm-6 col-xs-6">{displayPrice price=$total_shipping_tax_exc}</div>
</div>
{else}
<div class="line"{if $total_shipping <= 0} style="display:none;"{/if}>
<div class="col-offset-md-1 col-md-5 col-offset-sm-0 col-sm-6 ">{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}
<div class="col-md-6 col-sm-6 col-xs-6 ">{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}
</div>
<div class="col-md-6 col-sm-6 col-xs-6">{displayPrice price=$total_shipping}</div>
@ -153,7 +153,7 @@
{else}
<div{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<div class="col-offset-md-1 col-md-5 col-offset-sm-0 col-sm-6 ">{l s='Total shipping'}</div>
<div class="col-md-6 col-sm-6 col-xs-6">{l s='Total shipping'}</div>
<div class="col-md-6 col-sm-6 col-xs-6">{displayPrice price=$total_shipping_tax_exc}</div>
</div>