diff --git a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl index a5a6de31d..711935a3d 100755 --- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - -{if ($product.customizedDatas)} - +{if $product.customizedDatas} + + {if ($product.image->id)}{$product.image_tag}{else}'--'{/if} @@ -34,76 +34,89 @@ {if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if} - {displayPrice price=$product['product_price_wt'] currency=$currency->id} + + {displayPrice price=$product['product_price_wt'] currency=$currency->id} + {if $can_edit} + + {/if} + {$product['customizationQuantityTotal']} {if ($order->hasBeenPaid())}{$product['customizationQuantityRefunded']}{/if} {if ($order->hasBeenDelivered())}{$product['customizationQuantityReturned']}{/if} - - - + - + {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} {displayPrice price=Tools::ps_round($product['product_price'] * $product['customizationQuantityTotal'], 2) currency=$currency->id} {else} {displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id} {/if} - -- - -- +   + + + {l s='Edit'} + + + {l s='Delete'} + - {foreach from=$product.customizedDatas key=customizationId item=customization} - - - {foreach from=$customization.datas key=type item=datas} - {if ($type == Product::CUSTOMIZE_FILE)} - - {elseif ($type == Product::CUSTOMIZE_TEXTFIELD)} - - {/if} + {foreach $product.customizedDatas as $customizationPerAddress} + {foreach $customizationPerAddress as $customizationId => $customization} + + + + {foreach $customization.datas as $type => $datas} + {if ($type == Product::CUSTOMIZE_FILE)} + + {elseif ($type == Product::CUSTOMIZE_TEXTFIELD)} + + {/if} + {/foreach} + + - + + + {$customization['quantity']} + {if $can_edit} + + {/if} + + {if ($order->hasBeenPaid())}{$customization['quantity_refunded']}{/if} + {if ($order->hasBeenDelivered())}{$customization['quantity_returned']}{/if} + + - + + + {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} + {displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id} + {else} + {displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id} + {/if} + + +
{l s='Quantity:'}
0/{$customization['quantity']-$product['product_quantity_refunded']}
+
{l s='Amount:'}
€
+ + + + + {/foreach} - - - - {$customization['quantity']} - {if ($order->hasBeenPaid())}{$customization['quantity_refunded']}{/if} - {if ($order->hasBeenDelivered())}{$customization['quantity_returned']}{/if} - - - - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id} - {else} - {displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id} - {/if} - - - - - - {if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) && (int)(($customization['quantity_returned']) < (int)($customization['quantity'])))} - = $customization['quantity'])}disabled="disabled"{/if} /> - {else} - -- - {/if} - - - {if (($customization['quantity_returned'] + $customization['quantity_refunded']) >= $customization['quantity'])} - - {elseif (!$order->hasBeenDelivered() || Configuration::get('PS_ORDER_RETURN'))} - - {/if} - {if ($order->hasBeenDelivered())} - {$customization['quantity_returned']}/{$customization['quantity']-$customization['quantity_refunded']} - {elseif ($order->hasBeenPaid())} - {$customization['quantity_returned']}/{$customization['quantity']} - {/if} - - {/foreach} {/if} diff --git a/classes/order/Order.php b/classes/order/Order.php index 20f52c684..ff4b81f9b 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -549,6 +549,9 @@ class OrderCore extends ObjectModel // Get the display filename $row['display_filename'] = ProductDownload::getFilenameFromFilename($row['filename']); } + + $row['id_address_delivery'] = $this->id_address_delivery; + /* Stock product */ $resultArray[(int)$row['id_order_detail']] = $row; } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 17209950e..20e9400e3 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1573,12 +1573,26 @@ class AdminOrdersControllerCore extends AdminController if (Tools::isSubmit('product_invoice')) $order_invoice = new OrderInvoice(Tools::getValue('product_invoice')); + // Check fields validity $this->doEditProductValidation($order_detail, $order, isset($order_invoice) ? $order_invoice : null); + + // If multiple product_quantity, the order details concern a product customized + $product_quantity = 0; + if (is_array(Tools::getValue('product_quantity'))) + foreach (Tools::getValue('product_quantity') as $id_customization => $qty) + { + // Update quantity of each customization + Db::getInstance()->update('customization', array('quantity' => $qty), 'id_customization = '.(int)$id_customization); + // Calculate the real quantity of the product + $product_quantity += $qty; + } + else + $product_quantity = Tools::getValue('product_quantity'); $product_price_tax_incl = Tools::ps_round(Tools::getValue('product_price_tax_incl'), 2); $product_price_tax_excl = Tools::ps_round(Tools::getValue('product_price_tax_excl'), 2); - $total_products_tax_incl = $product_price_tax_incl * Tools::getValue('product_quantity'); - $total_products_tax_excl = $product_price_tax_excl * Tools::getValue('product_quantity'); + $total_products_tax_incl = $product_price_tax_incl * $product_quantity; + $total_products_tax_excl = $product_price_tax_excl * $product_quantity; // Calculate differences of price (Before / After) $diff_price_tax_incl = $total_products_tax_incl - $order_detail->total_price_tax_incl; @@ -1639,7 +1653,7 @@ class AdminOrdersControllerCore extends AdminController $res &= $order->update(); } - $order_detail->product_quantity = Tools::getValue('product_quantity'); + $order_detail->product_quantity = $product_quantity; // Save order detail $res &= $order_detail->update(); // Save order invoice @@ -1677,16 +1691,23 @@ class AdminOrdersControllerCore extends AdminController 'result' => $res, 'error' => Tools::displayError('Error occurred while editing this product line') ))); + + + if (is_array(Tools::getValue('product_quantity'))) + $view = $this->createTemplate('_customized_data.tpl')->fetch(); + else + $view = $this->createTemplate('_product_line.tpl')->fetch(); die(Tools::jsonEncode(array( 'result' => $res, - 'view' => $this->createTemplate('_product_line.tpl')->fetch(), + 'view' => $view, 'can_edit' => $this->tabAccess['add'], 'invoices_collection' => $invoice_collection, 'order' => $order, 'invoices' => $invoice_array, 'documents_html' => $this->createTemplate('_documents.tpl')->fetch(), - 'shipping_html' => $this->createTemplate('_shipping.tpl')->fetch() + 'shipping_html' => $this->createTemplate('_shipping.tpl')->fetch(), + 'customized_product' => is_array(Tools::getValue('product_quantity')) ))); } @@ -1806,11 +1827,18 @@ class AdminOrdersControllerCore extends AdminController 'error' => Tools::displayError('Invalid price') ))); - if (!Validate::isUnsignedInt(Tools::getValue('product_quantity'))) + if (!is_array(Tools::getValue('product_quantity')) && !Validate::isUnsignedInt(Tools::getValue('product_quantity'))) die(Tools::jsonEncode(array( 'result' => false, 'error' => Tools::displayError('Invalid quantity') ))); + elseif (is_array(Tools::getValue('product_quantity'))) + foreach (Tools::getValue('product_quantity') as $qty) + if (!Validate::isUnsignedInt($qty)) + die(Tools::jsonEncode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid quantity') + ))); } protected function doDeleteProductLinveValidation(OrderDetail $order_detail, Order $order) diff --git a/js/admin_order.js b/js/admin_order.js index 9d9215872..c5607d8cf 100644 --- a/js/admin_order.js +++ b/js/admin_order.js @@ -145,6 +145,14 @@ function addProductRefreshTotal() function editProductRefreshTotal(element) { element = element.parent().parent().parent(); + var element_list = []; + + // Customized product + if(element.hasClass('customized')) + { + var element_list = $('.customized-' + element.find('.edit_product_id_order_detail').val()); + element = $(element_list[0]); + } var quantity = parseInt(element.find('td .edit_product_quantity').val()); if (quantity < 1 || isNaN(quantity)) @@ -156,9 +164,33 @@ function editProductRefreshTotal(element) if (price < 0 || isNaN(price)) price = 0; + + // Customized product + if (element_list.length) + { + console.log(element_list); + var qty = 0; + $.each(element_list, function(i, elm) { + if($(elm).find('.edit_product_quantity').length) + { + qty += parseInt($(elm).find('.edit_product_quantity').val()); + subtotal = makeTotalProductCaculation($(elm).find('.edit_product_quantity').val(), price); + $(elm).find('.total_product').html(formatCurrency(subtotal, currency_format, currency_sign, currency_blank)); + console.log('res'); + console.log($(elm).find('.total_product')); + } + }); + + var total = makeTotalProductCaculation(qty, price); + element.find('td.total_product').html(formatCurrency(total, currency_format, currency_sign, currency_blank)); + element.find('td.productQuantity').html(qty); + } + else + { + var total = makeTotalProductCaculation(quantity, price); + element.find('td.total_product').html(formatCurrency(total, currency_format, currency_sign, currency_blank)); + } - var total = makeTotalProductCaculation(quantity, price); - element.find('td.total_product').html(formatCurrency(total, currency_format, currency_sign, currency_blank)); } function makeTotalProductCaculation(quantity, price) @@ -187,10 +219,15 @@ function refreshProductLineView(element, view) { var new_product_line = $(view); new_product_line.find('td').hide(); + + var element_list = []; + 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 current_product_line = element.parent().parent(); current_product_line.before(new_product_line); current_product_line.remove(); + element_list.remove(); new_product_line.find('td').each(function() { if (!$(this).is('.product_invoice')) @@ -509,32 +546,39 @@ function init() $('.edit_product_fields').show(); $('.cancel_product_change_link:visible').trigger('click'); closeAddProduct(); - - query = 'ajax=1&token='+token+'&action=loadProductInformation&id_order_detail='+ - $(this).parent().parent().find('input.edit_product_id_order_detail').val()+'&id_address='+id_address+'&id_order='+id_order; var element = $(this); $.ajax({ type: 'POST', url: admin_order_tab_link, cache: false, dataType: 'json', - data : query, + data : { + ajax: 1, + token: token, + action: 'loadProductInformation', + id_order_detail: $(this).parent().parent().find('input.edit_product_id_order_detail').val(), + id_address: id_address, + id_order: id_order + }, success : function(data) { if (data.result) { current_product = data; - element.parent().parent().css('background-color', '#E8EDC2'); + + var element_list = $('.customized-' + element.parent().parent().find('.edit_product_id_order_detail').val()); - element.parent().parent().find('td .product_price_show').hide(); - element.parent().parent().find('td .product_quantity_show').hide(); - element.parent().parent().find('td .product_price_edit').parent().attr('align', 'left'); - element.parent().parent().find('td .product_price_edit').show(); - element.parent().parent().find('td .product_quantity_edit').show(); + element_list.css('background-color', '#E8EDC2'); - element.parent().parent().find('td.cancelCheck').hide(); - element.parent().parent().find('td.cancelQuantity').hide(); - element.parent().parent().find('td.product_invoice').show(); + 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(); element.parent().children('.delete_product_line').hide(); element.parent().children('.edit_product_change_link').hide(); @@ -554,23 +598,25 @@ function init() $('.cancel_product_change_link').click(function() { current_product = null; - $('.edit_product_fields').show(); - $(this).parent().parent().css('background-color', '#FFF'); + $('.edit_product_fields').hide(); + var element_list = $('.customized-' + $(this).parent().parent().find('.edit_product_id_order_detail').val()); - $(this).parent().parent().find('td .product_price_show').show(); - $(this).parent().parent().find('td .product_quantity_show').show(); - $(this).parent().parent().find('td .product_price_edit').parent().attr('align', 'center'); - $(this).parent().parent().find('td .product_price_edit').hide(); - $(this).parent().parent().find('td .product_quantity_edit').hide(); + element_list.css('background-color', '#FFF'); - $(this).parent().parent().find('td.product_invoice').hide(); - $(this).parent().parent().find('td.cancelCheck').show(); - $(this).parent().parent().find('td.cancelQuantity').show(); + 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(); - $(this).parent().children('.delete_product_line').show(); - $(this).parent().children('.edit_product_change_link').show(); - $(this).parent().children('input[name=submitProductChange]').hide(); - $(this).parent().children('.cancel_product_change_link').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').show(); + element_list.find('input[name=submitProductChange]').hide(); + element_list.find('.cancel_product_change_link').hide(); $('.standard_refund_fields').hide(); return false; }); @@ -591,9 +637,11 @@ function init() if (confirm(txt_confirm)) { var element = $(this); + + 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+'&'+ - element.parent().parent().find('input:visible, select:visible, input.edit_product_id_order_detail').serialize(); + element_list.parent().parent().find('input:visible, select:visible, input.edit_product_id_order_detail').serialize(); $.ajax({ type: 'POST', diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl index b583d1b14..f5da06cc9 100644 --- a/themes/default/order-detail.tpl +++ b/themes/default/order-detail.tpl @@ -211,32 +211,34 @@ - {foreach from=$product.customizedDatas item='customization' key='customizationId'} - - {if $return_allowed}{/if} - - {foreach from=$customization.datas key='type' item='datas'} - {if $type == $CUSTOMIZE_FILE} - - {elseif $type == $CUSTOMIZE_TEXTFIELD} - - {/if} + {foreach $product.customizedDatas as $customizationPerAddress} + {foreach $customizationPerAddress as $customizationId => $customization} + + {if $return_allowed}{/if} + + {foreach from=$customization.datas key='type' item='datas'} + {if $type == $CUSTOMIZE_FILE} + + {elseif $type == $CUSTOMIZE_TEXTFIELD} + + {/if} + {/foreach} + + + + + + {/foreach} - - - - - - {/foreach} {/if}