From 9c42e38f28560dd581b0a2492aa16f851fe48e37 Mon Sep 17 00:00:00 2001 From: tpeigne Date: Sat, 23 Nov 2013 00:05:31 +0100 Subject: [PATCH] Update order template for 1.5.5 PrestaShop version --- .../order-address-multishipping-products.tpl | 10 +- .../order-address-multishipping.tpl | 26 +-- .../order-address-product-line.tpl | 18 +-- .../simpleresponsivetheme/order-address.tpl | 72 ++++----- .../simpleresponsivetheme/order-carrier.tpl | 81 ++++++---- .../order-confirmation.tpl | 15 +- themes/simpleresponsivetheme/order-detail.tpl | 100 ++++++------ themes/simpleresponsivetheme/order-follow.tpl | 36 ++--- .../order-opc-new-account.tpl | 150 ++++++++++-------- themes/simpleresponsivetheme/order-opc.tpl | 45 +++--- .../simpleresponsivetheme/order-payment.tpl | 42 +++-- themes/simpleresponsivetheme/order-return.tpl | 43 +++-- themes/simpleresponsivetheme/order-slip.tpl | 4 +- themes/simpleresponsivetheme/order-steps.tpl | 13 +- 14 files changed, 340 insertions(+), 315 deletions(-) diff --git a/themes/simpleresponsivetheme/order-address-multishipping-products.tpl b/themes/simpleresponsivetheme/order-address-multishipping-products.tpl index 7d7e752..d863a2b 100644 --- a/themes/simpleresponsivetheme/order-address-multishipping-products.tpl +++ b/themes/simpleresponsivetheme/order-address-multishipping-products.tpl @@ -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 -* @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 *} -

{l s='Choose the delivery addresses:'}

+

{l s='Choose the delivery addresses'}

diff --git a/themes/simpleresponsivetheme/order-address-multishipping.tpl b/themes/simpleresponsivetheme/order-address-multishipping.tpl index 81c5215..ec15d1d 100644 --- a/themes/simpleresponsivetheme/order-address-multishipping.tpl +++ b/themes/simpleresponsivetheme/order-address-multishipping.tpl @@ -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 -* @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'] = '{l s='Update'}'; + li_content['update'] = '{l s='Update' js=1}'; appendAddressList(dest_comp, li_content, ordered_fields_name); } @@ -162,7 +162,7 @@ {include file="$tpl_dir./order-address-multishipping-products.tpl"} -
+ {else}
@@ -179,7 +179,7 @@ {/section} {else} - {l s='Add a new address'} + {l s='Add a new address'} {/if}

@@ -187,11 +187,11 @@

- » {l s='Add a new address'} + » {l s='Add a new address'}

{if !$opc}
-

{l s='If you would like to add a comment about your order, please write it below.'}

+

{l s='If you would like to add a comment about your order, please write it in the field below.'}

{/if} @@ -201,9 +201,9 @@ {if $back} - « {l s='Previous'} + « {l s='Previous'} {else} - « {l s='Previous'} + « {l s='Previous'} {/if}

diff --git a/themes/simpleresponsivetheme/order-address-product-line.tpl b/themes/simpleresponsivetheme/order-address-product-line.tpl index f65b40b..c41e66f 100644 --- a/themes/simpleresponsivetheme/order-address-product-line.tpl +++ b/themes/simpleresponsivetheme/order-address-product-line.tpl @@ -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 -* @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 *} - {$product.name|escape:'htmlall':'UTF-8'} + {$product.name|escape:'htmlall':'UTF-8'} -
{$product.name|escape:'htmlall':'UTF-8'}
+
{$product.name|escape:'htmlall':'UTF-8'}
{if isset($product.attributes) && $product.attributes}{$product.attributes|escape:'htmlall':'UTF-8'}{/if} {if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if} @@ -37,10 +37,10 @@ {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} {else} {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} -
- {l s='Add'}
+
+ {l s='Add'}
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} - + {l s='Subtract'} {else} @@ -56,7 +56,7 @@ {/if} - + +
- + {l s='Specify a delivery address for each product.'}
@@ -209,32 +209,32 @@ {/if}
-

+

isVirtualCart()}style="display:none;"{/if}> - id_address_invoice == $cart->id_address_delivery || $addresses|@count == 1}checked="checked"{/if} /> + id_address_invoice == $cart->id_address_delivery || $addresses|@count == 1} checked="checked"{/if} autocomplete="off"/>

-

id_address_invoice == $cart->id_address_delivery}style="display: none;"{/if}> +

id_address_invoice == $cart->id_address_delivery}style="display: none;"{/if}> - {if $addresses|@count > 1} - - + {if $addresses|@count > 1} + + {else} - {l s='Add a new address'} + {l s='Add a new address'} {/if}

@@ -244,11 +244,11 @@

- {l s='Add a new address'} + {l s='Add a new address'}

{if !$opc}
-

{l s='If you would like to add a comment about your order, please write it below.'}

+

{l s='If you would like to add a comment about your order, please write it in the field below.'}

{/if} @@ -257,8 +257,8 @@

- « {l s='Previous'} - + « {l s='Previous'} +

{else} diff --git a/themes/simpleresponsivetheme/order-carrier.tpl b/themes/simpleresponsivetheme/order-carrier.tpl index 09e3a19..c81bc44 100644 --- a/themes/simpleresponsivetheme/order-carrier.tpl +++ b/themes/simpleresponsivetheme/order-carrier.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,12 +18,10 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6758 $ +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
{if !$opc} {else} {/if} @@ -71,12 +69,18 @@ {/if} {if !$opc} - {capture name=path}{l s='Shipping'}{/capture} + {capture name=path}{l s='Shipping:'}{/capture} {include file="$tpl_dir./breadcrumb.tpl"} {/if} {if !$opc} -

{l s='Shipping'}

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

{l s='Shipping:'}

{else}

2 {l s='Delivery methods'}

{/if} @@ -87,7 +91,7 @@ {include file="$tpl_dir./errors.tpl"} -
+ {else}
@@ -106,24 +110,24 @@ {/if}
{if isset($isVirtualCart) && $isVirtualCart} -

{l s='No carrier needed for this order'}

+

{l s='No carrier is needed for this order.'}

{else} {if $recyclablePackAllowed}

- - + +

{/if} - {*
*} +
{if isset($delivery_option_list)} {foreach $delivery_option_list as $id_address => $option_list} - {*

+

{if isset($address_collection[$id_address])} {l s='Choose a shipping option for this address:'} {$address_collection[$id_address]->alias} {else} {l s='Choose a shipping option'} {/if} -

*} +
{foreach $option_list as $key => $option}
@@ -166,14 +170,14 @@
- {if $option.total_price_with_tax && !$free_shipping} + {if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))} {if $use_taxes == 1} {convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'} {else} {convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'} {/if} {else} - {l s='Free!'} + {l s='Free'} {/if}
@@ -198,9 +202,9 @@ {if isset($carrier.instance->delay[$cookie->id_lang])} {$carrier.instance->delay[$cookie->id_lang]}
{if count($carrier.product_list) <= 1} - ({l s='product concerned:'} + ({l s='Product concerned:'} {else} - ({l s='products concerned:'} + ({l s='Products concerned:'} {/if} {* This foreach is on one line, to avoid tabulation in the title attribute of the acronym *} {foreach $carrier.product_list as $product} @@ -226,18 +230,21 @@ {if !$address@last}
{/if} + {foreachelse} + {l s='No carriers available.'} {/foreach}

{/foreach} {/if} - {*
*} + +
{if $giftAllowed}

{l s='Gift'}

- gift == 1}checked="checked"{/if} /> - + gift == 1}checked="checked"{/if} autocomplete="off"/> +
      {if $gift_wrapping_price > 0} @@ -249,7 +256,7 @@ {/if}

- +

{/if} @@ -259,10 +266,18 @@ {if $conditions AND $cms_id}

{l s='Terms of service'}

- - {l s='(Read Terms of Service)'} + + {l s='(Read the Terms of Service)'}

- + {/if}
@@ -272,12 +287,12 @@ {if !$is_guest} {if $back} - « {l s='Previous'} + « {l s='Previous'} {else} - « {l s='Previous'} + « {l s='Previous'} {/if} {else} - « {l s='Previous'} + « {l s='Previous'} {/if} {if isset($virtual_cart) && $virtual_cart || (isset($delivery_option_list) && !empty($delivery_option_list))} @@ -287,8 +302,8 @@ {else}

{l s='Leave a message'}

-

{l s='If you would like to add a comment about your order, please write it below.'}

-

+

{l s='If you would like to add a comment about your order, please write it in the field below.'}

+

{/if} diff --git a/themes/simpleresponsivetheme/order-confirmation.tpl b/themes/simpleresponsivetheme/order-confirmation.tpl index f244939..8e140fc 100644 --- a/themes/simpleresponsivetheme/order-confirmation.tpl +++ b/themes/simpleresponsivetheme/order-confirmation.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6599 $ +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -39,10 +38,10 @@
{if $is_guest} -

{l s='Your order ID is:'} {$id_order_formatted} . {l s='Your order ID has been sent to you via e-mail.'}

- {l s='Follow my order'} - {l s='Follow my order'} +

{l s='Your order ID is:'} {$id_order_formatted} . {l s='Your order ID has been sent via email.'}

+ {l s='Follow my order'} + {l s='Follow my order'} {else} - {l s='Back to orders'} - {l s='Back to orders'} + {l s='Back to orders'} + {l s='Back to orders'} {/if} diff --git a/themes/simpleresponsivetheme/order-detail.tpl b/themes/simpleresponsivetheme/order-detail.tpl index 5f5f437..4a8d0ef 100644 --- a/themes/simpleresponsivetheme/order-detail.tpl +++ b/themes/simpleresponsivetheme/order-detail.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,16 +18,15 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
+
-

+

{l s='Order Reference %s - placed on' sprintf=$order->getUniqReference()} {dateFormat date=$order->date_add full=0}

@@ -35,27 +34,27 @@
-{if $carrier->id}

{l s='Carrier:'} {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}

{/if} -

{l s='Payment method:'} {$order->payment|escape:'htmlall':'UTF-8'}

+{if $carrier->id}

{l s='Carrier'} {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}

{/if} +

{l s='Payment method'} {$order->payment|escape:'htmlall':'UTF-8'}

{if $invoice AND $invoiceAllowed}

- {l s='Download your invoice as a PDF file'} + {l s='Download your invoice as a PDF file.'}

{/if} {if $order->recyclable}

 {l s='You have given permission to receive your order in recycled packaging.'}

{/if} {if $order->gift} -

 {l s='You requested gift-wrapping for your order.'}

-

{l s='Message:'} {$order->gift_message|nl2br}

+

 {l s='You have requested gift wrapping for this order.'}

+

{l s='Message'} {$order->gift_message|nl2br}

{/if}
{if count($order_history)} -

{l s='Follow your order step-by-step'}

+

{l s='Follow your order\'s status step-by-step'}

- +
@@ -108,19 +107,19 @@ {$HOOK_ORDERDETAILDISPLAYED} -{if !$is_guest}{/if} +{if !$is_guest}{/if}
-
{l s='Date'}
+
- {if $return_allowed}{/if} - + {if $return_allowed}{/if} + - + {if $order->hasProductReturned()} - + {/if} - + @@ -252,10 +251,7 @@ - + {if $order->hasProductReturned()} {if $order->hasProductReturned()} - {/if} @@ -374,7 +370,7 @@ {foreach from=$discounts item=discount} - + @@ -386,9 +382,24 @@
{l s='Reference'}{l s='Reference'} {l s='Product'}{l s='Quantity'}{l s='Quantity'}{l s='Returned'}{l s='Returned'}{l s='Unit price'}{l s='Unit price'} {l s='Total price'}
- - - {$product['qty_returned']} @@ -345,7 +341,7 @@ + {$product['qty_returned']}
{$discount.name|escape:'htmlall':'UTF-8'}{l s='Voucher:'} {$discount.name|escape:'htmlall':'UTF-8'}{l s='Voucher'} {$discount.name|escape:'htmlall':'UTF-8'} 1   {if $discount.value != 0.00}-{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}
+ {if $return_allowed} +
+

{l s='Merchandise return'}

+

{l s='If you wish to return one or more products, please mark the corresponding boxes and provide an explanation for the return. When complete, click the button below.'}

+

+ +

+

+ + +

+
+
+ {/if} +
{if $order->getShipping()|count > 0} - +
@@ -401,8 +412,8 @@ {foreach from=$order->getShipping() item=line} - - + + - + @@ -106,12 +105,12 @@ @@ -167,20 +166,20 @@ {else} - {if $use_taxes} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} {if $priceDisplay} - + - + {else} - + - + @@ -188,9 +187,9 @@ {/if} {else} - + - + @@ -313,12 +312,12 @@ {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} {else}
- {l s='Delete'} + {l s='Delete'}
- {l s='Add'}
+ {l s='Add'}
{if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} - + {l s='Subtract'} {else} @@ -383,8 +382,7 @@ {/if} {if !$opc} -

- « {l s='Previous'}

+

« {l s='Previous'}

{else}
{/if} diff --git a/themes/simpleresponsivetheme/order-return.tpl b/themes/simpleresponsivetheme/order-return.tpl index 9e107bb..092f50c 100644 --- a/themes/simpleresponsivetheme/order-return.tpl +++ b/themes/simpleresponsivetheme/order-return.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -29,7 +28,7 @@

{l s='We have logged your return request.'}

{l s='Your package must be returned to us within'} {$nbdaysreturn} {l s='days of receiving your order.'}

-

{l s='Current status of your merchandise return:'} {$state_name|escape:'htmlall':'UTF-8'}

+

{l s='The current status of your merchandise return is:'} {$state_name|escape:'htmlall':'UTF-8'}

{l s='List of items to be returned:'}

@@ -46,14 +45,14 @@ {assign var='quantityDisplayed' value=0} {foreach from=$returnedCustomizations item='customization' name=products} - {if $customization.product_id == $product.product_id} + {if $customization.id == $product.id}
- + - {assign var='productId' value=$customization.product_id} - {assign var='productAttributeId' value=$customization.product_attribute_id} + {assign var='productId' value=$customization.id} + {assign var='productAttributeId' value=$customization.attribute_id} {assign var='customizationId' value=$customization.id_customization} {foreach from=$customizedDatas.$productId.$productAttributeId.$customizationId.datas key='type' item='datas'} @@ -61,7 +60,7 @@ {if $type == $smarty.const._CUSTOMIZE_FILE_}
    {foreach from=$datas item='data'} -
  • WAHOU
    • +
    • {/foreach}
{elseif $type == $smarty.const._CUSTOMIZE_TEXTFIELD_} @@ -75,15 +74,15 @@ {/foreach} - {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.product_quantity} + {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} {/if} {/foreach} - {if $product.product_quantity > $quantityDisplayed} - - - - + {if $product.quantity > $quantityDisplayed} + + + + {/if} {/foreach} @@ -92,19 +91,19 @@ {if $orderRet->state == 2} -

{l s='REMINDER:'}

+

{l s='Reminder:'}

- - {l s='All products must be returned in their original packaging without damage or wear.'} -
- {l s='Please print out the'} id|intval}")}">{l s='PDF return slip'} {l s='and include it with your package.'} -
- {l s='Please see PDF return slip'} (id|intval}")}">{l s='for the correct address'}) + - {l s='All merchandise must be returned in its original packaging and in its original state.'} +
- {l s='Please print out the'} id|intval}")|escape:'html'}">{l s='PDF return slip'} {l s='and include it with your package.'} +
- {l s='Please see the PDF return slip'} (id|intval}")|escape:'html'}">{l s='for the correct address'})

- {l s='Upon receiving your package, we will notify you by e-mail. We will then begin processing the reimbursement of your order total.'} -

{l s='Please let us know if you have any questions.'} + {l s='When we receive your package, we will notify you by email. We will then begin processing order reimbursement.'} +

{l s='Please let us know if you have any questions.'}

{l s='If the conditions of return listed above are not respected, we reserve the right to refuse your package and/or reimbursement.'}

{elseif $orderRet->state == 1} -

{l s='You must wait for our confirmation before returning any merchandise.'}

+

{l s='You must wait for confirmation before returning any merchandise.'}

{/if} {/if} diff --git a/themes/simpleresponsivetheme/order-slip.tpl b/themes/simpleresponsivetheme/order-slip.tpl index 3740af6..73568a0 100644 --- a/themes/simpleresponsivetheme/order-slip.tpl +++ b/themes/simpleresponsivetheme/order-slip.tpl @@ -44,9 +44,9 @@ {foreach from=$ordersSlip item=slip name=myLoop} - + - diff --git a/themes/simpleresponsivetheme/order-steps.tpl b/themes/simpleresponsivetheme/order-steps.tpl index 4ec64c0..57be2f0 100644 --- a/themes/simpleresponsivetheme/order-steps.tpl +++ b/themes/simpleresponsivetheme/order-steps.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -38,7 +37,7 @@
  • {if $current_step=='payment' || $current_step=='shipping' || $current_step=='address' || $current_step=='login'} - + 1 {l s='Summary'} {else} @@ -47,7 +46,7 @@
  • {if $current_step=='payment' || $current_step=='shipping' || $current_step=='address'} - + 2 {l s='Login'} {else} @@ -56,7 +55,7 @@
  • {if $current_step=='payment' || $current_step=='shipping'} - + 3 {l s='Address'} {else} @@ -65,7 +64,7 @@
  • {if $current_step=='payment'} - + 4 {l s='Shipping'} {else}
{l s='Date'}
{$line.date_add}{$line.state_name}{dateFormat date=$line.date_add full=0}{$line.carrier_name} {if $line.weight > 0}{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}{else}-{/if} {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if} @@ -416,26 +427,10 @@
{if !$is_guest} - {if $return_allowed} -
-

{l s='Merchandise return'}

-

{l s='If you wish to return one or more products, please mark the corresponding boxes and provide an explanation for the return. Then click the button below.'}

-

- -

-

- - -

-
-
- {/if} - - {if count($messages)}

{l s='Messages'}

-
- +
+
@@ -473,9 +468,14 @@ {/if} - -

{l s='Add a message:'}

-

{l s='If you would like to add a comment about your order, please write it below.'}

+ {if isset($message_confirmation) && $message_confirmation} +

+ {l s='Message successfully sent'} +

+ {/if} + +

{l s='Add a message'}

+

{l s='If you would like to add a comment about your order, please write it in the field below.'}

@@ -51,10 +51,10 @@

{/if} {if isset($errorDetail1) && $errorDetail1}

{l s='Please check at least one product you would like to return.'}

{/if} -{if isset($errorDetail2) && $errorDetail2}

{l s='Please provide a quantity for the product you checked.'}

{/if} +{if isset($errorDetail2) && $errorDetail2}

{l s='For each product you wish to add, please specify the desired quantity.'}

{/if} {if isset($errorNotReturnable) && $errorNotReturnable}

{l s='This order cannot be returned.'}

{/if} -

{l s='Here are the merchandise returns you have made'}.

+

{l s='Here is a list of pending merchandise returns'}.

{if $ordersReturn && count($ordersReturn)}
{l s='From'}
@@ -63,21 +63,21 @@ - - + + {foreach from=$ordersReturn item=return name=myLoop} - - - + + + -
{l s='Return'} {l s='Order'} {l s='Package status'}{l s='Date issued'}{l s='Return slip'}{l s='Date issued'}{l s='Return slip'}
{l s='#'}{$return.id_order_return|string_format:"%06d"}{l s='#'}{$return.id_order|string_format:"%06d"}{$return.state_name|escape:'htmlall':'UTF-8'}{l s='#'}{$return.id_order_return|string_format:"%06d"}{l s='#'}{$return.id_order|string_format:"%06d"}{$return.state_name|escape:'htmlall':'UTF-8'} {dateFormat date=$return.date_add full=0} + {if $return.state == 2} - {l s='Order return'} {l s='#'}{$return.id_order_return|string_format: - {l s='Print out'} + {l s='Order return'} {l s='#'}{$return.id_order_return|string_format: + {l s='Print out'} {else} -- {/if} @@ -88,11 +88,11 @@
{else} -

{l s='You have no return merchandise authorizations.'}

+

{l s='You have no merchandise return authorizations.'}

{/if}
diff --git a/themes/simpleresponsivetheme/order-opc-new-account.tpl b/themes/simpleresponsivetheme/order-opc-new-account.tpl index 932a36d..47db788 100644 --- a/themes/simpleresponsivetheme/order-opc-new-account.tpl +++ b/themes/simpleresponsivetheme/order-opc-new-account.tpl @@ -1,7 +1,7 @@

1 {l s='Account'}

- +

{l s='Already registered?'} {l s='Click here'}

@@ -39,7 +39,7 @@

{l s='Create your account today and enjoy:'}

  • {l s='Personalized and secure access'}
    • -
  • {l s='Fast and easy check out'}
    • +
  • {l s='A fast and easy check out process'}
  • {l s='Separate billing and shipping addresses'}

@@ -72,35 +72,33 @@ {/foreach} {/if} //]]> - {if $vat_management} - {literal} - function vat_number() - { - if ($('#company').val() != '') - $('#vat_number_block').show(); - else - $('#vat_number_block').hide(); - } - function vat_number_invoice() - { - if ($('#company_invoice').val() != '') - $('#vat_number_block_invoice').show(); - else - $('#vat_number_block_invoice').hide(); - } + {literal} + function vat_number() + { + if ($('#company').val() != '') + $('#vat_number_block').show(); + else + $('#vat_number_block').hide(); + } + function vat_number_invoice() + { + if ($('#company_invoice').val() != '') + $('#vat_number_block_invoice').show(); + else + $('#vat_number_block_invoice').hide(); + } - $(document).ready(function() { - $('#company').blur(function(){ - vat_number(); - }); - $('#company_invoice').blur(function(){ - vat_number_invoice(); - }); + $(document).ready(function() { + $('#company').on('input',function(){ vat_number(); + }); + $('#company_invoice').on('input',function(){ vat_number_invoice(); }); - {/literal} - {/if} + vat_number(); + vat_number_invoice(); + }); + {/literal}

@@ -111,13 +109,13 @@

- +

- {l s='(5 characters min.)'} + {l s='(five characters min.)'}

{l s='Title'} @@ -171,20 +169,21 @@

{if isset($newsletter) && $newsletter}

- - + +

- - + +

{/if}

{l s='Delivery address'}

{$stateExist = false} + {$postCodeExist = false} {foreach from=$dlv_all_fields item=field_name} - {if $field_name eq "company"} + {if $field_name eq "company" && $b2b_enable}

@@ -210,6 +209,7 @@

{elseif $field_name eq "postcode"} + {$postCodeExist = true}

@@ -218,13 +218,11 @@

-

{elseif $field_name eq "country" || $field_name eq "Country:name"}

- *

{/if} {/foreach} @@ -253,8 +250,14 @@ {l s='DNI / NIF / NIE'}

+ {if !$postCodeExist} + + {/if} {if !$stateExist} -

+

-

+ {if isset($one_phone_at_least) && $one_phone_at_least} +

{l s='You must register at least one phone number.'}

+ {/if} +

-

- - +

+ +

-

- +

+

@@ -285,9 +291,10 @@
{assign var=stateExist value=false} + {assign var=postCodeExist value=false}

{l s='Invoice address'}

{foreach from=$inv_all_fields item=field_name} - {if $field_name eq "company"} + {if $field_name eq "company" && $b2b_enable}

@@ -301,56 +308,60 @@

- + {l s='DNI / NIF / NIE'}

{elseif $field_name eq "firstname"}

- +

{elseif $field_name eq "lastname"}

- +

-

+ {if isset($one_phone_at_least) && $one_phone_at_least} +

{l s='You must register at least one phone number.'}

+ {/if} +

- +

-

- - +

+ +

{elseif $field_name eq "address1"}

- +

{elseif $field_name eq "address2"}

- +

{elseif $field_name eq "postcode"} -

+ {$postCodeExist = true} +

- +

{elseif $field_name eq "city"}

- +

- {elseif $field_name eq "country"} + {elseif $field_name eq "country" || $field_name eq "Country:name"}

@@ -364,13 +375,18 @@

{/if} {/foreach} + {if !$postCodeExist} + + {/if} {if !$stateExist} - {/if}

@@ -386,7 +402,7 @@

*{l s='Required field'} diff --git a/themes/simpleresponsivetheme/order-opc.tpl b/themes/simpleresponsivetheme/order-opc.tpl index a5300c6..cd56dcf 100644 --- a/themes/simpleresponsivetheme/order-opc.tpl +++ b/themes/simpleresponsivetheme/order-opc.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,8 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -39,11 +38,11 @@ @@ -40,7 +39,7 @@ {include file="$tpl_dir./breadcrumb.tpl"} {/if} -{if !$opc}

{l s='Choose your payment method'}

{else}

3 {l s='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'} @@ -94,7 +93,7 @@ {else}
{l s='Total products:'}{l s='Total products'} {if $use_taxes} {if $priceDisplay} - {if $display_tax_label}{l s='Total vouchers (tax excl.):'}{else}{l s='Total vouchers:'}{/if} + {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 vouchers (tax incl.):'}{else}{l s='Total vouchers:'}{/if} + {if $display_tax_label}{l s='Total gift wrapping (tax incl.)'}{else}{l s='Total gift wrapping cost:'}{/if} {/if} {else} - {l s='Total vouchers:'} + {l s='Total gift wrapping cost:'} {/if} {l s='Free Shipping!'}
{if $customization.reference}{$customization.reference|escape:'htmlall':'UTF-8'}{else}--{/if} {$customization.name|escape:'htmlall':'UTF-8'}{$customization.product_quantity|intval}{$customization.quantity|intval}
{if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}{$product.product_name|escape:'htmlall':'UTF-8'}{$product.product_quantity|intval}
{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}{$product.name|escape:'htmlall':'UTF-8'}{$product.quantity|intval}
{l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}{l s='#%s' sprintf=$slip.id_order|string_format:"%06d"}{l s='#%s' sprintf=$slip.id_order|string_format:"%06d"} {dateFormat date=$slip.date_add full=0} + {l s='Order slip'} {l s='#%s' sprintf=$slip.id_order_slip|string_format: {l s='PDF'}