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

// Replace shop->addSqlAssociation() by static call

Browse Source
This commit is contained in:
rMalie
2012-02-27 13:07:51 +00:00
parent 8f0257fc87
commit 9c6b80fabe
23 changed files with 55 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocklayered/blocklayered.php
+2 -2
View File
@@ -2288,7 +2288,7 @@ class BlockLayered extends Module
}
if (version_compare(_PS_VERSION_,'1.5','>'))
$queryFiltersFrom .= Context::getContext()->shop->addSqlAssociation('product', 'p');
$queryFiltersFrom .= Shop::addSqlAssociation('product', 'p');
$allProductsOut = self::query('
SELECT p.`id_product` id_product
@@ -2624,7 +2624,7 @@ class BlockLayered extends Module
if (!empty($sqlQuery['from']))
{
if (version_compare(_PS_VERSION_,'1.5','>'))
$sqlQuery['from'] .= Context::getContext()->shop->addSqlAssociation('product', 'p');
$sqlQuery['from'] .= Shop::addSqlAssociation('product', 'p');
$products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sqlQuery['select']."\n".$sqlQuery['from']."\n".$sqlQuery['join']."\n".$sqlQuery['where']."\n".$sqlQuery['group']);
}
modules/statsbestproducts/statsbestproducts.php
+1 -1
View File
@@ -165,7 +165,7 @@ class StatsBestProducts extends ModuleGrid
AND dr.time_end BETWEEN '.$dateBetween.'
) AS totalPageViewed
FROM '._DB_PREFIX_.'product p
'.$this->context->shop->addSqlAssociation('product', 'p').'
'.Shop::addSqlAssociation('product', 'p').'
LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)$this->getLang().Shop::addSqlRestrictionOnLang('pl').')
LEFT JOIN '._DB_PREFIX_.'order_detail od ON od.product_id = p.id_product
LEFT JOIN '._DB_PREFIX_.'orders o ON od.id_order = o.id_order
modules/statscatalog/statscatalog.php
+1 -1
View File
@@ -144,7 +144,7 @@ class StatsCatalog extends Module
$this->_join = ' LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = p.`id_product`)';
$this->_where = ' AND cp.`id_category` = '.$id_category;
}
$this->_join .= $this->context->shop->addSqlAssociation('product', 'p');
$this->_join .= Shop::addSqlAssociation('product', 'p');
$result1 = $this->getQuery1(true);
$total = $result1['total'];
modules/statscheckup/statscheckup.php
+3 -3
View File
@@ -99,7 +99,7 @@ class StatsCheckUp extends Module
// Get languages
$sql = 'SELECT l.*
FROM '._DB_PREFIX_.'lang l'
.$this->context->shop->addSqlAssociation('lang', 'l');
.Shop::addSqlAssociation('lang', 'l');
$languages = $db->executeS($sql);
$arrayColors = array(
@@ -126,7 +126,7 @@ class StatsCheckUp extends Module
$sql = 'SELECT p.id_product, p.active, pl.name, (
SELECT COUNT(*)
FROM '._DB_PREFIX_.'image i
'.$this->context->shop->addSqlAssociation('image', 'i').'
'.Shop::addSqlAssociation('image', 'i').'
WHERE i.id_product = p.id_product
) as nbImages, (
SELECT SUM(od.product_quantity)
@@ -141,7 +141,7 @@ class StatsCheckUp extends Module
'.Product::sqlStock('p', 0).'
LEFT JOIN '._DB_PREFIX_.'product_lang pl
ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)$this->context->language->id.Shop::addSqlRestrictionOnLang('pl').')
'.$this->context->shop->addSqlAssociation('product', 'p').'
'.Shop::addSqlAssociation('product', 'p').'
ORDER BY '.$orderBy;
$result = $db->executeS($sql);
modules/statsforecast/statsforecast.php
+1 -1
View File
@@ -512,7 +512,7 @@ class StatsForecast extends Module
$langValues = '';
$sql = 'SELECT l.id_lang, l.iso_code
FROM `'._DB_PREFIX_.'lang` l
'.$this->context->shop->addSqlAssociation('lang', 'l').'
'.Shop::addSqlAssociation('lang', 'l').'
WHERE l.active = 1';
$languages = Db::getInstance()->executeS($sql);
foreach ($languages as $language)
modules/statsproduct/statsproduct.php
+1 -1
View File
@@ -103,7 +103,7 @@ class StatsProduct extends ModuleGraph
FROM `'._DB_PREFIX_.'product` p
'.Product::sqlStock('p', 0).'
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON p.`id_product` = pl.`id_product`'.Shop::addSqlRestrictionOnLang('pl').'
'.$this->context->shop->addSqlAssociation('product', 'p').'
'.Shop::addSqlAssociation('product', 'p').'
'.(Tools::getValue('id_category') ? 'LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON p.`id_product` = cp.`id_product`' : '').'
WHERE pl.`id_lang` = '.(int)$id_lang.'
'.(Tools::getValue('id_category') ? 'AND cp.id_category = '.(int)Tools::getValue('id_category') : '').'
modules/statsstock/statsstock.php
+1 -1
View File
@@ -68,7 +68,7 @@ class StatsStock extends Module
), p.wholesale_price) as wholesale_price,
IFNULL(stock.quantity, 0) as quantity
FROM '._DB_PREFIX_.'product p
'.$this->context->shop->addSqlAssociation('product', 'p').'
'.Shop::addSqlAssociation('product', 'p').'
INNER JOIN '._DB_PREFIX_.'product_lang pl
ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)$this->context->language->id.Shop::addSqlRestrictionOnLang('pl').')
'.Product::sqlStock('p', 0).'