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