Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

discounts!

Browse Source
This commit is contained in:
Jonas Hendrickx 2024-11-20 14:50:13 +01:00
parent 9b5c696e1f
commit 4c349ddce5
3 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/Billing/Controllers/AccountsBillingController.cs
View File

@ -79,10 +79,16 @@ public class AccountsBillingController(
return TypedResults.Ok(transactions); return TypedResults.Ok(transactions);
} }
[HttpPost("preview-invoice"), AllowAnonymous] [HttpPost("preview-invoice")]
public async Task<IResult> PreviewInvoiceAsync([FromBody] PreviewInvoiceRequestBody model) public async Task<IResult> PreviewInvoiceAsync([FromBody] PreviewInvoiceRequestBody model)
{ {
var invoice = await paymentService.PreviewInvoiceAsync(model); var user = await userService.GetUserByPrincipalAsync(User);
if (user == null)
{
throw new UnauthorizedAccessException();
}
var invoice = await paymentService.PreviewInvoiceAsync(model, user.GatewayCustomerId, user.GatewaySubscriptionId);
return TypedResults.Ok(invoice); return TypedResults.Ok(invoice);
} }

2
src/Core/Services/IPaymentService.cs
View File

@ -61,5 +61,5 @@ public interface IPaymentService
Task<bool> RisksSubscriptionFailure(Organization organization); Task<bool> RisksSubscriptionFailure(Organization organization);
Task<bool> HasSecretsManagerStandalone(Organization organization); Task<bool> HasSecretsManagerStandalone(Organization organization);
Task<(DateTime?, DateTime?)> GetSuspensionDateAsync(Stripe.Subscription subscription); Task<(DateTime?, DateTime?)> GetSuspensionDateAsync(Stripe.Subscription subscription);
Task<PreviewInvoiceResponseModel> PreviewInvoiceAsync(PreviewInvoiceRequestBody parameters); Task<PreviewInvoiceResponseModel> PreviewInvoiceAsync(PreviewInvoiceRequestBody parameters, string gatewayCustomerId, string gatewaySubscriptionId);
} }

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

@ -1882,11 +1882,11 @@ public class StripePaymentService : IPaymentService
} }
} }
public async Task<PreviewInvoiceResponseModel> PreviewInvoiceAsync(PreviewInvoiceRequestBody parameters) public async Task<PreviewInvoiceResponseModel> PreviewInvoiceAsync(
PreviewInvoiceRequestBody parameters,
string gatewayCustomerId,
string gatewaySubscriptionId)
{ {
var pmStripePlan = await _stripeAdapter.PlanGetAsync("premium-annually");
var storageStripePlan = await _stripeAdapter.PlanGetAsync("storage-gb-annually");
var options = new InvoiceCreatePreviewOptions var options = new InvoiceCreatePreviewOptions
{ {
AutomaticTax = new InvoiceAutomaticTaxOptions AutomaticTax = new InvoiceAutomaticTaxOptions
@ -1894,28 +1894,23 @@ public class StripePaymentService : IPaymentService
Enabled = true, Enabled = true,
}, },
Currency = "usd", Currency = "usd",
InvoiceItems = new List<InvoiceUpcomingInvoiceItemOptions> Discounts = new List<InvoiceDiscountOptions>(),
SubscriptionDetails = new InvoiceSubscriptionDetailsOptions
{ {
new() Items =
{ [
Quantity = 1, new()
PriceData = new InvoiceItemPriceDataOptions
{ {
Currency = "usd", Quantity = 1,
UnitAmount = pmStripePlan.Amount, Plan = "premium-annually"
Product = pmStripePlan.ProductId },
}
}, new()
new()
{
Quantity = parameters.PasswordManager.AdditionalStorage,
PriceData = new InvoiceItemPriceDataOptions
{ {
Currency = "usd", Quantity = parameters.PasswordManager.AdditionalStorage,
UnitAmount = storageStripePlan.Amount, Plan = "storage-gb-annually"
Product = storageStripePlan.ProductId
} }
} ]
}, },
CustomerDetails = new InvoiceCustomerDetailsOptions CustomerDetails = new InvoiceCustomerDetailsOptions
{ {
@ -1950,6 +1945,29 @@ public class StripePaymentService : IPaymentService
]; ];
} }
if (gatewayCustomerId != null)
{
var gatewayCustomer = await _stripeAdapter.CustomerGetAsync(gatewayCustomerId);
if (gatewayCustomer.Discount != null)
{
options.Discounts.Add(new InvoiceDiscountOptions
{
Discount = gatewayCustomer.Discount.Id
});
}
var gatewaySubscription = await _stripeAdapter.SubscriptionGetAsync(gatewaySubscriptionId);
if (gatewaySubscription?.Discount != null)
{
options.Discounts.Add(new InvoiceDiscountOptions
{
Discount = gatewaySubscription.Discount.Id
});
}
}
try try
{ {
var invoice = await _stripeAdapter.InvoiceCreatePreviewAsync(options); var invoice = await _stripeAdapter.InvoiceCreatePreviewAsync(options);