X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=1f5b89b3275b6c56231549389c8ffbb2f86e14d0;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=98bd06a240502d571a3b25073457f27117e799a2;hpb=4e4ce8577f8582967995919860c66aa94d633afd;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 98bd06a2..1f5b89b3 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'),
 		'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,7 +428,7 @@ class FrontReport extends Cpdf
 
 		$doctype = $this->formData['doctype'];
 		$header2type = true;
- 		
+
 		$this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
 
  		 // leave layout files names without path to enable including
@@ -944,7 +945,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;
 
@@ -958,7 +959,6 @@ class FrontReport extends Cpdf
 		}
 		else
 		{
-
 			$dir =  company_path(). '/pdf_files';
 			//save the file
 			if (!file_exists($dir))
@@ -979,13 +979,15 @@ class FrontReport extends Cpdf
 					$this->SetLang(user_language());
 					display_error(_("You have no email contact defined for this type of document"));
 				} else {
-					$sent = 0;
+					$sent = $try = 0;
+					$emails = "";
+					if(!$subject)
+						$subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
 					foreach($this->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']),
@@ -994,35 +996,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 . "&currency_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_error(_("There is no contact email set for this document type."));
+					} elseif (!$sent)
+						display_error($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