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

Lots of work on documents. OAs can now be made without a new job. Job can be changed.

Browse source
This commit is contained in:
Karl Cordes 2013-04-14 13:14:11 +10:00
parent 9485f80428
commit a484786737
6 changed files with 52 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/documents_controller.php
View file

@ -578,6 +578,7 @@ class DocumentsController extends AppController {
case "purchaseOrder":
$filename = $document['PurchaseOrder']['title'];
$template_name = 'pdf_po';
break;
case "orderAck":

4
app/controllers/enquiries_controller.php
View file

@ -62,8 +62,8 @@ class EnquiriesController extends AppController {
//$this->set('number_of_files', $this->Enquiry->EnquiryFile->find('count', array('conditions' => array('EnquiryFile.enquiry_id'=>$id))));
$this->set('principle_emails', $this->Enquiry->Principle->PrincipleContact->findAllByPrincipleId($enquiry['Enquiry']['principle_id']));
$this->set('jobs', $this->Enquiry->Job->find('all', array('conditions'=>array('Job.enquiry_id'=>$id))));
$this->set('order_acknowledgements', $this->Enquiry->OrderAcknowledgement->find('all', array('conditions'=>array('OrderAcknowledgement.enquiry_id'=>$id))));
$this->set('jobs', $this->Enquiry->Job->find('all', array('conditions'=>array('Job.enquiry_id'=>$id, ),'order'=>'Job.id DESC')));
$this->set('order_acknowledgements', $this->Enquiry->OrderAcknowledgement->find('all', array('conditions'=>array('OrderAcknowledgement.enquiry_id'=>$id), 'order'=>'OrderAcknowledgement.id DESC')));
if($enquiry['Enquiry']['billing_address_id'] != 0) {
$this->set('billingaddress', $this->Enquiry->BillingAddress->findById($enquiry['Enquiry']['billing_address_id']));

5
app/views/documents/pdf_invoice.ctp
View file

@ -33,9 +33,6 @@ $this->element('pdf_output', array('pdfdoc'=>$pdfdoc));
?>
<script type="text/javascript">
//window.location.replace("/documents/view/<?=$document['Document']['id']?>");
window.location.replace("/documents/view/<?=$document['Document']['id']?>");
</script>
<? debug($document); ?>
<? //debug($enquiry); ?>

38
app/views/documents/pdf_po.ctp Executable file
View file

@ -0,0 +1,38 @@
<?php
App::import('Vendor','pdfdoc');
$pdfdoc = new PDFDOC();
$pdfdoc->SetPrintHeader(false);
$pdfdoc->SetPrintFooter(false);
$pdfdoc->AddPage();
$pdfdoc->Page1Header();
$pageTitle = "<h1>TAX INVOICE</h1>";
$pdfdoc->writeHTML($pageTitle, true, false, false, false, 'C');
$pdfdoc->SetTextColor(0);
$pageNo = $pdfdoc->PageNoFormatted();
$totalCount = $pdfdoc->getAliasNbPages();
$shippingBillingBox = $this->element('pdf_shipping_billing_box', array('pageNo'=>$pageNo, 'totalCount'=>$totalCount));
$pdfdoc->writeHTML($shippingBillingBox, false);
$LineItemTable = $this->element('line_items_table_with_shipping');
$pdfdoc->SetPrintHeader(true);
$pdfdoc->pageContent($LineItemTable);
$this->element('pdf_output', array('pdfdoc'=>$pdfdoc));
?>
<script type="text/javascript">
window.location.replace("/documents/view/<?=$document['Document']['id']?>");
</script>

11
app/views/elements/document_invoice_view.ctp
View file

@ -5,8 +5,8 @@
</div>
<div class="docButtons">
<button id="paymentReceived">Enter Payment Received</button>
<?=$html->link('Generate PDF of this Invoice', '/documents/pdf/'.$document['Document']['id']);?>
<?=$html->link('Email PDF to Customer', '/documents/email_pdf/'.$document['Document']['id']);?>
<button id="pdfDocButton" data-url="/documents/pdf/<?= $document['Document']['id']; ?>">Generate PDF</button>
<button id="emailDocButton" data-url="/documents/email_pdf/<?= $document['Document']['id']; ?>">Email Invoice to customer</button>
</div>
@ -16,13 +16,20 @@
<? echo $form->create('Document',array('type'=>'post','action'=>'edit', 'default'=>false));
echo $form->input('Document.id');
echo $form->input('Invoice.id');
echo $form->input('Invoice.job_id');
echo $form->input('Invoice.currency_id');
echo $form->input('Invoice.issue_date');
echo $form->input('Invoice.due_date');
echo $form->input('billing_address_id', array('div' => 'addressradio', 'legend' => 'Select Billing Address', 'options' => $billing_addresses_list, 'type' => 'radio', 'class'=>'billing_address'));
echo $form->input('Document.bill_to');
echo $form->input('shipping_address_id', array('div' => 'addressradio','legend' => 'Select Shipping Address', 'options' => $shipping_addresses_list, 'type' => 'radio', 'class' => 'shipping_address'));
echo $form->input('Document.ship_to');
echo $form->input('Invoice.ship_via');
echo $form->input('Invoice.fob');
echo $form->input('Document.shipping_details', array('id'=>'shippingDetails'));

2
app/webroot/js/document_add_edit.js
View file

@ -575,7 +575,7 @@ function savePages() {
});
$.post('/documents/ajax_edit', docPages, function(data) {
$("#flashMessage").html("Pages Saved Successfully");
$("#flashMessage").html("Document saved");
$("#flashMessage").show();
loadLineItems();
});