Merge branch 'issue-1991-Do-not-display-product-availability-until-al…

…l-required-product-attributes-are-selected' into develop # Conflicts: # upgradescripts/4.00-4.10 (under development)/upgrade.sql
nopSolutions · Jan 9, 2018 · 33f7dea · 33f7dea
2 parents a738cb9 + 9e6a339
commit 33f7dea
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/src/Libraries/Nop.Services/Catalog/ProductExtensions.cs b/src/Libraries/Nop.Services/Catalog/ProductExtensions.cs
@@ -17,7 +17,7 @@ public static class ProductExtensions
     {
         #region Utilities
 
-        private static string GeStockMessage(Product product, string attributesXml, ILocalizationService localizationService, IProductAttributeParser productAttributeParser, IDateRangeService dateRangeService)
+        private static string GeStockMessage(Product product, string attributesXml, ILocalizationService localizationService, IProductAttributeParser productAttributeParser, IDateRangeService dateRangeService, IProductAttributeService productAttributeService)
         {
             if (!product.DisplayStockAvailability)
                 return string.Empty;
@@ -68,7 +68,8 @@ private static string GeStockMessage(Product product, string attributesXml, ILoc
                 }
                 else
                 {
-                    stockMessage = localizationService.GetResource("Products.Availability.InStock");
+                    stockMessage = !productAttributeService.GetProductAttributeMappingsByProductId(product.Id)
+                        .Any(pam => pam.IsRequired) ? localizationService.GetResource("Products.Availability.InStock") : localizationService.GetResource("Products.Availability.SelectRequiredAttributes");
                 }
             }
             return stockMessage;
@@ -185,9 +186,10 @@ public static TierPrice GetPreferredTierPrice(this Product product, Customer cus
         /// <param name="localizationService">Localization service</param>
         /// <param name="productAttributeParser">Product attribute parser</param>
         /// <param name="dateRangeService">Date range service</param>
+        /// <param name="productAttributeService">Product attribute service</param>
         /// <returns>The stock message</returns>
         public static string FormatStockMessage(this Product product, string attributesXml,
-            ILocalizationService localizationService, IProductAttributeParser productAttributeParser, IDateRangeService dateRangeService)
+            ILocalizationService localizationService, IProductAttributeParser productAttributeParser, IDateRangeService dateRangeService, IProductAttributeService productAttributeService)
         {
             if (product == null)
                 throw new ArgumentNullException(nameof(product));
@@ -209,7 +211,7 @@ public static TierPrice GetPreferredTierPrice(this Product product, Customer cus
                     stockMessage = GetStockMessage(product, localizationService, dateRangeService, stockMessage);
                     break;
                 case ManageInventoryMethod.ManageStockByAttributes:
-                    stockMessage = GeStockMessage(product, attributesXml, localizationService, productAttributeParser, dateRangeService);
+                    stockMessage = GeStockMessage(product, attributesXml, localizationService, productAttributeParser, dateRangeService, productAttributeService);
                     break;
             }
 

diff --git a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
@@ -15870,6 +15870,9 @@
   <LocaleResource Name="Products.Availability.OutOfStock">
     <Value>Out of stock</Value>
   </LocaleResource>
+  <LocaleResource Name="Products.Availability.SelectRequiredAttributes">
+    <Value>Please select required attribute(s)</Value>
+  </LocaleResource>
   <LocaleResource Name="Products.BasePrice">
     <Value>equates to {0} per {1} {2}</Value>
   </LocaleResource>

diff --git a/src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs b/src/Presentation/Nop.Web/Controllers/ShoppingCartController.cs
@@ -982,7 +982,7 @@ public virtual IActionResult AddProductToCart_Details(int productId, int shoppin
             }
 
             //stock
-            var stockAvailability = product.FormatStockMessage(attributeXml, _localizationService, _productAttributeParser, _dateRangeService);
+            var stockAvailability = product.FormatStockMessage(attributeXml, _localizationService, _productAttributeParser, _dateRangeService, _productAttributeService);
 
             //conditional attributes
             var enabledAttributeMappingIds = new List<int>();

diff --git a/src/Presentation/Nop.Web/Factories/ProductModelFactory.cs b/src/Presentation/Nop.Web/Factories/ProductModelFactory.cs
@@ -1190,7 +1190,7 @@ public virtual string PrepareProductTemplateViewPath(Product product)
                 ShowGtin = _catalogSettings.ShowGtin,
                 Gtin = product.Gtin,
                 ManageInventoryMethod = product.ManageInventoryMethod,
-                StockAvailability = product.FormatStockMessage("", _localizationService, _productAttributeParser, _dateRangeService),
+                StockAvailability = product.FormatStockMessage("", _localizationService, _productAttributeParser, _dateRangeService, _productAttributeService),
                 HasSampleDownload = product.IsDownload && product.HasSampleDownload,
                 DisplayDiscontinuedMessage = !product.Published && _catalogSettings.DisplayDiscontinuedMessageForUnpublishedProducts
             };

diff --git a/upgradescripts/4.00-4.10 (under development)/upgrade.sql b/upgradescripts/4.00-4.10 (under development)/upgrade.sql
@@ -95,6 +95,9 @@ set @resources='
   <LocaleResource Name="Admin.Catalog.LowStockReport.SearchPublished.UnpublishedOnly">
     <Value>Unpublished only</Value>
   </LocaleResource>
+  <LocaleResource Name="Products.Availability.SelectRequiredAttributes">
+    <Value>Please select required attribute(s)</Value>
+  </LocaleResource>
 </Language>
 '