Cart and mini cart should not have different item order

mgesing · mgesing · commit 3b58ca04740e · 2016-06-21T20:32:20.000+02:00
diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerExtentions.cs b/src/Libraries/SmartStore.Services/Customers/CustomerExtentions.cs
@@ -287,14 +287,15 @@ public static int CountProductsInCart(this Customer customer, ShoppingCartType c
 
 			return count;
 		}
-		public static List<OrganizedShoppingCartItem> GetCartItems(this Customer customer, ShoppingCartType cartType, int? storeId = null, bool orderById = false)
+
+		public static List<OrganizedShoppingCartItem> GetCartItems(this Customer customer, ShoppingCartType cartType, int? storeId = null)
 		{
 			var rawItems = customer.ShoppingCartItems.Filter(cartType, storeId);
 
-			if (orderById)
-				rawItems = rawItems.OrderByDescending(x => x.Id);
-
-			var organizedItems = rawItems.ToList().Organize();
+			var organizedItems = rawItems
+				.OrderByDescending(x => x.Id)
+				.ToList()
+				.Organize();
 
 			return organizedItems.ToList();
 		}
diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
@@ -996,7 +996,6 @@ protected MiniShoppingCartModel PrepareMiniShoppingCartModel()
 
                 //products. sort descending (recently added products)
                 foreach (var sci in cart
-                    .OrderByDescending(x => x.Item.Id)
                     .Take(_shoppingCartSettings.MiniShoppingCartProductNumber)
                     .ToList())
                 {
@@ -2633,7 +2632,7 @@ public ActionResult FlyoutWishlist()
         {
             Customer customer = _workContext.CurrentCustomer;
 
-            var cart = customer.GetCartItems(ShoppingCartType.Wishlist, _storeContext.CurrentStore.Id, true);
+            var cart = customer.GetCartItems(ShoppingCartType.Wishlist, _storeContext.CurrentStore.Id);
 			var model = new WishlistModel();
 
             PrepareWishlistModel(model, cart, true);

Original file line number	Diff line number	Diff line change
`@@ -287,14 +287,15 @@ public static int CountProductsInCart(this Customer customer, ShoppingCartType c`
`287`	`287`
`288`	`288`	`return count;`
`289`	`289`	`}`
`290`		`- public static List<OrganizedShoppingCartItem> GetCartItems(this Customer customer, ShoppingCartType cartType, int? storeId = null, bool orderById = false)`
	`290`	`+`
	`291`	`+ public static List<OrganizedShoppingCartItem> GetCartItems(this Customer customer, ShoppingCartType cartType, int? storeId = null)`
`291`	`292`	`{`
`292`	`293`	`var rawItems = customer.ShoppingCartItems.Filter(cartType, storeId);`
`293`	`294`
`294`		`- if (orderById)`
`295`		`- rawItems = rawItems.OrderByDescending(x => x.Id);`
`296`		`-`
`297`		`- var organizedItems = rawItems.ToList().Organize();`
	`295`	`+ var organizedItems = rawItems`
	`296`	`+ .OrderByDescending(x => x.Id)`
	`297`	`+ .ToList()`
	`298`	`+ .Organize();`
`298`	`299`
`299`	`300`	`return organizedItems.ToList();`
`300`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,6 @@ protected MiniShoppingCartModel PrepareMiniShoppingCartModel()`
`996`	`996`
`997`	`997`	`//products. sort descending (recently added products)`
`998`	`998`	`foreach (var sci in cart`
`999`		`- .OrderByDescending(x => x.Item.Id)`
`1000`	`999`	`.Take(_shoppingCartSettings.MiniShoppingCartProductNumber)`
`1001`	`1000`	`.ToList())`
`1002`	`1001`	`{`
`@@ -2633,7 +2632,7 @@ public ActionResult FlyoutWishlist()`
`2633`	`2632`	`{`
`2634`	`2633`	`Customer customer = _workContext.CurrentCustomer;`
`2635`	`2634`
`2636`		`- var cart = customer.GetCartItems(ShoppingCartType.Wishlist, _storeContext.CurrentStore.Id, true);`
	`2635`	`+ var cart = customer.GetCartItems(ShoppingCartType.Wishlist, _storeContext.CurrentStore.Id);`
`2637`	`2636`	`var model = new WishlistModel();`
`2638`	`2637`
`2639`	`2638`	`PrepareWishlistModel(model, cart, true);`