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

Merge branch 'fixes/fix-talk-devis-format' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-30 14:09:57 +03:00
commit 5108043679
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3401,25 +3401,12 @@ class Bdd {
return $productMessage;
}
private function getDevisTalkRoomClientContent($clientNom,$clientPrenom){
private function getDevisTalkRoomClientContent($clientPrenom){
$message = ". Pour PF: ";
$clientNameContent = "";
$clientNomIsSet = $clientNom != null && $clientNom != "" && $clientNom != "-";
$clientNameContent = "aucun";
$clientPrenomIsSet = $clientPrenom != null && $clientPrenom != "" && $clientPrenom != "-";
if($clientNomIsSet){
$clientNameContent .= html_entity_decode($clientNom);
}
if($clientPrenomIsSet){
$clientPrenomContent = html_entity_decode($clientPrenom);
if($clientNomIsSet){
$clientNameContent .= " ".$clientPrenomContent;
}
else{
$clientNameContent .= $clientPrenomContent;
}
}
if($clientNameContent == ""){
$clientNameContent = "aucun";
$clientNameContent = html_entity_decode($clientPrenom);
}
$message .= $clientNameContent;
return $message;
@ -3439,7 +3426,7 @@ class Bdd {
$message .= 'à '.$devis->startTime. ' ';
$message .= 'à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin);
$clientMessageContent = $this->getDevisTalkRoomClientContent($devis->nom,$devis->prenom);
$clientMessageContent = $this->getDevisTalkRoomClientContent($devis->prenom);
$message .= $clientMessageContent;
$productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
$message .= $productMessage;
@ -3448,13 +3435,13 @@ class Bdd {
$comment = html_entity_decode($devis->comment);
}
$message .= ". COMMENTAIRES: ".$comment.". ";
$clientCodes = [
$locationCodes = [
"Code portail" => $devis->portal_code,
"Code alarme" => $devis->alarm_code,
"Code funéraire" => $devis->funeral_code
];
$locationCodeMessageContent = "";
foreach($clientCodes as $label => $code){
foreach($locationCodes as $label => $code){
$value = "Aucun";
if($code != null && trim($code) != ""){
$value = $code;