slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add products description and reference and comments in talk message,

Browse Source
This commit is contained in:
Tiavina 2025-01-14 10:08:25 +03:00
parent ac2326a635
commit 37101ef3dd
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2968,7 +2968,7 @@ class Bdd {
return null; return null;
} }
private function getDevisByIdWithCalendarData($devisId,$idNextcloud){ private function getDevisByIdWithCalendarDataAndProducts($devisId,$idNextcloud){
$devis = $this->getOneDevis($devisId,$idNextcloud); $devis = $this->getOneDevis($devisId,$idNextcloud);
$devis= json_decode($devis); $devis= json_decode($devis);
if(empty($devis)){ if(empty($devis)){
@ -2982,23 +2982,43 @@ class Bdd {
$devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData); $devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData);
$devis->startTime = $devisTimeValue["startTime"]; $devis->startTime = $devisTimeValue["startTime"];
$devis->endTime = $devisTimeValue["endTime"]; $devis->endTime = $devisTimeValue["endTime"];
$devisProducts = $this->getDevisProduits($devisId);
$devisProducts = json_encode($devisProducts);
$devisProducts = json_decode($devisProducts);
$devis->products = $devisProducts;
return $devis; 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){ public function getDevisTalkRoomMessage($devisId,$idNextcloud){
$devis = $this->getDevisByIdWithCalendarData($devisId,$idNextcloud); $devis = $this->getDevisByIdWithCalendarDataAndProducts($devisId,$idNextcloud);
if($devis == null){ if($devis == null){
return null; return null;
} }
$devisDate = new Datetime($devis->date); $devisDate = new Datetime($devis->date);
$devisDate = $devisDate->format('d/m/Y'); $devisDate = $devisDate->format('d/m/Y');
$message = "NOUVEAUX SOINS: "; $message = "NOUVEAUX SOINS: ";
$message .= $devis->nom_defunt . ' '; $message .= $devis->nom_defunt . ' ';
$message .= 'le '.$devisDate. ' '; $message .= 'le '.$devisDate. ' ';
$message .= 'à '.$devis->startTime. ' '; $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; return $message;
} }