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

Only allow automatic tax flag to be updated for complete subscription updates such as plan changes, not when upgrading additional storage, seats, etc

Browse Source
This commit is contained in:
Jonas Hendrickx 2025-04-01 13:39:31 +02:00
parent 50d2200dce
commit 9846f5b133
No known key found for this signature in database
GPG Key ID: C4B27F601CE4317D
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Billing/Services/Implementations/AutomaticTax/AutomaticTaxFactory.cs
View File

@ -39,9 +39,8 @@ public class AutomaticTaxFactory(
} }
var personalUsePlans = await _personalUsePlansTask.Value; var personalUsePlans = await _personalUsePlansTask.Value;
var plans = await pricingClient.ListPlans();
if (personalUsePlans.Any(x => plans.Any(y => y.PasswordManager.StripePlanId == x))) if (parameters.Prices != null && parameters.Prices.Any(x => personalUsePlans.Any(y => y == x)))
{ {
return new PersonalUseAutomaticTaxStrategy(featureService); return new PersonalUseAutomaticTaxStrategy(featureService);
} }

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

@ -128,15 +128,18 @@ public class StripePaymentService : IPaymentService
new SubscriptionPendingInvoiceItemIntervalOptions { Interval = "month" }; new SubscriptionPendingInvoiceItemIntervalOptions { Interval = "month" };
} }
if (_featureService.IsEnabled(FeatureFlagKeys.PM19147_AutomaticTaxImprovements)) if (subscriptionUpdate is CompleteSubscriptionUpdate)
{ {
var automaticTaxParameters = new AutomaticTaxFactoryParameters(subscriber, updatedItemOptions.Select(x => x.Price)); if (_featureService.IsEnabled(FeatureFlagKeys.PM19147_AutomaticTaxImprovements))
var automaticTaxStrategy = await _automaticTaxFactory.CreateAsync(automaticTaxParameters); {
automaticTaxStrategy.SetUpdateOptions(subUpdateOptions, sub); var automaticTaxParameters = new AutomaticTaxFactoryParameters(subscriber, updatedItemOptions.Select(x => x.Plan ?? x.Price));
} var automaticTaxStrategy = await _automaticTaxFactory.CreateAsync(automaticTaxParameters);
else automaticTaxStrategy.SetUpdateOptions(subUpdateOptions, sub);
{ }
subUpdateOptions.EnableAutomaticTax(sub.Customer, sub); else
{
subUpdateOptions.EnableAutomaticTax(sub.Customer, sub);
}
} }
if (!subscriptionUpdate.UpdateNeeded(sub)) if (!subscriptionUpdate.UpdateNeeded(sub))