2660 Commits

Author SHA1 Message Date
a2f105dd41 Merge pull request 'Expense_Weidget_main' (#489) from Expense_Weidget_main into main
Reviewed-on: #489
merged
2025-10-25 10:18:16 +00:00
247bda1be4 format figure in at dashboard 2025-10-25 12:16:22 +05:30
fc2d115f40 fixed move figure out f card - using type= compact 2025-10-25 12:12:36 +05:30
7f848eeb38 fixed figure moved out of card 2025-10-25 11:40:34 +05:30
b38eb1bc4b handle view documents inside expense 2025-10-25 11:37:23 +05:30
9cd9e0fbbe added document files properly handling inside 2025-10-25 11:20:57 +05:30
4238157fd4 prevent error occurering due to zoom in -out 2025-10-25 11:02:57 +05:30
d7caf47498 added zoom functionality inside prevw documents 2025-10-25 10:45:52 +05:30
b4f1c48293 removed debugger 2025-10-25 10:27:21 +05:30
a070d23304 added skeleton for dashboard card figures cards 2025-10-25 10:26:41 +05:30
32f16092db changed ui for org 2025-10-24 17:29:38 +05:30
1372f9870a updated - add org. ui 2025-10-24 16:01:35 +05:30
d130ede851 changed button size of resetbutton inside preview-document component 2025-10-24 13:19:09 +05:30
9355efa4af fixed search position of master search bar 2025-10-24 13:12:41 +05:30
c438b51ef1 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-24 13:04:39 +05:30
5b3f002772 Merge branch 'Collection_Management' 2025-10-24 12:33:58 +05:30
0d9037dbdc Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Collection_Management 2025-10-24 12:32:42 +05:30
55d455bb10 Merge pull request 'Collection_Management' (#487) from Collection_Management into main
Reviewed-on: #487
Merged
2025-10-24 06:41:58 +00:00
767e218987 changed useCollection file extension syntax js to jsx 2025-10-24 06:41:58 +00:00
e0eec8ff69 added ratoted image inside preview documents 2025-10-24 06:41:58 +00:00
c38efe9934 added mismatch permission 2025-10-24 06:41:58 +00:00
9e5555ff9d added properly permissions 2025-10-24 06:41:58 +00:00
8a18c0860e added collection permission 2025-10-24 06:41:58 +00:00
e5b01e9e0f added xl, and doc file allow to upload and getSubscription plan api properly 2025-10-24 06:41:58 +00:00
b7268f9294 removed console 2025-10-24 06:41:58 +00:00
43ecdadfa9 added paymentadjustment head crud operation 2025-10-24 06:41:58 +00:00
005261abab adjust history table whenever select comment tab 2025-10-24 06:41:58 +00:00
9527427f47 added provideAll is flag inside basic projctname api 2025-10-24 06:41:58 +00:00
10fc88c022 added mark as completd api operation 2025-10-24 06:41:58 +00:00
3b0097f46b integrated editcollection and vew douments 2025-10-24 06:41:58 +00:00
ecd726bbb1 integrated comment api added comment and payments history inside view collection 2025-10-24 06:41:58 +00:00
d14fb130c6 updated payhistory after add payment 2025-10-24 06:41:58 +00:00
b6ef3e0d22 added skeleton for payment history at add payment form 2025-10-24 06:41:58 +00:00
b3f489fe9f rmoved console 2025-10-24 06:41:58 +00:00
edae70f8af integrated collection details api 2025-10-24 06:41:58 +00:00
4563e328a5 changed useCollection file extension syntax js to jsx 2025-10-24 12:01:24 +05:30
8f0ca4a9ca added ratoted image inside preview documents 2025-10-17 12:26:57 +05:30
dec959c495 added mismatch permission 2025-10-17 11:55:55 +05:30
cb7e044b27 added properly permissions 2025-10-17 11:19:44 +05:30
4c059afb72 added collection permission 2025-10-17 10:18:11 +05:30
97525e3cb2 Correction in Expense compoent at name column. 2025-10-16 12:51:03 +05:30
2a0f7794b5 Changes in filter panel. 2025-10-16 10:17:12 +05:30
798ea24088 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main 2025-10-16 10:03:02 +05:30
8460460caf Merge pull request 'Excessive space between Organization dropdown and Search bar in Attendance menu.' (#484) from Kartik_Bug#1499 into Issues_Oct_main_2W
Reviewed-on: #484
Merged
2025-10-15 12:37:16 +00:00
c8273070ac Changes in Attendance and Expenselist. 2025-10-15 12:37:16 +00:00
dc4e48ad3b Changes in Employee list at pagination and at mobile view then scrollbar is shown. 2025-10-15 12:37:16 +00:00
20b508bebc Changes in Regularization tab. 2025-10-15 12:37:16 +00:00
05c01d1d34 Changes in Attendance page. 2025-10-15 12:37:16 +00:00
073897156e Excessive space between Organization dropdown and Search bar in Attendance menu. 2025-10-15 12:37:16 +00:00
3a2fcf71ee Merge pull request 'Export to PDF button not functioning' (#479) from Kartik_Bug#1434 into Issues_Oct_main_2W
Reviewed-on: #479
Merged
2025-10-15 12:33:55 +00:00