Merge branch 'issue-1609-Product-editor-setting-Add-manufacturers' in…

…to develop
timfun · Aug 1, 2016 · 17ba434 · 17ba434
2 parents 9ed13f7 + bb6e468
commit 17ba434
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 2 deletions.
diff --git a/src/Libraries/Nop.Core/Domain/Catalog/ProductEditorSettings.cs b/src/Libraries/Nop.Core/Domain/Catalog/ProductEditorSettings.cs
@@ -345,5 +345,10 @@ public class ProductEditorSettings : ISettings
         /// Gets or sets a value indicating whether 'Specification attributes' tab is shown
         /// </summary>
         public bool SpecificationAttributes { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether 'Manufacturers' field is shown
+        /// </summary>
+        public bool Manufacturers { get; set; }
     }
 }
diff --git a/src/Libraries/Nop.Services/ExportImport/ExportManager.cs b/src/Libraries/Nop.Services/ExportImport/ExportManager.cs
@@ -951,7 +951,7 @@ public virtual byte[] ExportProductsToXlsx(IEnumerable<Product> products)
                 new PropertyByName<Product>("Width", p => p.Width, IgnoreExportPoductProperty(p => p.Dimensions)),
                 new PropertyByName<Product>("Height", p => p.Height, IgnoreExportPoductProperty(p => p.Dimensions)),
                 new PropertyByName<Product>("Categories", GetCategories),
-                new PropertyByName<Product>("Manufacturers", GetManufacturers),
+                new PropertyByName<Product>("Manufacturers", GetManufacturers, IgnoreExportPoductProperty(p => p.Manufacturers)),
                 new PropertyByName<Product>("Picture1", p => GetPictures(p)[0]),
                 new PropertyByName<Product>("Picture2", p => GetPictures(p)[1]),
                 new PropertyByName<Product>("Picture3", p => GetPictures(p)[2])

diff --git a/src/Presentation/Nop.Web/Administration/Models/Settings/ProductEditorSettingsModel.cs b/src/Presentation/Nop.Web/Administration/Models/Settings/ProductEditorSettingsModel.cs
@@ -208,5 +208,8 @@ public partial class ProductEditorSettingsModel : BaseNopModel
 
         [NopResourceDisplayName("Admin.Configuration.Settings.ProductEditor.SpecificationAttributes")]
         public bool SpecificationAttributes { get; set; }
+
+        [NopResourceDisplayName("Admin.Configuration.Settings.ProductEditor.Manufacturers")]
+        public bool Manufacturers { get; set; }
     }
 }
diff --git a/src/Presentation/Nop.Web/Administration/Views/Product/_CreateOrUpdate.Info.cshtml b/src/Presentation/Nop.Web/Administration/Views/Product/_CreateOrUpdate.Info.cshtml
@@ -1817,7 +1817,7 @@
                             </script>
                         </div>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group @(Model.ProductEditorSettingsModel.Manufacturers ? null : "advanced-setting")">
                         <div class="@leftColumnClass">
                             @Html.NopLabelFor(model => model.SelectedManufacturerIds)
                         </div>

diff --git a/src/Presentation/Nop.Web/Administration/Views/Product/_ProductEditorSettingsModal.cshtml b/src/Presentation/Nop.Web/Administration/Views/Product/_ProductEditorSettingsModal.cshtml
@@ -499,6 +499,15 @@
                                                 @Html.ValidationMessageFor(model => model.ProductEditorSettingsModel.Stores)
                                             </div>
                                         </div>
+                                        <div class="form-group">
+                                            <div class="col-md-10">
+                                                @Html.NopLabelFor(model => model.ProductEditorSettingsModel.Manufacturers)
+                                            </div>
+                                            <div class="col-md-2">
+                                                @Html.NopEditorFor(model => model.ProductEditorSettingsModel.Manufacturers)
+                                                @Html.ValidationMessageFor(model => model.ProductEditorSettingsModel.Manufacturers)
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>

diff --git a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
@@ -6456,6 +6456,9 @@
   <LocaleResource Name="Admin.Configuration.Settings.ProductEditor.ManufacturerPartNumber">
     <Value>Manufacturer part number</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.ProductEditor.Manufacturers">
+    <Value>Manufacturers</Value>
+  </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.ProductEditor.MarkAsNew">
     <Value>Mark as new</Value>
   </LocaleResource>

diff --git a/upgradescripts/3.70-the next version/upgrade.sql b/upgradescripts/3.70-the next version/upgrade.sql
@@ -2174,6 +2174,9 @@ set @resources='
   <LocaleResource Name="Admin.Configuration.Settings.Tax.ShippingTaxClass.Hint">
     <Value>Select tax category used for shipping tax calculation.</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.ProductEditor.Manufacturers">
+    <Value>Manufacturers</Value>
+  </LocaleResource> 
 </Language>
 '