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

[-] BO: Fix #PSCFV-4890

Browse Source
This commit is contained in:
rGaillard
2012-10-15 16:00:50 +00:00
parent 8cabde0f10
commit 64ad6ddf80
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTaxRulesGroupController.php
+10 -8
View File
@@ -216,7 +216,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
array( array(
'type' => 'select', 'type' => 'select',
'label' => $this->l('Country:'), 'label' => $this->l('Country:'),
'name' => 'country[]', 'name' => 'country',
'id' => 'country', 'id' => 'country',
'options' => array( 'options' => array(
'query' => Country::getCountries($this->context->language->id), 'query' => Country::getCountries($this->context->language->id),
@@ -386,7 +386,15 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$behavior = (int)Tools::getValue('behavior'); $behavior = (int)Tools::getValue('behavior');
$description = pSQL(Tools::getValue('description')); $description = pSQL(Tools::getValue('description'));
$this->selected_countries = Tools::getValue('country'); if ((int)($id_country = Tools::getValue('country')) == 0)
{
$countries = Country::getCountries($this->context->language->id);
$this->selected_countries = array();
foreach ($countries as $country)
$this->selected_countries[] = (int)$country['id_country'];
}
else
$this->selected_countries = array($id_country);
$this->selected_states = Tools::getValue('states'); $this->selected_states = Tools::getValue('states');
if (empty($this->selected_states) || count($this->selected_states) == 0) if (empty($this->selected_states) || count($this->selected_states) == 0)
@@ -435,14 +443,8 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->errors = array_merge($this->errors, $this->validateTaxRule($tr)); $this->errors = array_merge($this->errors, $this->validateTaxRule($tr));
if (count($this->errors) == 0) if (count($this->errors) == 0)
{
if (!$tr->save()) if (!$tr->save())
$this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current tax rule'); $this->errors[] = Tools::displayError('An error has occurred: Can\'t save the current tax rule');
else
Tools::redirectAdmin(
self::$currentIndex.'&'.$this->identifier.'='.$tr->id_tax_rules_group.'&conf=4&update'.$this->table.'&token='.$this->token
);
}
} }
} }