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

// Code review

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9403 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-10-17 17:21:51 +00:00
parent f895c0c65b
commit 1aaa5b1e02
1 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminWarehousesController.php
+49 -33
View File
@@ -39,22 +39,38 @@ class AdminWarehousesControllerCore extends AdminController
$this->addRowAction('edit'); $this->addRowAction('edit');
if (!Tools::getValue('realedit'))
$this->deleted = false;
$this->fieldsDisplay = array( $this->fieldsDisplay = array(
'reference' => array('title' => $this->l('Reference'), 'width' => 40), 'reference' => array(
'name' => array('title' => $this->l('Name'), 'width' => 300, 'havingFilter' => true), 'title' => $this->l('Reference'),
'management_type' => array('title' => $this->l('Managment type'), 'width' => 40), 'width' => 40
'employee' => array('title' => $this->l('Manager'), 'width' => 150, 'havingFilter' => true), ),
'location' => array('title' => $this->l('Location'), 'width' => 150), 'name' => array(
'contact' => array('title' => $this->l('Phone Number'), 'width' => 50), 'title' => $this->l('Name'),
'width' => 300,
'havingFilter' => true
),
'management_type' => array(
'title' => $this->l('Managment type'),
'width' => 40
),
'employee' => array(
'title' => $this->l('Manager'),
'width' => 150,
'havingFilter' => true
),
'location' => array(
'title' => $this->l('Location'),
'width' => 150
),
'contact' => array(
'title' => $this->l('Phone Number'),
'width' => 50
),
); );
$this->_select = 'reference, name, management_type, $this->_select = 'reference, name, management_type, CONCAT(e.lastname, \' \', e.firstname) AS employee,
CONCAT(e.lastname, \' \', e.firstname) AS employee, ad.phone AS contact, CONCAT(ad.city, \' \', c.iso_code) location';
ad.phone AS contact,
CONCAT(ad.city, \' \', c.iso_code) location';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'employee` e ON (e.id_employee = a.id_employee) $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'employee` e ON (e.id_employee = a.id_employee)
LEFT JOIN `'._DB_PREFIX_.'address` ad ON (ad.id_address = a.id_address) LEFT JOIN `'._DB_PREFIX_.'address` ad ON (ad.id_address = a.id_address)
LEFT JOIN `'._DB_PREFIX_.'country` c ON (c.id_country = ad.id_country)'; LEFT JOIN `'._DB_PREFIX_.'country` c ON (c.id_country = ad.id_country)';
@@ -64,7 +80,7 @@ class AdminWarehousesControllerCore extends AdminController
$query->select('id_employee, CONCAT(lastname," ",firstname) as name'); $query->select('id_employee, CONCAT(lastname," ",firstname) as name');
$query->from('employee'); $query->from('employee');
$query->where('active = 1'); $query->where('active = 1');
$this->employees_array = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); $employees_array = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
@@ -161,7 +177,7 @@ class AdminWarehousesControllerCore extends AdminController
'name' => 'id_employee', 'name' => 'id_employee',
'required' => true, 'required' => true,
'options' => array( 'options' => array(
'query' => $this->employees_array, 'query' => $employees_array,
'id' => 'id_employee', 'id' => 'id_employee',
'name' => 'name' 'name' => 'name'
), ),
@@ -233,39 +249,39 @@ class AdminWarehousesControllerCore extends AdminController
public function postProcess() public function postProcess()
{ {
if (isset($_POST['submitAdd'.$this->table])) if (Tools::isSubmit('submitAdd'.$this->table))
{ {
if (!($obj = $this->loadObject(true))) if (!($obj = $this->loadObject(true)))
return; return;
//handle shops associations //handle shops associations
if (isset($_POST['ids_shops'])) if (Tools::isSubmit('ids_shops'))
$obj->setShops($_POST['ids_shops']); $obj->setShops(Tools::getValue('ids_shops'));
//handle carriers associations //handle carriers associations
if (isset($_POST['ids_carriers'])) if (Tools::isSubmit('ids_carriers'))
$obj->setCarriers($_POST['ids_carriers']); $obj->setCarriers(Tools::getValue('ids_carriers'));
// update/create address if not exists // update/create address if not exists
if (isset($_POST['id_address']) && $_POST['id_address'] > 0) if (Tools::isSubmit('id_address') && Tools::getValue('id_address') > 0)
//update address //update address
$address = new Address((int)$_POST['id_address']); $address = new Address((int)Tools::getValue('id_address'));
else else
//create address //create address
$address = new Address(); $address = new Address();
$address->alias = $_POST['name']; $address->alias = Tools::getValue('name');
$address->lastname = $_POST['name']; $address->lastname = Tools::getValue('name');
$address->firstname = $_POST['name']; $address->firstname = Tools::getValue('name');
$address->address1 = $_POST['address']; $address->address1 = Tools::getValue('address');
$address->address2 = $_POST['address2']; $address->address2 = Tools::getValue('address2');
$address->postcode = $_POST['postcode']; $address->postcode = Tools::getValue('postcode');
$address->phone = $_POST['phone']; $address->phone = Tools::getValue('phone');
$address->id_country = $_POST['id_country']; $address->id_country = Tools::getValue('id_country');
$address->id_state = $_POST['id_state']; $address->id_state = Tools::getValue('id_state');
$address->city = $_POST['city']; $address->city = Tools::getValue('city');
if (isset($_POST['id_address']) && $_POST['id_address'] > 0) if (Tools::isSubmit('id_address') && Tools::getValue('id_address') > 0)
{ {
//update address //update address
$address->update(); $address->update();