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

// Multiple bugs fix on stock interfaces during tests

Browse Source
This commit is contained in:
dSevere
2011-12-08 15:22:31 +00:00
parent c52b1a8793
commit ea26882c58
6 changed files with 265 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockCoverController.php
+7 -5
View File
@@ -110,22 +110,24 @@ class AdminStockCoverControllerCore extends AdminController
$id_product = (int)Tools::getValue('id');
$period = (Tools::getValue('period') ? (int)Tools::getValue('period') : 7);
$warehouse = Tools::getValue('id_warehouse', -1);
$where_warehouse = '';
if ($warehouse != -1)
$where_warehouse = ' AND s.id_warehouse = '.(int)$warehouse;
$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');
$query->from('product_attribute pa
INNER JOIN
$query->from('product_attribute pa');
$query->join('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).'
WHERE s.id_product = '.($id_product).
$where_warehouse.'
GROUP BY s.id_product_attribute
)
stock_view ON (stock_view.id_product_attribute = pa.id_product_attribute)');
$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);