From 7d520a19ca68bc1c471574959f605d2ecd43ce28 Mon Sep 17 00:00:00 2001 From: Narindra ezway Date: Tue, 8 Apr 2025 17:18:38 +0300 Subject: [PATCH] adjust invoice info table positioning and spacing --- .../InvoiceGroupPdfHandler.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php index d824822..c4b7857 100644 --- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php +++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php @@ -236,7 +236,9 @@ class InvoiceGroupPdfHandler extends FPDF { public function DrawInvoiceInfoTable(){ - $this->setY(67); + $startInvoiceInfoTable = 70; + $this->setY($startInvoiceInfoTable); + $factureDatePaiement = $this->factureData['date_paiement']; $factureDatePaiement = DateTime::createFromFormat('Y-m-d',$factureDatePaiement); $factureDateEcheance = $factureDatePaiement; @@ -256,10 +258,11 @@ class InvoiceGroupPdfHandler extends FPDF { $this->Cell(39, 11, $this->factureData['num'], 1, 0, 'C'); $this->Cell(36, 11, $factureDateEcheance, 1, 1, 'C'); - $this->startingYOfArticlesTable = 88; + $this->startingYOfArticlesTable = $startInvoiceInfoTable + 20; } public function DrawArticlesTableRect(){ + $this->SetLineWidth(0.2); $gapBetweenStartingOfArticlesTableAndColumnName = 10; $tableHeight = $this->thereIsOrderOrCaseNumber ? 137 : 137 + 10; @@ -268,10 +271,10 @@ class InvoiceGroupPdfHandler extends FPDF { // cadre titre des colonnes $this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207,$this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName); // les traits verticaux colonnes - $this->Line(28, $this->startingYOfArticlesTable, 28, 235); - $this->Line(132, $this->startingYOfArticlesTable, 132, 235); - $this->Line(157, $this->startingYOfArticlesTable, 157, 235); - $this->Line(182, $this->startingYOfArticlesTable, 182, 235); + $this->Line(28, $this->startingYOfArticlesTable, 28, 237); + $this->Line(132, $this->startingYOfArticlesTable, 132, 237); + $this->Line(157, $this->startingYOfArticlesTable, 157, 237); + $this->Line(182, $this->startingYOfArticlesTable, 182, 237); } public function DrawArticlesTableHeader(){ @@ -372,7 +375,7 @@ class InvoiceGroupPdfHandler extends FPDF { } public function DrawBankAndTotalPriceInfo(){ - $this->SetY(238); + $this->SetY(239); $this->SetFont('ComicSans', '', 8); $this->MultiCell(0,4,utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de ". $this->factureData['configuration']->entreprise))); $this->MultiCell(0,4,utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :")));