From c095b9f333d93d5b37684d8bd443cf580d99ad7b Mon Sep 17 00:00:00 2001 From: Tiavina Date: Tue, 4 Feb 2025 11:44:37 +0300 Subject: [PATCH] finish adding client info and configuration info on recap, wip column name --- .../InvoiceRecap/InvoiceRecapService.php | 100 +++++++++++------- 1 file changed, 64 insertions(+), 36 deletions(-) diff --git a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php index 6e467e7..9a47573 100644 --- a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php +++ b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php @@ -194,13 +194,12 @@ class InvoiceRecapService { // adresse du facture $clientInfoXAxis = 125; $clientInfoYAxis = 40; - $pdf->SetFont('ComicSans','B',size: 11); + $pdf->SetFont('ComicSans','',size: 11); $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); $pdf->Cell( 0, 7, utf8_decode('Groupe '.$groupName)); $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); // date facture - $pdf->SetFont('ComicSans','',11); $pdf->Cell( 0, 7, "Saint Senoux, le ".utf8_decode($date_formated)); // observations @@ -256,26 +255,36 @@ class InvoiceRecapService { $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); } + //adresse de mon entreprise + $companyInfoXAxis = 10; + $companyInfoYAxis = 40; + $pdf->SetFont('ComicSans', '', 11); + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport($defaultConfig[0]->entreprise)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport($configurationAddress)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport($configurationAddressCity)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($defaultConfig[0]->telephone)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, 'Mail : ' . $defaultConfig[0]->mail); + // n° page en haute à droite if($nb_page>1){ $pdf->SetXY( 120, 5 ); $pdf->SetFont( "ComicSans", "B", 9 ); $pdf->Cell( 160, 8, $num_page . '/' . $nb_page, 0, 0, 'C'); } - // date facture - $pdf->SetFont('ComicSans','',11); $pdf->SetXY( 122, 15 ); - $pdf->SetY(10); - $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.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 - $pdf->SetFont('ComicSans','B',11); - $pdf->SetY(32); - // $pdf->SetXY( $x, $y ); $pdf->Cell( 100, 8, 'doit', 0, 0, ''); $y += 8; - $pdf->Cell( 0, 6, 'Groupe '.$groupName, 0, 1, 'R'); - $pdf->Cell( 0, 6, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue), 0, 1, 'R'); + $clientInfoXAxis = 125; + $clientInfoYAxis = 40; + $pdf->SetFont('ComicSans','',size: 11); + $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); + $pdf->Cell( 0, 7, utf8_decode('Groupe '.$groupName)); // *********************** // le cadre des articles @@ -283,6 +292,7 @@ class InvoiceRecapService { // cadre avec 18 lignes max ! et 118 de hauteur --> 80 + 118 = 198 pour les traits verticaux $pdf->SetLineWidth(0.2); $pdf->Rect(5, 80, 200, 153, "D"); // cadre titre des colonnes + $pdf->SetFillColor(255); $pdf->Line(5, 90, 205, 90); // les traits verticaux colonnes $pdf->Line(145, 80, 145, 233); $pdf->Line(163, 80, 163, 233); @@ -512,7 +522,7 @@ class InvoiceRecapService { // adresse du facture $clientInfoXAxis = 125; $clientInfoYAxis = 40; - $pdf->SetFont('ComicSans','B',size: 11); + $pdf->SetFont('ComicSans','',size: 11); $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); $pdf->Cell( 0, 7, utf8_decode($current_client)); $clientInfoYAxis += 7; @@ -524,7 +534,6 @@ class InvoiceRecapService { $clientInfoYAxis += 7; $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); // date facture - $pdf->SetFont('ComicSans','',11); $pdf->Cell( 0, 7, "Saint Senoux, le ".utf8_decode($date_formated)); // observations @@ -580,35 +589,54 @@ class InvoiceRecapService { $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25); } + //adresse de mon entreprise + $companyInfoXAxis = 10; + $companyInfoYAxis = 40; + $pdf->SetFont('ComicSans', '', 11); + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport($defaultConfig[0]->entreprise)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport($configurationAddress)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport($configurationAddressCity)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($defaultConfig[0]->telephone)); + $companyInfoYAxis += 7; + $pdf->SetXY($companyInfoXAxis,$companyInfoYAxis); + $pdf->Cell(0, 7, 'Mail : ' . $defaultConfig[0]->mail); + // n° page en haute à droite if($nb_page>1){ $pdf->SetXY( 120, 5 ); $pdf->SetFont( "ComicSans", "B", 9 ); $pdf->Cell( 160, 8, $num_page . '/' . $nb_page, 0, 0, 'C'); } - // date facture - $pdf->SetFont('ComicSans','',11); - $pdf->SetY(10); - $pdf->Cell( 0, 8,"Saint Senoux, le ".utf8_decode($date_formated), 0, 0, 'R'); - - // n° facture, date echeance et reglement et obs - $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 - $pdf->SetFont('ComicSans','B',11); - $pdf->SetY(y: 32); - $pdf->Cell( 0, 6, utf8_decode($current_client), 0, 1, 'R'); - $pdf->Cell( 0, 6, trim(utf8_decode(html_entity_decode($clientAddress))), 0, 1, 'R'); - if($clientCity != ''){ - $pdf->Cell( 0, 6, trim(utf8_decode(html_entity_decode($clientCity))), 0, 1, 'R'); - } - $pdf->Cell( 0, 6, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue), 0, 1, 'R'); - $pdf->Cell( 0, 6, 'Email: ' . utf8_decode(html_entity_decode($facture['mail_client'])), 0, 1, 'R'); + $clientInfoXAxis = 125; + $clientInfoYAxis = 40; + $pdf->SetFont('ComicSans','',size: 11); + $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); + $pdf->Cell( 0, 7, utf8_decode($current_client)); + $clientInfoYAxis += 7; + $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); + $pdf->Cell( 0, 7, trim(utf8_decode(html_entity_decode($clientAddress)))); + $clientInfoYAxis += 7; + $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); + $pdf->Cell( 0, 7, trim(utf8_decode(html_entity_decode($clientCity)))); + $clientInfoYAxis += 7; + $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); + $pdf->Cell( 0, 7, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . FileExportHelpers::FormatTextForExport($tvaIntraCommuValue)); + $clientInfoYAxis += 7; + $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis); + $pdf->Cell( 0, 7, 'Email: ' . utf8_decode(html_entity_decode($facture['mail_client'])),0,1); // *********************** // le cadre des articles // *********************** // cadre avec 18 lignes max ! et 118 de hauteur --> 80 + 118 = 198 pour les traits verticaux + $pdf->SetFillColor(255); $pdf->Rect(5, 80, 200, 153, "DF"); // cadre titre des colonnes $pdf->Line(5, 90, 205, 90);