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

[*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.

Browse Source
This commit is contained in:
rMalie
2011-12-06 15:41:34 +00:00
parent f7e573035e
commit ad45eeca37
17 changed files with 85 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartRulesController.php
+9 -9
View File
@@ -166,14 +166,14 @@ class AdminCartRulesControllerCore extends AdminController
{
case 'attributes':
$attributes = array('selected' => array(), 'unselected' => array());
$result = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->ExecuteS('
SELECT CONCAT(agl.name, " - ", al.name) as name, a.id_attribute as id
FROM '._DB_PREFIX_.'attribute_group_lang agl
LEFT JOIN '._DB_PREFIX_.'attribute a ON a.id_attribute_group = agl.id_attribute_group
LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON (a.id_attribute = al.id_attribute AND al.id_lang = '.(int)Context::getContext()->language->id.')
WHERE agl.id_lang = '.(int)Context::getContext()->language->id.'
ORDER BY agl.name, al.name', false);
while ($row = Db::getInstance()->nextRow($result))
ORDER BY agl.name, al.name');
foreach ($results as $row)
$attributes[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $attributes);
$choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl');
@@ -182,12 +182,12 @@ class AdminCartRulesControllerCore extends AdminController
case 'products':
// Todo: Consider optimization
$products = array('selected' => array(), 'unselected' => array());
$result = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->ExecuteS('
SELECT name, id_product as id
FROM '._DB_PREFIX_.'product_lang pl
WHERE id_lang = '.(int)Context::getContext()->language->id.'
ORDER BY name', false);
while ($row = Db::getInstance()->nextRow($result))
ORDER BY name');
foreach ($results as $row)
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl');
@@ -196,12 +196,12 @@ class AdminCartRulesControllerCore extends AdminController
case 'categories':
// Todo: Consider optimization
$categories = array('selected' => array(), 'unselected' => array());
$result = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->ExecuteS('
SELECT name, id_category as id
FROM '._DB_PREFIX_.'category_lang pl
WHERE id_lang = '.(int)Context::getContext()->language->id.'
ORDER BY name', false);
while ($row = Db::getInstance()->nextRow($result))
ORDER BY name');
foreach ($results as $row)
$categories[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $categories);
$choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl');