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

[-] FO : #PSTEST-975 - Fix bugs with promo page

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13935 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-03-07 16:13:12 +00:00
parent 209c5e53d9
commit 4ebfa4f457
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+8 -7
View File
@@ -2040,6 +2040,13 @@ class ProductCore extends ObjectModel
$current_date = date('Y-m-d H:i:s'); $current_date = date('Y-m-d H:i:s');
$ids_product = Product::_getProductIdByDate((!$beginning ? $current_date : $beginning), (!$ending ? $current_date : $ending), $context); $ids_product = Product::_getProductIdByDate((!$beginning ? $current_date : $beginning), (!$ending ? $current_date : $ending), $context);
$tab_id_product = array();
foreach ($ids_product as $product)
if (is_array($product))
$tab_id_product[] = (int)$product['id_product'];
else
$tab_id_product[] = (int)$product;
$front = true; $front = true;
if (!in_array($context->controller->controller_type, array('front', 'modulefront'))) if (!in_array($context->controller->controller_type, array('front', 'modulefront')))
$front = false; $front = false;
@@ -2055,7 +2062,7 @@ class ProductCore extends ObjectModel
WHERE p.`active` = 1 WHERE p.`active` = 1
AND p.`show_price` = 1 AND p.`show_price` = 1
'.($front ? ' AND p.`visibility` IN ("both", "catalog")' : '').' '.($front ? ' AND p.`visibility` IN ("both", "catalog")' : '').'
'.((!$beginning && !$ending) ? 'AND p.`id_product` IN('.((is_array($ids_product) && count($ids_product)) ? implode(', ', array_map('intval', $ids_product)) : 0).')' : '').' '.((!$beginning && !$ending) ? 'AND p.`id_product` IN('.((is_array($tab_id_product) && count($tab_id_product)) ? implode(', ', $tab_id_product) : 0).')' : '').'
AND p.`id_product` IN ( AND p.`id_product` IN (
SELECT cp.`id_product` SELECT cp.`id_product`
FROM `'._DB_PREFIX_.'category_group` cg FROM `'._DB_PREFIX_.'category_group` cg
@@ -2070,12 +2077,6 @@ class ProductCore extends ObjectModel
$order_by = explode('.', $order_by); $order_by = explode('.', $order_by);
$order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`'; $order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`';
} }
$tab_id_product = array();
foreach ($ids_product as $product)
if (is_array($product))
$tab_id_product[] = $product['id_product'];
else
$tab_id_product = $product;
$sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`, $sql = 'SELECT p.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`,
pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`,
pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name, pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,