// Deleted carriers are now properly removed from the table warehouse_carrier

2011-11-14 15:44:26 +00:00
parent 2b254e1a2a
commit e0ec780dec
2 changed files with 26 additions and 2 deletions
@@ -491,13 +491,21 @@ class AdminCarriersControllerCore extends AdminController
 				|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
 					$this->_errors[] = $this->l('Please set another carrier as default before deleting');
 			else
+			{
+				// if deletion : removes the carrier from the warehouse/carrier association
+				if (Tools::isSubmit('delete'.$this->table))
+				{
+					$id = (int)Tools::getValue('id_'.$this->table);
+					Warehouse::removeCarrier($id);
+				}
 				parent::postProcess();
+			}
 		}
 	}

 	/**
 	 * Overload the property $fields_value
-	 * 
+	 *
 	 * @param object $obj
 	 */
 	public function getFieldsValues($obj)