From 203e92123ba3191497e01dc205edac603e0ee0eb Mon Sep 17 00:00:00 2001 From: Tolotsoa Date: Fri, 22 Aug 2025 11:16:34 +0300 Subject: [PATCH] fix remove filigran_pdf in header --- .../InvoiceGroupPdfHandler.php | 84 +++++++++++-------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php index 6a34469..08d099c 100644 --- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php +++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace OCA\Gestion\Service\InvoiceGroupPdfHandler; use DateTime; -use \FPDF; +use FPDF; use OCA\Gestion\Helpers\FileExportHelpers; use OCA\Gestion\Helpers\PriceHelpers; @@ -54,11 +54,11 @@ class InvoiceGroupPdfHandler extends FPDF public $additionalArticlesLineBasedOnMultiline = 0; public $interLigneHeader = 5; - function Header() + public function Header() { if ($this->logo != "nothing") { $this->Image($this->logoPath . "logo.png", 4, 2, 50, 35); - $this->AddWatermark(); + //$this->AddWatermark(); } else { $this->Cell(55, 30, ''); } @@ -66,32 +66,32 @@ class InvoiceGroupPdfHandler extends FPDF $this->DrawInvoiceCompanyAndClientInfo(); $this->DrawInvoiceInfoTable(); } - function AddWatermark() + public function AddWatermark() { $this->SetAlpha(0.2); $imagePath = $this->logoPath . "filigrane_pdf.png"; list($originalWidth, $originalHeight) = getimagesize($imagePath); - // Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm) - // Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm) + // Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm) + // Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm) $originalWidth = $originalWidth * 0.264583; $originalHeight = $originalHeight * 0.264583; - // Augmenter l'échelle, par exemple, 1.5 pour 150% de la taille d'origine + // Augmenter l'échelle, par exemple, 1.5 pour 150% de la taille d'origine $scale = 1.7; $width = $originalWidth * $scale; $height = $originalHeight * $scale; - // Calculer la position pour centrer l'image - $x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm - $y = ((297 - $height) / 2) + 21; // 297 mm est la hauteur d'une page A4 + // Calculer la position pour centrer l'image + $x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm + $y = ((297 - $height) / 2) + 21; // 297 mm est la hauteur d'une page A4 - // Ajouter l'image en filigrane - $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur - $this->SetAlpha(0.1); // Définir l'opacité + // Ajouter l'image en filigrane + $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur + $this->SetAlpha(0.1); // Définir l'opacité } - function SetAlpha($alpha) + public function SetAlpha($alpha) { // Appliquer la transparence au document $this->SetFillColor(255, 255, 255, $alpha * 255); @@ -106,7 +106,7 @@ class InvoiceGroupPdfHandler extends FPDF } - function Footer() + public function Footer() { $this->SetY(-34); $this->SetFont('ComicSans', '', 7); @@ -325,7 +325,7 @@ class InvoiceGroupPdfHandler extends FPDF public function DrawArticlesTableValue() { - // Set espacement avant de continue + // Set espacement avant de continue $this->SetFont('ComicSans', '', 10); $devisData = $this->factureData['devis']; @@ -335,7 +335,7 @@ class InvoiceGroupPdfHandler extends FPDF $totalTva = 0; $yValue = $this->startingYOfArticlesTable + 13; // $maxDescriptionWidth = 102; - $maxDescriptionWidth = 104.3; + $maxDescriptionWidth = 104.3; $currentIndexPosition = $this->currentIndexPosition; for ($currentIndexPosition; $currentIndexPosition < ($this->initialIndexPosition + $this->devisCountToGet); $currentIndexPosition++) { $currentDevis = $devisData[$currentIndexPosition]; @@ -449,7 +449,7 @@ class InvoiceGroupPdfHandler extends FPDF $this->DrawBankAndTotalPriceInfo(); } - function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false) + public function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false) { // Store reset values for (x,y) positions $x = $this->GetX() + $w; @@ -464,19 +464,22 @@ class InvoiceGroupPdfHandler extends FPDF } } - function NbLines($w, $txt) + public function NbLines($w, $txt) { // Compute the number of lines a MultiCell of width w will take - if (!isset($this->CurrentFont)) + if (!isset($this->CurrentFont)) { $this->Error('No font has been set'); + } $cw = $this->CurrentFont['cw']; - if ($w == 0) + if ($w == 0) { $w = $this->w - $this->rMargin - $this->x; + } $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize; $s = str_replace("\r", '', (string) $txt); $nb = strlen($s); - if ($nb > 0 && $s[$nb - 1] == "\n") + if ($nb > 0 && $s[$nb - 1] == "\n") { $nb--; + } $sep = -1; $i = 0; $j = 0; @@ -492,21 +495,25 @@ class InvoiceGroupPdfHandler extends FPDF $nl++; continue; } - if ($c == ' ') + if ($c == ' ') { $sep = $i; + } $l += $cw[$c]; if ($l > $wmax) { if ($sep == -1) { - if ($i == $j) + if ($i == $j) { $i++; - } else + } + } else { $i = $sep + 1; + } $sep = -1; $j = $i; $l = 0; $nl++; - } else + } else { $i++; + } } return $nl; } @@ -516,38 +523,42 @@ class InvoiceGroupPdfHandler extends FPDF { $k = $this->k; $hp = $this->h; - if ($style == 'F') + if ($style == 'F') { $op = 'f'; - elseif ($style == 'FD' || $style == 'DF') + } elseif ($style == 'FD' || $style == 'DF') { $op = 'B'; - else + } else { $op = 'S'; + } $MyArc = 4 / 3 * (sqrt(2) - 1); $this->_out(sprintf('%.2F %.2F m', ($x + $r) * $k, ($hp - $y) * $k)); $xc = $x + $w - $r; $yc = $y + $r; $this->_out(sprintf('%.2F %.2F l', $xc * $k, ($hp - $y) * $k)); - if (strpos($corners, '2') === false) + if (strpos($corners, '2') === false) { $this->_out(sprintf('%.2F %.2F l', ($x + $w) * $k, ($hp - $y) * $k)); - else + } else { $this->_Arc($xc + $r * $MyArc, $yc - $r, $xc + $r, $yc - $r * $MyArc, $xc + $r, $yc); + } $xc = $x + $w - $r; $yc = $y + $h - $r; $this->_out(sprintf('%.2F %.2F l', ($x + $w) * $k, ($hp - $yc) * $k)); - if (strpos($corners, '3') === false) + if (strpos($corners, '3') === false) { $this->_out(sprintf('%.2F %.2F l', ($x + $w) * $k, ($hp - ($y + $h)) * $k)); - else + } else { $this->_Arc($xc + $r, $yc + $r * $MyArc, $xc + $r * $MyArc, $yc + $r, $xc, $yc + $r); + } $xc = $x + $r; $yc = $y + $h - $r; $this->_out(sprintf('%.2F %.2F l', $xc * $k, ($hp - ($y + $h)) * $k)); - if (strpos($corners, '4') === false) + if (strpos($corners, '4') === false) { $this->_out(sprintf('%.2F %.2F l', ($x) * $k, ($hp - ($y + $h)) * $k)); - else + } else { $this->_Arc($xc - $r * $MyArc, $yc + $r, $xc - $r, $yc + $r * $MyArc, $xc - $r, $yc); + } $xc = $x + $r; $yc = $y + $r; @@ -555,8 +566,9 @@ class InvoiceGroupPdfHandler extends FPDF if (strpos($corners, '1') === false) { $this->_out(sprintf('%.2F %.2F l', ($x) * $k, ($hp - $y) * $k)); $this->_out(sprintf('%.2F %.2F l', ($x + $r) * $k, ($hp - $y) * $k)); - } else + } else { $this->_Arc($xc - $r, $yc - $r * $MyArc, $xc - $r * $MyArc, $yc - $r, $xc, $yc - $r); + } $this->_out($op); }