New shopping cart setting ShowItemsFromWishlistToCartButton

mgesing · mgesing · commit aaa15c593707 · 2015-03-30T14:36:38.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -28,6 +28,7 @@
 * #625 Bundles can be ordered if an attribute combination of a bundle item is not available
 * Minor UI tweaks in checkout process
 * #666 Export addresses in customer export
+* New shopping cart setting ShowItemsFromWishlistToCartButton
 
 ### Bugfixes
 * Instant search box did not display all results when SQL Fulltext Search was enabled
diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs
@@ -9,6 +9,7 @@ public ShoppingCartSettings()
 			MaximumShoppingCartItems = 1000;
 			MaximumWishlistItems = 1000;
 			MoveItemsFromWishlistToCart = true;
+			ShowItemsFromWishlistToCartButton = true;
 			ShowProductImagesOnShoppingCart = true;
 			ShowProductBundleImagesOnShoppingCart = true;
 			ShowProductImagesOnWishList = true;
@@ -25,7 +26,6 @@ public ShoppingCartSettings()
             ShowBasePrice = true;
             ShowDeliveryTimes = true;
             ShowShortDesc = true;
-            
 		}
 		
 		/// <summary>
@@ -58,6 +58,11 @@ public ShoppingCartSettings()
         /// </summary>
         public bool MoveItemsFromWishlistToCart { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether to show the items from wishlist to ahopping cart button.
+		/// </summary>
+		public bool ShowItemsFromWishlistToCartButton { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether to show product image on shopping cart page
         /// </summary>
diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
@@ -865,6 +865,7 @@ protected void PrepareWishlistModel(WishlistModel model, IList<OrganizedShopping
             model.CustomerFullname = customer.GetFullName();
             model.ShowProductImages = _shoppingCartSettings.ShowProductImagesOnShoppingCart;
 			model.ShowProductBundleImages = _shoppingCartSettings.ShowProductBundleImagesOnShoppingCart;
+			model.ShowItemsFromWishlistToCartButton = _shoppingCartSettings.ShowItemsFromWishlistToCartButton;
             model.ShowSku = _catalogSettings.ShowProductSku;
 			model.DisplayShortDesc = _shoppingCartSettings.ShowShortDesc;
 			model.BundleThumbSize = _mediaSettings.CartThumbBundleItemPictureSize;
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs
@@ -32,12 +32,12 @@ public WishlistModel()
 
         public IList<string> Warnings { get; set; }
 
-        // codehint: sm-add
         public int ThumbSize { get; set; }
 		public int BundleThumbSize { get; set; }
         public int IgnoredProductsCount { get; set; }
 		public bool DisplayShortDesc { get; set; }
 		public bool ShowProductBundleImages { get; set; }
+		public bool ShowItemsFromWishlistToCartButton { get; set; }
         
 		#region Nested Classes
 
diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/FlyoutWishlist.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/FlyoutWishlist.cshtml
@@ -46,17 +46,20 @@
                             </span>
                         }
                     </div>
-                    <div class="action pull-left">
-                         <a class="btn btn-mini ajax-cart-link" title='@T("ShoppingCart.AddToCart")' 
-                             href="#"
-							 rel="nofollow"
-                             data-href="@Url.Action("AddOneItemtoCartFromWishlist", "ShoppingCart", new { cartItemId = item.Id })"
-                             data-name="@item.ProductName"
-                             data-type="cart"
-                             data-action="addfromwishlist">
-                            <i class="fa fa-shopping-cart"></i>
-                        </a>
-                    </div>
+					@if (Model.ShowItemsFromWishlistToCartButton)
+					{
+						<div class="action pull-left">
+							 <a class="btn btn-mini ajax-cart-link" title='@T("ShoppingCart.AddToCart")' 
+								 href="#"
+								 rel="nofollow"
+								 data-href="@Url.Action("AddOneItemtoCartFromWishlist", "ShoppingCart", new { cartItemId = item.Id })"
+								 data-name="@item.ProductName"
+								 data-type="cart"
+								 data-action="addfromwishlist">
+								<i class="fa fa-shopping-cart"></i>
+							</a>
+						</div>
+					}
                     <div class="price pull-right">
                         @item.UnitPrice
                     </div>
