From e27203157c9f6b88dc844af087d7bc6e5f85d8d2 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Wed, 14 Mar 2012 09:15:31 +0000
Subject: [PATCH] [-] BO : BugFix : #PSTEST-1020 : category reduction are now
 deletable

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14131 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminGroupsController.php | 29 ++++++---------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index f5e651656..d72ccb8c7 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -409,6 +409,14 @@ class AdminGroupsControllerCore extends AdminController
 	protected function updateCategoryReduction()
 	{
 		$category_reduction = Tools::getValue('category_reduction');
+		Db::getInstance()->execute('
+			DELETE FROM `'._DB_PREFIX_.'group_reduction`
+			WHERE `id_group` = '.(int)Tools::getValue('id_group')
+		);
+		Db::getInstance()->execute('
+			DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache`
+			WHERE `id_group` = '.(int)Tools::getValue('id_group')
+		);
 		if (is_array($category_reduction))
 		{
 			foreach ($category_reduction as $cat => $reduction)
@@ -417,15 +425,6 @@ class AdminGroupsControllerCore extends AdminController
 					$this->errors[] = Tools::displayError('Discount value is incorrect');
 				else
 				{
-					Db::getInstance()->execute('
-						DELETE FROM `'._DB_PREFIX_.'group_reduction`
-						WHERE `id_group` = '.(int)Tools::getValue('id_group').'
-							AND `id_category` = '.(int)$cat
-					);
-					Db::getInstance()->execute('
-						DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache`
-						WHERE `id_group` = '.(int)Tools::getValue('id_group')
-					);
 					$category = new Category((int)$cat);
 					$category->addGroupsIfNoExist((int)Tools::getValue('id_group'));
 					$group_reduction = new GroupReduction();
@@ -437,18 +436,6 @@ class AdminGroupsControllerCore extends AdminController
 				}
 			}
 		}
-		else
-		{
-			// if we have no category reduction anymore, we delete the existing ones
-			Db::getInstance()->execute('
-				DELETE FROM `'._DB_PREFIX_.'group_reduction`
-				WHERE `id_group` = '.(int)Tools::getValue('id_group')
-			);
-			Db::getInstance()->execute('
-				DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache`
-				WHERE `id_group` = '.(int)Tools::getValue('id_group')
-			);
-		}
 	}
 
 	/**