1128 Commits

Author SHA1 Message Date
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
445d02662a Merge pull request 'Restrict the user creation if the maximum user limit is reached' (#111) from Ashutosh_Bug#935 into Tenant_Management
Reviewed-on: #111
2025-08-20 06:50:20 +00:00
307c7c96c2 Optimized the helper function 2025-08-20 12:19:16 +05:30
bc935282a5 Restrict the user creation if the maximum user limit is reached 2025-08-20 12:12:12 +05:30
889b5a84b6 change the employee fetching logic in employe suspend employee 2025-08-19 11:46:14 +05:30
b4cb81772e Added the function to re activeate the employee 2025-08-19 11:31:14 +05:30
e8c8c92120 handle error 2025-08-18 23:31:18 +05:30
3ba954ac82 correct the order of haspermission method parameters 2025-08-18 18:22:50 +05:30
90a2b23c1a Added the condition to check if it is the root tenant 2025-08-18 12:41:00 +05:30
c84ea987c5 Added the pagenantion in employee search API 2025-08-18 12:21:01 +05:30
cf161e4a04 Only sending the feature that tenant has permission of 2025-08-18 11:46:42 +05:30
374e023cde added perfectly permssion checking coondition and fixed previous mistake 2025-08-18 10:29:53 +05:30
732cfbef3e added permission for fetch menu according feature permission 2025-08-18 09:37:16 +05:30
ff5f673475 initially added fetch menu api 2025-08-17 12:55:53 +05:30
288c0fe492 Adding the days to end date while adding or updating subscription rather than months 2025-08-16 17:26:42 +05:30
d240a79e49 Assigning the root employee to default when creating the tenant 2025-08-16 17:15:01 +05:30
d8870b8140 Added default entries for the tenant in master tables depending upon its plan 2025-08-16 16:59:36 +05:30
3d6926864d Added the current plan details in tenant details API 2025-08-14 11:06:55 +05:30
d74e64d1dc Merge pull request 'profile_page' (#110) from profile_page into main
Reviewed-on: #110
This branched is tested and deployed on  production
2025-08-13 05:44:45 +00:00
d113fc3c3d Sending the project degination in place of employee degination in allocation history API 2025-08-13 11:07:36 +05:30
f19f759752 Added suspend tenant API 2025-08-12 14:49:23 +05:30
d9a454ca28 Added the update logs in mongoDB while updating tenant 2025-08-12 14:23:53 +05:30
21e1a7322c Saving the tenant subscription modification logs in mongo DB 2025-08-11 11:43:46 +05:30
ac0843ffe7 Solved migration error occured while rebasing 2025-08-11 11:05:21 +05:30
897a998b27 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into profile_page 2025-08-08 12:20:55 +05:30
7f0dd1c08a Sloved the rebase issue 2025-08-08 12:20:02 +05:30
de41db6219 Resolved the rebase issues 2025-08-08 12:19:31 +05:30