#2262 Added a warning that the same combination already exists

nopSolutions · Aug 30, 2017 · 8b5ff1a · 8b5ff1a
1 parent c46a9d6
commit 8b5ff1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
@@ -3345,6 +3345,9 @@
   <LocaleResource Name="Admin.Catalog.Products.ProductAttributes.AttributeCombinations.AddTitle">
     <Value>Select new combination and enter details below</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Catalog.Products.ProductAttributes.AttributeCombinations.AlreadyExists">
+    <Value>The same combination already exists</Value>
+  </LocaleResource>
   <LocaleResource Name="Admin.Catalog.Products.ProductAttributes.AttributeCombinations.Description">
     <Value>Note that some attribute control types that support custom user input (e.g. file upload, textboxes, date picker) are useless with attribute combinations</Value>
   </LocaleResource>

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Controllers/ProductController.cs b/src/Presentation/Nop.Web/Areas/Admin/Controllers/ProductController.cs
@@ -4629,6 +4629,12 @@ public virtual IActionResult AddAttributeCombinationPopup(int productId, AddProd
 
             warnings.AddRange(_shoppingCartService.GetShoppingCartItemAttributeWarnings(_workContext.CurrentCustomer,
                 ShoppingCartType.ShoppingCart, product, 1, attributesXml, true));
+
+            //check whether the same attribute combination already exists
+            var existingCombination = _productAttributeParser.FindProductAttributeCombination(product, attributesXml);
+            if (existingCombination != null)
+                warnings.Add(_localizationService.GetResource("Admin.Catalog.Products.ProductAttributes.AttributeCombinations.AlreadyExists"));
+
             if (!warnings.Any())
             {
                 //save combination

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Views/Product/AddAttributeCombinationPopup.cshtml b/src/Presentation/Nop.Web/Areas/Admin/Views/Product/AddAttributeCombinationPopup.cshtml
@@ -35,13 +35,10 @@
             <div class="panel-group">
                 <div class="panel panel-default panel-popup">
                     <div class="panel-body">
-                        @if (Model.Warnings.Count > 0)
+                        @foreach (var warning in Model.Warnings)
                         {
                             <div class="alert alert-warning alert-dismissible">
-                                @foreach (var warning in Model.Warnings)
-                                {
-                                    @warning
-                                }
+                                @warning
                             </div>
                         }
 

diff --git a/upgradescripts/3.90-4.00 (under development)/upgrade.sql b/upgradescripts/3.90-4.00 (under development)/upgrade.sql
@@ -236,6 +236,9 @@ set @resources='
   <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.AdminArea.UseRichEditorInMessageTemplates.Hint">
     <Value>Indicates whether to use rich editor on message templates and campaigns details pages.</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Catalog.Products.ProductAttributes.AttributeCombinations.AlreadyExists">
+    <Value>The same combination already exists</Value>
+  </LocaleResource>
 </Language>
 '