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

[-] Core: Fix PSCFV-3092

Browse Source
This commit is contained in:
rGaillard
2012-08-03 14:40:31 +00:00
parent 2ad34b2c88
commit ae5acf0be9
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderHistory.php
+4 -4
View File
@@ -111,11 +111,11 @@ class OrderHistoryCore extends ObjectModel
// @since 1.5.0 - Stock Management
if (!Pack::isPack($product['product_id']) &&
($old_os->id == Configuration::get('PS_OS_ERROR') || $old_os->id == Configuration::get('PS_OS_CANCELED')) &&
!StockAvailable::dependsOnStock($product['id_product']))
!StockAvailable::dependsOnStock($product['id_product'], (int)$order->id_shop))
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], -(int)$product['product_quantity'], $order->id_shop);
}
// if becoming unlogable => removes sale
else if (!$new_os->logable && $old_os->logable)
elseif (!$new_os->logable && $old_os->logable)
{
ProductSale::removeProductSale($product['product_id'], $product['product_quantity']);
@@ -126,7 +126,7 @@ class OrderHistoryCore extends ObjectModel
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 &&
elseif (!$new_os->logable && !$old_os->logable &&
($new_os->id == Configuration::get('PS_OS_ERROR') || $new_os->id == Configuration::get('PS_OS_CANCELED')) &&
!StockAvailable::dependsOnStock($product['id_product']))
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int)$product['product_quantity'], $order->id_shop);
@@ -153,7 +153,7 @@ class OrderHistoryCore extends ObjectModel
);
}
// @since.1.5.0 : if the order was shipped, and is not anymore, we need to restock products
else if ($new_os->shipped == 0 && $old_os->shipped == 1 &&
elseif ($new_os->shipped == 0 && $old_os->shipped == 1 &&
Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') &&
Warehouse::exists($product['id_warehouse']) &&
$manager != null &&