Compare commits

..

31 Commits

Author SHA1 Message Date
7b39ee59f4 handle proper error 2025-07-25 19:26:51 +05:30
3d847444bb Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Expense 2025-07-25 18:45:18 +05:30
303420409c merged 2025-07-25 18:43:22 +05:30
00d91ad8dd removed double assigned class 2025-07-25 18:28:12 +05:30
fb865cbe4f prevent unwanted rendering 2025-07-25 18:28:12 +05:30
d34fadfc6d implement delete functionality for Draft expenses only 2025-07-25 18:28:12 +05:30
3424c79594 rmoved unusd code 2025-07-25 18:27:13 +05:30
dce477f6cd set up action properly 2025-07-25 18:27:12 +05:30
b1fa01e2c9 correctly set isActive flag from document data 2025-07-25 18:27:12 +05:30
007b08f335 added optinal chain for color , for prevent error 2025-07-25 18:27:12 +05:30
9bc5f84c83 completed full updation for expnse feature 2025-07-25 18:27:12 +05:30
0944a8d78c progress in expense update 2025-07-25 18:27:12 +05:30
22ef95d6b7 completed full updation for expnse feature 2025-07-25 18:18:50 +05:30
6b830c5063 progress in expense update 2025-07-25 18:18:50 +05:30
ca2ed451d8 renamed status of expse list - name to displayName 2025-07-25 18:18:50 +05:30
d78f90f700 added utils fun that has code convert into bootstrap color like priamery. 2025-07-25 18:18:50 +05:30
182ae887d8 initiated forn edit and created with one component 2025-07-25 18:18:50 +05:30
24d7bd52d2 view expense with document (image), not yet PDF 2025-07-25 18:18:49 +05:30
2122d7e959 updated global modal for size customize 2025-07-25 18:18:49 +05:30
e388906b80 changed added expense button 2025-07-25 18:18:49 +05:30
e1f5bb8baf color, displayName - of Expense status columns names added insinde hidden column 2025-07-25 18:18:49 +05:30
9df4b20ff0 Added taking action on expense, like Review, Approve ... 2025-07-25 18:18:49 +05:30
bd1dabdd68 made new hook for make action on give employee 2025-07-25 18:18:49 +05:30
945d5b1546 partially implemented Expense Details modal with full view 2025-07-25 18:18:48 +05:30
ce66c137aa created and display expenses list 2025-07-25 18:18:48 +05:30
fca24d4081 making a expense page layout 2025-07-25 18:18:48 +05:30
977ab05e61 created list view interface 2025-07-25 18:18:48 +05:30
bc6e66b25c api integrated for get list of expense-status in master 2025-07-25 18:18:48 +05:30
e5d97e3105 refactored code for optimze 2025-07-25 18:18:48 +05:30
b1586a8cfb added Payment Mode master with API integration and table config for get list 2025-07-25 18:18:48 +05:30
de7ca102fd add Expense Type master with API integration and table config 2025-07-25 18:18:47 +05:30

View File

@ -107,6 +107,9 @@ export const useUpdateExpense = (onSuccessCallBack) => {
if (onSuccessCallBack) onSuccessCallBack(); if (onSuccessCallBack) onSuccessCallBack();
}, },
onError:(error)=>{
showToast( "Something went wrong.Please try again later.", "error");
}
}); });
}; };
@ -157,7 +160,7 @@ export const useActionOnExpense = (onSuccessCallBack) => {
}, },
onError: (error) => { onError: (error) => {
showToast( showToast(
error.message || "Something went wrong, please try again!", error.message || "Something went wrong.Please try again later.",
"error" "error"
); );
}, },
@ -189,7 +192,7 @@ export const useDeleteExpense = () => {
showToast(data.message || "Expense deleted successfully", "success"); showToast(data.message || "Expense deleted successfully", "success");
}, },
onError: (error) => { onError: (error) => {
showToast("Failed to delete expense", "error"); showToast(error.message || error.response.message || "Something went wrong.Please try again later.", "error");
}, },
}); });
} }