From 24eaa4c0cd9c5a348e4af05c2bf6453cb6035119 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Mon, 29 Apr 2013 22:30:18 +1000
Subject: [PATCH] added currency to job table

---
 app/views/jobs/get_viewable_row.ctp | 165 ++++++++++++++--------------
 app/views/jobs/index.ctp            |   8 +-
 2 files changed, 84 insertions(+), 89 deletions(-)

diff --git a/app/views/jobs/get_viewable_row.ctp b/app/views/jobs/get_viewable_row.ctp
index edb992e5..5ace2ed6 100755
--- a/app/views/jobs/get_viewable_row.ctp
+++ b/app/views/jobs/get_viewable_row.ctp
@@ -2,123 +2,118 @@
 <?
 
 if($job['Job']['deleted'] == 1) {
-$rowClass = 'deleted';
-$button = '<button class="undeleteButton">Undelete</button>';
+	$rowClass = 'deleted';
+	$button = '<button class="undeleteButton">Undelete</button>';
 }
 else {
-$rowClass = '';
-$button = '<button class="deleteButton">X</button>';
+	$rowClass = '';
+	$button = '<button class="deleteButton">X</button>';
 }
 
 ?>
 
 <tr id="<?=$job['Job']['id']?>" class="<?=$rowClass?>">
-    <td>
+	<td>
 	<button class="editButton">Edit</button>
 	<?=$button?>
-    </td>
-    <td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
+	</td>
+	<td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
 
-    <td>
+	<td>
 	<?=$this->element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?>
-    </td>
-    <td>
+	</td>
+	<td>
 	<?=$this->element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?>
-    </td>
+	</td>
 
 
-    <td><?=$job['Job']['job_status'];?></td>
-    <td>
+	<td><?=$job['Job']['job_status'];?></td>
+	<td>
 	<?=$sale_category_array[$job['Job']['sale_category']];?>
-    </td>
-    <td>
+	</td>
+	<td>
 	<?=$job['Job']['job_type'];?></td>
-    <td><?=$shipment_category_options[$job['Job']['shipment_category']];?></td>
-    <td class="nowrap"><?=$html->link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?></td>
-    <td class="nowrap"><?=$html->link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?></td>
-    <td><?=$html->link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?></td>
-    <td><?
-	$poString = '';
-	foreach($job['PurchaseOrder'] as $po) {
+	<td><?=$shipment_category_options[$job['Job']['shipment_category']];?></td>
+	<td class="nowrap"><?=$html->link($job['Job']['title'], array('controller'=>'jobs', 'action'=>'view', $job['Job']['id']));?></td>
+	<td class="nowrap"><?=$html->link($job['Enquiry']['title'], array('controller'=>'enquiries','action'=>'view', $job['Enquiry']['id']));?></td>
+	<td><?=$html->link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?></td>
+	<td><?
+$poString = '';
+foreach($job['PurchaseOrder'] as $po) {
 	$poString .= ' '.$html->link($po['title'], array('controller'=>'purchase_orders', 'action'=>'view', $po['id']));
-	}
-	echo $poString;
-	?>
-    </td>
-    <td class="nowrap"><?
-	foreach($job['PurchaseOrder'] as $po) {
+}
+echo $poString;
+?>
+	</td>
+	<td class="nowrap"><?
+foreach($job['PurchaseOrder'] as $po) {
 	echo $this->element('isEmptyDate', array('date'=>$po['issue_date']));
 	echo "<br>";
-	}
-	?>
-    </td>
-    <td><?=$html->link($job['Customer']['name'], array('controller'=>'customers','action'=>'view', $job['Customer']['id']));?></td>
-    <td>
+}
+?>
+	</td>
+	<td><?=$html->link($job['Customer']['name'], array('controller'=>'customers','action'=>'view', $job['Customer']['id']));?></td>
+	<td>
 	<?=$job['Job']['customer_order_number'];?>
-    </td>
+	</td>
 
-    <td>    <?
-	foreach($job['PurchaseOrder'] as $po) {
+		<td>    <?
+foreach($job['PurchaseOrder'] as $po) {
 	echo $po['principle_reference'];
 	echo "<br>";
-	}
-	?>
-    </td>
+}
+?>
+	</td>
 
-    <td>
+	<td>
 	<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?>
-    </td>
-    <td>
+	</td>
+	<td>
 	<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?>
-    </td>
-    <td> <?=$job['Job']['domestic_freight_paid_by'];?>
-    </td>
-    <td>
+	</td>
+	<td> <?=$job['Job']['domestic_freight_paid_by'];?>
+	</td>
+	<td>
 	<?=$job['Currency']['name'];?>
-    </td>
-    <td>
-	<?=$job['Job']['company_gross_sales_aud'];?>
-
-    </td>
-    <td>
-	<?=$job['Job']['net_sales_aud'];?>
-    </td>
-    <td> <?=$job['Job']['gross_profit_aud'];?>
-    </td>
-    <td>
-	<?=$job['Job']['net_export_sales_aud'];?>
-    </td>
-    <td>
-	<?=$job['Job']['gross_profit_exports_aud'];?>
-    </td>
-    <td>
+	</td>
+	<td>
+			<?=$number->currency($job['Job']['net_sales_aud']);?>
+		</td>
+		<td> <?=$number->currency($job['Job']['gross_profit_aud']);?>
+		</td>
+		<td>
+			<?=$number->currency($job['Job']['net_export_sales_aud']);?>
+		</td>
+		<td>
+			<?=$number->currency($job['Job']['gross_profit_exports_aud']);?>
+		</td>    <td>
 	<?=$job['Job']['gp_percent'];?>
-    </td>
+	</td>
 
-    <td>
+	<td>
 	<?=$job['Job']['ato_exchange_rate'];?>
-    </td>
-    <td> <?=$job['Job']['gross_australian_sales_foreign_currency'];?>
-    </td>
-    <td>
+	</td>
+	<td> <?=$job['Job']['gross_australian_sales_foreign_currency'];?>
+	</td>
+	<td>
 	<?=$job['Job']['net_australian_sales_foreign_currency'];?>
-    </td>
-    <td> <?=$job['Job']['gross_profit_value_australian_sales_foreign_currency'];?>
-    </td>
-    <td>
+	</td>
+	<td> <?=$job['Job']['gross_profit_value_australian_sales_foreign_currency'];?>
+	</td>
+	<td>
 	<?=$job['Job']['gross_export_sales_foreign_currency'];?>
-    </td>
-    <td> <?=$job['Job']['net_export_sales_foreign_currency'];?>
-    </td>
-    <td> <?=$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];?>
-    </td>
-    <td>
+	</td>
+	<td> <?=$job['Job']['net_export_sales_foreign_currency'];?>
+	</td>
+	<td> <?=$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];?>
+	</td>
+	<td>
 	<?=$job['Job']['gross_commissions'];?>
-    </td>
-    <td> <?=$job['Job']['net_commissions'];?>
-    </td>
-    <td>
+	</td>
+	<td> <?=$job['Job']['net_commissions'];?>
+	</td>
+	<td>
 	<button class="editButton">Edit</button>
 	<?=$button?>
-    </td>
-</tr>
\ No newline at end of file
+	</td>
+</tr>
diff --git a/app/views/jobs/index.ctp b/app/views/jobs/index.ctp
index 492a5817..b1382f69 100755
--- a/app/views/jobs/index.ctp
+++ b/app/views/jobs/index.ctp
@@ -158,13 +158,13 @@ echo $paginator->counter(array(
 		<td>
 			<?=$number->currency($job['Job']['net_sales_aud']);?>
 		</td>
-		<td> <?=$job['Job']['gross_profit_aud'];?>
+		<td> <?=$number->currency($job['Job']['gross_profit_aud']);?>
 		</td>
 		<td>
-			<?=$job['Job']['net_export_sales_aud'];?>
+			<?=$number->currency($job['Job']['net_export_sales_aud']);?>
 		</td>
 		<td>
-			<?=$job['Job']['gross_profit_exports_aud'];?>
+			<?=$number->currency($job['Job']['gross_profit_exports_aud']);?>
 		</td>
 		<td>
 			<?=$job['Job']['gp_percent'];?>
@@ -213,4 +213,4 @@ echo $paginator->counter(array(
 <? echo $form->end(); ?>
 
 <? debug($jobs);
-?>
\ No newline at end of file
+?>