Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-13 14:01:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: removed user limit validation (#1080)

Browse Source
This commit is contained in:
guru_sainath
2024-09-09 19:48:27 +05:30
committed by GitHub
parent a83892ae52
commit ca60dd00ab
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apiserver/plane/payment/utils/member_payment_count.py
View File

@@ -321,15 +321,15 @@ def handle_cloud_payments(
"""
Case1: Free Plan and Trial Plan
a. Invitation case - requested_role is None and requested_invite_list is a list of invite emails with roles
- Allowed only if the total count of current users and invited users and requested invite users is less than or equal to workspace_license.free_seats
- Allowed only if the total count of current users and invited users and requested invite users is less than or equal to workspace_license.free_seats
b. Update case - requested_role is a role and requested_invite_list is None
- Allowed for all roles since the total count of current members and invited members is less than or equal to workspace_license.free_seats
- Allowed for all roles since the total count of current members and invited members is less than or equal to workspace_license.free_seats
Case2: Paid Plan
a. Online Payment case - all allowed - sync back to payment server for calculation
b. Offline Payment case
i. Invitation case - requested_role is None and requested_invite_list is a list of invite emails with roles
- Allowed only if the total count of paid current users and paid invited users and paid requested invite users is less than or equal to workspace_license.purchased_seats
ii.Update case - requested_role is a role and requested_invite_list is None
i. Invitation case - requested_role is None and requested_invite_list is a list of invite emails with roles
- Allowed only if the total count of paid current users and paid invited users and paid requested invite users is less than or equal to workspace_license.purchased_seats
ii. Update case - requested_role is a role and requested_invite_list is None
- Allowed for roles > 10 if in the purchased seats limit and for roles <= 10 if in the 5 * purchased seats limit
"""
@@ -402,9 +402,9 @@ def handle_self_managed_payments(
return True for all cases
Case2: Subscription Plan
a. Invitation case - requested_role is None and requested_invite_list is a list of invite emails with roles
- Allowed only if the total count of paid current users and paid invited users and paid requested invite users is less than or equal to workspace_license.purchased_seats
- Allowed only if the total count of paid current users and paid invited users and paid requested invite users is less than or equal to workspace_license.purchased_seats
b. Update case - requested_role is a role and requested_invite_list is None
- Allowed for roles > 10 if in the purchased seats limit and for roles <= 10 if in the 5 * purchased seats limit
- Allowed for roles > 10 if in the purchased seats limit and for roles <= 10 if in the 5 * purchased seats limit
"""
if workspace_license.plan == WorkspaceLicense.PlanChoice.FREE:
@@ -460,13 +460,14 @@ def workspace_member_check(
# Get the workspace license
if os.environ.get("IS_MULTI_TENANT", "0") == "1":
return handle_cloud_payments(
slug=slug,
requested_invite_list=requested_invite_list,
requested_role=requested_role,
current_role=current_role,
workspace_license=workspace_license,
)
# return handle_cloud_payments(
# slug=slug,
# requested_invite_list=requested_invite_list,
# requested_role=requested_role,
# current_role=current_role,
# workspace_license=workspace_license,
# )
return True, 0, 0
else:
return handle_self_managed_payments(
slug=slug,

6
web/app/[workspaceSlug]/(projects)/settings/layout.tsx
View File

@@ -5,7 +5,7 @@ import { ReactNode } from "react";
import { ContentWrapper } from "@plane/ui";
import { AppHeader } from "@/components/core";
// plane web components
import { LicenseSeatsBanner } from "@/plane-web/components/license";
// import { LicenseSeatsBanner } from "@/plane-web/components/license";
// local components
import { WorkspaceSettingHeader } from "./header";
import { MobileWorkspaceSettingsTabs } from "./mobile-header-tabs";
@@ -23,9 +23,7 @@ export default function WorkspaceSettingLayout(props: IWorkspaceSettingLayout) {
<AppHeader header={<WorkspaceSettingHeader />} />
<div className="w-full h-full overflow-hidden">
{/* free banner */}
<div className="flex-shrink-0">
<LicenseSeatsBanner />
</div>
<div className="flex-shrink-0">{/* <LicenseSeatsBanner /> */}</div>
{/* workspace settings */}
<div className="w-full h-full overflow-hidden">
<MobileWorkspaceSettingsTabs />