From 37101ef3dd05a99ca69096738f6c62a0d6d90f0a Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Tue, 14 Jan 2025 10:08:25 +0300
Subject: [PATCH] add products description and reference and comments in talk
 message,

---
 gestion/lib/Db/Bdd.php | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index aead4d9..50a26f3 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -2968,7 +2968,7 @@ class Bdd {
         return null;
     }
 
-    private function getDevisByIdWithCalendarData($devisId,$idNextcloud){
+    private function getDevisByIdWithCalendarDataAndProducts($devisId,$idNextcloud){
         $devis = $this->getOneDevis($devisId,$idNextcloud);
         $devis= json_decode($devis);
         if(empty($devis)){
@@ -2982,23 +2982,43 @@ class Bdd {
         $devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData);
         $devis->startTime = $devisTimeValue["startTime"];
         $devis->endTime = $devisTimeValue["endTime"];
+        $devisProducts = $this->getDevisProduits($devisId);
+        $devisProducts = json_encode($devisProducts);
+        $devisProducts = json_decode($devisProducts);
+        $devis->products = $devisProducts;
         return $devis;
     }
+
+    private function getDevisTalkRoomProductSectionMessage($devisProducts){
+        if(empty($devisProducts)){
+            return "";
+        }
+        $productMessage = ". SOINS A FAIRE : ";
+        foreach($devisProducts as $product){
+            $productMessage.= html_entity_decode($product->produit_reference)." ".html_entity_decode($product->produit_description). "(".$product->quantite."), ";
+        }
+        $productMessage = trim( $productMessage );
+        $productMessage = rtrim($productMessage,",");
+        return $productMessage;
+    }
     
 
     public function getDevisTalkRoomMessage($devisId,$idNextcloud){
-        $devis = $this->getDevisByIdWithCalendarData($devisId,$idNextcloud);
+        $devis = $this->getDevisByIdWithCalendarDataAndProducts($devisId,$idNextcloud);
         if($devis == null){
             return null;
         }
         $devisDate = new Datetime($devis->date);
         $devisDate = $devisDate->format('d/m/Y');
-
-        $message = "NOUVEAUX SOINS : ";
+        $message = "NOUVEAUX SOINS: ";
         $message .= $devis->nom_defunt . ' ';
         $message .= 'le '.$devisDate. ' ';
         $message .= 'à '.$devis->startTime. ' ';
-        $message .= 'à '.$devis->lieu. ' '. $devis->adresse_soin;
+        $message .= 'à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin);
+
+        $productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
+        $message .= $productMessage;
+        $message .= ". COMMENTAIRES: ".html_entity_decode($devis->comment);
         return $message;
     }