1154 Commits

Author SHA1 Message Date
61f5b14fcc Merge pull request 'Added the API to verify or reject the document' (#122) from Ashutosh_Task#1025 into Document_Manager
Reviewed-on: #122
2025-08-29 07:41:07 +00:00
87cf37ca03 Added the API to verify or reject the document 2025-08-29 13:10:31 +05:30
0cdbd574db changing the documentDataId if attachment is not verified 2025-08-29 12:42:27 +05:30
72765fd491 Merge pull request 'Added the get filter for documents' (#121) from Ashutosh_Task#1013 into Document_Manager
Reviewed-on: #121
2025-08-29 06:56:16 +00:00
7e98429e10 Added the get filter for documents 2025-08-29 12:25:43 +05:30
759fa9324b Merge pull request 'Added the update document API' (#120) from Ashutosh_Task#1010 into Document_Manager
Reviewed-on: #120
2025-08-29 05:59:39 +00:00
d2af05b6a0 Added the update document API 2025-08-29 11:29:04 +05:30
6d207e8f7d Merge pull request 'Added the list document API' (#119) from Ashutosh_Task#1011 into Document_Manager
Reviewed-on: #119
2025-08-28 11:50:47 +00:00
cf2b07ee77 Added the list document API 2025-08-28 17:20:09 +05:30
08232ee34f Added uploaded by in response of upload document API 2025-08-28 15:13:44 +05:30
d57395efcd Merge pull request 'Added the upload document API' (#118) from Ashutosh_Task#1009 into Document_Manager
Reviewed-on: #118
2025-08-28 09:31:22 +00:00
75ae12a81e Added the upload document API 2025-08-28 15:00:16 +05:30
4c36cf266f Added Document Category and Document Type in master menu list 2025-08-28 14:31:55 +05:30
39ebc69da7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Document_Manager 2025-08-28 12:53:46 +05:30
8ceac5aa91 Merge pull request 'Added the get list of Document type API' (#117) from Ashutosh_Task#1019 into Document_Manager
Reviewed-on: #117
2025-08-28 07:19:30 +00:00
4161506def Added the get list of Document type API 2025-08-28 12:48:13 +05:30
a89a2f076f Merge pull request 'Added the Get Document Category list API' (#116) from Ashutosh_Task#1018 into Document_Manager
Reviewed-on: #116
2025-08-28 06:47:43 +00:00
eac77e23d4 Added the Get Document Category list API 2025-08-28 12:17:05 +05:30
0ef9f0e62d Change the endpoint of request Demo API 2025-08-28 11:50:06 +05:30
6aaa38ba52 Fixed the spelling mistake 2025-08-28 11:41:32 +05:30
535a9924cc Merge pull request 'Added the tables for document management' (#115) from Ashutosh_Task#980 into Document_Manager
Reviewed-on: #115
2025-08-28 05:55:42 +00:00
3dfdb2ab5d Added the tables for document management 2025-08-28 11:22:31 +05:30
d3eebb2086 Merge pull request 'Tenant_Management' (#114) from Tenant_Management into main
Reviewed-on: #114
2025-08-28 05:13:09 +00:00
03f7a5ba14 Added new get menu list for mobile 2025-08-26 15:17:00 +05:30
6253ba7de3 Chnaged the logic of adding and removing the permissions 2025-08-25 15:21:02 +05:30
fdcbd9af5f Added the logic to only remove the employee permission if every module in subscription is not enabled 2025-08-25 12:57:15 +05:30
9765ce1b8f Added the check to check the max user in add subscription as well 2025-08-25 11:02:38 +05:30
5d8a5909bc Added the check to check the ma user count 2025-08-25 10:40:09 +05:30
2c841b3bd0 Resovled the mearge confilects 2025-08-25 10:22:51 +05:30
66716dda0f Sending the master list by name order 2025-08-25 10:19:39 +05:30
76ac9de014 Set logic the get all master table for super tenant 2025-08-24 14:12:55 +05:30
3864788d43 Changed the logic for super tenant 2025-08-24 13:57:56 +05:30
300f570907 Optimized the get master table list 2025-08-24 13:53:09 +05:30
e7705a5051 Added API to get Master Tables list dynamically 2025-08-24 13:38:39 +05:30
f85f1adb92 Added current plan feature details in tenant profile 2025-08-23 18:28:24 +05:30
9e11ca0008 added coments in appmenu controller 2025-08-23 18:23:26 +05:30
ff288448b0 Optimized the the Appmenu controller 2025-08-23 17:53:53 +05:30
4ebd49d0c8 Merge pull request 'Issues_Aug_1W' (#113) from Issues_Aug_1W into main
Reviewed-on: #113
2025-08-23 11:08:42 +00:00
7cfebd764c sloving the merage conflicts 2025-08-23 13:23:00 +05:30
5d2687f1e7 Merge pull request 'AppMenu : Implement Sidebar Menu with Permission-based Access Control' (#112) from AppMenu into Tenant_Management
Reviewed-on: #112
2025-08-23 07:49:59 +00:00
f97a59994e Sloving the Mearge conflict 2025-08-23 13:19:39 +05:30
68027ded77 If user has manage tenant permission then only showing the tenants he/she created 2025-08-23 13:07:20 +05:30
ea1e172c65 resolved conflicts 2025-08-23 12:45:20 +05:30
bd4f1d5e69 Added the IsRoot user Field in employee profile VM 2025-08-23 11:42:11 +05:30
ac23a8724d Added page size the search emplyee API 2025-08-23 09:53:32 +05:30
540c3e75fd Changed the logic of validating 2025-08-22 17:27:53 +05:30
6f7fad1ae4 Added a new validation to check if the tenant is it's own tenant 2025-08-22 14:50:59 +05:30
88a7a90bfe Getting the permission through different scope 2025-08-22 12:55:07 +05:30
7eabd4fa73 Added the tenant ID in emplyee profile 2025-08-22 10:17:54 +05:30
0de2e3f75d Corrected the typo in method name 2025-08-21 09:50:10 +05:30