diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php index 9752eaa2..66f55b34 100755 --- a/app/controllers/documents_controller.php +++ b/app/controllers/documents_controller.php @@ -621,6 +621,7 @@ class DocumentsController extends AppController { $document = $this->Document->read(null, $id); $this->set('document',$document); + $this->set('attachments', $this->Document->DocumentAttachment->find('all', array('conditions'=>array('document_id'=> $id)))); $enquiry = $this->Document->Quote->Enquiry->read(null, $document['Quote']['enquiry_id']); $this->set('enquiry', $enquiry); } @@ -643,7 +644,9 @@ class DocumentsController extends AppController { $document = $this->Document->read(null,$id); if(empty($document['Document']['pdf_filename'])) { - $this->Session->setFlash(__('Error. Please generate the PDF before attempting to email it', true)); + + + $this->Session->setFlash(__('Error. Please generate the PDF before attempting to email it', true)); return; } else { diff --git a/app/vendors/pagecounter.php b/app/vendors/pagecounter.php new file mode 100755 index 00000000..46b5bde2 --- /dev/null +++ b/app/vendors/pagecounter.php @@ -0,0 +1,24 @@ +setSourceFile($file); + if(is_numeric($count)) { + return $count; + } + else { + return; + } + } +} + + +?> diff --git a/app/views/documents/generate_first_page.ctp b/app/views/documents/generate_first_page.ctp index 2dd2b2af..07dd403b 100755 --- a/app/views/documents/generate_first_page.ctp +++ b/app/views/documents/generate_first_page.ctp @@ -1,3 +1,9 @@ + + + App::import('Vendor','pagecounter'); + $pagecounter = new PageCounter(); +?> +
Dear =$enquiry['Contact']['first_name']?>,
Thank you for your enquiry. The following quotation is for:
@@ -27,4 +33,7 @@ =$enquiry['User']['job_title'];?>