Resolves #791 Preselected attributes or attribute combinations should…

… always be appended as querystring to product page links (part 1) Perf: Flyout shopping cart must not round-trip the database for bundle item data, OrganizedShoppingCart already provides it Flyout shopping cart should consider ShoppingCartSettings.ShowProductBundleImagesOnShoppingCart
smartstore · Oct 22, 2015 · 0f8ddbf · 0f8ddbf
1 parent c31f25b
commit 0f8ddbf
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 39 deletions.
diff --git a/changelog.md b/changelog.md
@@ -52,6 +52,7 @@
 * #778 Web-API: Increase MaxExpansionDepth for using expand pathes
 * #767 Remove assignments to a grouped product if the grouped product is deleted
 * #773 Reduce number of guest records created by search engine requests
+* #791 Preselected attributes or attribute combinations should always be appended as querystring to product page links
 
 ### Bugfixes
 * #523 Redirecting to payment provider performed by core instead of plugin

diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs
@@ -4105,7 +4105,7 @@ public ActionResult ProductVariantAttributeCombinationList(GridCommand command,
 
 			var productUrlTitle = _localizationService.GetResource("Common.OpenInShop");
 			var productUrl = Url.RouteUrl("Product", new { SeName = product.GetSeName() });
-			productUrl = "{0}{1}attributes=".FormatWith(productUrl, productUrl.Contains("?") ? "&" : "?");
+			productUrl = "{0}{1}attributes=".FormatInvariant(productUrl, productUrl.Contains("?") ? "&" : "?");
 
 			var productVariantAttributesModel = allCombinations.Select(x =>
 			{

diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
@@ -223,7 +223,7 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
 
 			product.MergeWithCombination(item.AttributesXml);
 
-			var model = new ShoppingCartModel.ShoppingCartItemModel()
+			var model = new ShoppingCartModel.ShoppingCartItemModel
 			{
 				Id = item.Id,
 				Sku = product.Sku,
@@ -235,10 +235,12 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
 				IsShipEnabled = product.IsShipEnabled,
 				ShortDesc = product.GetLocalized(x => x.ShortDescription),
 				ProductType = product.ProductType,
-                BasePrice = product.GetBasePriceInfo(_localizationService, _priceFormatter, _currencyService, _taxService, _priceCalculationService, _workContext.WorkingCurrency),
-                Weight = product.Weight
+				BasePrice = product.GetBasePriceInfo(_localizationService, _priceFormatter, _currencyService, _taxService, _priceCalculationService, _workContext.WorkingCurrency),
+				Weight = product.Weight
 			};
 
+			model.ProductUrl = GetProductUrl(item, model.ProductSeName);
+
 			if (item.BundleItem != null)
 			{
 				model.BundlePerItemPricing = item.BundleItem.BundleProduct.BundlePerItemPricing;
@@ -419,7 +421,7 @@ private WishlistModel.ShoppingCartItemModel PrepareWishlistCartItemModel(Organiz
 
 			product.MergeWithCombination(item.AttributesXml);
 
-			var model = new WishlistModel.ShoppingCartItemModel()
+			var model = new WishlistModel.ShoppingCartItemModel
 			{
 				Id = item.Id,
 				Sku = product.Sku,
@@ -432,6 +434,8 @@ private WishlistModel.ShoppingCartItemModel PrepareWishlistCartItemModel(Organiz
 				VisibleIndividually = product.VisibleIndividually
 			};
 
+			model.ProductUrl = GetProductUrl(item, model.ProductSeName);
+
 			if (item.BundleItem != null)
 			{
 				model.BundlePerItemPricing = item.BundleItem.BundleProduct.BundlePerItemPricing;
@@ -587,6 +591,20 @@ private void PrepareButtonPaymentMethodModel(ButtonPaymentMethodModel model, ILi
 			}
 		}
 
+		private string GetProductUrl(ShoppingCartItem cartItem, string productSeName)
+		{
+			var url = Url.RouteUrl("Product", new { SeName = productSeName });
+
+			var queryString = _productAttributeParser.SerializeQueryData(cartItem.ProductId, cartItem.AttributesXml);
+
+			if (queryString.HasValue())
+			{
+				url = string.Concat(url, url.Contains("?") ? "&" : "?", "attributes=", queryString);
+			}
+
+			return url;
+		}
+
 		/// <summary>
 		/// Prepare shopping cart model
 		/// </summary>
@@ -960,7 +978,7 @@ protected MiniShoppingCartModel PrepareMiniShoppingCartModel()
                     .Take(_shoppingCartSettings.MiniShoppingCartProductNumber)
                     .ToList())
                 {
-                    var cartItemModel = new MiniShoppingCartModel.ShoppingCartItemModel()
+                    var cartItemModel = new MiniShoppingCartModel.ShoppingCartItemModel
                     {
                         Id = sci.Item.Id,
                         ProductId = sci.Item.Product.Id,
@@ -977,23 +995,27 @@ protected MiniShoppingCartModel PrepareMiniShoppingCartModel()
                             allowHyperlinks: false)
                     };
 
-                    if (sci.Item.Product.ProductType == ProductType.BundledProduct)
-                    {                        
-                        var bundleItems = _productService.GetBundleItems(sci.Item.Product.Id);
-                        foreach (var bundleItem in bundleItems)
-                        {
-                            var bundleItemModel = new MiniShoppingCartModel.ShoppingCartItemBundleItem();
-                            bundleItemModel.ProductName = bundleItem.Item.Product.GetLocalized(x => x.Name);
-                            var bundlePic = _pictureService.GetPicturesByProductId(bundleItem.Item.ProductId).FirstOrDefault();
-                            if(bundlePic != null)
-                                bundleItemModel.PictureUrl = _pictureService.GetPictureUrl(bundlePic.Id, 32);
+					cartItemModel.ProductUrl = GetProductUrl(sci.Item, cartItemModel.ProductSeName);
 
-                            bundleItemModel.ProductSeName = bundleItem.Item.Product.GetSeName();
+					if (sci.ChildItems != null && _shoppingCartSettings.ShowProductBundleImagesOnShoppingCart)
+					{
+						foreach (var childItem in sci.ChildItems.Where(x => x.Item.Id != sci.Item.Id && x.Item.BundleItem != null && !x.Item.BundleItem.HideThumbnail))
+						{
+							var bundleItemModel = new MiniShoppingCartModel.ShoppingCartItemBundleItem
+							{
+								ProductName = childItem.Item.Product.GetLocalized(x => x.Name),
+								ProductSeName = childItem.Item.Product.GetSeName(),
+							};
 
-                            if (!bundleItem.Item.HideThumbnail) 
-                                cartItemModel.BundleItems.Add(bundleItemModel);
-                        }
-                    }
+							bundleItemModel.ProductUrl = GetProductUrl(childItem.Item, bundleItemModel.ProductSeName);
+
+							var itemPicture = _pictureService.GetPicturesByProductId(childItem.Item.ProductId, 1).FirstOrDefault();
+							if (itemPicture != null)
+								bundleItemModel.PictureUrl = _pictureService.GetPictureUrl(itemPicture.Id, 32);
+
+							cartItemModel.BundleItems.Add(bundleItemModel);
+						}
+					}
 
                     //unit prices
                     if (sci.Item.Product.CallForPrice)

diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
@@ -40,6 +40,8 @@ public ShoppingCartItemModel()
 
             public string ProductSeName { get; set; }
 
+			public string ProductUrl { get; set; }
+
             public int Quantity { get; set; }
 
             public string UnitPrice { get; set; }
@@ -57,6 +59,7 @@ public partial class ShoppingCartItemBundleItem : ModelBase
             public string PictureUrl { get; set; }
             public string ProductName { get; set; }
             public string ProductSeName { get; set; }
+			public string ProductUrl { get; set; }
         }
 
         #endregion

diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs
@@ -73,6 +73,8 @@ public ShoppingCartItemModel()
 
             public string ProductSeName { get; set; }
 
+			public string ProductUrl { get; set; }
+
 			public bool VisibleIndividually { get; set; }
 
 			public ProductType ProductType { get; set; }

diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs
@@ -51,6 +51,7 @@ public ShoppingCartItemModel()
 				ChildItems = new List<ShoppingCartItemModel>();
 				BundleItem = new BundleItemModel();
             }
+
             public string Sku { get; set; }
 
             public PictureModel Picture {get;set;}
@@ -61,6 +62,8 @@ public ShoppingCartItemModel()
 
             public string ProductSeName { get; set; }
 
+			public string ProductUrl { get; set; }
+
 			public bool VisibleIndividually { get; set; }
 
 			public ProductType ProductType { get; set; }

diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/FlyoutShoppingCart.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/FlyoutShoppingCart.cshtml
@@ -32,7 +32,7 @@
                     @if (Model.ShowProductImages)
                     {
                         <figure class="picture pull-left">
-                            <a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@item.Picture.Title">
+                            <a href="@item.ProductUrl" title="@item.Picture.Title">
                                 <img alt="@item.Picture.AlternateText" src="@item.Picture.ImageUrl" title="@item.Picture.Title" />
                             </a>
                         </figure>
@@ -41,7 +41,7 @@
                         @(item.Quantity)<span class="times">x</span>
                     </div>
                     <div class="data pull-left">
-                        <a class="name" href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@item.ProductName">@item.ProductName</a>
+                        <a class="name" href="@item.ProductUrl" title="@item.ProductName">@item.ProductName</a>
                         @if (item.AttributeInfo.HasValue())
                         {
                             <br />
@@ -71,19 +71,16 @@
                             {
                                 var bundleItem = item.BundleItems[j];
 
-                                <a href="@Url.RouteUrl("Product", new { SeName = bundleItem.ProductSeName })" title="@bundleItem.ProductName">
-                                    <img alt="@bundleItem.ProductName" src="@bundleItem.PictureUrl" title="@bundleItem.ProductName" />
-                                </a>
+                                <a href="@bundleItem.ProductUrl" title="@bundleItem.ProductName">
+                                    <img alt="@bundleItem.ProductName" src="@bundleItem.PictureUrl" title="@bundleItem.ProductName" /></a>
 
                                 if (bundlelength != (j + 1)) 
                                 { 
                                     <i class="fa fa-plus"></i>
                                 }
-
                             }        
                         </div>
                     }
-
                 </li>
             }
             @if (Model.IgnoredProductsCount > 0)

diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/FlyoutWishlist.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/FlyoutWishlist.cshtml
@@ -28,7 +28,7 @@
                     @if (Model.ShowProductImages)
                     {
                         <figure class="picture pull-left">
-                            <a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@item.Picture.Title">
+                            <a href="@item.ProductUrl" title="@item.Picture.Title">
                                 <img alt="@item.Picture.AlternateText" src="@item.Picture.ImageUrl" title="@item.Picture.Title" />
                             </a>
                         </figure>
@@ -37,7 +37,7 @@
                         @(item.Quantity)<span class="times">x</span>
                     </div>
                     <div class="data pull-left">
-                        <a class="name" href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@item.ProductName">@item.ProductName</a>
+                        <a class="name" href="@item.ProductUrl" title="@item.ProductName">@item.ProductName</a>
                         @if (item.AttributeInfo.HasValue())
                         {
                             <br />    

diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.Mobile.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.Mobile.cshtml
@@ -13,7 +13,7 @@
 				<div class="bundle-item-name">
 					@if (item.VisibleIndividually)
 					{
-						<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@T("Products.Details")">@item.ProductName</a>
+						<a href="@item.ProductUrl" title="@T("Products.Details")">@item.ProductName</a>
 					}
 					else
 					{
@@ -81,7 +81,7 @@
                     <li>
                         <div class="cart-item-row">
                             <div class="product">
-                                <a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="View details">@item.ProductName</a>
+                                <a href="@item.ProductUrl" title="View details">@item.ProductName</a>
                                 @if (!String.IsNullOrEmpty(item.AttributeInfo))
                                 {
                                     <div class="attributes">

diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.cshtml
@@ -25,7 +25,7 @@
 			</td>
 		}
 		<td class="product">
-			<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@T("Products.Details")">@item.ProductName</a>
+			<a href="@item.ProductUrl" title="@T("Products.Details")">@item.ProductName</a>
 
 			@if (Model.DisplayShortDesc && !String.IsNullOrEmpty(item.ShortDesc))
 			{
@@ -151,7 +151,7 @@
 					<div class="bundle-item">
 						@if (Model.ShowProductBundleImages)
 						{
-							<div class="bundle-item-image" style="@("min-width: {0}px; min-height: {0}px;".FormatWith(Model.BundleThumbSize + 10))">
+							<div class="bundle-item-image" style="@("min-width: {0}px; min-height: {0}px;".FormatInvariant(Model.BundleThumbSize + 10))">
 								@if (!item.BundleItem.HideThumbnail)
 								{
 									<img class="img-polaroid" src="@item.Picture.ImageUrl" alt="@item.Picture.AlternateText" title="@item.Picture.Title" />
@@ -162,7 +162,7 @@
 							<div class="bundle-item-name">
 								@if (item.VisibleIndividually)
 								{
-									<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@T("Products.Details")">@item.ProductName</a>
+									<a href="@item.ProductUrl" title="@T("Products.Details")">@item.ProductName</a>
 								}
 								else
 								{

diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/Wishlist.Mobile.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/Wishlist.Mobile.cshtml
@@ -20,7 +20,7 @@
 				<div class="bundle-item-name">
 					@if (item.VisibleIndividually)
 					{
-						<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@T("Products.Details")">@item.ProductName</a>
+						<a href="@item.ProductUrl" title="@T("Products.Details")">@item.ProductName</a>
 					}
 					else
 					{
@@ -99,7 +99,7 @@
                             <li>
                                 <div class="cart-item-row">
                                     <div class="product">
-                                        <a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="View details">@item.ProductName</a>
+                                        <a href="@item.ProductUrl" title="View details">@item.ProductName</a>
                                         @if (!String.IsNullOrEmpty(item.AttributeInfo))
                                         {
                                             <div class="attributes">

diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/Wishlist.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/Wishlist.cshtml
@@ -38,7 +38,7 @@
 			</td>
 		}
 		<td class="product">
-			<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="View details">@item.ProductName</a>
+			<a href="@item.ProductUrl" title="View details">@item.ProductName</a>
 
 			@if (Model.DisplayShortDesc && !String.IsNullOrEmpty(item.ShortDesc))
 			{
@@ -144,7 +144,7 @@
 							<div class="bundle-item-name">
 								@if (item.VisibleIndividually)
 								{
-									<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })" title="@T("Products.Details")">@item.ProductName</a>
+									<a href="@item.ProductUrl" title="@T("Products.Details")">@item.ProductName</a>
 								}
 								else
 								{