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

// Fixed #PSFV-510

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13258 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-02-13 14:55:43 +00:00
parent 6263b145fe
commit 9ef6ddb636
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartRulesController.php
+7 -7
View File
@@ -113,19 +113,19 @@ class AdminCartRulesControllerCore extends AdminController
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`) Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`)
VALUES ('.(int)$currentObject->id.', '.(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity').')'); VALUES ('.(int)$currentObject->id.', '.(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity').')');
$id_product_rule_group = Db::getInstance()->Insert_ID(); $id_product_rule_group = Db::getInstance()->Insert_ID();
if (is_array($ruleArray = Tools::getValue('product_rule_'.$ruleGroupId)) && count($ruleArray)) if (is_array($ruleArray = Tools::getValue('product_rule_'.$ruleGroupId)) && count($ruleArray))
foreach ($ruleArray as $ruleId) foreach ($ruleArray as $ruleId)
{ {
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`) Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`)
VALUES ('.(int)$id_product_rule_group.', "'.pSQL(Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type')).'")'); VALUES ('.(int)$id_product_rule_group.', "'.pSQL(Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type')).'")');
$id_product_rule = Db::getInstance()->Insert_ID(); $id_product_rule = Db::getInstance()->Insert_ID();
$values = array(); $values = array();
foreach (Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId) as $id) foreach (Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId) as $id)
$values[] = '('.(int)$id_product_rule.','.(int)$id.')'; $values[] = '('.(int)$id_product_rule.','.(int)$id.')';
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values)); Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values));
} }
} }
} }
@@ -183,7 +183,7 @@ class AdminCartRulesControllerCore extends AdminController
); );
} }
} }
$productRuleGroupsArray[] = $this->getProductRuleGroupDisplay( $productRuleGroupsArray[] = $this->getProductRuleGroupDisplay(
$i++, $i++,
(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity'), (int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity'),
@@ -214,7 +214,7 @@ class AdminCartRulesControllerCore extends AdminController
Context::getContext()->smarty->assign('product_rules', $product_rules); Context::getContext()->smarty->assign('product_rules', $product_rules);
return Context::getContext()->smarty->fetch('controllers/cart_rules/product_rule_group.tpl'); return Context::getContext()->smarty->fetch('controllers/cart_rules/product_rule_group.tpl');
} }
public function getProductRuleDisplay($product_rule_group_id, $product_rule_id, $product_rule_type, $selected = array()) public function getProductRuleDisplay($product_rule_group_id, $product_rule_id, $product_rule_type, $selected = array())
{ {
Context::getContext()->smarty->assign( Context::getContext()->smarty->assign(
@@ -265,7 +265,7 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row) foreach ($results as $row)
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row; $products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $products); Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl'); $choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content); Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break; break;
case 'suppliers': case 'suppliers':
@@ -277,7 +277,7 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row) foreach ($results as $row)
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row; $products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $products); Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl'); $choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content); Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break; break;
case 'categories': case 'categories':