diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index d06bd39..7de5fd2 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -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;