{l s='Note'} - {$document->note|escape:'htmlall':'UTF-8'} + {$document->note|escape:'htmlall':'UTF-8'}
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 8837e3340..55d02a0dc 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl @@ -76,9 +76,13 @@ {/if} + + + {l s='Cancel'} + - - {l s='Add product'} + + {l s='Add'} diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index 9eb840650..325614c2b 100755 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -134,26 +134,38 @@ {/if} - - {l s='Quantity:'} + + + + {l s='Quantity:'} + + + + 0/{$productQuantity-$product['product_quantity_refunded']} + - - - 0/{$productQuantity-$product['product_quantity_refunded']} + + + + {l s='Amount:'} + + + + {$currency->prefix} + {$currency->suffix} + + + - - {l s='Amount:'} + + + {if !empty($product['amount_refund']) && $product['amount_refund'] > 0} + ({l s='%s refund' sprintf=$product['amount_refund']}) + {/if} + + - - {$currency->prefix} - - {$currency->suffix} - - {if !empty($product['amount_refund']) && $product['amount_refund'] > 0} - ({l s='%s refund' sprintf=$product['amount_refund']}) - {/if} - - + {if ($can_edit && !$order->hasBeenDelivered())} @@ -198,7 +210,6 @@ {l s='Cancel'} - {/if} diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl index c40fddcef..442cc499f 100644 --- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl @@ -66,7 +66,10 @@ - + + + {l s='Update'} + 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 7645dbc16..c35d56fbc 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 @@ -119,7 +119,7 @@ {foreach from=$history item=row key=key} {if ($key == 0)} - + {$row['ostate_name']|stripslashes} {if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if} @@ -332,7 +332,7 @@ {if count($order->getOrderPayments()) > 0} - + {l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} @@ -764,7 +764,7 @@ {/if} - {l s='Partial refund'} + {l s='Partial refund'} {if !$order->hasBeenDelivered()} @@ -788,10 +788,10 @@ {if $can_edit} {if !$order->hasBeenDelivered()} - + {l s='Add a product'} - + {/if} {/if} @@ -836,9 +836,13 @@ {displayPrice price=$order->total_shipping_tax_incl currency=$currency->id} - {$currency->prefix} - - {$currency->suffix} + + + {$currency->prefix} + {$currency->suffix} + + + @@ -851,6 +855,59 @@ + + {if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))} + + + + {l s='Re-stock products'} + + + {/if} + + {if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} + + + + {l s='Generate a credit card slip'} + + + + + + {l s='Generate a voucher'} + + + + + + {l s='Repay shipping costs'} + + + {/if} + + {if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} + + {/if} + + + + + + {l s='Re-stock products'} + + + + + + {l s='Generate a voucher'} + + + + + {l s='Partial refund'} + + @@ -872,7 +929,9 @@ {l s='Value'} - {if $can_edit}{/if} + {if $can_edit} + + {/if} @@ -908,35 +967,6 @@ {/if} {/if} - - {if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))} - - {l s='Re-stock products'} - {/if} - - {if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} - - {l s='Generate a credit card slip'} - - {l s='Generate a voucher'} - - - - {l s='Repay shipping costs'} - - {/if} - - {if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} - - {/if} - - - - {l s='Re-stock products'} - - {l s='Generate a voucher'} - - @@ -946,36 +976,79 @@ {l s='New message'} - + + + {l s='to add a comment or send a message to the customer.'} + + + + {l s='New message'} - - {l s='to add a comment or send a message to the customer.'} + + + {l s='Choose a standard message'} + + + -- + {foreach from=$orderMessages item=orderMessage} + {$orderMessage['name']} + {/foreach} + + + + + {l s='Display to customer?'} + + + + + + + + {l s='Yes'} + + + + + {l s='No'} + + + + + + + + + + {l s='Message'} + + {Tools::getValue('message')|escape:'htmlall':'UTF-8'} + + + + + + + + + + {l s='Cancel'} + + + + {l s='Send'} + + + + {l s='Click here'} {l s='to see all messages.'} + - - - -- {l s='Choose a standard message'} -- - {foreach from=$orderMessages item=orderMessage} - {$orderMessage['name']} - {/foreach} - - {l s='Display to customer?'} - {l s='Yes'} - {l s='No'} - - - - {Tools::getValue('message')|escape:'htmlall':'UTF-8'} - - - - - @@ -989,7 +1062,7 @@ {if ($message['is_new_for_me'])} - + {/if} {l s='At'} {dateFormat date=$message['date_add']} @@ -1003,4 +1076,8 @@ {/if} + + {/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 773e9fcef..8ef5ff597 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -368,7 +368,7 @@ {if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} /> addJS(_PS_JS_DIR_.'jquery/plugins/jquery.autosize.min.js'); + return parent::initContent(); + } + public function initPageHeaderToolbar() { $this->page_header_toolbar_title = $this->l('Orders'); diff --git a/js/admin_order.js b/js/admin_order.js index 93154c171..76bb3ca6f 100644 --- a/js/admin_order.js +++ b/js/admin_order.js @@ -293,13 +293,35 @@ function closeAddProduct() current_product = null; } + + /** * This method allow to initialize all events */ function init() { - $('.add_product').unbind('click'); - $('.add_product').click(function() { + $('#txt_msg').on('keyup', function(){ + var length = $('#txt_msg').val().length; + if (length > 600) length = '600+'; + $('#nbchars').html(length+'/600'); + }); + + $('#newMessage').unbind('click'); + $('#newMessage').click(function() { + $(this).hide(); + $('#message').show(); + return false; + }); + + $('#cancelMessage').unbind('click'); + $('#cancelMessage').click(function() { + $('#newMessage').show(); + $('#message').hide(); + return false; + }); + + $('#add_product').unbind('click'); + $('#add_product').click(function() { $('.cancel_product_change_link:visible').trigger('click'); $('.add_product_fields').show(); $('.edit_product_fields').hide(); @@ -308,12 +330,17 @@ function init() $('tr#new_product').slideDown('fast', function () { $('tr#new_product td').fadeIn('fast'); }); - + $(this).hide(); $.scrollTo('tr#new_product', 1200, {offset: -100}); - return false; }); + $('#cancelAddProduct').unbind('click'); + $('#cancelAddProduct').click(function() { + $('#add_product').show(); + $('tr#new_product td').fadeOut('fast'); + }); + $("#add_product_product_name").autocomplete(admin_order_tab_link, { minChars: 3, @@ -793,15 +820,13 @@ function init() $('#add_voucher').click(function() { $(this).hide(); $('#voucher_form').show(); - return false; }); $('#cancel_add_voucher').unbind('click'); $('#cancel_add_voucher').click(function() { $('#voucher_form').hide(); - $('#add_discount_btn').show(); - + $('#add_voucher').show(); return false; }); @@ -873,7 +898,6 @@ $(document).ready(function() { $('.partial_refund_fields').hide(); $('.standard_refund_fields').fadeIn(); } - return false; }); @@ -896,7 +920,6 @@ $(document).ready(function() { $('.standard_refund_fields').hide(); $('.partial_refund_fields').fadeIn(); } - return false; }); });
+
{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} @@ -764,7 +764,7 @@ {/if}
+ + + {l s='Re-stock products'} + +
+ + + {l s='Generate a credit card slip'} + +
+ + + {l s='Generate a voucher'} + +
+ + + {l s='Repay shipping costs'} + +
+ {l s='to add a comment or send a message to the customer.'} +