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

Hopefully fixed the dodgy subject

Browse source
This commit is contained in:
Karl Cordes 2016-05-01 13:14:01 +10:00
parent 4284e0c0f8
commit cbea64ec75
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/documents_controller.php
View file

@ -663,28 +663,28 @@ class DocumentsController extends AppController {
$this->Email->cc = array($enquiry['User']['email']); $this->Email->cc = array($enquiry['User']['email']);
$this->Email->bcc = array('carpis@cmctechnologies.com.au'); $this->Email->bcc = array('carpis@cmctechnologies.com.au');
$this->Email->subject = $enquiry['Enquiry']['title'].' ';
$this->Email->replyTo = $enquiry['User']['email']; $this->Email->replyTo = $enquiry['User']['email'];
$this->Email->from = 'CMC Technologies - Sales <sales@cmctechnologies.com.au>'; $this->Email->from = 'CMC Technologies - Sales <sales@cmctechnologies.com.au>';
$docType = $this->Document->getDocType($document); $docType = $this->Document->getDocType($document);
$template = $docType.'_email'; $template = $docType.'_email';
$subject = $enquiry['Enquiry']['title'].' ';
switch($docType) { switch($docType) {
case 'quote': case 'quote':
$this->Email->subject .= " Quotation" $this->Email->subject .= " Quotation"
break; break;
case 'invoice': case 'invoice':
$this->Email->subject .= " Invoice" $subject .= " Invoice"
$this->set('invoice', $this->Document->Invoice->find('first', array('conditions'=>array('Invoice.id'=>$document['Invoice']['id'])))); $this->set('invoice', $this->Document->Invoice->find('first', array('conditions'=>array('Invoice.id'=>$document['Invoice']['id']))));
break; break;
case 'purchaseOrder': case 'purchaseOrder':
$this->Email->subject .= " Purchase Order" $subject .= " Purchase Order"
$this->set('job', $this->Document->PurchaseOrder->Job->find('first', array('conditions'=>array('Job.id'=>$document['OrderAcknowledgement']['job_id'])))); $this->set('job', $this->Document->PurchaseOrder->Job->find('first', array('conditions'=>array('Job.id'=>$document['OrderAcknowledgement']['job_id']))));
break; break;
case 'orderAck': case 'orderAck':
$this->Email->subject .= " Order Acknowledgement" $subject .= " Order Acknowledgement"
$this->set('job', $this->Document->OrderAcknowledgement->Job->find('first', array('conditions'=>array('Job.id'=>$document['OrderAcknowledgement']['job_id'])))); $this->set('job', $this->Document->OrderAcknowledgement->Job->find('first', array('conditions'=>array('Job.id'=>$document['OrderAcknowledgement']['job_id']))));
if ($document['OrderAcknowledgement']['signature_required']) { if ($document['OrderAcknowledgement']['signature_required']) {
$template = 'OrderAck_email_signature_required'; $template = 'OrderAck_email_signature_required';
@ -693,6 +693,7 @@ class DocumentsController extends AppController {
$this->Email->template = $template; $this->Email->template = $template;
$this->Email->subject = $subject;
$this->Email->sendAs = 'both'; $this->Email->sendAs = 'both';