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

// StockManager : changed prototypes in interface & fixed its implementation

Browse Source
This commit is contained in:
bMancone
2011-10-12 13:45:55 +00:00
parent e72818732b
commit 1cae2a0cf1
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockManager.php
+27 -16
View File
@@ -46,7 +46,7 @@ class StockManagerCore implements StockManagerInterface
*/ */
public function addProduct($id_product, public function addProduct($id_product,
$id_product_attribute = 0, $id_product_attribute = 0,
$warehouse, Warehouse $warehouse,
$quantity, $quantity,
$id_stock_mvt_reason, $id_stock_mvt_reason,
$price_te, $price_te,
@@ -103,7 +103,7 @@ class StockManagerCore implements StockManagerInterface
'physical_quantity' => ($stock->physical_quantity + $quantity), 'physical_quantity' => ($stock->physical_quantity + $quantity),
'price_te' => $current_wa, 'price_te' => $current_wa,
'usable_quantity' => ($is_usable ? ($stock->usable_quantity + $quantity) : $stock->usable_quantity), 'usable_quantity' => ($is_usable ? ($stock->usable_quantity + $quantity) : $stock->usable_quantity),
'id_warehouse' => $warehouse->id 'id_warehouse' => $warehouse->id,
); );
// saves stock in warehouse // saves stock in warehouse
@@ -162,7 +162,8 @@ class StockManagerCore implements StockManagerInterface
'physical_quantity' => $quantity, 'physical_quantity' => $quantity,
'price_te' => round($price_te, 6), 'price_te' => round($price_te, 6),
'usable_quantity' => ($is_usable ? $quantity : 0), 'usable_quantity' => ($is_usable ? $quantity : 0),
'id_warehouse' => $warehouse->id 'id_warehouse' => $warehouse->id,
'id_currency' => (int)Configuration::get('PS_CURRENCY_DEFAULT')
); );
// saves stock in warehouse // saves stock in warehouse
@@ -185,7 +186,7 @@ class StockManagerCore implements StockManagerInterface
*/ */
public function removeProduct($id_product, public function removeProduct($id_product,
$id_product_attribute = null, $id_product_attribute = null,
$warehouse, Warehouse $warehouse,
$quantity, $quantity,
$id_stock_mvt_reason, $id_stock_mvt_reason,
$is_usable = true, $is_usable = true,
@@ -240,6 +241,9 @@ class StockManagerCore implements StockManagerInterface
$stock_params = array( $stock_params = array(
'physical_quantity' => ($stock->physical_quantity - $quantity), 'physical_quantity' => ($stock->physical_quantity - $quantity),
'usable_quantity' => ($is_usable ? ($stock->usable_quantity - $quantity) : $stock->usable_quantity), 'usable_quantity' => ($is_usable ? ($stock->usable_quantity - $quantity) : $stock->usable_quantity),
'last_wa' => $stock->price_te,
'current_wa' => $stock->price_te,
'id_currency' => (int)Configuration::get('PS_CURRENCY_DEFAULT')
); );
// saves stock in warehouse // saves stock in warehouse
@@ -250,6 +254,10 @@ class StockManagerCore implements StockManagerInterface
$stock_mvt = new StockMvt(); $stock_mvt = new StockMvt();
$stock_mvt->hydrate($mvt_params); $stock_mvt->hydrate($mvt_params);
$stock_mvt->save(); $stock_mvt->save();
$return[$stock->id]['quantity'] = $quantity;
$return[$stock->id]['price_te'] = $stock->price_te;
break; break;
case 'LIFO': case 'LIFO':
@@ -358,6 +366,7 @@ class StockManagerCore implements StockManagerInterface
$stock_params = array( $stock_params = array(
'physical_quantity' => ($stock->physical_quantity - $total_quantity_for_current_stock), 'physical_quantity' => ($stock->physical_quantity - $total_quantity_for_current_stock),
'usable_quantity' => ($is_usable ? ($stock->usable_quantity - $total_quantity_for_current_stock) : $stock->usable_quantity), 'usable_quantity' => ($is_usable ? ($stock->usable_quantity - $total_quantity_for_current_stock) : $stock->usable_quantity),
'id_currency' => (int)Configuration::get('PS_CURRENCY_DEFAULT')
); );
$return[$stock->id]['quantity'] = $total_quantity_for_current_stock; $return[$stock->id]['quantity'] = $total_quantity_for_current_stock;
@@ -376,21 +385,21 @@ class StockManagerCore implements StockManagerInterface
/** /**
* @see StockManagerInterface::getProductPhysicalQuantities() * @see StockManagerInterface::getProductPhysicalQuantities()
*/ */
public function getProductPhysicalQuantities($id_product, $id_product_attribute, $warehouses_id = null, $usable = false) public function getProductPhysicalQuantities($id_product, $id_product_attribute, $id_warehouses = null, $usable = false)
{ {
$query = new DbQuery(); $query = new DbQuery();
$query->select('SUM('.($usable ? 's.usable_quantity' : 's.physical_quantity').')'); $query->select('SUM('.($usable ? 's.usable_quantity' : 's.physical_quantity').')');
$query->from('stock s'); $query->from('stock s');
$query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute); $query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute);
if (count($warehouses_id)) if (count($id_warehouses))
$query->where('s.id_warehouse IN('.implode(', ', $warehouses_id).')'); $query->where('s.id_warehouse IN('.implode(', ', $id_warehouses).')');
return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
} }
/** /**
* @see StockManagerInterface::getProductRealQuantities() * @see StockManagerInterface::getProductRealQuantities()
*/ */
public function getProductRealQuantities($id_product, $id_product_attribute, $warehouses_id = null, $usable = false) public function getProductRealQuantities($id_product, $id_product_attribute, $id_warehouses = null, $usable = false)
{ {
// Gets clients_orders_qty // Gets clients_orders_qty
$query = new DbQuery(); $query = new DbQuery();
@@ -403,7 +412,7 @@ class StockManagerCore implements StockManagerInterface
$clients_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); $clients_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
// Gets {physical OR usable}_qty // Gets {physical OR usable}_qty
$qty = $this->getProductPhysicalQuantities($id_product, $id_product_attribute, $warehouses_id, $usable); $qty = $this->getProductPhysicalQuantities($id_product, $id_product_attribute, $id_warehouses, $usable);
// Returns real_qty = qty - clients_orders_qty // Returns real_qty = qty - clients_orders_qty
// @TODO include suplliers orders in the calcul when they will be implemented // @TODO include suplliers orders in the calcul when they will be implemented
@@ -423,7 +432,7 @@ class StockManagerCore implements StockManagerInterface
$usable_to = true) $usable_to = true)
{ {
// Checks if this transfer is possible // Checks if this transfer is possible
if (getProductPhysicalQuantities($id_product, $id_product_attribute, array($id_warehouse_from), $usable_from) < $quantity) if ($this->getProductPhysicalQuantities($id_product, $id_product_attribute, array($id_warehouse_from), $usable_from) < $quantity)
return false; return false;
// Checks if the given warehouses are available // Checks if the given warehouses are available
@@ -434,13 +443,15 @@ class StockManagerCore implements StockManagerInterface
return false; return false;
// Removes from warehouse_from // Removes from warehouse_from
if (!count($stocks = $this->removeProduct($id_product, $stocks = $this->removeProduct($id_product,
$id_product_attribute, $id_product_attribute,
$warehouse_from, $warehouse_from,
$quantity, $quantity,
$id_stock_mvt_reason, $id_stock_mvt_reason,
$is_usable_from))) $usable_from);
if (!count($stocks))
return false; return false;
// Adds in warehouse_to // Adds in warehouse_to
foreach ($stocks as $stock) foreach ($stocks as $stock)
{ {
classes/stock/StockManagerInterface.php
+10 -10
View File
@@ -49,10 +49,10 @@ interface StockManagerInterface
* @param int $id_stock_movement_reason * @param int $id_stock_movement_reason
* @param float $price_te * @param float $price_te
* @param bool $is_usable * @param bool $is_usable
* @param int $id_supplier_order Optionnal * @param int $id_supplier_order optionnal
* @return bool * @return bool
*/ */
public function addProduct($id_product, $id_product_attribute, $warehouse, $quantity, $id_stock_movement_reason, $price_te, $is_usable, $id_supplier_order = null); public function addProduct($id_product, $id_product_attribute, Warehouse $warehouse, $quantity, $id_stock_movement_reason, $price_te, $is_usable, $id_supplier_order = null);
/** /**
* For a given product, removes a given quantity * For a given product, removes a given quantity
@@ -64,20 +64,20 @@ interface StockManagerInterface
* @param int $id_stock_movement_reason * @param int $id_stock_movement_reason
* @param bool $is_usable * @param bool $is_usable
* @param int $id_order Optionnal * @param int $id_order Optionnal
* @return array - empty if an error occured, details of removed products quantities with corresponding prices otherwise * @return array - empty if an error occured | details of removed products quantities with corresponding prices otherwise
*/ */
public function removeProduct($id_product, $id_product_attribute, $warehouse, $quantity, $id_stock_movement_reason, $is_usable, $id_order = null); public function removeProduct($id_product, $id_product_attribute, Warehouse $warehouse, $quantity, $id_stock_movement_reason, $is_usable, $id_order = null);
/** /**
* For a given product, returns its physical quantity * For a given product, returns its physical quantity
* *
* @param int $id_product * @param int $id_product
* @param int $id_product_attribute * @param int $id_product_attribute
* @param array $warehouses_id Optional * @param array|int $id_warehouses optional
* @param bool $usable false default - in this case we retrieve all physical quantities, otherwise we retrieve physical quantities flagged as usable * @param bool $usable false default - in this case we retrieve all physical quantities, otherwise we retrieve physical quantities flagged as usable
* @return int * @return int
*/ */
public function getProductPhysicalQuantities($id_product, $id_product_attribute, $warehouses_id = null, $usable = false); public function getProductPhysicalQuantities($id_product, $id_product_attribute, $id_warehouses = null, $usable = false);
/** /**
* For a given product, returns its real quantity * For a given product, returns its real quantity
@@ -86,11 +86,11 @@ interface StockManagerInterface
* *
* @param int $id_product * @param int $id_product
* @param int $id_product_attribute * @param int $id_product_attribute
* @param array|int $warehouses_id optional
* @param bool $usable false by default * @param bool $usable false by default
* @param array $warehouses_id Optional
* @return int * @return int
*/ */
public function getProductRealQuantities($id_product, $id_product_attribute, $warehouses_id = null, $usable = false); public function getProductRealQuantities($id_product, $id_product_attribute, $id_warehouses = null, $usable = false);
/** /**
* For a given product, transfers quantities between two warehouses * For a given product, transfers quantities between two warehouses
@@ -102,8 +102,8 @@ interface StockManagerInterface
* @param int $id_product_attribute * @param int $id_product_attribute
* @param int $quantity * @param int $quantity
* @param int $id_stock_movement_reason * @param int $id_stock_movement_reason
* @param Warehouse $warehouse_from * @param int $warehouse_from
* @param Warehouse $warehouse_to * @param int $warehouse_to
* @param bool $usable_from true by default * @param bool $usable_from true by default
* @param bool $usable_to true by default * @param bool $usable_to true by default
* @return bool * @return bool