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

// Stock : fixed bugs on cover/instant state/warehouse/management

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10150 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-11-15 18:19:27 +00:00
parent 03823bc17d
commit 8931216544
11 changed files with 167 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockCoverController.php
+35 -16
View File
@@ -53,6 +53,12 @@ class AdminStockCoverControllerCore extends AdminController
'width' => 100,
'filter_key' => 'a!ean13'
),
'upc' => array(
'title' => $this->l('UPC'),
'align' => 'center',
'width' => 100,
'filter_key' => 'a!upc'
),
'name' => array(
'title' => $this->l('Name'),
'filter_key' => 'b!name'
@@ -99,24 +105,32 @@ class AdminStockCoverControllerCore extends AdminController
{
$this->lang = false;
$lang_id = (int)$this->context->language->id;
$product_id = (int)Tools::getValue('id');
$id_product = (int)Tools::getValue('id');
$period = (Tools::getValue('period') ? (int)Tools::getValue('period') : 7);
$warehouse = (Tools::getValue('id_warehouse') ? (int)Tools::getValue('id_warehouse') : -1);
$query = '
SELECT a.id_product_attribute as id, a.id_product, a.reference, a.ean13,
IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(agl.`name`, \' - \', al.name SEPARATOR \', \')),pl.name) as name,
IFNULL(s.physical_quantity, 0) as stock
FROM '._DB_PREFIX_.'product_attribute a
INNER JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = a.id_product AND pl.id_lang = '.$lang_id.')
LEFT JOIN '._DB_PREFIX_.'product_attribute_combination pac ON (pac.id_product_attribute = a.id_product_attribute)
LEFT JOIN '._DB_PREFIX_.'attribute atr ON (atr.id_attribute = pac.id_attribute)
LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON (al.id_attribute = atr.id_attribute AND al.id_lang = '.$lang_id.')
LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$lang_id.')
INNER JOIN '._DB_PREFIX_.'stock s ON (a.id_product_attribute = s.id_product_attribute)
WHERE a.id_product = '.$product_id.
($warehouse != -1 ? ' AND s.id_warehouse = '.(int)$warehouse : ' ').'
GROUP BY a.id_product_attribute';
$query = new DbQuery();
$query->select('pa.id_product_attribute as id, pa.id_product, stock_view.reference, stock_view.ean13,
stock_view.upc, stock_view.usable_quantity as stock,
IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(agl.`name`, \' - \', al.name SEPARATOR \', \')),pl.name) as name');
$query->from('product_attribute pa
INNER JOIN
(
SELECT SUM(s.usable_quantity) as usable_quantity, s.id_product_attribute, s.reference, s.ean13, s.upc
FROM '._DB_PREFIX_.'stock s
WHERE s.id_product = '.($id_product).'
GROUP BY s.id_product_attribute
)
stock_view ON (stock_view.id_product_attribute = pa.id_product_attribute)');
$query->innerJoin('product_lang pl ON (pl.id_product = pa.id_product AND pl.id_lang = '.$lang_id.')');
$query->leftJoin('product_attribute_combination pac ON (pac.id_product_attribute = pa.id_product_attribute)');
$query->leftJoin('attribute atr ON (atr.id_attribute = pac.id_attribute)');
$query->leftJoin('attribute_lang al ON (al.id_attribute = atr.id_attribute AND al.id_lang = '.$lang_id.')');
$query->leftJoin('attribute_group_lang agl ON (agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$lang_id.')');
$query->where('pa.id_product = '.$id_product);
if ($warehouse != -1)
$query->where('s.id_warehouse = '.(int)$warehouse);
$query->groupBy('pa.id_product_attribute');
$datas = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
foreach ($datas as &$data)
@@ -145,7 +159,7 @@ class AdminStockCoverControllerCore extends AdminController
$this->list_no_link = true;
// query
$this->_select = 'a.id_product as id, COUNT(pa.id_product_attribute) as variations, s.physical_quantity as stock';
$this->_select = 'a.id_product as id, COUNT(pa.id_product_attribute) as variations, SUM(s.usable_quantity) as stock';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.id_product = a.id_product)
INNER JOIN `'._DB_PREFIX_.'stock` s ON (s.id_product = a.id_product)';
if ($this->getCurrentCoverageWarehouse() != -1)
@@ -195,7 +209,12 @@ class AdminStockCoverControllerCore extends AdminController
$this->addRowActionSkipList('details', array($item['id']));
}
else
{
$item['stock'] = 'See details';
$item['reference'] = '--';
$item['ean13'] = '--';
$item['upc'] = '--';
}
}
}
controllers/admin/AdminStockInstantStateController.php
+43 -94
View File
@@ -35,9 +35,9 @@ class AdminStockInstantStateControllerCore extends AdminController
public function __construct()
{
$this->context = Context::getContext();
$this->table = 'product';
$this->className = 'Product';
$this->lang = true;
$this->table = 'stock';
$this->className = 'Stock';
$this->lang = false;
$this->fieldsDisplay = array(
'reference' => array(
@@ -50,14 +50,19 @@ class AdminStockInstantStateControllerCore extends AdminController
'align' => 'center',
'width' => 100,
),
'upc' => array(
'title' => $this->l('UPC'),
'align' => 'center',
'width' => 100,
),
'name' => array(
'title' => $this->l('Name'),
'filter_key' => 'b!name'
'havingFilter' => true
),
'price_te' => array(
'title' => $this->l('Price (te)'),
'width' => 150,
'orderby' => false,
'orderby' => true,
'search' => false,
'type' => 'price',
'currency' => true,
@@ -65,19 +70,19 @@ class AdminStockInstantStateControllerCore extends AdminController
'physical_quantity' => array(
'title' => $this->l('Physical quantity'),
'width' => 80,
'orderby' => false,
'orderby' => true,
'search' => false
),
'usable_quantity' => array(
'title' => $this->l('Usable quantity'),
'width' => 80,
'orderby' => false,
'orderby' => true,
'search' => false,
),
'real_quantity' => array(
'title' => $this->l('Real quantity'),
'width' => 80,
'orderby' => false,
'orderby' => true,
'search' => false,
'hint' => $this->l('Pysical qty,
in combination with the quantity you ordered (atm) from your supplier,
@@ -91,61 +96,6 @@ class AdminStockInstantStateControllerCore extends AdminController
parent::__construct();
}
/**
* Method called when an ajax request is made
* @see AdminController::postProcess()
*/
public function ajaxProcess()
{
if (Tools::isSubmit('id')) // if a product id is submit
{
$this->lang = false;
$lang_id = (int)$this->context->language->id;
$id_product = (int)Tools::getValue('id');
$warehouse = (Tools::getValue('id_warehouse') ? (int)Tools::getValue('id_warehouse') : -1);
$query = '
SELECT a.id_product_attribute as id, a.id_product, a.reference, a.ean13,
IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(agl.`name`, \' - \', al.name SEPARATOR \', \')),pl.name) as name,
IFNULL(s.physical_quantity, 0) as physical_quantity,
IFNULL(s.usable_quantity, 0) as usable_quantity,
s.price_te,
w.id_currency as id_currency
FROM '._DB_PREFIX_.'product_attribute a
INNER JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = a.id_product AND pl.id_lang = '.$lang_id.')
LEFT JOIN '._DB_PREFIX_.'product_attribute_combination pac ON (pac.id_product_attribute = a.id_product_attribute)
LEFT JOIN '._DB_PREFIX_.'attribute atr ON (atr.id_attribute = pac.id_attribute)
LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON (al.id_attribute = atr.id_attribute AND al.id_lang = '.$lang_id.')
LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$lang_id.')
INNER JOIN '._DB_PREFIX_.'stock s ON (a.id_product_attribute = s.id_product_attribute)
LEFT JOIN `'._DB_PREFIX_.'warehouse` w ON (w.id_warehouse = s.id_warehouse)
WHERE a.id_product = '.$id_product.
($warehouse != -1 ? ' AND s.id_warehouse = '.(int)$warehouse : ' ').'
GROUP BY a.id_product_attribute';
// gets stock manager
$manager = StockManagerFactory::getManager();
// queries
$datas = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
foreach ($datas as &$data)
{
// retrieves real quantity for each product
$data['real_quantity'] = $manager->getProductRealQuantities($data['id_product'],
$data['id'],
($warehouse == -1 ? null : array($warehouse)), // all or selected warehouse(s)
true);
// display price correctly
$data['price_te'] = Tools::displayPrice($data['price_te'], (int)$data['id_currency']);
}
echo Tools::jsonEncode(array('data'=> $datas, 'fields_display' => $this->fieldsDisplay));
}
die;
}
/**
* AdminController::initList() override
* @see AdminController::initList()
@@ -154,26 +104,36 @@ class AdminStockInstantStateControllerCore extends AdminController
{
// query
$this->_select = '
a.id_product as id,
COUNT(pa.id_product_attribute) as variations,
s.physical_quantity as physical_quantity,
s.usable_quantity as usable_quantity,
s.price_te as price_te,
w.id_currency as id_currency';
CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) as name,
a.reference,
a.ean13,
a.upc,
w.id_currency,
a.physical_quantity,
a.usable_quantity,
COUNT(a.id_stock) as multiple_prices';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.id_product = a.id_product)
INNER JOIN `'._DB_PREFIX_.'stock` s ON (s.id_product = a.id_product)
LEFT JOIN `'._DB_PREFIX_.'warehouse` w ON (w.id_warehouse = s.id_warehouse)';
$this->_join = 'INNER JOIN '._DB_PREFIX_.'stock stock ON a.id_stock = stock.id_stock
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (
stock.id_product = pl.id_product
AND pl.id_lang = '.(int)$this->context->language->id.$this->context->shop->addSqlRestrictionOnLang('pl').'
)
LEFT JOIN `'._DB_PREFIX_.'warehouse` w ON (w.id_warehouse = stock.id_warehouse)
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.id_product_attribute = stock.id_product_attribute)
LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (
al.id_attribute = pac.id_attribute
AND al.id_lang = '.(int)$this->context->language->id.'
)';
$this->_group = 'GROUP BY a.id_stock, a.id_product, a.id_product_attribute';
if ($this->getCurrentCoverageWarehouse() != -1)
$this->_where .= ' AND s.id_warehouse = '.$this->getCurrentCoverageWarehouse();
$this->_where .= ' AND a.id_warehouse = '.$this->getCurrentCoverageWarehouse();
// toolbar btn
$this->toolbar_btn = array();
// disables link
$this->list_no_link = true;
// adds action
$this->addRowAction('details');
// smarty
$this->tpl_list_vars['stock_instant_state_warehouses'] = $this->stock_instant_state_warehouses;
$this->tpl_list_vars['stock_instant_state_cur_warehouse'] = $this->getCurrentCoverageWarehouse();
@@ -198,27 +158,15 @@ class AdminStockInstantStateControllerCore extends AdminController
for ($i = 0; $i < $nb_items; ++$i)
{
$item = &$this->_list[$i];
if ((int)$item['variations'] <= 0) // if this product does not have combinations
{
// removes 'details' action on products without attributes
$this->addRowActionSkipList('details', array($item['id']));
// gets stock manager
$manager = StockManagerFactory::getManager();
// gets stock manager
$manager = StockManagerFactory::getManager();
// gets real_quantity depending on the warehouse
$item['real_quantity'] = $manager->getProductRealQuantities($item['id'],
0,
($this->getCurrentCoverageWarehouse() == -1 ? null : array($this->getCurrentCoverageWarehouse())),
true);
}
else // else, this product does have combinations, hence we do not display informations
{
$item['price_te'] = '--';
$item['physical_quantity'] = '--';
$item['usable_quantity'] = '--';
$item['real_quantity'] = '--';
}
// gets real_quantity depending on the warehouse
$item['real_quantity'] = $manager->getProductRealQuantities($item['id_product'],
$item['id_product_attribute'],
($this->getCurrentCoverageWarehouse() == -1 ? null : array($this->getCurrentCoverageWarehouse())),
true);
}
}
@@ -239,4 +187,5 @@ class AdminStockInstantStateControllerCore extends AdminController
}
return $warehouse;
}
}
controllers/admin/AdminStockManagementController.php
+22 -1
View File
@@ -50,6 +50,12 @@ class AdminStockManagementControllerCore extends AdminController
'filter_key' => 'a!ean13',
'width' => 100
),
'upc' => array(
'title' => $this->l('UPC'),
'align' => 'center',
'filter_key' => 'a!upc',
'width' => 100
),
'name' => array(
'title' => $this->l('Name'),
),
@@ -161,6 +167,13 @@ class AdminStockManagementControllerCore extends AdminController
'size' => 15,
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('UPC:'),
'name' => 'upc',
'size' => 15,
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Name :'),
@@ -767,7 +780,7 @@ class AdminStockManagementControllerCore extends AdminController
// Load product attributes with sql override
$this->table = 'product_attribute';
$this->_select = 'a.id_product_attribute as id, a.id_product, a.reference, a.ean13,
$this->_select = 'a.id_product_attribute as id, a.id_product, a.reference, a.ean13, a.upc,
IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(agl.`name`, \' - \', al.name SEPARATOR \', \')),pl.name) as name';
$this->_join = '
@@ -836,6 +849,11 @@ class AdminStockManagementControllerCore extends AdminController
$this->addRowActionSkipList('addstock', array($item['id']));
$this->addRowActionSkipList('removestock', array($item['id']));
$this->addRowActionSkipList('transferstock', array($item['id']));
// does not display these informaions because this product has combinations
$item['reference'] = '--';
$item['ean13'] = '--';
$item['upc'] = '--';
}
else
{
@@ -915,6 +933,7 @@ class AdminStockManagementControllerCore extends AdminController
$id_product = $combination->id_product;
$reference = $combination->reference;
$ean13 = $combination->ean13;
$upc = $combination->upc;
$manufacturer_reference = $combination->supplier_reference;
// get the full name for this combination
@@ -941,6 +960,7 @@ class AdminStockManagementControllerCore extends AdminController
$product_is_valid = true;
$reference = $product->reference;
$ean13 = $product->ean13;
$upc = $product->upc;
$name = $product->name;
$manufacturer_reference = $product->supplier_reference;
$is_pack = $product->cache_is_pack;
@@ -974,6 +994,7 @@ class AdminStockManagementControllerCore extends AdminController
'manufacturer_reference' => $manufacturer_reference,
'name' => $name,
'ean13' => $ean13,
'upc' => $upc,
'check' => md5(_COOKIE_KEY_.$id_product.$id_product_attribute),
'quantity' => Tools::getValue('quantity', ''),
'id_warehouse' => Tools::getValue('id_warehouse', ''),
controllers/admin/AdminSupplyOrdersController.php
+22 -19
View File
@@ -743,6 +743,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
$this->tpl_form_vars['products_list'] = $products;
$this->tpl_form_vars['product_ids'] = implode($product_ids, '|');
$this->tpl_form_vars['product_ids_to_delete'] = '';
$this->tpl_form_vars['supplier_id'] = $supply_order->id_supplier;
$this->tpl_form_vars['currency'] = $currency;
}
@@ -961,6 +962,27 @@ class AdminSupplyOrdersControllerCore extends AdminController
// gets all product ids to manage
$product_ids_str = Tools::getValue('product_ids', null);
$product_ids = explode('|', $product_ids_str);
$product_ids_to_delete_str = Tools::getValue('product_ids_to_delete', null);
$product_ids_to_delete = array_unique(explode('|', $product_ids_to_delete_str));
//delete products that are not managed anymore
foreach ($products_already_in_order as $paio)
{
$product_ok = false;
foreach ($product_ids_to_delete as $id)
{
$id_check = $paio['id_product'].'_'.$paio['id_product_attribute'];
if ($id_check == $id)
$product_ok = true;
}
if ($product_ok === true)
{
$entry = new SupplyOrderDetail($paio['id_supply_order_detail']);
$entry->delete();
}
}
// manage each product
foreach ($product_ids as $id)
@@ -1042,25 +1064,6 @@ class AdminSupplyOrdersControllerCore extends AdminController
else
$entry->save();
}
//delete products that are not managed anymore
foreach ($products_already_in_order as $paio)
{
$product_ok = false;
foreach ($product_ids as $id)
{
$id_check = $paio['id_product'].'_'.$paio['id_product_attribute'];
if ($id_check == $id)
$product_ok = true;
}
if ($product_ok === false)
{
$entry = new SupplyOrderDetail($paio['id_supply_order_detail']);
$entry->delete();
}
}
}
}
}
controllers/admin/AdminWarehousesController.php
+4 -2
View File
@@ -275,7 +275,7 @@ class AdminWarehousesControllerCore extends AdminController
);
// It is not possible to change currency valuation and management type
if (Tools::isSubmit('addwarehouse'))
if (Tools::isSubmit('addwarehouse') || Tools::isSubmit('submitAddwarehouse'))
{
$this->fields_form['input'][] = array(
'type' => 'select',
@@ -314,7 +314,9 @@ class AdminWarehousesControllerCore extends AdminController
'name' => 'name'
)
);
} else {
}
else
{
$this->fields_form['input'][] = array(
'type' => 'hidden',
'name' => 'management_type'