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

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

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10107 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-11-14 15:44:26 +00:00
parent 04e40cbb73
commit 726a53c490
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/Warehouse.php
+17 -1
View File
@@ -182,6 +182,20 @@ class WarehouseCore extends ObjectModel
Db::getInstance()->autoExecute(_DB_PREFIX_.'warehouse_carrier', $row_to_insert, 'INSERT'); Db::getInstance()->autoExecute(_DB_PREFIX_.'warehouse_carrier', $row_to_insert, 'INSERT');
} }
/**
* For a given carrier, removes it from the warehouse/carrier association
* If $id_warehouse is set, it only removes the carrier for this warehouse
* @param int $id_carrier
* @param int $id_warehouse optional
*/
public static function removeCarrier($id_carrier, $id_warehouse = null)
{
Db::getInstance()->execute('
DELETE FROM '._DB_PREFIX_.'warehouse_carrier
WHERE id_carrier = '.(int)$id_carrier.
($id_warehouse ? ' AND id_warehouse = '.(int)$id_warehouse : ''));
}
/** /**
* Checks if a warehouse is empty - i.e. holds no stock * Checks if a warehouse is empty - i.e. holds no stock
* *
@@ -315,7 +329,9 @@ class WarehouseCore extends ObjectModel
FROM '._DB_PREFIX_.'stock s FROM '._DB_PREFIX_.'stock s
WHERE s.id_warehouse = '.(int)$this->id; WHERE s.id_warehouse = '.(int)$this->id;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
return ($res ? $res : 0);
} }
/** /**
controllers/admin/AdminCarriersController.php
+9 -1
View File
@@ -491,13 +491,21 @@ class AdminCarriersControllerCore extends AdminController
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT'))) || (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'); $this->_errors[] = $this->l('Please set another carrier as default before deleting');
else 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(); parent::postProcess();
}
} }
} }
/** /**
* Overload the property $fields_value * Overload the property $fields_value
* *
* @param object $obj * @param object $obj
*/ */
public function getFieldsValues($obj) public function getFieldsValues($obj)