Merge branch '4.90-bug-fixes' into develop

Author: skoshelev

src/Libraries/Nop.Services/Orders/NopOrderDefaults.cs

@@ -34,8 +34,9 @@ public static partial class NopOrderDefaults
     /// {3} : product ID
     /// {4} : created from date
     /// {5} : created to date
+    /// {6} : custom wishlist ID
     /// </remarks>
-    public static CacheKey ShoppingCartItemsAllCacheKey => new("Nop.shoppingcartitem.all.{0}-{1}-{2}-{3}-{4}-{5}");
+    public static CacheKey ShoppingCartItemsAllCacheKey => new("Nop.shoppingcartitem.all.{0}-{1}-{2}-{3}-{4}-{5}-{6}");
 
     /// <summary>
     /// Gets a key pattern to clear cache
@@ -45,7 +46,6 @@ public static partial class NopOrderDefaults
     /// </remarks>
     public static string ShoppingCartItemsByCustomerPrefix => "Nop.shoppingcartitem.all.{0}";
 
-
     #endregion
 
     #region Perform order with lock

src/Libraries/Nop.Services/Orders/ShoppingCartService.cs

@@ -776,7 +776,7 @@ public virtual async Task<IList<ShoppingCartItem>> GetShoppingCartAsync(Customer
         if (createdToUtc.HasValue)
             items = items.Where(item => createdToUtc.Value >= item.CreatedOnUtc);
 
-        return await _shortTermCacheManager.GetAsync(async () => await items.ToListAsync(), NopOrderDefaults.ShoppingCartItemsAllCacheKey, customer, shoppingCartType, storeId, productId, createdFromUtc, createdToUtc);
+        return await _shortTermCacheManager.GetAsync(async () => await items.ToListAsync(), NopOrderDefaults.ShoppingCartItemsAllCacheKey, customer, shoppingCartType, storeId, productId, createdFromUtc, createdToUtc, customWishlistId);
     }
 
     /// <summary>

src/Presentation/Nop.Web/Factories/CommonModelFactory.cs

@@ -347,13 +347,14 @@ public virtual async Task<HeaderLinksModel> PrepareHeaderLinksModelAsync()
             UnreadPrivateMessages = unreadMessage,
             AlertMessage = alertMessage,
         };
+        
         //performance optimization (use "HasShoppingCartItems" property)
         if (customer.HasShoppingCartItems)
         {
             model.ShoppingCartItems = (await _shoppingCartService.GetShoppingCartAsync(customer, ShoppingCartType.ShoppingCart, store.Id))
                 .Sum(item => item.Quantity);
 
-            model.WishlistItems = (await _shoppingCartService.GetShoppingCartAsync(customer, ShoppingCartType.Wishlist, store.Id))
+            model.WishlistItems = (await _shoppingCartService.GetShoppingCartAsync(customer, ShoppingCartType.Wishlist, store.Id, customWishlistId: 0))
                 .Sum(item => item.Quantity);
         }