diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php
index c8fb6ff9..c9ceac7e 100755
--- a/controllers/jobs_controller.php
+++ b/controllers/jobs_controller.php
@@ -32,8 +32,15 @@ class JobsController extends AppController {
/** Called via AJAX to get an editable row */
function getEditableRow($id) {
$this->layout = 'ajax';
- $this->set('job', $this->Job->find('first', array('conditions'=>array('Job.id'=>$id))));
+
+ $job = $this->Job->find('first', array('conditions'=>array('Job.id'=>$id)));
+ $this->set('job', $job);
+
+ $this->data = $job;
+
+
+ $this->set('yesNo', array(0=>'No', 1=>'Yes'));
$this->set('currencies', $this->Job->Currency->find('list'));
$this->set('sale_category_options', $this->sale_category_options());
$this->set('sale_category_array', $this->sale_category_array());
@@ -95,19 +102,19 @@ class JobsController extends AppController {
$numberOfDaysInMonth = date('t', $startDateTime);
- $endDate = $year.'-'.$nMonth.'-'.$numberOfDaysInMonth;
+ $endDate = $year.'-'.$nMonth.'-'.$numberOfDaysInMonth;
- $jobs = $this->Job->find('all', array('conditions'=>
- array('Job.date_order_received BETWEEN ? AND ?'=>array($startDate, $endDate))));
+ $jobs = $this->Job->find('all', array('conditions'=>
+ array('Job.date_order_received BETWEEN ? AND ?'=>array($startDate, $endDate))));
- $this->set('jobs', $jobs);
+ $this->set('jobs', $jobs);
- $this->set('principleList',$this->Job->Enquiry->Principle->find('list'));
+ $this->set('principleList',$this->Job->Enquiry->Principle->find('list'));
- $this->set('startDate',$startDate);
- $this->set('endDate',$endDate);
+ $this->set('startDate',$startDate);
+ $this->set('endDate',$endDate);
}
@@ -161,13 +168,14 @@ class JobsController extends AppController {
function job_status_options() {
$options = array('ORDER RECEIVED FROM CUSTOMER',
'ORDER PLACED ON PRINCIPLE - WAITING ON DELIVERY',
- 'GOODS SHIPPED TO CUSTOMER - CMC WAITING ON PAYMENT',
- 'WAITING ON PAYMENT AND ANOTHER DELIVERY',
- 'GOODS DELIVERED TO CUSTOMER - CMC PAID IN FULL',
- 'PAID IN FULL WAITING ON DELIVERY',
+ 'GOODS SHIPPED TO CUSTOMER',
+ 'WAITING ON DELIVERY',
+ 'MULTIPLE SHIPMENTS CMC WAITING ON ANOTHER DELIVERY',
+ 'GOODS DELIVERED TO CUSTOMER',
'JOB CANCELLED',
'JOB ON HOLD',
- 'CUSTOMER TO PAY 100% WITH ORDER');
+ 'CUSTOMER TO PAY 100% WITH ORDER'
+ );
$options = $this->buildEnumOpts($options);
return $options;
}
diff --git a/views/elements/booleanTick.ctp b/views/elements/booleanTick.ctp
new file mode 100644
index 00000000..1a8be328
--- /dev/null
+++ b/views/elements/booleanTick.ctp
@@ -0,0 +1,5 @@
+image('tick.png');
+}
+?>
\ No newline at end of file
diff --git a/views/jobs/get_editable_row.ctp b/views/jobs/get_editable_row.ctp
index 8ea1ca71..f4c73cec 100644
--- a/views/jobs/get_editable_row.ctp
+++ b/views/jobs/get_editable_row.ctp
@@ -56,11 +56,14 @@ else {
}*/
?>
+
input('id', array('type'=>'hidden', 'value'=>$job['Job']['id'])); ?>
| |
input('date_order_received_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_order_received_display'));?>
input('date_order_received', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_received', 'value'=>$job['Job']['date_order_received']));?>
|
+input('all_paid', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_paid'], 'class'=>'yesNo'));?> |
+input('all_sent', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_sent'], 'class'=>'yesNo'));?> |
input('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>''));?> |
input('sale_category', array('options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?>
diff --git a/views/jobs/get_viewable_row.ctp b/views/jobs/get_viewable_row.ctp
index d735970e..9dafc7d9 100644
--- a/views/jobs/get_viewable_row.ctp
+++ b/views/jobs/get_viewable_row.ctp
@@ -1,6 +1,15 @@
|
|
element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?> |
+
+
+ element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?>
+ |
+
+ element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?>
+ |
+
+
|
diff --git a/views/jobs/index.ctp b/views/jobs/index.ctp
index a29ade9f..3b6c5b14 100644
--- a/views/jobs/index.ctp
+++ b/views/jobs/index.ctp
@@ -37,6 +37,8 @@ echo $paginator->counter(array(
| Actions |
sort('Order Received', 'date_order_received');?> |
+ sort('All Paid', 'all_paid');?> |
+ sort('All Sent', 'all_sent');?> |
sort('Status', 'job_status');?> |
sort('Sale Category');?> |
sort('Job Type', 'job_type');?> |
@@ -81,6 +83,12 @@ echo $paginator->counter(array(
|
element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?> |
+
+ element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?>
+ |
+
+ element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?>
+ |
|
@@ -110,7 +118,7 @@ echo $paginator->counter(array(
|
";
}
diff --git a/views/purchase_orders/view.ctp b/views/purchase_orders/view.ctp
index e8e8331c..00d06498 100755
--- a/views/purchase_orders/view.ctp
+++ b/views/purchase_orders/view.ctp
@@ -46,19 +46,10 @@
- link(__('Edit PurchaseOrder', true), array('action' => 'edit', $purchaseOrder['PurchaseOrder']['id'])); ?>
- - link(__('Delete PurchaseOrder', true), array('action' => 'delete', $purchaseOrder['PurchaseOrder']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $purchaseOrder['PurchaseOrder']['id'])); ?>
- - link(__('List PurchaseOrders', true), array('action' => 'index')); ?>
- - link(__('New PurchaseOrder', true), array('action' => 'add')); ?>
- - link(__('List Principles', true), array('controller' => 'principles', 'action' => 'index')); ?>
- - link(__('New Principle', true), array('controller' => 'principles', 'action' => 'add')); ?>
- - link(__('List Documents', true), array('controller' => 'documents', 'action' => 'index')); ?>
- - link(__('New Document', true), array('controller' => 'documents', 'action' => 'add')); ?>
- - link(__('List Jobs', true), array('controller' => 'jobs', 'action' => 'index')); ?>
- - link(__('New Job', true), array('controller' => 'jobs', 'action' => 'add')); ?>
|