From a9c81536681d59026e2c6f462d48ee799401c865 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Sun, 18 Nov 2012 13:57:16 +1100 Subject: [PATCH] Attachments working --- controllers/app_controller.php | 2 +- controllers/documents_controller.php | 7 +++++++ views/documents/view.ctp | 6 +++++- views/elements/document_quote_view.ctp | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/controllers/app_controller.php b/controllers/app_controller.php index d4041be2..426e4568 100755 --- a/controllers/app_controller.php +++ b/controllers/app_controller.php @@ -24,7 +24,7 @@ class AppController extends Controller { } - + //WTF. Why is this here?? function isAuthorized() { return true; } diff --git a/controllers/documents_controller.php b/controllers/documents_controller.php index 6f0b77e4..056170da 100755 --- a/controllers/documents_controller.php +++ b/controllers/documents_controller.php @@ -337,6 +337,7 @@ class DocumentsController extends AppController { $enquiry = $this->Document->OrderAcknowledgement->Enquiry->find('first', array('conditions'=>array('Enquiry.id'=>$originalDoc['Quote']['enquiry_id']))); $enquiry['Enquiry']['status_id'] = 3; //Job Won, Order Placed + $this->Document->OrderAcknowledgement->Enquiry->save($enquiry); $customer = $this->Document->OrderAcknowledgement->Enquiry->Customer->find('first', array('conditions'=>array('Customer.id'=>$enquiry['Enquiry']['customer_id']))); @@ -347,6 +348,8 @@ class DocumentsController extends AppController { $job = $this->Document->OrderAcknowledgement->Job->newJob($enquiry, $this->data['Job']['customer_order_number']); //Only way to know Enquiry ID is if it's a Quote. + + if($job == false) { echo 'Error: Unable to create Job'; } @@ -357,6 +360,7 @@ class DocumentsController extends AppController { $newDoc['OrderAcknowledgement']['enquiry_id'] = $enquiry['Enquiry']['id']; $newDoc['OrderAcknowledgement']['currency_id'] = 2; //Default to AUD. $newDoc['OrderAcknowledgement']['issue_date'] = date('Y-m-d'); + $newDoc['Document']['user_id']= $enquiry['Enquiry']['user_id']; $newDoc['Document']['revision'] = 0; //No revisions for Order Acks. I have decreed it! $newDoc['Document']['type'] = 'orderAck'; @@ -570,6 +574,9 @@ class DocumentsController extends AppController { $this->set('enquiry', $enquiry); } + + + /** * Email the PDF(document + attachments) for this Document to a Recipient (Customer or Principle). * diff --git a/views/documents/view.ctp b/views/documents/view.ctp index 6a8e4a8e..9dd3bf54 100755 --- a/views/documents/view.ctp +++ b/views/documents/view.ctp @@ -35,6 +35,10 @@ echo $this->element($docTypeElement); +
+
+ +
@@ -46,4 +50,4 @@ echo $this->element($docTypeElement); - \ No newline at end of file + diff --git a/views/elements/document_quote_view.ctp b/views/elements/document_quote_view.ctp index b80176b5..c99564f0 100755 --- a/views/elements/document_quote_view.ctp +++ b/views/elements/document_quote_view.ctp @@ -20,6 +20,7 @@ echo $form->input('Document.id'); link('Generate PDF of this Quote', '/documents/pdf/'.$document['Document']['id']);?> + link('Email this Quote', '/documents/email_pdf/'.$document['Document']['id']);?>