X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=2bda1d078572c052dc4888469ff2e9cf6b24bd11;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=daacbd2dbbb26a010b6fd3c82b790f1833130a5c;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc index daacbd2d..2bda1d07 100644 --- a/reporting/includes/pdf_report.inc +++ b/reporting/includes/pdf_report.inc @@ -255,10 +255,10 @@ class FrontReport extends Cpdf { global $app_title, $version, $power_by, $power_url; - $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', $app_title . ' ' . $version); + $this->addInfo('Creator',$power_by . ' - ' . $power_url); $year = get_current_fiscalyear(); if ($year['closed'] == 0) $how = _("Active"); @@ -386,10 +386,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 +402,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 @@ -427,8 +428,9 @@ class FrontReport extends Cpdf $doctype = $this->formData['doctype']; $header2type = true; - - $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang); + + $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] + : ($_SESSION["wa_current_user"]->prefs->language ? $_SESSION["wa_current_user"]->prefs->language : $dflt_lang)); // leave layout files names without path to enable including // modified versions from company/x/reporting directory @@ -526,7 +528,7 @@ class FrontReport extends Cpdf // 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,7 +946,7 @@ 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; @@ -955,7 +960,6 @@ class FrontReport extends Cpdf } else { - $dir = company_path(). '/pdf_files'; //save the file if (!file_exists($dir)) @@ -972,17 +976,25 @@ class FrontReport extends Cpdf 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 +1003,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); + $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