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

Merge branch 'hytha/fixe/fixing-pdf-client-name-section-position' into staging

Browse Source
This commit is contained in:
Narindra ezway 2025-04-07 13:35:04 +03:00
commit 286181f816
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gestion/lib/Db/Bdd.php
View File

@ -2957,6 +2957,7 @@ class Bdd {
$factureData["client_mail"] = $devis["client_mail"]; $factureData["client_mail"] = $devis["client_mail"];
$factureData["siret"] = $devis["client_legal_one"]; $factureData["siret"] = $devis["client_legal_one"];
$factureData["group_name"] = $devis["client_nom"] ?? ""; $factureData["group_name"] = $devis["client_nom"] ?? "";
$factureData["group_type"] = "single";
} }
else{ else{
$factureData["client_real_adress"] = $devis["group_address"] ?? ""; $factureData["client_real_adress"] = $devis["group_address"] ?? "";
@ -2965,6 +2966,8 @@ class Bdd {
$factureData["siret"] = $devis["group_siret_number"]; $factureData["siret"] = $devis["group_siret_number"];
$factureData["group_name"] = $devis["group_name"] ?? ""; $factureData["group_name"] = $devis["group_name"] ?? "";
$templateType = $devis['fk_template_type_key'] ?? ClientTemplateTypeConstant::PRIVEES; $templateType = $devis['fk_template_type_key'] ?? ClientTemplateTypeConstant::PRIVEES;
$factureData["group_type"] = "group";
} }
} }
$products = $this->getDevisProduits($devis["devis_id"]); $products = $this->getDevisProduits($devis["devis_id"]);

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

@ -160,16 +160,28 @@ class InvoiceGroupPdfHandler extends FPDF {
public function DrawInvoiceClientInfo(){ public function DrawInvoiceClientInfo(){
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$clientName = $this->factureData['group_name']; $clientName = $this->factureData['group_name'];
$clientInfoXAxis = 125; $clientInfoXAxis = 135;
$clientAddress = $this->factureData['client_real_adress']; $clientAddress = $this->factureData['client_real_adress'];
$maxWidth = $this->GetPageWidth(); $maxWidth = $this->GetPageWidth();
$availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis; $availableWidhtForClientInfo = $maxWidth - 20 - $clientInfoXAxis;
$clientInfoYAxis = 40; $clientInfoYAxis = 40;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName)); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
$clientInfoYAxis += 4; $clientInfoYAxis += 4;
if ( $this->factureData['group_type'] == 'single' ) {
$addressWidth = $this->GetStringWidth($clientAddress);
$isMultiline = $addressWidth > $availableWidhtForClientInfo;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
if($isMultiline){
$clientInfoYAxis += 4;
}
$clientInfoYAxis += 4;
}else{
$clientAddresses = explode(",",$clientAddress); $clientAddresses = explode(",",$clientAddress);
foreach ($clientAddresses as $address) { foreach ($clientAddresses as $address) {
$addressWidth = $this->GetStringWidth($address); $addressWidth = $this->GetStringWidth($address);
@ -181,6 +193,8 @@ class InvoiceGroupPdfHandler extends FPDF {
} }
$clientInfoYAxis += 4; $clientInfoYAxis += 4;
} }
}
$this->SetXY($clientInfoXAxis,$clientInfoYAxis + 1); $this->SetXY($clientInfoXAxis,$clientInfoYAxis + 1);
$this->Cell(0, 4, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $this->Cell(0, 4, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
} }