smartstore#320 Unavailable attribute combinations: better UI indication

mgesing · mgesing · commit 27fe459af139 · 2014-04-13T17:37:00.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -13,6 +13,7 @@
 * Updated BundleTransformer to the latest version 1.8.25
 * Added JavaScriptEngineSwitcher.Msie (disabled by default). Useful in scenarios where target server has problems calling the V8 native libs.
 * Updated some 3rd party libraries to their latest versions
+* #320 Unavailable attribute combinations: better UI indication
 
 ###Bugfixes###
 * UI notifications get displayed repeatedly
diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs
@@ -457,7 +457,7 @@ orderby pvac.Id
 
 			var query =
 				from pvac in _productVariantAttributeCombinationRepository.Table
-				where pvac.ProductId == productId && pvac.Price != null
+				where pvac.ProductId == productId && pvac.Price != null && pvac.IsActive
 				orderby pvac.Price ascending
 				select pvac.Price;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs
@@ -62,7 +62,7 @@ public ProductVariantAttributeCombinationModel()
         public int? BasePriceBaseAmount { get; set; }
 
 		[SmartResourceDisplayName("Common.IsActive")]
-		public bool IsActive { get; set; }		
+		public bool IsActive { get; set; }
 
         public IList<ProductVariantAttributeModel> ProductVariantAttributes { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs
@@ -1545,17 +1545,25 @@ protected ProductDetailsModel PrepareProductDetailModel(ProductDetailsModel mode
 			else if (isAssociatedProduct)
 				model.ThumbDimensions = _mediaSettings.AssociatedProductPictureSize;
 
-
-            var deliveryTime = _deliveryTimeService.GetDeliveryTimeById(product.DeliveryTimeId.GetValueOrDefault());
-            if (deliveryTime != null) { 
-                model.DeliveryTimeName = deliveryTime.GetLocalized(x => x.Name);
-                model.DeliveryTimeHexValue = deliveryTime.ColorHexValue;
-            }
+			if (model.IsAvailable)
+			{
+				var deliveryTime = _deliveryTimeService.GetDeliveryTimeById(product.DeliveryTimeId.GetValueOrDefault());
+				if (deliveryTime != null)
+				{
+					model.DeliveryTimeName = deliveryTime.GetLocalized(x => x.Name);
+					model.DeliveryTimeHexValue = deliveryTime.ColorHexValue;
+				}
+			}
 
             model.DisplayDeliveryTime = _catalogSettings.ShowDeliveryTimesInProductDetail;
             model.IsShipEnabled = product.IsShipEnabled;
             model.DisplayDeliveryTimeAccordingToStock = product.DisplayDeliveryTimeAccordingToStock();
 
+			if (model.DeliveryTimeName.IsNullOrEmpty() && model.DisplayDeliveryTime)
+			{
+				model.DeliveryTimeName = T("ShoppingCart.NotAvailable");
+			}
+
             //back in stock subscriptions)
             if (product.ManageInventoryMethod == ManageInventoryMethod.ManageStock &&
                 product.BackorderMode == BackorderMode.NoBackorders &&
diff --git a/src/Presentation/SmartStore.Web/Scripts/public.product-detail.js b/src/Presentation/SmartStore.Web/Scripts/public.product-detail.js
@@ -91,8 +91,11 @@
 
 		    //delivery time
 		    var deliveryTime = priceBlock.find(".delivery-time");
-		    deliveryTime.find(".delivery-time-color").css("background-color", data.Delivery.Color).attr("title", data.Delivery.Name);
 		    deliveryTime.find(".delivery-time-value").html(data.Delivery.Name);
+			deliveryTime.find(".delivery-time-color")
+				.css("background-color", data.Delivery.Color)
+				.attr("title", data.Delivery.Name)
+				.toggle(data.Stock.Availability.Available);
 		     
 		    //attributes
 		    var attributesBlock = $(context).find('.attributes').addBack();
