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

// Orders : fixed stock (available quantity & Stock)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-12-21 14:24:34 +00:00
parent 8742c90560
commit 0d0f43f783
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+1 -1
View File
@@ -1362,7 +1362,7 @@ class CartCore extends ObjectModel
if ($stock_management_active && (int)$product['advanced_stock_management'] == 1) if ($stock_management_active && (int)$product['advanced_stock_management'] == 1)
{ {
$warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute'], $this->id_shop); $warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute'], $this->id_shop);
if (count($warehouse_list) == 0) if (count($warehouse_list) == 0)
$warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute']); $warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute']);
// Does the product is in stock ? // Does the product is in stock ?
// If yes, get only warehouse where the product is in stock // If yes, get only warehouse where the product is in stock
classes/order/OrderHistory.php
+5 -7
View File
@@ -85,8 +85,6 @@ class OrderHistoryCore extends ObjectModel
&& $oldOrderStatus->logable)) && $oldOrderStatus->logable))
{ {
ProductSale::addProductSale($product['product_id'], $product['product_quantity']); ProductSale::addProductSale($product['product_id'], $product['product_quantity']);
// @since 1.5.0
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], -(int)$product['product_quantity'], $order->id_shop);
} }
/* If becoming unlogable => removing sale */ /* If becoming unlogable => removing sale */
else if (!$newOS->logable else if (!$newOS->logable
@@ -95,7 +93,8 @@ class OrderHistoryCore extends ObjectModel
{ {
ProductSale::removeProductSale($product['product_id'], $product['product_quantity']); ProductSale::removeProductSale($product['product_id'], $product['product_quantity']);
// @since 1.5.0 // @since 1.5.0
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int)$product['product_quantity'], $order->id_shop); if ($newOS->id == Configuration::get('PS_OS_ERROR') || $newOS->id == Configuration::get('PS_OS_CANCELED'))
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int)$product['product_quantity'], $order->id_shop);
} }
if ((!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') || (int)$product['advanced_stock_management'] != 1) if ((!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') || (int)$product['advanced_stock_management'] != 1)
@@ -113,8 +112,7 @@ class OrderHistoryCore extends ObjectModel
&& $oldOrderStatus instanceof OrderState && $oldOrderStatus instanceof OrderState
&& $oldOrderStatus->shipped == 0 && $oldOrderStatus->shipped == 0
&& Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
&& (int)$product['advanced_stock_management'] == 1 && (int)$product['advanced_stock_management'] == 1)
)
{ {
$manager = StockManagerFactory::getManager(); $manager = StockManagerFactory::getManager();
$warehouse = new Warehouse($product['id_warehouse']); $warehouse = new Warehouse($product['id_warehouse']);
@@ -142,12 +140,12 @@ class OrderHistoryCore extends ObjectModel
) )
{ {
$manager = StockManagerFactory::getManager(); $manager = StockManagerFactory::getManager();
$mvts = StockMvt::getNegativeStockMvts($order->id, $product['product_id'], $product['product_attribute_id'], $product['cart_quantity']); $mvts = StockMvt::getNegativeStockMvts($order->id, $product['product_id'], $product['product_attribute_id'], $product['product_quantity']);
foreach ($mvts as $mvt) foreach ($mvts as $mvt)
{ {
$manager->addProduct( $manager->addProduct(
$product['product_id'], $product['product_id'],
$product['id_product_attribute'], $product['product_attribute_id'],
new Warehouse($mvt['id_warehouse']), new Warehouse($mvt['id_warehouse']),
$mvt['physical_quantity'], $mvt['physical_quantity'],
null, null,
classes/stock/StockAvailable.php
-1
View File
@@ -140,7 +140,6 @@ class StockAvailableCore extends ObjectModel
foreach ($ids_product_attribute as $id_product_attribute) foreach ($ids_product_attribute as $id_product_attribute)
{ {
$quantity = $manager->getProductRealQuantities($id_product, $id_product_attribute, $warehouses, true); $quantity = $manager->getProductRealQuantities($id_product, $id_product_attribute, $warehouses, true);
$query = array( $query = array(
'table' => _DB_PREFIX_.'stock_available', 'table' => _DB_PREFIX_.'stock_available',
'data' => array('quantity' => $quantity), 'data' => array('quantity' => $quantity),
classes/stock/StockManager.php
+4 -3
View File
@@ -465,9 +465,10 @@ class StockManagerCore implements StockManagerInterface
$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.date_add = o.date_upd');
$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'); $query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').'
// @FIXME: Once part-shipping is done, remove the comment on the line below. AND os.id_order_state != '.(int)Configuration::get('PS_OS_CANCELED').')');
// $query->where('o.id_warehouse IN (0, '.implode(', ', $ids_warehouse).')'); //if (count($ids_warehouse))
//$query->where('od.id_warehouse IN('.implode(', ', $ids_warehouse).')');
$client_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); $client_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
// Gets supply_orders_qty // Gets supply_orders_qty
controllers/admin/AdminWarehousesController.php
+2 -1
View File
@@ -165,7 +165,8 @@ class AdminWarehousesControllerCore extends AdminController
'size' => 40, 'size' => 40,
'maxlength' => 45, 'maxlength' => 45,
'required' => true, 'required' => true,
'desc' => $this->l('Name of this warehouse') 'desc' => $this->l('Name of this warehouse'),
'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:',
), ),
array( array(
'type' => 'text', 'type' => 'text',