From 4e32cfb13c92f199773f8af5a04b12079b235707 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Mon, 3 Feb 2025 18:11:22 +0300
Subject: [PATCH] finish facture design , wip facture recapitulatif

---
 gestion/lib/Service/InvoicePdfHandler.php              |  2 +-
 .../lib/Service/InvoiceRecap/InvoiceRecapService.php   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php
index 5da20fd..596fe62 100644
--- a/gestion/lib/Service/InvoicePdfHandler.php
+++ b/gestion/lib/Service/InvoicePdfHandler.php
@@ -77,7 +77,7 @@ class InvoicePdfHandler extends FPDF {
         foreach($this->multipleFactureData as $factureData){
             $factureType = $factureData["facture_type"];
             if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){
-                $filename = mb_strtoupper($factureData["client_prenom"],'UTF-8');
+                $filename = mb_strtoupper($factureData["client_nom"],'UTF-8');
             }
             else{
                 $filename = 'GROUPE_'.mb_strtoupper($factureData["group_facturation_name"],'UTF-8');
diff --git a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
index a0d001c..d2d7e51 100644
--- a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
+++ b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
@@ -237,7 +237,7 @@ class InvoiceRecapService {
                     $pdf->Cell( 0, 8, "Saint Senoux, le ".utf8_decode($date_formated), 0, 0, 'R');
 
                     // n° facture, date echeance et reglement et obs
-                    $pdf->SetLineWidth(0.1); $pdf->SetFillColor(255); $pdf->Rect(114, 20, 85, 8, "DF");
+                    $pdf->SetLineWidth(0.2); $pdf->SetFillColor(255); $pdf->Rect(114, 20, 85, 8, "DF");
                     $pdf->SetXY( 114, 20 ); $pdf->SetFont( "ComicSans", "B", 12 ); $pdf->Cell( 85, 8, 'FACTURE N'.utf8_decode('°').' FAC/'.$key_annee.'/'.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])), 0, 0, 'C');
 
                     // adresse du facture
@@ -251,7 +251,7 @@ class InvoiceRecapService {
                     // le cadre des articles
                     // ***********************
                     // cadre avec 18 lignes max ! et 118 de hauteur --> 80 + 118 = 198 pour les traits verticaux
-                    $pdf->SetLineWidth(0.1); $pdf->Rect(5, 80, 200, 153, "D");
+                    $pdf->SetLineWidth(0.2); $pdf->Rect(5, 80, 200, 153, "D");
                     // cadre titre des colonnes
                     $pdf->Line(5, 90, 205, 90);
                     // les traits verticaux colonnes
@@ -426,7 +426,7 @@ class InvoiceRecapService {
                     $j=1;
                     foreach ($client as $key => $facture) {
                         if($j==1) {
-                            $current_client = $facture['prenoms_client'].' '.$facture['nom_client'];
+                            $current_client = $facture['nom_client'];
                             $date_facture = $facture['date_facture'];
                             $clientAddresses = FileExportHelpers::GetAddressAndCityFromAddress($facture['adresse_client']);
                             $clientAddress = $clientAddresses['address'];
@@ -527,7 +527,7 @@ class InvoiceRecapService {
                         $pdf->Cell( 0, 8,"Saint Senoux, le ".utf8_decode($date_formated), 0, 0, 'R');
 
                         // n° facture, date echeance et reglement et obs
-                        $pdf->SetLineWidth(0.1); $pdf->SetFillColor(255); $pdf->Rect(114, 20, 85, 8, "DF");
+                        $pdf->SetLineWidth(0.2); $pdf->SetFillColor(255); $pdf->Rect(114, 20, 85, 8, "DF");
                         $pdf->SetXY( 114, 20 ); $pdf->SetFont( "ComicSans", "B", 12 ); $pdf->Cell( 85, 8, 'FACTURE N'.utf8_decode('°').' FAC/'.$key_annee.'/'.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])), 0, 0, 'C');
 
                         // adresse du facture
@@ -545,7 +545,7 @@ class InvoiceRecapService {
                         // le cadre des articles
                         // ***********************
                         // cadre avec 18 lignes max ! et 118 de hauteur --> 80 + 118 = 198 pour les traits verticaux
-                        $pdf->SetLineWidth(0.1); $pdf->Rect(5, 80, 200, 153, "D");
+                        $pdf->SetLineWidth(0.2); $pdf->Rect(5, 80, 200, 153, "D");
                         // cadre titre des colonnes
                         $pdf->Line(5, 90, 205, 90);
                         // les traits verticaux colonnes