Merge branch 'fixes/fix-export-utf-and-logo-path' into staging

This commit is contained in:
Tiavina 2024-12-30 14:45:33 +03:00
commit 699f60d7ec
22 changed files with 26 additions and 23 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -50,7 +50,8 @@ class ExportClientStatisticService {
$filename .= $client['client_nom'] . '-' . $client['client_entreprise'] . '--';
}
$filename = rtrim($filename, '-');
return utf8_decode(html_entity_decode($filename));
$filename = str_replace(' ','-', $filename);
return $filename;
}
public function getExportClientFileHeader(): string{

View File

@ -52,7 +52,8 @@ class ExportThanatoStatisticService {
$filename .= $thanato['thanato_nom'] . '-' . $thanato['thanato_prenom'] . '--';
}
$filename = rtrim($filename, '-');
return utf8_decode(html_entity_decode($filename));
$filename = str_replace(' ','-', $filename);
return $filename;
}
public function getExportThanatoFileHeader(): string{

View File

@ -395,6 +395,7 @@ $('body').on('click', '#exportDevisToFacture', function () {
});
if(devisToFacture.length == 0){
showError(t('gestion', "Veuillez choisir une ligne de devis à facturer"));
return;
}
@ -410,9 +411,9 @@ $('body').on('click', '#exportDevisToFacture', function () {
}).done(function (response) {
let datatable = new DataTable('.tabledt');
Devis.loadDevisDT(datatable);
showSuccess(t('gestion', "Devis exported to facture"));
showSuccess(t('gestion', "Devis facturés avec succès"));
}).fail(function (response, code) {
showError(t('gestion', "Please select devis to facture"));
showError(t('gestion', "Erreur dans la facturation du devis"));
});