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

added currency to job table

Browse source
This commit is contained in:
Karl Cordes 2013-04-29 22:30:18 +10:00
parent d107e13bc5
commit 24eaa4c0cd
2 changed files with 84 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
app/views/jobs/get_viewable_row.ctp
View file

@ -2,123 +2,118 @@
<? <?
if($job['Job']['deleted'] == 1) { if($job['Job']['deleted'] == 1) {
$rowClass = 'deleted'; $rowClass = 'deleted';
$button = '<button class="undeleteButton">Undelete</button>'; $button = '<button class="undeleteButton">Undelete</button>';
} }
else { else {
$rowClass = ''; $rowClass = '';
$button = '<button class="deleteButton">X</button>'; $button = '<button class="deleteButton">X</button>';
} }
?> ?>
<tr id="<?=$job['Job']['id']?>" class="<?=$rowClass?>"> <tr id="<?=$job['Job']['id']?>" class="<?=$rowClass?>">
<td> <td>
<button class="editButton">Edit</button> <button class="editButton">Edit</button>
<?=$button?> <?=$button?>
</td> </td>
<td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td> <td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_received']));?></td>
<td> <td>
<?=$this->element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?> <?=$this->element('booleanTick', array('bool'=>$job['Job']['all_paid'])); ?>
</td> </td>
<td> <td>
<?=$this->element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?> <?=$this->element('booleanTick', array('bool'=>$job['Job']['all_sent'])); ?>
</td> </td>
<td><?=$job['Job']['job_status'];?></td> <td><?=$job['Job']['job_status'];?></td>
<td> <td>
<?=$sale_category_array[$job['Job']['sale_category']];?> <?=$sale_category_array[$job['Job']['sale_category']];?>
</td> </td>
<td> <td>
<?=$job['Job']['job_type'];?></td> <?=$job['Job']['job_type'];?></td>
<td><?=$shipment_category_options[$job['Job']['shipment_category']];?></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['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 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><?=$html->link($principleList[$job['Enquiry']['principle_id']], '/principles/view/'.$job['Enquiry']['principle_id']);?></td>
<td><? <td><?
$poString = ''; $poString = '';
foreach($job['PurchaseOrder'] as $po) { foreach($job['PurchaseOrder'] as $po) {
$poString .= ' '.$html->link($po['title'], array('controller'=>'purchase_orders', 'action'=>'view', $po['id'])); $poString .= ' '.$html->link($po['title'], array('controller'=>'purchase_orders', 'action'=>'view', $po['id']));
} }
echo $poString; echo $poString;
?> ?>
</td> </td>
<td class="nowrap"><? <td class="nowrap"><?
foreach($job['PurchaseOrder'] as $po) { foreach($job['PurchaseOrder'] as $po) {
echo $this->element('isEmptyDate', array('date'=>$po['issue_date'])); echo $this->element('isEmptyDate', array('date'=>$po['issue_date']));
echo "<br>"; echo "<br>";
} }
?> ?>
</td> </td>
<td><?=$html->link($job['Customer']['name'], array('controller'=>'customers','action'=>'view', $job['Customer']['id']));?></td> <td><?=$html->link($job['Customer']['name'], array('controller'=>'customers','action'=>'view', $job['Customer']['id']));?></td>
<td> <td>
<?=$job['Job']['customer_order_number'];?> <?=$job['Job']['customer_order_number'];?>
</td> </td>
<td> <? <td> <?
foreach($job['PurchaseOrder'] as $po) { foreach($job['PurchaseOrder'] as $po) {
echo $po['principle_reference']; echo $po['principle_reference'];
echo "<br>"; echo "<br>";
} }
?> ?>
</td> </td>
<td> <td>
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?> <?=$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']));?> <?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?>
</td> </td>
<td> <?=$job['Job']['domestic_freight_paid_by'];?> <td> <?=$job['Job']['domestic_freight_paid_by'];?>
</td> </td>
<td> <td>
<?=$job['Currency']['name'];?> <?=$job['Currency']['name'];?>
</td> </td>
<td> <td>
<?=$job['Job']['company_gross_sales_aud'];?> <?=$number->currency($job['Job']['net_sales_aud']);?>
</td>
</td> <td> <?=$number->currency($job['Job']['gross_profit_aud']);?>
<td> </td>
<?=$job['Job']['net_sales_aud'];?> <td>
</td> <?=$number->currency($job['Job']['net_export_sales_aud']);?>
<td> <?=$job['Job']['gross_profit_aud'];?> </td>
</td> <td>
<td> <?=$number->currency($job['Job']['gross_profit_exports_aud']);?>
<?=$job['Job']['net_export_sales_aud'];?> </td> <td>
</td>
<td>
<?=$job['Job']['gross_profit_exports_aud'];?>
</td>
<td>
<?=$job['Job']['gp_percent'];?> <?=$job['Job']['gp_percent'];?>
</td> </td>
<td> <td>
<?=$job['Job']['ato_exchange_rate'];?> <?=$job['Job']['ato_exchange_rate'];?>
</td> </td>
<td> <?=$job['Job']['gross_australian_sales_foreign_currency'];?> <td> <?=$job['Job']['gross_australian_sales_foreign_currency'];?>
</td> </td>
<td> <td>
<?=$job['Job']['net_australian_sales_foreign_currency'];?> <?=$job['Job']['net_australian_sales_foreign_currency'];?>
</td> </td>
<td> <?=$job['Job']['gross_profit_value_australian_sales_foreign_currency'];?> <td> <?=$job['Job']['gross_profit_value_australian_sales_foreign_currency'];?>
</td> </td>
<td> <td>
<?=$job['Job']['gross_export_sales_foreign_currency'];?> <?=$job['Job']['gross_export_sales_foreign_currency'];?>
</td> </td>
<td> <?=$job['Job']['net_export_sales_foreign_currency'];?> <td> <?=$job['Job']['net_export_sales_foreign_currency'];?>
</td> </td>
<td> <?=$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];?> <td> <?=$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];?>
</td> </td>
<td> <td>
<?=$job['Job']['gross_commissions'];?> <?=$job['Job']['gross_commissions'];?>
</td> </td>
<td> <?=$job['Job']['net_commissions'];?> <td> <?=$job['Job']['net_commissions'];?>
</td> </td>
<td> <td>
<button class="editButton">Edit</button> <button class="editButton">Edit</button>
<?=$button?> <?=$button?>
</td> </td>
</tr> </tr>

8
app/views/jobs/index.ctp
View file

@ -158,13 +158,13 @@ echo $paginator->counter(array(
<td> <td>
<?=$number->currency($job['Job']['net_sales_aud']);?> <?=$number->currency($job['Job']['net_sales_aud']);?>
</td> </td>
<td> <?=$job['Job']['gross_profit_aud'];?> <td> <?=$number->currency($job['Job']['gross_profit_aud']);?>
</td> </td>
<td> <td>
<?=$job['Job']['net_export_sales_aud'];?> <?=$number->currency($job['Job']['net_export_sales_aud']);?>
</td> </td>
<td> <td>
<?=$job['Job']['gross_profit_exports_aud'];?> <?=$number->currency($job['Job']['gross_profit_exports_aud']);?>
</td> </td>
<td> <td>
<?=$job['Job']['gp_percent'];?> <?=$job['Job']['gp_percent'];?>
@ -213,4 +213,4 @@ echo $paginator->counter(array(
<? echo $form->end(); ?> <? echo $form->end(); ?>
<? debug($jobs); <? debug($jobs);
?> ?>