From 3321ec696618697d1334c6bc0cb5df6e720c7e96 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Wed, 3 Sep 2025 16:15:28 +0300 Subject: [PATCH] Fix email signature and remove signature image --- gestion/lib/Controller/InvoiceController.php | 9 ++++++++- gestion/lib/Controller/PageController.php | 2 +- gestion/lib/Service/MailerService.php | 7 ++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gestion/lib/Controller/InvoiceController.php b/gestion/lib/Controller/InvoiceController.php index 806b612..984190c 100644 --- a/gestion/lib/Controller/InvoiceController.php +++ b/gestion/lib/Controller/InvoiceController.php @@ -109,7 +109,8 @@ class InvoiceController extends Controller $message->attach($content); $message->setSubject("Facture"); - $signature = $this->mailerService->getFooterContent(); + $signature = $this->mailerService->getFooterContent( $this->getUserNameForEmailSignature()); + $message->setHtmlBody( "

Bonjour.

". @@ -128,4 +129,10 @@ class InvoiceController extends Controller } return new DataResponse("E-mail envoyé avec succès à ".$email.".", 200, ['Content-Type' => 'application/json']); } + + public function getUserNameForEmailSignature (){ + $configs = json_decode($this->gestionRepository->getConfiguration(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD)); + $currentConfig = $configs[0]; + return $currentConfig->nom . " " . $currentConfig->prenom; + } } \ No newline at end of file diff --git a/gestion/lib/Controller/PageController.php b/gestion/lib/Controller/PageController.php index b6ecc0e..9f4afdf 100644 --- a/gestion/lib/Controller/PageController.php +++ b/gestion/lib/Controller/PageController.php @@ -1885,7 +1885,7 @@ class PageController extends Controller } public function getUserNameForEmailSignature() { - $configs = json_decode($this->myDb->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN)); + $configs = json_decode($this->myDb->getConfiguration(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD)); $currentConfig = $configs[0]; return $currentConfig->nom . " " . $currentConfig->prenom; } diff --git a/gestion/lib/Service/MailerService.php b/gestion/lib/Service/MailerService.php index 5314609..e0e6d8b 100644 --- a/gestion/lib/Service/MailerService.php +++ b/gestion/lib/Service/MailerService.php @@ -38,12 +38,13 @@ class MailerService { ){ $this->adminStorage = $rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD); } - public function getFooterContent ($userName = "Johann"){ + public function getFooterContent ($userName = "DEKINDT Vanessa"){ $wish = "

Vous en souhaitant bonne réception.

"; $cordialement = "

Cordialement,

"; $userName = "

{$userName}

" ; - $signatureImage = $this->getSignatureHtmlEmailContent(); - return $wish . $cordialement .$userName . $signatureImage ; + // $signatureImage = $this->getSignatureHtmlEmailContent(); + // return $wish . $cordialement .$userName . $signatureImage ; + return $wish . $cordialement .$userName ; } private function getSignatureHtmlEmailContent (){