dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : #PSFV-776 - Fix Bug with order editing on the back office

Browse Source
This commit is contained in:
mDeflotte
2012-04-16 09:34:31 +00:00
parent 25e0218fa9
commit 6b9ad6bae3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin_order.js
+12 -5
View File
@@ -168,7 +168,6 @@ function editProductRefreshTotal(element)
// Customized product // Customized product
if (element_list.length) if (element_list.length)
{ {
console.log(element_list);
var qty = 0; var qty = 0;
$.each(element_list, function(i, elm) { $.each(element_list, function(i, elm) {
if($(elm).find('.edit_product_quantity').length) if($(elm).find('.edit_product_quantity').length)
@@ -176,8 +175,6 @@ function editProductRefreshTotal(element)
qty += parseInt($(elm).find('.edit_product_quantity').val()); qty += parseInt($(elm).find('.edit_product_quantity').val());
subtotal = makeTotalProductCaculation($(elm).find('.edit_product_quantity').val(), price); subtotal = makeTotalProductCaculation($(elm).find('.edit_product_quantity').val(), price);
$(elm).find('.total_product').html(formatCurrency(subtotal, currency_format, currency_sign, currency_blank)); $(elm).find('.total_product').html(formatCurrency(subtotal, currency_format, currency_sign, currency_blank));
console.log('res');
console.log($(elm).find('.total_product'));
} }
}); });
@@ -223,6 +220,8 @@ function refreshProductLineView(element, view)
var element_list = []; var element_list = [];
if (element.parent().parent().find('.edit_product_id_order_detail').length) if (element.parent().parent().find('.edit_product_id_order_detail').length)
var element_list = $('.customized-' + element.parent().parent().find('.edit_product_id_order_detail').val()); var element_list = $('.customized-' + element.parent().parent().find('.edit_product_id_order_detail').val());
if (!element_list.length)
element_list = $(element.parent().parent());
var current_product_line = element.parent().parent(); var current_product_line = element.parent().parent();
current_product_line.before(new_product_line); current_product_line.before(new_product_line);
@@ -567,6 +566,8 @@ function init()
current_product = data; current_product = data;
var element_list = $('.customized-' + element.parent().parent().find('.edit_product_id_order_detail').val()); var element_list = $('.customized-' + element.parent().parent().find('.edit_product_id_order_detail').val());
if (!element_list.length)
element_list = element.parent().parent();
element_list.css('background-color', '#E8EDC2'); element_list.css('background-color', '#E8EDC2');
@@ -600,6 +601,8 @@ function init()
current_product = null; current_product = null;
$('.edit_product_fields').hide(); $('.edit_product_fields').hide();
var element_list = $('.customized-' + $(this).parent().parent().find('.edit_product_id_order_detail').val()); 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.css('background-color', '#FFF');
@@ -640,8 +643,12 @@ function init()
var element_list = $('.customized-' + $(this).parent().parent().find('.edit_product_id_order_detail').val()); var element_list = $('.customized-' + $(this).parent().parent().find('.edit_product_id_order_detail').val());
query = 'ajax=1&token='+token+'&action=editProductOnOrder&id_order='+id_order+'&'+ query = 'ajax=1&token='+token+'&action=editProductOnOrder&id_order='+id_order+'&';
element_list.parent().parent().find('input:visible, select:visible, input.edit_product_id_order_detail').serialize();
if (element_list.length)
query += element_list.parent().parent().find('input:visible, select:visible, .edit_product_id_order_detail').serialize();
else
query += element.parent().parent().find('input:visible, select:visible, .edit_product_id_order_detail').serialize();
$.ajax({ $.ajax({
type: 'POST', type: 'POST',