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

[-] BO : fixed bug #PSCFV-2503 - fix issue on stock update when product line edition in order

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15566 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2012-05-21 18:04:07 +00:00
parent e70fbf89dc
commit 545abdbc24
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+7 -2
View File
@@ -1272,7 +1272,7 @@ class AdminOrdersControllerCore extends AdminController
'currencies' => Currency::getCurrencies(),
'previousOrder' => $order->getPreviousOrderId(),
'nextOrder' => $order->getNextOrderId(),
'currentIndex' => self::$currentIndex,
'current_index' => self::$currentIndex,
'carrierModuleCall' => $carrier_module_call,
'iso_code_lang' => $this->context->language->iso_code,
'id_lang' => $this->context->language->id,
@@ -1631,7 +1631,7 @@ class AdminOrdersControllerCore extends AdminController
'invoices_collection' => $invoice_collection,
'current_id_lang' => Context::getContext()->language->id,
'link' => Context::getContext()->link,
'currentIndex' => self::$currentIndex
'current_index' => self::$currentIndex
));
die(Tools::jsonEncode(array(
@@ -1767,6 +1767,8 @@ class AdminOrdersControllerCore extends AdminController
$res &= $order->update();
}
$old_quantity = $order_detail->product_quantity;
$order_detail->product_quantity = $product_quantity;
// Save order detail
$res &= $order_detail->update();
@@ -1782,6 +1784,9 @@ class AdminOrdersControllerCore extends AdminController
$product['amount_refundable'] = $product['total_price_tax_incl'] - $resume['amount_tax_incl'];
$product['amount_refund'] = Tools::displayPrice($resume['amount_tax_incl']);
// Update product available quantity
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], ($old_quantity - $product['product_quantity']), $order->id_shop);
// Get invoices collection
$invoice_collection = $order->getInvoicesCollection();