From de56461b97ed0657e34eb8563a536e57bf78bc75 Mon Sep 17 00:00:00 2001 From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com> Date: Fri, 21 Jun 2024 13:02:27 +0100 Subject: [PATCH] resolve the issue with error page after cancel (#4193) Signed-off-by: Cy Okeke --- src/Admin/Controllers/ToolsController.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs index 2b59441a54..3e092b90af 100644 --- a/src/Admin/Controllers/ToolsController.cs +++ b/src/Admin/Controllers/ToolsController.cs @@ -13,6 +13,7 @@ using Bit.Core.Settings; using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using TaxRate = Bit.Core.Entities.TaxRate; namespace Bit.Admin.Controllers; @@ -518,8 +519,17 @@ public class ToolsController : Controller { model.Filter.StartingAfter = null; } + if (model.Action == StripeSubscriptionsAction.NextPage || model.Action == StripeSubscriptionsAction.Search) { + if (!string.IsNullOrEmpty(model.Filter.StartingAfter)) + { + var subscription = await _stripeAdapter.SubscriptionGetAsync(model.Filter.StartingAfter); + if (subscription.Status == "canceled") + { + model.Filter.StartingAfter = null; + } + } model.Filter.EndingBefore = null; } }