diff --git a/controllers/customers_controller.php b/controllers/customers_controller.php index a1572104..24628ece 100755 --- a/controllers/customers_controller.php +++ b/controllers/customers_controller.php @@ -33,12 +33,18 @@ class CustomersController extends AppController { $this->set('addresses', $this->Customer->Address->findAllByCustomerId($id)); $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.customer_id' => $id))); $this->set('contacts', $this->Customer->Contact->find('all', array('conditions' => array('customer_id' => $id), 'order' => 'Contact.last_name ASC'))); - $statuses = $this->Customer->Enquiry->Status->find('all'); - $status_list = array(); - foreach ($statuses as $status) { - $status_list[] = array($status['Status']['id'], $status['Status']['name']); - } - $this->set('status_list', $status_list); + + + + $statuses = $this->Customer->Enquiry->Status->find('all', array('recursive'=>0)); + $status_list = array(); + foreach ($statuses as $status) { + $statusid = $status['Status']['id']; + $status_list[$statusid] = $status['Status']['name']; + } + $this->set('status_list', $status_list); + + $this->set('parent_industry_list', $this->Customer->Industry->find('list', array('conditions' => array('parent_id' => null)))); } diff --git a/controllers/statuses_controller.php b/controllers/statuses_controller.php index 280889e0..67522936 100755 --- a/controllers/statuses_controller.php +++ b/controllers/statuses_controller.php @@ -64,6 +64,8 @@ class StatusesController extends AppController { } } + + function jsonList($selectedId = null) { $statuses = $this->Status->find('all', array('recursive'=>0)); @@ -74,8 +76,10 @@ class StatusesController extends AppController { } $status_list['selected'] = $selectedId; + + $jsonList = json_encode($status_list); - $this->set('status_list', $status_list); + $this->set('json_status_list', $jsonList); } } diff --git a/controllers/users_controller.php b/controllers/users_controller.php index 209d3959..e6230192 100755 --- a/controllers/users_controller.php +++ b/controllers/users_controller.php @@ -71,12 +71,13 @@ class UsersController extends AppController { $this->set('user', $this->User->read(null, $id)); $this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.user_id' => $id))); - $statuses = $this->User->Enquiry->Status->find('all'); - $status_list = array(); - foreach ($statuses as $status) { - $status_list[] = array($status['Status']['id'], $status['Status']['name']); - } - $this->set('status_list', $status_list); + $statuses = $this->User->Enquiry->Status->find('all', array('recursive'=>0)); + $status_list = array(); + foreach ($statuses as $status) { + $statusid = $status['Status']['id']; + $status_list[$statusid] = $status['Status']['name']; + } + $this->set('status_list', $status_list); }