// Address: added id_warehouse. Supplier: it is now possible to edit the address of a given supplier. Manufacturers: addresses are now correctly displayed. AdminSuppliers: addresses are now editable / when deleting a supplier (if possible <=> no current orders) address is now flaged deleted. AdminWarehouses: when deleting a warehouse, its address is now flagged as deleted.

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:28:40 +00:00
parent f24d06977b
commit 65f1c44ae6
8 changed files with 241 additions and 21 deletions
@@ -440,7 +440,12 @@ class AdminWarehousesControllerCore extends AdminController
 			else if (SupplyOrder::warehouseHasPendingOrders($obj->id))
 				$this->_errors[] = $this->l('It is not possible to delete a Warehouse if it has pending supply orders.');
 			else
+			{
+				$address = new Address($obj->id_address);
+				$address->deleted = 1;
+				$address->save();
 				return parent::postProcess();
+			}
 	}

 	/**
@@ -475,4 +480,18 @@ class AdminWarehousesControllerCore extends AdminController

 		return parent::renderView();
 	}
+
+	/**
+	 * @see AdminController::afterAdd()
+	 */
+	public function afterAdd($object)
+	{
+		$address = new Address($object->id_address);
+		if (Validate::isLoadedObject($address))
+		{
+			$address->id_warehouse = $object->id_address;
+			$address->save();
+		}
+		return true;
+	}
 }