From 1c5a38e1b4896d578d1d24df2a0f1b8c17bbb7c8 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Tue, 20 May 2025 10:09:04 +0300 Subject: [PATCH] [FIX] fix email facture (photo and quotes), add siret to invoicegrouppdfhandler --- gestion/lib/Controller/InvoiceController.php | 2 +- .../Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php | 3 +++ gestion/lib/Service/MailerService.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gestion/lib/Controller/InvoiceController.php b/gestion/lib/Controller/InvoiceController.php index 3ec6a59..806b612 100644 --- a/gestion/lib/Controller/InvoiceController.php +++ b/gestion/lib/Controller/InvoiceController.php @@ -113,7 +113,7 @@ class InvoiceController extends Controller $message->setHtmlBody( "

Bonjour.

". - "

Vous trouverez en pièce jointe la facture des soins de « " . $factureDate . " » .

". + "

Vous trouverez en pièce jointe la facture des soins de " . $factureDate . ".

". $signature ); $appAdminEmail = $this->gestionRepository->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD); diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php index 3807e49..f95abe6 100644 --- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php +++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php @@ -238,6 +238,9 @@ class InvoiceGroupPdfHandler extends FPDF { $this->SetXY($clientInfoXAxis,$clientInfoYAxis + 1); $this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); + $clientInfoYAxis += $this->interLigneHeader + 1; + $this->SetXY($clientInfoXAxis,$clientInfoYAxis); + $this->Cell(0, $this->interLigneHeader, 'Siret: ' . ($this->factureData['siret'] ?? "")); } diff --git a/gestion/lib/Service/MailerService.php b/gestion/lib/Service/MailerService.php index f064825..6ff915e 100644 --- a/gestion/lib/Service/MailerService.php +++ b/gestion/lib/Service/MailerService.php @@ -51,7 +51,7 @@ class MailerService { if (!$signatureImage) { return ""; } - return "" ; + return "" ; } private function getSignatureContent(){