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

[-] BO: Fix stock when combinations are removed.

Browse Source
This commit is contained in:
Dinis Lage
2013-11-16 12:36:38 +00:00
parent 7f02c8ca58
commit f83c22281b
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/stock/StockAvailable.php
View File

@@ -108,6 +108,10 @@ class StockAvailableCore extends ObjectModel
public static function getStockAvailableIdByProductId($id_product, $id_product_attribute = null, $id_shop = null)
{
// if null, it's a product without attributes
if ($id_product_attribute === null)
$id_product_attribute = 0;
if (!Validate::isUnsignedId($id_product))
return false;
@@ -115,9 +119,7 @@ class StockAvailableCore extends ObjectModel
$query->select('id_stock_available');
$query->from('stock_available');
$query->where('id_product = '.(int)$id_product);
if ($id_product_attribute !== null)
$query->where('id_product_attribute = '.(int)$id_product_attribute);
$query->where('id_product_attribute = '.(int)$id_product_attribute);
$query = StockAvailable::addSqlShopRestriction($query, $id_shop);
return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
@@ -172,7 +174,7 @@ class StockAvailableCore extends ObjectModel
if ($order_id_shop != null && !count(array_intersect($allowed_warehouse_for_product_clean, $order_warehouses)))
continue;
$product_quantity = $manager->getProductRealQuantities($id_product, null, $allowed_warehouse_for_product_clean, true);
$product_quantity = $manager->getProductRealQuantities($id_product, 0, $allowed_warehouse_for_product_clean, true);
Hook::exec('actionUpdateQuantity',
array(

11
classes/stock/StockManager.php
View File

@@ -423,6 +423,10 @@ class StockManagerCore implements StockManagerInterface
*/
public function getProductPhysicalQuantities($id_product, $id_product_attribute, $ids_warehouse = null, $usable = false)
{
// if null, it's a product without attributes
if ($id_product_attribute === null)
$id_product_attribute = 0;
if (!is_null($ids_warehouse))
{
// in case $ids_warehouse is not an array
@@ -441,8 +445,7 @@ class StockManagerCore implements StockManagerInterface
$query->select('SUM('.($usable ? 's.usable_quantity' : 's.physical_quantity').')');
$query->from('stock', 's');
$query->where('s.id_product = '.(int)$id_product);
if (0 != $id_product_attribute)
$query->where('s.id_product_attribute = '.(int)$id_product_attribute);
$query->where('s.id_product_attribute = '.(int)$id_product_attribute);
if (count($ids_warehouse))
$query->where('s.id_warehouse IN('.implode(', ', $ids_warehouse).')');
@@ -455,6 +458,10 @@ class StockManagerCore implements StockManagerInterface
*/
public function getProductRealQuantities($id_product, $id_product_attribute, $ids_warehouse = null, $usable = false)
{
// if null, it's a product without attributes
if ($id_product_attribute === null)
$id_product_attribute = 0;
if (!is_null($ids_warehouse))
{
// in case $ids_warehouse is not an array