X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=c475a29be608bdeafbcc8807db72efac9d40190f;hb=41fc5025878df6a2950e4356e4b6883a5efcac1a;hp=daacbd2dbbb26a010b6fd3c82b790f1833130a5c;hpb=a749d48dad4cdb0708ff272129338fa46fff7c2c;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index daacbd2d..c475a29b 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -20,6 +20,7 @@
*/
include_once(dirname(__FILE__)."/class.pdf.inc");
include_once(dirname(__FILE__)."/printer_class.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
include_once($path_to_root . "/admin/db/company_db.inc");
include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
include_once($path_to_root . "/admin/db/printers_db.inc");
@@ -253,12 +254,12 @@ class FrontReport extends Cpdf
$cols2 = null, $headers2 = null, $aligns2 = null,
$companylogoenable = false, $footerenable = false, $footertext = '')
{
- global $app_title, $version, $power_by, $power_url;
+ global $SysPrefs, $version;
- $this->addinfo('Title', $this->title);
- $this->addinfo('Subject', $this->title);
- $this->addinfo('Author', $app_title . ' ' . $version);
- $this->addinfo('Creator',$power_by . ' - ' . $power_url);
+ $this->addInfo('Title', $this->title);
+ $this->addInfo('Subject', $this->title);
+ $this->addInfo('Author', $SysPrefs->app_title . ' ' . $version);
+ $this->addInfo('Creator',$SysPrefs->power_by . ' - ' . $SysPrefs->power_url);
$year = get_current_fiscalyear();
if ($year['closed'] == 0)
$how = _("Active");
@@ -295,6 +296,8 @@ class FrontReport extends Cpdf
//
function Header()
{
+ global $SysPrefs;
+
$companyCol = $this->endLine - 150;
$titleCol = $this->leftMargin + 100;
@@ -310,9 +313,18 @@ class FrontReport extends Cpdf
$this->Text($this->leftMargin, $this->title, $companyCol);
$this->Font();
$this->fontSize -= 4;
- $this->Text($companyCol, $this->company['coy_name']);
- $this->row -= ($this->lineHeight + 4);
-
+ $logo = company_path() . "/images/" . $this->company['coy_logo'];
+ if (!empty($SysPrefs->show_company_logo_report) && $this->company['coy_logo'] != '' && file_exists($logo))
+ {
+ $this->row -= ($this->lineHeight + 3);
+ $this->AddImage($logo, $companyCol, $this->row, 0, 30);
+ $this->row -= 6;
+ }
+ else
+ {
+ $this->Text($companyCol, $this->company['coy_name']);
+ $this->row -= ($this->lineHeight + 4);
+ }
$str = _("Print Out Date") . ':';
$this->Text($this->leftMargin, $str, $titleCol);
$str = Today() . ' ' . Now();
@@ -375,8 +387,6 @@ class FrontReport extends Cpdf
*/
function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
{
-// $this->formData = array_merge($myrow, $branch, $sales_order,
-// $bank_account, array('doctype' => $doctype));
$this->formData = array();
$datnames = array(
@@ -386,10 +396,10 @@ class FrontReport extends Cpdf
'DebtorName', 'supp_account_no', 'wo_ref', 'debtor_ref','type', 'trans_no',
'StockItemName', 'tax_id', 'order_', 'delivery_date', 'units_issued',
'due_date', 'required_by', 'payment_terms', 'curr_code',
- 'ov_freight', 'ov_gst', 'ov_amount'),
+ 'ov_freight', 'ov_gst', 'ov_amount', 'prepaid', 'requisition_no', 'contact'),
'branch' => array('br_address', 'br_name', 'salesman', 'disable_branch'),
'sales_order' => array('deliver_to', 'delivery_address', 'customer_ref'),
- 'bankaccount' => array('bank_name', 'bank_account_number')
+ 'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')
);
foreach($datnames as $var => $fields) {
@@ -402,6 +412,7 @@ class FrontReport extends Cpdf
}
}
$this->formData['doctype'] = $doctype;
+ $this->formData['document_amount'] = @$this->formData['ov_amount']+@$this->formData['ov_freight']+@$this->formData['ov_gst'];
if (count($contacts)) {
if (!is_array($contacts[0]))
$contacts = array($contacts); // change to array when single contact passed
@@ -422,13 +433,15 @@ class FrontReport extends Cpdf
*/
function Header2()
{
- global $path_to_root, $print_as_quote,
- $print_invoice_no, $packing_slip, $dflt_lang; // FIXME should be passed as params
+ global $dflt_lang; // FIXME should be passed as params
+ $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
$doctype = $this->formData['doctype'];
$header2type = true;
-
- $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
+
+ $lang = user_language();
+ $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang']
+ : ( $lang ? $lang : $dflt_lang));
// leave layout files names without path to enable including
// modified versions from company/x/reporting directory
@@ -467,16 +480,6 @@ class FrontReport extends Cpdf
$footerCol = $this->leftMargin + PAGE_NUM_WIDTH;
$footerRow = $this->bottomMargin - FOOTER_MARGIN;
- // Calling this function generates a new PDF page after the first instance
-// {
-// // TODO: experimenting with line drawing to highlight current period
-// $this->SetLineWidth(1);
-// $this->LineTo($this->cols[3], 33, $this->cols[3], 534);
-// $this->LineTo($this->cols[4], 33, $this->cols[4], 534);
-// $this->SetLineWidth(0.1);
-
-// $this->newPage();
-// }
$this->row = $this->pageHeight - $this->topMargin;
// Set the color of dividing lines we'll draw
@@ -518,15 +521,14 @@ class FrontReport extends Cpdf
$this->fontSize = HEADER1_FONT_SIZE;
// Print company logo if present and requested, or else just print company name
- if ($this->companyLogoEnable && ($this->company['coy_logo'] != ''))
+ // Build a string specifying the location of the company logo file
+ $logo = company_path() . "/images/" . $this->company['coy_logo'];
+ if ($this->companyLogoEnable && ($this->company['coy_logo'] != '') && file_exists($logo))
{
- // Build a string specifying the location of the company logo file
- $logo = company_path() . "/images/" . $this->company['coy_logo'];
-
// Width being zero means that the image will be scaled to the specified height
// keeping its aspect ratio intact.
if ($this->scaleLogoWidth)
- $this->AddImage($logo, $companyCol, $this->row, COMPANY_WIDTH, 0);
+ $this->AddImage($logo, $companyCol, $this->row + 15, COMPANY_WIDTH, 0);
else
$this->AddImage($logo, $companyCol, $this->row - (LOGO_HEIGHT * LOGO_Y_POS_ADJ_FACTOR), 0, LOGO_HEIGHT);
}
@@ -738,6 +740,8 @@ class FrontReport extends Cpdf
function TextWrap($xpos, $ypos, $len, $str, $align = 'left', $border = 0, $fill = 0, $link = NULL, $stretch = 1, $spacebreak=false)
{
+ $str = strtr($str, array("\r"=>''));
+
if ($this->fontSize != $this->oldFontSize)
{
$this->SetFontSize($this->fontSize);
@@ -792,7 +796,8 @@ class FrontReport extends Cpdf
function TextWrapLines($c, $width, $txt, $align='left', $border=0, $fill=0, $link=NULL, $stretch=0, $spacebreak=true)
{
- $str = Explode("\n", $txt);
+ $str = explode("\n", $txt);
+
for ($i = 0; $i < count($str); $i++)
{
$l = $str[$i];
@@ -941,21 +946,20 @@ class FrontReport extends Cpdf
$this->{$this->headerTmpl}();
}
- function End($email=0, $subject=null, $myrow=null, $doctype = 0)
+ function End($email=0, $subject='')
{
- global $pdf_debug, $path_to_root;
+ global $SysPrefs, $path_to_root;
- if ($pdf_debug == 1)
+ if ($SysPrefs->pdf_debug == 1)
{
$pdfcode = $this->Output('','S');
- $pdfcode = str_replace("\n", "\n
", htmlspecialchars($pdfcode));
+ $pdfcode = str_replace("\n", "\n
", html_specials_encode($pdfcode));
echo '';
echo trim($pdfcode);
echo '';
}
else
{
-
$dir = company_path(). '/pdf_files';
//save the file
if (!file_exists($dir))
@@ -964,25 +968,30 @@ class FrontReport extends Cpdf
}
// do not use standard filenames or your sensitive company data
// are world readable
- if ($email == 1)
- $fname = $dir.'/'.$this->filename;
- else
- $fname = $dir.'/'.uniqid('').'.pdf';
+ $fname = $dir.'/'.random_id().'.pdf';
$this->Output($fname, 'F');
if ($email == 1)
{
- if(!count($this->contactData)) {
+ $contactData = array();
+ if ($this->contactData)
+ foreach($this->contactData as $contact)
+ if (!empty($contact['email']))
+ $contactData[] = $contact;
+
+ if(!count($contactData)) {
$this->SetLang(user_language());
- display_error(_("You have no email contact defined for this type of document"));
+ display_warning(sprintf(_("You have no email contact defined for this type of document for '%s'."), $this->formData['recipient_name']));
} else {
- $sent = 0;
- foreach($this->contactData as $contact) {
+ $sent = $try = 0;
+ $emails = "";
+ if(!$subject)
+ $subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
+ foreach($contactData as $contact) {
if (!isset($contact['email']))
continue;
$emailtype = true;
$this->SetLang($contact['lang']);
- include("includes/doctext.inc");
require_once($path_to_root . "/reporting/includes/class.mail.inc");
$mail = new email(str_replace(",", "", $this->company['coy_name']),
@@ -991,35 +1000,42 @@ class FrontReport extends Cpdf
$to = str_replace(",", "", $contact['name'].' '.$contact['name2'])
." <" . $contact['email'] . ">";
- $msg = $doc_Dear_Sirs . " " . $contact['name2'] . ",\n\n"
- . $doc_AttachedFile . " " . $subject ."\n\n";
- if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == ST_SALESINVOICE) // helper for payment links
+ $msg = _("Dear") . " " . $contact['name2'] . ",\n\n"
+ . _("Attached you will find ") . " " . $subject ."\n\n";
+
+ if (isset($this->formData['payment_service']))
{
- if ($myrow['dimension_id'] == 1)
- {
- $amt = number_format($myrow["ov_freight"] + $myrow["ov_gst"] + $myrow["ov_amount"], user_price_dec());
- $txt = $doc_Payment_Link . " PayPal: ";
- $nn = urlencode($this->title . " " . $myrow['reference']);
- $url = "https://www.paypal.com/xclick/business=" . $this->company['email'] . "&item_name=" .
- $nn . "&amount=" . $amt . "¤cy_code=" . $myrow['curr_code'];
- $msg .= $txt . $url . "\n\n";
- }
+ $amt = number_format($this->formData['document_amount'], user_price_dec());
+ $service = $this->formData['payment_service'];
+ $url = payment_link($service, array(
+ 'company_email' => $this->company['email'],
+ 'amount' => $amt,
+ 'currency' => $this->formData['curr_code'],
+ 'comment' => $this->title . " " . $this->formData['document_number']
+ ));
+ if ($url)
+ $msg.= _("You can pay through"). " $service: $url\n\n";
}
- $msg .= $doc_Kindest_regards . "\n\n";
+
+ $msg .= _("Kindest regards") . "\n\n";
$sender = $this->user . "\n" . $this->company['coy_name'] . "\n" . $this->company['postal_address'] . "\n" . $this->company['email'] . "\n" . $this->company['phone'];
- $mail->to($to);
+ $mail->to($to); $try++;
$mail->subject($subject);
$mail->text($msg . $sender);
- $mail->attachment($fname);
+ $mail->attachment($fname, $this->filename);
+ $emails .= " " . $contact['email'];
if ($mail->send()) $sent++;
} // foreach contact
unlink($fname);
$this->SetLang(user_language());
- if (!$sent)
- display_error(_("Sending document by email failed"));
+ if (!$try) {
+ display_warning(sprintf(_("You have no email contact defined for this type of document for '%s'."), $this->formData['recipient_name']));
+ } elseif (!$sent)
+ display_warning($this->title . " " . $this->formData['document_number'] . ". "
+ . _("Sending document by email failed") . ". " . _("Email:") . $emails);
else
- display_notification($this->title . " " . $myrow['reference'] . " "
- . _("has been sent by email to destination."));
+ display_notification($this->title . " " . $this->formData['document_number'] . " "
+ . _("has been sent by email to destination.") . " " . _("Email:") . $emails);
}
}
else
@@ -1039,7 +1055,6 @@ class FrontReport extends Cpdf
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
-// $this->Stream(basename($fname));
$this->Stream($this->filename);
}
} else { // send report to network printer
@@ -1070,4 +1085,3 @@ class FrontReport extends Cpdf
}
}
-?>
\ No newline at end of file