Merge pull request #324 from Resgrid/develop

RE1-T112 Fixes

Author: ucswift

Web/Resgrid.Web/Areas/User/Controllers/SubscriptionController.cs

@@ -687,6 +687,9 @@ public async Task<IActionResult> CancelAddon(int addonTypeId)
 		[Authorize(Policy = ResgridResources.Department_Update)]
 		public async Task<IActionResult> GetStripeSession(int id, int count, string discountCode = null, CancellationToken cancellationToken = default)
 		{
+			if (count < 1 || count > 200)
+				return BadRequest("Invalid entity pack count.");
+
 			var plan = await _subscriptionsService.GetPlanByIdAsync(id);
 			var stripeCustomerId = await _departmentSettingsService.GetStripeCustomerIdForDepartmentAsync(DepartmentId);
 			var department = await _departmentsService.GetDepartmentByIdAsync(DepartmentId);
@@ -725,6 +728,9 @@ public async Task<IActionResult> GetStripeUpdate()
 		[Authorize(Policy = ResgridResources.Department_Update)]
 		public async Task<IActionResult> GetPaddleCheckout(int id, int count, string discountCode = null, CancellationToken cancellationToken = default)
 		{
+			if (count < 1 || count > 200)
+				return BadRequest("Invalid entity pack count.");
+
 			var plan = await _subscriptionsService.GetPlanByIdAsync(id);
 			var paddleCustomerId = await _departmentSettingsService.GetPaddleCustomerIdForDepartmentAsync(DepartmentId);
 			var department = await _departmentsService.GetDepartmentByIdAsync(DepartmentId);

Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml

@@ -107,17 +107,6 @@
     </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>

Web/Resgrid.Web/Areas/User/Views/Subscription/Index.cshtml

@@ -731,7 +731,7 @@
                         { tier: 0, marginalUserSlots: 5, costPerUser: 200.0 },
                         { tier: 1, marginalUserSlots: 100, costPerUser: 20.0 },
                         { tier: 2, marginalUserSlots: 1000, costPerUser: 15.0 },
-                        { tier: 3, marginalUserSlots: 1000, costPerUser: 10.0 },
+                        { tier: 3, marginalUserSlots: 5000, costPerUser: 10.0 },
                         { tier: 4, marginalUserSlots: 999999999, costPerUser: 5.0 },
                     ];