From dc3d70cf3ab538b81effded56502d840c6158314 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Wed, 1 Dec 2021 14:41:05 -0600 Subject: [PATCH] Pay 0 cost invoices that have not been paid (#1739) --- src/Core/Services/IStripeAdapter.cs | 2 +- src/Core/Services/Implementations/StripeAdapter.cs | 2 +- src/Core/Services/Implementations/StripePaymentService.cs | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Core/Services/IStripeAdapter.cs b/src/Core/Services/IStripeAdapter.cs index 6daaa7adab..fdc4b797ee 100644 --- a/src/Core/Services/IStripeAdapter.cs +++ b/src/Core/Services/IStripeAdapter.cs @@ -19,7 +19,7 @@ namespace Bit.Core.Services Task InvoiceUpdateAsync(string id, Stripe.InvoiceUpdateOptions options); Task InvoiceFinalizeInvoiceAsync(string id, Stripe.InvoiceFinalizeOptions options); Task InvoiceSendInvoiceAsync(string id, Stripe.InvoiceSendOptions options); - Task InvoicePayAsync(string id, Stripe.InvoicePayOptions options); + Task InvoicePayAsync(string id, Stripe.InvoicePayOptions options = null); Task InvoiceDeleteAsync(string id, Stripe.InvoiceDeleteOptions options = null); Task InvoiceVoidInvoiceAsync(string id, Stripe.InvoiceVoidOptions options = null); IEnumerable PaymentMethodListAutoPaging(Stripe.PaymentMethodListOptions options); diff --git a/src/Core/Services/Implementations/StripeAdapter.cs b/src/Core/Services/Implementations/StripeAdapter.cs index f3c1c34921..7b46640e71 100644 --- a/src/Core/Services/Implementations/StripeAdapter.cs +++ b/src/Core/Services/Implementations/StripeAdapter.cs @@ -101,7 +101,7 @@ namespace Bit.Core.Services return _invoiceService.SendInvoiceAsync(id, options); } - public Task InvoicePayAsync(string id, Stripe.InvoicePayOptions options) + public Task InvoicePayAsync(string id, Stripe.InvoicePayOptions options = null) { return _invoiceService.PayAsync(id, options); } diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index 7ca89b2012..ec9759d9c2 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -801,6 +801,12 @@ namespace Bit.Core.Services throw; } } + else if (!invoice.Paid) + { + // Pay invoice with no charge to customer this completes the invoice immediately without waiting the scheduled 1h + invoice = await _stripeAdapter.InvoicePayAsync(subResponse.LatestInvoiceId); + paymentIntentClientSecret = null; + } // Change back the subscription collection method and/or days until due if (collectionMethod != "send_invoice" || daysUntilDue == null)