diff --git a/controllers/contacts_controller.php b/controllers/contacts_controller.php index f4950b9e..af7a682a 100755 --- a/controllers/contacts_controller.php +++ b/controllers/contacts_controller.php @@ -9,6 +9,7 @@ class ContactsController extends AppController { 'Enquiry' => array('order' => array('Enquiry.id' => 'asc')) ); + function index() { $this->Contact->recursive = 0; $this->set('contacts', $this->paginate()); diff --git a/controllers/customers_controller.php b/controllers/customers_controller.php index 511edb8d..19b0edb3 100755 --- a/controllers/customers_controller.php +++ b/controllers/customers_controller.php @@ -32,7 +32,7 @@ class CustomersController extends AppController { $this->set('customer', $this->Customer->read(null, $id)); $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'))); + $this->set('contacts', $this->Customer->Contact->find('all', array('conditions' => array('customer_id' => $id)))); $this->set('invoices', $this->Customer->Invoice->find('all', array('conditions'=>array('Invoice.customer_id'=>$id), 'order'=> 'Invoice.id DESC'))); $this->set('jobs', $this->Customer->Job->find('all', array('conditions'=>array('Job.customer_id'=>$id), 'order'=> 'Job.id DESC'))); diff --git a/models/user.php b/models/user.php index 2d489edd..356caf44 100755 --- a/models/user.php +++ b/models/user.php @@ -12,6 +12,8 @@ class User extends AppModel { ); + var $order = 'first_name ASC'; + /* TO DO: Fix up this validation stuff var $validate = array( 'username' => array( diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp index d02c0878..f8ec3875 100644 --- a/views/jobs/index.ctp +++ b/views/jobs/index.ctp @@ -47,7 +47,7 @@ echo $paginator->counter(array( Date Order Placed on Principle sort('Customer','Customer.name');?> Customer Order No - sort('Supplier Ref');?> + sort('Principle Ref', 'principle_reference');?> sort('Scheduled Ex-Works', 'date_scheduled_ex_works');?> sort('Date Sent to Customer', 'date_sent_to_customer');?> sort('Freight Paid By CMC');?> @@ -115,7 +115,7 @@ echo $paginator->counter(array( - "; @@ -135,11 +135,11 @@ echo $paginator->counter(array( - + currency($job['Job']['company_gross_sales_aud']);?> - + currency($job['Job']['net_sales_aud']);?> diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index bbba7b9f..423d07a7 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -1337,7 +1337,7 @@ select.sale_category { input.highlighted { - background-color:#77A7FF; + background-color:#F9FF4C; font-size: 100%; }