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

Merge branch 'fixes/fix-talk-message-design' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-27 11:51:54 +03:00
commit 81635aae5f
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/appinfo/routes.php
View File

@ -149,7 +149,7 @@ return [
['name' => 'page#getUserConnectedGroups', 'url' => '/getUserConnectedGroups', 'verb' => 'GET'], ['name' => 'page#getUserConnectedGroups', 'url' => '/getUserConnectedGroups', 'verb' => 'GET'],
//testTalk //testTalk
['name' => 'page#testTalk', 'url' => '/testTalk', 'verb' => 'POST'], // ['name' => 'page#testTalk', 'url' => '/testTalk', 'verb' => 'POST'],
//devis pdf //devis pdf
['name' => 'page#exportDevisToPdf', 'url' => '/devis/exportDevisToPdf', 'verb' => 'POST'], ['name' => 'page#exportDevisToPdf', 'url' => '/devis/exportDevisToPdf', 'verb' => 'POST'],

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

@ -3272,6 +3272,30 @@ class Bdd {
return $productMessage; return $productMessage;
} }
private function getDevisTalkRoomClientContent($clientNom,$clientPrenom){
$message = ". Pour PF: ";
$clientNameContent = "";
$clientNomIsSet = $clientNom != null && $clientNom != "" && $clientNom != "-";
$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";
}
$message .= $clientNameContent;
return $message;
}
public function getDevisTalkRoomMessage($devisId,$idNextcloud){ public function getDevisTalkRoomMessage($devisId,$idNextcloud){
$devis = $this->getDevisByIdWithCalendarDataAndProducts($devisId,$idNextcloud); $devis = $this->getDevisByIdWithCalendarDataAndProducts($devisId,$idNextcloud);
@ -3280,12 +3304,14 @@ 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 = "NOUVEL 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->nom,$devis->prenom);
$message .= $clientMessageContent;
$productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products); $productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
$message .= $productMessage; $message .= $productMessage;
$comment = "aucun"; $comment = "aucun";