bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-22 19:23:45 +00:00
Code Issues Releases Wiki Activity

Milestone 2C Update (#6560)

Browse Source 
* fix(billing): milestone update

* tests(billing): update tests
This commit is contained in:
Stephon Brown
2025-11-10 16:07:14 -05:00
committed by GitHub
parent 4de10c830d
commit db36c52c62
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
View File

@@ -177,7 +177,8 @@ public class UpcomingInvoiceHandler(
Discounts = Discounts =
[ [
new SubscriptionDiscountOptions { Coupon = CouponIDs.Milestone2SubscriptionDiscount } new SubscriptionDiscountOptions { Coupon = CouponIDs.Milestone2SubscriptionDiscount }
] ],
ProrationBehavior = "none"
}); });
} }
catch (Exception exception) catch (Exception exception)

4
src/Core/Billing/Pricing/PricingClient.cs
View File

@@ -123,9 +123,7 @@ public class PricingClient(
return [CurrentPremiumPlan]; return [CurrentPremiumPlan];
} }
var milestone2Feature = featureService.IsEnabled(FeatureFlagKeys.PM23341_Milestone_2); var response = await httpClient.GetAsync("plans/premium");
var response = await httpClient.GetAsync($"plans/premium?milestone2={milestone2Feature}");
if (response.IsSuccessStatusCode) if (response.IsSuccessStatusCode)
{ {

3
test/Billing.Test/Services/UpcomingInvoiceHandlerTests.cs
View File

@@ -268,7 +268,8 @@ public class UpcomingInvoiceHandlerTests
Arg.Is("sub_123"), Arg.Is("sub_123"),
Arg.Is<SubscriptionUpdateOptions>(o => Arg.Is<SubscriptionUpdateOptions>(o =>
o.Items[0].Id == priceSubscriptionId && o.Items[0].Id == priceSubscriptionId &&
o.Items[0].Price == priceId)); o.Items[0].Price == priceId &&
o.ProrationBehavior == "none"));
// Verify the updated invoice email was sent // Verify the updated invoice email was sent
await _mailer.Received(1).SendEmail( await _mailer.Received(1).SendEmail(