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

// Interface: typo. Manager: Physical & Real Quantities + transfer between warehouses

Browse Source
This commit is contained in:
bMancone
2011-10-10 16:22:45 +00:00
parent aa05d2d620
commit 827751e120
2 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockManager.php
+57 -7
View File
@@ -394,7 +394,13 @@ class StockManagerCore implements StockManagerInterface
*/
public function getProductPhysicalQuantities($id_product, $id_product_attribute, $warehouses_id = null, $usable = false)
{
$query = new DbQuery();
$query->select('SUM('.($usable ? 's.usable_quantity' : 's.physical_quantity').')');
$query->from('stock s');
$query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute);
if (count($warehouses_id))
$query->where('s.id_warehouse IN('.implode(', ', $warehouses_id).')');
return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
}
/**
@@ -402,7 +408,20 @@ class StockManagerCore implements StockManagerInterface
*/
public function getProductRealQuantities($id_product, $id_product_attribute, $warehouses_id = null, $usable = false)
{
// Gets clients_orders_qty
$query = new DbQuery();
$query->select('SUM(od.product_quantity)');
$query->from('order_detail od');
$query->leftjoin('orders o ON o.id_order = od.id_order');
$query->where('od.product_id = '.(int)$id_product.' AND od.product_attribute_id = '.(int)$id_product_attribute);
$query->where('o.delivery_number = 0');
$clients_orders_qty = (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
// Gets {physical OR usable}_qty
$qty = $this->getProductPhysicalQuantities($id_product, $id_product_attribute, $warehouses_id, $usable);
// Returns real_qty = qty - clients_orders_qty
return ($qty - $clients_orders_qty);
}
/**
@@ -411,12 +430,44 @@ class StockManagerCore implements StockManagerInterface
public function transferBetweenWarehouses($id_product,
$id_product_attribute,
$quantity,
$id_stock_movement_reason,
$id_warehouse_from,
$id_warehouse_to,
$usable_from = true,
$usable_to = true)
{
// Checks if this transfer is possible
if (getProductPhysicalQuantities($id_product, $id_product_attribute, array($id_warehouse_from), $usable_from) < $quantity)
return false;
// Checks if the given warehouses are available
$warehouse_from = new Warehouse($id_warehouse_from);
$warehouse_to = new Warehouse($id_warehouse_to);
if (!Validate::isLoadedObject($warehouse_from) ||
!Validate::isLoadedObject($warehouse_to))
return false;
// Removes from warehouse_from
if (!count($stocks = $this->removeProduct($id_product,
$id_product_attribute,
$warehouse_from,
$quantity,
$id_stock_movement_reason,
$is_usable_from)))
return false;
// Adds in warehouse_to
foreach ($stocks as $stock)
{
if (!$this->addProduct($id_product,
$id_product_attribute,
$warehouse_to,
$stock['quantity'],
$id_stock_movement_reason,
$stock['price_te'],
$usable_to))
return false;
}
return true;
}
/**
@@ -446,15 +497,14 @@ class StockManagerCore implements StockManagerInterface
$query = new DbQuery();
$query->select('s.id_stock, s.physical_quantity, s.usable_quantity, s.price_te');
$query->from('stock s');
$query->where('id_product = '.(int)$id_product.' AND id_product_attribute = '.(int)$id_product_attribute);
if ($id_warehouse != null)
$query->where('id_warehouse = '.(int)$id_warehouse);
if ($price_te != null)
$query->where('price_te = '.(float)$price_te);
$query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute);
if ($id_warehouse)
$query->where('s.id_warehouse = '.(int)$id_warehouse);
if ($price_te)
$query->where('s.price_te = '.(float)$price_te);
$results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
return ObjectModel::hydrateCollection('Stock', $results);
}
}
classes/stock/StockManagerInterface.php
+6 -5
View File
@@ -46,13 +46,13 @@ interface StockManagerInterface
* @param int id_product_attribute
* @param Warehouse $warehouse
* @param int $quantity
* @param int $id_stock_mouvement_reason
* @param int $id_stock_movement_reason
* @param float $price_te
* @param bool $is_usable
* @param int $id_supplier_order Optionnal
* @return bool
*/
public function addProduct($id_product, $id_product_attribute, $warehouse, $quantity, $id_stock_mouvement_reason, $price_te, $is_usable, $id_supplier_order = null);
public function addProduct($id_product, $id_product_attribute, $warehouse, $quantity, $id_stock_movement_reason, $price_te, $is_usable, $id_supplier_order = null);
/**
* For a given product, removes a given quantity
@@ -61,12 +61,12 @@ interface StockManagerInterface
* @param int id_product_attribute
* @param Warehouse $warehouse
* @param int $quantity
* @param int $id_stock_mouvement_reason
* @param int $id_stock_movement_reason
* @param bool $is_usable
* @param int $id_order Optionnal
* @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_mouvement_reason, $is_usable, $id_order = null);
public function removeProduct($id_product, $id_product_attribute, $warehouse, $quantity, $id_stock_movement_reason, $is_usable, $id_order = null);
/**
* For a given product, returns its physical quantity
@@ -101,12 +101,13 @@ interface StockManagerInterface
* @param int $id_product
* @param int $id_product_attribute
* @param int $quantity
* @param int $id_stock_movement_reason
* @param Warehouse $warehouse_from
* @param Warehouse $warehouse_to
* @param bool $usable_from true by default
* @param bool $usable_to true by default
* @return bool
*/
public function transferBetweenWarehouses($id_product, $id_product_attribute, $quantity, $warehouse_from, $warehouse_to, $usable_from = true, $usable_to = true);
public function transferBetweenWarehouses($id_product, $id_product_attribute, $quantity, $id_stock_movement_reason, $warehouse_from, $warehouse_to, $usable_from = true, $usable_to = true);
}