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

// Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class

Browse Source
This commit is contained in:
rMalie
2011-12-19 11:13:13 +00:00
parent 82a8c98d3a
commit 1302bdb194
23 changed files with 183 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockCoverController.php
+5 -5
View File
@@ -125,7 +125,7 @@ class AdminStockCoverControllerCore extends AdminController
$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');
$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
@@ -319,10 +319,10 @@ class AdminStockCoverControllerCore extends AdminController
{
$query = new DbQuery();
$query->select('SUM(od.product_quantity)');
$query->from('order_detail od');
$query->leftJoin('orders o ON (od.id_order = o.id_order)');
$query->leftJoin('order_history oh ON (o.date_upd = oh.date_add)');
$query->leftJoin('order_state os ON (os.id_order_state = oh.id_order_state)');
$query->from('order_detail', 'od');
$query->leftJoin('orders', 'o', 'od.id_order = o.id_order');
$query->leftJoin('order_history', 'oh', 'o.date_upd = oh.date_add');
$query->leftJoin('order_state', 'os', 'os.id_order_state = oh.id_order_state');
$query->where('od.product_id = '.(int)$id_product);
$query->where('od.product_attribute_id = '.(int)$id_product_attribute);
$query->where('TO_DAYS(NOW()) - TO_DAYS(oh.date_add) <= '.(int)$coverage);
controllers/admin/AdminStockInstantStateController.php
+4 -4
View File
@@ -260,8 +260,8 @@ class AdminStockInstantStateControllerCore extends AdminController
$query = new DbQuery();
$query->select('w.id_currency, s.price_te, SUM(s.physical_quantity) as physical_quantity, SUM(s.usable_quantity) as usable_quantity,
(s.price_te * SUM(s.physical_quantity)) as valuation');
$query->from('stock s');
$query->leftJoin('warehouse w ON (w.id_warehouse = s.id_warehouse)');
$query->from('stock', 's');
$query->leftJoin('warehouse', 'w', 'w.id_warehouse = s.id_warehouse');
$query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute);
if ($id_warehouse != -1)
$query->where('s.id_warehouse = '.(int)$id_warehouse);
@@ -369,8 +369,8 @@ class AdminStockInstantStateControllerCore extends AdminController
// gets prices
$query = new DbQuery();
$query->select('s.price_te, SUM(s.physical_quantity) as physical_quantity, SUM(s.usable_quantity) as usable_quantity');
$query->from('stock s');
$query->leftJoin('warehouse w ON (w.id_warehouse = s.id_warehouse)');
$query->from('stock', 's');
$query->leftJoin('warehouse', 'w', 'w.id_warehouse = s.id_warehouse');
$query->where('s.id_product = '.$id_product.' AND s.id_product_attribute = '.$id_product_attribute);
$query->where('s.id_warehouse = '.$id_warehouse);
$query->groupBy('s.price_te');
controllers/admin/AdminStockManagementController.php
+1 -1
View File
@@ -936,7 +936,7 @@ class AdminStockManagementControllerCore extends AdminController
$query = new DbQuery();
$query->select('IFNULL(CONCAT(pl.`name`, \' : \', GROUP_CONCAT(agl.`name`, \' - \', al.`name` SEPARATOR \', \')),pl.`name`) as name');
$query->from('product_attribute a');
$query->from('product_attribute', 'a');
$query->join('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`)
controllers/admin/AdminSupplyOrdersController.php
+24 -31
View File
@@ -1126,8 +1126,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
{
$query = new DbQuery();
$query->select(implode(', sod.', $keys));
$query->from('supply_order_detail sod');
$query->leftJoin('supply_order so ON (so.id_supply_order = sod.id_supply_order)');
$query->from('supply_order_detail', 'sod');
$query->leftJoin('supply_order', 'so', 'so.id_supply_order = sod.id_supply_order');
$id_warehouse = $this->getCurrentWarehouse();
if ($id_warehouse != -1)
$query->where('so.id_warehouse = '.(int)$id_warehouse);
@@ -1498,14 +1498,14 @@ class AdminSupplyOrdersControllerCore extends AdminController
IFNULL(CONCAT(pl.name, \' : \', GROUP_CONCAT(DISTINCT agl.name, \' - \', al.name SEPARATOR \', \')), pl.name) as name
');
$query->from('product p');
$query->from('product', 'p');
$query->innerJoin('product_lang pl ON (pl.id_product = p.id_product AND pl.id_lang = '.$id_lang.')');
$query->leftJoin('product_attribute pa ON (pa.id_product = p.id_product)');
$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 = '.$id_lang.')');
$query->leftJoin('attribute_group_lang agl ON (agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$id_lang.')');
$query->innerJoin('product_lang', 'pl', 'pl.id_product = p.id_product AND pl.id_lang = '.$id_lang);
$query->leftJoin('product_attribute', 'pa', 'pa.id_product = p.id_product');
$query->leftJoin('product_attribute_combination', 'pac', 'pac.id_product_attribute = pa.id_product_attribute');
$query->leftJoin('attribute', 'atr', 'atr.id_attribute = pac.id_attribute');
$query->leftJoin('attribute_lang', 'al', 'al.id_attribute = atr.id_attribute AND al.id_lang = '.$id_lang);
$query->leftJoin('attribute_group_lang', 'agl', 'agl.id_attribute_group = atr.id_attribute_group AND agl.id_lang = '.$id_lang);
$query->where('pl.name LIKE \'%'.$pattern.'%\' OR p.reference LIKE \'%'.$pattern.'%\'');
$query->where('p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))');
@@ -1859,28 +1859,21 @@ class AdminSupplyOrdersControllerCore extends AdminController
IFNULL(pa.reference, IFNULL(p.reference, \'\')) as reference,
IFNULL(pa.ean13, IFNULL(p.ean13, \'\')) as ean13,
IFNULL(pa.upc, IFNULL(p.upc, \'\')) as upc');
$query->from('product_supplier ps');
$query->leftJoin('stock s ON
(
s.id_product = ps.id_product
AND
s.id_product_attribute = ps.id_product_attribute
)');
$query->innerJoin('warehouse_product_location wpl ON
(
wpl.id_product = ps.id_product
AND
wpl.id_product_attribute = ps.id_product_attribute
AND
wpl.id_warehouse = '.(int)$supply_order->id_warehouse.'
)');
$query->leftJoin('product p ON (p.id_product = ps.id_product)');
$query->leftJoin('product_attribute pa ON
(
pa.id_product_attribute = ps.id_product_attribute
AND
p.id_product = ps.id_product
)');
$query->from('product_supplier', 'ps');
$query->leftJoin('stock', 's', '
s.id_product = ps.id_product
AND s.id_product_attribute = ps.id_product_attribute
');
$query->innerJoin('warehouse_product_location', 'wpl', '
wpl.id_product = ps.id_product
AND wpl.id_product_attribute = ps.id_product_attribute
AND wpl.id_warehouse = '.(int)$supply_order->id_warehouse.'
');
$query->leftJoin('product', 'p', 'p.id_product = ps.id_product');
$query->leftJoin('product_attribute', 'pa', '
pa.id_product_attribute = ps.id_product_attribute
AND p.id_product = ps.id_product
');
$query->where('ps.id_supplier = '.(int)$supply_order->id_supplier);
// gets items