Merge branch '4.90-bug-fixes' into develop

# Conflicts:
#	src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs

Author: skoshelev

src/Presentation/Nop.Web/Controllers/CatalogController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Nop.Core;
 using Nop.Core.Domain.Catalog;
-using Nop.Core.Domain.Customers;
 using Nop.Core.Domain.FilterLevels;
 using Nop.Core.Domain.Media;
 using Nop.Core.Domain.Vendors;
@@ -119,12 +118,6 @@ public virtual async Task<IActionResult> Category(int categoryId, CatalogProduct
 
         var store = await _storeContext.GetCurrentStoreAsync();
 
-        //'Continue shopping' URL
-        await _genericAttributeService.SaveAttributeAsync(await _workContext.GetCurrentCustomerAsync(),
-            NopCustomerDefaults.LastContinueShoppingPageAttribute,
-            _webHelper.GetThisPageUrl(false),
-            store.Id);
-
         //display "edit" (manage) link
         if (await _permissionService.AuthorizeAsync(StandardPermission.Security.ACCESS_ADMIN_PANEL) && await _permissionService.AuthorizeAsync(StandardPermission.Catalog.CATEGORIES_VIEW))
             DisplayEditLink(Url.Action("Edit", "Category", new { id = category.Id, area = AreaNames.ADMIN }));
@@ -165,14 +158,6 @@ public virtual async Task<IActionResult> Manufacturer(int manufacturerId, Catalo
         if (!await CheckManufacturerAvailabilityAsync(manufacturer))
             return InvokeHttp404();
 
-        var store = await _storeContext.GetCurrentStoreAsync();
-
-        //'Continue shopping' URL
-        await _genericAttributeService.SaveAttributeAsync(await _workContext.GetCurrentCustomerAsync(),
-            NopCustomerDefaults.LastContinueShoppingPageAttribute,
-            _webHelper.GetThisPageUrl(false),
-            store.Id);
-
         //display "edit" (manage) link
         if (await _permissionService.AuthorizeAsync(StandardPermission.Security.ACCESS_ADMIN_PANEL) && await _permissionService.AuthorizeAsync(StandardPermission.Catalog.MANUFACTURER_VIEW))
             DisplayEditLink(Url.Action("Edit", "Manufacturer", new { id = manufacturer.Id, area = AreaNames.ADMIN }));
@@ -221,14 +206,6 @@ public virtual async Task<IActionResult> Vendor(int vendorId, CatalogProductsCom
         if (!await CheckVendorAvailabilityAsync(vendor))
             return InvokeHttp404();
 
-        var store = await _storeContext.GetCurrentStoreAsync();
-
-        //'Continue shopping' URL
-        await _genericAttributeService.SaveAttributeAsync(await _workContext.GetCurrentCustomerAsync(),
-            NopCustomerDefaults.LastContinueShoppingPageAttribute,
-            _webHelper.GetThisPageUrl(false),
-            store.Id);
-
         //display "edit" (manage) link
         if (await _permissionService.AuthorizeAsync(StandardPermission.Security.ACCESS_ADMIN_PANEL) && await _permissionService.AuthorizeAsync(StandardPermission.Customers.VENDORS_VIEW))
             DisplayEditLink(Url.Action("Edit", "Vendor", new { id = vendor.Id, area = AreaNames.ADMIN }));
@@ -380,14 +357,6 @@ public virtual async Task<IActionResult> NewProductsRss()
 
     public virtual async Task<IActionResult> Search(SearchModel model, CatalogProductsCommand command)
     {
-        var store = await _storeContext.GetCurrentStoreAsync();
-
-        //'Continue shopping' URL
-        await _genericAttributeService.SaveAttributeAsync(await _workContext.GetCurrentCustomerAsync(),
-            NopCustomerDefaults.LastContinueShoppingPageAttribute,
-            _webHelper.GetThisPageUrl(true),
-            store.Id);
-
         if (model == null)
             model = new SearchModel();
 
@@ -528,14 +497,6 @@ public virtual async Task<IActionResult> SearchByFilterLevelValues(SearchFilterL
         if (!_filterLevelSettings.FilterLevelEnabled)
             return RedirectToRoute(NopRouteNames.General.HOMEPAGE);
 
-        var store = await _storeContext.GetCurrentStoreAsync();
-
-        //'Continue shopping' URL
-        await _genericAttributeService.SaveAttributeAsync(await _workContext.GetCurrentCustomerAsync(),
-            NopCustomerDefaults.LastContinueShoppingPageAttribute,
-            _webHelper.GetThisPageUrl(true),
-            store.Id);
-
         if (model == null)
             model = new SearchFilterLevelValueModel();
 

src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs

@@ -596,15 +596,24 @@ public virtual async Task<IActionResult> AddProductToCart_Catalog(int productId,
 
         var product = await _productService.GetProductByIdAsync(productId);
         if (product == null)
-            //no product found
         {
+            //no product found
             return Json(new
             {
                 success = false,
                 message = "No product found with the specified ID"
             });
         }
 
+        var customer = await _workContext.GetCurrentCustomerAsync();
+        var store = await _storeContext.GetCurrentStoreAsync();
+        var referrerPageUrl = _webHelper.GetUrlReferrer();
+        //'Continue shopping' URL
+        await _genericAttributeService.SaveAttributeAsync(customer,
+            NopCustomerDefaults.LastContinueShoppingPageAttribute,
+            referrerPageUrl,
+            store.Id);
+
         var redirectUrl = await _nopUrlHelper.RouteGenericUrlAsync(product);
 
         //we can add only simple products
@@ -664,8 +673,6 @@ public virtual async Task<IActionResult> AddProductToCart_Catalog(int productId,
 
         //get standard warnings without attribute validations
         //first, try to find existing shopping cart item
-        var customer = await _workContext.GetCurrentCustomerAsync();
-        var store = await _storeContext.GetCurrentStoreAsync();
         var cart = await _shoppingCartService.GetShoppingCartAsync(customer, cartType, store.Id);
         var shoppingCartItem = await _shoppingCartService.FindShoppingCartItemInTheCartAsync(cart, cartType, product);
         //if we already have the same product in the cart, then use the total quantity to validate