Attachments working
This commit is contained in:
parent
743ce3cec5
commit
a9c8153668
|
|
@ -24,7 +24,7 @@ class AppController extends Controller {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//WTF. Why is this here??
|
||||||
function isAuthorized() {
|
function isAuthorized() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = $this->Document->OrderAcknowledgement->Enquiry->find('first', array('conditions'=>array('Enquiry.id'=>$originalDoc['Quote']['enquiry_id'])));
|
||||||
$enquiry['Enquiry']['status_id'] = 3; //Job Won, Order Placed
|
$enquiry['Enquiry']['status_id'] = 3; //Job Won, Order Placed
|
||||||
|
|
||||||
$this->Document->OrderAcknowledgement->Enquiry->save($enquiry);
|
$this->Document->OrderAcknowledgement->Enquiry->save($enquiry);
|
||||||
|
|
||||||
$customer = $this->Document->OrderAcknowledgement->Enquiry->Customer->find('first', array('conditions'=>array('Customer.id'=>$enquiry['Enquiry']['customer_id'])));
|
$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.
|
$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) {
|
if($job == false) {
|
||||||
echo 'Error: Unable to create Job';
|
echo 'Error: Unable to create Job';
|
||||||
}
|
}
|
||||||
|
|
@ -357,6 +360,7 @@ class DocumentsController extends AppController {
|
||||||
$newDoc['OrderAcknowledgement']['enquiry_id'] = $enquiry['Enquiry']['id'];
|
$newDoc['OrderAcknowledgement']['enquiry_id'] = $enquiry['Enquiry']['id'];
|
||||||
$newDoc['OrderAcknowledgement']['currency_id'] = 2; //Default to AUD.
|
$newDoc['OrderAcknowledgement']['currency_id'] = 2; //Default to AUD.
|
||||||
$newDoc['OrderAcknowledgement']['issue_date'] = date('Y-m-d');
|
$newDoc['OrderAcknowledgement']['issue_date'] = date('Y-m-d');
|
||||||
|
|
||||||
$newDoc['Document']['user_id']= $enquiry['Enquiry']['user_id'];
|
$newDoc['Document']['user_id']= $enquiry['Enquiry']['user_id'];
|
||||||
$newDoc['Document']['revision'] = 0; //No revisions for Order Acks. I have decreed it!
|
$newDoc['Document']['revision'] = 0; //No revisions for Order Acks. I have decreed it!
|
||||||
$newDoc['Document']['type'] = 'orderAck';
|
$newDoc['Document']['type'] = 'orderAck';
|
||||||
|
|
@ -570,6 +574,9 @@ class DocumentsController extends AppController {
|
||||||
$this->set('enquiry', $enquiry);
|
$this->set('enquiry', $enquiry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Email the PDF(document + attachments) for this Document to a Recipient (Customer or Principle).
|
* Email the PDF(document + attachments) for this Document to a Recipient (Customer or Principle).
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,10 @@ echo $this->element($docTypeElement);
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div id="Attachments" title="Attachments">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div id="InvoiceDetails">
|
<div id="InvoiceDetails">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -46,4 +50,4 @@ echo $this->element($docTypeElement);
|
||||||
|
|
||||||
<?php //debug($enquiry);?>
|
<?php //debug($enquiry);?>
|
||||||
|
|
||||||
<?php // debug($document);?>
|
<?php // debug($document);?>
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ echo $form->input('Document.id');
|
||||||
<button id="addPage">Add Content Page</button>
|
<button id="addPage">Add Content Page</button>
|
||||||
<button id="editQuoteDetails">View/Edit Quote Details</button>
|
<button id="editQuoteDetails">View/Edit Quote Details</button>
|
||||||
<?=$html->link('Generate PDF of this Quote', '/documents/pdf/'.$document['Document']['id']);?>
|
<?=$html->link('Generate PDF of this Quote', '/documents/pdf/'.$document['Document']['id']);?>
|
||||||
|
<?=$html->link('Email this Quote', '/documents/email_pdf/'.$document['Document']['id']);?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="flashMessage" class="message">
|
<div id="flashMessage" class="message">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue