dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Browse Source
This commit is contained in:
gRoussac committed 2013-12-06 12:18:59 +01:00
2 parents 33e9c2c132 d4f73213cb
commit 0af0601cc7
1 file changed
+14 -4
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/shopping-cart.tpl
+14 -4
View File
@@ -26,7 +26,11 @@
{capture name=path}{l s='Your shopping cart'}{/capture} {capture name=path}{l s='Your shopping cart'}{/capture}
<h1 id="cart_title" class="page-heading">{l s='Shopping-cart summary'} <h1 id="cart_title" class="page-heading">{l s='Shopping-cart summary'}
{if !isset($empty) && !$PS_CATALOG_MODE}<span class="heading-counter">{l s='Your shopping cart contains:'} <span id="summary_products_quantity">{$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if}</span></span>{/if} {if !isset($empty) && !$PS_CATALOG_MODE}
<span class="heading-counter">{l s='Your shopping cart contains:'}
<span id="summary_products_quantity">{$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if}</span>
</span>
{/if}
</h1> </h1>
{if isset($account_created)} {if isset($account_created)}
@@ -122,7 +126,9 @@
<p id="title" class="title-offers">{l s='Take advantage of our exclusive offers:'}</p> <p id="title" class="title-offers">{l s='Take advantage of our exclusive offers:'}</p>
<div id="display_cart_vouchers"> <div id="display_cart_vouchers">
{foreach $displayVouchers as $voucher} {foreach $displayVouchers as $voucher}
{if $voucher.code != ''}<span onclick="$('#discount_name').val('{$voucher.code}');return false;" class="voucher_name">{$voucher.code}</span> - {/if}{$voucher.name}<br /> {if $voucher.code != ''}<span onclick="$('#discount_name').val('{$voucher.code}');return false;" class="voucher_name">{$voucher.code}</span> - {/if}
{$voucher.name}
<br />
{/foreach} {/foreach}
</div> </div>
{/if} {/if}
@@ -252,6 +258,7 @@
{/if} {/if}
{/if} {/if}
<tr class="cart_total_voucher" {if $total_discounts == 0}style="display:none"{/if}> <tr class="cart_total_voucher" {if $total_discounts == 0}style="display:none"{/if}>
<td colspan="2"></td>
<td colspan="3" class="text-right"> <td colspan="3" class="text-right">
{if $display_tax_label} {if $display_tax_label}
{if $use_taxes && $priceDisplay == 0} {if $use_taxes && $priceDisplay == 0}
@@ -274,15 +281,18 @@
</tr> </tr>
{if $use_taxes && $show_taxes} {if $use_taxes && $show_taxes}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td colspan="2"></td>
<td colspan="3" class="text-right">{l s='Total (tax excl.)'}</td> <td colspan="3" class="text-right">{l s='Total (tax excl.)'}</td>
<td colspan="2" class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td> <td colspan="2" class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td>
</tr> </tr>
<tr class="cart_total_tax"> <tr class="cart_total_tax">
<td colspan="2"></td>
<td colspan="3" class="text-right">{l s='Total tax'}</td> <td colspan="3" class="text-right">{l s='Total tax'}</td>
<td colspan="2" class="price" id="total_tax">{displayPrice price=$total_tax}</td> <td colspan="2" class="price" id="total_tax">{displayPrice price=$total_tax}</td>
</tr> </tr>
{/if} {/if}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td colspan="2"></td>
<td colspan="3" class="total_price_container text-right"> <td colspan="3" class="total_price_container text-right">
<span>{l s='Total'}</span> <span>{l s='Total'}</span>
</td> </td>
@@ -545,14 +555,14 @@
<p class="cart_navigation clearfix"> <p class="cart_navigation clearfix">
{if !$opc} {if !$opc}
<a <a
href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}" href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:html:'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:html:'UTF-8'}{/if}"
class="button btn btn-default standard-checkout button-medium" class="button btn btn-default standard-checkout button-medium"
title="{l s='Proceed to checkout'}"> title="{l s='Proceed to checkout'}">
<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span> <span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>
</a> </a>
{if Configuration::get('PS_ALLOW_MULTISHIPPING')} {if Configuration::get('PS_ALLOW_MULTISHIPPING')}
<a <a
href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}&amp;multi-shipping=1" href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:html:'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:html:'UTF-8'}{/if}&amp;multi-shipping=1"
class="multishipping-button multishipping-checkout button btn btn-default button-medium" class="multishipping-button multishipping-checkout button btn btn-default button-medium"
title="{l s='Proceed to checkout'}"> title="{l s='Proceed to checkout'}">
<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span> <span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>