#2312 If a returning customer has entered a couponcode which no longe…

…r exists accessing, the cart can cause a crash
nopSolutions · May 8, 2017 · b5f7884 · b5f7884
1 parent 379d8ac
commit b5f7884
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Presentation/Nop.Web/Factories/ShoppingCartModelFactory.cs b/src/Presentation/Nop.Web/Factories/ShoppingCartModelFactory.cs
@@ -818,11 +818,14 @@ public virtual PictureModel PrepareCartItemPictureModel(ShoppingCartItem sci, in
                 var discount = _discountService.GetAllDiscountsForCaching(couponCode: couponCode)
                     .FirstOrDefault(d => d.RequiresCouponCode && _discountService.ValidateDiscount(d, _workContext.CurrentCustomer).IsValid);
 
-                model.DiscountBox.AppliedDiscountsWithCodes.Add(new ShoppingCartModel.DiscountBoxModel.DiscountInfoModel()
+                if (discount != null)
                 {
-                    Id = discount.Id,
-                    CouponCode = discount.CouponCode
-                });
+                    model.DiscountBox.AppliedDiscountsWithCodes.Add(new ShoppingCartModel.DiscountBoxModel.DiscountInfoModel()
+                    {
+                        Id = discount.Id,
+                        CouponCode = discount.CouponCode
+                    });
+                }
             }
             model.GiftCardBox.Display = _shoppingCartSettings.ShowGiftCardBox;