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

talk message format

Browse Source
This commit is contained in:
Tiavina 2025-03-13 10:45:24 +03:00
parent 7e6992dfad
commit c9efafcf5d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3787,7 +3787,7 @@ class Bdd {
if(empty($devisProducts)){ if(empty($devisProducts)){
return ""; return "";
} }
$productMessage = ". ACTE A FAIRE : "; $productMessage = "ACTE A FAIRE : ";
foreach($devisProducts as $product){ foreach($devisProducts as $product){
$productMessage.= html_entity_decode($product->produit_reference).", "; $productMessage.= html_entity_decode($product->produit_reference).", ";
} }
@ -3797,7 +3797,7 @@ class Bdd {
} }
private function getDevisTalkRoomClientContent($clientPrenom){ private function getDevisTalkRoomClientContent($clientPrenom){
$message = ". Pour PF: "; $message = "Pour PF: ";
$clientNameContent = "aucun"; $clientNameContent = "aucun";
$clientPrenomIsSet = $clientPrenom != null && $clientPrenom != "" && $clientPrenom != "-"; $clientPrenomIsSet = $clientPrenom != null && $clientPrenom != "" && $clientPrenom != "-";
if($clientPrenomIsSet){ if($clientPrenomIsSet){
@ -3816,20 +3816,25 @@ class Bdd {
$devisDate = new Datetime($devis->date); $devisDate = new Datetime($devis->date);
$devisDate = $devisDate->format('d/m/Y'); $devisDate = $devisDate->format('d/m/Y');
$message = "NOUVELLE INTERVENTION: "; $message = "NOUVELLE INTERVENTION: ";
$message .= html_entity_decode($devis->nom_defunt) . ' '; $message .= html_entity_decode($devis->nom_defunt);
$message .= 'le '.$devisDate. ' '; $message .= '
le '.$devisDate;
$message .= 'à '.$devis->startTime. ' '; $message .= 'à '.$devis->startTime. ' ';
$message .= 'à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin); $message .= '
à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin);
$clientMessageContent = $this->getDevisTalkRoomClientContent($devis->prenom); $clientMessageContent = $this->getDevisTalkRoomClientContent($devis->prenom);
$message .= $clientMessageContent; $message .= '
'.$clientMessageContent;
$productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products); $productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
$message .= $productMessage; $message .= '
'.$productMessage;
$comment = "aucun"; $comment = "aucun";
if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){ if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){
$comment = html_entity_decode($devis->comment); $comment = html_entity_decode($devis->comment);
} }
$message .= ". COMMENTAIRES: ".$comment.". "; $message .= "
COMMENTAIRES: ".$comment;
$locationCodes = [ $locationCodes = [
"Code portail" => $devis->portal_code, "Code portail" => $devis->portal_code,
"Code alarme" => $devis->alarm_code, "Code alarme" => $devis->alarm_code,
@ -3844,7 +3849,8 @@ class Bdd {
$locationCodeMessageContent .= $label. ": ".$value.". "; $locationCodeMessageContent .= $label. ": ".$value.". ";
} }
$locationCodeMessageContent = trim($locationCodeMessageContent); $locationCodeMessageContent = trim($locationCodeMessageContent);
$message .= $locationCodeMessageContent; $message .= '
'.$locationCodeMessageContent;
return $message; return $message;
} }