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

// Warehouse: getWarehouseList is now getWarehouses. Employee: it is not possible to delete an employee if he manages warehouses, anymore.

Browse Source
This commit is contained in:
bMancone
2011-11-14 14:28:30 +00:00
parent 5bde977d1f
commit 0fd7bdcea4
7 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminEmployeesController.php
+8
View File
@@ -331,6 +331,14 @@ class AdminEmployeesControllerCore extends AdminController
$this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.');
return false;
}
// It is not possible to delete an employee if he manages warehouses
$warehouses = Warehouse::getWarehousesByEmployee((int)Tools::getValue('id_employee'));
if (Tools::isSubmit('deleteemployee') && count($warehouses) > 0)
{
$this->_errors[] = Tools::displayError('You cannot delete this account since it manages warehouses. Check your warehouses first.');
return false;
}
}
else if (Tools::isSubmit('submitAddemployee'))
{
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -534,7 +534,7 @@ class AdminOrdersControllerCore extends AdminController
'carrier' => $carrier = new Carrier($order->id_carrier),
'history' => $order->getHistory($this->context->language->id),
'states' => OrderState::getOrderStates($this->context->language->id),
'warehouse_list' => Warehouse::getWarehouseList(false, $order->id_shop),
'warehouse_list' => Warehouse::getWarehouses(false, $order->id_shop),
'sources' => ConnectionsSource::getOrderSources($order->id),
'currentState' => OrderHistory::getLastOrderState($order->id),
'currency' => new Currency($order->id_currency),
controllers/admin/AdminStockCoverController.php
+1 -1
View File
@@ -82,7 +82,7 @@ class AdminStockCoverControllerCore extends AdminController
);
// gets the list of warehouses available
$this->stock_cover_warehouses = Warehouse::getWarehouseList(true);
$this->stock_cover_warehouses = Warehouse::getWarehouses(true);
// gets the final list of warehouses
array_unshift($this->stock_cover_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
controllers/admin/AdminStockInstantStateController.php
+1 -1
View File
@@ -85,7 +85,7 @@ class AdminStockInstantStateControllerCore extends AdminController
),
);
$this->stock_instant_state_warehouses = Warehouse::getWarehouseList(true);
$this->stock_instant_state_warehouses = Warehouse::getWarehouses(true);
array_unshift($this->stock_instant_state_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
parent::__construct();
controllers/admin/AdminStockMvtController.php
+1 -1
View File
@@ -202,7 +202,7 @@ class AdminStockMvtControllerCore extends AdminController
/*
* Manage second list
*/
$warehouses = Warehouse::getWarehouseList(true);
$warehouses = Warehouse::getWarehouses(true);
array_unshift($warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
$this->tpl_list_vars['list_warehouses'] = $warehouses;
$this->tpl_list_vars['current_warehouse'] = $this->getCurrentWarehouseId();
controllers/admin/AdminSupplierOrdersController.php
+1 -1
View File
@@ -327,7 +327,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
$this->addJqueryUI('ui.datepicker');
//get warehouses list
$warehouses = Warehouse::getWarehouseList(true);
$warehouses = Warehouse::getWarehouses(true);
//get currencies list
$currencies = Currency::getCurrencies();