-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update order template for 1.5.5 PrestaShop version
- Loading branch information
Showing
14 changed files
with
340 additions
and
315 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| {* | ||
| * 2007-2012 PrestaShop | ||
| * 2007-2013 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
|
|
@@ -18,15 +18,15 @@ | |
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <[email protected]> | ||
| * @copyright 2007-2012 PrestaShop SA | ||
| * @version Release: $Revision: 15625 $ | ||
| * @copyright 2007-2013 PrestaShop SA | ||
| * @version Release: $Revision$ | ||
| * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| *} | ||
| <p>{l s='Choose the delivery addresses:'}</p> | ||
| <p>{l s='Choose the delivery addresses'}</p> | ||
| <script type="text/javascript"> | ||
| CloseTxt = '{l s='Submit' js=1}'; | ||
| QtyChanged = '{l s='Some product quantities have changed, please check them.' js=1}'; | ||
| QtyChanged = '{l s='Some product quantities have changed. Please check them' js=1}'; | ||
| ShipToAnOtherAddress = '{l s='Ship to multiple addresses' js=1}'; | ||
| </script> | ||
| <div id="order-detail-content" class="table_block"> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| {* | ||
| * 2007-2012 PrestaShop | ||
| * 2007-2013 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
|
|
@@ -18,8 +18,8 @@ | |
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <[email protected]> | ||
| * @copyright 2007-2012 PrestaShop SA | ||
| * @version Release: $Revision: 16039 $ | ||
| * @copyright 2007-2013 PrestaShop SA | ||
| * @version Release: $Revision$ | ||
| * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| *} | ||
|
|
@@ -67,9 +67,9 @@ | |
| var currencyRate = '{$currencyRate|floatval}'; | ||
| var currencyFormat = '{$currencyFormat|intval}'; | ||
| var currencyBlank = '{$currencyBlank|intval}'; | ||
| var txtProduct = "{l s='product'}"; | ||
| var txtProducts = "{l s='products'}"; | ||
| var txtSelectAnAddressFirst = "{l s='Please start by selecting an address'}"; | ||
| var txtProduct = "{l s='Product' js=1}"; | ||
| var txtProducts = "{l s='Products' js=1}"; | ||
| var txtSelectAnAddressFirst = "{l s='Please start by selecting an address' js=1}"; | ||
| {/if} | ||
| var formatedAddressFieldsValuesList = new Array(); | ||
|
|
@@ -112,7 +112,7 @@ | |
| dest_comp.html(''); | ||
| li_content['title'] = adr_titles_vals[address_type]; | ||
| li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&back=order?step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">{l s='Update'}</a>'; | ||
| li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")|addslashes}'+id_address+'&back=order?step=1{if $back}&mod={$back}{/if}" title="{l s='Update' js=1}">{l s='Update' js=1}</a>'; | ||
| appendAddressList(dest_comp, li_content, ordered_fields_name); | ||
| } | ||
|
|
@@ -162,7 +162,7 @@ | |
|
|
||
| {include file="$tpl_dir./order-address-multishipping-products.tpl"} | ||
|
|
||
| <form action="{$link->getPageLink('order', true, NULL, 'multi-shipping=1')}" method="post"> | ||
| <form action="{$link->getPageLink('order', true, NULL, 'multi-shipping=1')|escape:'html'}" method="post"> | ||
| {else} | ||
| <div id="opc_account" class="opc-main-block"> | ||
| <div id="opc_account-overlay" class="opc-overlay" style="display: none;"></div> | ||
|
|
@@ -179,19 +179,19 @@ | |
| {/section} | ||
| </select> | ||
| {else} | ||
| <a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back}{/if}")}" title="{l s='Add'}" class="button_large">{l s='Add a new address'}</a> | ||
| <a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back}{/if}")|escape:'html'}" title="{l s='Add'}" class="button_large">{l s='Add a new address'}</a> | ||
| {/if} | ||
| </p> | ||
| <div class="clearfix"> | ||
| <ul class="address alternate_item {if $cart->isVirtualCart()}full_width{/if}" id="address_invoice"> | ||
| </ul> | ||
| </div> | ||
| <p class="address_add submit"> | ||
| <a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}" title="{l s='Add'}" class="button_large">» {l s='Add a new address'}</a> | ||
| <a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")|escape:'html'}" title="{l s='Add'}" class="button_large">» {l s='Add a new address'}</a> | ||
| </p> | ||
| {if !$opc} | ||
| <div id="ordermsg" class="clearfix"> | ||
| <p class="txt">{l s='If you would like to add a comment about your order, please write it below.'}</p> | ||
| <p class="txt">{l s='If you would like to add a comment about your order, please write it in the field below.'}</p> | ||
| <p class="textarea"><textarea cols="60" rows="3" name="message">{if isset($oldMessage)}{$oldMessage}{/if}</textarea></p> | ||
| </div> | ||
| {/if} | ||
|
|
@@ -201,9 +201,9 @@ | |
| <input type="hidden" class="hidden" name="step" value="2" /> | ||
| <input type="hidden" name="back" value="{$back}" /> | ||
| {if $back} | ||
| <a href="{$link->getPageLink('order', true, NULL, "step=0&back={$back}")}" title="{l s='Previous'}" class="button">« {l s='Previous'}</a> | ||
| <a href="{$link->getPageLink('order', true, NULL, "step=0&back={$back}")|escape:'html'}" title="{l s='Previous'}" class="button">« {l s='Previous'}</a> | ||
| {else} | ||
| <a href="{$link->getPageLink('order', true, NULL, "step=0")}" title="{l s='Previous'}" class="button">« {l s='Previous'}</a> | ||
| <a href="{$link->getPageLink('order', true, NULL, "step=0")|escape:'html'}" title="{l s='Previous'}" class="button">« {l s='Previous'}</a> | ||
| {/if} | ||
| <input type="submit" name="processAddress" value="{l s='Next'} »" class="exclusive" /> | ||
| </p> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| {* | ||
| * 2007-2012 PrestaShop | ||
| * 2007-2013 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
|
|
@@ -18,17 +18,17 @@ | |
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <[email protected]> | ||
| * @copyright 2007-2012 PrestaShop SA | ||
| * @version Release: $Revision: 17489 $ | ||
| * @copyright 2007-2013 PrestaShop SA | ||
| * @version Release: $Revision$ | ||
| * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| *} | ||
| <tr id="product_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" class="{if $productLast}last_item{elseif $productFirst}first_item{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}alternate_item{/if} cart_item {if $odd}odd{else}even{/if}"> | ||
| <td class="cart_product"> | ||
| <a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a> | ||
| <a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a> | ||
| </td> | ||
| <td class="cart_description"> | ||
| <h5><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">{$product.name|escape:'htmlall':'UTF-8'}</a></h5> | ||
| <h5 class="s_title_block"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">{$product.name|escape:'htmlall':'UTF-8'}</a></h5> | ||
| {if isset($product.attributes) && $product.attributes}<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">{$product.attributes|escape:'htmlall':'UTF-8'}</a>{/if} | ||
| </td> | ||
| <td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td> | ||
|
|
@@ -37,10 +37,10 @@ | |
| <span style="float:left">{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span> | ||
| {else} | ||
| {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} | ||
| <div id="cart_quantity_button" class="cart_quantity_button" style="float:left;"> | ||
| <a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br /> | ||
| <div class="cart_quantity_button"> | ||
| <a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&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 /> | ||
| {if $product.minimal_quantity < ($product.cart_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}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&op=down&token={$token_cart}")}" title="{l s='Subtract'}"> | ||
| <a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&op=down&token={$token_cart}")|escape:'html'}" title="{l s='Subtract'}"> | ||
| <img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" /> | ||
| </a> | ||
| {else} | ||
|
|
@@ -56,7 +56,7 @@ | |
| {/if} | ||
| </td> | ||
| <td> | ||
| <form method="post" action="{$link->getPageLink('cart', true, NULL, "token={$token_cart}")}"> | ||
| <form method="post" action="{$link->getPageLink('cart', true, NULL, "token={$token_cart}")|escape:'html'}"> | ||
| <input type="hidden" name="id_product" value="{$product.id_product}" /> | ||
| <input type="hidden" name="id_product_attribute" value="{$product.id_product_attribute}" /> | ||
| <select name="address_delivery" id="select_address_delivery_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" class="cart_address_delivery"> | ||
|
|
||
Oops, something went wrong.