From 0067eff263ff53886fa12657bbce3c8d8c7d1dd1 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 5 Dec 2013 18:50:50 +0100 Subject: [PATCH] // working on W3C validation --- themes/default-bootstrap/order-payment.tpl | 604 +++++++------- themes/default-bootstrap/shopping-cart.tpl | 912 +++++++++++---------- 2 files changed, 814 insertions(+), 702 deletions(-) diff --git a/themes/default-bootstrap/order-payment.tpl b/themes/default-bootstrap/order-payment.tpl index 75a8c1bd2..f65eff64d 100644 --- a/themes/default-bootstrap/order-payment.tpl +++ b/themes/default-bootstrap/order-payment.tpl @@ -34,308 +34,332 @@ var txtProducts = "{l s='products' js=1}"; // ]]> - {capture name=path}{l s='Your payment method'}{/capture} {/if} -{if !$opc}

{l s='Please choose your payment method'}

{else}

3 {l s='Please choose your payment method'}

{/if} +{if !$opc} +

{l s='Please choose your payment method'}

+{else} +

3 {l s='Please choose your payment method'}

+{/if} {if !$opc} {assign var='current_step' value='payment'} {include file="$tpl_dir./order-steps.tpl"} - {include file="$tpl_dir./errors.tpl"} {else}
{/if} - -
- -
{$HOOK_TOP_PAYMENT}
- -{if $HOOK_PAYMENT} - {if !$opc} -
- - - - - - - - - - - - - {if $use_taxes} - {if $priceDisplay} - - - - - {else} - - - - - {/if} - {else} - - - - - {/if} - - - - - {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} - - - - - {else} - {if $use_taxes && $total_shipping_tax_exc != $total_shipping} - {if $priceDisplay} - - - - - {else} - - - - - {/if} - {else} - - - - - {/if} - {/if} - - - - - {if $use_taxes} - {if $priceDisplay && $total_tax != 0} - - - - - {/if} - - - - - {else} - - {if $voucherAllowed} - - {/if} - - - - {/if} - - - {foreach from=$products item=product name=productLoop} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='cannotModify' value=1} - {assign var='odd' value=$product@iteration%2} - {assign var='noDeleteButton' value=1} - {* Display the product line *} - {include file="$tpl_dir./shopping-cart-product-line.tpl"} - {* Then the customized datas ones*} - {if isset($customizedDatas.$productId.$productAttributeId)} - {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization'} - - + + + {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} + + + + + {else} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + {/if} + + + + + {if $use_taxes} + {if $priceDisplay && $total_tax != 0} + + + + + {/if} + + + + + {else} + + {if $voucherAllowed} + + {/if} + + + + {/if} + -{if !$opc} -

{l s='Continue shopping'}

-{else} - -{/if} - + + {foreach from=$products item=product name=productLoop} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='cannotModify' value=1} + {assign var='odd' value=$product@iteration%2} + {assign var='noDeleteButton' value=1} + {* Display the product line *} + {include file="$tpl_dir./shopping-cart-product-line.tpl"} + {* Then the customized datas ones*} + {if isset($customizedDatas.$productId.$productAttributeId)} + {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization'} + + + + + + {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} + {/foreach} + {* If it exists also some uncustomized products *} + {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl"}{/if} + {/if} + {/foreach} + {assign var='last_was_odd' value=$product@iteration%2} + {foreach $gift_products as $product} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='odd' value=($product@iteration+$last_was_odd)%2} + {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} + {assign var='cannotModify' value=1} + {* Display the gift product line *} + {include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {/foreach} + + + {if count($discounts)} + + {foreach from=$discounts item=discount name=discountLoop} + + + + + + {/foreach} + + {/if} +
{l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Total'}
{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
{l s='Total products'}{displayPrice price=$total_products}
- {if $use_taxes} - {if $priceDisplay} - {if $display_tax_label}{l s='Total gift wrapping (tax excl.):'}{else}{l s='Total gift wrapping cost:'}{/if} - {else} - {if $display_tax_label}{l s='Total gift wrapping (tax incl.)'}{else}{l s='Total gift wrapping cost:'}{/if} - {/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} -
{l s='Shipping:'}{l s='Free Shipping!'}
- {if $use_taxes} - {if $priceDisplay} - {if $display_tax_label}{l s='Total vouchers (tax excl.)'}{else}{l s='Total vouchers'}{/if} - {else} - {if $display_tax_label}{l s='Total vouchers (tax incl.)'}{else}{l s='Total vouchers'}{/if} - {/if} - {else} - {l s='Total vouchers'} - {/if} - - {if $use_taxes} - {if $priceDisplay} - {displayPrice price=$total_discounts_tax_exc*-1} - {else} - {displayPrice price=$total_discounts*-1} - {/if} - {else} - {displayPrice price=$total_discounts_tax_exc*-1} - {/if} -
{l s='Total tax:'}{displayPrice price=$total_tax}
{l s='Total'} - {displayPrice price=$total_price} -
-
- {if isset($errors_discount) && $errors_discount} -
    - {foreach from=$errors_discount key=k item=error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} - {if $voucherAllowed} -
-
-

{l s='Vouchers'}

- - - - {if $displayVouchers} -

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

-
- {foreach from=$displayVouchers item=voucher} - {$voucher.name} - {$voucher.description}
- {/foreach} -
- {/if} -
-
- {/if} -
- 		- {l s='Total'} - - {displayPrice price=$total_price_without_tax} -
- {foreach from=$customization.datas key='type' item='datas'} - {if $type == $CUSTOMIZE_FILE} -
-
    - {foreach from=$datas item='picture'} -
  • - -
    • - {/foreach} -
-
- {elseif $type == $CUSTOMIZE_TEXTFIELD} -
    - {foreach from=$datas item='textField' name='typedText'} -
  • - {if $textField.name} - {l s='%s:' sprintf=$textField.name} +
    +
    {$HOOK_TOP_PAYMENT}
    + {if $HOOK_PAYMENT} + {if !$opc} +
    + + + + + + + + + + + + + {if $use_taxes} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + + - - - - {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} - {/foreach} - {* If it exists also some uncustomized products *} - {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl"}{/if} - {/if} - {/foreach} - {assign var='last_was_odd' value=$product@iteration%2} - {foreach $gift_products as $product} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='odd' value=($product@iteration+$last_was_odd)%2} - {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} - {assign var='cannotModify' value=1} - {* Display the gift product line *} - {include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} - {/foreach} - - {if count($discounts)} - - {foreach from=$discounts item=discount name=discountLoop} - - - - - - {/foreach} - - {/if} -
    {l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Total'}
    {if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
    {if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
    {l s='Total products'}{displayPrice price=$total_products}
    + {if $use_taxes} + {if $priceDisplay} + {if $display_tax_label}{l s='Total gift wrapping (tax excl.):'}{else}{l s='Total gift wrapping cost:'}{/if} {else} - {l s='Text #%s:' sprintf=$smarty.foreach.typedText.index+1} + {if $display_tax_label}{l s='Total gift wrapping (tax incl.)'}{else}{l s='Total gift wrapping cost:'}{/if} {/if} - {$textField.value} - - {/foreach} - - {/if} - {/foreach} - - {if isset($cannotModify) AND $cannotModify == 1} - {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} - {else} -
    - {l s='Delete'} -
    -
    - {l s='Add'}
    - {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} - - {l s='Subtract'} - - {else} - - {l s='Subtract'} - - {/if} -
    - - - {/if} -
    {$discount.name}{$discount.description} - - {if $discount.value_real > 0} - {if !$priceDisplay} - {displayPrice price=$discount.value_real*-1} - {else} - {displayPrice price=$discount.value_tax_exc*-1} - {/if} - {/if} - -
    -
    -{/if} - {if $opc}
    {/if} -
    - {$HOOK_PAYMENT} -
    - {if $opc}
    {/if} -{else} -

    {l s='No payment modules have been installed.'}

    -{/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} +
{l s='Shipping:'}{l s='Free Shipping!'}
+ {if $use_taxes} + {if $priceDisplay} + {if $display_tax_label}{l s='Total vouchers (tax excl.)'}{else}{l s='Total vouchers'}{/if} + {else} + {if $display_tax_label}{l s='Total vouchers (tax incl.)'}{else}{l s='Total vouchers'}{/if} + {/if} + {else} + {l s='Total vouchers'} + {/if} + + {if $use_taxes} + {if $priceDisplay} + {displayPrice price=$total_discounts_tax_exc*-1} + {else} + {displayPrice price=$total_discounts*-1} + {/if} + {else} + {displayPrice price=$total_discounts_tax_exc*-1} + {/if} +
{l s='Total tax:'}{displayPrice price=$total_tax}
{l s='Total'} + {displayPrice price=$total_price} +
+
+ {if isset($errors_discount) && $errors_discount} +
    + {foreach from=$errors_discount key=k item=error} +
  • {$error|escape:'html':'UTF-8'}
    • + {/foreach} +
+ {/if} + {if $voucherAllowed} +
+
+

{l s='Vouchers'}

+ + + + {if $displayVouchers} +

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

+
+ {foreach from=$displayVouchers item=voucher} + {$voucher.name} - {$voucher.description}
+ {/foreach} +
+ {/if} +
+
+ {/if} +
+ 		+ {l s='Total'} + + {displayPrice price=$total_price_without_tax} +
+ {foreach from=$customization.datas key='type' item='datas'} + {if $type == $CUSTOMIZE_FILE} +
+
    + {foreach from=$datas item='picture'} +
  • + +
    • + {/foreach} +
+
+ {elseif $type == $CUSTOMIZE_TEXTFIELD} +
    + {foreach from=$datas item='textField' name='typedText'} +
  • + {if $textField.name} + {l s='%s:' sprintf=$textField.name} + {else} + {l s='Text #%s:' sprintf=$smarty.foreach.typedText.index+1} + {/if} + {$textField.value} +
    • + {/foreach} +
+ {/if} + {/foreach} + 		+ {if isset($cannotModify) AND $cannotModify == 1} + {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} + {else} +
+ + {l s='Delete'} + +
+
+ + {l s='Add'} + +
+ {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} + + {l s='Subtract'} + + {else} + + {l s='Subtract'} + + {/if} +
+ + + {/if} +
{$discount.name}{$discount.description} + + {if $discount.value_real > 0} + {if !$priceDisplay} + {displayPrice price=$discount.value_real*-1} + {else} + {displayPrice price=$discount.value_tax_exc*-1} + {/if} + {/if} + +
+
+ {/if} + {if $opc}
{/if} +
+ {$HOOK_PAYMENT} +
+ {if $opc}
{/if} + {else} +

{l s='No payment modules have been installed.'}

+ {/if} + {if !$opc} +

+ + + {l s='Continue shopping'} + +

+ {else} +
+ {/if} +
\ No newline at end of file diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl index 13275edb7..5b2694ac3 100644 --- a/themes/default-bootstrap/shopping-cart.tpl +++ b/themes/default-bootstrap/shopping-cart.tpl @@ -34,6 +34,7 @@ {l s='Your account has been created.'}

{/if} + {assign var='current_step' value='summary'} {include file="$tpl_dir./order-steps.tpl"} {include file="$tpl_dir./errors.tpl"} @@ -44,444 +45,531 @@

{l s='This store has not accepted your new order.'}

{else} -{if isset($lastProductAdded) AND $lastProductAdded} -
-
-
{l s='Last product added'}
+ {if isset($lastProductAdded) AND $lastProductAdded} +
+
+
{l s='Last product added'}
+
+ + {$lastProductAdded.name|escape:'html':'UTF-8'} + +
+

+ + {$lastProductAdded.name|escape:'html':'UTF-8'} + +

+ {if isset($lastProductAdded.attributes) && $lastProductAdded.attributes} + + + {$lastProductAdded.attributes|escape:'html':'UTF-8'} + + + {/if} +
- {$lastProductAdded.name|escape:'html':'UTF-8'} -
-

{$lastProductAdded.name|escape:'html':'UTF-8'}

- {if isset($lastProductAdded.attributes) && $lastProductAdded.attributes}{$lastProductAdded.attributes|escape:'html':'UTF-8'}{/if} -
-
-{/if} -{assign var='total_discounts_num' value="{if $total_discounts != 0}1{else}0{/if}"} -{assign var='use_show_taxes' value="{if $use_taxes && $show_taxes}2{else}0{/if}"} -{assign var='total_wrapping_taxes_num' value="{if $total_wrapping != 0}1{else}0{/if}"} -
- - - - - - - - - - - - - - {if $use_taxes} - {if $priceDisplay} - - - - - - {else} - - - - - - {/if} - {else} - - - - - - {/if} - - - - - {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} - - - - - {else} - {if $use_taxes && $total_shipping_tax_exc != $total_shipping} - {if $priceDisplay} - - - - - {else} - - - - - {/if} - {else} - - - - - {/if} - {/if} - - - - - {if $use_taxes && $show_taxes} - - - - - - - - - {/if} - - - {if $use_taxes} - - {else} - - {/if} - - - - {assign var='odd' value=0} - {foreach $products as $product} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='odd' value=($odd+1)%2} - {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId) || count($gift_products)} - {* Display the product line *} - {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} - {* Then the customized datas ones*} - {if isset($customizedDatas.$productId.$productAttributeId)} - {foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization} - - - + {if sizeof($discounts)} + + {foreach $discounts as $discount} + + + + + + + {/foreach} - {/foreach} - - - {/foreach} + + {/if} +
{l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Qty'}{l s='Total'} 
- {if $voucherAllowed} - {if isset($errors_discount) && $errors_discount} -
    - {foreach $errors_discount as $k=>$error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} -
-
-

{l s='Vouchers'}

- - - -
-
- {if $displayVouchers} -

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

-
- {foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
- {/foreach} -
- {/if} - {/if} - 		{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
- {if $voucherAllowed} - {if isset($errors_discount) && $errors_discount} -
    - {foreach $errors_discount as $k=>$error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} -
-
-

{l s='Vouchers'}

- - - -
-
- {if $displayVouchers} -

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

-
- {foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
- {/foreach} -
- {/if} - {/if} - 		{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
- {if $voucherAllowed} - {if isset($errors_discount) && $errors_discount} -
    - {foreach $errors_discount as $k=>$error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} -
-
-

{l s='Vouchers'}

- - - -
-
- {if $displayVouchers} -

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

-
- {foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
- {/foreach} -
- {/if} - {/if} - 		{l s='Total products'}{displayPrice price=$total_products}
- {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} -
{l s='Shipping'}{l s='Free Shipping!'}
- {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 $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} -
{l s='Total (tax excl.)'}{displayPrice price=$total_price_without_tax}
{l s='Total tax'}{displayPrice price=$total_tax}
{l s='Total'} - {displayPrice price=$total_price} - - {displayPrice price=$total_price_without_tax} -
- {foreach $customization.datas as $type => $custom_data} - {if $type == $CUSTOMIZE_FILE} -
-
    - {foreach $custom_data as $picture} -
    • + {/if} + {assign var='total_discounts_num' value="{if $total_discounts != 0}1{else}0{/if}"} + {assign var='use_show_taxes' value="{if $use_taxes && $show_taxes}2{else}0{/if}"} + {assign var='total_wrapping_taxes_num' value="{if $total_wrapping != 0}1{else}0{/if}"} + +
    + + + + + + + + + + + + + + {if $use_taxes} + {if $priceDisplay} + + + + + + {else} + + + + + + {/if} + {else} + + - - + + + {/if} + + + - {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} + {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} + + + + + {else} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + {/if} + + + + + {if $use_taxes && $show_taxes} + + + + + + + + + {/if} + + + {if $use_taxes} + + {else} + + {/if} + + + + {assign var='odd' value=0} + {foreach $products as $product} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='odd' value=($odd+1)%2} + {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId) || count($gift_products)} + {* Display the product line *} + {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {* Then the customized datas ones*} + {if isset($customizedDatas.$productId.$productAttributeId)} + {foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization} + + + + + + + {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} + {/foreach} + + {* If it exists also some uncustomized products *} + {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}{/if} + {/if} {/foreach} - {* If it exists also some uncustomized products *} - {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}{/if} - {/if} - {/foreach} - {assign var='last_was_odd' value=$product@iteration%2} - {foreach $gift_products as $product} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='odd' value=($product@iteration+$last_was_odd)%2} - {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} - {assign var='cannotModify' value=1} - {* Display the gift product line *} - {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} - {/foreach} - - {if sizeof($discounts)} - - {foreach $discounts as $discount} - - - - - - - - {/foreach} - - {/if} -
    {l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Qty'}{l s='Total'} 
    + {if $voucherAllowed} + {if isset($errors_discount) && $errors_discount} +
      + {foreach $errors_discount as $k=>$error} +
    • {$error|escape:'html':'UTF-8'}
      • {/foreach}
    - - {elseif $type == $CUSTOMIZE_TEXTFIELD} -
      - {foreach $custom_data as $textField} -
    • - {if $textField.name} - {$textField.name} - {else} - {l s='Text #'}{$textField@index+1} + {/if} +
      +
      +

      {l s='Vouchers'}

      + + + +
      +
      + {if $displayVouchers} +

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

      +
      + {foreach $displayVouchers as $voucher} + {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
      + {/foreach} +
      + {/if} + {/if} +
    		{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
    + {if $voucherAllowed} + {if isset($errors_discount) && $errors_discount} +
      + {foreach $errors_discount as $k=>$error} +
    • {$error|escape:'html':'UTF-8'}
      • + {/foreach} +
    + {/if} +
    +
    +

    {l s='Vouchers'}

    + + + +
    +
    + {if $displayVouchers} +

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

    +
    + {foreach $displayVouchers as $voucher} + {if $voucher.code != ''} + {$voucher.code} - {/if} - {l s=':'} {$textField.value} - + {$voucher.name} +
    + {/foreach} +
    + {/if} + {/if} +     		{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
    + {if $voucherAllowed} + {if isset($errors_discount) && $errors_discount} +
      + {foreach $errors_discount as $k=>$error} +
    • {$error|escape:'html':'UTF-8'}
      • {/foreach} -
    {/if} - - {/foreach} -     		- {if isset($cannotModify) AND $cannotModify == 1} - {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} - {else} - - -
    - {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} - - - - {else} - - - +
    +
    +

    {l s='Vouchers'}

    + + + +
    +
    + {if $displayVouchers} +

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

    +
    + {foreach $displayVouchers as $voucher} + {if $voucher.code != ''} + {$voucher.code} - + {/if} + {$voucher.name}
    + {/foreach} +
    {/if} - -
    {/if}     		- {if isset($cannotModify) AND $cannotModify == 1} + {l s='Total products'}{displayPrice price=$total_products}
    + {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}
    {l s='Shipping'}{l s='Free Shipping!'}
    + {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 $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} +
    {l s='Total (tax excl.)'}{displayPrice price=$total_price_without_tax}
    {l s='Total tax'}{displayPrice price=$total_tax}
    + {l s='Total'} + + {displayPrice price=$total_price} + + {displayPrice price=$total_price_without_tax} +
    + {foreach $customization.datas as $type => $custom_data} + {if $type == $CUSTOMIZE_FILE} +
    +
      + {foreach $custom_data as $picture} +
      • + {/foreach} +
    +
    + {elseif $type == $CUSTOMIZE_TEXTFIELD} +
      + {foreach $custom_data as $textField} +
    • + {if $textField.name} + {$textField.name} + {else} + {l s='Text #'}{$textField@index+1} + {/if} + {l s=':'} {$textField.value} +
      • + {/foreach} +
    + {/if} + {/foreach} +     		+ {if isset($cannotModify) AND $cannotModify == 1} + {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} + {else} + + +
    + {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} + + + + {else} + + + + {/if} + + + +
    + {/if} +     		+ {if isset($cannotModify) AND $cannotModify == 1} + {else} +
    + + + +
    + {/if} +
    {$discount.name} - {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} - 1 - {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} - - {if strlen($discount.code)}{/if} -
    -
    - -{if $show_option_allow_separate_package} -

    - allow_seperated_package}checked="checked"{/if} autocomplete="off"/> - -

    -{/if} -{if !$opc} - {if Configuration::get('PS_ALLOW_MULTISHIPPING')} -

    - - -

    - {/if} -{/if} - -{* Define the style if it doesn't exist in the PrestaShop version*} -{* Will be deleted for 1.5 version and more *} -{if !isset($addresses_style)} - {$addresses_style.company = 'address_company'} - {$addresses_style.vat_number = 'address_company'} - {$addresses_style.firstname = 'address_name'} - {$addresses_style.lastname = 'address_name'} - {$addresses_style.address1 = 'address_address1'} - {$addresses_style.address2 = 'address_address2'} - {$addresses_style.city = 'address_city'} - {$addresses_style.country = 'address_country'} - {$addresses_style.phone = 'address_phone'} - {$addresses_style.phone_mobile = 'address_phone_mobile'} - {$addresses_style.alias = 'address_title'} -{/if} - -{if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc} -
    - {if !isset($formattedAddresses) || (count($formattedAddresses.invoice) == 0 && count($formattedAddresses.delivery) == 0) || (count($formattedAddresses.invoice.formated) == 0 && count($formattedAddresses.delivery.formated) == 0)} - {if $delivery->id} -
    -
      -

    • {l s='Delivery address'} ({$delivery->alias})

      • - {if $delivery->company}
    • {$delivery->company|escape:'html':'UTF-8'}
      • {/if} -
    • {$delivery->firstname|escape:'html':'UTF-8'} {$delivery->lastname|escape:'html':'UTF-8'}
      • -
    • {$delivery->address1|escape:'html':'UTF-8'}
      • - {if $delivery->address2}
    • {$delivery->address2|escape:'html':'UTF-8'}
      • {/if} -
    • {$delivery->postcode|escape:'html':'UTF-8'} {$delivery->city|escape:'html':'UTF-8'}
      • -
    • {$delivery->country|escape:'html':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'html':'UTF-8'}){/if}
      • -
    -
    - {/if} - {if $invoice->id} -
    -
      -

    • {l s='Invoice address'} ({$invoice->alias})

      • - {if $invoice->company}
    • {$invoice->company|escape:'html':'UTF-8'}
      • {/if} -
    • {$invoice->firstname|escape:'html':'UTF-8'} {$invoice->lastname|escape:'html':'UTF-8'}
      • -
    • {$invoice->address1|escape:'html':'UTF-8'}
      • - {if $invoice->address2}
    • {$invoice->address2|escape:'html':'UTF-8'}
      • {/if} -
    • {$invoice->postcode|escape:'html':'UTF-8'} {$invoice->city|escape:'html':'UTF-8'}
      • -
    • {$invoice->country|escape:'html':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'html':'UTF-8'}){/if}
      • -
    -
    - {/if} - {else} - {foreach from=$formattedAddresses key=k item=address} -
    -
      -

    • {if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)} ({$address.object.alias}){/if}

      • - {foreach $address.ordered as $pattern} - {assign var=addressKey value=" "|explode:$pattern} - {assign var=addedli value=false} - {foreach from=$addressKey item=key name=foo} - {if isset($address.formated[$key]) && !empty($address.formated[$key])} - {if (!$addedli)} - {$addedli = true} -
    • - {/if}{$address.formated[$key]|escape:'html':'UTF-8'}{/if}{if ($smarty.foreach.foo.last && $addedli)} -
      • {/if} + {assign var='last_was_odd' value=$product@iteration%2} + {foreach $gift_products as $product} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='odd' value=($product@iteration+$last_was_odd)%2} + {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} + {assign var='cannotModify' value=1} + {* Display the gift product line *} + {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {/foreach} +
{$discount.name} + + {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} + + 1 + {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} + + {if strlen($discount.code)} + + + + {/if} +
+
+ + {if $show_option_allow_separate_package} +

+ allow_seperated_package}checked="checked"{/if} autocomplete="off"/> + +

{/if} -
-{/if} -
{$HOOK_SHOPPING_CART}
-

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

+ + +

{/if} {/if} - {l s='Continue shopping'} -

+ + {* Define the style if it doesn't exist in the PrestaShop version*} + {* Will be deleted for 1.5 version and more *} + {if !isset($addresses_style)} + {$addresses_style.company = 'address_company'} + {$addresses_style.vat_number = 'address_company'} + {$addresses_style.firstname = 'address_name'} + {$addresses_style.lastname = 'address_name'} + {$addresses_style.address1 = 'address_address1'} + {$addresses_style.address2 = 'address_address2'} + {$addresses_style.city = 'address_city'} + {$addresses_style.country = 'address_country'} + {$addresses_style.phone = 'address_phone'} + {$addresses_style.phone_mobile = 'address_phone_mobile'} + {$addresses_style.alias = 'address_title'} + {/if} + + {if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc} +
+ {if !isset($formattedAddresses) || (count($formattedAddresses.invoice) == 0 && count($formattedAddresses.delivery) == 0) || (count($formattedAddresses.invoice.formated) == 0 && count($formattedAddresses.delivery.formated) == 0)} + {if $delivery->id} +
+
    +

  • {l s='Delivery address'} ({$delivery->alias})

    • + {if $delivery->company}
  • {$delivery->company|escape:'html':'UTF-8'}
    • {/if} +
  • {$delivery->firstname|escape:'html':'UTF-8'} {$delivery->lastname|escape:'html':'UTF-8'}
    • +
  • {$delivery->address1|escape:'html':'UTF-8'}
    • + {if $delivery->address2}
  • {$delivery->address2|escape:'html':'UTF-8'}
    • {/if} +
  • {$delivery->postcode|escape:'html':'UTF-8'} {$delivery->city|escape:'html':'UTF-8'}
    • +
  • {$delivery->country|escape:'html':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'html':'UTF-8'}){/if}
    • +
+
+ {/if} + {if $invoice->id} +
+
    +

  • {l s='Invoice address'} ({$invoice->alias})

    • + {if $invoice->company}
  • {$invoice->company|escape:'html':'UTF-8'}
    • {/if} +
  • {$invoice->firstname|escape:'html':'UTF-8'} {$invoice->lastname|escape:'html':'UTF-8'}
    • +
  • {$invoice->address1|escape:'html':'UTF-8'}
    • + {if $invoice->address2}
  • {$invoice->address2|escape:'html':'UTF-8'}
    • {/if} +
  • {$invoice->postcode|escape:'html':'UTF-8'} {$invoice->city|escape:'html':'UTF-8'}
    • +
  • {$invoice->country|escape:'html':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'html':'UTF-8'}){/if}
    • +
+
+ {/if} + {else} + {foreach from=$formattedAddresses key=k item=address} +
+
    +
  • +

    + {if $k eq 'invoice'} + {l s='Invoice address'} + {elseif $k eq 'delivery' && $delivery->id} + {l s='Delivery address'} + {/if} + {if isset($address.object.alias)} + ({$address.object.alias}) + {/if} +

    +
    • + {foreach $address.ordered as $pattern} + {assign var=addressKey value=" "|explode:$pattern} + {assign var=addedli value=false} + {foreach from=$addressKey item=key name=foo} + {if isset($address.formated[$key]) && !empty($address.formated[$key])} + {if (!$addedli)} + {$addedli = true} +
  • + {/if} + {$address.formated[$key]|escape:'html':'UTF-8'} + {/if} + {if ($smarty.foreach.foo.last && $addedli)} +
    • + {/if} + {/foreach} + {/foreach} +
+
+ {/foreach} + {/if} +
+ {/if} +
{$HOOK_SHOPPING_CART}
+

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

{if !empty($HOOK_SHOPPING_CART_EXTRA)}
{$HOOK_SHOPPING_CART_EXTRA}
{/if} -{/if} - +{/if} \ No newline at end of file