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

// Opti

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17093 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-30 10:06:45 +00:00
parent 267a408cdf
commit dbf3e5947c
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+16 -25
View File
@@ -2435,40 +2435,31 @@ class ProductCore extends ObjectModel
if (!isset(self::$_pricesLevel2[$cache_id_2])) if (!isset(self::$_pricesLevel2[$cache_id_2]))
{ {
$sql = new DbQuery(); $sql = new DbQuery();
$sql->select('product_shop.`price`, product_shop.`ecotax`, NULL id_product_attribute'); $sql->select('product_shop.`price`, product_shop.`ecotax`');
$sql->from('product', 'p'); $sql->from('product', 'p');
$sql->join(Shop::addSqlAssociation('product', 'p')); $sql->join(Shop::addSqlAssociation('product', 'p'));
$sql->where('p.`id_product` = '.(int)$id_product); $sql->where('p.`id_product` = '.(int)$id_product);
$default_on = false;
if (Combination::isFeatureActive()) if (Combination::isFeatureActive())
{ {
$default_on = true; $sql->select('pa.id_product_attribute, product_attribute_shop.`price` AS attribute_price, pa.default_on');
$sql->select('pa.id_product_attribute, product_attribute_shop.`price` AS attribute_price, ( $sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`');
SELECT product_attribute_shop.price
FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
WHERE pa.id_product = '.(int)$id_product.'
AND product_attribute_shop.default_on = 1
GROUP BY pa.id_product_attribute
LIMIT 1
) as default_on');
$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = '.(int)$id_product);
$sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.id_shop = p.id_shop_default')); $sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.id_shop = p.id_shop_default'));
} }
else
$sql->select('0 as id_product_attribute');
$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
foreach ($res as $row)
if ($res)
{ {
foreach ($res as $row) $array_tmp = array(
self::$_pricesLevel2[$cache_id_2][(int)$row['id_product_attribute']] = array( 'price' => $row['price'],
'price' => $row['price'], 'ecotax' => $row['ecotax'],
'ecotax' => $row['ecotax'], 'attribute_price' => (isset($row['attribute_price']) ? $row['attribute_price'] : null)
'attribute_price' => (isset($row['attribute_price']) ? $row['attribute_price'] : null) );
); self::$_pricesLevel2[$cache_id_2][(int)$row['id_product_attribute']] = $array_tmp;
if ($default_on)
self::$_pricesLevel2[$cache_id_2][0] = array('price' => $row['price'], if (isset($row['default_on']) && $row['default_on'] == 1)
'ecotax' => $row['ecotax'], self::$_pricesLevel2[$cache_id_2][0] = $array_tmp;
'attribute_price' => $row['attribute_price']);
} }
} }