From 5542af2b982af00d1dc46bd146292ae6c1cc83cd Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Sep 2023 03:52:20 +0000 Subject: [PATCH] fix tests incl. more tcpdf changes --- Admin/Install/Media/bill.pdf.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Admin/Install/Media/bill.pdf.php b/Admin/Install/Media/bill.pdf.php index 721c526..d7028d8 100755 --- a/Admin/Install/Media/bill.pdf.php +++ b/Admin/Install/Media/bill.pdf.php @@ -97,13 +97,14 @@ $lineHeight = $pdf->getY(); $pdf->Write( 0, $addressString, - '', 0, 'L', false, 0, false, false, 0 + '', false, 'L', false, 0, false, false, 0 ); $lineHeight = ($lineHeight - $pdf->getY()) / $addressLineCount; // Bill head $pdf->setFont('helvetica', 'B', 16); $titleWidth = $pdf->getStringWidth($billTypeName, 'helvetica', 'B', 16); +$titleWidth = \is_array($titleWidth) ? \array_sum($titleWidth) : $titleWidth; $pdf->setXY( $rightPos = ($pdf->getPageWidth() - $titleWidth - \max(60 - $titleWidth, 0) - 15 - 2), @@ -172,7 +173,7 @@ $lines = $bill->getElements(); $headerCount = \count($header); $w = [$pdf->getPageWidth() - 20 - 20 - 20 - 2 * 15, 20, 20, 20]; -$pdf->setCellPadding(1, 1, 1, 1); +$pdf->setCellPadding(1); $taxes = []; $first = true; @@ -276,23 +277,23 @@ $tempY2 = $pdf->getY(); $pdf->setTextColor(0); $pdf->setFont('helvetica', 'B', 8); $pdf->setY($tempY); -$pdf->Write(0, $lang[$pdf->language]['PaymentTerms'] . ': CreditCard', '', 0, 'L', false, 0, false, false, 0); +$pdf->Write(0, $lang[$pdf->language]['PaymentTerms'] . ': CreditCard', '', false, 'L', false, 0, false, false, 0); $pdf->setFont('helvetica', '', 8); -$pdf->Write(0, $bill->paymentText, '', 0, 'L', false, 0, false, false, 0); +$pdf->Write(0, $bill->paymentText, '', false, 'L', false, 0, false, false, 0); $pdf->Ln(); // @todo: fix terms $pdf->setFont('helvetica', 'B', 8); -$pdf->Write(0, $lang[$pdf->language]['Terms'] . ': ' . $pdf->attributes['terms'], '', 0, 'L', false, 0, false, false, 0); +$pdf->Write(0, $lang[$pdf->language]['Terms'] . ': ' . $pdf->attributes['terms'], '', false, 'L', false, 0, false, false, 0); $pdf->Ln(); $pdf->setFont('helvetica', 'B', 8); -$pdf->Write(0, $lang[$pdf->language]['Currency'] . ': ' . $bill->currency, '', 0, 'L', false, 0, false, false, 0); +$pdf->Write(0, $lang[$pdf->language]['Currency'] . ': ' . $bill->currency, '', false, 'L', false, 0, false, false, 0); $pdf->Ln(); $pdf->setFont('helvetica', 'B', 8); -$pdf->Write(0, $lang[$pdf->language]['TaxRemark'], '', 0, 'L', false, 0, false, false, 0); +$pdf->Write(0, $lang[$pdf->language]['TaxRemark'], '', false, 'L', false, 0, false, false, 0); $pdf->Ln(); $pdf->setFont('helvetica', '', 8);