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

Fixed up reporting with foreign values

Browse source
This commit is contained in:
Karl Cordes 2011-04-07 20:21:46 +10:00
parent 100657c28f
commit 3bae951ed4
2 changed files with 63 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/jobs_controller.php
View file

@ -2,7 +2,7 @@
class JobsController extends AppController {
var $name = 'Jobs';
var $helpers = array('Html', 'Form', 'Text', 'Javascript');
var $helpers = array('Html', 'Form', 'Text', 'Javascript', 'Number');
var $components = array('RequestHandler');

72
views/jobs/view_report.ctp
View file

@ -19,6 +19,16 @@
<th>Net Sales Converted to or Charge in AUD</th>
<th>GP% Excl Commissions</th>
<th>ATO Exchange Rate</th>
<th>Gross Australian Sales Foreign Currency</th>
<th>Net Australian Sales Foreign Currency</th>
<th>Gross Profit value Australian Sales Foreign Currency</th>
<th>Gross Export Sales Foreign Currency</th>
<th>Net Export Sales Foreign Currency</th>
<th>Gross Profit Value After Discount Exports Foreign Currency</th>
<th>Gross Commissions</th>
<th>Net Commisions</th>
</tr>
</thead>
<tbody>
@ -29,6 +39,15 @@
$net_sales_aud_total = 0;
$gross_profit_total = 0;
$count = 0;
$gross_profit_exports_aud_total = 0;
$gross_australian_sales_foreign_currency_total = 0;
$net_australian_sales_foreign_currency_total = 0;
$gross_profit_value_australian_sales_foreign_currency_total = 0;
$gross_export_sales_foreign_currency_total =0;
$net_export_sales_foreign_currency_total = 0;
$gross_profit_value_after_discount_exports_foreign_currency_total =0;
$gross_commissions_total =0;
$net_commissions_total = 0;
?>
<?foreach($jobs as $job):?>
@ -70,25 +89,44 @@
<td>
<?=$job['Job']['ato_exchange_rate'];?>
</td>
<? /*<td> <?=$job['Job']['gross_australian_sales_foreign_currency'];?>
<td> <?=$job['Job']['gross_australian_sales_foreign_currency'];?>
<? $gross_australian_sales_foreign_currency_total += $job['Job']['gross_australian_sales_foreign_currency']; ?>
</td>
<td>
<?=$job['Job']['net_australian_sales_foreign_currency'];?>
<?=$job['Job']['net_australian_sales_foreign_currency'];
$net_australian_sales_foreign_currency_total += $job['Job']['net_australian_sales_foreign_currency'];
?>
</td>
<td> <?=$job['Job']['gross_profit_value_australian_sales_foreign_currency'];?>
<td> <?=$job['Job']['gross_profit_value_australian_sales_foreign_currency'];
$gross_profit_value_australian_sales_foreign_currency_total += $job['Job']['gross_profit_value_australian_sales_foreign_currency'];
?>
</td>
<td>
<?=$job['Job']['gross_export_sales_foreign_currency'];?>
<?=$job['Job']['gross_export_sales_foreign_currency'];
$gross_export_sales_foreign_currency_total += $job['Job']['gross_export_sales_foreign_currency'];
?>
</td>
<td> <?=$job['Job']['net_export_sales_foreign_currency'];?>
<td> <?=$job['Job']['net_export_sales_foreign_currency'];
$net_export_sales_foreign_currency_total += $job['Job']['net_export_sales_foreign_currency'];
?>
</td>
<td> <?=$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];?>
<td> <?=$job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];
$gross_profit_value_after_discount_exports_foreign_currency_total += $job['Job']['gross_profit_value_after_discount_exports_foreign_currency'];
?>
</td>
<td>
<?=$job['Job']['gross_commissions'];?>
<?=$job['Job']['gross_commissions'];
$gross_commissions_total += $job['Job']['gross_commissions'];
?>
</td>
<td> <?=$job['Job']['net_commissions'];
$net_commissions_total += $job['Job']['net_commissions'];
?>
</td>
<td> <?=$job['Job']['net_commissions'];?>
</td> */?>
</tr>
<?
$count++;
@ -102,12 +140,22 @@
<td><? //Principle ?></td>
<td><? //Customer ?></td>
<td><? //Sale Currency?></td>
<td><?=$gross_sales_aud_total?></td>
<td><?=$net_sales_aud_total?></td>
<td><?=$gross_profit_total?></td>
<td><?=$number->currency($gross_sales_aud_total)?></td>
<td><?=$number->currency($net_sales_aud_total)?></td>
<td><?=$number->currency($gross_profit_total)?></td>
<td><? //Net Sales Conv to AUD?></td>
<td><? //GP % Excl Comm?> </td>
<td><? //ATO EXH RATE?></td>
<td><?=$number->currency($gross_australian_sales_foreign_currency_total);?></td>
<td><?=$number->currency($net_australian_sales_foreign_currency_total);?></td>
<td><?=$number->currency($gross_profit_value_australian_sales_foreign_currency_total);?></td>
<td><?=$number->currency($gross_export_sales_foreign_currency_total);?></td>
<td><?=$number->currency($net_export_sales_foreign_currency_total);?></td>
<td><?=$number->currency($gross_profit_value_after_discount_exports_foreign_currency_total);?></td>
<td><?=$number->currency($gross_commissions_total);?></td>
<td><?=$number->currency($net_commissions_total);?></td>
</tr>
</tfoot>
</table>