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

Merge branch 'gsuite'

Browse source
This commit is contained in:
Karl Cordes 2016-11-05 14:14:18 +11:00
parent 89894906fa 912f04cddd
commit 9d716c0665
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/documents_controller.php
View file

@ -811,7 +811,11 @@ ENDINSTRUCTIONS;
$enquiry = $this->Document->Quote->Enquiry->read(null, $document['Quote']['enquiry_id']); $enquiry = $this->Document->Quote->Enquiry->read(null, $document['Quote']['enquiry_id']);
$this->set('enquiry', $enquiry); $this->set('enquiry', $enquiry);
} }
function email_format($a) {
return "<".$a.">";
}
/** /**
* 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).
@ -844,11 +848,13 @@ ENDINSTRUCTIONS;
} }
$enquiry = $this->Document->getEnquiry($document); $enquiry = $this->Document->getEnquiry($document);
$this->Email->to = $enquiry['Contact']['email']; $this->Email->to = $this->email_format($enquiry['Contact']['email']);
//Uncomment this when going live //Uncomment this when going live
$this->Email->cc = array($enquiry['User']['email']); $this->Email->cc = array($this->email_format($enquiry['User']['email']));
$this->Email->bcc = array('carpis@cmctechnologies.com.au'); $this->Email->bcc = array($this->email_format('carpis@cmctechnologies.com.au'));
$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>';

10
app/controllers/enquiries_controller.php
View file

@ -303,6 +303,10 @@ class EnquiriesController extends AppController {
} }
function email_format($a) {
return "<".$a.">";
}
/* Moving this to the new Enquiry email sender. */ /* Moving this to the new Enquiry email sender. */
function __sendNewEnquiryEmail($id) { function __sendNewEnquiryEmail($id) {
@ -313,9 +317,9 @@ class EnquiriesController extends AppController {
$this->Email->delivery = 'smtp'; $this->Email->delivery = 'smtp';
$enquiry = $this->Enquiry->read(null, $id); $enquiry = $this->Enquiry->read(null, $id);
$this->Email->to = $enquiry['Contact']['email']; $this->Email->to = $this->email_format($enquiry['Contact']['email']);
$this->Email->cc = array($enquiry['User']['email']); $this->Email->cc = array($this->email_format($enquiry['User']['email']));
$this->Email->bcc = array('carpis@cmctechnologies.com.au'); $this->Email->bcc = array($this->email_format('carpis@cmctechnologies.com.au'));
$this->Email->subject = $enquiry['Enquiry']['title'].' - Your Enquiry has been Entered in our System - CMC Technologies'; $this->Email->subject = $enquiry['Enquiry']['title'].' - Your Enquiry has been Entered in our System - CMC Technologies';
$this->Email->replyTo = $enquiry['User']['email']; $this->Email->replyTo = $enquiry['User']['email'];