Merge pull request #437 from ismaelTartola/issue#436/CheckoutControll…

…er-will-Occasionally-throw-a-NULL-Ref-Exception Issue #436 - SI: CheckoutController will Occasionally throw a NULL Ref Exception
HotcakesCommerce · Dec 19, 2022 · 30a5c75 · 30a5c75
2 parents 716c2b9 + 104713e
commit 30a5c75
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Website/DesktopModules/Hotcakes/Core/Controllers/CheckoutController.cs b/Website/DesktopModules/Hotcakes/Core/Controllers/CheckoutController.cs
@@ -99,6 +99,11 @@ protected bool IsOrderConfirmed
         [NonCacheableResponseFilter]
         public ActionResult Index()
         {
+            if (CurrentCart == null || CurrentCart.Items == null || CurrentCart.Items.Count == 0)
+            {
+                return Redirect(Url.RouteHccUrl(HccRoute.Cart));
+            }
+
             var model = LoadCheckoutModel();
             HccApp.AnalyticsService.RegisterEvent(HccApp.CurrentCustomerId, ActionTypes.GoToChekout, null);
             VerifySessionError(model);
@@ -569,9 +574,6 @@ public ActionResult ApplyEUVatRules()
 
         private CheckoutViewModel LoadCheckoutModel()
         {
-            if (CurrentCart == null || CurrentCart.Items == null || CurrentCart.Items.Count == 0)
-                Redirect(Url.RouteHccUrl(HccRoute.Cart));
-
             var model = new CheckoutViewModel { CurrentOrder = CurrentCart };
 
             LoadCurrentCustomer(model);