Compare commits

..

96 Commits

Author SHA1 Message Date
bd135c44ff Merge branch 'Refactor_Expenses' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Expenses 2025-08-05 15:14:08 +05:30
33c0234ff8 changed modal position center to top 2025-08-05 15:10:55 +05:30
d9aa8e7309 added date for reviewed by 2025-08-05 15:10:55 +05:30
3c075b2205 added signalr 2025-08-05 15:10:55 +05:30
b92c8aeea5 removed debugger 2025-08-05 15:10:54 +05:30
847abff403 changed employee api for manage expense 2025-08-05 15:10:52 +05:30
7b876b2311 added expense status logs 2025-08-05 15:10:15 +05:30
546434e688 changed label of employee to "Reimburse By" 2025-08-05 15:10:15 +05:30
1f35cf202f added padding 2025-08-05 15:10:15 +05:30
2fa3aa0025 changed date format and add padding inside expense page card 2025-08-05 15:10:13 +05:30
ca5610c720 user can not select reimburseDate before transaction date 2025-08-05 15:09:39 +05:30
c05ec8feca correct draft id 2025-08-05 15:09:38 +05:30
39ad81f379 handle action when expense rejected 2025-08-05 15:09:38 +05:30
6a6f4d453c removed search text 2025-08-05 15:09:38 +05:30
a90dff13ec if expense rejected , created user can edit and submit 2025-08-05 15:09:38 +05:30
54d7726441 handle filter error during network or any 2025-08-05 15:09:38 +05:30
ad9ed74e07 chnaged lable name for supplier 2025-08-05 15:09:38 +05:30
5b6dfde173 removed fuature validation for date, because added flatepick that not allow to select feature date 2025-08-05 15:09:37 +05:30
315756a29f added expenses Reimburse 2025-08-05 15:09:37 +05:30
8e0c35b5fc added search filter and group by 2025-08-05 15:09:37 +05:30
9e13e671ae added flatepicker for dates 2025-08-05 15:09:34 +05:30
106129b634 dynamically set group by filed 2025-08-05 15:09:09 +05:30
fceae5da6d Expense List display group by selected filed 2025-08-05 15:09:09 +05:30
ed199b253a fixed : feature date not allow 2025-08-05 15:09:09 +05:30
19dad6d234 added label for filter fields 2025-08-05 15:08:21 +05:30
8eb6f54681 removed unused code 2025-08-05 15:08:21 +05:30
15613bab95 removed debugger 2025-08-05 15:08:21 +05:30
59f722883a removed extra padding 2025-08-05 15:08:21 +05:30
89f7056ec7 centralize offcanvas panel handling and make it dynamically configurable per page 2025-08-05 15:08:21 +05:30
1fc3f9899c removed parent node, 2025-08-05 15:07:51 +05:30
0b3d0d0a8f arrange Expense Details columns 2025-08-05 15:07:51 +05:30
8acdbc1259 added one more column for createdAt date 2025-08-05 15:07:51 +05:30
e502a31403 fixed action button visibilities 2025-08-05 15:07:50 +05:30
834624b5ad added edit and delete who can perform action 2025-08-05 15:07:50 +05:30
abf1858059 hide page if have any permission for Expense 2025-08-05 15:07:50 +05:30
325a6a5442 added viewer for pdf type document 2025-08-05 15:07:48 +05:30
bc2900b573 implement feature permission checks for expense status actions 2025-08-05 15:07:15 +05:30
dfd77158db added pDf view 2025-08-05 15:07:15 +05:30
8d5ced7fdd add create, edit, delete functionality with validation and UI integration 2025-08-05 15:07:15 +05:30
e081da0484 added delete functionality using id 2025-08-05 15:07:15 +05:30
6e4ba3e314 added update functionality with fields (id, name, description) in ManagePaymentMode 2025-08-05 15:07:15 +05:30
4440ddc9cd add create functionality in ManagePaymentMode 2025-08-05 15:07:14 +05:30
11da322098 dded delete functionality for Expense Type using ID 2025-08-05 15:07:14 +05:30
c7486b01e6 forgot close fun inside cancel btn 2025-08-05 15:07:14 +05:30
708211b786 added edit functionality, merged create/edit into a common form 2025-08-05 15:07:14 +05:30
656819d362 added create new Expense master form with api integrated 2025-08-05 15:07:14 +05:30
6d5269d077 updated expense skeleton according expense list 2025-08-05 15:07:14 +05:30
f2fc11bf46 setdefault value for data range 2025-08-05 15:07:13 +05:30
67d061c858 added permission keys 2025-08-05 15:07:13 +05:30
fc733153c5 added msg if data not exist 2025-08-05 15:07:13 +05:30
448c535264 added filter for expense list 2025-08-05 15:07:13 +05:30
4a0e1c5649 group wise row of expenses list 2025-08-05 15:07:12 +05:30
d525132460 handle proper error 2025-08-05 15:07:12 +05:30
a1d6c5571b implement delete functionality for Draft expenses only 2025-08-05 15:07:11 +05:30
e1da9e87a8 rmoved unusd code 2025-08-05 15:07:11 +05:30
bed3561e98 completed full updation for expnse feature 2025-08-05 15:06:17 +05:30
931147244b progress in expense update 2025-08-05 15:05:16 +05:30
2c3a3ed2bb completed full updation for expnse feature 2025-08-05 14:58:59 +05:30
653051919c progress in expense update 2025-08-05 14:57:04 +05:30
9367c6de28 initiated forn edit and created with one component 2025-08-05 14:52:36 +05:30
31dec5402a view expense with document (image), not yet PDF 2025-08-05 14:50:02 +05:30
a2db8865be Added taking action on expense, like Review, Approve ... 2025-08-05 14:47:15 +05:30
c678897044 made new hook for make action on give employee 2025-08-05 14:43:31 +05:30
7289edc2ed partially implemented Expense Details modal with full view 2025-08-05 14:42:56 +05:30
67db30e81f created and display expenses list 2025-08-05 14:40:18 +05:30
cd1a02b0dc making a expense page layout 2025-08-05 14:37:20 +05:30
66f35d64c3 created list view interface 2025-08-05 14:36:26 +05:30
88e96f261a merged 2025-08-05 14:31:20 +05:30
59782a457b removed double assigned class 2025-08-05 14:31:20 +05:30
f7270e3436 prevent unwanted rendering 2025-08-05 14:31:20 +05:30
2327e43fa9 implement delete functionality for Draft expenses only 2025-08-05 14:31:20 +05:30
4f4a5fbf16 rmoved unusd code 2025-08-05 14:31:20 +05:30
b37f64d1fe set up action properly 2025-08-05 14:31:20 +05:30
270d9e199e correctly set isActive flag from document data 2025-08-05 14:31:19 +05:30
d7ec4b7734 added optinal chain for color , for prevent error 2025-08-05 14:31:19 +05:30
0839b27341 completed full updation for expnse feature 2025-08-05 14:31:19 +05:30
a5ba926b0b progress in expense update 2025-08-05 14:31:19 +05:30
d783ddfcb9 completed full updation for expnse feature 2025-08-05 14:31:19 +05:30
48721175ef progress in expense update 2025-08-05 14:31:19 +05:30
0fb5986f0a renamed status of expse list - name to displayName 2025-08-05 14:31:19 +05:30
853121334c added utils fun that has code convert into bootstrap color like priamery. 2025-08-05 14:31:19 +05:30
48f41074d7 initiated forn edit and created with one component 2025-08-05 14:31:19 +05:30
0e15191b0a view expense with document (image), not yet PDF 2025-08-05 14:31:18 +05:30
9e8f69b1cc updated global modal for size customize 2025-08-05 14:31:18 +05:30
44c5d7352e changed added expense button 2025-08-05 14:31:18 +05:30
8e3d3a3ddd color, displayName - of Expense status columns names added insinde hidden column 2025-08-05 14:31:18 +05:30
e0bd37cb79 Added taking action on expense, like Review, Approve ... 2025-08-05 14:31:18 +05:30
121e5328a3 made new hook for make action on give employee 2025-08-05 14:31:18 +05:30
bacc027c55 partially implemented Expense Details modal with full view 2025-08-05 14:31:18 +05:30
034b5c2d4c created and display expenses list 2025-08-05 14:30:47 +05:30
3d121e8af6 making a expense page layout 2025-08-05 14:30:21 +05:30
3b1627d028 created list view interface 2025-08-05 14:30:21 +05:30
7f1eef6d03 api integrated for get list of expense-status in master 2025-08-05 14:30:21 +05:30
471134ae1c refactored code for optimze 2025-08-05 14:30:21 +05:30
e683c65612 added Payment Mode master with API integration and table config for get list 2025-08-05 14:30:20 +05:30
e9b1255dd8 add Expense Type master with API integration and table config 2025-08-05 14:30:20 +05:30
2 changed files with 2 additions and 7 deletions

View File

@ -179,13 +179,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
handleClose();
}
);
const onSubmit = (fromdata) => {
let payload = {
...fromdata,
transactionDate: moment
.utc(fromdata.transactionDate, "DD-MM-YYYY")
.toISOString(),
};
const onSubmit = (payload) => {
if (expenseToEdit) {
const editPayload = { ...payload, id: data.id };
ExpenseUpdate({ id: data.id, payload: editPayload });

View File

@ -414,6 +414,7 @@ const ViewExpense = ({ ExpenseId }) => {
target="_blank"
rel="noopener noreferrer"
className="bx bx-cloud-download cursor-pointer"
title="View PDF"
/>
</div>
</div>