From f6a6177e2a7e6f14e34f6336cf4bfb677babfc00 Mon Sep 17 00:00:00 2001 From: bMancone Date: Mon, 12 Dec 2011 15:39:48 +0000 Subject: [PATCH] // OrderHistory: fixed synchronize/updateQuantity conflits --- classes/order/OrderHistory.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php index 669aaea1f..c48368886 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -124,6 +124,7 @@ class OrderHistoryCore extends ObjectModel { $manager = StockManagerFactory::getManager(); $warehouse = new Warehouse($id_warehouse); + $depends = $mvts = StockMvt::getNegativeStockMvts($order->id, $product['id_product'], $product['id_product_attribute'], $product['cart_quantity']); foreach ($mvts as $mvt) @@ -138,7 +139,11 @@ class OrderHistoryCore extends ObjectModel true ); } - StockAvailable::synchronize($product['id_product']); + + if (StockAvailable::dependsOnStock($product['id_product'], $order->id_shop)) + StockAvailable::synchronize($product['id_product']); + else + StockAvailable::updateQuantity($product['id_product'], $product['id_product_attribute'], (int)$product['cart_quantity'], $order->id_shop); } }