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

// Fixed #PSTEST-453

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12530 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-01-18 14:10:52 +00:00
parent 7514b555c5
commit 3b2daa5d3d
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Address.php
+9
View File
@@ -163,6 +163,9 @@ class AddressCore extends ObjectModel
$this->country = Country::getNameById($id_lang ? $id_lang : Configuration::get('PS_LANG_DEFAULT'), $this->id_country); $this->country = Country::getNameById($id_lang ? $id_lang : Configuration::get('PS_LANG_DEFAULT'), $this->id_country);
} }
/**
* @see ObjectModel::add()
*/
public function add($autodate = true, $null_values = false) public function add($autodate = true, $null_values = false)
{ {
if (!parent::add($autodate, $null_values)) if (!parent::add($autodate, $null_values))
@@ -173,6 +176,9 @@ class AddressCore extends ObjectModel
return true; return true;
} }
/**
* @see ObjectModel::delete()
*/
public function delete() public function delete()
{ {
if (Validate::isUnsignedId($this->id_customer)) if (Validate::isUnsignedId($this->id_customer))
@@ -200,6 +206,9 @@ class AddressCore extends ObjectModel
return $out; return $out;
} }
/**
* @see ObjectModel::validateController()
*/
public function validateController($htmlentities = true) public function validateController($htmlentities = true)
{ {
$errors = parent::validateController($htmlentities); $errors = parent::validateController($htmlentities);
controllers/admin/AdminSuppliersController.php
+19 -1
View File
@@ -407,10 +407,28 @@ class AdminSuppliersControllerCore extends AdminController
$address = new Address($object->id_address); $address = new Address($object->id_address);
if (Validate::isLoadedObject($address)) if (Validate::isLoadedObject($address))
{ {
$address->id_supplier = $object->id_address; $address->id_supplier = $object->id;
$address->save(); $address->save();
} }
return true; return true;
}
/**
* @see AdminController::afterUpdate()
*/
public function afterUpdate($object)
{
$address = new Address($object->id_address);
if (Validate::isLoadedObject($address))
{
if ($address->id_supplier != $object->id)
{
$address->id_supplier = $object->id;
$address->save();
}
}
return true;
} }
} }