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

Merge branch 'staging' into releases/release-hytha-prod

Browse Source
This commit is contained in:
Tiavina 2025-04-04 19:43:40 +03:00
commit 602466d9a9
12 changed files with 401 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
<?php <?php
namespace OCA\Gestion\Controller; namespace OCA\Gestion\Controller;
use OCP\IConfig;
use OCP\IRequest; use OCP\IRequest;
use OCP\DB\Exception; use OCP\DB\Exception;
use OCP\Mail\IMailer; use OCP\Mail\IMailer;
@ -22,11 +23,14 @@ class InvoiceController extends Controller
private $storage; private $storage;
private $mailerService; private $mailerService;
private $config;
public function __construct( public function __construct(
$UserId, $UserId,
$AppName, $AppName,
IRequest $request, IRequest $request,
IConfig $config,
Bdd $bdd, Bdd $bdd,
InvoicePdfService $invoicePdfService, InvoicePdfService $invoicePdfService,
IRootFolder $rootFolder, IRootFolder $rootFolder,
@ -41,6 +45,7 @@ class InvoiceController extends Controller
$this->mailer = $mailer; $this->mailer = $mailer;
$this->gestionRepository = $bdd; $this->gestionRepository = $bdd;
$this->mailerService = $mailerService; $this->mailerService = $mailerService;
$this->config = $config;
try{ try{
$this->storage = $rootFolder->getUserFolder($this->currentUserIdNextcloud); $this->storage = $rootFolder->getUserFolder($this->currentUserIdNextcloud);
@ -93,6 +98,12 @@ class InvoiceController extends Controller
$factureContent = $factureGeneratedResponse["content"]; $factureContent = $factureGeneratedResponse["content"];
$factureDate = DateHelpers::convertInvoiceDateToMonthAndYearOnly($facture['date_paiement']); $factureDate = DateHelpers::convertInvoiceDateToMonthAndYearOnly($facture['date_paiement']);
try { try {
$senderEmailAddress = $this->config->getSystemValue('mail_from_address') ?? null;
$senderEmailDomain = $this->config->getSystemValue('mail_domain') ?? null;
$senderEmail = null;
if($senderEmailAddress && $senderEmailDomain){
$senderEmail = $senderEmailAddress.'@'.$senderEmailDomain;
}
$message = $this->mailer->createMessage(); $message = $this->mailer->createMessage();
$message->setTo(recipients: [$email => "Facture"]); $message->setTo(recipients: [$email => "Facture"]);
$content = $this->mailer->createAttachment($factureContent, "Facture.pdf", "application/pdf"); $content = $this->mailer->createAttachment($factureContent, "Facture.pdf", "application/pdf");
@ -106,6 +117,9 @@ class InvoiceController extends Controller
"<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 $signature
); );
if($senderEmail != null){
$message->setCc([$senderEmail]);
}
$this->mailer->send($message); $this->mailer->send($message);
$this->gestionRepository->setFactureSentDate($factureId); $this->gestionRepository->setFactureSentDate($factureId);
} catch (Exception $e) { } catch (Exception $e) {

10
gestion/lib/Controller/PageController.php
View File

@ -1590,6 +1590,12 @@ class PageController extends Controller {
$devis = $this->myDb->getDevisOfDefunt($defuntId); $devis = $this->myDb->getDevisOfDefunt($defuntId);
if($devis != null){ if($devis != null){
// try { // try {
$senderEmailAddress = $this->config->getSystemValue('mail_from_address') ?? null;
$senderEmailDomain = $this->config->getSystemValue('mail_domain') ?? null;
$senderEmail = null;
if($senderEmailAddress && $senderEmailDomain){
$senderEmail = $senderEmailAddress.'@'.$senderEmailDomain;
}
$client_email = $to; $client_email = $to;
$client_nom = $devis['client_nom']; $client_nom = $devis['client_nom'];
$data = $this->storage->get($ff_pdf)->getContent(); $data = $this->storage->get($ff_pdf)->getContent();
@ -1608,6 +1614,10 @@ class PageController extends Controller {
"<p>$body_text</p>". "<p>$body_text</p>".
$signature $signature
); );
if($senderEmail != null){
$message->setCc([$senderEmail]);
}
$this->mailer->send($message); $this->mailer->send($message);
return new DataResponse("", 200, ['Content-Type' => 'application/json']); return new DataResponse("", 200, ['Content-Type' => 'application/json']);
// } catch (Exception $e) { // } catch (Exception $e) {

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

@ -3840,8 +3840,16 @@ class Bdd {
} }
$calendarData = $this->getCalendarDataByCalendarObjectUuid($devis->num); $calendarData = $this->getCalendarDataByCalendarObjectUuid($devis->num);
$devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData); $devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData);
$devis->startTime = $devisTimeValue["startTime"]; $startTimeValueWithMinutes = "";
$devis->endTime = $devisTimeValue["endTime"]; $endTimeValueWithMinutes = "";
if($devisTimeValue["datetimeStart"]){
$startTimeValueWithMinutes = $devisTimeValue["datetimeStart"]->format('H\hi');
}
if($devisTimeValue["datetimeEnd"]){
$endTimeValueWithMinutes = $devisTimeValue["datetimeEnd"]->format('H\hi');
}
$devis->startTime = $startTimeValueWithMinutes;
$devis->endTime = $endTimeValueWithMinutes;
$devisProducts = $this->getDevisProduits($devisId); $devisProducts = $this->getDevisProduits($devisId);
$devisProducts = json_encode($devisProducts); $devisProducts = json_encode($devisProducts);
$devisProducts = json_decode($devisProducts); $devisProducts = json_decode($devisProducts);
@ -3885,7 +3893,7 @@ class Bdd {
$message .= html_entity_decode($devis->nom_defunt); $message .= html_entity_decode($devis->nom_defunt);
$message .= ' $message .= '
le '.$devisDate; le '.$devisDate;
$message .= 'à '.$devis->startTime. ' '; $message .= ' à '.$devis->startTime. ' ';
$message .= ' $message .= '
à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin); à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin);

4
gestion/lib/Db/TalkDb.php
View File

@ -195,9 +195,9 @@ class TalkDb {
[$messageId,$roomId,$idNextCloud]); [$messageId,$roomId,$idNextCloud]);
} }
public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message){ public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message,$senderUser){
$this->createDevisTalkRoomMessage( $this->createDevisTalkRoomMessage(
BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD, $senderUser,
$message, $message,
self::DEVIS_TALK_ROOM_VERB_COMMENT, self::DEVIS_TALK_ROOM_VERB_COMMENT,
$roomId, $roomId,

4
gestion/lib/Helpers/VCalendarHelpers.php
View File

@ -41,6 +41,8 @@ class VCalendarHelpers
$endTimeValue = ""; $endTimeValue = "";
$totalHours = 0; $totalHours = 0;
$totalWorkedHours = 0; $totalWorkedHours = 0;
$dateStart = null;
$dateEnd = null;
if($vCalendarString != ""){ if($vCalendarString != ""){
$dateStart = self::GetDateStartOrDateEndFromVCalendarString("DTSTART", $vCalendarString); $dateStart = self::GetDateStartOrDateEndFromVCalendarString("DTSTART", $vCalendarString);
if($dateStart != null){ if($dateStart != null){
@ -54,6 +56,8 @@ class VCalendarHelpers
$totalWorkedHours = DateHelpers::GetWorkingHoursBetweenDatetimeEndAndDatetimeStart($dateEnd,$dateStart); $totalWorkedHours = DateHelpers::GetWorkingHoursBetweenDatetimeEndAndDatetimeStart($dateEnd,$dateStart);
} }
return [ return [
"datetimeStart" => $dateStart,
"datetimeEnd" => $dateEnd,
"startTime" => $startTimeValue, "startTime" => $startTimeValue,
"endTime" => $endTimeValue, "endTime" => $endTimeValue,
"totalHours" => $totalHours, "totalHours" => $totalHours,

24
gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceFunecapPdfHandler.php
View File

@ -40,8 +40,8 @@ class InvoiceFunecapPdfHandler extends InvoiceGroupPdfHandler {
$totalHt = 0; $totalHt = 0;
$totalTtc = 0; $totalTtc = 0;
$totalTva = 0; $totalTva = 0;
$yValue = $this->startingYOfArticlesTable + 11; $yValue = $this->startingYOfArticlesTable + 13;
$maxDescriptionWidth = 98; $maxDescriptionWidth = 102;
$currentIndexPosition = $this->currentIndexPosition; $currentIndexPosition = $this->currentIndexPosition;
for($currentIndexPosition;$currentIndexPosition<($this->initialIndexPosition + $this->devisCountToGet);$currentIndexPosition++){ for($currentIndexPosition;$currentIndexPosition<($this->initialIndexPosition + $this->devisCountToGet);$currentIndexPosition++){
$currentDevis = $devisData[$currentIndexPosition]; $currentDevis = $devisData[$currentIndexPosition];
@ -51,11 +51,11 @@ class InvoiceFunecapPdfHandler extends InvoiceGroupPdfHandler {
$products = $currentDevis["products"]; $products = $currentDevis["products"];
$subcontractorOrderNumberText = "Numéro de sous traitance ".$currentDevis["order_number"]; $subcontractorOrderNumberText = "Numéro de sous traitance ".$currentDevis["order_number"];
$subcontractorCaseNumberText = "Numéro de dossier ".$currentDevis["case_number"]; $subcontractorCaseNumberText = "Numéro de dossier ".$currentDevis["case_number"];
$this->SetXY( 35,$yValue ); $this->SetXY( 29,$yValue );
$this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($subcontractorOrderNumberText),0,'0',); $this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($subcontractorOrderNumberText),0,'0',);
$yValue += 6; $yValue += 6;
$this->SetXY( 35,$yValue ); $this->SetXY( 29,$yValue );
$this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($subcontractorCaseNumberText),0,'0',); $this->MultiAlignCell(100, 6, FileExportHelpers::FormatTextForExport($subcontractorCaseNumberText),0,'0',);
$yValue += 6; $yValue += 6;
foreach($products as $product){ foreach($products as $product){
@ -70,10 +70,10 @@ class InvoiceFunecapPdfHandler extends InvoiceGroupPdfHandler {
$productDescription .= " de " . $currentDevis["defunt_nom"] ?? ""; $productDescription .= " de " . $currentDevis["defunt_nom"] ?? "";
} }
$tvaAmount = $valueTtc - $valueHt; $tvaAmount = $valueTtc - $valueHt;
$this->SetXY( 8,$yValue ); $this->SetXY( 5,$yValue );
$this->Cell(20, 6, $dateValue, 0,0); $this->Cell(5, 6, $dateValue, 0,0);
$this->SetXY( 35,$yValue ); $this->SetXY( 29,$yValue );
$productDescription = FileExportHelpers::FormatTextForExport($productDescription); $productDescription = FileExportHelpers::FormatTextForExport($productDescription);
$productDescriptionWidth = $this->GetStringWidth($productDescription); $productDescriptionWidth = $this->GetStringWidth($productDescription);
$productDescriptionWidthIsGreaterThanMaxWidth = $productDescriptionWidth > $maxDescriptionWidth; $productDescriptionWidthIsGreaterThanMaxWidth = $productDescriptionWidth > $maxDescriptionWidth;
@ -89,14 +89,16 @@ class InvoiceFunecapPdfHandler extends InvoiceGroupPdfHandler {
} else { } else {
$this->Cell($maxDescriptionWidth, 6, $productDescription); $this->Cell($maxDescriptionWidth, 6, $productDescription);
} }
$this->SetXY( 138,$yValue ); $this->SetFont('ComicSans', '', 8);
$this->SetXY( 135,$yValue );
$this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');
$this->SetXY( 160,$yValue ); $this->SetXY( 159,$yValue );
$this->Cell(20, 6, number_format($tvaAmount,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($tvaAmount,2,'.','').chr(128), 0, 0, 'C');
$this->SetXY( 181,$yValue ); $this->SetXY( 182,$yValue );
$this->Cell(25, 6, number_format($valueTtc,2,'.','').chr(128), 0, 1, 'C'); $this->Cell(25, 6, number_format($valueTtc,2,'.','').chr(128), 0, 1, 'C');
$yValue += 6; $yValue += 6;
$totalTva += $tvaAmount; $totalTva += $tvaAmount;

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

@ -55,6 +55,7 @@ class InvoiceGroupPdfHandler extends FPDF {
{ {
if($this->logo != "nothing"){ if($this->logo != "nothing"){
$this->Image($this->logoPath."logo.png", 2, 2, 75, 25); $this->Image($this->logoPath."logo.png", 2, 2, 75, 25);
$this->AddWatermark();
} }
else{ else{
$this->Cell(55,30,''); $this->Cell(55,30,'');
@ -63,17 +64,50 @@ class InvoiceGroupPdfHandler extends FPDF {
$this->DrawInvoiceCompanyAndClientInfo(); $this->DrawInvoiceCompanyAndClientInfo();
$this->DrawInvoiceInfoTable(); $this->DrawInvoiceInfoTable();
} }
function AddWatermark()
{
$this->SetAlpha(0.2);
$imagePath = $this->logoPath . "filigrane_pdf.png";
list($originalWidth, $originalHeight) = getimagesize($imagePath);
// Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm)
// Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm)
$originalWidth = $originalWidth * 0.264583;
$originalHeight = $originalHeight * 0.264583;
// Augmenter l'échelle, par exemple, 1.5 pour 150% de la taille d'origine
$scale = 2;
$width = $originalWidth * $scale;
$height = $originalHeight * $scale;
// Calculer la position pour centrer l'image
$x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm
$y = (297 - $height) / 2; // 297 mm est la hauteur d'une page A4
// Ajouter l'image en filigrane
$this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur
$this->SetAlpha(0.1); // Définir l'opacité
}
function SetAlpha($alpha)
{
// Appliquer la transparence au document
$this->SetFillColor(255, 255, 255, $alpha * 255);
$this->SetTextColor(0, 0, 0, $alpha * 255);
$this->SetDrawColor(0, 0, 0, $alpha * 255);
}
function Footer() function Footer()
{ {
$this->SetY(-35); $this->SetY(-34);
$this->SetFont('ComicSans', '', size: 7); $this->SetFont('ComicSans', '', size: 7);
$this->MultiCell(0,5,utf8_decode(html_entity_decode('Tout retard de paiement entraînera de plein droit une pénalité de retard de 3 fois le taux légal ( Loi 2008-776 du 4 août 2008) et une indemnité forfaitaire de 40 EUR pour frais de recouvrement sera appliquée.'))); $this->MultiCell(0,4,utf8_decode(html_entity_decode('Tout retard de paiement entraînera de plein droit une pénalité de retard de 3 fois le taux légal ( Loi 2008-776 du 4 août 2008) et une indemnité forfaitaire de 40 EUR pour frais de recouvrement sera appliquée.')));
$this->Ln(1); $this->Ln(1);
$this->MultiCell(0,5,utf8_decode(html_entity_decode('Si les frais de recouvrement sont supérieurs à ce montant forfaitaire, une indemnisation complémentaire sera due sur présentation de justificatifs ( articles L.441-3 et L.441-6 du code de commerce ). $this->MultiCell(0,4,utf8_decode(html_entity_decode('Si les frais de recouvrement sont supérieurs à ce montant forfaitaire, une indemnisation complémentaire sera due sur présentation de justificatifs ( articles L.441-3 et L.441-6 du code de commerce ).
'))); ')));
$this->SetY(-15); $this->SetY(-10);
$this->SetFont('ComicSans', 'B', 8); $this->SetFont('ComicSans', '', 7);
$this->Cell(0, 10, utf8_decode(html_entity_decode($this->factureData['configuration']->legal_one)), 0, 0, 'C'); $this->Cell(0, 10, utf8_decode(html_entity_decode($this->factureData['configuration']->legal_one)), 0, 0, 'C');
} }
@ -117,11 +151,11 @@ class InvoiceGroupPdfHandler extends FPDF {
public function DrawInvoiceCompanyInfo(){ public function DrawInvoiceCompanyInfo(){
$this->SetY(40); $this->SetY(40);
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration']->entreprise), 0, 1); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($this->factureData['configuration']->entreprise), 0, 1);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse']), 0, 1); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse']), 0, 1);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse_city']), 0, 1); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse_city']), 0, 1);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($this->factureData['configuration']->telephone),0,1); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($this->factureData['configuration']->telephone),0,1);
$this->Cell(0, 5, 'Mail : ' . $this->factureData['configuration']->mail, 0, 1); $this->Cell(0, 4, 'Mail : ' . $this->factureData['configuration']->mail, 0, 1);
} }
public function DrawInvoiceClientInfo(){ public function DrawInvoiceClientInfo(){
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
@ -136,21 +170,22 @@ class InvoiceGroupPdfHandler extends FPDF {
$clientInfoYAxis = $clientAdressIsMultiline ? 35 : 40; $clientInfoYAxis = $clientAdressIsMultiline ? 35 : 40;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($clientName)); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->MultiCell( 0, 5, trim(FileExportHelpers::FormatTextForExport($clientAddress))); $this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
if($clientAdressIsMultiline){ if($clientAdressIsMultiline){
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
} }
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 5, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $this->Cell(0, 4, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
} }
public function DrawInvoiceCompanyAndClientInfo(){ public function DrawInvoiceCompanyAndClientInfo(){
$this->DrawInvoiceCompanyInfo(); $this->DrawInvoiceCompanyInfo();
$this->DrawInvoiceClientInfo(); $this->DrawInvoiceClientInfo();
} }
public function DrawInvoiceInfoTable(){ public function DrawInvoiceInfoTable(){
@ -162,18 +197,18 @@ class InvoiceGroupPdfHandler extends FPDF {
$factureDateEcheance->modify('last day of next month'); $factureDateEcheance->modify('last day of next month');
$factureDateEcheance = $factureDateEcheance->format('d-m-Y'); $factureDateEcheance = $factureDateEcheance->format('d-m-Y');
$this->SetFont('ComicSans', 'B', 11); $this->SetFont('ComicSans', 'B', 11);
$this->Cell(30, 7, 'DATE', 1, 0, 'C'); $this->Cell(25, 7, 'DATE', 1, 0, 'C');
$this->Cell(94, 7, 'CLIENT', 1, 0, 'C'); $this->Cell(104, 7, 'CLIENT', 1, 0, 'C');
$this->Cell(40, 7, 'FACTURE', 1, 0, 'C'); $this->Cell(39, 7, 'FACTURE', 1, 0, 'C');
$this->Cell(40, 7, 'ECHEANCE', 1, 1, 'C'); $this->Cell(36, 7, 'ECHEANCE', 1, 1, 'C');
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$this->Cell(30, 7, $factureDatePaiement, 1, 0, 'C'); $this->Cell(25, 11, $factureDatePaiement, 1, 0, 'C');
$this->Cell(94, 7, utf8_decode(html_entity_decode($this->factureData['group_name'])), 1, 0, 'C'); $this->Cell(104, 11, utf8_decode(html_entity_decode($this->factureData['group_name'])), 1, 0, 'C');
$this->Cell(40, 7, $this->factureData['num'], 1, 0, 'C'); $this->Cell(39, 11, $this->factureData['num'], 1, 0, 'C');
$this->Cell(40, 7, $factureDateEcheance, 1, 1, 'C'); $this->Cell(36, 11, $factureDateEcheance, 1, 1, 'C');
$this->startingYOfArticlesTable = 85; $this->startingYOfArticlesTable = 88;
} }
public function DrawArticlesTableRect(){ public function DrawArticlesTableRect(){
@ -184,42 +219,43 @@ class InvoiceGroupPdfHandler extends FPDF {
// cadre titre des colonnes // cadre titre des colonnes
$this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207,$this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName); $this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207,$this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName);
// les traits verticaux colonnes // les traits verticaux colonnes
$this->Line(35, $this->startingYOfArticlesTable, 35, 232); $this->Line(28, $this->startingYOfArticlesTable, 28, 235);
$this->Line(135, $this->startingYOfArticlesTable, 135, 232); $this->Line(132, $this->startingYOfArticlesTable, 132, 235);
$this->Line(160, $this->startingYOfArticlesTable, 160, 232); $this->Line(157, $this->startingYOfArticlesTable, 157, 235);
$this->Line(180, $this->startingYOfArticlesTable, 180, 232); $this->Line(182, $this->startingYOfArticlesTable, 182, 235);
} }
public function DrawArticlesTableHeader(){ public function DrawArticlesTableHeader(){
$tvaValue = $this->factureData["configuration"]->tva_default; $tvaValue = $this->factureData["configuration"]->tva_default;
$columnNameY = $this->startingYOfArticlesTable + 1; $columnNameY = $this->startingYOfArticlesTable + 1;
$this->SetFont('ComicSans','',10); $this->SetFont('ComicSans', '', 10);
$this->SetXY( 9,$columnNameY ); $this->SetXY(12, $columnNameY);
$this->Cell( 20, 8, "Date", 0, 0, 'C'); $this->Cell(7, 8, "Date", 0, 0, 'C');
$this->SetXY( 35,$columnNameY ); $this->SetXY(28, $columnNameY);
$this->Cell( 100, 8, "Description", 0, 0, 'C'); $this->Cell(100, 8, "Description", 0, 0, 'C');
$this->SetXY( 138,$columnNameY ); $this->SetXY(135, $columnNameY);
$this->Cell( 20, 8, "Prix Uni. HT", 0, 0, 'C'); $this->Cell(20, 8, "Prix Uni. HT", 0, 0, 'C');
$this->SetXY( 160,$columnNameY ); $this->SetXY(159, $columnNameY);
$this->Cell( 20, 8, 'TVA ' . $tvaValue . '%', 0, 0, 'C'); $this->Cell(20, 8, 'TVA ' . $tvaValue . '%', 0, 0, 'C');
$this->SetXY( 181,$columnNameY );
$this->Cell( 25, 8, "Prix Uni. TTC", 0, 0, 'C');
$this->SetXY(185, $columnNameY);
$this->Cell(20, 8, "Prix Uni. TTC", 0, 0, 'C');
} }
public function DrawArticlesTableValue(){ public function DrawArticlesTableValue(){
// Set espacement avant de continue
$this->SetFont('ComicSans','',10); $this->SetFont('ComicSans','',10);
$devisData = $this->factureData['devis']; $devisData = $this->factureData['devis'];
$tvaValue = $this->factureData["configuration"]->tva_default; $tvaValue = $this->factureData["configuration"]->tva_default;
$totalHt = 0; $totalHt = 0;
$totalTtc = 0; $totalTtc = 0;
$totalTva = 0; $totalTva = 0;
$yValue = $this->startingYOfArticlesTable + 11; $yValue = $this->startingYOfArticlesTable + 13;
$maxDescriptionWidth = 98; $maxDescriptionWidth = 102;
$currentIndexPosition = $this->currentIndexPosition; $currentIndexPosition = $this->currentIndexPosition;
for($currentIndexPosition;$currentIndexPosition<($this->initialIndexPosition + $this->devisCountToGet);$currentIndexPosition++){ for($currentIndexPosition;$currentIndexPosition<($this->initialIndexPosition + $this->devisCountToGet);$currentIndexPosition++){
$currentDevis = $devisData[$currentIndexPosition]; $currentDevis = $devisData[$currentIndexPosition];
@ -229,6 +265,8 @@ class InvoiceGroupPdfHandler extends FPDF {
$products = $currentDevis["products"]; $products = $currentDevis["products"];
$productIncrement = 0; $productIncrement = 0;
foreach($products as $product){ foreach($products as $product){
$this->SetFont('ComicSans', '', 8);
$valueHt = $product['produit_price'] * $product["quantite"]; $valueHt = $product['produit_price'] * $product["quantite"];
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue); $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue);
$totalHt+=$valueHt; $totalHt+=$valueHt;
@ -240,10 +278,10 @@ class InvoiceGroupPdfHandler extends FPDF {
$productDescription .= " de " . $currentDevis["defunt_nom"] ?? ""; $productDescription .= " de " . $currentDevis["defunt_nom"] ?? "";
} }
$tvaAmount = $valueTtc - $valueHt; $tvaAmount = $valueTtc - $valueHt;
$this->SetXY( 8,$yValue ); $this->SetXY( 5,$yValue );
$this->Cell(20, 6, $dateValue, 0,0); $this->Cell(5, 6, $dateValue, 0,0);
$this->SetXY( 35,$yValue ); $this->SetXY( 29,$yValue );
$productDescription = FileExportHelpers::FormatTextForExport($productDescription); $productDescription = FileExportHelpers::FormatTextForExport($productDescription);
$productDescriptionWidth = $this->GetStringWidth($productDescription); $productDescriptionWidth = $this->GetStringWidth($productDescription);
$productDescriptionWidthIsGreaterThanMaxWidth = $productDescriptionWidth > $maxDescriptionWidth; $productDescriptionWidthIsGreaterThanMaxWidth = $productDescriptionWidth > $maxDescriptionWidth;
@ -260,13 +298,14 @@ class InvoiceGroupPdfHandler extends FPDF {
$this->Cell($maxDescriptionWidth, 6, $productDescription); $this->Cell($maxDescriptionWidth, 6, $productDescription);
} }
$this->SetXY( 138,$yValue );
$this->SetXY( 135,$yValue );
$this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');
$this->SetXY( 160,$yValue ); $this->SetXY( 159,$yValue );
$this->Cell(20, 6, number_format($tvaAmount,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($tvaAmount,2,'.','').chr(128), 0, 0, 'C');
$this->SetXY( 181,$yValue ); $this->SetXY( 182,$yValue );
$this->Cell(25, 6, number_format($valueTtc,2,'.','').chr(128), 0, 1, 'C'); $this->Cell(25, 6, number_format($valueTtc,2,'.','').chr(128), 0, 1, 'C');
$yValue += 6; $yValue += 6;
$totalTva += $tvaAmount; $totalTva += $tvaAmount;
@ -284,31 +323,37 @@ class InvoiceGroupPdfHandler extends FPDF {
} }
public function DrawBankAndTotalPriceInfo(){ public function DrawBankAndTotalPriceInfo(){
$this->SetY(235); $this->SetY(238);
$this->SetFont('ComicSans', '', 7); $this->SetFont('ComicSans', '', 7);
$this->MultiCell(0,5,utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de ". $this->factureData['configuration']->entreprise))); $this->MultiCell(0,4,utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de ". $this->factureData['configuration']->entreprise)));
$this->MultiCell(0,5,utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :"))); $this->MultiCell(0,4,utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :")));
$this->Ln(1); $this->Ln(1);
//Table IBAN //Table IBAN
$this->SetFont('ComicSans', '', 9); $this->SetFont('ComicSans', '', 8);
$ibanWidth = 90; $ibanWidth = 62;
$ibanCursorY = $this->GetY(); $ibanCursorY = $this->GetY();
$this->Cell($ibanWidth, 5, 'IBAN : FR76 1360 6000 1436 5418 1800 038', 1, 1, 'C'); $this->Cell($ibanWidth, 5, 'IBAN : FR76 1360 6000 1436 5418 1800 038', 1, 1, 'C');
$ibanCursorX = $this->GetX(); $ibanCursorX = $this->GetX();
$this->Cell($ibanWidth, 5, 'Code SWIFT : AGRI FR PP 836', 1, 1, 'C'); $this->Cell($ibanWidth, 5, 'Code SWIFT : AGRI FR PP 836', 1, 1, 'C');
//TABLE HT //TABLE HT
$ibanLastPositionX = $ibanCursorX+$ibanWidth + 54; $tableWidth = 40; // Largeur totale de la 2e table (20+20)
$startOfArrayX = $ibanLastPositionX; $marginRight = 3; // Marge par rapport au bord droit
$startOfArrayY = $ibanCursorY - 10; $pageWidth = 210; // Largeur d'une page A4 en mm (portrait)
// Position correcte de la 2e table
$startOfArrayX = $pageWidth - $tableWidth - $marginRight;
$startOfArrayY = $ibanCursorY - 5;
$totalPriceArray = $this->totalPrices; $totalPriceArray = $this->totalPrices;
foreach($totalPriceArray as $label => $price){ foreach($totalPriceArray as $label => $price){
$this->SetXY($startOfArrayX,$startOfArrayY); $this->SetXY($startOfArrayX,$startOfArrayY);
$this->Cell(30, 5, $label, 1, 1, 'C'); $this->Cell(20, 5, $label, 1, 1, 'C');
$this->SetXY($startOfArrayX + 30,$startOfArrayY); $this->SetXY($startOfArrayX + 20,$startOfArrayY);
$this->Cell(30, 5, number_format($price,2,'.','').chr(128), 1, 1, 'C'); $this->Cell(20, 5, number_format($price,2,'.','').chr(128), 1, 1, 'C');
$startOfArrayY += 5; $startOfArrayY += 5;
} }
} }

34
gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceOgfPdfHandler.php
View File

@ -43,24 +43,24 @@ class InvoiceOgfPdfHandler extends InvoiceGroupPdfHandler {
$availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis; $availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis;
$clientAdressIsMultiline = $clientAdressWidth > $availableWidhtForClientInfo; $clientAdressIsMultiline = $clientAdressWidth > $availableWidhtForClientInfo;
$clientInfoYAxis = $clientAdressIsMultiline ? 35 : 40; $clientInfoYAxis = $clientAdressIsMultiline ? 35 : 39;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($clientName)); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->MultiCell( 0, 5, trim(FileExportHelpers::FormatTextForExport($clientAddress))); $this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
if($clientAdressIsMultiline){ if($clientAdressIsMultiline){
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
} }
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 5, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $this->Cell(0, 4, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->factureData['siret']); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->factureData['siret']);
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']);
} }
public function DrawInvoiceInfoTable(){ public function DrawInvoiceInfoTable(){
@ -79,13 +79,13 @@ class InvoiceOgfPdfHandler extends InvoiceGroupPdfHandler {
$this->Cell(34, 7, 'COMMANDE', 1, 1, 'C'); $this->Cell(34, 7, 'COMMANDE', 1, 1, 'C');
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$this->Cell(30, 7, $factureDatePaiement, 1, 0, 'C'); $this->Cell(30, 11, $factureDatePaiement, 1, 0, 'C');
$this->Cell(60, 7, utf8_decode(html_entity_decode($this->factureData['group_name'])), 1, 0, 'C'); $this->Cell(60, 11, utf8_decode(html_entity_decode($this->factureData['group_name'])), 1, 0, 'C');
$this->Cell(40, 7, $this->factureData['num'], 1, 0, 'C'); $this->Cell(40, 11, $this->factureData['num'], 1, 0, 'C');
$this->Cell(40, 7, $factureDateEcheance, 1, 0, 'C'); $this->Cell(40, 11, $factureDateEcheance, 1, 0, 'C');
$this->Cell(34, 7, $this->factureData["facture_order_number"], 1, 1, 'C'); $this->Cell(34, 11, $this->factureData["facture_order_number"], 1, 1, 'C');
$this->startingYOfArticlesTable = 85; $this->startingYOfArticlesTable = 88;
} }

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

@ -33,200 +33,248 @@ use OCA\Gestion\Helpers\DateHelpers;
use OCA\Gestion\Helpers\FileExportHelpers; use OCA\Gestion\Helpers\FileExportHelpers;
use OCA\Gestion\Helpers\PriceHelpers; use OCA\Gestion\Helpers\PriceHelpers;
class InvoicePdfHandler extends FPDF { class InvoicePdfHandler extends FPDF
{
private $multipleFactureData = []; private $multipleFactureData = [];
private $factureData = []; private $factureData = [];
private $logo = null; private $logo = null;
private $logoPath = "/var/www/html/data/admin/files/.gestion/"; private $logoPath = "/var/www/html/data/admin/files/.gestion/";
protected $extgstates = [];
private $thereIsOrderOrCaseNumber = false; private $thereIsOrderOrCaseNumber = false;
private $startingYOfArticlesTable = 95; private $startingYOfArticlesTable = 95;
function Header() function Header()
{ {
if($this->logo != "nothing"){ if ($this->logo != "nothing") {
$this->Image($this->logoPath."logo.png", 10, 10, 75, 25); $this->Image($this->logoPath."logo.png", 10, 10, 75, 25);
} $this->AddWatermark();
else{ } else {
$this->Cell(55,30,''); $this->Cell(55, 30, '');
} }
} }
function AddWatermark()
{
$this->SetAlpha(0.2);
$imagePath = $this->logoPath . "filigrane_pdf.png";
list($originalWidth, $originalHeight) = getimagesize($imagePath);
// Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm)
// Convertir les dimensions de pixels à mm (1 pixel = 0.264583 mm)
$originalWidth = $originalWidth * 0.264583;
$originalHeight = $originalHeight * 0.264583;
// Augmenter l'échelle, par exemple, 1.5 pour 150% de la taille d'origine
$scale = 2;
$width = $originalWidth * $scale;
$height = $originalHeight * $scale;
// Calculer la position pour centrer l'image
$x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm
$y = (297 - $height) / 2; // 297 mm est la hauteur d'une page A4
// Ajouter l'image en filigrane
$this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur
$this->SetAlpha(0.1); // Définir l'opacité
}
function SetAlpha($alpha)
{
// Appliquer la transparence au document
$this->SetFillColor(255, 255, 255, $alpha * 255);
$this->SetTextColor(0, 0, 0, $alpha * 255);
$this->SetDrawColor(0, 0, 0, $alpha * 255);
}
function Footer() function Footer()
{ {
$this->SetY(-35); $this->SetY(-34);
$this->SetFont('ComicSans', '', 7); $this->SetFont('ComicSans', '', 7);
$this->MultiCell(0,5,utf8_decode(html_entity_decode('Tout retard de paiement entraînera de plein droit une pénalité de retard de 3 fois le taux légal ( Loi 2008-776 du 4 août 2008) et une indemnité forfaitaire de 40 EUR pour frais de recouvrement sera appliquée.'))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode('Tout retard de paiement entraînera de plein droit une pénalité de retard de 3 fois le taux légal ( Loi 2008-776 du 4 août 2008) et une indemnité forfaitaire de 40 EUR pour frais de recouvrement sera appliquée.')));
$this->Ln(1); $this->Ln(1);
$this->MultiCell(0,5,utf8_decode(html_entity_decode('Si les frais de recouvrement sont supérieurs à ce montant forfaitaire, une indemnisation complémentaire sera due sur présentation de justificatifs ( articles L.441-3 et L.441-6 du code de commerce ). $this->MultiCell(0, 4, utf8_decode(html_entity_decode('Si les frais de recouvrement sont supérieurs à ce montant forfaitaire, une indemnisation complémentaire sera due sur présentation de justificatifs ( articles L.441-3 et L.441-6 du code de commerce ).
'))); ')));
$this->SetY(-15); $this->SetY(-10);
$this->SetFont('ComicSans', 'B', 8); $this->SetFont('ComicSans', '', 7);
$this->Cell(0, 10, utf8_decode(html_entity_decode($this->factureData['configuration']->legal_one)), 0, 0, 'C'); $this->Cell(0, 10, utf8_decode(html_entity_decode($this->factureData['configuration']->legal_one)), 0, 0, 'C');
} }
public function InvoicePdfFactory(array $factureData,$logo = null){ public function InvoicePdfFactory(array $factureData, $logo = null)
{
$this->factureData = $factureData; $this->factureData = $factureData;
$this->logo = $logo; $this->logo = $logo;
} }
public function MutlipleInvoicePdfFactory(array $multipleInvoiceData,$logo = null){ public function MutlipleInvoicePdfFactory(array $multipleInvoiceData, $logo = null)
{
$this->multipleFactureData = $multipleInvoiceData; $this->multipleFactureData = $multipleInvoiceData;
$this->logo = $logo; $this->logo = $logo;
} }
public function GetMultipleInvoiceFilename($month,$year){ public function GetMultipleInvoiceFilename($month, $year)
{
$filename = ""; $filename = "";
foreach($this->multipleFactureData as $factureData){ foreach ($this->multipleFactureData as $factureData) {
$factureType = $factureData["facture_type"]; $factureType = $factureData["facture_type"];
if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){ if ($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE) {
$filename = mb_strtoupper($factureData["client_nom"],'UTF-8'); $filename = mb_strtoupper($factureData["client_nom"], 'UTF-8');
} else {
$filename = 'GROUPE_' . mb_strtoupper($factureData["group_name"], 'UTF-8');
} }
else{ $filename .= $month != 0 ? '_' . DateHelpers::GetMonthPlainString($month) : '';
$filename = 'GROUPE_'.mb_strtoupper($factureData["group_name"],'UTF-8'); $filename .= "_" . $year;
}
$filename .= $month != 0 ? '_'.DateHelpers::GetMonthPlainString($month) :'';
$filename .= "_".$year;
break; break;
} }
return $filename; return $filename;
} }
public function GetInvoiceFilename(){ public function GetInvoiceFilename()
{
$factureNum = $this->factureData['num']; $factureNum = $this->factureData['num'];
$factureNum = str_replace('/','-',$factureNum); $factureNum = str_replace('/', '-', $factureNum);
$defuntNom = str_replace('&nbsp;',' ',$this->factureData['defunt_nom']); $defuntNom = str_replace('&nbsp;', ' ', $this->factureData['defunt_nom']);
return $this->factureData['configuration']->facture_prefixe.'_'.$factureNum.'_'.mb_strtoupper($defuntNom,'UTF-8'); return $this->factureData['configuration']->facture_prefixe . '_' . $factureNum . '_' . mb_strtoupper($defuntNom, 'UTF-8');
} }
private function DrawInvoiceCompanyInfo(){ private function DrawInvoiceCompanyInfo()
{
$this->SetY(40); $this->SetY(40);
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration']->entreprise), 0, 1); $this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration']->entreprise), 0, 1);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse']), 0, 1); $this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse']), 0, 1);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse_city']), 0, 1); $this->Cell(0, 5, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse_city']), 0, 1);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($this->factureData['configuration']->telephone),0,1); $this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Tél : ') . FileExportHelpers::FormatTextForExport($this->factureData['configuration']->telephone), 0, 1);
$this->Cell(0, 5, 'Mail : ' . $this->factureData['configuration']->mail, 0, 1); $this->Cell(0, 5, 'Mail : ' . $this->factureData['configuration']->mail, 0, 1);
} }
private function DrawInvoiceClientInfo(){ private function DrawInvoiceClientInfo()
{
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$clientName = $this->factureData['client_nom']; $clientName = $this->factureData['client_nom'];
if($this->factureData["group_name"] != null && $this->factureData["group_name"] != ""){ if ($this->factureData["group_name"] != null && $this->factureData["group_name"] != "") {
$clientName = $this->factureData['group_name']; $clientName = $this->factureData['group_name'];
} }
$clientInfoXAxis = 125; $clientInfoXAxis = 125;
$clientAddress = $this->factureData['client_real_adress']; $clientAddress = $this->factureData['client_real_adress'];
$clientAdressWidth = $this->GetStringWidth($clientAddress); $clientAdressWidth = $this->GetStringWidth($clientAddress);
$maxWidth = $this->GetPageWidth(); $maxWidth = $this->GetPageWidth();
$availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis; $availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis;
$clientAdressIsMultiline = $clientAdressWidth > $availableWidhtForClientInfo; $clientAdressIsMultiline = $clientAdressWidth > $availableWidhtForClientInfo;
$clientInfoYAxis = $clientAdressIsMultiline ? 35 : 40; $clientInfoYAxis = $clientAdressIsMultiline ? 35 : 40;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport($clientName)); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->MultiCell( 0, 5, trim(FileExportHelpers::FormatTextForExport($clientAddress))); $this->MultiCell(0, 4, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
if($clientAdressIsMultiline){ if ($clientAdressIsMultiline) {
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
} }
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->Cell(0, 5, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $this->Cell(0, 4, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->factureData['siret']); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport('Numéro') . ' Siret: ' . $this->factureData['siret']);
$clientInfoYAxis += 5; $clientInfoYAxis += 4;
$this->SetXY($clientInfoXAxis,$clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']); $this->Cell(0, 4, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']);
} }
private function DrawInvoiceCompanyAndClientInfo(){ private function DrawInvoiceCompanyAndClientInfo()
{
$this->DrawInvoiceCompanyInfo(); $this->DrawInvoiceCompanyInfo();
$this->DrawInvoiceClientInfo(); $this->DrawInvoiceClientInfo();
} }
private function DrawInvoiceInfoTable(){ private function DrawInvoiceInfoTable()
$this->setY(67); {
$this->setY(80);
$factureDatePaiement = $this->factureData['date_paiement']; $factureDatePaiement = $this->factureData['date_paiement'];
$factureDatePaiement = DateTime::createFromFormat('Y-m-d',$factureDatePaiement); $factureDatePaiement = DateTime::createFromFormat('Y-m-d', $factureDatePaiement);
$factureDateEcheance = $factureDatePaiement; $factureDateEcheance = $factureDatePaiement;
$factureDatePaiement = $factureDatePaiement->format('d-m-Y'); $factureDatePaiement = $factureDatePaiement->format('d-m-Y');
$factureDateEcheance->modify('last day of next month'); $factureDateEcheance->modify('last day of next month');
$factureDateEcheance = $factureDateEcheance->format('d-m-Y'); $factureDateEcheance = $factureDateEcheance->format('d-m-Y');
$this->SetFont('ComicSans', 'B', 11); $this->SetFont('ComicSans', 'B', 11);
$this->Cell(30, 7, 'DATE', 1, 0, 'C'); $this->Cell(25, 7, 'DATE', 1, 0, 'C');
$this->Cell(94, 7, 'CLIENT', 1, 0, 'C'); $this->Cell(104, 7, 'CLIENT', 1, 0, 'C');
$this->Cell(40, 7, 'FACTURE', 1, 0, 'C'); $this->Cell(39, 7, 'FACTURE', 1, 0, 'C');
$this->Cell(40, 7, 'ECHEANCE', 1, 1, 'C'); $this->Cell(36, 7, 'ECHEANCE', 1, 1, 'C');
$this->setY(90);
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
$this->Cell(30, 7, $factureDatePaiement, 1, 0, 'C'); $this->setY(30);
$this->Cell(94, 7, utf8_decode(html_entity_decode($this->factureData['client_nom'])), 1, 0, 'C'); $this->Cell(25, 11, $factureDatePaiement, 1, 0, 'C');
$this->Cell(40, 7, $this->factureData['num'], 1, 0, 'C'); $this->Cell(104, 11, utf8_decode(html_entity_decode($this->factureData['client_nom'])), 1, 0, 'C');
$this->Cell(40, 7, $factureDateEcheance, 1, 1, 'C'); $this->Cell(39, 11, $this->factureData['num'], 1, 0, 'C');
$this->Cell(36, 11, $factureDateEcheance, 1, 1, 'C');
$orderNumberIsProvided = (trim($this->factureData['order_number']) !== "" && trim($this->factureData['order_number']) !== "-" ); $orderNumberIsProvided = (trim($this->factureData['order_number']) !== "" && trim($this->factureData['order_number']) !== "-");
$caseNumberIsProvided = (trim($this->factureData['case_number']) !== "" && trim($this->factureData['case_number']) !== "-"); $caseNumberIsProvided = (trim($this->factureData['case_number']) !== "" && trim($this->factureData['case_number']) !== "-");
if($orderNumberIsProvided){ if ($orderNumberIsProvided) {
$this->thereIsOrderOrCaseNumber = true; $this->thereIsOrderOrCaseNumber = true;
$this->Ln(2); $this->Ln(2);
if($caseNumberIsProvided == false){ if ($caseNumberIsProvided == false) {
$this->Ln(3); $this->Ln(3);
} }
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Bon de commande: ".$this->factureData['order_number']),0,1,'C'); $this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Bon de commande: " . $this->factureData['order_number']), 0, 1, 'C');
} }
if($caseNumberIsProvided){ if ($caseNumberIsProvided) {
$this->thereIsOrderOrCaseNumber = true; $this->thereIsOrderOrCaseNumber = true;
if($orderNumberIsProvided == false){ if ($orderNumberIsProvided == false) {
$this->Ln(5); $this->Ln(5);
} }
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Numéro de dossier: ".$this->factureData['case_number']),0,1,'C'); $this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Numéro de dossier: " . $this->factureData['case_number']), 0, 1, 'C');
} }
$this->startingYOfArticlesTable = $this->thereIsOrderOrCaseNumber ? 95 : 85; $this->startingYOfArticlesTable = $this->thereIsOrderOrCaseNumber ? 98 : 88;
} }
private function DrawArticlesTable(){ private function DrawArticlesTable()
{
$this->SetLineWidth(0.2); $this->SetLineWidth(0.2);
$gapBetweenStartingOfArticlesTableAndColumnName = 10; $gapBetweenStartingOfArticlesTableAndColumnName = 10;
$tableHeight = $this->thereIsOrderOrCaseNumber ? 137 : 137 + 10; $tableHeight = $this->thereIsOrderOrCaseNumber ? 137 : 137 + 10;
$this->Rect(3, $this->startingYOfArticlesTable, 204, $tableHeight, "D"); $this->Rect(3, $this->startingYOfArticlesTable, 204, $tableHeight, "D");
// cadre titre des colonnes // cadre titre des colonnes
$this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207,$this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName); $this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName);
// les traits verticaux colonnes // les traits verticaux colonnes
$this->Line(35, $this->startingYOfArticlesTable, 35, 232); $this->Line(28, $this->startingYOfArticlesTable, 28, 232);
$this->Line(135, $this->startingYOfArticlesTable, 135, 232); $this->Line(132, $this->startingYOfArticlesTable, 132, 232);
$this->Line(160, $this->startingYOfArticlesTable, 160, 232); $this->Line(157, $this->startingYOfArticlesTable, 157, 232);
$this->Line(180, $this->startingYOfArticlesTable, 180, 232); $this->Line(182, $this->startingYOfArticlesTable, 182, 232);
} }
private function DrawArticlesTableHeader(){ private function DrawArticlesTableHeader()
{
$tvaValue = $this->factureData["configuration"]->tva_default; $tvaValue = $this->factureData["configuration"]->tva_default;
$columnNameY = $this->startingYOfArticlesTable + 1; $columnNameY = $this->startingYOfArticlesTable + 1;
$this->SetFont('ComicSans','',10); $this->SetFont('ComicSans', '', 10);
$this->SetXY( 9,$columnNameY ); $this->SetXY(12, $columnNameY);
$this->Cell( 20, 8, "Date", 0, 0, 'C'); $this->Cell(7, 8, "Date", 0, 0, 'C');
$this->SetXY( 35,$columnNameY ); $this->SetXY(28, $columnNameY);
$this->Cell( 100, 8, "Description", 0, 0, 'C'); $this->Cell(100, 8, "Description", 0, 0, 'C');
$this->SetXY( 138,$columnNameY ); $this->SetXY(135, $columnNameY);
$this->Cell( 20, 8, "Prix Uni. HT", 0, 0, 'C'); $this->Cell(20, 8, "Prix Uni. HT", 0, 0, 'C');
$this->SetXY( 160,$columnNameY ); $this->SetXY(159, $columnNameY);
$this->Cell( 20, 8, 'TVA ' . $tvaValue . '%', 0, 0, 'C'); $this->Cell(20, 8, 'TVA ' . $tvaValue . '%', 0, 0, 'C');
$this->SetXY( 181,$columnNameY );
$this->Cell( 25, 8, "Prix Uni. TTC", 0, 0, 'C');
$this->SetXY(185, $columnNameY);
$this->Cell(20, 8, "Prix Uni. TTC", 0, 0, 'C');
} }
public function DrawArticlesTableValueAndReturnTotalPrice(){ public function DrawArticlesTableValueAndReturnTotalPrice()
$this->SetFont('ComicSans','',10); {
$this->SetFont('ComicSans', '', 10);
$devisDate = $this->factureData['devis_date']; $devisDate = $this->factureData['devis_date'];
$devisDate = DateTime::createFromFormat('Y-m-d',$devisDate); $devisDate = DateTime::createFromFormat('Y-m-d', $devisDate);
$devisDate = $devisDate->format('d-m-Y'); $devisDate = $devisDate->format('d-m-Y');
$tvaValue = $this->factureData["configuration"]->tva_default; $tvaValue = $this->factureData["configuration"]->tva_default;
$totalHt = 0; $totalHt = 0;
@ -234,82 +282,95 @@ class InvoicePdfHandler extends FPDF {
$totalTva = 0; $totalTva = 0;
$products = $this->factureData["products"]; $products = $this->factureData["products"];
$yValue = $this->startingYOfArticlesTable + 11; $yValue = $this->startingYOfArticlesTable + 11;
foreach($products as $product){ foreach ($products as $product) {
$this->SetFont('ComicSans', '', 8);
$valueHt = $product['produit_price']; $valueHt = $product['produit_price'];
$valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt,$tvaValue); $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
$totalHt+=$valueHt; $totalHt += $valueHt;
$totalTtc+=$valueTtc; $totalTtc += $valueTtc;
$productDescription = $product["produit_description"]; $productDescription = $product["produit_description"];
$dateValue = ""; $dateValue = "";
if($product === end($products)){ if ($product === end($products)) {
$dateValue = $devisDate; $dateValue = $devisDate;
$productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->factureData['defunt_sexe']) . ' '. $this->factureData["defunt_nom"]; $productDescription .= " de " . FileExportHelpers::GetSexeLabel($this->factureData['defunt_sexe']) . ' ' . $this->factureData["defunt_nom"];
} }
$tvaAmount = $valueTtc - $valueHt; $tvaAmount = $valueTtc - $valueHt;
$this->SetXY( 8,$yValue ); $this->SetXY(5, $yValue);
$this->Cell(20, 6, $dateValue, 0,0); $this->Cell(5, 6, $dateValue, 0, 0);
$this->SetXY(29, $yValue);
$this->MultiAlignCell(102, 6, utf8_decode(html_entity_decode($productDescription)), 0, '0',);
$this->SetXY( 35,$yValue );
$this->MultiAlignCell(100, 6, utf8_decode(html_entity_decode($productDescription)),0,'0',);
$this->SetXY( 138,$yValue );
$this->Cell(20, 6, number_format($valueHt,2,'.','').chr(128), 0, 0, 'C');
$this->SetXY( 160,$yValue ); $this->SetXY(135, $yValue);
$this->Cell(20, 6, number_format($tvaAmount,2,'.','').chr(128), 0, 0, 'C'); $this->Cell(20, 6, number_format($valueHt, 2, '.', '') . chr(128), 0, 0, 'C');
$this->SetXY( 181,$yValue ); $this->SetXY(159, $yValue);
$this->Cell(25, 6, number_format($valueTtc,2,'.','').chr(128), 0, 1, 'C'); $this->Cell(20, 6, number_format($tvaAmount, 2, '.', '') . chr(128), 0, 0, 'C');
$this->SetXY(182, $yValue);
$this->Cell(25, 6, number_format($valueTtc, 2, '.', '') . chr(128), 0, 1, 'C');
$yValue += 12; $yValue += 12;
$totalTva += $tvaAmount; $totalTva += $tvaAmount;
} }
return [ return [
"TOTAL HT" => $totalHt, "TOTAL HT" => $totalHt,
"TVA ".$tvaValue. "%" => $totalTva, "TVA " . $tvaValue . "%" => $totalTva,
"TOTAL TTC" => $totalTtc "TOTAL TTC" => $totalTtc
]; ];
} }
private function DrawBankAndTotalPriceInfo($totalPriceArray){ private function DrawBankAndTotalPriceInfo($totalPriceArray)
{
$this->SetY(235); $this->SetY(235);
$this->SetFont('ComicSans', '', 7); $this->SetFont('ComicSans', '', 7);
$this->MultiCell(0,5,utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de ". $this->factureData['configuration']->entreprise))); $this->MultiCell(0, 5, utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de " . $this->factureData['configuration']->entreprise)));
$this->MultiCell(0,5,utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :"))); $this->MultiCell(0, 5, utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :")));
$this->Ln(1); $this->Ln(1);
//Table IBAN // Table IBAN
$this->SetFont('ComicSans', '', 9); $this->SetFont('ComicSans', '', 7);
$ibanWidth = 90; $ibanWidth = 56;
$ibanCursorY = $this->GetY(); $ibanCursorY = $this->GetY();
$this->Cell($ibanWidth, 5, 'IBAN : FR76 1360 6000 1436 5418 1800 038', 1, 1, 'C'); $this->Cell($ibanWidth, 5, 'IBAN : FR76 1360 6000 1436 5418 1800 038', 1, 1, 'C');
$ibanCursorX = $this->GetX(); $ibanCursorX = $this->GetX();
$this->Cell($ibanWidth, 5, 'Code SWIFT : AGRI FR PP 836', 1, 1, 'C'); $this->Cell($ibanWidth, 5, 'Code SWIFT : AGRI FR PP 836', 1, 1, 'C');
//TABLE HT //TABLE HT
$ibanLastPositionX = $ibanCursorX+$ibanWidth + 54; $tableWidth = 40; // Largeur totale de la 2e table (20+20)
$startOfArrayX = $ibanLastPositionX; $marginRight = 3; // Marge par rapport au bord droit
$pageWidth = 210; // Largeur d'une page A4 en mm (portrait)
// Position correcte de la 2e table
$startOfArrayX = $pageWidth - $tableWidth - $marginRight;
$startOfArrayY = $ibanCursorY - 10; $startOfArrayY = $ibanCursorY - 10;
foreach($totalPriceArray as $label => $price){
$this->SetXY($startOfArrayX,$startOfArrayY); foreach ($totalPriceArray as $label => $price) {
$this->Cell(30, 5, $label, 1, 1, 'C'); $this->SetXY($startOfArrayX, $startOfArrayY);
$this->SetXY($startOfArrayX + 30,$startOfArrayY); $this->Cell(20, 5, $label, 1, 1, 'C');
$this->Cell(30, 5, number_format($price,2,'.','').chr(128), 1, 1, 'C'); $this->SetXY($startOfArrayX + 20, $startOfArrayY);
$this->Cell(20, 5, number_format($price, 2, '.', '') . chr(128), 1, 1, 'C');
$startOfArrayY += 5; $startOfArrayY += 5;
} }
} }
public function SetMultipleFactureContent(){ public function SetMultipleFactureContent()
foreach($this->multipleFactureData as $factureData){ {
foreach ($this->multipleFactureData as $factureData) {
$this->factureData = $factureData; $this->factureData = $factureData;
$this->SetFactureContent(); $this->SetFactureContent();
} }
} }
public function SetFactureContent(){ public function SetFactureContent()
{
$this->AddPage(); $this->AddPage();
$this->SetMargins(3,0,3); $this->SetMargins(3, 0, 3);
$this->DrawInvoiceCompanyAndClientInfo(); $this->DrawInvoiceCompanyAndClientInfo();
$this->DrawInvoiceInfoTable(); $this->DrawInvoiceInfoTable();
$this->DrawArticlesTable(); $this->DrawArticlesTable();
@ -318,45 +379,42 @@ class InvoicePdfHandler extends FPDF {
$this->DrawBankAndTotalPriceInfo($totalPriceValue); $this->DrawBankAndTotalPriceInfo($totalPriceValue);
} }
function MultiAlignCell($w,$h,$text,$border=0,$ln=0,$align='L',$fill=false) function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
{ {
// Store reset values for (x,y) positions // Store reset values for (x,y) positions
$x = $this->GetX() + $w; $x = $this->GetX() + $w;
$y = $this->GetY(); $y = $this->GetY();
// Make a call to FPDF's MultiCell // Make a call to FPDF's MultiCell
$this->MultiCell($w,$h,$text,$border,$align,$fill); $this->MultiCell($w, $h, $text, $border, $align, $fill);
// Reset the line position to the right, like in Cell // Reset the line position to the right, like in Cell
if( $ln==0 ) if ($ln == 0) {
{ $this->SetXY($x, $y);
$this->SetXY($x,$y); }
} }
}
function NbLines($w, $txt) function NbLines($w, $txt)
{ {
// Compute the number of lines a MultiCell of width w will take // Compute the number of lines a MultiCell of width w will take
if(!isset($this->CurrentFont)) if (!isset($this->CurrentFont))
$this->Error('No font has been set'); $this->Error('No font has been set');
$cw = $this->CurrentFont['cw']; $cw = $this->CurrentFont['cw'];
if($w==0) if ($w == 0)
$w = $this->w-$this->rMargin-$this->x; $w = $this->w - $this->rMargin - $this->x;
$wmax = ($w-2*$this->cMargin)*1000/$this->FontSize; $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
$s = str_replace("\r",'',(string)$txt); $s = str_replace("\r", '', (string)$txt);
$nb = strlen($s); $nb = strlen($s);
if($nb>0 && $s[$nb-1]=="\n") if ($nb > 0 && $s[$nb - 1] == "\n")
$nb--; $nb--;
$sep = -1; $sep = -1;
$i = 0; $i = 0;
$j = 0; $j = 0;
$l = 0; $l = 0;
$nl = 1; $nl = 1;
while($i<$nb) while ($i < $nb) {
{
$c = $s[$i]; $c = $s[$i];
if($c=="\n") if ($c == "\n") {
{
$i++; $i++;
$sep = -1; $sep = -1;
$j = $i; $j = $i;
@ -364,24 +422,20 @@ class InvoicePdfHandler extends FPDF {
$nl++; $nl++;
continue; continue;
} }
if($c==' ') if ($c == ' ')
$sep = $i; $sep = $i;
$l += $cw[$c]; $l += $cw[$c];
if($l>$wmax) if ($l > $wmax) {
{ if ($sep == -1) {
if($sep==-1) if ($i == $j)
{
if($i==$j)
$i++; $i++;
} } else
else $i = $sep + 1;
$i = $sep+1;
$sep = -1; $sep = -1;
$j = $i; $j = $i;
$l = 0; $l = 0;
$nl++; $nl++;
} } else
else
$i++; $i++;
} }
return $nl; return $nl;

3
gestion/lib/Service/InvoicePdfService.php
View File

@ -167,6 +167,9 @@ class InvoicePdfService {
$templateType = $invoicePdfData['template_type_key']; $templateType = $invoicePdfData['template_type_key'];
$clean_folder = html_entity_decode(string: $currentConfig->path).'/'; $clean_folder = html_entity_decode(string: $currentConfig->path).'/';
$factureFolders = $this->getGroupFactureFolder($invoicePdfData,$clean_folder); $factureFolders = $this->getGroupFactureFolder($invoicePdfData,$clean_folder);
//For testing
// $templateType = ClientTemplateTypeConstant::OGF;
switch ($templateType) { switch ($templateType) {
case ClientTemplateTypeConstant::FUNECAP: case ClientTemplateTypeConstant::FUNECAP:
$pdf = new InvoiceFunecapPdfHandler(); $pdf = new InvoiceFunecapPdfHandler();

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

@ -94,7 +94,7 @@ class TalkService {
else{ else{
$roomToken = $room['token']; $roomToken = $room['token'];
} }
$devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message); $devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message,$senderUser);
$this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']); $this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],$senderUser); $this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],$senderUser);
//send notifications //send notifications

4
gestion/lib/Sql/20250402-ADD_NEW_PAYMENT_METHODE_VALUE.sql Normal file
View File

@ -0,0 +1,4 @@
INSERT INTO oc_gestion_facture_payment_type (facture_payment_type_label)
VALUES
('LCR'),
('Prélèvement');