diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 91e3275c..02d2c7f7 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -66,7 +66,7 @@ class JobsController extends AppController { $customers = $this->Job->Enquiry->Customer->find('list'); $this->set('customers', $customers); - $this->set('currencies', $this->Job->Currency->find('list')); + //$this->set('currencies', $this->Job->Currency->find('list')); } diff --git a/views/jobs/build_jobs_json.ctp b/views/jobs/build_jobs_json.ctp index ca3a0f00..bf18be4b 100644 --- a/views/jobs/build_jobs_json.ctp +++ b/views/jobs/build_jobs_json.ctp @@ -89,4 +89,6 @@ foreach($jobs as $job) { $jsonObj = json_encode($recordObj); echo $jsonObj; -?> \ No newline at end of file +?> + + \ No newline at end of file diff --git a/webroot/js/job_grid.js b/webroot/js/job_grid.js index b1aca5d6..b04b1115 100644 --- a/webroot/js/job_grid.js +++ b/webroot/js/job_grid.js @@ -71,7 +71,6 @@ jQuery(document).ready(function(){ "GOODS SHIPPED TO CUSTOMER - CMC WAITING ON PAYMENT:GOODS SHIPPED TO CUSTOMER - CMC WAITING ON PAYMENT; WAITING ON PAYMENT AND ANOTHER DELIVERY:WAITING ON PAYMENT AND ANOTHER DELIVERY;"+ "GOODS DELIVERED TO CUSTOMER & PAID IN FULL:GOODS DELIVERED TO CUSTOMER & PAID IN FULL; PAID IN FULL WAITING ON DELIVERY:PAID IN FULL WAITING ON DELIVERY; JOB CANCELLED:JOB CANCELLED;"+ "JOB ON HOLD:JOB ON HOLD; CUSTOMER TO PAY 100% WITH ORDER:CUSTOMER TO PAY 100% WITH ORDER" - } },