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

[PM-18268] SM Marketing Initiated Trials cause invoice previewing to … (#5404)

Browse Source 
(cherry picked from commit 288f08da2ad26086b58e8145129b91ed86cd6ea7)
This commit is contained in:
Jonas Hendrickx 2025-02-14 18:01:49 +01:00 committed by Conner Turnbull
parent b6da1454cb
commit 12673f0a3f
No known key found for this signature in database
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1852,7 +1852,6 @@ public class StripePaymentService : IPaymentService
Enabled = true, Enabled = true,
}, },
Currency = "usd", Currency = "usd",
Discounts = new List<InvoiceDiscountOptions>(),
SubscriptionDetails = new InvoiceSubscriptionDetailsOptions SubscriptionDetails = new InvoiceSubscriptionDetailsOptions
{ {
Items = Items =
@ -1903,29 +1902,23 @@ public class StripePaymentService : IPaymentService
]; ];
} }
if (gatewayCustomerId != null) if (!string.IsNullOrWhiteSpace(gatewayCustomerId))
{ {
var gatewayCustomer = await _stripeAdapter.CustomerGetAsync(gatewayCustomerId); var gatewayCustomer = await _stripeAdapter.CustomerGetAsync(gatewayCustomerId);
if (gatewayCustomer.Discount != null) if (gatewayCustomer.Discount != null)
{ {
options.Discounts.Add(new InvoiceDiscountOptions options.Coupon = gatewayCustomer.Discount.Coupon.Id;
{
Discount = gatewayCustomer.Discount.Id
});
} }
}
if (gatewaySubscriptionId != null) if (!string.IsNullOrWhiteSpace(gatewaySubscriptionId))
{
var gatewaySubscription = await _stripeAdapter.SubscriptionGetAsync(gatewaySubscriptionId);
if (gatewaySubscription?.Discount != null)
{ {
var gatewaySubscription = await _stripeAdapter.SubscriptionGetAsync(gatewaySubscriptionId); options.Coupon ??= gatewaySubscription.Discount.Coupon.Id;
if (gatewaySubscription?.Discount != null)
{
options.Discounts.Add(new InvoiceDiscountOptions
{
Discount = gatewaySubscription.Discount.Id
});
}
} }
} }
@ -1976,7 +1969,6 @@ public class StripePaymentService : IPaymentService
Enabled = true, Enabled = true,
}, },
Currency = "usd", Currency = "usd",
Discounts = new List<InvoiceDiscountOptions>(),
SubscriptionDetails = new InvoiceSubscriptionDetailsOptions SubscriptionDetails = new InvoiceSubscriptionDetailsOptions
{ {
Items = Items =
@ -2069,7 +2061,7 @@ public class StripePaymentService : IPaymentService
if (gatewayCustomer.Discount != null) if (gatewayCustomer.Discount != null)
{ {
options.Discounts.Add(new InvoiceDiscountOptions { Discount = gatewayCustomer.Discount.Id }); options.Coupon = gatewayCustomer.Discount.Coupon.Id;
} }
} }
@ -2079,10 +2071,7 @@ public class StripePaymentService : IPaymentService
if (gatewaySubscription?.Discount != null) if (gatewaySubscription?.Discount != null)
{ {
options.Discounts.Add(new InvoiceDiscountOptions options.Coupon ??= gatewaySubscription.Discount.Coupon.Id;
{
Discount = gatewaySubscription.Discount.Id
});
} }
} }