diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index f8be6e65b..029c14989 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -8311,44 +8311,49 @@ tr.highlighted td { /* line 678, admin-theme.sass */ .nav-tabs { border-bottom: none; } -/* line 681, admin-theme.sass */ +/* line 680, admin-theme.sass */ +.nav-tabs li a { + font-size: 1.2em; + text-transform: uppercase; + font-weight: 300; } +/* line 685, admin-theme.sass */ .nav-tabs li.active a, .nav-tabs li.active a:hover { background-color: white; } -/* line 684, admin-theme.sass */ +/* line 688, admin-theme.sass */ .tree-actions { padding-bottom: 4px; display: inline-block; } -/* line 689, admin-theme.sass */ +/* line 693, admin-theme.sass */ .tt-query { border-bottom-right-radius: 3px !important; border-top-right-radius: 3px !important; } -/* line 691, admin-theme.sass */ +/* line 695, admin-theme.sass */ .tt-dropdown-menu { background-color: white; border: solid 1px #cccccc; font-size: 0.9em; text-transform: none; } -/* line 696, admin-theme.sass */ +/* line 700, admin-theme.sass */ .tt-suggestions { padding: 0 6px; -webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; } -/* line 699, admin-theme.sass */ +/* line 703, admin-theme.sass */ .tt-suggestion p { border-bottom: solid 1px #cccccc; margin: 0 !important; padding: 0 !important; } -/* line 703, admin-theme.sass */ +/* line 707, admin-theme.sass */ .tt-suggestion:last-child p { border-bottom: none; } -/* line 707, admin-theme.sass */ +/* line 711, admin-theme.sass */ .tagify-container { background-color: white; padding: 2px 6px; @@ -8362,10 +8367,10 @@ tr.highlighted td { border: solid 1px #cccccc; -webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; } -/* line 715, admin-theme.sass */ +/* line 719, admin-theme.sass */ .tagify-container span { float: left; } -/* line 717, admin-theme.sass */ +/* line 721, admin-theme.sass */ .tagify-container > span { display: inline-block; padding: 3px 5px; @@ -8374,26 +8379,26 @@ tr.highlighted td { border: 1px solid #1ba6e5; background-color: #60c1ed; color: white; } -/* line 725, admin-theme.sass */ +/* line 729, admin-theme.sass */ .tagify-container > span > a { padding-left: 5px; color: #1ba6e5; text-decoration: none; font-weight: bold; } -/* line 730, admin-theme.sass */ +/* line 734, admin-theme.sass */ .tagify-container > input { margin-top: 2px; border: 0 none; width: 100px; -webkit-box-shadow: none; box-shadow: none; } -/* line 735, admin-theme.sass */ +/* line 739, admin-theme.sass */ .tagify-container > input:focus { outline: 0; -webkit-box-shadow: none; box-shadow: none; } -/* line 740, admin-theme.sass */ +/* line 744, admin-theme.sass */ li.sortable-placeholder { border: 1px dashed #cccccc; background-color: #bbbbbb; diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 255ea6906..a97b7e623 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -677,6 +677,10 @@ tr.highlighted td .nav-tabs border-bottom: none + li a + font-size: 1.2em + text-transform: uppercase + font-weight: 300 li.active a, a:hover background-color: white 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 56efb8436..554eb4f54 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 @@ -87,112 +87,273 @@ - + {hook h="displayAdminOrder" id_order=$order->id} -
- {l s='Orders'} : - {if $previousOrder} - - - {l s='Prev'} - - {/if} - {if $nextOrder} - - {l s='Next'} - - - {/if} -
-
-

- - {l s='Status'} +

+ + + {l s='Prev'} + + {l s='Order'} : {$order->reference} + + {l s='Next'} + +

- {if (count($invoices_collection))} - - - {l s='View invoice'} - - {else} - + +
+ {if (count($invoices_collection))} + - - - {l s='No invoice'} - {/if} - {if (($currentState && $currentState->delivery) || $order->delivery_number)} - - - {l s='View delivery slip'} - - {else} - + {l s='View invoice'} + + {else} + + + + + {l s='No invoice'} + {/if} + {if (($currentState && $currentState->delivery) || $order->delivery_number)} + - - - {l s='No delivery slip'} - {/if} - - - {l s='Print order'} - -
- -
-
-
- - -
-
- -
+ {l s='View delivery slip'} + + {else} + + + + + {l s='No delivery slip'} + {/if} + + + {l s='Print order'} + +
+ + + +
+ +
+ + +
+
+ + +
+
+ +
+
+ + + + + + {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} - - - - - - + +
+ {* Include document template *} + {include file='controllers/orders/_documents.tpl'} +
+ + + + + +
+ +
+ + {if !$order->isVirtual()} +
+
+
+ +
+

+ {if $order->recyclable} + + + {l s='Yes'} + + {else} + + + {l s='No'} + + {/if} +

+
+
+
+ +
+

+ {if $order->gift} + + + {l s='Yes'} + + {else} + + + {l s='No'} + + {/if} +

+
+
+
+ {if $order->gift_message} +
+ +
+

{$order->gift_message|nl2br}

+
+
+ {/if} +
+ {include file='controllers/orders/_shipping.tpl'} + {if $carrierModuleCall} + {$carrierModuleCall} + {/if} +
{/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 !$order->isVirtual()} + +
+ {if $order->getReturn()|count > 0} + + + + + + + + + + + {foreach from=$order->getReturn() item=line} + + + + + + + {/foreach} + +
DateTypeCarrierTracking 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} +
+ {else} + {l s='No merchandise returned yet.'} + {/if} + {if $carrierModuleCall} + {$carrierModuleCall} + {/if} +
+ {/if} +
+
+
+
- {if $customer->id} + {if $customer->id}

- {l s='Customer information'} -

-

+ {l s='Customer'} : {$gender->name|escape:'htmlall':'UTF-8'} {$customer->firstname} @@ -202,9 +363,8 @@ ({l s='#'}{$customer->id}) - {$customer->email} -

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

{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}
    • -
  • {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='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} -
- + + +
+ +
+ + {if !$order->isVirtual()} + + {if $can_edit} + +
+
+ +
+
+ +
+
+ + {/if} +
+ + + {l s='Edit'} + + {displayAddressDetail address=$addresses.delivery newLine='
'} + {if $addresses.delivery->other} +
{$addresses.delivery->other}
+ {/if} +
+ + {/if} +
+
+ + {if $can_edit} +
+
+
+ +
+
+ +
+
+
+ {/if} +
+ + + {l s='Edit'} + + {displayAddressDetail address=$addresses.invoice newLine='
'} + {if $addresses.invoice->other} +
{$addresses.invoice->other}
+ {/if} +
+ +
+
+ -

+ +

+ - - +
@@ -297,196 +564,176 @@
-
-
- - - {l s='Click here'} {l s='to see all messages.'} - - -
- -
- -
- - -
-
- -
-

- - {l s='Payment'} -

- {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} - {/if} - - #{'%06d'|sprintf:$brother_order->id} +

+ + + {l s='Click here'} {l s='to see all messages.'} + - {/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, $order->id_shop)} - {else} - {l s='No invoice'} - {/if} - - -
- - {l s='No payments are available'} -
- - - - - - -
-
- -
-
- -
-
- 		- - - -
+
- {if (!$order->valid && sizeof($currencies) > 1)} -
+
+
+ + +
+

+ + {l s="Payment"} +

+ {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} + {/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, $order->id_shop)} + {else} + {l s='No invoice'} + {/if} + + +
+ + {l s='No payments are available'} +
+ + + + + + +
+
+ +
+
+ +
+
+ 		+ + + +
+ + {if (!$order->valid && sizeof($currencies) > 1)} +
+
- - {/if} -
- -
- -
-
- - {if !$order->isVirtual()} -
-
-

- - {l s='Shipping'} -

-
- -
-

- {if $order->recyclable} - - - {l s='Yes'} - - {else} - - - {l s='No'} - - {/if} -

-
-
-
- -
-

- {if $order->gift} - - - {l s='Yes'} - - {else} - - - {l s='No'} - - {/if} -

-
-
- {if $order->gift_message} -
- -
-

{$order->gift_message|nl2br}

-
-
- {/if} -
- {include file='controllers/orders/_shipping.tpl'} - {if $carrierModuleCall} - {$carrierModuleCall} - {/if} -
-
- {/if} - - - {if !$order->isVirtual()} -
- -
-

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

- {if $can_edit} -
-
-
- -
-
- -
-
-
- {/if} -
- - - {l s='Edit'} - - {displayAddressDetail address=$addresses.delivery newLine='
'} - {if $addresses.delivery->other} -
{$addresses.delivery->other}
- {/if} -
- -
-
- {/if} - - - -
-
-

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

- - {if $can_edit} -
-
-
- -
-
- -
-
-
- {/if} - -
- - - {l s='Edit'} - - {displayAddressDetail address=$addresses.invoice newLine='
'} - {if $addresses.invoice->other} -
{$addresses.invoice->other}
- {/if} -
-
-
-
-
-
- -
-

- - {l s='Documents'} -

- - {* Include document template *} - {include file='controllers/orders/_documents.tpl'} -
-
-
- {if !$order->isVirtual()} - -
-

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

- - {if $order->getReturn()|count > 0} - - - - - - - - - - - {foreach from=$order->getReturn() item=line} - - - - - - - {/foreach} - -
DateTypeCarrierTracking 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} -
- {else} - {l s='No merchandise returned yet.'} - {/if} - {if $carrierModuleCall} - {$carrierModuleCall} - {/if} -
+ {/if} -
- - - + + {if (sizeof($sources))}