From bb7050715bec38137da319451d69f35f5156d414 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Wed, 23 Nov 2011 13:38:41 +0000
Subject: [PATCH] // 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
---
 .../admin/AdminCartRulesController.php        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index bea27b829..8274a7ccc 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -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;
 	}