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

Merge branch 'fixes/fix-bijou-and-pacemaker-photo' into staging

Browse Source
This commit is contained in:
Tiavina 2025-02-13 09:19:03 +03:00
commit f86a272332
8 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/js/apercusTousDevis.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/apercusToutesFactures.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/defuntShow.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/devisShow.app.js
View File

File diff suppressed because one or more lines are too long

2
gestion/js/facture.app.js
View File

File diff suppressed because one or more lines are too long

4
gestion/lib/Controller/PageController.php
View File

@ -2791,10 +2791,10 @@ class PageController extends Controller {
return false;
}
$folder = FileExportHelpers::GetBijouxOfDefuntFolder($devisOfDefunt["client_nom"],$bijoux["defunt_nom"],$currentConfig->path);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
try {
$this->storage->newFolder($folder);
$this->adminStorage->newFolder($folder);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
$appAdminStorage->newFolder($folder);
}
catch(\OCP\Files\NotPermittedException $e) {
@ -2830,10 +2830,10 @@ class PageController extends Controller {
return null;
}
$folder = FileExportHelpers::GetPacemakerPhotoFolderOfDefunt($devisOfDefunt["client_nom"],$devisOfDefunt["defunt_nom"],$currentConfig->path);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
try {
$this->storage->newFolder($folder);
$this->adminStorage->newFolder($folder);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
$appAdminStorage->newFolder($folder);
}
catch(\OCP\Files\NotPermittedException $e) {

10
gestion/src/js/listener/invoiceListener.js
View File

@ -69,9 +69,10 @@ $('body').on('click', '#payInvoice', function () {
let datatable = new DataTable('.tabledt');
Facture.loadFactureDT(datatable);
showSuccess(t('gestion', "Factures payés avec succès"));
return;
}
showError(t('gestion', "Erreur dans le paiement des factures"));
else{
showError(t('gestion', "Erreur dans le paiement des factures"));
}
}).fail(function (response, code) {
$('#facturePaymentModal').hide();
showError(t('gestion', "Erreur dans le paiement des factures"));
@ -105,9 +106,10 @@ $('body').on('click', '#exportMultipleFactureToPdf', function () {
var fileName = response;
if(fileName != null){
showSuccess('Sauvegardé dans' + fileName);
return;
}
showError(t('gestion', "Les données pour sauvegarde sont vides"));
else{
showError(t('gestion', "Les données pour sauvegarde sont vides"));
}
}).fail(function (response, code) {
showError(t('gestion', "Erreur dans la génération de facture multiple"));
}).always(function () {

30
gestion/src/js/modules/ajaxRequest.mjs
View File

@ -815,12 +815,13 @@ export function exportDevisToPdf(devisId) {
}).done(function (response) {
if(response == null) {
showMessage('Le devis n\'existe pas');
return;
}
var fileNames = JSON.parse(response);
fileNames.forEach(fileName => {
showSuccess('Sauvegardé dans' + fileName);
});
else{
var fileNames = JSON.parse(response);
fileNames.forEach(fileName => {
showSuccess('Sauvegardé dans' + fileName);
});
}
}).fail(function (response, code) {
showMessage(t('gestion', 'Erreur dans l\'export du devis en PDF'));
}).always(function () {
@ -848,9 +849,10 @@ export function exportClientDevisByMonthAndYearToPdf(clientId,year,month) {
}).done(function (response) {
if(response != null) {
showSuccess('Sauvegardé dans' + response);
return;
}
showError(t('gestion', "Les données pour sauvegarde sont vides"));
else{
showError(t('gestion', "Les données pour sauvegarde sont vides"));
}
}).fail(function (response, code) {
showError(t('gestion', "Erreur dans la génération de devis multiple"));
}).always(function () {
@ -880,9 +882,10 @@ export function setBijouxPhoto(bijouxId,file) {
if(response != null) {
showSuccess('Sauvegardé dans' + response);
getBijouxById();
return;
}
showError(t('gestion', "Erreur dans l'assignation de photo sur ce bijou"));
else{
showError(t('gestion', "Erreur dans l'assignation de photo sur ce bijou"));
}
}).fail(function (response, code) {
showError(t('gestion', "Erreur dans la génération de devis multiple"));
}).always(function () {
@ -891,6 +894,7 @@ export function setBijouxPhoto(bijouxId,file) {
}
else{
showError(t('gestion', "Veuillez choisir une image"))
hideLoader();
}
};
@ -916,9 +920,10 @@ export function setDefuntPacemakerPhoto(defuntId,file) {
showSuccess('Sauvegardé dans' + response);
let pacemakerPhotoLabel = document.getElementById("pacemakerPhotoLabel");
pacemakerPhotoLabel.innerHTML = file.name;
return;
}
showError(t('gestion', "Le défunt n'appartient à aucun devis"));
else{
showError(t('gestion', "Le défunt n'appartient à aucun devis"));
}
}).fail(function (response, code) {
showError(t('gestion', "Le défunt n'appartient à aucun devis"));
}).always(function () {
@ -926,6 +931,7 @@ export function setDefuntPacemakerPhoto(defuntId,file) {
});
}
else{
showError(t('gestion', "Veuillez choisir une photo"))
showError(t('gestion', "Veuillez choisir une photo"));
hideLoader();
}
};