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

Merge branch 'staging-HFC' into production-hfc

Browse Source
This commit is contained in:
narindraezway 2025-08-11 17:23:53 +03:00
commit 005034f587
3 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,8 +57,8 @@ class InvoiceGroupPdfHandler extends FPDF
function Header() function Header()
{ {
if ($this->logo != "nothing") { if ($this->logo != "nothing") {
$this->Image($this->logoPath . "logo.png", 4, 2, 50, 35); $this->Image($this->logoPath . "logo.png", 4, 2, 36, 37);
$this->AddWatermark(); // $this->AddWatermark();
} else { } else {
$this->Cell(55, 30, ''); $this->Cell(55, 30, '');
} }
@ -68,6 +68,7 @@ class InvoiceGroupPdfHandler extends FPDF
} }
function AddWatermark() function AddWatermark()
{ {
try {
$this->SetAlpha(0.2); $this->SetAlpha(0.2);
$imagePath = $this->logoPath . "filigrane_pdf.png"; $imagePath = $this->logoPath . "filigrane_pdf.png";
@ -89,6 +90,10 @@ class InvoiceGroupPdfHandler extends FPDF
// Ajouter l'image en filigrane // Ajouter l'image en filigrane
$this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur
$this->SetAlpha(0.1); // Définir l'opacité $this->SetAlpha(0.1); // Définir l'opacité
} catch (\Throwable $th) {
//throw $th;
}
} }
function SetAlpha($alpha) function SetAlpha($alpha)

8
gestion/lib/Service/InvoicePdfHandler.php
View File

@ -52,8 +52,8 @@ class InvoicePdfHandler extends FPDF
function Header() function Header()
{ {
if ($this->logo != "nothing") { if ($this->logo != "nothing") {
$this->Image($this->logoPath . "logo.png", 4, 2, 50, 35); $this->Image($this->logoPath . "logo.png", 4, 2, 36, 37);
$this->AddWatermark(); // $this->AddWatermark();
} else { } else {
$this->Cell(55, 30, ''); $this->Cell(55, 30, '');
} }
@ -61,6 +61,7 @@ class InvoicePdfHandler extends FPDF
function AddWatermark() function AddWatermark()
{ {
try {
$this->SetAlpha(0.2); $this->SetAlpha(0.2);
$imagePath = $this->logoPath . "filigrane_pdf.png"; $imagePath = $this->logoPath . "filigrane_pdf.png";
@ -82,6 +83,9 @@ class InvoicePdfHandler extends FPDF
// Ajouter l'image en filigrane // Ajouter l'image en filigrane
$this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur
$this->SetAlpha(0.1); // Définir l'opacité $this->SetAlpha(0.1); // Définir l'opacité
} catch (\Exception $e) {
// Handle exception if needed
}
} }
function SetAlpha($alpha) function SetAlpha($alpha)

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

@ -38,7 +38,7 @@ class MailerService {
){ ){
$this->adminStorage = $rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD); $this->adminStorage = $rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD);
} }
public function getFooterContent ($userName = "Johann"){ public function getFooterContent ($userName = "Vanessa"){
$wish = "<p>Vous en souhaitant bonne réception. </p>"; $wish = "<p>Vous en souhaitant bonne réception. </p>";
$cordialement = "<p> Cordialement,</p>"; $cordialement = "<p> Cordialement,</p>";
$userName = "<p> {$userName} </p>" ; $userName = "<p> {$userName} </p>" ;