// bug fix for the cart rules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10525 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2011-11-23 13:38:41 +00:00
parent bac9674b03
commit bb7050715b
+17 -3
View File
@@ -258,9 +258,23 @@ class AdminCartRulesControllerCore extends AdminController
{
$i = 1;
$productRulesArray = array();
$productRules = $cartRule->getProductRules();
foreach ($productRules as $productRule)
$productRulesArray[] = $this->getProductRuleDisplay($i++, $productRule['type'], $productRule['quantity'], $productRule['values']);
if (Tools::getValue('product_restriction') && is_array($array = Tools::getValue('product_rule')) && count($array))
{
foreach ($array as $id)
{
$productRulesArray[] = $this->getProductRuleDisplay(
$i++,
Tools::getValue('product_rule_'.$id.'_type'),
(int)Tools::getValue('product_rule_'.$id.'_quantity'),
Tools::getValue('product_rule_select_'.$id)
);
}
}
else
{
foreach ($cartRule->getProductRules() as $productRule)
$productRulesArray[] = $this->getProductRuleDisplay($i++, $productRule['type'], $productRule['quantity'], $productRule['values']);
}
return $productRulesArray;
}