Added all paid and all sent cols to jobs index

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());
@@ -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;
     }

views/elements/booleanTick.ctp

@@ -0,0 +1,5 @@
+<?
+if($bool == 1) {
+    echo $html->image('tick.png');
+}
+?>

views/jobs/get_editable_row.ctp

@@ -56,11 +56,14 @@ else {
 }*/
 
 ?>
+
 <?=$form->input('id', array('type'=>'hidden', 'value'=>$job['Job']['id'])); ?>
 <td><button class="saveButton">Save</button> <button class="cancelButton">Cancel</button></td>
 <td><?=$form->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'));?>
     <?=$form->input('date_order_received', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_received', 'value'=>$job['Job']['date_order_received']));?>
 </td>
+<td><?=$form->input('all_paid', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_paid'], 'class'=>'yesNo'));?></td>
+<td><?=$form->input('all_sent', array('type'=>'select','options'=>array($yesNo), 'label'=>false, 'selected'=>$job['Job']['all_sent'], 'class'=>'yesNo'));?></td>
 <td><?=$form->input('job_status', array('type'=>'select', 'options'=>$job_status_options, 'value'=>$job['Job']['job_status'], 'label'=>false, 'class'=>''));?></td>
 <td>
     <?=$form->input('sale_category', array('options'=>$sale_category_options, 'type'=>'select', 'label'=>false, 'value'=>$job['Job']['sale_category'], 'class'=>'sale_category'));?>

views/jobs/get_viewable_row.ctp

@@ -1,6 +1,15 @@
 <tr id="<?=$job['Job']['id']?>">
     <td><button class="editButton">Edit</button></td>
     <td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
+
+    <td>
+	<?=$this->element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?>
+    </td>
+    <td>
+	<?=$this->element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?>
+    </td>
+
+
     <td><?=$job['Job']['job_status'];?></td>
     <td>
 	<?=$sale_category_array[$job['Job']['sale_category']];?>

views/jobs/index.ctp

@@ -37,6 +37,8 @@ echo $paginator->counter(array(
 
 	    <th class="actions">Actions</th>
 	    <th><?php echo $paginator->sort('Order Received', 'date_order_received');?></th>
+	    <th><?php echo $paginator->sort('All Paid', 'all_paid');?></th>
+	    <th><?php echo $paginator->sort('All Sent', 'all_sent');?></th>
 	    <th><?php echo $paginator->sort('Status', 'job_status');?></th>
 	    <th class="sale_category"><?php echo $paginator->sort('Sale Category');?></th>
 	    <th><?php echo $paginator->sort('Job Type', 'job_type');?></th>
@@ -81,6 +83,12 @@ echo $paginator->counter(array(
 	    <td><button class="editButton">Edit</button></td>
 	    <td>
 		    <?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
+	    <td>
+		    <?=$this->element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?>
+	    </td>
+	    <td>
+		    <?=$this->element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?>
+	    </td>
 	    <td class=""><?=$job['Job']['job_status'];?></td>
 	    <td class="sale_category nowrap">
 		    <?=$sale_category_array[$job['Job']['sale_category']];?>

views/purchase_orders/view.ctp

@@ -46,19 +46,10 @@
 <div class="actions">
 	<ul>
 		<li><?php echo $html->link(__('Edit PurchaseOrder', true), array('action' => 'edit', $purchaseOrder['PurchaseOrder']['id'])); ?> </li>
-		<li><?php echo $html->link(__('Delete PurchaseOrder', true), array('action' => 'delete', $purchaseOrder['PurchaseOrder']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $purchaseOrder['PurchaseOrder']['id'])); ?> </li>
-		<li><?php echo $html->link(__('List PurchaseOrders', true), array('action' => 'index')); ?> </li>
-		<li><?php echo $html->link(__('New PurchaseOrder', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $html->link(__('List Principles', true), array('controller' => 'principles', 'action' => 'index')); ?> </li>
-		<li><?php echo $html->link(__('New Principle', true), array('controller' => 'principles', 'action' => 'add')); ?> </li>
-		<li><?php echo $html->link(__('List Documents', true), array('controller' => 'documents', 'action' => 'index')); ?> </li>
-		<li><?php echo $html->link(__('New Document', true), array('controller' => 'documents', 'action' => 'add')); ?> </li>
-		<li><?php echo $html->link(__('List Jobs', true), array('controller' => 'jobs', 'action' => 'index')); ?> </li>
-		<li><?php echo $html->link(__('New Job', true), array('controller' => 'jobs', 'action' => 'add')); ?> </li>
 	</ul>
 </div>
 <div class="related">
-	<h3><?php __('Related Jobs');?></h3>
+	<h3>PO for these Jobs</h3>
 	<?php if (!empty($purchaseOrder['Job'])):?>
 	<table cellpadding = "0" cellspacing = "0">
 	<tr>

webroot/css/quotenik.css

@@ -374,7 +374,7 @@ div.quoteproducts {
     padding-top: 3%;
 }
 
- Tables
+/* Tables */
 table {
     background: #fff;
     border:1px solid #ccc;
@@ -1313,6 +1313,11 @@ select.sale_category {
     width: 300px;
 }
 
+
+select.yesNo {
+    width: 50px;
+}
+
 select.job_status {
     width: 300px;
 }
@@ -1330,6 +1335,9 @@ select.job_status {
 }
 
 
+
+
+
 /* CSS for the Job Reporting */
 
 #yearMonths {