From f86bd186953816dd0ff112cc8e6fc74430b3c530 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Wed, 22 Jan 2025 15:46:10 +0300
Subject: [PATCH] folder names and filename to upper utf 8 fix, WIP update
 message talk

---
 .../lib/Service/Certificate/CertificateService.php   | 12 ++++++------
 gestion/lib/Service/InvoicePdfHandler.php            |  6 +++---
 gestion/lib/Service/InvoicePdfService.php            |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gestion/lib/Service/Certificate/CertificateService.php b/gestion/lib/Service/Certificate/CertificateService.php
index 4ccf921..c95f89f 100644
--- a/gestion/lib/Service/Certificate/CertificateService.php
+++ b/gestion/lib/Service/Certificate/CertificateService.php
@@ -155,31 +155,31 @@ class CertificateService {
 
     private function getCareCertificateFolder($devisOfDefunt){
         $careCertificateFolder = 'CLIENTS/'
-        .strtoupper($devisOfDefunt["client_entreprise"])
+        .mb_strtoupper($devisOfDefunt["client_entreprise"],'UTF-8')
         .'/DEFUNTS/'
-        .strtoupper($devisOfDefunt["defunt_nom"]).'/'
+        .mb_strtoupper($devisOfDefunt["defunt_nom"],'UTF-8').'/'
         .'ATTESTATION/';
 
         return $careCertificateFolder;
     }
 
     private function GetCareCertificateFilename($devisOfDefunt){
-        $filename = 'ATTESTATION_SOIN_'.strtoupper($devisOfDefunt['defunt_nom']);
+        $filename = 'ATTESTATION_SOIN_'.mb_strtoupper($devisOfDefunt['defunt_nom'],'UTF-8');
         return $filename;
     }
 
     private function getPacemakerCertificateFolder($devisOfDefunt){
         $folder = 'CLIENTS/'
-        .strtoupper($devisOfDefunt["client_entreprise"])
+        .mb_strtoupper($devisOfDefunt["client_entreprise"],'UTF-8')
         .'/DEFUNTS/'
-        .strtoupper($devisOfDefunt["defunt_nom"]).'/'
+        .mb_strtoupper($devisOfDefunt["defunt_nom"],'UTF-8').'/'
         .'ATTESTATION/';
 
         return $folder;
     }
 
     private function getPacemakerCertificateFilename($devisOfDefunt){
-        $filename = 'ATTESTATION_PACEMAKER_'.strtoupper($devisOfDefunt['defunt_nom']);
+        $filename = 'ATTESTATION_PACEMAKER_'.mb_strtoupper($devisOfDefunt['defunt_nom'],'UTF-8');
         return $filename;
     }
 
diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php
index 7e16b77..bd4e995 100644
--- a/gestion/lib/Service/InvoicePdfHandler.php
+++ b/gestion/lib/Service/InvoicePdfHandler.php
@@ -77,10 +77,10 @@ class InvoicePdfHandler extends FPDF {
         foreach($this->multipleFactureData as $factureData){
             $factureType = $factureData["facture_type"];
             if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){
-                $filename = strtoupper($factureData["client_entreprise"]);
+                $filename = mb_strtoupper($factureData["client_entreprise"],'UTF-8');
             }
             else{
-                $filename = 'GROUP_'.strtoupper($factureData["client_entreprise"]);
+                $filename = 'GROUP_'.mb_strtoupper($factureData["client_entreprise"],'UTF-8');
             }
             $filename .= $month != 0 ? '_'.DateHelpers::GetMonthPlainString($month) :'';
             $filename .= "_".$year;
@@ -93,7 +93,7 @@ class InvoicePdfHandler extends FPDF {
         $factureNum = $this->factureData['num'];
         $factureNum = str_replace('/','-',$factureNum);
         $defuntNom = str_replace('&nbsp;',' ',$this->factureData['defunt_nom']);
-        return $this->factureData['configuration']->facture_prefixe.'_'.$factureNum.'_'.strtoupper($defuntNom);
+        return $this->factureData['configuration']->facture_prefixe.'_'.$factureNum.'_'.mb_strtoupper($defuntNom,'UTF-8');
     }
 
     private function DrawInvoiceCompanyAndClientInfo(){
diff --git a/gestion/lib/Service/InvoicePdfService.php b/gestion/lib/Service/InvoicePdfService.php
index 322a3d0..7b6080b 100644
--- a/gestion/lib/Service/InvoicePdfService.php
+++ b/gestion/lib/Service/InvoicePdfService.php
@@ -101,8 +101,8 @@ class InvoicePdfService {
     }
     
     private function getFacturesFolder(array $factureData,$racinePath){
-        $clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($factureData["client_entreprise"]).'/';
-        $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.strtoupper($factureData['defunt_nom']).'/'.'FACTURES'.'/';
+        $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_entreprise"],'UTF-8').'/';
+        $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/';
         $devisDate = $factureData['devis_date'];
         $devisDatetime = new DateTime($devisDate);
         $devisDateYear = $devisDatetime->format('Y');
@@ -135,7 +135,7 @@ class InvoicePdfService {
         $pdf->MutlipleInvoicePdfFactory($invoiceData,$logo);
         $pdf->SetMultipleFactureContent();
         $racinePath = html_entity_decode(string: $currentConfig->path).'/';
-        $clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($invoiceData[0]["client_entreprise"]).'/';
+        $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($invoiceData[0]["client_entreprise"],'UTF-8').'/';
         $filename = $currentConfig->facture_prefixe.'_'.$pdf->GetMultipleInvoiceFilename($month,$year);
         $filenamePath = $clientRacineFolder.$filename.'.pdf';
         $pdfContent = $pdf->Output('','S');