nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

[PM-19180] Calculate sales tax correctly for sponsored plans

Browse Source
This commit is contained in:
Jonas Hendrickx 2025-04-04 18:58:12 +02:00
parent 39ac93326d
commit 55595e3ae4
No known key found for this signature in database
GPG Key ID: C4B27F601CE4317D
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Billing/Models/Api/Requests/Organizations/PreviewOrganizationInvoiceRequestModel.cs
View File

@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Bit.Core.Billing.Enums; using Bit.Core.Billing.Enums;
using Bit.Core.Enums;
namespace Bit.Core.Billing.Models.Api.Requests.Organizations; namespace Bit.Core.Billing.Models.Api.Requests.Organizations;
@ -20,6 +21,8 @@ public class OrganizationPasswordManagerRequestModel
{ {
public PlanType Plan { get; set; } public PlanType Plan { get; set; }
public PlanSponsorshipType? SponsoredPlan { get; set; }
[Range(0, int.MaxValue)] [Range(0, int.MaxValue)]
public int Seats { get; set; } public int Seats { get; set; }

59
src/Core/Services/Implementations/StripePaymentService.cs
View File

@ -1286,6 +1286,7 @@ public class StripePaymentService : IPaymentService
string gatewaySubscriptionId) string gatewaySubscriptionId)
{ {
var plan = await _pricingClient.GetPlanOrThrow(parameters.PasswordManager.Plan); var plan = await _pricingClient.GetPlanOrThrow(parameters.PasswordManager.Plan);
var isSponsored = parameters.PasswordManager.SponsoredPlan.HasValue;
var options = new InvoiceCreatePreviewOptions var options = new InvoiceCreatePreviewOptions
{ {
@ -1311,45 +1312,47 @@ public class StripePaymentService : IPaymentService
}, },
}; };
if (plan.PasswordManager.HasAdditionalSeatsOption) if (isSponsored)
{ {
var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(parameters.PasswordManager.SponsoredPlan.Value);
options.SubscriptionDetails.Items.Add( options.SubscriptionDetails.Items.Add(
new() new() { Quantity = 1, Plan = sponsoredPlan.StripePlanId }
{
Quantity = parameters.PasswordManager.Seats,
Plan = plan.PasswordManager.StripeSeatPlanId
}
); );
} }
else else
{ {
options.SubscriptionDetails.Items.Add( if (plan.PasswordManager.HasAdditionalSeatsOption)
new()
{
Quantity = 1,
Plan = plan.PasswordManager.StripePlanId
}
);
}
if (plan.SupportsSecretsManager)
{
if (plan.SecretsManager.HasAdditionalSeatsOption)
{ {
options.SubscriptionDetails.Items.Add(new() options.SubscriptionDetails.Items.Add(
{ new() { Quantity = parameters.PasswordManager.Seats, Plan = plan.PasswordManager.StripeSeatPlanId }
Quantity = parameters.SecretsManager?.Seats ?? 0, );
Plan = plan.SecretsManager.StripeSeatPlanId }
}); else
{
options.SubscriptionDetails.Items.Add(
new() { Quantity = 1, Plan = plan.PasswordManager.StripePlanId }
);
} }
if (plan.SecretsManager.HasAdditionalServiceAccountOption) if (plan.SupportsSecretsManager)
{ {
options.SubscriptionDetails.Items.Add(new() if (plan.SecretsManager.HasAdditionalSeatsOption)
{ {
Quantity = parameters.SecretsManager?.AdditionalMachineAccounts ?? 0, options.SubscriptionDetails.Items.Add(new()
Plan = plan.SecretsManager.StripeServiceAccountPlanId {
}); Quantity = parameters.SecretsManager?.Seats ?? 0,
Plan = plan.SecretsManager.StripeSeatPlanId
});
}
if (plan.SecretsManager.HasAdditionalServiceAccountOption)
{
options.SubscriptionDetails.Items.Add(new()
{
Quantity = parameters.SecretsManager?.AdditionalMachineAccounts ?? 0,
Plan = plan.SecretsManager.StripeServiceAccountPlanId
});
}
} }
} }