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

[-] BO : Fixed bug #PSCFV-1590. Save restrictions won't delete the ones for inactive module.

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15354 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vSchoener
2012-05-16 16:15:55 +00:00
parent ae47d8b9f2
commit 6ebbfd3925
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminPaymentController.php
+20 -3
View File
@@ -108,14 +108,31 @@ class AdminPaymentControllerCore extends AdminController
protected function saveRestrictions($type) protected function saveRestrictions($type)
{ {
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_'.bqSQL($type).'` WHERE id_shop = '.Context::getContext()->shop->id); // Delete type restrictions for active module.
$modules = array();
foreach ($this->payment_modules as $module)
if ($module->active)
$modules[] = (int)$module->id;
Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'module_'.bqSQL($type).'`
WHERE id_shop = '.Context::getContext()->shop->id.'
AND `id_module` IN ('.implode(', ', $modules).')'
);
// Fill the new restriction selection for active module.
$values = array();
foreach ($this->payment_modules as $module) foreach ($this->payment_modules as $module)
if ($module->active && isset($_POST[$module->name.'_'.$type.''])) if ($module->active && isset($_POST[$module->name.'_'.$type.'']))
foreach ($_POST[$module->name.'_'.$type.''] as $selected) foreach ($_POST[$module->name.'_'.$type.''] as $selected)
$values[] = '('.(int)$module->id.', '.Context::getContext()->shop->id.', '.(int)$selected.')'; $values[] = '('.(int)$module->id.', '.(int)Context::getContext()->shop->id.', '.(int)$selected.')';
if (count($values)) if (count($values))
Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'module_'.$type.' (`id_module`, `id_shop`, `id_'.$type.'`) VALUES '.implode(',', $values)); Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_'.bqSQL($type).'`
(`id_module`, `id_shop`, `id_'.bqSQL($type).'`)
VALUES '.implode(',', $values));
Tools::redirectAdmin(self::$currentIndex.'&conf=4'.'&token='.$this->token); Tools::redirectAdmin(self::$currentIndex.'&conf=4'.'&token='.$this->token);
} }