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

[-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time

Browse Source
This commit is contained in:
Rémi Gaillard
2013-02-04 19:54:14 +01:00
parent a9106be306
commit fdf7eeb629
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockManager.php
+2 -2
View File
@@ -473,7 +473,7 @@ class StockManagerCore implements StockManagerInterface
$query->where('od.product_id = '.(int)$id_product); $query->where('od.product_id = '.(int)$id_product);
if (0 != $id_product_attribute) if (0 != $id_product_attribute)
$query->where('od.product_attribute_id = '.(int)$id_product_attribute); $query->where('od.product_attribute_id = '.(int)$id_product_attribute);
$query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.date_add = o.date_upd'); $query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.id_order_state = o.current_state');
$query->leftJoin('order_state', 'os', 'os.id_order_state = oh.id_order_state'); $query->leftJoin('order_state', 'os', 'os.id_order_state = oh.id_order_state');
$query->where('os.shipped != 1'); $query->where('os.shipped != 1');
$query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').' $query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').'
@@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface
return $stocks; return $stocks;
} }
} }