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

fix thanato stat column (facture num , adresse)

Browse Source
This commit is contained in:
Tiavina 2024-12-30 18:51:03 +03:00
parent 97f1d2b244
commit 77917ada21
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1919,19 +1919,23 @@ class Bdd {
lieu.latitude as lieu_latitude, lieu.latitude as lieu_latitude,
lieu.longitude as lieu_longitude, lieu.longitude as lieu_longitude,
client.nom as nom_client, client.nom as nom_client,
client.entreprise as client_entreprise client.entreprise as client_entreprise,
client.adresse as client_adresse,
facture.num as facture_num
FROM ".$this->tableprefix."devis as devis FROM ".$this->tableprefix."devis as devis
LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id
LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id
LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id
LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
LEFT JOIN ".$this->tableprefix."facture as facture on devis.id = facture.id_devis
WHERE YEAR(devis.date) = ? AND WHERE YEAR(devis.date) = ? AND
MONTH(devis.date) = ? AND MONTH(devis.date) = ? AND
devis.id_thanato IN ($sqlConditionsPlaceholder) devis.id_thanato IN ($sqlConditionsPlaceholder) AND
devis.mentions = ?
ORDER BY devis.date ASC;"; ORDER BY devis.date ASC;";
$devisList = $this->execSQLNoJsonReturn( $devisList = $this->execSQLNoJsonReturn(
$sql, $sql,
array_merge([$currentYear, $currentMonth],$thanatoIds)); array_merge([$currentYear, $currentMonth],$thanatoIds,["facturé"]));
return $devisList; return $devisList;
} }

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

@ -59,6 +59,7 @@ class ExportThanatoStatisticService {
public function getExportThanatoFileHeader(): string{ public function getExportThanatoFileHeader(): string{
$fileHeader = $fileHeader =
'Facture'.';'.
'Thanatopracteur'.';'. 'Thanatopracteur'.';'.
'Date'.';'. 'Date'.';'.
utf8_decode(html_entity_decode('Heure de début')).';'. utf8_decode(html_entity_decode('Heure de début')).';'.
@ -102,6 +103,7 @@ class ExportThanatoStatisticService {
''.';'. ''.';'.
''.';'. ''.';'.
''.';'. ''.';'.
''.';'.
utf8_decode(html_entity_decode("$distance"))."\n"; utf8_decode(html_entity_decode("$distance"))."\n";
return $fileContent; return $fileContent;
} }
@ -119,6 +121,7 @@ class ExportThanatoStatisticService {
private function populateDevisDataIntoThanatoExportFileContent(string $fileContent,array $devis){ private function populateDevisDataIntoThanatoExportFileContent(string $fileContent,array $devis){
$produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]); $produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]);
$fileContent = $fileContent. $fileContent = $fileContent.
utf8_decode(html_entity_decode($devis["facture_num"])).';'.
utf8_decode(html_entity_decode($devis['nom_thanato'] . ' ' . $devis['prenom_thanatho'])).';'. utf8_decode(html_entity_decode($devis['nom_thanato'] . ' ' . $devis['prenom_thanatho'])).';'.
utf8_decode(html_entity_decode($devis["date"])).';'. utf8_decode(html_entity_decode($devis["date"])).';'.
utf8_decode(html_entity_decode($devis["startTime"])).';'. utf8_decode(html_entity_decode($devis["startTime"])).';'.
@ -128,7 +131,7 @@ class ExportThanatoStatisticService {
utf8_decode(html_entity_decode($devis["nom_defunt"])).';'. utf8_decode(html_entity_decode($devis["nom_defunt"])).';'.
utf8_decode(html_entity_decode($devis["nom_lieu"] ?? "")).';'. utf8_decode(html_entity_decode($devis["nom_lieu"] ?? "")).';'.
utf8_decode(html_entity_decode($devis["nom_client"] ?? "")).';'. utf8_decode(html_entity_decode($devis["nom_client"] ?? "")).';'.
utf8_decode(html_entity_decode($devis["client_entreprise"] ?? ""))."\n"; utf8_decode(html_entity_decode($devis["client_adresse"] ?? ""))."\n";
return $fileContent; return $fileContent;