From 650001024a0bea0ddd90fb8f2383b16ff253f65b Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 19 Sep 2013 16:55:06 +0200 Subject: [PATCH] // orders cleanup --- .../controllers/orders/helpers/view/view.tpl | 487 ++++++++++-------- 1 file changed, 278 insertions(+), 209 deletions(-) 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 7b01dc639..bf0a650ca 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 @@ -65,102 +65,114 @@
{if (count($invoices_collection))} - + {l s='View invoice'} {l s='View invoice'} {else} {l s='No invoice'} {l s='No invoice'} {/if} - | {if (($currentState && $currentState->delivery) || $order->delivery_number)} - - {l s='View delivery slip'} {l s='View delivery slip'} + + {l s='View delivery slip'} + {l s='View delivery slip'} {else} - {l s='No delivery slip'} {l s='No delivery slip'} + {l s='No delivery slip'} + {l s='No delivery slip'} {/if} - | - {l s='Print order'} {l s='Print order'} + + {l s='Print order'} + {l s='Print order'} +
{l s='Date'}
{dateFormat date=$order->date_add full=true}
- |
+
{l s='Messages:'}
{sizeof($messages)}
- |
+
-
{l s='New Customer Messages:'}
-
{sizeof($customer_thread_message)}
- |
+
+ {l s='New Customer Messages:'} +
+
+ {sizeof($customer_thread_message)} +
+
{l s='Products:'}
{sizeof($products)}
- |
+
{l s='Total'}
{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
+
-
+ - +
- - - - - - - - {foreach from=$history item=row key=key} - {if ($key == 0)} - - - - - - - {else} - - - - - - - {/if} - {/foreach} -
{$row['ostate_name']|stripslashes}{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}{dateFormat date=$row['date_add'] full=true}
{$row['ostate_name']|stripslashes}{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else} {/if}{dateFormat date=$row['date_add'] full=true}
- +
+ + + {foreach from=$history item=row key=key} + {if ($key == 0)} + + + + + + + {else} + + + + + + + {/if} + {/foreach} + +
{$row['ostate_name']|stripslashes}{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}{dateFormat date=$row['date_add'] full=true}
{$row['ostate_name']|stripslashes}{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else} {/if}{dateFormat date=$row['date_add'] full=true}
+
{if $customer->id}
-

{l s='Customer information'}

- {$customer->firstname} {$customer->lastname} ({l s='#'}{$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'}
+
+ {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}
@@ -173,7 +185,10 @@ {if (sizeof($sources))}
-

{l s='Sources'}

+

+ + {l s='Sources'} +

    3}style="height: 200px; overflow-y: scroll;"{/if}> {foreach from=$sources item=source}
  • @@ -194,31 +209,32 @@
    -
    +
    {l s='Orders'} : - {if $previousOrder}{l s='< Prev'}{/if} - {if $nextOrder}{l s='Next >'}{/if} + {if $previousOrder}{l s='< Prev'}{/if} + {if $nextOrder}{l s='Next >'}{/if}
    -
    {if count($order->getBrother()) > 0}
    -

    {l s='Linked orders'}

    +

    + + {l s='Linked orders'} +

    - - - + @@ -245,7 +261,10 @@
    -

    {l s='Documents'}

    +

    + + {l s='Documents'} +

    {* Include document template *} {include file='controllers/orders/_documents.tpl'} @@ -253,8 +272,10 @@
    -

    {l s='Payment: '}

    - +

    + + {l s='Payment: '} +

    {if (!$order->valid && sizeof($currencies) > 1)}

    {l s='Do not forget to update your exchange rate before making this change.'}

    @@ -266,11 +287,10 @@ {/if} {/foreach} - + -
    {/if} - + {if count($order->getOrderPayments()) > 0}

    {l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} @@ -290,23 +310,15 @@ {/if}
    -

    + {l s='Order no. '} {l s='Status'} + {l s='Amount'} -
    - - - - - - - - +
    - - - - - - + + + + + + @@ -323,7 +335,7 @@ {l s='No invoice'} {/if} - @@ -402,7 +414,7 @@ {/if} - +
    {l s='Date'}{l s='Payment method'}{l s='Transaction ID'}{l s='Amount'}{l s='Invoice'} {l s='Date'}{l s='Payment method'}{l s='Transaction ID'}{l s='Amount'}{l s='Invoice'}
    + {l s='See payment information'}
    @@ -412,9 +424,11 @@ {if !$order->isVirtual()}
    -

    {l s='Shipping'}

    - -
    +

    + + {l s='Shipping'} +

    +
    {l s='Recycled packaging'} {if $order->recyclable} @@ -422,14 +436,14 @@ {/if}
    -
    +
    {l s='Gift wrapping'} {if $order->gift}
    -
    +
    {if $order->gift_message} -
    {l s='Message'}
    {$order->gift_message|nl2br}
    +
    {l s='Message'}
    {$order->gift_message|nl2br}
    {/if} {else} @@ -445,16 +459,19 @@
    -

    {l s='Merchandise returns'}

    +

    + + {l s='Merchandise returns'} +

    {if $order->getReturn()|count > 0} - - - - + + + + @@ -466,13 +483,17 @@ @@ -491,33 +512,34 @@ {/if} -
    {if !$order->isVirtual()} -
    +
    -

    {l s='Shipping address'}{l s='Shipping address'}

    - +

    + + {l s='Shipping address'} +

    {if $can_edit}
    -
    +

    - +

    {/if} -
    +
    @@ -527,27 +549,30 @@
    {/if} -
    +
    -

    {l s='Invoice address'}{l s='Invoice address'}

    +

    + + {l s='Invoice address'} +

    {if $can_edit}
    -
    +

    - +

    {/if} -
    +
    @@ -555,58 +580,68 @@ {if $addresses.invoice->other}
    {$addresses.invoice->other}
    {/if}
    -
    -
    + -
    +
    -

    {l s='Products:'}{l s='Products:'}

    -
    +

    + + {l s='Products:'} +

    +
    {if $can_edit} - {if !$order->hasBeenDelivered()}{/if} -
    + {if !$order->hasBeenDelivered()} + + {/if} +
    {/if} -
    DateTypeCarrierTracking numberDateTypeCarrierTracking number
    {if isset($line.url) && isset($line.tracking_number)}{$line.tracking_number}{elseif isset($line.tracking_number)}{$line.tracking_number}{/if} {if $line.can_edit} - + - {l s='Edit'} - + + {l s='Edit'} + + {/if}
    - - - - - - {if $display_warehouse}{/if} - {if ($order->hasBeenPaid())}{/if} - {if ($order->hasBeenDelivered() || $order->hasProductReturned())}{/if} - {if $stock_management}{/if} - - - -
     {l s='Product'}{l s='Unit Price'} *{l s='Qty'}{l s='Warehouse'}{l s='Refunded'}{l s='Returned'}{l s='Available quantity'}{l s='Total'} *