diff --git a/themes/prestashop/order-payment.tpl b/themes/prestashop/order-payment.tpl index 5b6f71001..bd06c0608 100644 --- a/themes/prestashop/order-payment.tpl +++ b/themes/prestashop/order-payment.tpl @@ -55,7 +55,222 @@
{$HOOK_TOP_PAYMENT}
{if $HOOK_PAYMENT} - {if !$opc}

{l s='Please select your preferred payment method to pay the amount of'} {convertPrice price=$total_price} {if $taxes_enabled}{l s='(tax incl.)'}{/if}


{/if} + {if !$opc} +
+ + + + + + + + + + + + + + {if $use_taxes} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + + + + + + + + + {if $use_taxes} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + + {if $use_taxes} + + + + + + + + + + + + + {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} + {* 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 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} + + {if sizeof($discounts)} + + {foreach from=$discounts item=discount name=discountLoop} + + + + + + + {/foreach} + + {/if} +
{l s='Product'}{l s='Description'}{l s='Ref.'}{l s='Avail.'}{l s='Unit price'}{l s='Qty'}{l s='Total'}
{l s='Total products'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}{displayPrice price=$total_products}
{l s='Total products'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}{displayPrice price=$total_products_wt}
{l s='Total products:'}{displayPrice price=$total_products}
+ {if $use_taxes} + {if $priceDisplay} + {l s='Total vouchers'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {else} + {l s='Total vouchers'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {/if} + {else} + {l s='Total vouchers:'} + {/if} + + {if $use_taxes} + {if $priceDisplay} + {displayPrice price=$total_discounts_tax_exc} + {else} + {displayPrice price=$total_discounts} + {/if} + {else} + {displayPrice price=$total_discounts_tax_exc} + {/if} +
+ {if $use_taxes} + {if $priceDisplay} + {l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'} + {else} + {l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'} + {/if} + {else} + {l s='Total gift-wrapping:'} + {/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 $display_tax_label} + {l s='Total (tax excl.):'} + {else} + {l s='Subtotal:'} + {/if} + {displayPrice price=$total_price_without_tax}
+ {if $display_tax_label} + {l s='Total tax:'} + {else} + {l s='Estimated Sales Tax:'} + {/if} + {displayPrice price=$total_tax}
+ {if $display_tax_label} + {l s='Total (tax incl.):'} + {else} + {l s='Total:'} + {/if} + {displayPrice price=$total_price}
{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}{$textField.name}{else}{l s='Text #'}{$smarty.foreach.typedText.index+1}{/if}{l s=':'} {$textField.value}
    • {/foreach} +
+ {/if} + {/foreach} + 		+
+ {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} +
+ + +
{$discount.name}{$discount.description}{l s='Delete'} + {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} diff --git a/themes/prestashop/shopping-cart-product-line.tpl b/themes/prestashop/shopping-cart-product-line.tpl index 3f1a9fd41..4237feddc 100644 --- a/themes/prestashop/shopping-cart-product-line.tpl +++ b/themes/prestashop/shopping-cart-product-line.tpl @@ -46,26 +46,30 @@ - {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}{$product.customizationQuantityTotal}{/if} - {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} -
- {l s='Delete'} -
-
- {l s='Add'}
- {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} - - {l s='Subtract'} - - {else} - - {l s='Subtract'} - - {/if} -
- - - + {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 isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}{$product.customizationQuantityTotal}{/if} + {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} +
+ {l s='Delete'} +
+
+ {l s='Add'}
+ {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} + + {l s='Subtract'} + + {else} + + {l s='Subtract'} + + {/if} +
+ + + + {/if} {/if}