root/THANASOFT-DV
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:19:43 +03:00
commit 943790afac
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,11 +171,22 @@ class InvoiceGroupPdfHandler extends FPDF {
$this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
$clientInfoYAxis += 4;
if ( $this->factureData['group_type'] == 'single' ) {
$addressWidth = $this->GetStringWidth($clientAddress);
$isMultiline = $addressWidth > $availableWidhtForClientInfo;
$address = FileExportHelpers::FormatTextForExport($clientAddress);
$addressWidth = $this->GetStringWidth($address);
$addressWidthGreaterThanMaxWidth = $addressWidth > $availableWidhtForClientInfo;
$isMultiline = false;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
if ($addressWidthGreaterThanMaxWidth) {
$yBefore = $this->GetY();
$this->MultiCell($availableWidhtForClientInfo, 4, $address,0,'L');
$yAfter = $this->GetY();
$isMultiline = ($yAfter - $yBefore) > 4;
if($isMultiline){
$this->SetXY($this->GetX(),$yBefore);
}
} else {
$this->Cell($availableWidhtForClientInfo, 4, $address);
}
if($isMultiline){
$clientInfoYAxis += 4;
}
@ -184,10 +195,22 @@ class InvoiceGroupPdfHandler extends FPDF {
}else{
$clientAddresses = explode(",",$clientAddress);
foreach ($clientAddresses as $address) {
$address = FileExportHelpers::FormatTextForExport($address);
$addressWidth = $this->GetStringWidth($address);
$isMultiline = $addressWidth > $availableWidhtForClientInfo;
$addressWidthGreaterThanMaxWidth = $addressWidth > $availableWidhtForClientInfo;
$isMultiline = false;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($address)));
if ($addressWidthGreaterThanMaxWidth) {
$yBefore = $this->GetY();
$this->MultiCell($availableWidhtForClientInfo, 4, $address,0,'L');
$yAfter = $this->GetY();
$isMultiline = ($yAfter - $yBefore) > 4;
if($isMultiline){
$this->SetXY($this->GetX(),$yBefore);
}
} else {
$this->Cell($availableWidhtForClientInfo, 4, $address);
}
if($isMultiline){
$clientInfoYAxis += 4;
}