From b835b3cb40b026c0410657b80d2cf5017c610805 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Thu, 23 Jan 2025 13:13:25 +0300 Subject: [PATCH] wip recap groupe --- gestion/lib/Db/Bdd.php | 2 +- .../lib/Service/InvoiceRecap/InvoiceRecapService.php | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index 6a8e61c..b0439f3 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -3425,7 +3425,7 @@ class Bdd { } public function getClientGroupFacturations(){ - $sql = "SELECT * as client_type FROM ".$this->tableprefix."client_group_facturation as client_group_facturation ORDER BY client_group_facturation.id DESC;"; + $sql = "SELECT * FROM ".$this->tableprefix."client_group_facturation as client_group_facturation ORDER BY client_group_facturation.id DESC;"; $clientGroupFacturations = $this->execSQL($sql,[]); return $clientGroupFacturations; } diff --git a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php index d9dfa9f..f5f1321 100644 --- a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php +++ b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php @@ -333,12 +333,21 @@ class InvoiceRecapService { $num_page++; } - $ff_pdf = html_entity_decode($defaultConfig[0]->path).'/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).'/GROUPE_OGF_RECAP_FACTURE_'.strtoupper(FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1])).'_'.$key_annee.'.pdf'; + $ff_pdf = html_entity_decode( + $defaultConfig[0]->path). + '/DOCUMENTS RECAPITULATIFS/'.$key_annee.'/'.$key_mois.' '. + strtoupper( + FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1]) + ). + '/GROUPE_/'.$groupName.'_RECAP_FACTURE_'.strtoupper( + FileExportHelpers::ConvertSpecialChar(explode(' ', $date_formated)[1]) + ).'_'.$key_annee.'.pdf'; $storage->newFile($ff_pdf); $pdfContent = $pdf->Output('','S'); $file_pdf = $storage->get($ff_pdf); $file_pdf->putContent($pdfContent); + return $ff_pdf; } } }