}
$this->formData['doctype'] = $doctype;
if (count($contacts)) {
+ if (!is_array($contacts[0]))
+ $contacts = array($contacts); // change to array when single contact passed
$this->contactData = $contacts;
// as report is currently generated once despite number of email recipients
// we select language for the first recipient as report language
return $drawColor;
}
- function SetDrawColor($r, $g, $b)
- {
- parent::SetDrawColor($r, $g, $b);
- }
-
- function SetTextColor($r, $g, $b)
- {
- parent::SetTextColor($r, $g, $b);
- }
-
- /**
- * Set the fill color for table cells.
- * @see reporting/includes/TCPDF#SetFillColor($col1, $col2, $col3, $col4)
- */
- function SetFillColor($r, $g, $b)
- {
- parent::SetFillColor($r, $g, $b);
- }
-
// Get current cell padding setting from TCPDF object
function GetCellPadding()
{
return $this->TextWrap($c, $this->row - $r, $n - $c + $corr, $txt, $align, $border, $fill, $link, $stretch);
}
- function TextWrap($xpos, $ypos, $len, $str, $align = 'left', $border = 0, $fill = 0, $link = NULL, $stretch = 1)
+ 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);
$this->oldFontSize = $this->fontSize;
}
- return $this->addTextWrap($xpos, $ypos, $len, $this->fontSize, $str, $align, $border, $fill, $link, $stretch);
+ return $this->addTextWrap($xpos, $ypos, $len, $this->fontSize, $str, $align, $border, $fill, $link, $stretch, $spacebreak);
}
function TextCol($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=1)
return $this->TextWrap($this->cols2[$c], $this->row - $r, $this->cols2[$n] - $this->cols2[$c] + $corr, $txt, $this->aligns2[$c], $border, $fill, $link, $stretch);
}
- function TextColLines($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=1)
+ function TextColLines($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
{
$this->row -= $r;
- $this->TextWrapLines($this->cols[$c], $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c], $border, $fill, $link, $stretch);
+ $this->TextWrapLines($this->cols[$c], $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c], $border, $fill, $link, $stretch, true);
}
- function TextWrapLines($c, $width, $txt, $align='left', $border=0, $fill=0, $link=NULL, $stretch=1)
+ 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];
do
{
- $l = $this->TextWrap($c, $this->row , $width, $l, $align, $border, $fill, $link, $stretch);
+ $l = $this->TextWrap($c, $this->row , $width, $l, $align, $border, $fill, $link, $stretch, $spacebreak);
$this->row -= $this->lineHeight;
}
while ($l != '');
parent::line($from, $row, $to, $row2);
}
- function Line($row, $height = 0)
+ function Line($row, $height = 0, $dummy1=null, $dummy2=null, $dummy3=null)
{
$oldLineWidth = $this->GetLineWidth();
$this->SetLineWidth($height + 1);
display_error(_("You have no email contact defined for this type of document"));
} else {
$sent = 0;
- foreach($this->contactData as $contact) {
- $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']), $this->company['email']);
- $mail->charset = $this->encoding;
- if (!isset($contact['email']) || $contact['email'] == '')
- $contact['email'] = isset($myrow['contact_email']) ? $myrow['contact_email'] : '';
-
- $to = str_replace(",", "", $contact['name'].' '.$contact['name2'])." <" . $contact['email'] . ">";
- $msg = $doc_Dear_Sirs . " " . $myrow['DebtorName'] . ",\n\n" . $doc_AttachedFile . " " . $subject .
- "\n\n";
- if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == ST_SALESINVOICE) // helper for payment links
- {
- if ($myrow['dimension_id'] == 1)
+ 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']),
+ $this->company['email']);
+ $mail->charset = $this->encoding;
+
+ $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
{
- $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";
+ 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";
+ }
}
- }
- $msg .= $doc_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->subject($subject);
- $mail->text($msg . $sender);
- $mail->attachment($fname);
- if ($mail->send()) $sent++;
+ $msg .= $doc_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->subject($subject);
+ $mail->text($msg . $sender);
+ $mail->attachment($fname);
+ if ($mail->send()) $sent++;
} // foreach contact
unlink($fname);
$this->SetLang(user_language());
projects / fa-stable.git / blobdiff