diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php index e3dc9114..e4ddaede 100755 --- a/app/controllers/documents_controller.php +++ b/app/controllers/documents_controller.php @@ -669,6 +669,8 @@ class DocumentsController extends AppController { $docType = $this->Document->getDocType($document); + $template = $docType.'_email'; + switch($docType) { case 'quote': break; @@ -680,10 +682,12 @@ class DocumentsController extends AppController { break; case 'orderAck': $this->set('job', $this->Document->OrderAcknowledgement->Job->find('first', array('conditions'=>array('Job.id'=>$document['OrderAcknowledgement']['job_id'])))); + if ($document['OrderAcknowledgement']['signature_required']) { + $template = 'OrderAck_email_signature_required'; + } } - $template = $docType.'_email'; $this->Email->template = $template; diff --git a/app/views/elements/email/html/orderAck_email.ctp b/app/views/elements/email/html/orderAck_email.ctp index e339e745..bfea5b60 100755 --- a/app/views/elements/email/html/orderAck_email.ctp +++ b/app/views/elements/email/html/orderAck_email.ctp @@ -1,13 +1,12 @@ Dear ,

-

Thank you for your Purchase Order # . Please find attached the Order Acknowledgement for your -review. Once you have reviewed it, please send us a signed and dated copy so we can proceed with your -order. +

Thank you for your Purchase Order # . +

Should you have any questions regarding your enquiry or quotation, please reply to this email or reference to expedite our response time.

-Thank you very much, looking forward to your reply,

+

CMC Technologies
diff --git a/app/views/elements/email/html/orderAck_signature_required_email.ctp b/app/views/elements/email/html/orderAck_signature_required_email.ctp new file mode 100755 index 00000000..e339e745 --- /dev/null +++ b/app/views/elements/email/html/orderAck_signature_required_email.ctp @@ -0,0 +1,123 @@ +Dear ,

+ +

Thank you for your Purchase Order # . Please find attached the Order Acknowledgement for your +review. Once you have reviewed it, please send us a signed and dated copy so we can proceed with your +order. + +

Should you have any questions regarding your enquiry or quotation, please reply to this email or +reference to expedite our response time.

+ +Thank you very much, looking forward to your reply,

+ + +CMC Technologies
+ + + +
+
+
+
+

CMC +Technologies Pty Limited +- ACN: 085 991 224 , ABN: 47 085 991 224
+Engineering & Industrial +Instrumentation
+
+

+

Unit 19, 77 Bourke Road +                               +Phone: ++61 2 9669 4000
+Alexandria, NSW, 2015 +                                 +Fax: ++61 2 9669 4111
+AUSTRALIA                               +Web: +http://www.cmctechnologies.com.au

+

 

+

Specialising in Fire and +Explosion Prevention or Protection, Overpressure Protection, Vision in the Process, Flow +Measurement, +Pressure - Differential Pressure, and Temperature - Humidity +Measurement/logging, On-Line +Analysers

+
+
+
+
+

The +information in this message is confidential and may be priveleged. If +you are +not the intended recipient then access, disclosure, copying or other +dissemination of the contents of this message is unauthorised and may +be +priveledged. Please inform the sender immediately if you are not the +intended +addressee.All correspondence is subject to CMC Technologies' Terms and +Conditions of Sale - July 1, 2006

+
+
+
+
+ diff --git a/app/views/elements/email/text/orderAck_email.ctp b/app/views/elements/email/text/orderAck_email.ctp index 7641a737..02f8eac7 100755 --- a/app/views/elements/email/text/orderAck_email.ctp +++ b/app/views/elements/email/text/orderAck_email.ctp @@ -1,13 +1,10 @@ Dear , -Thank you for your Purchase Order # . Please find attached the Order Acknowledgement for your -review. Once you have reviewed it, please send us a signed and dated copy so we can proceed with your -order. +Thank you for your Purchase Order # . Please find attached the Order Acknowledgement for your review. Should you have any questions regarding your enquiry or quotation, please reply to this email or reference to expedite our response time. -Thank you very much, looking forward to your reply, CMC Technologies diff --git a/app/views/elements/email/text/orderAck_signature_required_email.ctp b/app/views/elements/email/text/orderAck_signature_required_email.ctp new file mode 100755 index 00000000..7641a737 --- /dev/null +++ b/app/views/elements/email/text/orderAck_signature_required_email.ctp @@ -0,0 +1,36 @@ +Dear , + +Thank you for your Purchase Order # . Please find attached the Order Acknowledgement for your +review. Once you have reviewed it, please send us a signed and dated copy so we can proceed with your +order. + +Should you have any questions regarding your enquiry or quotation, please reply to this email or +reference to expedite our response time. + +Thank you very much, looking forward to your reply, + + +CMC Technologies + +***************************************************************************************** +CMC Technologies Pty Limited +ACN: 085 991 224 , ABN: 47 085 991 224 +Engineering & Industrial Instrumentation +Unit 19, 77 Bourke Road +Alexandria, NSW, 2015 +AUSTRALIA +phone: +61 2 9669 4000 +fax:+61 2 9669 4111 +web: http://www.cmctechnologies.com.au +Specialising in Fire and Explosion Prevention or Protection, Overpressure +Protection, Vision in the Process, Flow Measurement, Pressure - Differential Pressure, and Temperature - Humidity measurement/logging +On-Line Analysers. +***************************************************************************************** +The information in this message is +confidential and may be priveleged. If you are not the intended recipient then +access, disclosure, copying or other dissemination of the contents of this +message is unauthorised and may be priveledged. Please inform the sender +immediately if you are not the intended addressee.All correspondence is subject +to CMC Technologies' Terms and Conditions of Sale - July 1, 2006. +***************************************************************************************** +