diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index bfe87649c..8eb2216dc 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -8312,7 +8312,7 @@ tr.highlighted td { .nav-tabs { border-bottom: none; } /* line 681, admin-theme.sass */ -.nav-tabs li.active a.tab-page { +.nav-tabs li.active a, .nav-tabs li.active a:hover { background-color: white; } /* line 684, admin-theme.sass */ diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 906d63f45..255ea6906 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -678,7 +678,7 @@ tr.highlighted td .nav-tabs border-bottom: none li.active - a.tab-page + a, a:hover background-color: white .tree-actions diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl index d59685c5f..119ecefb8 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl @@ -54,7 +54,6 @@
- %
diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl index 33221b48f..ecf0486ea 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl @@ -69,13 +69,13 @@ {if get_class($document) eq 'OrderInvoice'} {if isset($document->is_delivery)} - + {else} - + {/if} {elseif get_class($document) eq 'OrderSlip'} - + {/if} {if get_class($document) eq 'OrderInvoice'} @@ -90,13 +90,8 @@ #{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id} - {/if} - - - - {l s='See the document'} - - + {/if} + {if get_class($document) eq 'OrderInvoice'} @@ -121,12 +116,14 @@ {if get_class($document) eq 'OrderInvoice'} {if !isset($document->is_delivery)} + {if $document->getRestPaid()} {l s='Enter Payment'} {/if} + {if $document->note eq ''} @@ -136,6 +133,7 @@ {l s='Edit note'} {/if} + {/if} {/if} diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl index 266b1e856..1e5ab206e 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl @@ -49,7 +49,7 @@
-
+
{$currency->sign} {l s='tax excl.'} @@ -58,7 +58,7 @@
-
+
{$currency->sign} {l s='tax incl.'} @@ -69,16 +69,16 @@ - + - {if ($order->hasBeenPaid())} {/if} - {if $display_warehouse} {/if} - {if ($order->hasBeenDelivered())} {/if} + {if ($order->hasBeenPaid())}{/if} + {if $display_warehouse}{/if} + {if ($order->hasBeenDelivered())}{/if} 0 {displayPrice price=0 currency=$currency->id} {if sizeof($invoices_collection)} - {foreach from=$invoices_collection item=invoice} @@ -101,17 +101,29 @@ + -

{l s='New invoice information'}

- -
- {$carrier->name} -
-
- - -

{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied.'}

+

{l s='New invoice information'}

+
+
+ +
+

{$carrier->name}

+
+
+
+ +
+
+ +

{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied.'}

+
+
+
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 210f22430..fe47a3685 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 @@ -41,14 +41,12 @@ var use_taxes = {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}true{else}false{/if}; var token = "{$smarty.get.token|escape:'htmlall':'UTF-8'}"; var stock_management = {$stock_management|intval}; - var txt_add_product_stock_issue = "{l s='Are you sure you want to add this quantity?' js=1}"; var txt_add_product_new_invoice = "{l s='Are you sure you want to create a new invoice?' js=1}"; var txt_add_product_no_product = "{l s='Error: No product has been selected' js=1}"; var txt_add_product_no_product_quantity = "{l s='Error: Quantity of products must be set' js=1}"; var txt_add_product_no_product_price = "{l s='Error: Product price must be set' js=1}"; var txt_confirm = "{l s='Are you sure?' js=1}"; - var statesShipped = new Array(); {foreach from=$states item=state} {if (!$currentState->shipped && $state['shipped'])} @@ -62,7 +60,6 @@
{$hook_invoice}
{/if} -
@@ -89,6 +86,25 @@
+ + + {hook h="displayAdminOrder" id_order=$order->id} +
+ {l s='Orders'} : + {if $previousOrder} + + + {l s='Prev'} + + {/if} + {if $nextOrder} + + {l s='Next'} + + + {/if} +
+
@@ -96,6 +112,35 @@ {l s='Status'} + {if (count($invoices_collection))} + + + {l s='View invoice'} + + {else} + + + + + {l s='No invoice'} + {/if} + {if (($currentState && $currentState->delivery) || $order->delivery_number)} + + + {l s='View delivery slip'} + + {else} + + + + + {l s='No delivery slip'} + {/if} + + + {l s='Print order'} + +
@@ -140,85 +185,82 @@
+ + {if $customer->id}
- {if (count($invoices_collection))} - - - {l s='View invoice'} - +

+ + {l s='Customer information'} +

+

+ + {$gender->name|escape:'htmlall':'UTF-8'} + {$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} {else} - - - - - {l s='No invoice'} +
    +
  • {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 (($currentState && $currentState->delivery) || $order->delivery_number)} - - - {l s='View delivery slip'} - - {else} - - - - - {l s='No delivery slip'} - {/if} - - - {l s='Print order'} - +
+ {/if} + + +
+

+ + {l s='Documents'} +

+ + {* Include document template *} + {include file='controllers/orders/_documents.tpl'}
- - {if $customer->id} -
-

- - {l s='Customer information'} -

-

- - {$gender->name|escape:'htmlall':'UTF-8'} - {$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} - - {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} - +
+
1
+
2
+
3
+
+
+ {if (sizeof($sources))}
@@ -238,28 +280,10 @@
{/if} - - - {hook h="displayAdminOrder" id_order=$order->id} -
- {l s='Orders'} : - {if $previousOrder} - - - {l s='Prev'} - - {/if} - {if $nextOrder} - - - {l s='Next'} - - {/if} -
- + {if count($order->getBrother()) > 0} -
+

{l s='Linked orders'} @@ -301,19 +325,8 @@ {/foreach} -

+
{/if} - - -
-

- - {l s='Documents'} -

- - {* Include document template *} - {include file='controllers/orders/_documents.tpl'} -
@@ -322,7 +335,6 @@ {l s='Payment'} - {if count($order->getOrderPayments()) > 0}

{l s='Warning'} @@ -437,12 +449,18 @@ - - +

+
+ +
+
+ +
+
{if count($invoices_collection) > 0} @@ -456,14 +474,13 @@ - {if (!$order->valid && sizeof($currencies) > 1)}
@@ -482,7 +499,6 @@
{/if} - @@ -538,12 +554,10 @@ {/if}
{include file='controllers/orders/_shipping.tpl'} - {if $carrierModuleCall} {$carrierModuleCall} {/if} -

@@ -597,14 +611,12 @@ {else} {l s='No merchandise returned yet.'} {/if} - {if $carrierModuleCall} {$carrierModuleCall} {/if}

{/if} -
{if !$order->isVirtual()} @@ -778,15 +790,70 @@ {if $can_edit} - {if !$order->hasBeenDelivered()}
+ {if !$order->hasBeenDelivered()} + {/if} +
{/if} - {/if} + +
+
+ {if (sizeof($discounts) || $can_edit)} + + + + + + {if $can_edit} + + {/if} + + + + {foreach from=$discounts item=discount} + + + + {if $can_edit} + + {/if} + + {/foreach} + +
+ + {l s='Discount name'} + + + + {l s='Value'} + +
{$discount['name']} + {if $discount['value'] != 0.00} + - + {/if} + {displayPrice price=$discount['value'] currency=$currency->id} + + + + {l s='Delete voucher'} + +
+ + {/if} +
+
+
@@ -838,9 +905,9 @@ - {l s='Total'} + {l s='Total'} - {displayPrice price=$order->total_paid_tax_incl currency=$currency->id} + {displayPrice price=$order->total_paid_tax_incl currency=$currency->id} @@ -901,65 +968,6 @@
- -
-{if (sizeof($discounts) || $can_edit)} -

- - {l s="Discounts"} -

- - - - - - {if $can_edit} - - {/if} - - - - {foreach from=$discounts item=discount} - - - - {if $can_edit} - - {/if} - - {/foreach} - -
- - {l s='Discount name'} - - - - {l s='Value'} - -
{$discount['name']} - {if $discount['value'] != 0.00} - - - {/if} - {displayPrice price=$discount['value'] currency=$currency->id} - - - - {l s='Delete voucher'} - -
- {if $can_edit} - - - {/if} -{/if} - -
diff --git a/js/admin_order.js b/js/admin_order.js index 76bb3ca6f..fec384c24 100644 --- a/js/admin_order.js +++ b/js/admin_order.js @@ -517,6 +517,7 @@ function init() $('.standard_refund_fields').hide(); $('.partial_refund_fields').hide(); + $('#add_product').show(); } else jAlert(data.error); @@ -616,30 +617,20 @@ function init() var element_list = $('.customized-' + element.parent().parent().find('.edit_product_id_order_detail').val()); if (!element_list.length) element_list = element.parent().parent().parent(); - - //element_list.css('background-color', '#E8EDC2'); - element_list.find('td .product_price_show').hide(); element_list.find('td .product_quantity_show').hide(); - //element_list.find('td .product_price_edit').parent().attr('align', 'left'); element_list.find('td .product_price_edit').show(); element_list.find('td .product_quantity_edit').show(); - element_list.find('td.cancelCheck').hide(); element_list.find('td.cancelQuantity').hide(); element_list.find('td.product_invoice').show(); - $('td.product_action').attr('colspan', 3); $('th.edit_product_fields').show(); $('th.edit_product_fields').attr('colspan', 2); element_list.find('td.product_action').attr('colspan', 1); - - //element.parent().children('.delete_product_line').hide(); element.parent().children('.edit_product_change_link').parent().hide(); - element.parent().parent().find('button.submitProductChange').show(); element.parent().parent().find('.cancel_product_change_link').show(); - $('.standard_refund_fields').hide(); $('.partial_refund_fields').hide(); } @@ -658,21 +649,15 @@ function init() var element_list = $('.customized-' + $(this).parent().parent().find('.edit_product_id_order_detail').val()); if (!element_list.length) element_list = $($(this).parent().parent()); - - //element_list.css('background-color', '#FFF'); element_list.find('td .product_price_show').show(); element_list.find('td .product_quantity_show').show(); - //element_list.find('td .product_price_edit').parent().attr('align', 'center'); element_list.find('td .product_price_edit').hide(); element_list.find('td .product_quantity_edit').hide(); - element_list.find('td.product_invoice').hide(); element_list.find('td.cancelCheck').show(); element_list.find('td.cancelQuantity').show(); - - //element_list.find('.delete_product_line').show(); element_list.find('.edit_product_change_link').parent().show(); - element_list.find('button[name=submitProductChange]').hide(); + element_list.find('button.submitProductChange').hide(); element_list.find('.cancel_product_change_link').hide(); $('.standard_refund_fields').hide(); return false;