From 7fa38c9fbc39449409be82eef8459b3aaacac784 Mon Sep 17 00:00:00 2001 From: bMancone Date: Mon, 16 Jan 2012 11:34:46 +0000 Subject: [PATCH] // #PSTEST-473 Fixed OrderHistory --- classes/order/OrderHistory.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php index 59df291bd..b210bc2e3 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -122,7 +122,11 @@ class OrderHistoryCore extends ObjectModel ($new_os->id == Configuration::get('PS_OS_ERROR') || $new_os->id == Configuration::get('PS_OS_CANCELED'))) StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int)$product['product_quantity'], $order->id_shop); } + // if waiting for payment => payment error/canceled + else if (!$new_os->logable && !$old_os->logable && + ($new_os->id == Configuration::get('PS_OS_ERROR') || $new_os->id == Configuration::get('PS_OS_CANCELED'))) + StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int)$product['product_quantity'], $order->id_shop); // @since 1.5.0 : if the order is being shipped and this products uses the advanced stock management : // decrements the physical stock using $id_warehouse if ($new_os->shipped == 1 && $old_os->shipped == 0 &&