[-] BO : BugFix : #PSTEST-1020 : category reduction are now deletable

This commit is contained in:
vChabot
2012-03-14 09:15:31 +00:00
parent 65fe2fe7c8
commit 9ff96b258f
+8 -21
View File
@@ -409,6 +409,14 @@ class AdminGroupsControllerCore extends AdminController
protected function updateCategoryReduction() protected function updateCategoryReduction()
{ {
$category_reduction = Tools::getValue('category_reduction'); $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)) if (is_array($category_reduction))
{ {
foreach ($category_reduction as $cat => $reduction) foreach ($category_reduction as $cat => $reduction)
@@ -417,15 +425,6 @@ class AdminGroupsControllerCore extends AdminController
$this->errors[] = Tools::displayError('Discount value is incorrect'); $this->errors[] = Tools::displayError('Discount value is incorrect');
else 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 = new Category((int)$cat);
$category->addGroupsIfNoExist((int)Tools::getValue('id_group')); $category->addGroupsIfNoExist((int)Tools::getValue('id_group'));
$group_reduction = new GroupReduction(); $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')
);
}
} }
/** /**