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

[-] Fix bug #PSCFV-8109 country creation/activation regarding payment modules restrictions

Browse Source
This commit is contained in:
gRoussac
2013-06-24 16:45:10 +02:00
parent 383acfb8bf
commit b421d469d2
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Country.php
+7 -1
View File
@@ -370,4 +370,10 @@ class CountryCore extends ObjectModel
else else
return true; return true;
} }
}
public function add($autodate = true, $null_values = false)
{
$return = parent::add($autodate, $null_values) && self::addModuleRestrictions(array(), array(array('id_country' => $this->id)), array());
return $return;
}
}
controllers/admin/AdminCountriesController.php
+4 -4
View File
@@ -433,10 +433,10 @@ class AdminCountriesControllerCore extends AdminController
public function processStatus() public function processStatus()
{ {
if (Validate::isLoadedObject($object = $this->loadObject())) $return = parent::processStatus();
Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array()); if (Validate::isLoadedObject($object = $this->loadObject()) && $object->active == 1)
$return &= Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array());
parent::processStatus(); return $return;
} }
public function processBulkStatusSelection($way) public function processBulkStatusSelection($way)