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

[-] BO : fixed issue with reduction in the category for groups #PSCFV-9101

Browse Source
This commit is contained in:
Damien Metzger
2013-05-15 15:22:02 +02:00
parent e105f8fff7
commit 3e4ef99214
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminGroupsController.php
+13 -17
View File
@@ -312,36 +312,32 @@ class AdminGroupsControllerCore extends AdminController
return parent::renderForm();
}
protected function formatCategoryDiscountList($id)
protected function formatCategoryDiscountList($id_group)
{
$category = GroupReduction::getGroupReductions((int)$id, $this->context->language->id);
$group_reductions = GroupReduction::getGroupReductions((int)$id_group, $this->context->language->id);
$category_reductions = array();
$category_reduction = Tools::getValue('category_reduction');
foreach ($category as $category)
foreach ($group_reductions as $category)
{
if (is_array($category_reduction) && array_key_exists($category['id_category'], $category_reduction))
$category['reduction'] = $category_reduction[$category['id_category']];
$tmp = array();
$tmp['path'] = getPath(self::$currentIndex.'?tab=AdminCategories', (int)$category['id_category']);
$tmp['reduction'] = (float)$category['reduction'] * 100;
$tmp['id_category'] = (int)$category['id_category'];
$category_reductions[(int)$category['id_category']] = $tmp;
$category_reductions[(int)$category['id_category']] = array(
'path' => getPath(self::$currentIndex.'?tab=AdminCategories', (int)$category['id_category']),
'reduction' => (float)$category['reduction'] * 100,
'id_category' => (int)$category['id_category']
);
}
if (is_array($category_reduction))
foreach ($category_reduction as $key => $val)
{
if (!array_key_exists($key, $category_reductions))
{
$tmp = array();
$tmp['path'] = getPath(self::$currentIndex.'?tab=AdminCategories', $key);
$tmp['reduction'] = (float)$val * 100;
$tmp['id_category'] = (int)$key;
$category_reductions[(int)$category['id_category']] = $tmp;
}
}
$category_reductions[(int)$key] = array(
'path' => getPath(self::$currentIndex.'?tab=AdminCategories', $key),
'reduction' => (float)$val * 100,
'id_category' => (int)$key
);
return $category_reductions;
}