Removed PO details from Job model.
This commit is contained in:
Karl Cordes
parent
3bae951ed4
commit
f8fe6fbdb1
|
|
@ -15,14 +15,6 @@
|
|||
});
|
||||
|
||||
|
||||
$('#<?=$job['Job']['id']?>_date_order_placed_on_principle_display').datepicker({
|
||||
showButtonPanel: true,
|
||||
dateFormat: 'd M yy',
|
||||
altFormat: 'yy-mm-dd',
|
||||
altField: '#<?=$job['Job']['id']?>_date_order_placed_on_principle'
|
||||
|
||||
});
|
||||
|
||||
$('#<?=$job['Job']['id']?>_date_scheduled_ex_works_display').datepicker({
|
||||
showButtonPanel: true,
|
||||
dateFormat: 'd M yy',
|
||||
|
|
@ -86,17 +78,24 @@ else {
|
|||
echo $poString;
|
||||
?>
|
||||
</td>
|
||||
<td><?=$form->input('date_order_placed_on_principle_display', array('value'=>$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_placed_on_principle'])), 'label'=>false, 'id'=>$job['Job']['id'].'_date_order_placed_on_principle_display'));?>
|
||||
<?=$form->input('date_order_placed_on_principle', array('type'=>'hidden', 'id'=>$job['Job']['id'].'_date_order_placed_on_principle', 'value'=>$job['Job']['date_order_placed_on_principle']));?>
|
||||
<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>
|
||||
<?=$form->input('customer_order_number', array('value'=>$job['Job']['customer_order_number'], 'label'=>false));?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?=$form->input('supplier_reference', array('value'=>$job['Job']['supplier_reference'], 'label'=>false));?>
|
||||
<td> <?
|
||||
foreach($job['PurchaseOrder'] as $po) {
|
||||
echo $po['principle_reference'];
|
||||
echo "<br>";
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -18,14 +18,24 @@
|
|||
echo $poString;
|
||||
?>
|
||||
</td>
|
||||
<td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_placed_on_principle']));?></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>
|
||||
<?=$job['Job']['customer_order_number'];?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?=$job['Job']['supplier_reference'];?>
|
||||
<td> <?
|
||||
foreach($job['PurchaseOrder'] as $po) {
|
||||
echo $po['principle_reference'];
|
||||
echo "<br>";
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -31,141 +31,150 @@ echo $paginator->counter(array(
|
|||
</div>
|
||||
|
||||
|
||||
<table cellpadding="0" cellspacing="0" class="jobsTable">
|
||||
<thead class="jobTableHead">
|
||||
<tr class="jobTableHeadRow" id="originalHeader">
|
||||
<table cellpadding="0" cellspacing="0" class="jobsTable">
|
||||
<thead class="jobTableHead">
|
||||
<tr class="jobTableHeadRow" id="originalHeader">
|
||||
|
||||
<th class="actions">Actions</th>
|
||||
<th><?php echo $paginator->sort('Order Received', 'date_order_received');?></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>
|
||||
<th><?php echo $paginator->sort('Shipment Category','shipment_category');?></th>
|
||||
<th><?php echo $paginator->sort('Job Number','title');?></th>
|
||||
<th>Enquiry Number</th>
|
||||
<th>CMC POs</th>
|
||||
<th>Date Order Placed on Principle</th>
|
||||
<th><?php echo $paginator->sort('Customer','Customer.name');?></th>
|
||||
<th>Customer Order No</th>
|
||||
<th><?php echo $paginator->sort('Supplier Ref');?></th>
|
||||
<th><?php echo $paginator->sort('Scheduled Ex-Works', 'date_scheduled_ex_works');?></th>
|
||||
<th><?php echo $paginator->sort('Date Sent to Customer', 'date_sent_to_customer');?></th>
|
||||
<th><?php echo $paginator->sort('Freight Paid By CMC');?></th>
|
||||
<th><?php echo $paginator->sort('Sale Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Sales AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Net Sales AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Net Export Sales Converted to Or Invoiced in AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit Value Export in AUD');?></th>
|
||||
<th><?php echo $paginator->sort('GP% Excl Commissions');?></th>
|
||||
<th><?php echo $paginator->sort('ATO Exchange Rate');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Australian Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Net Australian Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit value Australian Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Export Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Net Export Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit Value After Discount Exports Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Commissions');?></th>
|
||||
<th><?php echo $paginator->sort('Net Commisions');?></th>
|
||||
<th class="actions"><?php __('Actions');?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<? //echo $form->create('Job', array('action'=>'ajax_edit', 'class'=>'job_table_form', 'default'=>false));
|
||||
?>
|
||||
<th class="actions">Actions</th>
|
||||
<th><?php echo $paginator->sort('Order Received', 'date_order_received');?></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>
|
||||
<th><?php echo $paginator->sort('Shipment Category','shipment_category');?></th>
|
||||
<th><?php echo $paginator->sort('Job Number','title');?></th>
|
||||
<th>Enquiry Number</th>
|
||||
<th>CMC POs</th>
|
||||
<th>Date Order Placed on Principle</th>
|
||||
<th><?php echo $paginator->sort('Customer','Customer.name');?></th>
|
||||
<th>Customer Order No</th>
|
||||
<th><?php echo $paginator->sort('Supplier Ref');?></th>
|
||||
<th><?php echo $paginator->sort('Scheduled Ex-Works', 'date_scheduled_ex_works');?></th>
|
||||
<th><?php echo $paginator->sort('Date Sent to Customer', 'date_sent_to_customer');?></th>
|
||||
<th><?php echo $paginator->sort('Freight Paid By CMC');?></th>
|
||||
<th><?php echo $paginator->sort('Sale Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Sales AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Net Sales AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Net Export Sales Converted to Or Invoiced in AUD');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit Value Export in AUD');?></th>
|
||||
<th><?php echo $paginator->sort('GP% Excl Commissions');?></th>
|
||||
<th><?php echo $paginator->sort('ATO Exchange Rate');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Australian Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Net Australian Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit value Australian Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Export Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Net Export Sales Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Profit Value After Discount Exports Foreign Currency');?></th>
|
||||
<th><?php echo $paginator->sort('Gross Commissions');?></th>
|
||||
<th><?php echo $paginator->sort('Net Commisions');?></th>
|
||||
<th class="actions"><?php __('Actions');?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<? //echo $form->create('Job', array('action'=>'ajax_edit', 'class'=>'job_table_form', 'default'=>false));
|
||||
?>
|
||||
|
||||
<? foreach($jobs as $job):?>
|
||||
<? foreach($jobs as $job):?>
|
||||
|
||||
|
||||
<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 class=""><?=$job['Job']['job_status'];?></td>
|
||||
<td class="sale_category nowrap">
|
||||
<?=$sale_category_array[$job['Job']['sale_category']];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['job_type'];?></td>
|
||||
<td><?=$job['Job']['shipment_category'];?></td>
|
||||
<td><?=$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><?
|
||||
$poString = '';
|
||||
foreach($job['PurchaseOrder'] as $po) {
|
||||
$poString .= ' '.$html->link($po['title'], array('controller'=>'purchase_orders', 'action'=>'view', $po['id']));
|
||||
}
|
||||
echo $poString;
|
||||
?>
|
||||
</td>
|
||||
<td><?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_placed_on_principle']));?></td>
|
||||
<td><?=$html->link($job['Customer']['name'], array('controller'=>'customers','action'=>'view', $job['Customer']['id']));?></td>
|
||||
<td class="nowrap">
|
||||
<?=$job['Job']['customer_order_number'];?>
|
||||
</td>
|
||||
<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 class=""><?=$job['Job']['job_status'];?></td>
|
||||
<td class="sale_category nowrap">
|
||||
<?=$sale_category_array[$job['Job']['sale_category']];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['job_type'];?></td>
|
||||
<td><?=$job['Job']['shipment_category'];?></td>
|
||||
<td><?=$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><?
|
||||
$poString = '';
|
||||
foreach($job['PurchaseOrder'] as $po) {
|
||||
echo $html->link($po['title'], array('controller'=>'purchase_orders', 'action'=>'view', $po['id']))."<br>";
|
||||
}
|
||||
?>
|
||||
</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 class="nowrap">
|
||||
<?=$job['Job']['customer_order_number'];?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?=$job['Job']['supplier_reference'];?>
|
||||
</td>
|
||||
<td> <?
|
||||
foreach($job['PurchaseOrder'] as $po) {
|
||||
echo $po['principle_reference'];
|
||||
echo "<br>";
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?>
|
||||
</td>
|
||||
<td> <?=$job['Job']['domestic_freight_paid_by'];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Currency']['name'];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['company_gross_sales_aud'];?>
|
||||
<td>
|
||||
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_scheduled_ex_works']));?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$this->element('isEmptyDate', array('date'=>$job['Job']['date_order_sent_to_customer']));?>
|
||||
</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>
|
||||
</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>
|
||||
<?=$job['Job']['gp_percent'];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['ato_exchange_rate'];?>
|
||||
</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>
|
||||
<?=$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>
|
||||
<?=$job['Job']['gross_commissions'];?>
|
||||
</td>
|
||||
<td> <?=$job['Job']['net_commissions'];?>
|
||||
</td>
|
||||
<td><button class="editButton">Edit</button></td>
|
||||
</tr>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['gross_profit_exports_aud'];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['gp_percent'];?>
|
||||
</td>
|
||||
<td>
|
||||
<?=$job['Job']['ato_exchange_rate'];?>
|
||||
</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>
|
||||
<?=$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>
|
||||
<?=$job['Job']['gross_commissions'];?>
|
||||
</td>
|
||||
<td> <?=$job['Job']['net_commissions'];?>
|
||||
</td>
|
||||
<td><button class="editButton">Edit</button></td>
|
||||
</tr>
|
||||
|
||||
<? endforeach;?>
|
||||
<? endforeach;?>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="paging">
|
||||
|
||||
|
|
@ -175,5 +184,5 @@ echo $paginator->counter(array(
|
|||
</div>
|
||||
<? echo $form->end(); ?>
|
||||
|
||||
<? //debug($jobs);
|
||||
<? debug($jobs);
|
||||
?>
|
||||
Loading…
Reference in a new issue