springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Woot maybe fixed

Browse source
This commit is contained in:
Karl Cordes 2011-04-01 16:23:52 +11:00
parent 5744df45ab
commit 539569fbab
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controllers/jobs_controller.php
View file

@ -73,9 +73,19 @@ class JobsController extends AppController {
function ajax_edit() { function ajax_edit() {
if(isset($this->params['form'])) { 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)) { if ($this->Job->save($job)) {

8
webroot/js/job_grid.js
View file

@ -67,10 +67,10 @@ jQuery(document).ready(function(){
editoptions:{ editoptions:{
value: "ORDER RECEIVED FROM CUSTOMER:ORDER RECEIVED FROM CUSTOMER; ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY:ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY;"+ 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 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;"+ "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" "JOB ON HOLD:JOB ON HOLD;CUSTOMER TO PAY 100% WITH ORDER:CUSTOMER TO PAY 100% WITH ORDER"
} }
}, },