root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging-HFC' into production-hfc

Browse Source
This commit is contained in:
narindraezway 2025-08-27 17:28:21 +03:00
commit c6f2a549b5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gestion/lib/Helpers/FileExportHelpers.php
View File

@ -16,8 +16,8 @@ class FileExportHelpers
} }
public static function GetAddressAndCityFromAddress(string $adresse){ public static function GetAddressAndCityFromAddress(string $adresse){
$adresseResult = "Aucun adresse"; $adresseResult = "";
$cityResult = "Aucune ville"; $cityResult = "";
$adresses = explode("-",$adresse); $adresses = explode("-",$adresse);
if(isset($adresses[0])){ if(isset($adresses[0])){
$adresseResult = self::RemoveSpaceFromString($adresses[0]); $adresseResult = self::RemoveSpaceFromString($adresses[0]);

12
gestion/lib/Service/MailerService.php
View File

@ -47,14 +47,16 @@ class MailerService {
} }
private function getSignatureHtmlEmailContent (){ private function getSignatureHtmlEmailContent (){
$signatureImage = $this->getSignatureContent(); return " HYGIENE FUNERAIRE du CENTRE";
if (!$signatureImage) { // $signatureImage = $this->getSignatureContent();
return ""; // if (!$signatureImage) {
} // return "";
return "<img width='170' height='80' style= 'width: 170;height: 80px;display:block;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ; // }
// return "<img width='170' height='80' style= 'width: 170;height: 80px;display:block;' src='data:image/jpeg;base64,".base64_encode($signatureImage)."'>" ;
} }
private function getSignatureContent(){ private function getSignatureContent(){
try{ try{
if(isset($this->adminStorage)){ if(isset($this->adminStorage)){
$file = $this->adminStorage->get('/.gestion/sign.jpg'); $file = $this->adminStorage->get('/.gestion/sign.jpg');