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

// Product : Update stock and quantities of current product for compatibility with new stock management system

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10184 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-11-16 17:31:45 +00:00
parent 4e159bf6b6
commit c58d04acc9
2 changed files with 52 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+50 -40
View File
@@ -331,6 +331,7 @@ class ProductCore extends ObjectModel
$this->tags = Tag::getProductTags((int)$this->id);
}
// By default, the product quantity correspond to the available quantity to sell in the current shop
$this->quantity = StockAvailable::getStockAvailableForProduct($id_product, 0, Context::getContext()->shop->getID());
$this->out_of_stock = $this->getOutOfStock();
$this->depends_on_stock = $this->getDependsOnStock();
@@ -606,7 +607,7 @@ class ProductCore extends ObjectModel
* Removes the product from StockAvailable, for the current shop
*/
$context = Context::getContext();
$id_shop = $context->shop->id;
$id_shop = $context->shop->getID();
StockAvailable::removeProductFromStockAvailable($this->id, null, $id_shop);
if (!GroupReduction::deleteProductReduction($this->id))
@@ -918,24 +919,23 @@ class ProductCore extends ObjectModel
/**
* addProductAttribute is deprecated
*
* The quantity params is now ignored
*
* @see StockManager if you want to manage real stock
* @see StockAvailable if you want to manage available quantities for sale on your shop(s)
*
* @deprecated
*/
public function addProductAttribute($price, $weight, $unit_impact, $ecotax, $quantity, $id_images, $reference, $supplier_reference, $ean13, $default, $location = NULL, $upc = NULL)
{
Tools::displayAsDeprecated();
$id_product_attribute = $this->addAttribute($price, $weight, $unit_impact, $ecotax, $id_images, $reference, $supplier_reference, $ean13, $default, $location, $upc);
if (!$id_product_attribute)
return false;
// @todo handle $quantity
/*
$stock_available = new StockAvailable(StockAvailable::getIdStockAvailable($this->id, $id_product_attribute));
if (!$stock_available->id)
{
$stock_available->id_product = $product->id;
$stock_available->id_product_attribute = Tools::getValue('id_product_attribute');
$stock_available->id_shop = Context::getContext()->shop->getID(true);
}
*/
return $id_product_attribute;
}
@@ -1125,6 +1125,8 @@ class ProductCore extends ObjectModel
*/
public function updateQuantityProductWithAttributeQuantity()
{
Tools::displayAsDeprecated();
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product`
SET `quantity` = IFNULL(
@@ -2105,7 +2107,7 @@ class ProductCore extends ObjectModel
}
/**
* Create JOIN query with 'stock' table
* Create JOIN query with 'stock_available' table
*
* @param string $productAlias Alias of product table
* @param string|int $productAttribute If string : alias of PA table ; if int : value of PA ; if null : nothing about PA
@@ -2201,15 +2203,23 @@ class ProductCore extends ObjectModel
}
/**
* Update available product quantities
*
* @deprecated since 1.5.0
*
* It's not possible to use this method with new stockManager and stockAvailable features
* Now this method do nothing
*
* @see StockManager if you want to manage real stock
* @see StockAvailable if you want to manage available quantities for sale on your shop(s)
*
* @param array $product Array with ordered product (quantity, id_product_attribute if applicable)
* @return mixed Query result
*/
public static function updateQuantity($product, $id_order = null)
{
Tools::displayAsDeprecated();
return false;
/*
if (!is_array($product))
die (Tools::displayError());
@@ -2230,13 +2240,25 @@ class ProductCore extends ObjectModel
$productObj = new Product((int)$product['id_product'], false, (int)Configuration::get('PS_LANG_DEFAULT'));
return $productObj->addStockMvt(-(int)$product['cart_quantity'], (int)_STOCK_MOVEMENT_ORDER_REASON_, (int)$product['id_product_attribute'], (int)$id_order, null);
*/
}
/**
* @deprecated since 1.5.0
*
* It's not possible to use this method with new stockManager and stockAvailable features
* Now this method do nothing
*
* @see StockManager if you want to manage real stock
* @see StockAvailable if you want to manage available quantities for sale on your shop(s)
*
*/
public static function reinjectQuantities(&$orderDetail, $quantity, Context $context = null)
{
Tools::displayAsDeprecated();
return false;
/*
if (!$context)
$context = Context::getContext();
if (!Validate::isLoadedObject($orderDetail))
@@ -2256,6 +2278,7 @@ class ProductCore extends ObjectModel
$orderDetail->product_quantity_reinjected += (int)($quantity);
return true;
*/
}
public static function isAvailableWhenOutOfStock($out_of_stock)
@@ -3268,13 +3291,18 @@ class ProductCore extends ObjectModel
/**
* Add a stock movement for current product
*
* Since 1.5, this method only permit to add/remove available quantities of the current product in the current shop
*
* @see StockManager if you want to manage real stock
* @see StockAvailable if you want to manage available quantities for sale on your shop(s)
*
* @deprecated since 1.5.0
*
* @param int $quantity
* @param int $id_reason
* @param int $id_reason - useless
* @param int $id_product_attribute
* @param int $id_order
* @param int $id_employee
* @param int $id_order - useless
* @param int $id_employee - useless
* @return bool
*/
public function addStockMvt($quantity, $id_reason, $id_product_attribute = null, $id_order = null, $id_employee = null)
@@ -3282,32 +3310,12 @@ class ProductCore extends ObjectModel
if (!$this->id)
return;
$reason = new StockMvtReason($id_reason);
if (!$reason->id)
return;
if ($id_product_attribute == null)
$id_product_attribute = 0;
// Update product stock
$quantity = abs((int)$quantity) * $reason->sign;
$this->setStock($quantity, $id_product_attribute, true);
// Add a new stock movement
$stockMvt = new StockMvt();
$stockMvt->id_stock = Stock::getStockId($this->id, $id_product_attribute, Context::getContext()->shop->getID(true));
$stockMvt->id_product = $this->id;
$stockMvt->id_product_attribute = (int)$id_product_attribute;
$stockMvt->id_order = (int)$id_order;
$stockMvt->id_employee = (int)$id_employee;
$stockMvt->quantity = $quantity;
$stockMvt->id_stock_mvt_reason = (int)$id_reason;
// adding stock mouvement, this action update the stock of product in database only
if ($stockMvt->add())
{
$this->quantity = $this->getStock();
Hook::exec('updateQuantity', array('product' => $this, 'order' => null));
return true;
}
return false;
return StockAvailable::updateQuantity($this->id, $id_product_attribute, $quantity, Context::getContext()->shop->getID());
}
/**
@@ -3315,6 +3323,8 @@ class ProductCore extends ObjectModel
*/
public function getStockMvts($id_lang)
{
Tools::displayAsDeprecated();
return Db::getInstance()->executeS('
SELECT sm.id_stock_mvt, sm.date_add, sm.quantity, sm.id_order,
CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) product_name, CONCAT(e.lastname, \' \', e.firstname) employee, mrl.name reason
classes/stock/StockMvt.php
+2 -43
View File
@@ -183,52 +183,11 @@ class StockMvtCore extends ObjectModel
/**
* @deprecated since 1.5.0
*
* This method no longer exists, and have no equivalent because of the missing movements have to be handle by inventories on real stock.
*/
public static function addMissingMvt($id_employee)
{
Tools::displayAsDeprecated();
/*
// Search missing stock movement on products without attributes
$sql = 'SELECT s.id_stock, (stock.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty
FROM '._DB_PREFIX_.'product p
'.Product::sqlStock('p', null, true).'
LEFT JOIN '._DB_PREFIX_.'stock_mvt sm ON s.id_stock = sm.id_stock
WHERE (
SELECT COUNT(*) FROM '._DB_PREFIX_.'stock s2
WHERE s2.id_product = p.id_product
AND s2.id_product_attribute > 0
) = 0
GROUP BY s.id_product, s.id_shop
HAVING qty <> 0';
$products_without_attributes = Db::getInstance()->executeS($sql);
// Search missing stock movement on products with attributes
$sql = 'SELECT s.id_stock, (stock.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty
FROM '._DB_PREFIX_.'product_attribute pa
'.Product::sqlStock('pa', 'pa', true).'
LEFT JOIN '._DB_PREFIX_.'stock_mvt sm ON s.id_stock = sm.id_stock
WHERE s.id_product_attribute > 0
AND (
SELECT COUNT(*) FROM '._DB_PREFIX_.'stock s2
WHERE s2.id_product = pa.id_product
AND s2.id_product_attribute > 0
) > 0
GROUP BY s.id_product_attribute
HAVING qty <> 0';
$products_with_attributes = Db::getInstance()->executeS($sql);
// Add missing stock movements
$products = array_merge($products_without_attributes, $products_with_attributes);
if ($products)
foreach ($products as $product)
{
$mvt = new StockMvt();
$mvt->id_stock = $product['id_stock'];
$mvt->id_employee = (int)$id_employee;
$mvt->quantity = $product['qty'];
$mvt->id_stock_mvt_reason = _STOCK_MOVEMENT_MISSING_REASON_;
$mvt->add();
}
*/
}
}