From 539569fbabdb061c8012430cc7d8fd995f9e4748 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Fri, 1 Apr 2011 16:23:52 +1100 Subject: [PATCH] Woot maybe fixed --- controllers/jobs_controller.php | 14 ++++++++++++-- webroot/js/job_grid.js | 8 ++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php index 02d2c7f7..6f343dce 100755 --- a/controllers/jobs_controller.php +++ b/controllers/jobs_controller.php @@ -73,9 +73,19 @@ class JobsController extends AppController { function ajax_edit() { if(isset($this->params['form'])) { - $job = $this->params['form']; + $formData = $this->params['form']; - print_r($job); + /* $thisJob['Job'] = array( + 'id'=> $formData['id'], + 'job_status' => $formData['job_status'] + + + );*/ + + $job['Job'] = $this->params['form']; + + + //print_r($thisJob); if ($this->Job->save($job)) { diff --git a/webroot/js/job_grid.js b/webroot/js/job_grid.js index b04b1115..7aa49576 100644 --- a/webroot/js/job_grid.js +++ b/webroot/js/job_grid.js @@ -67,10 +67,10 @@ jQuery(document).ready(function(){ editoptions:{ - value: "ORDER RECEIVED FROM CUSTOMER:ORDER RECEIVED FROM CUSTOMER; ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY:ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY;"+ - "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" + value: "ORDER RECEIVED FROM CUSTOMER:ORDER RECEIVED FROM CUSTOMER;ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY:ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY;"+ + "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" } },