Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-13451] Update subscription setup process to support MOE providers #4937

Merged
merged 3 commits into from
Oct 25, 2024
Merged

[PM-13451] Update subscription setup process to support MOE providers #4937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83bd499
[PM-13451] Update subscription setup process to support multi-organiz…
jonashendrickx Oct 24, 2024
9e5a20b
provider portal pricing for enterprise annual plan
jonashendrickx Oct 24, 2024
f62482d
Improve error message for regression
jonashendrickx Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 12 additions & 31 deletions bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,42 +379,23 @@ public async Task<Subscription> SetupSubscription(

var subscriptionItemOptionsList = new List<SubscriptionItemOptions>();

var teamsProviderPlan =
providerPlans.SingleOrDefault(providerPlan => providerPlan.PlanType == PlanType.TeamsMonthly);

if (teamsProviderPlan == null || !teamsProviderPlan.IsConfigured())
foreach (var providerPlan in providerPlans)
{
logger.LogError("Cannot start subscription for provider ({ProviderID}) that has no configured Teams plan", provider.Id);

throw new BillingException();
}

var teamsPlan = StaticStore.GetPlan(PlanType.TeamsMonthly);

subscriptionItemOptionsList.Add(new SubscriptionItemOptions
{
Price = teamsPlan.PasswordManager.StripeProviderPortalSeatPlanId,
Quantity = teamsProviderPlan.SeatMinimum
});

var enterpriseProviderPlan =
providerPlans.SingleOrDefault(providerPlan => providerPlan.PlanType == PlanType.EnterpriseMonthly);
var plan = StaticStore.GetPlan(providerPlan.PlanType);

if (enterpriseProviderPlan == null || !enterpriseProviderPlan.IsConfigured())
{
logger.LogError("Cannot start subscription for provider ({ProviderID}) that has no configured Enterprise plan", provider.Id);
if (!providerPlan.IsConfigured())
{
logger.LogError("Cannot start subscription for provider ({ProviderID}) that has no configured {ProviderName} plan", provider.Id, plan.Name);
throw new BillingException();
}

throw new BillingException();
subscriptionItemOptionsList.Add(new SubscriptionItemOptions
{
Price = plan.PasswordManager.StripeProviderPortalSeatPlanId,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not defined for the Enterprise annual plan.

Quantity = providerPlan.SeatMinimum
});
}

var enterprisePlan = StaticStore.GetPlan(PlanType.EnterpriseMonthly);

subscriptionItemOptionsList.Add(new SubscriptionItemOptions
{
Price = enterprisePlan.PasswordManager.StripeProviderPortalSeatPlanId,
Quantity = enterpriseProviderPlan.SeatMinimum
});

var subscriptionCreateOptions = new SubscriptionCreateOptions
{
AutomaticTax = new SubscriptionAutomaticTaxOptions
Expand Down
2 changes: 2 additions & 0 deletions src/Core/Billing/Models/StaticStore/Plans/EnterprisePlan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public EnterprisePasswordManagerFeatures(bool isAnnual)
AdditionalStoragePricePerGb = 4;
StripeStoragePlanId = "storage-gb-annually";
StripeSeatPlanId = "2023-enterprise-org-seat-annually";
StripeProviderPortalSeatPlanId = "password-manager-provider-portal-enterprise-annually-2024";
SeatPrice = 72;
ProviderPortalSeatPrice = 72;
}
else
{
Expand Down
Loading