Resolves #1793 Add field for manufacturer bottom description like for…

… categories. Added database index for PermissionRecord.SystemName.
smartstore · Jan 22, 2020 · 5a1ef00 · 5a1ef00
1 parent 91c6b55
commit 5a1ef00
Show file tree

Hide file tree

Showing 18 changed files with 276 additions and 44 deletions.
diff --git a/changelog.md b/changelog.md
@@ -25,6 +25,7 @@
 * #1733 Add ability to hide products from catalog, but not search.
 * #1754 Implement hidden boolean setting that controls which catalog search engine implementation should be used in backend.
 * #1776 Enable images and color values for search filters to be stored for specification attribute options.
+* #1793 Add field for manufacturer bottom description like for categories.
 
 ### Improvements
 * #1663 Make MeasureDimension and MeasureWeight localizable.

diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs
@@ -31,6 +31,12 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc
 		[DataMember]
 		public string Description { get; set; }
 
+        /// <summary>
+        /// Gets or sets a description displayed at the bottom of the manufacturer page.
+        /// </summary>
+        [DataMember]
+        public string BottomDescription { get; set; }
+
         /// <summary>
         /// Gets or sets a value of used manufacturer template identifier
         /// </summary>

diff --git a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace SmartStore.Core.Domain.Security
 {
@@ -12,6 +13,7 @@ public class PermissionRecord : BaseEntity
         /// <summary>
         /// Gets or sets the permission system name.
         /// </summary>
+        [Index]
         public string SystemName { get; set; }
 
         /// <summary>

diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs
@@ -7,14 +7,15 @@ public partial class ManufacturerMap : EntityTypeConfiguration<Manufacturer>
     {
         public ManufacturerMap()
         {
-            this.ToTable("Manufacturer");
-            this.HasKey(m => m.Id);
-            this.Property(m => m.Name).IsRequired().HasMaxLength(400);
-			this.Property(m => m.Description).IsMaxLength();
-            this.Property(m => m.MetaKeywords).HasMaxLength(400);
-            this.Property(m => m.MetaTitle).HasMaxLength(400);
-            this.Property(m => m.PageSizeOptions).HasMaxLength(200).IsOptional();
-			this.HasOptional(p => p.Picture)
+            ToTable("Manufacturer");
+            HasKey(m => m.Id);
+            Property(m => m.Name).IsRequired().HasMaxLength(400);
+			Property(m => m.Description).IsMaxLength();
+            Property(c => c.BottomDescription).IsMaxLength();
+            Property(m => m.MetaKeywords).HasMaxLength(400);
+            Property(m => m.MetaTitle).HasMaxLength(400);
+            Property(m => m.PageSizeOptions).HasMaxLength(200).IsOptional();
+			HasOptional(p => p.Picture)
 				.WithMany()
 				.HasForeignKey(p => p.PictureId)
 				.WillCascadeOnDelete(false);

diff --git a/...ries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs b/...ries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs
diff --git a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs
@@ -0,0 +1,20 @@
+namespace SmartStore.Data.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+
+    public partial class ManufacturerBottomDescription : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.Manufacturer", "BottomDescription", c => c.String());
+            CreateIndex("dbo.PermissionRecord", "SystemName");
+        }
+
+        public override void Down()
+        {
+            DropIndex("dbo.PermissionRecord", new[] { "SystemName" });
+            DropColumn("dbo.Manufacturer", "BottomDescription");
+        }
+    }
+}
diff --git a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.resx b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.resx
diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs
@@ -332,6 +332,12 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
                 "Bild",
                 "Specifies an image as the selector element.",
                 "Legt ein Bild als Auswahlelement fest.");
+
+            builder.AddOrUpdate("Admin.Catalog.Manufacturers.Fields.BottomDescription",
+                "Bottom description",
+                "Untere Beschreibung",
+                "Optional second description displayed below products on the category page.",
+                "Optionale zweite Beschreibung, die auf der Herstellerseite unterhalb der Produkte angezeigt wird.");
         }
     }
 }
diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj
@@ -746,6 +746,10 @@
     <Compile Include="Migrations\202001141118171_SpecificationAttributeColorAndPicture.Designer.cs">
       <DependentUpon>202001141118171_SpecificationAttributeColorAndPicture.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202001221054109_ManufacturerBottomDescription.cs" />
+    <Compile Include="Migrations\202001221054109_ManufacturerBottomDescription.Designer.cs">
+      <DependentUpon>202001221054109_ManufacturerBottomDescription.cs</DependentUpon>
+    </Compile>
     <Compile Include="ObjectContextBase.SaveChanges.cs" />
     <Compile Include="Setup\Builder\ActivityLogTypeMigrator.cs" />
     <Compile Include="Setup\Builder\SettingsBuilder.cs" />
@@ -1332,6 +1336,9 @@
     <EmbeddedResource Include="Migrations\202001141118171_SpecificationAttributeColorAndPicture.resx">
       <DependentUpon>202001141118171_SpecificationAttributeColorAndPicture.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202001221054109_ManufacturerBottomDescription.resx">
+      <DependentUpon>202001221054109_ManufacturerBottomDescription.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Sql\Indexes.sql" />
     <EmbeddedResource Include="Sql\StoredProcedures.sql" />
   </ItemGroup>

diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
@@ -586,14 +586,16 @@ private dynamic ToDynamic(DataExporterContext ctx, Manufacturer manufacturer)
 			{
 				result.SeName = ctx.UrlRecords[nameof(Manufacturer)].GetSlug(ctx.LanguageId, manufacturer.Id);
                 result.Description = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.Description)) ?? manufacturer.Description;
-				result.MetaKeywords = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaKeywords)) ?? manufacturer.MetaKeywords;
+                result.BottomDescription = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.BottomDescription)) ?? manufacturer.BottomDescription;
+                result.MetaKeywords = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaKeywords)) ?? manufacturer.MetaKeywords;
 				result.MetaDescription = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaDescription)) ?? manufacturer.MetaDescription;
 				result.MetaTitle = translations.GetValue(ctx.LanguageId, manufacturer.Id, nameof(manufacturer.MetaTitle)) ?? manufacturer.MetaTitle;
 
 				result._Localized = GetLocalized(ctx, translations, urlRecords, manufacturer,
 					x => x.Name,
 					x => x.Description,
-					x => x.MetaKeywords,
+                    x => x.BottomDescription,
+                    x => x.MetaKeywords,
 					x => x.MetaDescription,
 					x => x.MetaTitle);
 			}

diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
@@ -428,7 +428,8 @@ public void WriteManufacturer(dynamic manufacturer, string node)
 			_writer.Write("Name", (string)manufacturer.Name);
 			_writer.Write("SeName", (string)manufacturer.SeName);
 			_writer.Write("Description", (string)manufacturer.Description);
-			_writer.Write("ManufacturerTemplateId", entity.ManufacturerTemplateId.ToString());
+            _writer.Write("BottomDescription", (string)manufacturer.BottomDescription);
+            _writer.Write("ManufacturerTemplateId", entity.ManufacturerTemplateId.ToString());
 			_writer.Write("MetaKeywords", (string)manufacturer.MetaKeywords);
 			_writer.Write("MetaDescription", (string)manufacturer.MetaDescription);
 			_writer.Write("MetaTitle", (string)manufacturer.MetaTitle);

diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs
@@ -98,32 +98,13 @@ protected void UpdateLocales(Manufacturer manufacturer, ManufacturerModel model)
         {
             foreach (var localized in model.Locales)
             {
-                _localizedEntityService.SaveLocalizedValue(manufacturer,
-                                                               x => x.Name,
-                                                               localized.Name,
-                                                               localized.LanguageId);
-
-                _localizedEntityService.SaveLocalizedValue(manufacturer,
-                                                           x => x.Description,
-                                                           localized.Description,
-                                                           localized.LanguageId);
-
-                _localizedEntityService.SaveLocalizedValue(manufacturer,
-                                                           x => x.MetaKeywords,
-                                                           localized.MetaKeywords,
-                                                           localized.LanguageId);
-
-                _localizedEntityService.SaveLocalizedValue(manufacturer,
-                                                           x => x.MetaDescription,
-                                                           localized.MetaDescription,
-                                                           localized.LanguageId);
-
-                _localizedEntityService.SaveLocalizedValue(manufacturer,
-                                                           x => x.MetaTitle,
-                                                           localized.MetaTitle,
-                                                           localized.LanguageId);
-
-                //search engine name
+                _localizedEntityService.SaveLocalizedValue(manufacturer, x => x.Name, localized.Name, localized.LanguageId);
+                _localizedEntityService.SaveLocalizedValue(manufacturer, x => x.Description, localized.Description, localized.LanguageId);
+                _localizedEntityService.SaveLocalizedValue(manufacturer, x => x.BottomDescription, localized.BottomDescription, localized.LanguageId);
+                _localizedEntityService.SaveLocalizedValue(manufacturer, x => x.MetaKeywords, localized.MetaKeywords, localized.LanguageId);
+                _localizedEntityService.SaveLocalizedValue(manufacturer, x => x.MetaDescription, localized.MetaDescription, localized.LanguageId);
+                _localizedEntityService.SaveLocalizedValue(manufacturer, x => x.MetaTitle, localized.MetaTitle, localized.LanguageId);
+
                 var seName = manufacturer.ValidateSeName(localized.SeName, localized.Name, false, localized.LanguageId);
                 _urlRecordService.SaveSlug(manufacturer, seName, localized.LanguageId);
             }
@@ -344,6 +325,7 @@ public ActionResult Edit(int id)
             {
                 locale.Name = manufacturer.GetLocalized(x => x.Name, languageId, false, false);
                 locale.Description = manufacturer.GetLocalized(x => x.Description, languageId, false, false);
+                locale.BottomDescription = manufacturer.GetLocalized(x => x.BottomDescription, languageId, false, false);
                 locale.MetaKeywords = manufacturer.GetLocalized(x => x.MetaKeywords, languageId, false, false);
                 locale.MetaDescription = manufacturer.GetLocalized(x => x.MetaDescription, languageId, false, false);
                 locale.MetaTitle = manufacturer.GetLocalized(x => x.MetaTitle, languageId, false, false);

diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs
@@ -33,6 +33,10 @@ public ManufacturerModel()
         [AllowHtml]
         public string Description { get; set; }
 
+        [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.BottomDescription")]
+        [AllowHtml]
+        public string BottomDescription { get; set; }
+
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.ManufacturerTemplate")]
         [AllowHtml]
         public int ManufacturerTemplateId { get; set; }
@@ -138,7 +142,11 @@ public class ManufacturerLocalizedModel : ILocalizedModelLocal
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Description")]
         [AllowHtml]
-        public string Description {get;set;}
+        public string Description { get; set; }
+
+        [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.BottomDescription")]
+        [AllowHtml]
+        public string BottomDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.MetaKeywords")]
         [AllowHtml]

diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Manufacturer/_CreateOrUpdate.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Manufacturer/_CreateOrUpdate.cshtml
@@ -61,7 +61,7 @@
                     @Html.ValidationMessageFor(model => model.Locales[item].Name)
                 </td>
             </tr>
-            <tr>
+            <tr class="description-container">
                 <td class="adminTitle">
                     @Html.SmartLabelFor(model => model.Locales[item].Description)
                 </td>
@@ -70,6 +70,15 @@
                     @Html.ValidationMessageFor(model => model.Locales[item].Description)
                 </td>
             </tr>
+            <tr class="description-container d-none">
+                <td class="adminTitle">
+                    @Html.SmartLabelFor(model => model.Locales[item].BottomDescription)
+                </td>
+                <td class="adminData wide">
+                    @Html.EditorFor(model => model.Locales[item].BottomDescription, "Html")
+                    @Html.ValidationMessageFor(model => model.Locales[item].BottomDescription)
+                </td>
+            </tr>
         </table>
         ,
         @<table class="adminContent">
@@ -82,7 +91,7 @@
                     @Html.ValidationMessageFor(model => model.Name)
                 </td>
             </tr>
-            <tr>
+            <tr class="description-container">
                 <td class="adminTitle">
                     @Html.SmartLabelFor(model => model.Description)
                 </td>
@@ -91,6 +100,24 @@
                     @Html.ValidationMessageFor(model => model.Description)
                 </td>
             </tr>
+            <tr class="description-container d-none">
+                <td class="adminTitle">
+                    @Html.SmartLabelFor(model => model.BottomDescription)
+                </td>
+                <td class="adminData wide">
+                    @Html.EditorFor(x => x.BottomDescription, "Html")
+                    @Html.ValidationMessageFor(model => model.BottomDescription)
+                </td>
+            </tr>
+			<tr>
+				<td class="adminTitle"></td>
+				<td class="adminData">
+					<button type="button" class="btn btn-secondary description-toggle-button">
+						<i class="fa fa-exchange-alt"></i>
+						<span>@T("Admin.Catalog.Categories.DescriptionToggle")</span>
+					</button>
+				</td>
+			</tr>
         </table>
     ))
 
@@ -360,7 +387,12 @@
 <script type="text/javascript">
 	$(function () {
         $("#@Html.FieldIdFor(model => model.AllowCustomersToSelectPageSize)").change(togglePageSize);
-		togglePageSize();
+        togglePageSize();
+
+		// Toggle top\bottom description.
+		$('.description-toggle-button').click(function() {
+			$('.description-container').toggleClass('d-none');
+		});
     });
 
 	function PickProducts_Completed(ids) {

diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs
@@ -269,7 +269,8 @@ public ActionResult Manufacturer(int manufacturerId, CatalogSearchQuery query)
 			if (query.IsSubPage && !_catalogSettings.ShowDescriptionInSubPages)
 			{
 				model.Description.ChangeValue(string.Empty);
-			}
+                model.BottomDescription.ChangeValue(string.Empty);
+            }
 
 			model.PictureModel = _helper.PrepareManufacturerPictureModel(manufacturer, model.Name);
 

diff --git a/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs b/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs
@@ -53,6 +53,7 @@ public static ManufacturerModel ToModel(this Manufacturer entity)
                 Id = entity.Id,
                 Name = entity.GetLocalized(x => x.Name),
                 Description = entity.GetLocalized(x => x.Description, detectEmptyHtml: true),
+                BottomDescription = entity.GetLocalized(x => x.BottomDescription, detectEmptyHtml: true),
                 MetaKeywords = entity.GetLocalized(x => x.MetaKeywords),
                 MetaDescription = entity.GetLocalized(x => x.MetaDescription),
                 MetaTitle = entity.GetLocalized(x => x.MetaTitle),

diff --git a/src/Presentation/SmartStore.Web/Models/Catalog/ManufacturerModel.cs b/src/Presentation/SmartStore.Web/Models/Catalog/ManufacturerModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using SmartStore.Services.Localization;
+using SmartStore.Services.Localization;
 using SmartStore.Services.Search;
 using SmartStore.Web.Framework.Modelling;
 using SmartStore.Web.Models.Media;
@@ -16,6 +15,7 @@ public ManufacturerModel()
 
         public LocalizedValue<string> Name { get; set; }
         public LocalizedValue<string> Description { get; set; }
+        public LocalizedValue<string> BottomDescription { get; set; }
         public LocalizedValue<string> MetaKeywords { get; set; }
         public LocalizedValue<string> MetaDescription { get; set; }
         public LocalizedValue<string> MetaTitle { get; set; }

diff --git a/...esentation/SmartStore.Web/Views/Catalog/ManufacturerTemplate.ProductsInGridOrLines.cshtml b/...esentation/SmartStore.Web/Views/Catalog/ManufacturerTemplate.ProductsInGridOrLines.cshtml
@@ -87,6 +87,13 @@
             }
 		</div>
 
+		@if (Model.BottomDescription.Value.HasValue())
+		{
+			<div @Html.LanguageAttributes(Model.BottomDescription) class="manufacturer-description lead html-editor-content">
+				@Html.Raw(Html.CollapsedText(Model.BottomDescription))
+			</div>
+		}
+
 		@* TODO: (mc) find more intelligent way of rendering RecentlyViewedProductsBlock globally *@
 		@{ Html.RenderAction("RecentlyViewedProductsBlock", "Catalog", new { area = "" }); }