diff --git a/gestion/appinfo/routes.php b/gestion/appinfo/routes.php index 143d125..c964995 100644 --- a/gestion/appinfo/routes.php +++ b/gestion/appinfo/routes.php @@ -149,7 +149,7 @@ return [ ['name' => 'page#getUserConnectedGroups', 'url' => '/getUserConnectedGroups', 'verb' => 'GET'], //testTalk - ['name' => 'page#testTalk', 'url' => '/testTalk', 'verb' => 'POST'], + // ['name' => 'page#testTalk', 'url' => '/testTalk', 'verb' => 'POST'], //devis pdf ['name' => 'page#exportDevisToPdf', 'url' => '/devis/exportDevisToPdf', 'verb' => 'POST'], diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index 3bf90a6..a734486 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -3271,6 +3271,30 @@ class Bdd { $productMessage = rtrim($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){ @@ -3280,12 +3304,14 @@ class Bdd { } $devisDate = new Datetime($devis->date); $devisDate = $devisDate->format('d/m/Y'); - $message = "NOUVEL INTERVENTION: "; + $message = "NOUVELLE INTERVENTION: "; $message .= html_entity_decode($devis->nom_defunt) . ' '; $message .= 'le '.$devisDate. ' '; $message .= 'à '.$devis->startTime. ' '; $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); $message .= $productMessage; $comment = "aucun";