slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-facture-group-address-multiline' into staging

Browse Source
This commit is contained in:
Tiavina 2025-04-07 17:42:16 +03:00
commit de4868fc15
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ class InvoiceGroupPdfHandler extends FPDF {
$this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName)); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
$clientInfoYAxis += 4; $clientInfoYAxis += 4;
if ( $this->factureData['group_type'] == 'single' ) { if ( $this->factureData['group_type'] == 'single' ) {
$address = FileExportHelpers::FormatTextForExport($clientAddress); $address = FileExportHelpers::FormatTextForExport(trim($clientAddress));
$addressWidth = $this->GetStringWidth($address); $addressWidth = $this->GetStringWidth($address);
$addressWidthGreaterThanMaxWidth = $addressWidth > $availableWidhtForClientInfo; $addressWidthGreaterThanMaxWidth = $addressWidth > $availableWidhtForClientInfo;
$isMultiline = false; $isMultiline = false;
@ -195,7 +195,7 @@ class InvoiceGroupPdfHandler extends FPDF {
}else{ }else{
$clientAddresses = explode(",",$clientAddress); $clientAddresses = explode(",",$clientAddress);
foreach ($clientAddresses as $address) { foreach ($clientAddresses as $address) {
$address = FileExportHelpers::FormatTextForExport($address); $address = FileExportHelpers::FormatTextForExport(trim($address));
$addressWidth = $this->GetStringWidth($address); $addressWidth = $this->GetStringWidth($address);
$addressWidthGreaterThanMaxWidth = $addressWidth > $availableWidhtForClientInfo; $addressWidthGreaterThanMaxWidth = $addressWidth > $availableWidhtForClientInfo;
$isMultiline = false; $isMultiline = false;