diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php index c9e923e9..7e239dd5 100755 --- a/app/controllers/documents_controller.php +++ b/app/controllers/documents_controller.php @@ -860,28 +860,6 @@ EOT; return $subject; } - - function orderack_email_subject($document) { - $id = $document['Document']['id']; - //print_r($document); - $q = <<Document->query($q); - - if count($titles) < 1 { - // This probably shouldn't happen, but who knows. - $subject = 'CMC Technologies Order Acknowledgement'; - return $subject; - } - - $subject = 'CMC Technologies Order Acknowledgement: '.$titles[0]['e']['enquiry_title'].' '.$titles[0]['j']['job_title']; - return $subject; - } /** * Email the PDF(document + attachments) for this Document to a Recipient (Customer or Principle). @@ -957,7 +935,7 @@ EOT; $this->set('job', $this->Document->PurchaseOrder->Job->find('first', array('conditions'=>array('Job.id'=>$document['OrderAcknowledgement']['job_id'])))); break; case 'orderAck': - $subject = $this->orderack_email_subject($document); + $subject .= " Order Acknowledgement"; $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';