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

// working on W3C validation

Browse Source
This commit is contained in:
Kevin Granger committed 2013-12-05 18:50:50 +01:00
1 parent ddcade285f
commit 0067eff263
2 files changed
+155 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default-bootstrap/order-payment.tpl
+40 -16
View File
@@ -34,26 +34,25 @@
var txtProducts = "{l s='products' js=1}"; var txtProducts = "{l s='products' js=1}";
// ]]> // ]]>
</script> </script>
{capture name=path}{l s='Your payment method'}{/capture} {capture name=path}{l s='Your payment method'}{/capture}
{/if} {/if}
{if !$opc}<h1 class="page-heading">{l s='Please choose your payment method'}</h1>{else}<h1 class="page-heading step-num"><span>3</span> {l s='Please choose your payment method'}</h1>{/if} {if !$opc}
<h1 class="page-heading">{l s='Please choose your payment method'}</h1>
{else}
<h1 class="page-heading step-num"><span>3</span> {l s='Please choose your payment method'}</h1>
{/if}
{if !$opc} {if !$opc}
{assign var='current_step' value='payment'} {assign var='current_step' value='payment'}
{include file="$tpl_dir./order-steps.tpl"} {include file="$tpl_dir./order-steps.tpl"}
{include file="$tpl_dir./errors.tpl"} {include file="$tpl_dir./errors.tpl"}
{else} {else}
<div id="opc_payment_methods" class="opc-main-block"> <div id="opc_payment_methods" class="opc-main-block">
<div id="opc_payment_methods-overlay" class="opc-overlay" style="display: none;"></div> <div id="opc_payment_methods-overlay" class="opc-overlay" style="display: none;"></div>
{/if} {/if}
<div class="paiement_block"> <div class="paiement_block">
<div id="HOOK_TOP_PAYMENT">{$HOOK_TOP_PAYMENT}</div> <div id="HOOK_TOP_PAYMENT">{$HOOK_TOP_PAYMENT}</div>
{if $HOOK_PAYMENT} {if $HOOK_PAYMENT}
{if !$opc} {if !$opc}
<div id="order-detail-content" class="table_block table-responsive"> <div id="order-detail-content" class="table_block table-responsive">
@@ -215,6 +214,7 @@
</tr> </tr>
{/if} {/if}
</tfoot> </tfoot>
<tbody> <tbody>
{foreach from=$products item=product name=productLoop} {foreach from=$products item=product name=productLoop}
{assign var='productId' value=$product.id_product} {assign var='productId' value=$product.id_product}
@@ -262,12 +262,31 @@
<span>{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span> <span>{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span>
{else} {else}
<div> <div>
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" title="{l s='Delete this customization'}" width="11" height="13" class="icon" /></a> <a
id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
class="cart_quantity_delete"
href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"
rel="nofollow">
<img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" title="{l s='Delete this customization'}" width="11" height="13" class="icon" />
</a>
</div> </div>
<div id="cart_quantity_button"> <div id="cart_quantity_button">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br /> <a
id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
class="cart_quantity_up"
href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"
rel="nofollow"
title="{l s='Add'}">
<img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" />
</a>
<br />
{if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html'}" title="{l s='Subtract'}"> <a
id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
class="cart_quantity_down"
href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html'}"
rel="nofollow"
title="{l s='Subtract'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" /> <img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
</a> </a>
{else} {else}
@@ -277,7 +296,7 @@
{/if} {/if}
</div> </div>
<input type="hidden" value="{$customization.quantity}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_hidden"/> <input type="hidden" value="{$customization.quantity}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_hidden"/>
<input size="2" type="text" value="{$customization.quantity}" class="cart_quantity_input" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"/> <input type="text" value="{$customization.quantity}" class="cart_quantity_input" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"/>
{/if} {/if}
</td> </td>
<td class="cart_total"></td> <td class="cart_total"></td>
@@ -300,6 +319,7 @@
{include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} {include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}
{/foreach} {/foreach}
</tbody> </tbody>
{if count($discounts)} {if count($discounts)}
<tbody> <tbody>
{foreach from=$discounts item=discount name=discountLoop} {foreach from=$discounts item=discount name=discountLoop}
@@ -322,20 +342,24 @@
</tbody> </tbody>
{/if} {/if}
</table> </table>
</div> </div> <!-- end order-detail-content -->
{/if} {/if}
{if $opc}<div id="opc_payment_methods-content">{/if} {if $opc}<div id="opc_payment_methods-content">{/if}
<div id="HOOK_PAYMENT"> <div id="HOOK_PAYMENT">
{$HOOK_PAYMENT} {$HOOK_PAYMENT}
</div> </div>
{if $opc}</div>{/if} {if $opc}</div> <!-- end opc_payment_methods-content -->{/if}
{else} {else}
<p class="alert alert-warning">{l s='No payment modules have been installed.'}</p> <p class="alert alert-warning">{l s='No payment modules have been installed.'}</p>
{/if} {/if}
{if !$opc} {if !$opc}
<p class="cart_navigation clearfix"><a href="{$link->getPageLink('order', true, NULL, "step=2")|escape:'html'}" title="{l s='Previous'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Continue shopping'}</a></p> <p class="cart_navigation clearfix">
<a href="{$link->getPageLink('order', true, NULL, "step=2")|escape:'html'}" title="{l s='Previous'}" class="button-exclusive btn btn-default">
<i class="icon-chevron-left"></i>
{l s='Continue shopping'}
</a>
</p>
{else} {else}
</div> </div> <!-- end opc_payment_methods -->
{/if} {/if}
</div> </div> <!-- end HOOK_TOP_PAYMENT -->
themes/default-bootstrap/shopping-cart.tpl
+115 -27
View File
@@ -34,6 +34,7 @@
{l s='Your account has been created.'} {l s='Your account has been created.'}
</p> </p>
{/if} {/if}
{assign var='current_step' value='summary'} {assign var='current_step' value='summary'}
{include file="$tpl_dir./order-steps.tpl"} {include file="$tpl_dir./order-steps.tpl"}
{include file="$tpl_dir./errors.tpl"} {include file="$tpl_dir./errors.tpl"}
@@ -60,16 +61,29 @@
<div class="cart_last_product_header"> <div class="cart_last_product_header">
<div class="left">{l s='Last product added'}</div> <div class="left">{l s='Last product added'}</div>
</div> </div>
<a class="cart_last_product_img" href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, $lastProductAdded.id_shop)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small_default')|escape:'html'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}"/></a> <a class="cart_last_product_img" href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, $lastProductAdded.id_shop)|escape:'html':'UTF-8'}">
<img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small_default')|escape:'html'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}"/>
</a>
<div class="cart_last_product_content"> <div class="cart_last_product_content">
<p class="product-name"><a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'html':'UTF-8'}">{$lastProductAdded.name|escape:'html':'UTF-8'}</a></p> <p class="product-name">
{if isset($lastProductAdded.attributes) && $lastProductAdded.attributes}<small><a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'html':'UTF-8'}">{$lastProductAdded.attributes|escape:'html':'UTF-8'}</a></small>{/if} <a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'html':'UTF-8'}">
{$lastProductAdded.name|escape:'html':'UTF-8'}
</a>
</p>
{if isset($lastProductAdded.attributes) && $lastProductAdded.attributes}
<small>
<a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'html':'UTF-8'}">
{$lastProductAdded.attributes|escape:'html':'UTF-8'}
</a>
</small>
{/if}
</div> </div>
</div> </div>
{/if} {/if}
{assign var='total_discounts_num' value="{if $total_discounts != 0}1{else}0{/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='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}"} {assign var='total_wrapping_taxes_num' value="{if $total_wrapping != 0}1{else}0{/if}"}
<div id="order-detail-content" class="table_block table-responsive"> <div id="order-detail-content" class="table_block table-responsive">
<table id="cart_summary" class="table table-bordered"> <table id="cart_summary" class="table table-bordered">
<thead> <thead>
@@ -140,7 +154,11 @@
<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}
@@ -166,14 +184,19 @@
<h4>{l s='Vouchers'}</h4> <h4>{l s='Vouchers'}</h4>
<input type="text" class="discount_name form-control" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" /> <input type="text" class="discount_name form-control" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" />
<input type="hidden" name="submitDiscount" /> <input type="hidden" name="submitDiscount" />
<button type="submit" name="submitAddDiscount" class="button btn btn-default button-small"><span>{l s='OK'}</span></button> <button type="submit" name="submitAddDiscount" class="button btn btn-default button-small">
<span>{l s='OK'}</span>
</button>
</fieldset> </fieldset>
</form> </form>
{if $displayVouchers} {if $displayVouchers}
<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}
@@ -260,7 +283,9 @@
</tr> </tr>
{/if} {/if}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td colspan="3" class="total_price_container text-right"><span>{l s='Total'}</span></td> <td colspan="3" class="total_price_container text-right">
<span>{l s='Total'}</span>
</td>
{if $use_taxes} {if $use_taxes}
<td colspan="2" class="price" id="total_price_container"> <td colspan="2" class="price" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price}</span> <span id="total_price">{displayPrice price=$total_price}</span>
@@ -285,7 +310,9 @@
{* Then the customized datas ones*} {* Then the customized datas ones*}
{if isset($customizedDatas.$productId.$productAttributeId)} {if isset($customizedDatas.$productId.$productAttributeId)}
{foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization} {foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization}
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" class="product_customization_for_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if $odd} odd{else} even{/if} customization alternate_item {if $product@last && $customization@last && !count($gift_products)}last_item{/if}"> <tr
id="product_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
class="product_customization_for_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if $odd} odd{else} even{/if} customization alternate_item {if $product@last && $customization@last && !count($gift_products)}last_item{/if}">
<td></td> <td></td>
<td colspan="3"> <td colspan="3">
{foreach $customization.datas as $type => $custom_data} {foreach $customization.datas as $type => $custom_data}
@@ -309,10 +336,8 @@
{l s=':'} {$textField.value} {l s=':'} {$textField.value}
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
{/if} {/if}
{/foreach} {/foreach}
</td> </td>
<td class="cart_quantity" colspan="2"> <td class="cart_quantity" colspan="2">
@@ -320,18 +345,34 @@
<span>{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span> <span>{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span>
{else} {else}
<input type="hidden" value="{$customization.quantity}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}_hidden"/> <input type="hidden" value="{$customization.quantity}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}_hidden"/>
<input size="2" type="text" value="{$customization.quantity}" class="cart_quantity_input form-control grey" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"/> <input type="text" value="{$customization.quantity}" class="cart_quantity_input form-control grey" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"/>
<div class="cart_quantity_button clearfix"> <div class="cart_quantity_button clearfix">
{if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down btn btn-default button-minus" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html'}" title="{l s='Subtract'}"> <a
id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
class="cart_quantity_down btn btn-default button-minus"
href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html'}"
rel="nofollow"
title="{l s='Subtract'}">
<span><i class="icon-minus"></i></span> <span><i class="icon-minus"></i></span>
</a> </a>
{else} {else}
<a class="cart_quantity_down btn btn-default button-minus disabled" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="#" title="{l s='Subtract'}"> <a
id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
class="cart_quantity_down btn btn-default button-minus disabled"
href="#"
title="{l s='Subtract'}">
<span><i class="icon-minus"></i></span> <span><i class="icon-minus"></i></span>
</a> </a>
{/if} {/if}
<a rel="nofollow" class="cart_quantity_up btn btn-default button-plus" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a> <a
id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
class="cart_quantity_up btn btn-default button-plus"
href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"
rel="nofollow"
title="{l s='Add'}">
<span><i class="icon-plus"></i></span>
</a>
</div> </div>
{/if} {/if}
</td> </td>
@@ -339,13 +380,21 @@
{if isset($cannotModify) AND $cannotModify == 1} {if isset($cannotModify) AND $cannotModify == 1}
{else} {else}
<div> <div>
<a rel="nofollow" title="{l s='Delete'}" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$token_cart}")|escape:'html'}"><i class=" icon-trash"></i></a> <a
id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
class="cart_quantity_delete"
href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$token_cart}")|escape:'html'}"
rel="nofollow"
title="{l s='Delete'}">
<i class=" icon-trash"></i>
</a>
</div> </div>
{/if} {/if}
</td> </td>
</tr> </tr>
{assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity}
{/foreach} {/foreach}
{* If it exists also some uncustomized products *} {* 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 $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}{/if}
{/if} {/if}
@@ -367,22 +416,31 @@
{foreach $discounts as $discount} {foreach $discounts as $discount}
<tr class="cart_discount {if $discount@last}last_item{elseif $discount@first}first_item{else}item{/if}" id="cart_discount_{$discount.id_discount}"> <tr class="cart_discount {if $discount@last}last_item{elseif $discount@first}first_item{else}item{/if}" id="cart_discount_{$discount.id_discount}">
<td class="cart_discount_name" colspan="3">{$discount.name}</td> <td class="cart_discount_name" colspan="3">{$discount.name}</td>
<td class="cart_discount_price"><span class="price-discount"> <td class="cart_discount_price">
<span class="price-discount">
{if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if}
</span></td> </span>
</td>
<td class="cart_discount_delete">1</td> <td class="cart_discount_delete">1</td>
<td class="cart_discount_price"> <td class="cart_discount_price">
<span class="price-discount price">{if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if}</span> <span class="price-discount price">{if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if}</span>
</td> </td>
<td class="price_discount_del text-center"> <td class="price_discount_del text-center">
{if strlen($discount.code)}<a href="{if $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}?deleteDiscount={$discount.id_discount}" class="price_discount_delete" title="{l s='Delete'}"><i class="icon-trash"></i></a>{/if} {if strlen($discount.code)}
<a
href="{if $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}?deleteDiscount={$discount.id_discount}"
class="price_discount_delete"
title="{l s='Delete'}">
<i class="icon-trash"></i>
</a>
{/if}
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
</tbody> </tbody>
{/if} {/if}
</table> </table>
</div> </div> <!-- end order-detail-content -->
{if $show_option_allow_separate_package} {if $show_option_allow_separate_package}
<p> <p>
@@ -390,6 +448,7 @@
<label for="allow_seperated_package">{l s='Send available products first'}</label> <label for="allow_seperated_package">{l s='Send available products first'}</label>
</p> </p>
{/if} {/if}
{if !$opc} {if !$opc}
{if Configuration::get('PS_ALLOW_MULTISHIPPING')} {if Configuration::get('PS_ALLOW_MULTISHIPPING')}
<p class="enable-multishipping checkbox"> <p class="enable-multishipping checkbox">
@@ -448,7 +507,18 @@
{foreach from=$formattedAddresses key=k item=address} {foreach from=$formattedAddresses key=k item=address}
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if} box"> <ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if} box">
<li><h3 class="page-subheading">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)}&nbsp;<span class="address_alias">({$address.object.alias})</span>{/if}</h3></li> <li>
<h3 class="page-subheading">
{if $k eq 'invoice'}
{l s='Invoice address'}
{elseif $k eq 'delivery' && $delivery->id}
{l s='Delivery address'}
{/if}
{if isset($address.object.alias)}
<span class="address_alias">({$address.object.alias})</span>
{/if}
</h3>
</li>
{foreach $address.ordered as $pattern} {foreach $address.ordered as $pattern}
{assign var=addressKey value=" "|explode:$pattern} {assign var=addressKey value=" "|explode:$pattern}
{assign var=addedli value=false} {assign var=addedli value=false}
@@ -456,9 +526,13 @@
{if isset($address.formated[$key]) && !empty($address.formated[$key])} {if isset($address.formated[$key]) && !empty($address.formated[$key])}
{if (!$addedli)} {if (!$addedli)}
{$addedli = true} {$addedli = true}
<li> <li><span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">
<span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">{/if}{$address.formated[$key]|escape:'html':'UTF-8'}{/if}{if ($smarty.foreach.foo.last && $addedli)}</span> {/if}
</li>{/if} {$address.formated[$key]|escape:'html':'UTF-8'}
{/if}
{if ($smarty.foreach.foo.last && $addedli)}
</span></li>
{/if}
{/foreach} {/foreach}
{/foreach} {/foreach}
</ul> </ul>
@@ -470,12 +544,27 @@
<div id="HOOK_SHOPPING_CART">{$HOOK_SHOPPING_CART}</div> <div id="HOOK_SHOPPING_CART">{$HOOK_SHOPPING_CART}</div>
<p class="cart_navigation clearfix"> <p class="cart_navigation clearfix">
{if !$opc} {if !$opc}
<a href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}" class="button btn btn-default standard-checkout button-medium" title="{l s='Proceed to checkout'}"><span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span></a> <a
href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}"
class="button btn btn-default standard-checkout button-medium"
title="{l s='Proceed to checkout'}">
<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>
</a>
{if Configuration::get('PS_ALLOW_MULTISHIPPING')} {if Configuration::get('PS_ALLOW_MULTISHIPPING')}
<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" class="multishipping-button multishipping-checkout button btn btn-default button-medium" title="{l s='Proceed to checkout'}"><span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span></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"
class="multishipping-button multishipping-checkout button btn btn-default button-medium"
title="{l s='Proceed to checkout'}">
<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>
</a>
{/if} {/if}
{/if} {/if}
<a href="{if (isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order.php')) || isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order-opc') || !isset($smarty.server.HTTP_REFERER)}{$link->getPageLink('index')}{else}{$smarty.server.HTTP_REFERER|escape:'html':'UTF-8'|secureReferrer}{/if}" class="button-exclusive btn btn-default" title="{l s='Continue shopping'}"><i class="icon-chevron-left"></i>{l s='Continue shopping'}</a> <a
href="{if (isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order.php')) || isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order-opc') || !isset($smarty.server.HTTP_REFERER)}{$link->getPageLink('index')}{else}{$smarty.server.HTTP_REFERER|escape:'html':'UTF-8'|secureReferrer}{/if}"
class="button-exclusive btn btn-default"
title="{l s='Continue shopping'}">
<i class="icon-chevron-left"></i>{l s='Continue shopping'}
</a>
</p> </p>
{if !empty($HOOK_SHOPPING_CART_EXTRA)} {if !empty($HOOK_SHOPPING_CART_EXTRA)}
<div class="clear"></div> <div class="clear"></div>
@@ -484,4 +573,3 @@
</div> </div>
{/if} {/if}
{/if} {/if}