From 3a39d5ba632997cdedf2b374f6cbd8c7ca2c0ed8 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Thu, 16 Jun 2011 15:05:34 +1000 Subject: [PATCH] Fixed line height in details box --- vendors/pdfdoc.php | 39 ++++++++++++++++++------- views/documents/generate_first_page.ctp | 1 + views/documents/pdf.ctp | 8 ++--- views/elements/line_items_table.ctp | 10 +++---- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/vendors/pdfdoc.php b/vendors/pdfdoc.php index 6a1edfba..5442b2a9 100644 --- a/vendors/pdfdoc.php +++ b/vendors/pdfdoc.php @@ -118,11 +118,11 @@ ENDHTML; - $this->MultiCell($firstColWidth, $lineHeight*$heightNeeded, "$docTypeFullName TO:", 'LTR', 'L', 0, 0); - $this->MultiCell($secondColWidth, $lineHeight*$heightNeeded, $companyName, 'LTR', 'L', 0, 0); + $this->MultiCell($firstColWidth, 0, "$docTypeFullName TO:", 'LTR', 'L', 0, 0); + $this->MultiCell($secondColWidth, 0, $companyName, 'LTR', 'L', 0, 0); - $this->MultiCell($thirdColWidth, $lineHeight*$heightNeeded, "FROM:", 'LT', 'L', 0, 0); - $this->MultiCell($fourthColWidth, $lineHeight*$heightNeeded, "$fromName", 'TR', 'L', false, 1, null,null, true,0,true, false, 0, null, false); //Start a new line after this. + $this->MultiCell($thirdColWidth, 0, "FROM:", 'LT', 'L', 0, 0); + $this->MultiCell($fourthColWidth, 0, "$fromName", 'TR', 'L', false, 1, null,null, true,0,true, false, 0, null, false); //Start a new line after this. $this->MultiCell($firstColWidth, 0, "EMAIL TO:", 'LR', 'L', 0, 0); @@ -160,22 +160,41 @@ ENDHTML; $table = << - - QUOTATION TO: - {$companyName} + + + + + + + + + + + + + + +
QUOTATION TO:
EMAIL TO:
ATTENTION:		{$companyName} FROM: {$fromName}
EMAILWTF?RAH
EMAILWTF?RAH
ENDTABLE; $this->SetTextColor(0); //Black Text - - $this->writeHTMLCell(0, 0, null, null, $table, null, 1, null, true, 'L', false); + $this->writeHTMLCell(0, 0, null, null, $table, null, 1, null, true, 'L', false); + $this->SetFontSize(7); + + //Kinda lame that I cant seem to wrap this text nicer. But Whatever. + $this->MultiCell(0, 0, 'The information in this document is confidential and may be privileged. If you are not the indended recipient then access, disclosure, copying or other dissemination of the contents of t his message is unauthorised and may be unlawful. Please inform the sender immediately if you are not the intended addressee.', + '', 'L', false, 1 + ); + + $this->writeHTMLCell(0, 0, null, null, '
', 0, 1, false,true, 'C', false); + } diff --git a/views/documents/generate_first_page.ctp b/views/documents/generate_first_page.ctp index b2448f5f..03dd9538 100644 --- a/views/documents/generate_first_page.ctp +++ b/views/documents/generate_first_page.ctp @@ -18,6 +18,7 @@ +

If you have any further queries, please contact us at our office for assistance.

We look forward to your reply.

diff --git a/views/documents/pdf.ctp b/views/documents/pdf.ctp index 9568e4f1..b43e588a 100755 --- a/views/documents/pdf.ctp +++ b/views/documents/pdf.ctp @@ -38,10 +38,10 @@ foreach($document['DocPage'] as $page) { $pdfdoc->DetailsBox($docTypeFullName, $companyName, $emailTo, $attention, $fromName, $fromEmail, $enquiryNumber, $your_reference, $issue_date); - - /* $pdfdoc->DetailsBoxHTML($docTypeFullName, $companyName, $emailTo, $attention, $fromName, - $fromEmail, $enquiryNumber, $your_reference, $issue_date); - */ + + /*$pdfdoc->DetailsBoxHTML($docTypeFullName, $companyName, $emailTo, $attention, $fromName, + $fromEmail, $enquiryNumber, $your_reference, $issue_date);*/ + $firstPageDone = true; } diff --git a/views/elements/line_items_table.ctp b/views/elements/line_items_table.ctp index d7413e17..88315acf 100644 --- a/views/elements/line_items_table.ctp +++ b/views/elements/line_items_table.ctp @@ -51,16 +51,14 @@ - - - + currency($totals['subtotal'], $currencyCode);?> - + @@ -74,12 +72,12 @@ }?> - + currency($totals['total'], $currencyCode);?> - +