root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into production

Browse Source
This commit is contained in:
Tiavina 2025-05-20 10:21:57 +03:00
commit 2d3196ffe4
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/lib/Controller/InvoiceController.php
View File

@ -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);

2
gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
View File

@ -245,10 +245,8 @@ class InvoiceGroupPdfHandler extends FPDF
}
}
$this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
if($this->factureData['siret']){
$clientInfoYAxis += $this->interLigneHeader;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, $this->interLigneHeader, 'Siret: ' . $this->factureData['siret']);
}

2
gestion/lib/Service/MailerService.php
View File

@ -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(){