From d4f73213cbe6d5f3844aaf8c0331e13ef8201382 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Fri, 6 Dec 2013 12:12:21 +0100 Subject: [PATCH] // checkout - shopping cart W3C valid --- themes/default-bootstrap/shopping-cart.tpl | 172 +++++++++++---------- 1 file changed, 91 insertions(+), 81 deletions(-) diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl index 5b2694ac3..59d0741cf 100644 --- a/themes/default-bootstrap/shopping-cart.tpl +++ b/themes/default-bootstrap/shopping-cart.tpl @@ -26,7 +26,11 @@ {capture name=path}{l s='Your shopping cart'}{/capture}

{l s='Shopping-cart summary'} - {if !isset($empty) && !$PS_CATALOG_MODE}{l s='Your shopping cart contains:'} {$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if}{/if} + {if !isset($empty) && !$PS_CATALOG_MODE} + {l s='Your shopping cart contains:'} + {$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if} + + {/if}

{if isset($account_created)} @@ -122,7 +126,9 @@

{l s='Take advantage of our exclusive offers:'}

{foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
+ {if $voucher.code != ''}{$voucher.code} - {/if} + {$voucher.name} +
{/foreach}
{/if} @@ -206,96 +212,100 @@ {displayPrice price=$total_products} {/if} - - - {if $use_taxes} - {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} - {else} - {l s='Total gift-wrapping cost:'} - {/if} - - - {if $use_taxes} - {if $priceDisplay} - {displayPrice price=$total_wrapping_tax_exc} - {else} - {displayPrice price=$total_wrapping} - {/if} - {else} - {displayPrice price=$total_wrapping_tax_exc} - {/if} - - - {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} - - {l s='Shipping'} - {l s='Free Shipping!'} - - {else} - {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + + + {if $use_taxes} + {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} + {else} + {l s='Total gift-wrapping cost:'} + {/if} + + + {if $use_taxes} {if $priceDisplay} - - {if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if} - {displayPrice price=$total_shipping_tax_exc} - + {displayPrice price=$total_wrapping_tax_exc} {else} - - {if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if} - {displayPrice price=$total_shipping} - + {displayPrice price=$total_wrapping} {/if} {else} - - {l s='Total shipping'} - {displayPrice price=$total_shipping_tax_exc} + {displayPrice price=$total_wrapping_tax_exc} + {/if} + + + {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} + + {l s='Shipping'} + {l s='Free Shipping!'} + + {else} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + {if $priceDisplay} + + {if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if} + {displayPrice price=$total_shipping_tax_exc} + + {else} + + {if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if} + {displayPrice price=$total_shipping} {/if} + {else} + + {l s='Total shipping'} + {displayPrice price=$total_shipping_tax_exc} + {/if} - - - {if $display_tax_label} - {if $use_taxes && $priceDisplay == 0} - {l s='Total vouchers (tax incl.):'} - {else} - {l s='Total vouchers (tax excl.)'} - {/if} - {else} - {l s='Total vouchers'} - {/if} - - + {/if} + + + + {if $display_tax_label} {if $use_taxes && $priceDisplay == 0} - {assign var='total_discounts_negative' value=$total_discounts * -1} + {l s='Total vouchers (tax incl.):'} {else} - {assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} + {l s='Total vouchers (tax excl.)'} {/if} - {displayPrice price=$total_discounts_negative} - - - {if $use_taxes && $show_taxes} - - {l s='Total (tax excl.)'} - {displayPrice price=$total_price_without_tax} - - - {l s='Total tax'} - {displayPrice price=$total_tax} - - {/if} - - - {l s='Total'} - - {if $use_taxes} - - {displayPrice price=$total_price} - {else} - - {displayPrice price=$total_price_without_tax} - + {l s='Total vouchers'} {/if} + + + {if $use_taxes && $priceDisplay == 0} + {assign var='total_discounts_negative' value=$total_discounts * -1} + {else} + {assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} + {/if} + {displayPrice price=$total_discounts_negative} + + + {if $use_taxes && $show_taxes} + + + {l s='Total (tax excl.)'} + {displayPrice price=$total_price_without_tax} + + + {l s='Total tax'} + {displayPrice price=$total_tax} + + {/if} + + + + {l s='Total'} + + {if $use_taxes} + + {displayPrice price=$total_price} + + {else} + + {displayPrice price=$total_price_without_tax} + + {/if} + {assign var='odd' value=0} @@ -545,14 +555,14 @@

{if !$opc} {l s='Proceed to checkout'} {if Configuration::get('PS_ALLOW_MULTISHIPPING')} {l s='Proceed to checkout'}