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

Merge branch 'fixes/fix-export-utf-and-logo-path' into staging

Browse Source
This commit is contained in:
Tiavina 2024-12-30 14:31:50 +03:00
commit b516009f28
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gestion/lib/Service/ExportClientStatisticService.php
View File

@ -50,15 +50,15 @@ class ExportClientStatisticService {
$filename .= $client['client_nom'] . '-' . $client['client_entreprise'] . '--'; $filename .= $client['client_nom'] . '-' . $client['client_entreprise'] . '--';
} }
$filename = rtrim($filename, '-'); $filename = rtrim($filename, '-');
return $filename; return utf8_decode(html_entity_decode($filename));
} }
public function getExportClientFileHeader(): string{ public function getExportClientFileHeader(): string{
$fileHeader = $fileHeader =
'Client'.';'. 'Client'.';'.
'Mois'.';'. 'Mois'.';'.
'Année'.';'. utf8_decode(html_entity_decode('Année')).';'.
'Nb defunts'.';'. utf8_decode(html_entity_decode('Nb défunts')).';'.
'Nb articles'.';'. 'Nb articles'.';'.
'Total HT'.';'. 'Total HT'.';'.
"\n"; "\n";

14
gestion/lib/Service/ExportThanatoStatisticService.php
View File

@ -52,22 +52,22 @@ class ExportThanatoStatisticService {
$filename .= $thanato['thanato_nom'] . '-' . $thanato['thanato_prenom'] . '--'; $filename .= $thanato['thanato_nom'] . '-' . $thanato['thanato_prenom'] . '--';
} }
$filename = rtrim($filename, '-'); $filename = rtrim($filename, '-');
return $filename; return utf8_decode(html_entity_decode($filename));
} }
public function getExportThanatoFileHeader(): string{ public function getExportThanatoFileHeader(): string{
$fileHeader = $fileHeader =
'Thanatopracteur'.';'. 'Thanatopracteur'.';'.
'Date'.';'. 'Date'.';'.
'Heure Debut'.';'. utf8_decode(html_entity_decode('Heure de début')).';'.
'Heure Fin'.';'. 'Heure de fin'.';'.
'Soins'.';'. 'Soins'.';'.
utf8_decode(html_entity_decode('Jour/Ferie')).';'. utf8_decode(html_entity_decode('Jour/Férié')).';'.
utf8_decode(html_entity_decode('Nom et Prénom')).';'. utf8_decode(html_entity_decode('Nom et Prénom')).';'.
'Lieu'.';'. 'Lieu'.';'.
'Pompe funebre'.';'. utf8_decode(html_entity_decode('Pompe funèbre')).';'.
'Pompe funebre adresse'.';'. utf8_decode(html_entity_decode('Pompe funèbre adresse')).';'.
'Distance Total (km)'.';'. 'Distance Totale (km)'.';'.
"\n"; "\n";
return $fileHeader; return $fileHeader;
} }

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

@ -33,7 +33,7 @@ class InvoicePdfHandler extends FPDF {
private $factureData = []; private $factureData = [];
private $logo = null; private $logo = null;
private $logoPath = "/var/www/html/custom_apps/gestion/img/"; private $logoPath = "/var/www/html/data/admin/files/.gestion/";
function Header() function Header()
{ {