diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 962c44aea..0b735bc19 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -129,7 +129,7 @@
-
+
{l s='Order status'} @@ -189,40 +189,37 @@ {/if} {/foreach} - - {if $customer->id}
+ {if $customer->id}
-
-
- - - {l s='Customer information'} - - {$customer->firstname} {$customer->lastname} ({l s='#'}{$customer->id})
- ({$customer->email})

- {if ($customer->isGuest())} - {l s='This order has been placed by a guest.'} - {if (!Customer::customerExists($customer->email))} - - -

- {l s='This feature will generate a random password and send an email to the customer.'} - - {else} -
{l s='A registered customer account has already claimed this email address'}
- {/if} +
+ + + {l s='Customer information'} + + {$customer->firstname} {$customer->lastname} ({l s='#'}{$customer->id})
+ ({$customer->email})

+ {if ($customer->isGuest())} + {l s='This order has been placed by a guest.'} + {if (!Customer::customerExists($customer->email))} +
+ +

+ {l s='This feature will generate a random password and send an email to the customer.'} +
{else} - {l s='Account registered:'} {dateFormat date=$customer->date_add full=true}
- {l s='Valid orders placed:'} {$customerStats['nb_orders']}
- {l s='Total spent since registration:'} {displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}
-
+
{l s='A registered customer account has already claimed this email address'}
+ {/if} + {else} + {l s='Account registered:'} {dateFormat date=$customer->date_add full=true}
+ {l s='Valid orders placed:'} {$customerStats['nb_orders']}
+ {l s='Total spent since registration:'} {displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}
{/if} - {/if} +
{if (sizeof($sources))} @@ -246,13 +243,13 @@ {hook h="displayAdminOrder" id_order=$order->id} -
+ {/if}
-
+
{l s='New message'} @@ -289,7 +286,7 @@

-

+ - - {/if} -
-
- {displayAddressDetail address=$addresses.delivery newLine='
'} - {if $addresses.delivery->other}
{$addresses.delivery->other}
{/if} -
-
- {l s='Choose an action'} - - -
- - - {/if} - - - -
-
-
+ +
- - {l s='Invoice address'} + + {l s='Shipping address'} {if $can_edit}
- + {/if}
- {displayAddressDetail address=$addresses.invoice newLine='
'} - {if $addresses.invoice->other}
{$addresses.invoice->other}
{/if} + {displayAddressDetail address=$addresses.delivery newLine='
'} + {if $addresses.delivery->other}
{$addresses.delivery->other}
{/if} +
+
+ {l s='Choose an action'} + +
-
- - - {l s='Edit'} - -
- + {/if} +
+ + +
+
+ + + {l s='Invoice address'} + + {if $can_edit} +
+
+ +
+ +
+ {/if} +
+
+ {displayAddressDetail address=$addresses.invoice newLine='
'} + {if $addresses.invoice->other}
{$addresses.invoice->other}
{/if} +
+
+ + + {l s='Edit'} + +
+
@@ -426,381 +418,370 @@ {if count($order->getBrother()) > 0}
-
-
- - - {l s='Linked orders'} - - - +
+ + + {l s='Linked orders'} + +
+ + + + + + + + + + {foreach $order->getBrother() as $brother_order} - - - - + + + + - - - {foreach $order->getBrother() as $brother_order} - - - - - - - {/foreach} - -
+ {l s='Order no. '} + + {l s='Status'} + + {l s='Amount'} + +
- {l s='Order no. '} - - {l s='Status'} - - {l s='Amount'} - - + #{'%06d'|sprintf:$brother_order->id} + + {$brother_order->getCurrentOrderState()->name[$current_id_lang]} + + {displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id} + + {l s='See the order'} +
- #{'%06d'|sprintf:$brother_order->id} - - {$brother_order->getCurrentOrderState()->name[$current_id_lang]} - - {displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id} - - {l s='See the order'} -
-
-
+ {/foreach} + + +
{/if}
-
-
- - - {l s='Documents'} - - {* Include document template *} - {include file='controllers/orders/_documents.tpl'} -
-
+
+ + + {l s='Documents'} + + {* Include document template *} + {include file='controllers/orders/_documents.tpl'} +
-
-
- - - {l s='Payment'} - +
+ + + {l s='Payment'} + - {if (!$order->valid && sizeof($currencies) > 1)} - -

{l s='Don\'t forget to update your conversion rate before making this change.'}

-
- -
- - -
- {/if} - - {if count($order->getOrderPayments()) > 0} -

- {l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} {displayPrice price=$orders_total_paid_tax_incl currency=$currency->id} - {foreach $order->getBrother() as $brother_order} - {if $brother_order@first} - {if count($order->getBrother()) == 1} -
{l s='This warning also concerns order '} - {else} -
{l s='This warning also concerns the next orders:'} + {if (!$order->valid && sizeof($currencies) > 1)} +

+

{l s='Don\'t forget to update your conversion rate before making this change.'}

+
+ +
+ +
+
+ {/if} + + {if count($order->getOrderPayments()) > 0} +

+ {l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} {displayPrice price=$orders_total_paid_tax_incl currency=$currency->id} + {foreach $order->getBrother() as $brother_order} + {if $brother_order@first} + {if count($order->getBrother()) == 1} +
{l s='This warning also concerns order '} + {else} +
{l s='This warning also concerns the next orders:'} {/if} - #{'%06d'|sprintf:$brother_order->id} - {/foreach} -

- {/if} -
- - - - - - - - - - - - - - - - - - - - - {foreach from=$order->getOrderPaymentCollection() item=payment} - - - - - - - - - - + + {foreachelse} + + + + {/foreach} + + + + + + {if count($invoices_collection) > 0} + + {/if} + + + +
- {l s='Date'} - - {l s='Payment method'} - - {l s='Transaction ID'} - - {l s='Amount'} - - {l s='Invoice'} -  
{dateFormat date=$payment->date_add full=true}{$payment->payment_method}{$payment->transaction_id}{displayPrice price=$payment->amount currency=$payment->id_currency} - {if $invoice = $payment->getOrderInvoice($order->id)} - {$invoice->getInvoiceNumberFormatted($current_id_lang)} - {else} - {l s='No invoice'} - {/if} - - - - {l s='See payment information'} - -
+

{l s='No payments are available'}

+
+ + + + + + + + + + + + +
+ +
{if !$order->isVirtual()} -
-
-
- - - {l s='Shipping'} - - {if $order->recyclable} -

- - - {l s='Recycled packaging'} - -

- {else} -

- - - {l s='Recycled packaging'} - -

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

- - - {l s='Gift wrapping'} - - {if $order->gift_message} -

-

- {l s='Message'} -

-

- {$order->gift_message|nl2br} -

-
- {/if} -

- {else} -

- - - {l s='Gift wrapping'} - -

- {/if} +
+ + + {l s='Shipping'} + + {if $order->recyclable} +

+ + + {l s='Recycled packaging'} + +

+ {else} +

+ + + {l s='Recycled packaging'} + +

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

+ + + {l s='Gift wrapping'} + + {if $order->gift_message} +

+

+ {l s='Message'} +

+

+ {$order->gift_message|nl2br} +

+
+ {/if} +

+ {else} +

+ + + {l s='Gift wrapping'} + +

+ {/if} - {include file='controllers/orders/_shipping.tpl'} + {include file='controllers/orders/_shipping.tpl'} - {if $carrierModuleCall} - {$carrierModuleCall} - {/if} -
- + {if $carrierModuleCall} + {$carrierModuleCall} + {/if} +
-
-
- - - {l s='Merchandise returns'} - +
+ + + {l s='Merchandise returns'} + - {if $order->getReturn()|count > 0} - - - - - - - - - - - {foreach from=$order->getReturn() item=line} - - - - - + + {/foreach} + +
- {l s='Date'} - - {l s='Type'} - - {l s='Carrier'} - - {l s='Tracking number'} -
{$line.date_add}{$line.type}{$line.state_name} - - {if isset($line.url) && isset($line.tracking_number)} - {$line.tracking_number} - {elseif isset($line.tracking_number)}{$line.tracking_number}{/if} + {if $order->getReturn()|count > 0} + + + + + + + + + + + {foreach from=$order->getReturn() item=line} + + + + + - - {/foreach} - -
+ {l s='Date'} + + {l s='Type'} + + {l s='Carrier'} + + {l s='Tracking number'} +
{$line.date_add}{$line.type}{$line.state_name} + + {if isset($line.url) && isset($line.tracking_number)} + {$line.tracking_number} + {elseif isset($line.tracking_number)}{$line.tracking_number}{/if} + + {if $line.can_edit} + + - {if $line.can_edit} - - - - - {l s='Edit'} - - - - {/if} -
- {else} - {l s='No merchandise returned yet.'} - {/if} + + + {l s='Edit'} + + + + {/if} +
+ {else} + {l s='No merchandise returned yet.'} + {/if} - {if $carrierModuleCall} - {$carrierModuleCall} - {/if} -
- + {if $carrierModuleCall} + {$carrierModuleCall} + {/if} +
{/if}
-
+
@@ -991,10 +972,10 @@ {if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} -
+ -
+