2607 Commits

Author SHA1 Message Date
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
6e89fbd680 added xl, and doc file allow to upload and getSubscription plan api properly 2025-10-15 17:31:58 +05:30
9648d1a98b removed console 2025-10-15 15:55:46 +05:30
aa947b791b added paymentadjustment head crud operation 2025-10-15 15:42:30 +05:30
51cca64dd5 adjust history table whenever select comment tab 2025-10-15 12:55:07 +05:30
ca88928850 added provideAll is flag inside basic projctname api 2025-10-15 12:45:11 +05:30
962286a4da added mark as completd api operation 2025-10-15 12:35:07 +05:30
76df08e921 integrated editcollection and vew douments 2025-10-14 20:17:48 +05:30
0052fed1e6 integrated comment api added comment and payments history inside view collection 2025-10-14 18:20:36 +05:30
e2035e1fd8 updated payhistory after add payment 2025-10-14 14:28:49 +05:30
7176a86913 Merge pull request 'integrated collection details api' (#485) from collection_dev into Collection_Management
Reviewed-on: #485
Merged
2025-10-14 08:54:29 +00:00
a26e4d1dc2 added skeleton for payment history at add payment form 2025-10-14 08:54:29 +00:00
f91c7d6da1 rmoved console 2025-10-14 08:54:29 +00:00
272645f0b4 integrated collection details api 2025-10-14 08:54:29 +00:00
301684a12b Merge pull request 'collection_dev' (#482) from collection_dev into Collection_Management
Reviewed-on: #482
merged
2025-10-14 04:55:41 +00:00
9288ac1fbc successfuuly fetch data and create collection 2025-10-14 10:24:45 +05:30
376a2a397f intergrated get list and create collection 2025-10-14 00:21:19 +05:30
58c2fbdf1b initiallly setup 2025-10-13 17:15:59 +05:30
12b632f087 added new api for list of org 2025-10-11 18:06:51 +05:30
6ee4fb6d04 Updated TeamEmployeeList to fetch employees using useOrganizationEmployees during search. 2025-10-11 17:48:25 +05:30
67bb685d4b added new api for orgaization dropdown 2025-10-11 16:55:22 +05:30
8fd4e7f3f1 added space between first and last name 2025-10-11 16:30:27 +05:30
aca2decb00 clear fully cache after remove session 2025-10-11 16:26:04 +05:30
f7f4b68997 changed reimburse data during transaction to current date 2025-10-11 15:09:04 +05:30
f839613066 Merge pull request 'Fix: Ensure orgData can be cleared when opening Organization Modal' (#474) from HotChanges_11_10_25 into main
Reviewed-on: #474
Merged
2025-10-11 08:42:26 +00:00
b58bd33774 added requested b and requested at column inside rgularization 2025-10-11 14:08:27 +05:30