From 9846f5b133aff1a58c198d35c9d204391511a5de Mon Sep 17 00:00:00 2001 From: Jonas Hendrickx Date: Tue, 1 Apr 2025 13:39:31 +0200 Subject: [PATCH] Only allow automatic tax flag to be updated for complete subscription updates such as plan changes, not when upgrading additional storage, seats, etc --- .../AutomaticTax/AutomaticTaxFactory.cs | 3 +-- .../Implementations/StripePaymentService.cs | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Core/Billing/Services/Implementations/AutomaticTax/AutomaticTaxFactory.cs b/src/Core/Billing/Services/Implementations/AutomaticTax/AutomaticTaxFactory.cs index ed0d3babe4..133cd2c7a7 100644 --- a/src/Core/Billing/Services/Implementations/AutomaticTax/AutomaticTaxFactory.cs +++ b/src/Core/Billing/Services/Implementations/AutomaticTax/AutomaticTaxFactory.cs @@ -39,9 +39,8 @@ public class AutomaticTaxFactory( } 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); } diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index 192e9136f6..cdc818e8c1 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -128,15 +128,18 @@ public class StripePaymentService : IPaymentService new SubscriptionPendingInvoiceItemIntervalOptions { Interval = "month" }; } - if (_featureService.IsEnabled(FeatureFlagKeys.PM19147_AutomaticTaxImprovements)) + if (subscriptionUpdate is CompleteSubscriptionUpdate) { - var automaticTaxParameters = new AutomaticTaxFactoryParameters(subscriber, updatedItemOptions.Select(x => x.Price)); - var automaticTaxStrategy = await _automaticTaxFactory.CreateAsync(automaticTaxParameters); - automaticTaxStrategy.SetUpdateOptions(subUpdateOptions, sub); - } - else - { - subUpdateOptions.EnableAutomaticTax(sub.Customer, sub); + if (_featureService.IsEnabled(FeatureFlagKeys.PM19147_AutomaticTaxImprovements)) + { + var automaticTaxParameters = new AutomaticTaxFactoryParameters(subscriber, updatedItemOptions.Select(x => x.Plan ?? x.Price)); + var automaticTaxStrategy = await _automaticTaxFactory.CreateAsync(automaticTaxParameters); + automaticTaxStrategy.SetUpdateOptions(subUpdateOptions, sub); + } + else + { + subUpdateOptions.EnableAutomaticTax(sub.Customer, sub); + } } if (!subscriptionUpdate.UpdateNeeded(sub))