nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

[AC-1828] [AC-1807] Aggregated admin panel pricing fixes (#3448)

Browse Source 
* AC-1828: Allow reseller to add all teams and enterprise orgs

* AC-1807: Only show provider-eligible plans on Organization edit

* Thomas' feedback

* Matt's feedback
This commit is contained in:
Alex Morask
2023-11-17 15:12:49 -05:00
committed by GitHub
parent b2a3ac4633
commit cf38ff3c19
4 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Admin/Views/Shared/_OrganizationForm.cshtml
View File

@ -82,7 +82,11 @@
<label asp-for="PlanType"></label>
@{
var planTypes = Enum.GetValues<PlanType>()
.Where(p => Model.Provider == null || p is >= PlanType.TeamsMonthly and <= PlanType.TeamsStarter)
.Where(p =>
Model.Provider == null ||
(Model.Provider != null
&& p is >= PlanType.TeamsMonthly2019 and <= PlanType.EnterpriseAnnually2019 or >= PlanType.TeamsMonthly2020 and <= PlanType.EnterpriseAnnually)
)
.Select(e => new SelectListItem
{
Value = ((int)e).ToString(),