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

[-] BO: Fix PSCFV-2994

Browse Source
This commit is contained in:
rGaillard
2012-08-01 14:43:44 +00:00
parent 4a432a9982
commit 01dfdf0f8a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+1 -1
View File
@@ -623,7 +623,7 @@ class OrderCore extends ObjectModel
&& (int)$product['id_warehouse'] > 0)
$product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], (int)$product['id_warehouse'], true);
else
$product['current_stock'] = '--';
$product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], (int)$this->id_shop);
}
/**
controllers/admin/AdminOrdersController.php
+3 -3
View File
@@ -1885,6 +1885,9 @@ class AdminOrdersControllerCore extends AdminController
if (isset($order_invoice))
$res &= $order_invoice->update();
// Update product available quantity
StockAvailable::updateQuantity($order_detail->product_id, $order_detail->product_attribute_id, ($old_quantity - $order_detail->product_quantity), $order->id_shop);
$products = $this->getProducts($order);
// Get the last product
$product = $products[$order_detail->id];
@@ -1893,9 +1896,6 @@ 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();