From 1c5a38e1b4896d578d1d24df2a0f1b8c17bbb7c8 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Tue, 20 May 2025 10:09:04 +0300
Subject: [PATCH 1/2] [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(
             "<p>Bonjour.</p>".
-            "<p> Vous trouverez en pièce jointe la facture des soins de « " . $factureDate . " » .</p>".
+            "<p> Vous trouverez en pièce jointe la facture des soins de " . $factureDate . ".</p>".
             $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 "<img style= 'width: 250px;height: 150;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ;
+		return "<img style= 'width: 250px;height: 150px;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ;
 	}
     
     private function getSignatureContent(){

From 0e4a019145a619ac4ecff6b544189a3ad09b8b90 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Tue, 20 May 2025 10:21:10 +0300
Subject: [PATCH 2/2] siret

---
 .../Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
index a06b5bb..0793e4a 100644
--- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
+++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
@@ -240,7 +240,6 @@ class InvoiceGroupPdfHandler extends FPDF {
         
         $this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
         if($this->factureData['siret']){
-            $clientInfoYAxis +=  $this->interLigneHeader +1 ;
             $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
             $this->Cell(0,  $this->interLigneHeader,  'Siret: ' . $this->factureData['siret']);
         }