From f01eee61c8c099d3793d4730ddb72bb183b3c5f8 Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Fri, 10 Apr 2026 17:34:09 -0700
Subject: [PATCH] RE1-T112 fixes

---
 .../Areas/User/Views/Shared/_UserLayout.cshtml        | 11 +++++++++++
 Web/Resgrid.Web/Filters/RequireActivePlanFilter.cs    |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml b/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
index e0743208..4ce641c7 100644
--- a/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
+++ b/Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
@@ -107,6 +107,17 @@
     </script>
 
     <script src="/js/int-bundle.js"></script>
+    <script>
+        // Guard Pace.js finish() against null element references (known issue with Zone.js interaction)
+        if (window.Pace && Pace.bar) {
+            var _origFinish = Pace.bar.finish.bind(Pace.bar);
+            Pace.bar.finish = function () {
+                try { return _origFinish(); } catch (e) {
+                    document.body.className = document.body.className.replace('pace-running', '') + ' pace-done';
+                }
+            };
+        }
+    </script>
     <script src="~/lib/chart.js/dist/chart.umd.min.js" asp-append-version="true"></script>
     <script src="~/js/app/resgrid.js" asp-append-version="true"></script>
     <script src="~/js/app/internal/resgrid.user.js" asp-append-version="true"></script>
diff --git a/Web/Resgrid.Web/Filters/RequireActivePlanFilter.cs b/Web/Resgrid.Web/Filters/RequireActivePlanFilter.cs
index 8fea9244..ffe959dc 100644
--- a/Web/Resgrid.Web/Filters/RequireActivePlanFilter.cs
+++ b/Web/Resgrid.Web/Filters/RequireActivePlanFilter.cs
@@ -32,7 +32,9 @@ public class RequireActivePlanFilter : IAsyncActionFilter
 			"paymentpending",
 			"paymentfailed",
 			"logstriperesponse",
-			"stripebillinginfoupdatesuccess"
+			"stripebillinginfoupdatesuccess",
+			"getpaddlecheckout",
+			"paddleprocessing"
 		};
 
 		public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)