Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Implementing store owner settings management (#695)

Copilotb3fd673589a3
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
index 8d16ae9b4..9643f7424 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
@@ -117,15 +117,20 @@ public class MerchandiseReturnService : IMerchandiseReturnService
/// <summary>
/// Gets all merchandise return actions
/// </summary>
+ /// <param name="storeId">Store identifier; empty to load all entries</param>
/// <returns>Merchandise return actions</returns>
- public virtual async Task<IList<MerchandiseReturnAction>> GetAllMerchandiseReturnActions()
+ public virtual async Task<IList<MerchandiseReturnAction>> GetAllMerchandiseReturnActions(string storeId = "")
{
- return await _cacheBase.GetAsync(CacheKey.MERCHANDISE_RETURN_ACTIONS_ALL_KEY, async () =>
+ var key = string.Format(CacheKey.MERCHANDISE_RETURN_ACTIONS_ALL_KEY, storeId);
+ return await _cacheBase.GetAsync(key, async () =>
{
- var query = from rra in _merchandiseReturnActionRepository.Table
+ IQueryable<MerchandiseReturnAction> query = from rra in _merchandiseReturnActionRepository.Table
orderby rra.DisplayOrder
select rra;
- return await Task.FromResult(query.ToList());
+ if (!string.IsNullOrEmpty(storeId))
+ query = query.Where(x => !x.LimitedToStores || x.Stores.Contains(storeId));
+ var actions = query.ToList();
+ return await Task.FromResult(actions);
});
}
@@ -203,7 +208,7 @@ public class MerchandiseReturnService : IMerchandiseReturnService
await _mediator.EntityInserted(merchandiseReturnAction);
//clear cache
- await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_ACTIONS_ALL_KEY);
+ await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_ACTIONS_PATTERN_KEY);
}
/// <summary>
@@ -220,7 +225,7 @@ public class MerchandiseReturnService : IMerchandiseReturnService
await _mediator.EntityUpdated(merchandiseReturnAction);
//clear cache
- await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_ACTIONS_ALL_KEY);
+ await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_ACTIONS_PATTERN_KEY);
}
/// <summary>
@@ -235,6 +240,9 @@ public class MerchandiseReturnService : IMerchandiseReturnService
//event notification
await _mediator.EntityDeleted(merchandiseReturnAction);
+
+ //clear cache
+ await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_ACTIONS_PATTERN_KEY);
}
/// <summary>
@@ -251,21 +259,26 @@ public class MerchandiseReturnService : IMerchandiseReturnService
await _mediator.EntityDeleted(merchandiseReturnReason);
//clear cache
- await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_REASONS_ALL_KEY);
+ await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_REASONS_PATTERN_KEY);
}
/// <summary>
/// Gets all merchandise return reasons
/// </summary>
+ /// <param name="storeId">Store identifier; empty to load all entries</param>
/// <returns>Merchandise return reasons</returns>
- public virtual async Task<IList<MerchandiseReturnReason>> GetAllMerchandiseReturnReasons()
+ public virtual async Task<IList<MerchandiseReturnReason>> GetAllMerchandiseReturnReasons(string storeId = "")
{
- return await _cacheBase.GetAsync(CacheKey.MERCHANDISE_RETURN_REASONS_ALL_KEY, async () =>
+ var key = string.Format(CacheKey.MERCHANDISE_RETURN_REASONS_ALL_KEY, storeId);
+ return await _cacheBase.GetAsync(key, async () =>
{
- var query = from rra in _merchandiseReturnReasonRepository.Table
+ IQueryable<MerchandiseReturnReason> query = from rra in _merchandiseReturnReasonRepository.Table
orderby rra.DisplayOrder
select rra;
- return await Task.FromResult(query.ToList());
+ if (!string.IsNullOrEmpty(storeId))
+ query = query.Where(x => !x.LimitedToStores || x.Stores.Contains(storeId));
+ var reasons = query.ToList();
+ return await Task.FromResult(reasons);
});
}
@@ -293,7 +306,7 @@ public class MerchandiseReturnService : IMerchandiseReturnService
await _mediator.EntityInserted(merchandiseReturnReason);
//clear cache
- await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_REASONS_ALL_KEY);
+ await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_REASONS_PATTERN_KEY);
}
/// <summary>
@@ -310,7 +323,7 @@ public class MerchandiseReturnService : IMerchandiseReturnService
await _mediator.EntityUpdated(merchandiseReturnReason);
//clear cache
- await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_REASONS_ALL_KEY);
+ await _cacheBase.RemoveByPrefix(CacheKey.MERCHANDISE_RETURN_REASONS_PATTERN_KEY);
}
#region Merchandise return notes
diff --git a/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs
index 711d1ea93..7cdb0a88f 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs
@@ -62,8 +62,9 @@ public interface IMerchandiseReturnService
/// <summary>
/// Gets all merchandise return actions
/// </summary>
+ /// <param name="storeId">Store identifier; empty to load all entries</param>
/// <returns>Merchandise return actions</returns>
- Task<IList<MerchandiseReturnAction>> GetAllMerchandiseReturnActions();
+ Task<IList<MerchandiseReturnAction>> GetAllMerchandiseReturnActions(string storeId = "");
/// <summary>
/// Gets a merchandise return action
@@ -93,8 +94,9 @@ public interface IMerchandiseReturnService
/// <summary>
/// Gets all merchandise return reasons
/// </summary>
+ /// <param name="storeId">Store identifier; empty to load all entries</param>
/// <returns>Merchandise return reasons</returns>
- Task<IList<MerchandiseReturnReason>> GetAllMerchandiseReturnReasons();
+ Task<IList<MerchandiseReturnReason>> GetAllMerchandiseReturnReasons(string storeId = "");
/// <summary>
/// Gets a merchandise return reasons
diff --git a/src/Core/Grand.Domain/Orders/MerchandiseReturnAction.cs b/src/Core/Grand.Domain/Orders/MerchandiseReturnAction.cs
index e3fcc132b..935b34e12 100644
--- a/src/Core/Grand.Domain/Orders/MerchandiseReturnAction.cs
+++ b/src/Core/Grand.Domain/Orders/MerchandiseReturnAction.cs
@@ -1,11 +1,12 @@
using Grand.Domain.Localization;
+using Grand.Domain.Stores;
namespace Grand.Domain.Orders;
/// <summary>
/// Represents a merchandise return action
/// </summary>
-public class MerchandiseReturnAction : BaseEntity, ITranslationEntity
+public class MerchandiseReturnAction : BaseEntity, ITranslationEntity, IStoreLinkEntity
{
/// <summary>
/// Gets or sets the name
@@ -21,4 +22,14 @@ public class MerchandiseReturnAction : BaseEntity, ITranslationEntity
/// Gets or sets the collection of locales
/// </summary>
public IList<TranslationEntity> Locales { get; set; } = new List<TranslationEntity>();
+
+ /// <summary>
+ /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
+ /// </summary>
+ public bool LimitedToStores { get; set; }
+
+ /// <summary>
+ /// Gets or sets the stores
+ /// </summary>
+ public IList<string> Stores { get; set; } = new List<string>();
}
\ No newline at end of file
diff --git a/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs b/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs
index 3374141c2..765c9a081 100644
--- a/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs
+++ b/src/Core/Grand.Domain/Orders/MerchandiseReturnReason.cs
@@ -1,11 +1,12 @@
using Grand.Domain.Localization;
+using Grand.Domain.Stores;
namespace Grand.Domain.Orders;
/// <summary>
/// Represents a merchandise return reason
/// </summary>
-public class MerchandiseReturnReason : BaseEntity, ITranslationEntity
+public class MerchandiseReturnReason : BaseEntity, ITranslationEntity, IStoreLinkEntity
{
/// <summary>
/// Gets or sets the name
@@ -21,4 +22,14 @@ public class MerchandiseReturnReason : BaseEntity, ITranslationEntity
/// Gets or sets the collection of locales
/// </summary>
public IList<TranslationEntity> Locales { get; set; } = new List<TranslationEntity>();
+
+ /// <summary>
+ /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
+ /// </summary>
+ public bool LimitedToStores { get; set; }
+
+ /// <summary>
+ /// Gets or sets the stores
+ /// </summary>
+ public IList<string> Stores { get; set; } = new List<string>();
}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Caching/Constants/MerchandiseReturnCacheKey.cs b/src/Core/Grand.Infrastructure/Caching/Constants/MerchandiseReturnCacheKey.cs
index a5d206b8b..d30d29bd2 100644
--- a/src/Core/Grand.Infrastructure/Caching/Constants/MerchandiseReturnCacheKey.cs
+++ b/src/Core/Grand.Infrastructure/Caching/Constants/MerchandiseReturnCacheKey.cs
@@ -3,12 +3,22 @@
public static partial class CacheKey
{
/// <summary>
- /// Key for all merchandise return reason
+ /// Key for all merchandise return reasons. {0} - store ID
/// </summary>
- public static string MERCHANDISE_RETURN_REASONS_ALL_KEY => "Grand.merchandisereturn.reasons.all";
+ public static string MERCHANDISE_RETURN_REASONS_ALL_KEY => "Grand.merchandisereturn.reasons.all-{0}";
/// <summary>
- /// Key for all merchandise return actions
+ /// Key pattern to clear merchandise return reasons cache
/// </summary>
- public static string MERCHANDISE_RETURN_ACTIONS_ALL_KEY => "Grand.merchandisereturn.actions.all";
+ public static string MERCHANDISE_RETURN_REASONS_PATTERN_KEY => "Grand.merchandisereturn.reasons";
+
+ /// <summary>
+ /// Key for all merchandise return actions. {0} - store ID
+ /// </summary>
+ public static string MERCHANDISE_RETURN_ACTIONS_ALL_KEY => "Grand.merchandisereturn.actions.all-{0}";
+
+ /// <summary>
+ /// Key pattern to clear merchandise return actions cache
+ /// </summary>
+ public static string MERCHANDISE_RETURN_ACTIONS_PATTERN_KEY => "Grand.merchandisereturn.actions";
}
\ No newline at end of file
diff --git a/src/Modules/Grand.Module.Installer/Utilities/StandardAdminSiteMap.cs b/src/Modules/Grand.Module.Installer/Utilities/StandardAdminSiteMap.cs
index 15297f172..40c6721f3 100644
--- a/src/Modules/Grand.Module.Installer/Utilities/StandardAdminSiteMap.cs
+++ b/src/Modules/Grand.Module.Installer/Utilities/StandardAdminSiteMap.cs
@@ -967,6 +967,7 @@ public static class StandardAdminSiteMap
new() {
SystemName = "Vendor settings",
ResourceName = "Admin.Settings.Vendor",
+ PermissionNames = new List<string> { PermissionSystemName.System },
ControllerName = "Setting",
ActionName = "Vendor",
DisplayOrder = 6,
@@ -975,6 +976,7 @@ public static class StandardAdminSiteMap
new() {
SystemName = "Push notifications settings",
ResourceName = "Admin.Settings.PushNotifications",
+ PermissionNames = new List<string> { PermissionSystemName.System },
ControllerName = "Setting",
ActionName = "PushNotifications",
DisplayOrder = 7,
@@ -983,6 +985,7 @@ public static class StandardAdminSiteMap
new() {
SystemName = "Admin search settings",
ResourceName = "Admin.Settings.AdminSearch",
+ PermissionNames = new List<string> { PermissionSystemName.System },
ControllerName = "Setting",
ActionName = "AdminSearch",
DisplayOrder = 8,
@@ -991,6 +994,7 @@ public static class StandardAdminSiteMap
new() {
SystemName = "System settings",
ResourceName = "Admin.Settings.System",
+ PermissionNames = new List<string> { PermissionSystemName.System },
ControllerName = "Setting",
ActionName = "SystemSetting",
DisplayOrder = 9,
diff --git a/src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateAdminSiteMap.cs b/src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateAdminSiteMap.cs
new file mode 100644
index 000000000..e845432e8
--- /dev/null
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateAdminSiteMap.cs
@@ -0,0 +1,55 @@
+using Grand.Data;
+using Grand.Domain.Admin;
+using Grand.Domain.Permissions;
+using Grand.Infrastructure.Migrations;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Grand.Module.Migration.Migrations._2._4;
+
+public class MigrationUpdateAdminSiteMap : IMigration
+{
+ public int Priority => 1;
+ public DbVersion Version => new(2, 4);
+ public Guid Identity => new("B7C3D8E2-F1A4-4B9E-8C62-197E3F5A4D21");
+ public string Name => "Update standard admin site map - restrict Vendor, Push notifications, Admin search, System settings to System permission";
+
+ /// <summary>
+ /// Upgrade process
+ /// </summary>
+ /// <param name="serviceProvider"></param>
+ /// <returns></returns>
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
+ {
+ var repository = serviceProvider.GetRequiredService<IRepository<AdminSiteMap>>();
+ var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateAdminSiteMap>>();
+
+ try
+ {
+ var sitemapSettings = repository.Table.FirstOrDefault(x => x.SystemName == "Settings");
+ if (sitemapSettings == null) return true;
+
+ var adminOnlyItems = new[] {
+ "Vendor settings",
+ "Push notifications settings",
+ "Admin search settings",
+ "System settings"
+ };
+
+ foreach (var itemName in adminOnlyItems)
+ {
+ var item = sitemapSettings.ChildNodes.FirstOrDefault(x => x.SystemName == itemName);
+ if (item != null && !item.PermissionNames.Contains(PermissionSystemName.System))
+ item.PermissionNames.Add(PermissionSystemName.System);
+ }
+
+ repository.Update(sitemapSettings);
+ }
+ catch (InvalidOperationException ex)
+ {
+ logService.LogError(ex, "UpgradeProcess - UpdateAdminSiteMap (2.4)");
+ }
+
+ return true;
+ }
+}
diff --git a/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnActionModel_ToDomain.verified.txt b/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnActionModel_ToDomain.verified.txt
index 4a3b6777a..5caab7d4b 100644
--- a/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnActionModel_ToDomain.verified.txt
+++ b/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnActionModel_ToDomain.verified.txt
@@ -1,5 +1,6 @@
{
Name: Refund,
DisplayOrder: 1,
+ LimitedToStores: false,
Id: ObjectId_1
}
\ No newline at end of file
diff --git a/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnReasonModel_ToDomain.verified.txt b/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnReasonModel_ToDomain.verified.txt
index 5c671d38b..c7b137d30 100644
--- a/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnReasonModel_ToDomain.verified.txt
+++ b/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.MerchandiseReturnReasonModel_ToDomain.verified.txt
@@ -1,5 +1,6 @@
{
Name: Defective,
DisplayOrder: 1,
+ LimitedToStores: false,
Id: ObjectId_1
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml
index 8f4a54b9b..cfd0f0c3c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml
@@ -40,5 +40,12 @@
<span asp-validation-for="DisplayOrder"></span>
</div>
</div>
+ <div class="form-group">
+ <admin-label asp-for="Stores"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Stores"/>
+ <span asp-validation-for="Stores"></span>
+ </div>
+ </div>
</div>
</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml
index dc3f9fd33..3793e673e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml
@@ -40,5 +40,12 @@
<span asp-validation-for="DisplayOrder"></span>
</div>
</div>
+ <div class="form-group">
+ <admin-label asp-for="Stores"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Stores"/>
+ <span asp-validation-for="Stores"></span>
+ </div>
+ </div>
</div>
</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index 0020c1c5f..e5e682b73 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -306,7 +306,8 @@ public class SettingController(
[HttpPost]
public async Task<IActionResult> MerchandiseReturnReasonList(DataSourceRequest command)
{
- var reasons = await merchandiseReturnService.GetAllMerchandiseReturnReasons();
+ var storeId = await GetActiveStore();
+ var reasons = await merchandiseReturnService.GetAllMerchandiseReturnReasons(storeId);
var gridModel = new DataSourceResult {
Data = reasons.Select(x => x.ToModel()),
Total = reasons.Count
@@ -317,7 +318,10 @@ public class SettingController(
//create
public async Task<IActionResult> MerchandiseReturnReasonCreate()
{
- var model = new MerchandiseReturnReasonModel();
+ var storeId = await GetActiveStore();
+ var model = new MerchandiseReturnReasonModel {
+ Stores = !string.IsNullOrEmpty(storeId) ? [storeId] : []
+ };
//locales
await AddLocales(languageService, model.Locales);
return View(model);
@@ -417,7 +421,8 @@ public class SettingController(
[HttpPost]
public async Task<IActionResult> MerchandiseReturnActionList(DataSourceRequest command)
{
- var actions = await merchandiseReturnService.GetAllMerchandiseReturnActions();
+ var storeId = await GetActiveStore();
+ var actions = await merchandiseReturnService.GetAllMerchandiseReturnActions(storeId);
var gridModel = new DataSourceResult {
Data = actions.Select(x => x.ToModel()),
Total = actions.Count
@@ -428,7 +433,10 @@ public class SettingController(
//create
public async Task<IActionResult> MerchandiseReturnActionCreate()
{
- var model = new MerchandiseReturnActionModel();
+ var storeId = await GetActiveStore();
+ var model = new MerchandiseReturnActionModel {
+ Stores = !string.IsNullOrEmpty(storeId) ? [storeId] : []
+ };
//locales
await AddLocales(languageService, model.Locales);
return View(model);
diff --git a/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnActionProfile.cs b/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnActionProfile.cs
index e03021761..b5632d1fc 100644
--- a/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnActionProfile.cs
+++ b/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnActionProfile.cs
@@ -11,10 +11,13 @@ public class MerchandiseReturnActionProfile : Profile, IAutoMapperProfile
public MerchandiseReturnActionProfile()
{
CreateMap<MerchandiseReturnAction, MerchandiseReturnActionModel>()
- .ForMember(dest => dest.Locales, mo => mo.Ignore());
+ .ForMember(dest => dest.Locales, mo => mo.Ignore())
+ .ForMember(dest => dest.Stores, mo => mo.MapFrom(src => src.Stores.ToArray()));
CreateMap<MerchandiseReturnActionModel, MerchandiseReturnAction>()
.ForMember(dest => dest.Locales, mo => mo.MapFrom(x => x.Locales.ToTranslationProperty()))
- .ForMember(dest => dest.Id, mo => mo.Ignore());
+ .ForMember(dest => dest.Id, mo => mo.Ignore())
+ .ForMember(dest => dest.LimitedToStores, mo => mo.MapFrom(x => x.Stores != null && x.Stores.Any()))
+ .ForMember(dest => dest.Stores, mo => mo.MapFrom(x => x.Stores != null ? x.Stores.ToList() : new List<string>()));
}
public int Order => 0;
diff --git a/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnReasonProfile.cs b/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnReasonProfile.cs
index 607a3cbf5..67b6a8b90 100644
--- a/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnReasonProfile.cs
+++ b/src/Web/Grand.Web.AdminShared/Mapper/MerchandiseReturnReasonProfile.cs
@@ -11,10 +11,13 @@ public class MerchandiseReturnReasonProfile : Profile, IAutoMapperProfile
public MerchandiseReturnReasonProfile()
{
CreateMap<MerchandiseReturnReason, MerchandiseReturnReasonModel>()
- .ForMember(dest => dest.Locales, mo => mo.Ignore());
+ .ForMember(dest => dest.Locales, mo => mo.Ignore())
+ .ForMember(dest => dest.Stores, mo => mo.MapFrom(src => src.Stores.ToArray()));
CreateMap<MerchandiseReturnReasonModel, MerchandiseReturnReason>()
.ForMember(dest => dest.Locales, mo => mo.MapFrom(x => x.Locales.ToTranslationProperty()))
- .ForMember(dest => dest.Id, mo => mo.Ignore());
+ .ForMember(dest => dest.Id, mo => mo.Ignore())
+ .ForMember(dest => dest.LimitedToStores, mo => mo.MapFrom(x => x.Stores != null && x.Stores.Any()))
+ .ForMember(dest => dest.Stores, mo => mo.MapFrom(x => x.Stores != null ? x.Stores.ToList() : new List<string>()));
}
public int Order => 0;
diff --git a/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnActionModel.cs b/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnActionModel.cs
index 4a22dc1dc..6faed1733 100644
--- a/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnActionModel.cs
+++ b/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnActionModel.cs
@@ -1,10 +1,13 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
+using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
+using System.ComponentModel.DataAnnotations;
namespace Grand.Web.AdminShared.Models.Settings;
-public class MerchandiseReturnActionModel : BaseEntityModel, ILocalizedModel<MerchandiseReturnActionLocalizedModel>
+public class MerchandiseReturnActionModel : BaseEntityModel, ILocalizedModel<MerchandiseReturnActionLocalizedModel>,
+ IStoreLinkModel
{
[GrandResourceDisplayName("Admin.Settings.Order.MerchandiseReturnActions.Name")]
@@ -15,6 +18,10 @@ public class MerchandiseReturnActionModel : BaseEntityModel, ILocalizedModel<Mer
public IList<MerchandiseReturnActionLocalizedModel> Locales { get; set; } =
new List<MerchandiseReturnActionLocalizedModel>();
+
+ [GrandResourceDisplayName("Admin.Settings.Order.MerchandiseReturnActions.LimitedToStores")]
+ [UIHint("Stores")]
+ public string[] Stores { get; set; }
}
public class MerchandiseReturnActionLocalizedModel : ILocalizedModelLocal
diff --git a/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnReasonModel.cs b/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnReasonModel.cs
index f375060d8..0a2c5219f 100644
--- a/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnReasonModel.cs
+++ b/src/Web/Grand.Web.AdminShared/Models/Settings/MerchandiseReturnReasonModel.cs
@@ -1,10 +1,13 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
+using Grand.Web.Common.Link;
using Grand.Web.Common.Models;
+using System.ComponentModel.DataAnnotations;
namespace Grand.Web.AdminShared.Models.Settings;
-public class MerchandiseReturnReasonModel : BaseEntityModel, ILocalizedModel<MerchandiseReturnReasonLocalizedModel>
+public class MerchandiseReturnReasonModel : BaseEntityModel, ILocalizedModel<MerchandiseReturnReasonLocalizedModel>,
+ IStoreLinkModel
{
[GrandResourceDisplayName("Admin.Settings.Order.MerchandiseReturnReasons.Name")]
@@ -15,6 +18,10 @@ public class MerchandiseReturnReasonModel : BaseEntityModel, ILocalizedModel<Mer
public IList<MerchandiseReturnReasonLocalizedModel> Locales { get; set; } =
new List<MerchandiseReturnReasonLocalizedModel>();
+
+ [GrandResourceDisplayName("Admin.Settings.Order.MerchandiseReturnReasons.LimitedToStores")]
+ [UIHint("Stores")]
+ public string[] Stores { get; set; }
}
public class MerchandiseReturnReasonLocalizedModel : ILocalizedModelLocal
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Catalog.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Catalog.cshtml
new file mode 100644
index 000000000..24bdc1b67
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Catalog.cshtml
@@ -0,0 +1,81 @@
+@model CatalogSettingsModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Catalog"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="Catalog" method="post">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-fw fa-sliders"></i>
+ @Loc["Admin.Settings.Catalog"]
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <admin-tabstrip name="catalogsettings-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.General"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabGeneralSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.Performance"]" tab-index="1">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabPerformance" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.ProductReviews"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabProductReviews" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.Search"]" tab-index="3">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabSearchSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.CompareProducts"]" tab-index="4">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabCompareProducts" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.Sharing"]" tab-index="5">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabSharing" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Catalog.SortOptions"]" tab-index="6">
+ <content>
+ <div>
+ <partial name="Partials/Catalog.TabSortOptions" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ </items>
+ </admin-tabstrip>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div asp-validation-summary="All"></div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Content.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Content.cshtml
new file mode 100644
index 000000000..f957222cb
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Content.cshtml
@@ -0,0 +1,53 @@
+@model ContentSettingsModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Content"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="Content" method="post">
+ <div asp-validation-summary="All"></div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-fw fa-sliders"></i>
+ @Loc["Admin.Settings.Content"]
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <admin-tabstrip name="contentsettings-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Settings.Content.BlogSettings"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/Content.TabBlogSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Content.NewsSettings"]" tab-index="1">
+ <content>
+ <div>
+ <partial name="Partials/Content.TabNewsSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Content.KnowledgebaseSettings"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/Content.TabKnowledgebaseSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ </items>
+ </admin-tabstrip>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Customer.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Customer.cshtml
new file mode 100644
index 000000000..3685188ce
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Customer.cshtml
@@ -0,0 +1,60 @@
+@model CustomerSettingsModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Customer"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="Customer" method="post">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-fw fa-sliders"></i>
+ @Loc["Admin.Settings.Customer"]
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <admin-tabstrip name="customersettings-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Settings.Customer.CustomerSettings"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/Customer.TabCustomerSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Customer.CustomerSecurity"]" tab-index="1">
+ <content>
+ <div>
+ <partial name="Partials/Customer.TabCustomerSecurity" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Customer.CustomerFormFields"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/Customer.TabCustomerFormFields" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Customer.AddressFormFields"]" tab-index="3">
+ <content>
+ <div>
+ <partial name="Partials/Customer.TabAddressFormFields" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ </items>
+ </admin-tabstrip>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div asp-validation-summary="All"></div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/GeneralCommon.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/GeneralCommon.cshtml
new file mode 100644
index 000000000..7ba42bc1e
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/GeneralCommon.cshtml
@@ -0,0 +1,67 @@
+@model GeneralCommonSettingsModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.GeneralCommon"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="GeneralCommon" method="post">
+ <div asp-validation-summary="All"></div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-fw fa-sliders"></i>
+ @Loc["Admin.Settings.GeneralCommon"]
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <admin-tabstrip name="generalsettings-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Settings.GeneralCommon.StoreInformationSettings"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/GeneralCommon.TabStoreInformationSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.GeneralCommon.SEOSettings"]" tab-index="1">
+ <content>
+ <div>
+ <partial name="Partials/GeneralCommon.TabSEOSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.GeneralCommon.SecuritySettings"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/GeneralCommon.TabSecuritySettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.GeneralCommon.PdfSettings"]" tab-index="3">
+ <content>
+ <div>
+ <partial name="Partials/GeneralCommon.TabPdfSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.GeneralCommon.DisplayMenu"]" tab-index="4">
+ <content>
+ <div>
+ <partial name="Partials/GeneralCommon.TabMenuSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ </items>
+ </admin-tabstrip>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Media.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Media.cshtml
new file mode 100644
index 000000000..bdacef702
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Media.cshtml
@@ -0,0 +1,242 @@
+@model MediaSettingsModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Media"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="Media" method="post">
+<div asp-validation-summary="All"></div>
+<div class="row">
+<div class="col-md-12">
+<div class="x_panel light form-fit">
+<div class="x_title">
+ <div class="caption">
+ <i class="fa fa-fw fa-sliders"></i>
+ @Loc["Admin.Settings.Media"]
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+</div>
+<div class="x_content form">
+<div class="form-horizontal">
+<div class="form-body">
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ProductThumbPictureSize"/>
+ <span asp-validation-for="ProductThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductDetailsPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ProductDetailsPictureSize"/>
+ <span asp-validation-for="ProductDetailsPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductThumbPictureSizeOnProductDetailsPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ProductThumbPictureSizeOnProductDetailsPage"/>
+ <span asp-validation-for="ProductThumbPictureSizeOnProductDetailsPage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AssociatedProductPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="AssociatedProductPictureSize"/>
+ <span asp-validation-for="AssociatedProductPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CategoryThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CategoryThumbPictureSize"/>
+ <span asp-validation-for="CategoryThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BrandThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="BrandThumbPictureSize"/>
+ <span asp-validation-for="BrandThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CollectionThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CollectionThumbPictureSize"/>
+ <span asp-validation-for="CollectionThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="VendorThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="VendorThumbPictureSize"/>
+ <span asp-validation-for="VendorThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CartThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CartThumbPictureSize"/>
+ <span asp-validation-for="CartThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="MiniCartThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="MiniCartThumbPictureSize"/>
+ <span asp-validation-for="MiniCartThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="MaximumImageSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="MaximumImageSize"/>
+ <span asp-validation-for="MaximumImageSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ImageQuality" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ImageQuality"/>
+ <span asp-validation-for="ImageQuality"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DefaultPictureZoomEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DefaultPictureZoomEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DefaultPictureZoomEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddToCartThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="AddToCartThumbPictureSize"/>
+ <span asp-validation-for="AddToCartThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AutoCompleteSearchThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="AutoCompleteSearchThumbPictureSize"/>
+ <span asp-validation-for="AutoCompleteSearchThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="BlogThumbPictureSize"/>
+ <span asp-validation-for="BlogThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CourseThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CourseThumbPictureSize"/>
+ <span asp-validation-for="CourseThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ImageSquarePictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ImageSquarePictureSize"/>
+ <span asp-validation-for="ImageSquarePictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LessonThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="LessonThumbPictureSize"/>
+ <span asp-validation-for="LessonThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsListThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="NewsListThumbPictureSize"/>
+ <span asp-validation-for="NewsListThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsThumbPictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="NewsThumbPictureSize"/>
+ <span asp-validation-for="NewsThumbPictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductBundlePictureSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ProductBundlePictureSize"/>
+ <span asp-validation-for="ProductBundlePictureSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DefaultImageName" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="DefaultImageName"/>
+ <span asp-validation-for="DefaultImageName"></span>
+ </div>
+</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnActionCreate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnActionCreate.cshtml
new file mode 100644
index 000000000..becefb3a1
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnActionCreate.cshtml
@@ -0,0 +1,33 @@
+@model MerchandiseReturnActionModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Order.MerchandiseReturnActions.AddNew"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="MerchandiseReturnActionCreate" method="post">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-list-alt"></i>
+ @Loc["Admin.Settings.Order.MerchandiseReturnActions.AddNew"]
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>
+ <a href="@Url.Action("Sales", "Setting", new { area = Constants.AreaStore })">@Loc["Admin.Settings.Order.MerchandiseReturnActions.BackToList"]</a>
+ </small>
+ </div>
+ <div class="actions">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate.MerchandiseReturnAction" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnActionEdit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnActionEdit.cshtml
new file mode 100644
index 000000000..fd398c521
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnActionEdit.cshtml
@@ -0,0 +1,39 @@
+@model MerchandiseReturnActionModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Order.MerchandiseReturnActions.EditDetails"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="MerchandiseReturnActionEdit" method="post">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-list-alt"></i>
+ @Loc["Admin.Settings.Order.MerchandiseReturnActions.EditDetails"] - @Model.Name
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>
+ <a href="@Url.Action("Sales", "Setting", new { area = Constants.AreaStore })">@Loc["Admin.Settings.Order.MerchandiseReturnActions.BackToList"]</a>
+ </small>
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ <span id="merchandisereturnaction-delete" class="btn red">
+ <i class="fa fa-trash-o"></i> <span class="d-none d-sm-inline"> @Loc["Admin.Common.Delete"]</span>
+ </span>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate.MerchandiseReturnAction" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
+<admin-delete-confirmation button-id="merchandisereturnaction-delete" action-name="MerchandiseReturnActionDelete"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnReasonCreate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnReasonCreate.cshtml
new file mode 100644
index 000000000..01fd1ab81
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnReasonCreate.cshtml
@@ -0,0 +1,33 @@
+@model MerchandiseReturnReasonModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Order.MerchandiseReturnReasons.AddNew"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="MerchandiseReturnReasonCreate" method="post">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-list-alt"></i>
+ @Loc["Admin.Settings.Order.MerchandiseReturnReasons.AddNew"]
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>
+ <a href="@Url.Action("Sales", "Setting", new { area = Constants.AreaStore })">@Loc["Admin.Settings.Order.MerchandiseReturnReasons.BackToList"]</a>
+ </small>
+ </div>
+ <div class="actions">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate.MerchandiseReturnReason" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnReasonEdit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnReasonEdit.cshtml
new file mode 100644
index 000000000..5bae9f869
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/MerchandiseReturnReasonEdit.cshtml
@@ -0,0 +1,39 @@
+@model MerchandiseReturnReasonModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Order.MerchandiseReturnReasons.EditDetails"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="MerchandiseReturnReasonEdit" method="post">
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-list-alt"></i>
+ @Loc["Admin.Settings.Order.MerchandiseReturnReasons.EditDetails"] - @Model.Name
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>
+ <a href="@Url.Action("Sales", "Setting", new { area = Constants.AreaStore })">@Loc["Admin.Settings.Order.MerchandiseReturnReasons.BackToList"]</a>
+ </small>
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ <span id="merchandisereturnreason-delete" class="btn red">
+ <i class="fa fa-trash-o"></i> <span class="d-none d-sm-inline"> @Loc["Admin.Common.Delete"]</span>
+ </span>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate.MerchandiseReturnReason" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
+<admin-delete-confirmation button-id="merchandisereturnreason-delete" action-name="MerchandiseReturnReasonDelete"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabCompareProducts.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabCompareProducts.cshtml
new file mode 100644
index 000000000..960b0a9dd
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabCompareProducts.cshtml
@@ -0,0 +1,42 @@
+@model CatalogSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CompareProductsEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CompareProductsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CompareProductsEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="IncludeShortDescriptionInCompareProducts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IncludeShortDescriptionInCompareProducts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IncludeShortDescriptionInCompareProducts"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="IncludeFullDescriptionInCompareProducts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IncludeFullDescriptionInCompareProducts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IncludeFullDescriptionInCompareProducts"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabGeneralSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabGeneralSettings.cshtml
new file mode 100644
index 000000000..2e04d9a56
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabGeneralSettings.cshtml
@@ -0,0 +1,710 @@
+@model CatalogSettingsModel
+
+<script>
+ $(document).ready(function () {
+
+ $("#@Html.IdFor(model => model.ShowCategoryProductNumber)").click(toggleShowCategoryProductNumberIncludingSubcategories);
+ $("#@Html.IdFor(model => model.EmailAFriendEnabled)").click(toggleEmailAFriend);
+ $("#@Html.IdFor(model => model.RecentlyViewedProductsEnabled)").click(toggleRecentlyViewedProducts);
+ $("#@Html.IdFor(model => model.SuggestedProductsEnabled)").click(toggleSuggestedProducts);
+ $("#@Html.IdFor(model => model.PersonalizedProductsEnabled)").click(togglePersonalizedProducts);
+ $("#@Html.IdFor(model => model.NewProductsEnabled)").click(toggleNewProducts);
+ $("#@Html.IdFor(model => model.NewProductsOnHomePage)").click(toggleNewProductsHomePage);
+ $("#@Html.IdFor(model => model.ShowBestsellersOnHomepage)").click(toggleBestsellersOnHomepage);
+ $("#@Html.IdFor(model => model.BestsellersFromReports)").click(toggleBestsellersFromReports);
+ $("#@Html.IdFor(model => model.ProductsAlsoPurchasedEnabled)").click(toggleProductsAlsoPurchasedNumber);
+ $("#@Html.IdFor(model => model.ProductsByTagAllowCustomersToSelectPageSize)").click(toggleProductsByTagPageSize);
+
+ toggleShowCategoryProductNumberIncludingSubcategories();
+ toggleEmailAFriend();
+ toggleRecentlyViewedProducts();
+ toggleSuggestedProducts();
+ togglePersonalizedProducts();
+ toggleNewProducts();
+ toggleNewProductsHomePage();
+ toggleBestsellersOnHomepage();
+ toggleBestsellersFromReports();
+ toggleProductsAlsoPurchasedNumber();
+ toggleProductsByTagPageSize();
+ });
+
+ function toggleShowCategoryProductNumberIncludingSubcategories() {
+ if ($('#@Html.IdFor(model => model.ShowCategoryProductNumber)').is(':checked')) {
+ $('#pnlShowCategoryProductNumberIncludingSubcategories').show();
+ }
+ else {
+ $('#pnlShowCategoryProductNumberIncludingSubcategories').hide();
+ }
+ }
+
+ function toggleEmailAFriend() {
+ if ($('#@Html.IdFor(model => model.EmailAFriendEnabled)').is(':checked')) {
+ $('#pnlAllowAnonymousUsersToEmailAFriend').show();
+ }
+ else {
+ $('#pnlAllowAnonymousUsersToEmailAFriend').hide();
+ }
+ }
+
+ function toggleRecentlyViewedProducts() {
+ if ($('#@Html.IdFor(model => model.RecentlyViewedProductsEnabled)').is(':checked')) {
+ $('#pnlRecentlyViewedProductsNumber').show();
+ }
+ else {
+ $('#pnlRecentlyViewedProductsNumber').hide();
+ }
+ }
+
+ function toggleSuggestedProducts() {
+ if ($('#@Html.IdFor(model => model.SuggestedProductsEnabled)').is(':checked')) {
+ $('#pnlSuggestedProductsNumber').show();
+ }
+ else {
+ $('#pnlSuggestedProductsNumber').hide();
+ }
+ }
+
+ function togglePersonalizedProducts() {
+ if ($('#@Html.IdFor(model => model.PersonalizedProductsEnabled)').is(':checked')) {
+ $('#pnlPersonalizedProductsNumber').show();
+ }
+ else {
+ $('#pnlPersonalizedProductsNumber').hide();
+ }
+ }
+
+ function toggleNewProducts() {
+ if ($('#@Html.IdFor(model => model.NewProductsEnabled)').is(':checked')) {
+ $('#pnlNewProductsNumber').show();
+ }
+ else {
+ $('#pnlNewProductsNumber').hide();
+ }
+ }
+
+ function toggleNewProductsHomePage() {
+ if ($('#@Html.IdFor(model => model.NewProductsOnHomePage)').is(':checked')) {
+ $('#pnlNewProductsNumberOnHomePage').show();
+ }
+ else {
+ $('#pnlNewProductsNumberOnHomePage').hide();
+ }
+ }
+ function toggleBestsellersOnHomepage() {
+ if ($('#@Html.IdFor(model => model.ShowBestsellersOnHomepage)').is(':checked')) {
+ $('#pnlNumberOfBestsellersOnHomepage').show();
+ $('#pnlBestsellersFromReports').show();
+ }
+ else {
+ $('#pnlNumberOfBestsellersOnHomepage').hide();
+ $('#pnlBestsellersFromReports').hide();
+ }
+ }
+ function toggleBestsellersFromReports() {
+ if ($('#@Html.IdFor(model => model.BestsellersFromReports)').is(':checked')) {
+ $('#pnlPeriodBestsellers').show();
+ }
+ else {
+ $('#pnlPeriodBestsellers').hide();
+ }
+ }
+
+ function toggleProductsAlsoPurchasedNumber() {
+ if ($('#@Html.IdFor(model => model.ProductsAlsoPurchasedEnabled)').is(':checked')) {
+ $('#pnlProductsAlsoPurchasedNumber').show();
+ }
+ else {
+ $('#pnlProductsAlsoPurchasedNumber').hide();
+ }
+ }
+
+ function toggleProductsByTagPageSize() {
+ if ($('#@Html.IdFor(model => model.ProductsByTagAllowCustomersToSelectPageSize)').is(':checked')) {
+ $('#pnlProductsByTagPageSize').hide();
+ $('#pnlProductsByTagPageSizeOptions').show();
+ } else {
+ $('#pnlProductsByTagPageSize').show();
+ $('#pnlProductsByTagPageSizeOptions').hide();
+ }
+ }
+</script>
+<div class="form-horizontal">
+<div class="form-body">
+<div class="col-md-6">
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="AllowViewUnpublishedProductPage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AllowViewUnpublishedProductPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AllowViewUnpublishedProductPage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="DisplayDiscontinuedMessageForUnpublishedProducts" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayDiscontinuedMessageForUnpublishedProducts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayDiscontinuedMessageForUnpublishedProducts"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowSkuOnProductDetailsPage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowSkuOnProductDetailsPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowSkuOnProductDetailsPage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowSkuOnCatalogPages" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowSkuOnCatalogPages"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowSkuOnCatalogPages"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowMpn" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowMpn"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowMpn"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowGtin" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowGtin"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowGtin"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowFreeShippingNotification" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowFreeShippingNotification"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowFreeShippingNotification"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="AllowProductSorting" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AllowProductSorting"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AllowProductSorting"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="AllowProductViewModeChanging" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AllowProductViewModeChanging"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AllowProductViewModeChanging"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowProductsFromSubcategories" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowProductsFromSubcategories"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowProductsFromSubcategories"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowCategoryProductNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowCategoryProductNumber"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowCategoryProductNumber"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlShowCategoryProductNumberIncludingSubcategories">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowCategoryProductNumberIncludingSubcategories" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowCategoryProductNumberIncludingSubcategories"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowCategoryProductNumberIncludingSubcategories"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CategoryBreadcrumbEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CategoryBreadcrumbEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CategoryBreadcrumbEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="AskQuestionOnProduct" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AskQuestionOnProduct"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AskQuestionOnProduct"></span>
+ </div>
+</div>
+
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="EmailAFriendEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="EmailAFriendEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="EmailAFriendEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAllowAnonymousUsersToEmailAFriend">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="AllowAnonymousUsersToEmailAFriend" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AllowAnonymousUsersToEmailAFriend"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AllowAnonymousUsersToEmailAFriend"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="RecentlyViewedProductsEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="RecentlyViewedProductsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="RecentlyViewedProductsEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlRecentlyViewedProductsNumber">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="RecentlyViewedProductsNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="RecentlyViewedProductsNumber"/>
+ <span asp-validation-for="RecentlyViewedProductsNumber"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="RecommendedProductsEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="RecommendedProductsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="RecommendedProductsEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="SuggestedProductsEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SuggestedProductsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SuggestedProductsEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlSuggestedProductsNumber">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="SuggestedProductsNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="SuggestedProductsNumber"/>
+ <span asp-validation-for="SuggestedProductsNumber"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="PersonalizedProductsEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="PersonalizedProductsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="PersonalizedProductsEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlPersonalizedProductsNumber">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="PersonalizedProductsNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="PersonalizedProductsNumber"/>
+ <span asp-validation-for="PersonalizedProductsNumber"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NewProductsEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NewProductsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NewProductsEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlNewProductsNumber">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NewProductsNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="NewProductsNumber"/>
+ <span asp-validation-for="NewProductsNumber"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NewProductsOnHomePage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NewProductsOnHomePage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NewProductsOnHomePage"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlNewProductsNumberOnHomePage">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NewProductsNumberOnHomePage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="NewProductsNumberOnHomePage"/>
+ <span asp-validation-for="NewProductsNumberOnHomePage"></span>
+ </div>
+</div>
+</div>
+<div class="col-md-6">
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowBestsellersOnHomepage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowBestsellersOnHomepage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowBestsellersOnHomepage"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlNumberOfBestsellersOnHomepage">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NumberOfBestsellersOnHomepage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="NumberOfBestsellersOnHomepage"/>
+ <span asp-validation-for="NumberOfBestsellersOnHomepage"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlBestsellersFromReports">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="BestsellersFromReports" class="control-label text-left"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="BestsellersFromReports"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="BestsellersFromReports"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlPeriodBestsellers">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="PeriodBestsellers" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="PeriodBestsellers"/>
+ <span asp-validation-for="PeriodBestsellers"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ProductsAlsoPurchasedEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ProductsAlsoPurchasedEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ProductsAlsoPurchasedEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlProductsAlsoPurchasedNumber">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ProductsAlsoPurchasedNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ProductsAlsoPurchasedNumber"/>
+ <span asp-validation-for="ProductsAlsoPurchasedNumber"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NumberOfProductTags" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="NumberOfProductTags"/>
+ <span asp-validation-for="NumberOfProductTags"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ProductsByTagAllowCustomersToSelectPageSize" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ProductsByTagAllowCustomersToSelectPageSize"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ProductsByTagAllowCustomersToSelectPageSize"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlProductsByTagPageSize">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ProductsByTagPageSize" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ProductsByTagPageSize"/>
+ <span asp-validation-for="ProductsByTagPageSize"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlProductsByTagPageSizeOptions">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ProductsByTagPageSizeOptions" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ProductsByTagPageSizeOptions"/>
+ <span asp-validation-for="ProductsByTagPageSizeOptions"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CollectionsBlockItemsToDisplay" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="CollectionsBlockItemsToDisplay"/>
+ <span asp-validation-for="CollectionsBlockItemsToDisplay"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowSpecAttributeOnCatalogPages" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowSpecAttributeOnCatalogPages"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowSpecAttributeOnCatalogPages"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="SecondPictureOnCatalogPages" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecondPictureOnCatalogPages"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecondPictureOnCatalogPages"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="IncludeFeaturedProductsInNormalLists" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IncludeFeaturedProductsInNormalLists"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IncludeFeaturedProductsInNormalLists"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="DisplayTierPricesWithDiscounts" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayTierPricesWithDiscounts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayTierPricesWithDiscounts"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="DisplayQuantityOnCatalogPages" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayQuantityOnCatalogPages"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayQuantityOnCatalogPages"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="PublishBackProductWhenCancellingOrders" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="PublishBackProductWhenCancellingOrders"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="PublishBackProductWhenCancellingOrders"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShowProductsFromSubcategoriesInSearchBox" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowProductsFromSubcategoriesInSearchBox"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowProductsFromSubcategoriesInSearchBox"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="DefaultPageSizeOptions" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="DefaultPageSizeOptions"/>
+ <span asp-validation-for="DefaultPageSizeOptions"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="DefaultPageSize" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="DefaultPageSize"/>
+ <span asp-validation-for="DefaultPageSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="DefaultViewMode" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ @*<admin-input asp-for="DefaultViewMode" />*@
+ <admin-select asp-for="DefaultViewMode" asp-items="Model.DefaultViewModes"/>
+ <span asp-validation-for="DefaultViewMode"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="NumberOfReview" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="NumberOfReview"/>
+ <span asp-validation-for="NumberOfReview"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="LimitOfFeaturedProducts" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="LimitOfFeaturedProducts"/>
+ <span asp-validation-for="LimitOfFeaturedProducts"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="MaxCatalogPageSize" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="MaxCatalogPageSize"/>
+ <span asp-validation-for="MaxCatalogPageSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="SortingByAvailability" class="control-label text-left"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SortingByAvailability"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SortingByAvailability"></span>
+ </div>
+</div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabPerformance.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabPerformance.cshtml
new file mode 100644
index 000000000..259842d46
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabPerformance.cshtml
@@ -0,0 +1,66 @@
+@model CatalogSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="IgnoreDiscounts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IgnoreDiscounts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IgnoreDiscounts"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="IgnoreFeaturedProducts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IgnoreFeaturedProducts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IgnoreFeaturedProducts"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="IgnoreFilterableSpecAttributeOption" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IgnoreFilterableSpecAttributeOption"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IgnoreFilterableSpecAttributeOption"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="IgnoreFilterableAvailableStartEndDateTime" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IgnoreFilterableAvailableStartEndDateTime"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IgnoreFilterableAvailableStartEndDateTime"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerProductPrice" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerProductPrice"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerProductPrice"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabProductReviews.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabProductReviews.cshtml
new file mode 100644
index 000000000..648069ef3
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabProductReviews.cshtml
@@ -0,0 +1,84 @@
+@model CatalogSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductReviewsMustBeApproved" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ProductReviewsMustBeApproved"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ProductReviewsMustBeApproved"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AllowAnonymousUsersToReviewProduct" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AllowAnonymousUsersToReviewProduct"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AllowAnonymousUsersToReviewProduct"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NotifyStoreOwnerAboutNewProductReviews" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NotifyStoreOwnerAboutNewProductReviews"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NotifyStoreOwnerAboutNewProductReviews"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductReviewPossibleOnlyAfterPurchasing" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ProductReviewPossibleOnlyAfterPurchasing"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ProductReviewPossibleOnlyAfterPurchasing"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductReviewPossibleOnlyOnce" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ProductReviewPossibleOnlyOnce"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ProductReviewPossibleOnlyOnce"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DefaultProductRatingValue" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="DefaultProductRatingValue"/>
+ <span asp-validation-for="DefaultProductRatingValue"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="FilterProductRating" class="control-label"/>
+ </div>
+ <div class="col-2 col-md-2 col-sm-2">
+ <admin-input asp-for="FilterProductRating"/>
+ <span asp-validation-for="FilterProductRating"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSearchSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSearchSettings.cshtml
new file mode 100644
index 000000000..74c484cb0
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSearchSettings.cshtml
@@ -0,0 +1,146 @@
+@model CatalogSettingsModel
+
+<script>
+ $(document).ready(function () {
+
+ $("#@Html.IdFor(model => model.SearchPageAllowCustomersToSelectPageSize)").click(toggleSearchPagePageSize);
+ $("#@Html.IdFor(model => model.ProductSearchAutoCompleteEnabled)").click(toggleProductSearchAutoComplete);
+
+ toggleSearchPagePageSize();
+ toggleProductSearchAutoComplete();
+ });
+
+ function toggleSearchPagePageSize() {
+ if ($('#@Html.IdFor(model => model.SearchPageAllowCustomersToSelectPageSize)').is(':checked')) {
+ $('#pnlSearchPageProductsPerPage').hide();
+ $('#pnlSearchPagePageSizeOptions').show();
+ } else {
+ $('#pnlSearchPageProductsPerPage').show();
+ $('#pnlSearchPagePageSizeOptions').hide();
+ }
+ }
+
+ function toggleProductSearchAutoComplete() {
+ if ($('#@Html.IdFor(model => model.ProductSearchAutoCompleteEnabled)').is(':checked')) {
+ $('#pnlProductSearchAutoCompleteNumberOfProducts').show();
+ $('#pnlShowProductImagesInSearchAutoComplete').show();
+ }
+ else {
+ $('#pnlProductSearchAutoCompleteNumberOfProducts').hide();
+ $('#pnlShowProductImagesInSearchAutoComplete').hide();
+ }
+ }
+</script>
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SearchPageAllowCustomersToSelectPageSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SearchPageAllowCustomersToSelectPageSize"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SearchPageAllowCustomersToSelectPageSize"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlSearchPageProductsPerPage">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SearchPageProductsPerPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SearchPageProductsPerPage"/>
+ <span asp-validation-for="SearchPageProductsPerPage"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlSearchPagePageSizeOptions">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SearchPagePageSizeOptions" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SearchPagePageSizeOptions"/>
+ <span asp-validation-for="SearchPagePageSizeOptions"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductSearchAutoCompleteEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ProductSearchAutoCompleteEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ProductSearchAutoCompleteEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlProductSearchAutoCompleteNumberOfProducts">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductSearchAutoCompleteNumberOfProducts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ProductSearchAutoCompleteNumberOfProducts"/>
+ <span asp-validation-for="ProductSearchAutoCompleteNumberOfProducts"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlShowProductImagesInSearchAutoComplete">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ShowProductImagesInSearchAutoComplete" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowProductImagesInSearchAutoComplete"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowProductImagesInSearchAutoComplete"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ProductSearchTermMinimumLength" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="ProductSearchTermMinimumLength"/>
+ <span asp-validation-for="ProductSearchTermMinimumLength"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SearchBySku" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SearchBySku"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SearchBySku"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SearchByDescription" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SearchByDescription"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SearchByDescription"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SaveSearchAutoComplete" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SaveSearchAutoComplete"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SaveSearchAutoComplete"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSharing.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSharing.cshtml
new file mode 100644
index 000000000..54f53c541
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSharing.cshtml
@@ -0,0 +1,44 @@
+@model CatalogSettingsModel
+
+<script>
+ $(document).ready(function () {
+
+ $("#@Html.IdFor(model => model.ShowShareButton)").click(togglePageShareCode);
+
+ togglePageShareCode();
+ });
+
+ function togglePageShareCode() {
+ if ($('#@Html.IdFor(model => model.ShowShareButton)').is(':checked')) {
+ $('#pnlPageShareCode').show();
+ }
+ else {
+ $('#pnlPageShareCode').hide();
+ }
+ }
+</script>
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="ShowShareButton" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShowShareButton"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShowShareButton"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlPageShareCode">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="PageShareCode" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-textarea asp-for="PageShareCode"></admin-textarea>
+ <span asp-validation-for="PageShareCode"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSortOptions.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSortOptions.cshtml
new file mode 100644
index 000000000..92995b94f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Catalog.TabSortOptions.cshtml
@@ -0,0 +1,96 @@
+@model CatalogSettingsModel
+
+<div class="panel panel-default">
+ <div class="panel-body">
+ <div id="sortoptions-grid"></div>
+ </div>
+</div>
+
+<script>
+ $(document).ready(function () {
+ $("#sortoptions-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("SortOptionsList", "Setting", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ update: {
+ url: "@Html.Raw(Url.Action("SortOptionUpdate", "Setting", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "Id",
+ fields: {
+ Name: { editable: false, type: "string" },
+ DisplayOrder: { editable: true, type: "number" },
+ IsActive: { editable: true, type: "boolean" }
+ }
+ }
+ },
+ requestEnd: function (e) {
+ if (e.type == "update") {
+ this.read();
+ }
+ },
+ error: function (e) {
+ display_kendoui_grid_error(e);
+ // Cancel the changes
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Name",
+ title: "@Loc["Admin.Settings.Catalog.SortOptions.Name"]",
+ width: 250
+ }, {
+ field: "DisplayOrder",
+ title: "@Loc["Admin.Settings.Catalog.SortOptions.DisplayOrder"]",
+ //integer format
+ format: "{0:0}",
+ width: 100
+ }, {
+ field: "IsActive",
+ title: "@Loc["Admin.Settings.Catalog.SortOptions.IsActive"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(IsActive) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ }, {
+ command: {
+ name: "edit",
+ text: {
+ edit: "@Loc["Admin.Common.Edit"]",
+ update: "@Loc["Admin.Common.Update"]",
+ cancel: "@Loc["Admin.Common.Cancel"]"
+ }
+ },
+ title: "@Loc["Admin.Common.Edit"]",
+ width: 150
+ }]
+ });
+ });
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabBlogSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabBlogSettings.cshtml
new file mode 100644
index 000000000..d81b35654
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabBlogSettings.cshtml
@@ -0,0 +1,101 @@
+@model ContentSettingsModel
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.Enabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="BlogSettings.Enabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="BlogSettings.Enabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.PostsPageSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="BlogSettings.PostsPageSize"/>
+ <span asp-validation-for="BlogSettings.PostsPageSize"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.AllowNotRegisteredUsersToLeaveComments" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="BlogSettings.AllowNotRegisteredUsersToLeaveComments"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="BlogSettings.AllowNotRegisteredUsersToLeaveComments"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.NotifyAboutNewBlogComments" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="BlogSettings.NotifyAboutNewBlogComments"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="BlogSettings.NotifyAboutNewBlogComments"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.NumberOfTags" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="BlogSettings.NumberOfTags"/>
+ <span asp-validation-for="BlogSettings.NumberOfTags"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.ShowBlogOnHomePage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="BlogSettings.ShowBlogOnHomePage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="BlogSettings.ShowBlogOnHomePage"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.HomePageBlogCount" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="BlogSettings.HomePageBlogCount"/>
+ <span asp-validation-for="BlogSettings.HomePageBlogCount"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.MaxTextSizeHomePage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="BlogSettings.MaxTextSizeHomePage"/>
+ <span asp-validation-for="BlogSettings.MaxTextSizeHomePage"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="BlogSettings.ShowBlogPostsInSearchAutoComplete" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="BlogSettings.ShowBlogPostsInSearchAutoComplete"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="BlogSettings.ShowBlogPostsInSearchAutoComplete"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabKnowledgebaseSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabKnowledgebaseSettings.cshtml
new file mode 100644
index 000000000..e8a16fb1c
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabKnowledgebaseSettings.cshtml
@@ -0,0 +1,42 @@
+@model ContentSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="KnowledgebaseSettings.Enabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="KnowledgebaseSettings.Enabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="KnowledgebaseSettings.Enabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="KnowledgebaseSettings.AllowNotRegisteredUsersToLeaveComments" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="KnowledgebaseSettings.AllowNotRegisteredUsersToLeaveComments"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="KnowledgebaseSettings.AllowNotRegisteredUsersToLeaveComments"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="KnowledgebaseSettings.NotifyAboutNewArticleComments" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="KnowledgebaseSettings.NotifyAboutNewArticleComments"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="KnowledgebaseSettings.NotifyAboutNewArticleComments"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabNewsSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabNewsSettings.cshtml
new file mode 100644
index 000000000..1defad5c8
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Content.TabNewsSettings.cshtml
@@ -0,0 +1,72 @@
+@model ContentSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsSettings.Enabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NewsSettings.Enabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NewsSettings.Enabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsSettings.AllowNotRegisteredUsersToLeaveComments" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NewsSettings.AllowNotRegisteredUsersToLeaveComments"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NewsSettings.AllowNotRegisteredUsersToLeaveComments"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsSettings.NotifyAboutNewNewsComments" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NewsSettings.NotifyAboutNewNewsComments"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NewsSettings.NotifyAboutNewNewsComments"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsSettings.ShowNewsOnMainPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="NewsSettings.ShowNewsOnMainPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="NewsSettings.ShowNewsOnMainPage"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsSettings.MainPageNewsCount" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="NewsSettings.MainPageNewsCount"/>
+ <span asp-validation-for="NewsSettings.MainPageNewsCount"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="NewsSettings.NewsArchivePageSize" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="NewsSettings.NewsArchivePageSize"/>
+ <span asp-validation-for="NewsSettings.NewsArchivePageSize"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml
new file mode 100644
index 000000000..45ae666d7
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnAction.cshtml
@@ -0,0 +1,43 @@
+@using Microsoft.AspNetCore.Mvc.Razor
+@model MerchandiseReturnActionModel
+
+<div asp-validation-summary="All"></div>
+<input asp-for="Id" type="hidden"/>
+
+@{
+ Func<int, HelperResult>
+ template = @<div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="@Model.Locales[item].Name"/>
+ <span asp-validation-for="@Model.Locales[item].Name"></span>
+ </div>
+ </div>
+ <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>
+ </div>;
+}
+
+<div class="form-horizontal">
+ <localized-editor localized-template="@template" name="merchandisereturnaction-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Name"/>
+ <span asp-validation-for="Name"></span>
+ </div>
+ </div>
+ </div>
+ </localized-editor>
+
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="DisplayOrder"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="DisplayOrder"/>
+ <span asp-validation-for="DisplayOrder"></span>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml
new file mode 100644
index 000000000..df85b8780
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/CreateOrUpdate.MerchandiseReturnReason.cshtml
@@ -0,0 +1,43 @@
+@using Microsoft.AspNetCore.Mvc.Razor
+@model MerchandiseReturnReasonModel
+
+<div asp-validation-summary="All"></div>
+<input asp-for="Id" type="hidden"/>
+
+@{
+ Func<int, HelperResult>
+ template = @<div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="@Model.Locales[item].Name"/>
+ <span asp-validation-for="@Model.Locales[item].Name"></span>
+ </div>
+ </div>
+ <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>
+ </div>;
+}
+
+<div class="form-horizontal">
+ <localized-editor localized-template="@template" name="merchandisereturnreason-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Name"/>
+ <span asp-validation-for="Name"></span>
+ </div>
+ </div>
+ </div>
+ </localized-editor>
+
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="DisplayOrder"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="DisplayOrder"/>
+ <span asp-validation-for="DisplayOrder"></span>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabAddressFormFields.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabAddressFormFields.cshtml
new file mode 100644
index 000000000..885fd3465
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabAddressFormFields.cshtml
@@ -0,0 +1,356 @@
+@model CustomerSettingsModel
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.AddressSettings.CountryEnabled)").click(toggleAddressCountryFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.CompanyEnabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.VatNumberEnabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.StreetAddressEnabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.StreetAddress2Enabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.ZipPostalCodeEnabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.CityEnabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.PhoneEnabled)").click(toggleAddressRequiredFormField);
+ $("#@Html.IdFor(model => model.AddressSettings.FaxEnabled)").click(toggleAddressRequiredFormField);
+
+ toggleAddressCountryFormField();
+ toggleAddressRequiredFormField();
+ });
+
+ function toggleAddressCountryFormField() {
+ if ($('#@Html.IdFor(model => model.AddressSettings.CountryEnabled)').is(':checked')) {
+ $('#pnlAddressStateProvinceEnabled').show();
+ }
+ else {
+ $('#pnlAddressStateProvinceEnabled').hide();
+ }
+ }
+
+ function toggleAddressRequiredFormField() {
+ if ($('#@Html.IdFor(model => model.AddressSettings.CompanyEnabled)').is(':checked')) {
+ $('#pnlAddressCompanyRequired').show();
+ }
+ else {
+ $('#pnlAddressCompanyRequired').hide();
+ }
+ if ($('#@Html.IdFor(model => model.AddressSettings.VatNumberEnabled)').is(':checked')) {
+ $('#pnlAddressVatNumberRequired').show();
+ }
+ else {
+ $('#pnlAddressVatNumberRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.AddressSettings.StreetAddressEnabled)').is(':checked')) {
+ $('#pnlAddressStreetAddressRequired').show();
+ }
+ else {
+ $('#pnlAddressStreetAddressRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.AddressSettings.StreetAddress2Enabled)').is(':checked')) {
+ $('#pnlAddressStreetAddress2Required').show();
+ }
+ else {
+ $('#pnlAddressStreetAddress2Required').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.AddressSettings.ZipPostalCodeEnabled)').is(':checked')) {
+ $('#pnlAddressZipPostalCodeRequired').show();
+ }
+ else {
+ $('#pnlAddressZipPostalCodeRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.AddressSettings.CityEnabled)').is(':checked')) {
+ $('#pnlAddressCityRequired').show();
+ }
+ else {
+ $('#pnlAddressCityRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.AddressSettings.PhoneEnabled)').is(':checked')) {
+ $('#pnlAddressPhoneRequired').show();
+ }
+ else {
+ $('#pnlAddressPhoneRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.AddressSettings.FaxEnabled)').is(':checked')) {
+ $('#pnlAddressFaxRequired').show();
+ }
+ else {
+ $('#pnlAddressFaxRequired').hide();
+ }
+ }
+</script>
+<div class="form-horizontal">
+<div class="form-body">
+<div class="form-group">
+ <div class="note note-info">
+ @Loc["Admin.Settings.Customer.AddressFormFields.Description"]
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.NameEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.NameEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.NameEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.AddressTypeEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.AddressTypeEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.AddressTypeEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.CompanyEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.CompanyEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.CompanyEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressCompanyRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.CompanyRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.CompanyRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.CompanyRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.VatNumberEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.VatNumberEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.VatNumberEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressVatNumberRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.VatNumberRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.VatNumberRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.VatNumberRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.StreetAddressEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.StreetAddressEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.StreetAddressEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressStreetAddressRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.StreetAddressRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.StreetAddressRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.StreetAddressRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.StreetAddress2Enabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.StreetAddress2Enabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.StreetAddress2Enabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressStreetAddress2Required">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.StreetAddress2Required" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.StreetAddress2Required"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.StreetAddress2Required"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.ZipPostalCodeEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.ZipPostalCodeEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.ZipPostalCodeEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressZipPostalCodeRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.ZipPostalCodeRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.ZipPostalCodeRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.ZipPostalCodeRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.CityEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.CityEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.CityEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressCityRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.CityRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.CityRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.CityRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.CountryEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.CountryEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.CountryEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressStateProvinceEnabled">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.StateProvinceEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.StateProvinceEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.StateProvinceEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.PhoneEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.PhoneEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.PhoneEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressPhoneRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.PhoneRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.PhoneRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.PhoneRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.FaxEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.FaxEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.FaxEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlAddressFaxRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.FaxRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.FaxRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.FaxRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.NoteEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.NoteEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.NoteEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="AddressSettings.DisallowUsersToChangeEmail" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="AddressSettings.DisallowUsersToChangeEmail"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="AddressSettings.DisallowUsersToChangeEmail"></span>
+ </div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerFormFields.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerFormFields.cshtml
new file mode 100644
index 000000000..721872c51
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerFormFields.cshtml
@@ -0,0 +1,438 @@
+@model CustomerSettingsModel
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.CustomerSettings.DateOfBirthEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.DateOfBirthRequired)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.CountryEnabled)").click(toggleCustomerCountryFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.StateProvinceEnabled)").click(toggleCustomerStateProvinceFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.CompanyEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.StreetAddressEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.StreetAddress2Enabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.ZipPostalCodeEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.CityEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.PhoneEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.FaxEnabled)").click(toggleCustomerRequiredFormField);
+ $("#@Html.IdFor(model => model.CustomerSettings.NewsletterEnabled)").click(toggleNewsletterEnabledField);
+ $("#@Html.IdFor(model => model.CustomerSettings.HideNewsletterBlock)").click(toggleHideNewsletterBlock);
+
+ toggleCustomerCountryFormField();
+ toggleCustomerStateProvinceFormField();
+ toggleCustomerRequiredFormField();
+ toggleNewsletterEnabledField();
+ toggleHideNewsletterBlock();
+ });
+
+ function toggleCustomerCountryFormField() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.CountryEnabled)').is(':checked')) {
+ $('#pnlCustomerCountryRequired').show();
+ $('#pnlCustomerStateProvinceEnabled').show();
+ toggleCustomerStateProvinceFormField();
+ } else {
+ $('#pnlCustomerCountryRequired').hide();
+ $('#pnlCustomerStateProvinceEnabled').hide();
+ toggleCustomerStateProvinceFormField();
+ }
+ }
+
+ function toggleCustomerStateProvinceFormField() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.CountryEnabled)').is(':checked') &&
+ $('#@Html.IdFor(model => model.CustomerSettings.StateProvinceEnabled)').is(':checked')) {
+ $('#pnlCustomerStateProvinceRequired').show();
+ } else {
+ $('#pnlCustomerStateProvinceRequired').hide();
+ }
+ }
+
+ function toggleCustomerRequiredFormField() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.DateOfBirthEnabled)').is(':checked')) {
+ $('#pnlCustomerDateOfBirthRequired').show();
+ } else {
+ $('#pnlCustomerDateOfBirthRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.DateOfBirthEnabled)').is(':checked') &&
+ $('#@Html.IdFor(model => model.CustomerSettings.DateOfBirthRequired)').is(':checked')) {
+ $('#pnlDateOfBirthMinimumAge').show();
+ } else {
+ $('#pnlDateOfBirthMinimumAge').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.CompanyEnabled)').is(':checked')) {
+ $('#pnlCustomerCompanyRequired').show();
+ } else {
+ $('#pnlCustomerCompanyRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.StreetAddressEnabled)').is(':checked')) {
+ $('#pnlCustomerStreetAddressRequired').show();
+ } else {
+ $('#pnlCustomerStreetAddressRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.StreetAddress2Enabled)').is(':checked')) {
+ $('#pnlCustomerStreetAddress2Required').show();
+ } else {
+ $('#pnlCustomerStreetAddress2Required').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.ZipPostalCodeEnabled)').is(':checked')) {
+ $('#pnlCustomerZipPostalCodeRequired').show();
+ } else {
+ $('#pnlCustomerZipPostalCodeRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.CityEnabled)').is(':checked')) {
+ $('#pnlCustomerCityRequired').show();
+ } else {
+ $('#pnlCustomerCityRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.PhoneEnabled)').is(':checked')) {
+ $('#pnlCustomerPhoneRequired').show();
+ } else {
+ $('#pnlCustomerPhoneRequired').hide();
+ }
+
+ if ($('#@Html.IdFor(model => model.CustomerSettings.FaxEnabled)').is(':checked')) {
+ $('#pnlCustomerFaxRequired').show();
+ } else {
+ $('#pnlCustomerFaxRequired').hide();
+ }
+ }
+
+ function toggleNewsletterEnabledField() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.NewsletterEnabled)').is(':checked')) {
+ $('#pnlCustomerNewsletterTickedByDefault').show();
+ } else {
+ $('#pnlCustomerNewsletterTickedByDefault').hide();
+ }
+ }
+
+ function toggleHideNewsletterBlock() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.HideNewsletterBlock)').is(':checked')) {
+ $('#pnlNewsletterBlockAllowToUnsubscribe').hide();
+ }
+ else {
+ $('#pnlNewsletterBlockAllowToUnsubscribe').show();
+ }
+ }
+
+</script>
+<div class="form-horizontal">
+<div class="form-body">
+<div class="form-group">
+ <div class="note note-info">
+ @Loc["Admin.Settings.Customer.CustomerFormFields.Description"]
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.FirstLastNameRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.FirstLastNameRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.FirstLastNameRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.GenderEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.GenderEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.GenderEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.DateOfBirthEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.DateOfBirthEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.DateOfBirthEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerDateOfBirthRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.DateOfBirthRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.DateOfBirthRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.DateOfBirthRequired"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlDateOfBirthMinimumAge">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.DateOfBirthMinimumAge" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.DateOfBirthMinimumAge"/>
+ <span asp-validation-for="CustomerSettings.DateOfBirthMinimumAge"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.CompanyEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CompanyEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CompanyEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerCompanyRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.CompanyRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CompanyRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CompanyRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.StreetAddressEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StreetAddressEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StreetAddressEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerStreetAddressRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.StreetAddressRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StreetAddressRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StreetAddressRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.StreetAddress2Enabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StreetAddress2Enabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StreetAddress2Enabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerStreetAddress2Required">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.StreetAddress2Required" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StreetAddress2Required"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StreetAddress2Required"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.ZipPostalCodeEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.ZipPostalCodeEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.ZipPostalCodeEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerZipPostalCodeRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.ZipPostalCodeRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.ZipPostalCodeRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.ZipPostalCodeRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.CityEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CityEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CityEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerCityRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.CityRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CityRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CityRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.CountryEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CountryEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CountryEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerCountryRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.CountryRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CountryRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CountryRequired"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerStateProvinceEnabled">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.StateProvinceEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StateProvinceEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StateProvinceEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerStateProvinceRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.StateProvinceRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StateProvinceRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StateProvinceRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.PhoneEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.PhoneEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.PhoneEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerPhoneRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.PhoneRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.PhoneRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.PhoneRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.FaxEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.FaxEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.FaxEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerFaxRequired">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.FaxRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.FaxRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.FaxRequired"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.AcceptPrivacyPolicyEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.AcceptPrivacyPolicyEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.AcceptPrivacyPolicyEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.NewsletterEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.NewsletterEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.NewsletterEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="pnlCustomerNewsletterTickedByDefault">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.NewsletterTickedByDefault" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.NewsletterTickedByDefault"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.NewsletterTickedByDefault"></span>
+ </div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtml
new file mode 100644
index 000000000..1d6321c51
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtml
@@ -0,0 +1,145 @@
+@using Grand.Domain.Customers
+@model CustomerSettingsModel
+
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.CustomerSettings.TwoFactorAuthenticationEnabled)").click(toggleTwoFactor);
+ toggleTwoFactor();
+ });
+
+ function toggleTwoFactor() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.TwoFactorAuthenticationEnabled)').is(':checked')) {
+ $('#twofactortype').show();
+ }
+ else {
+ $('#twofactortype').hide();
+ }
+ }
+</script>
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.TwoFactorAuthenticationEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.TwoFactorAuthenticationEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.TwoFactorAuthenticationEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group" id="twofactortype">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.TwoFactorAuthenticationType" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="CustomerSettings.TwoFactorAuthenticationType" asp-items="EnumTranslationService.ToSelectList((TwoFactorAuthenticationType)Model.CustomerSettings.TwoFactorAuthenticationType)"/>
+ <span asp-validation-for="CustomerSettings.TwoFactorAuthenticationType"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.DefaultPasswordFormat" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="CustomerSettings.DefaultPasswordFormat" asp-items="EnumTranslationService.ToSelectList((PasswordFormat)Model.CustomerSettings.DefaultPasswordFormat)"/>
+ <span asp-validation-for="CustomerSettings.DefaultPasswordFormat"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.HashedPasswordFormat" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="CustomerSettings.HashedPasswordFormat" asp-items="EnumTranslationService.ToSelectList(Model.CustomerSettings.HashedPasswordFormat)"/>
+ <span asp-validation-for="CustomerSettings.HashedPasswordFormat"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.PasswordRegularExpression" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.PasswordRegularExpression"/>
+ <span asp-validation-for="CustomerSettings.PasswordRegularExpression"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="note note-info">
+ You can use this regex: <br>
+ ^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@@$%^&*-]).{8,}$<br>
+ This regex will enforce these rules:<br>
+ • At least one upper case english letter<br>
+ • At least one lower case english letter<br>
+ • At least one digit<br>
+ • At least one special character<br>
+ • Minimum 8 in length
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.PasswordLifetime" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.PasswordLifetime"/>
+ <span asp-validation-for="CustomerSettings.PasswordLifetime"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.UnduplicatedPasswordsNumber" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.UnduplicatedPasswordsNumber"/>
+ <span asp-validation-for="CustomerSettings.UnduplicatedPasswordsNumber"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.PasswordRecoveryLinkDaysValid" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.PasswordRecoveryLinkDaysValid"/>
+ <span asp-validation-for="CustomerSettings.PasswordRecoveryLinkDaysValid"></span>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.FailedPasswordAllowedAttempts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.FailedPasswordAllowedAttempts"/>
+ <span asp-validation-for="CustomerSettings.FailedPasswordAllowedAttempts"></span>
+ <script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.CustomerSettings.FailedPasswordAllowedAttempts)").blur(toggleFailedPasswordAllowedAttempts);
+ toggleFailedPasswordAllowedAttempts();
+ });
+
+ function toggleFailedPasswordAllowedAttempts() {
+ var failedPasswordAllowedAttempts = $("#@Html.IdFor(model => model.CustomerSettings.FailedPasswordAllowedAttempts)").data("kendoNumericTextBox");
+ if (failedPasswordAllowedAttempts.value($("#value").val()) > 0) {
+ $('#pnlFailedPasswordLockoutMinutes').show();
+ } else {
+ $('#pnlFailedPasswordLockoutMinutes').hide();
+ }
+ }
+ </script>
+ </div>
+ </div>
+ <div class="form-group" id="pnlFailedPasswordLockoutMinutes">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CustomerSettings.FailedPasswordLockoutMinutes" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="CustomerSettings.FailedPasswordLockoutMinutes"/>
+ <span asp-validation-for="CustomerSettings.FailedPasswordLockoutMinutes"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerSettings.cshtml
new file mode 100644
index 000000000..6bd6facfa
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Customer.TabCustomerSettings.cshtml
@@ -0,0 +1,304 @@
+@using Grand.Domain.Customers
+@model CustomerSettingsModel
+
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.CustomerSettings.UsernamesEnabled)").click(toggleUsername);
+ toggleUsername();
+ });
+
+ function toggleUsername() {
+ if ($('#@Html.IdFor(model => model.CustomerSettings.UsernamesEnabled)').is(':checked')) {
+ $('#pnlAllowUsersToChangeUsernames').show();
+ $('#pnlCheckUsernameAvailability').show();
+ }
+ else {
+ $('#pnlAllowUsersToChangeUsernames').hide();
+ $('#pnlCheckUsernameAvailability').hide();
+ }
+ }
+</script>
+<div class="form-horizontal">
+<div class="form-body">
+<div class="col-6">
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.UserRegistrationType" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-select asp-for="CustomerSettings.UserRegistrationType" asp-items="EnumTranslationService.ToSelectList((UserRegistrationType)Model.CustomerSettings.UserRegistrationType)"/>
+ <span asp-validation-for="CustomerSettings.UserRegistrationType"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.GeoEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.GeoEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.GeoEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.NotifyNewCustomerRegistration" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.NotifyNewCustomerRegistration"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.NotifyNewCustomerRegistration"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideDownloadableProductsTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideDownloadableProductsTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideDownloadableProductsTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideOutOfStockSubscriptionsTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideOutOfStockSubscriptionsTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideOutOfStockSubscriptionsTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideAuctionsTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideAuctionsTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideAuctionsTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideNotesTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideNotesTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideNotesTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideReviewsTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideReviewsTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideReviewsTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideCoursesTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideCoursesTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideCoursesTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideSubaccountsTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideSubaccountsTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideSubaccountsTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideDocumentsTab" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideDocumentsTab"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideDocumentsTab"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.HideNewsletterBlock" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.HideNewsletterBlock"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.HideNewsletterBlock"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlNewsletterBlockAllowToUnsubscribe">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.NewsletterBlockAllowToUnsubscribe" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.NewsletterBlockAllowToUnsubscribe"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.NewsletterBlockAllowToUnsubscribe"></span>
+ </div>
+ </div>
+</div>
+<div class="col-6">
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.AllowUsersToChangeEmail" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.AllowUsersToChangeEmail"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.AllowUsersToChangeEmail"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.AllowUsersToDeleteAccount" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.AllowUsersToDeleteAccount"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.AllowUsersToDeleteAccount"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.AllowUsersToExportData" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.AllowUsersToExportData"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.AllowUsersToExportData"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.CustomerNameFormat" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-select asp-for="CustomerSettings.CustomerNameFormat" asp-items="EnumTranslationService.ToSelectList((CustomerNameFormat)Model.CustomerSettings.CustomerNameFormat)"/>
+ <span asp-validation-for="CustomerSettings.CustomerNameFormat"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.UsernamesEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.UsernamesEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.UsernamesEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlAllowUsersToChangeUsernames">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.AllowUsersToChangeUsernames" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.AllowUsersToChangeUsernames"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.AllowUsersToChangeUsernames"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlCheckUsernameAvailability">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.CheckUsernameAvailabilityEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.CheckUsernameAvailabilityEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.CheckUsernameAvailabilityEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.RegistrationFreeShipping" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.RegistrationFreeShipping"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.RegistrationFreeShipping"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.StoreLastVisitedPage" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CustomerSettings.StoreLastVisitedPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CustomerSettings.StoreLastVisitedPage"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.OnlineShoppingCartMinutes" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="CustomerSettings.OnlineShoppingCartMinutes"/>
+ <span asp-validation-for="CustomerSettings.OnlineShoppingCartMinutes"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="CustomerSettings.OnlineCustomerMinutes" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="CustomerSettings.OnlineCustomerMinutes"/>
+ <span asp-validation-for="CustomerSettings.OnlineCustomerMinutes"></span>
+ </div>
+ </div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabMenuSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabMenuSettings.cshtml
new file mode 100644
index 000000000..60ebca75d
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabMenuSettings.cshtml
@@ -0,0 +1,78 @@
+@model GeneralCommonSettingsModel
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DisplayMenuSettings.DisplayHomePageMenu" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayMenuSettings.DisplayHomePageMenu"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayMenuSettings.DisplayHomePageMenu"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DisplayMenuSettings.DisplayNewProductsMenu" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayMenuSettings.DisplayNewProductsMenu"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayMenuSettings.DisplayNewProductsMenu"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DisplayMenuSettings.DisplaySearchMenu" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayMenuSettings.DisplaySearchMenu"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayMenuSettings.DisplaySearchMenu"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DisplayMenuSettings.DisplayCustomerMenu" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayMenuSettings.DisplayCustomerMenu"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayMenuSettings.DisplayCustomerMenu"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DisplayMenuSettings.DisplayBlogMenu" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayMenuSettings.DisplayBlogMenu"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayMenuSettings.DisplayBlogMenu"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DisplayMenuSettings.DisplayContactUsMenu" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="DisplayMenuSettings.DisplayContactUsMenu"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="DisplayMenuSettings.DisplayContactUsMenu"></span>
+ </div>
+ </div>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabPdfSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabPdfSettings.cshtml
new file mode 100644
index 000000000..62c1abf61
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabPdfSettings.cshtml
@@ -0,0 +1,45 @@
+@model GeneralCommonSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="PdfSettings.LogoPictureId" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8" id="pdf-logo-picture">
+ <admin-input asp-for="PdfSettings.LogoPictureId"/>
+ <span asp-validation-for="PdfSettings.LogoPictureId"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="PdfSettings.DisablePdfInvoicesForPendingOrders" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="PdfSettings.DisablePdfInvoicesForPendingOrders"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="PdfSettings.DisablePdfInvoicesForPendingOrders"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="PdfSettings.InvoiceHeaderText" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-textarea asp-for="PdfSettings.InvoiceHeaderText"></admin-textarea>
+ <span asp-validation-for="PdfSettings.InvoiceHeaderText"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="PdfSettings.InvoiceFooterText" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-textarea asp-for="PdfSettings.InvoiceFooterText"></admin-textarea>
+ <span asp-validation-for="PdfSettings.InvoiceFooterText"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabSEOSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabSEOSettings.cshtml
new file mode 100644
index 000000000..3999d88ff
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabSEOSettings.cshtml
@@ -0,0 +1,187 @@
+@model GeneralCommonSettingsModel
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.SeoSettings.ConvertNonWesternChars)").click(toggleSeoCharField);
+
+ toggleSeoCharField();
+ });
+
+ function toggleSeoCharField() {
+ if ($('#@Html.IdFor(model => model.SeoSettings.ConvertNonWesternChars)').is(':checked')) {
+ $('#SeoCharConversion').show();
+ }
+ else {
+ $('#SeoCharConversion').hide();
+ }
+ }
+ </script>
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.CustomHeadTags" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.CustomHeadTags"/>
+ <span asp-validation-for="SeoSettings.CustomHeadTags"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.PageTitleSeparator" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.PageTitleSeparator"/>
+ <span asp-validation-for="SeoSettings.PageTitleSeparator"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.PageTitleSeoAdjustment" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.PageTitleSeoAdjustment"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.PageTitleSeoAdjustment"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.DefaultTitle" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.DefaultTitle"/>
+ <span asp-validation-for="SeoSettings.DefaultTitle"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.DefaultMetaKeywords" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.DefaultMetaKeywords"/>
+ <span asp-validation-for="SeoSettings.DefaultMetaKeywords"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.DefaultMetaDescription" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.DefaultMetaDescription"/>
+ <span asp-validation-for="SeoSettings.DefaultMetaDescription"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.GenerateProductMetaDescription" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.GenerateProductMetaDescription"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.GenerateProductMetaDescription"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.ConvertNonWesternChars" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.ConvertNonWesternChars"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.ConvertNonWesternChars"></span>
+ </div>
+ </div>
+ <div class="form-group" id="SeoCharConversion">
+ <div class="note note-warning">
+ <span>@Loc["Admin.Settings.GeneralCommon.SeoCharConversion.Note"]</span>
+ </div>
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.SeoCharConversion" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.SeoCharConversion"/>
+ <span asp-validation-for="SeoSettings.SeoCharConversion"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.AllowSlashChar" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.AllowSlashChar"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.AllowSlashChar"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.AllowUnicodeCharsInUrls" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.AllowUnicodeCharsInUrls"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.AllowUnicodeCharsInUrls"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.CanonicalUrlsEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.CanonicalUrlsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.CanonicalUrlsEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.TwitterMetaTags" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.TwitterMetaTags"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.TwitterMetaTags"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.OpenGraphMetaTags" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SeoSettings.OpenGraphMetaTags"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SeoSettings.OpenGraphMetaTags"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ @{
+ ViewData["Reference"] = "Settings";
+ ViewData["ObjectId"] = "SeoSettings.StorePicture";
+ }
+ <div class="col-xs-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SeoSettings.StorePictureId" class="control-label"/>
+ </div>
+ <div class="col-xs-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SeoSettings.StorePictureId"/>
+ <span asp-validation-for="SeoSettings.StorePictureId"></span>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabSecuritySettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabSecuritySettings.cshtml
new file mode 100644
index 000000000..c29b4d31e
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabSecuritySettings.cshtml
@@ -0,0 +1,287 @@
+@model GeneralCommonSettingsModel
+
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.SecuritySettings.CaptchaEnabled)").click(toggleReCaptcha);
+ toggleReCaptcha();
+ });
+
+ function toggleReCaptcha() {
+ if ($('#@Html.IdFor(model => model.SecuritySettings.CaptchaEnabled)').is(':checked')) {
+ $('#ssCaptchaShowOnLoginPagepnl').show();
+ $('#ssCaptchaShowOnRegistrationPagepnl').show();
+ $('#ssCaptchaShowOnPasswordRecoverPagepnl').show();
+ $('#ssCaptchaShowOnContactUsPagepnl').show();
+ $('#ssCaptchaShowOnEmailWishlistToFriendPagepnl').show();
+ $('#ssCaptchaShowOnEmailProductToFriendPagepnl').show();
+ $('#ssCaptchaShowOnAskQuestionPagepnl').show();
+ $('#ssCaptchaShowOnBlogCommentPagepnl').show();
+ $('#ssCaptchaShowOnArticleCommentPagepnl').show();
+ $('#ssCaptchaShowOnNewsCommentPagepnl').show();
+ $('#ssCaptchaShowOnProductReviewPagepnl').show();
+ $('#ssReCaptchaPublicKeypnl').show();
+ $('#ssCaptchaShowOnApplyVendorPagepnl').show();
+ $('#ssReCaptchaPrivateKeypnl').show();
+ $('#ssReCaptchaVersionpnl').show();
+ $('#ssCaptchaShowOnVendorReviewPagepnl').show();
+ $('#ssReCaptchaScorepnl').show();
+ $('#ssReCaptchaThemepnl').show();
+ }
+ else {
+ $('#ssCaptchaShowOnLoginPagepnl').hide();
+ $('#ssCaptchaShowOnRegistrationPagepnl').hide();
+ $('#ssCaptchaShowOnPasswordRecoverPagepnl').hide();
+ $('#ssCaptchaShowOnContactUsPagepnl').hide();
+ $('#ssCaptchaShowOnEmailWishlistToFriendPagepnl').hide();
+ $('#ssCaptchaShowOnEmailProductToFriendPagepnl').hide();
+ $('#ssCaptchaShowOnAskQuestionPagepnl').hide();
+ $('#ssCaptchaShowOnBlogCommentPagepnl').hide();
+ $('#ssCaptchaShowOnArticleCommentPagepnl').hide();
+ $('#ssCaptchaShowOnNewsCommentPagepnl').hide();
+ $('#ssCaptchaShowOnProductReviewPagepnl').hide();
+ $('#ssReCaptchaPublicKeypnl').hide();
+ $('#ssCaptchaShowOnApplyVendorPagepnl').hide();
+ $('#ssReCaptchaPrivateKeypnl').hide();
+ $('#ssReCaptchaVersionpnl').hide();
+ $('#ssCaptchaShowOnVendorReviewPagepnl').hide();
+ $('#ssReCaptchaScorepnl').hide();
+ $('#ssReCaptchaThemepnl').hide();
+ }
+ }
+</script>
+<div class="form-horizontal">
+<div class="form-body">
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.AdminAreaAllowedIpAddresses" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SecuritySettings.AdminAreaAllowedIpAddresses"/>
+ <span asp-validation-for="SecuritySettings.AdminAreaAllowedIpAddresses"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="note note-info">
+ A CAPTCHA is a program that can tell whether its user is a human or a computer.
+ You've probably seen them — colorful images with distorted text at the bottom of
+ Web registration forms. CAPTCHAs are used by many websites to prevent abuse from
+ "bots," or automated programs usually written to generate spam. No computer program
+ can read distorted text as well as humans can, so bots cannot navigate sites protected
+ by CAPTCHAs. <a href="http://www.google.com/recaptcha" target="_blank">reCAPTCHA</a>.
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaEnabled"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnLoginPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnLoginPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnLoginPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnLoginPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnRegistrationPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnRegistrationPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnRegistrationPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnRegistrationPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnPasswordRecoverPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnPasswordRecoveryPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnPasswordRecoveryPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnPasswordRecoveryPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnContactUsPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnContactUsPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnContactUsPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnContactUsPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnEmailWishlistToFriendPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnEmailWishlistToFriendPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnEmailWishlistToFriendPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnEmailWishlistToFriendPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnEmailProductToFriendPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnEmailProductToFriendPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnEmailProductToFriendPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnEmailProductToFriendPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnAskQuestionPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnAskQuestionPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnAskQuestionPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnAskQuestionPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnBlogCommentPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnBlogCommentPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnBlogCommentPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnBlogCommentPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnArticleCommentPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnArticleCommentPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnArticleCommentPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnArticleCommentPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnNewsCommentPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnNewsCommentPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnNewsCommentPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnNewsCommentPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnProductReviewPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnProductReviewPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnProductReviewPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnProductReviewPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnApplyVendorPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnApplyVendorPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnApplyVendorPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnApplyVendorPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssCaptchaShowOnVendorReviewPagepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.CaptchaShowOnVendorReviewPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="SecuritySettings.CaptchaShowOnVendorReviewPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="SecuritySettings.CaptchaShowOnVendorReviewPage"></span>
+ </div>
+</div>
+<div class="form-group" id="ssReCaptchaVersionpnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.ReCaptchaVersion" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="SecuritySettings.ReCaptchaVersion" asp-items="Model.SecuritySettings.AvailableReCaptchaVersions"/>
+ <span asp-validation-for="SecuritySettings.ReCaptchaVersion"></span>
+ </div>
+</div>
+<div class="form-group" id="ssReCaptchaPublicKeypnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.ReCaptchaPublicKey" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SecuritySettings.ReCaptchaPublicKey"/>
+ <span asp-validation-for="SecuritySettings.ReCaptchaPublicKey"></span>
+ </div>
+</div>
+<div class="form-group" id="ssReCaptchaPrivateKeypnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.ReCaptchaPrivateKey" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SecuritySettings.ReCaptchaPrivateKey"/>
+ <span asp-validation-for="SecuritySettings.ReCaptchaPrivateKey"></span>
+ </div>
+</div>
+<div class="form-group" id="ssReCaptchaScorepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.ReCaptchaScore" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SecuritySettings.ReCaptchaScore"/>
+ <span asp-validation-for="SecuritySettings.ReCaptchaScore"></span>
+ </div>
+</div>
+<div class="form-group" id="ssReCaptchaThemepnl">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="SecuritySettings.ReCaptchaTheme" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="SecuritySettings.ReCaptchaTheme"/>
+ <span asp-validation-for="SecuritySettings.ReCaptchaTheme"></span>
+ </div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml
new file mode 100644
index 000000000..bee83c203
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml
@@ -0,0 +1,341 @@
+@model GeneralCommonSettingsModel
+
+<script>
+ $(document).ready(function () {
+ $("#@Html.IdFor(model => model.StoreInformationSettings.DisplayCookieInformation)").click(togglePreferenceField);
+
+ togglePreferenceField();
+ });
+
+ function togglePreferenceField() {
+ if ($('#@Html.IdFor(model => model.StoreInformationSettings.DisplayCookieInformation)').is(':checked')) {
+ $('#DisplayPrivacyPreference').show();
+ }
+ else {
+ $('#DisplayPrivacyPreference').hide();
+ }
+ }
+</script>
+
+<div class="form-horizontal">
+<div class="form-body">
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="DateTimeSettings.DefaultStoreTimeZoneId" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="DateTimeSettings.DefaultStoreTimeZoneId" asp-items="Model.DateTimeSettings.AvailableTimeZones"/>
+ <span asp-validation-for="DateTimeSettings.DefaultStoreTimeZoneId"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.StoreClosed" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="StoreInformationSettings.StoreClosed"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="StoreInformationSettings.StoreClosed"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.DefaultStoreTheme" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <div class="row">
+ <ul class="clearer" style="list-style: none;" id="theme-selection-block">
+ @foreach (var theme in Model.StoreInformationSettings.AvailableStoreThemes)
+ {
+ <li style="float: left; width: 210px;">
+ <p style="float: left; padding-top: 55px;">
+ <input type="radio" name="@Html.NameFor(x => x.StoreInformationSettings.DefaultStoreTheme)" value="@theme.ThemeName" id="[email protected]"
+ @if (theme.ThemeName == Model.StoreInformationSettings.DefaultStoreTheme)
+ {
+ <text> checked="checked" </text>
+ }>
+ </p>
+ <p style="float: left;">
+ <label for="[email protected]">
+ <img src="@Url.Content(theme.PreviewImageUrl)" alt="@theme.PreviewText" title="@theme.PreviewText" width="175">
+ <br/>
+ <label style="text-align:center;font-weight:bold;width:170px;">@theme.ThemeTitle</label>
+ </label>
+ </p>
+ </li>
+ }
+ </ul>
+ </div>
+ <span asp-validation-for="StoreInformationSettings.DefaultStoreTheme"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <label class="control-label">
+ @Loc["Admin.Settings.GeneralCommon.PremiumThemes"]
+ <i class="help icon-question" data-container="body" data-placement="top" data-toggle="tooltip" title="" data-original-title="You can download themes from the extensions page at www.grandnode.com."></i>
+ </label>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8" id="premium_themes">
+ <script>
+ $.getJSON("https://grandnode.com/themes.json", function (data) {
+ var items = [];
+ $.each(data, function (key, value) {
+ items.push("<li id='theme-" + key + "'><a href='" + value.Url + "' target='_blank' ><img src='" + value.PictureUrl + "' /><span>" + value.Name + "<span></a></li>");
+ });
+
+ $("<ul/>", {
+ "class": "premium-list",
+ html: items.join("")
+ }).appendTo("#premium_themes");
+ });
+ </script>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.AllowCustomerToSelectTheme" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="StoreInformationSettings.AllowCustomerToSelectTheme"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="StoreInformationSettings.AllowCustomerToSelectTheme"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.AllowToSelectAdminTheme" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="StoreInformationSettings.AllowToSelectAdminTheme"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="StoreInformationSettings.AllowToSelectAdminTheme"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.LogoPictureId" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.LogoPictureId"/>
+ <span asp-validation-for="StoreInformationSettings.LogoPictureId"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.DisplayCookieInformation" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="StoreInformationSettings.DisplayCookieInformation"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="StoreInformationSettings.DisplayCookieInformation"></span>
+ </div>
+</div>
+<div class="form-group" id="DisplayPrivacyPreference">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.DisplayPrivacyPreference" class="control-label"/>
+ </div>
+ <div class="col-xs-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="StoreInformationSettings.DisplayPrivacyPreference"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="StoreInformationSettings.DisplayPrivacyPreference"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-xs-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.FacebookLink" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.FacebookLink"/>
+ <span asp-validation-for="StoreInformationSettings.FacebookLink"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.TwitterLink" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.TwitterLink"/>
+ <span asp-validation-for="StoreInformationSettings.TwitterLink"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.YoutubeLink" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.YoutubeLink"/>
+ <span asp-validation-for="StoreInformationSettings.YoutubeLink"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.InstagramLink" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.InstagramLink"/>
+ <span asp-validation-for="StoreInformationSettings.InstagramLink"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.LinkedInLink" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.LinkedInLink"/>
+ <span asp-validation-for="StoreInformationSettings.LinkedInLink"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.PinterestLink" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="StoreInformationSettings.PinterestLink"/>
+ <span asp-validation-for="StoreInformationSettings.PinterestLink"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="StoreInformationSettings.VoiceNavigation" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="StoreInformationSettings.VoiceNavigation"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="StoreInformationSettings.VoiceNavigation"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.StoreInDatabaseContactUsForm" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.StoreInDatabaseContactUsForm"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.StoreInDatabaseContactUsForm"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.SubjectFieldOnContactUsForm" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.SubjectFieldOnContactUsForm"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.SubjectFieldOnContactUsForm"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.UseSystemEmailForContactUsForm" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.UseSystemEmailForContactUsForm"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.UseSystemEmailForContactUsForm"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.AllowToSelectStore" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.AllowToSelectStore"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.AllowToSelectStore"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.PopupForTermsOfServiceLinks" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.PopupForTermsOfServiceLinks"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.PopupForTermsOfServiceLinks"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.SitemapEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.SitemapEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.SitemapEnabled"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.SitemapIncludeCategories" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.SitemapIncludeCategories"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.SitemapIncludeCategories"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.SitemapIncludeImage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.SitemapIncludeImage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.SitemapIncludeImage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.SitemapIncludeBrands" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.SitemapIncludeBrands"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.SitemapIncludeBrands"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="CommonSettings.SitemapIncludeProducts" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="CommonSettings.SitemapIncludeProducts"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="CommonSettings.SitemapIncludeProducts"></span>
+ </div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/MerchandiseReturnActions.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/MerchandiseReturnActions.cshtml
new file mode 100644
index 000000000..52b04d48a
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/MerchandiseReturnActions.cshtml
@@ -0,0 +1,65 @@
+<div class="panel panel-default">
+ <div class="note note-info">
+ <p>
+ <h4>@Loc["Admin.Settings.Order.MerchandiseReturnActions"]</h4>
+ </p>
+ </div>
+ <div class="panel-body">
+ <div id="merchandisereturnactions-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a href="@Url.Action("MerchandiseReturnActionCreate", new { area = Constants.AreaStore })" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Common.AddNew"]</a>
+ </div>
+</div>
+
+
+<script>
+$(document).ready(function () {
+ $("#merchandisereturnactions-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("MerchandiseReturnActionList", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ // Cancel the changes
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Name",
+ title: "@Loc["Admin.Settings.Order.MerchandiseReturnActions.Name"]",
+ width: 300,
+ template: '<a class="k-link" href="@Url.Action("MerchandiseReturnActionEdit", "Setting", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Name)#</a>',
+ }, {
+ field: "DisplayOrder",
+ title: "@Loc["Admin.Settings.Order.MerchandiseReturnActions.DisplayOrder"]",
+ width: 100
+ }]
+ });
+});
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/MerchandiseReturnReasons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/MerchandiseReturnReasons.cshtml
new file mode 100644
index 000000000..2ab85d502
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/MerchandiseReturnReasons.cshtml
@@ -0,0 +1,64 @@
+<div class="panel panel-default">
+ <div class="note note-info">
+ <p>
+ <h4>@Loc["Admin.Settings.Order.MerchandiseReturnReasons"]</h4>
+ </p>
+ </div>
+ <div class="panel-body">
+ <div id="merchandisereturnreasons-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a href="@Url.Action("MerchandiseReturnReasonCreate", new { area = Constants.AreaStore })" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Common.AddNew"]</a>
+ </div>
+</div>
+
+<script>
+$(document).ready(function () {
+ $("#merchandisereturnreasons-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("MerchandiseReturnReasonList", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ // Cancel the changes
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Name",
+ title: "@Loc["Admin.Settings.Order.MerchandiseReturnReasons.Name"]",
+ width: 300,
+ template: '<a class="k-link" href="@Url.Action("MerchandiseReturnReasonEdit", "Setting", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Name)#</a>',
+ }, {
+ field: "DisplayOrder",
+ title: "@Loc["Admin.Settings.Order.MerchandiseReturnReasons.DisplayOrder"]",
+ width: 100
+ }]
+ });
+});
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabLoyaltyPoints.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabLoyaltyPoints.cshtml
new file mode 100644
index 000000000..c71b24ede
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabLoyaltyPoints.cshtml
@@ -0,0 +1,120 @@
+@model SalesSettingsModel
+
+<vc:admin-widget widget-zone="loyalty_points_settings_top" additional-data="null"/>
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="note note-info">
+ @Loc["Admin.Settings.LoyaltyPoints.Description"]
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.Enabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="LoyaltyPointsSettings.Enabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="LoyaltyPointsSettings.Enabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.ExchangeRate" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ @Loc["Admin.Settings.LoyaltyPoints.ExchangeRate.Hint2"]
+ <admin-input asp-for="LoyaltyPointsSettings.ExchangeRate"/>
+ @Model.LoyaltyPointsSettings.PrimaryStoreCurrencyCode
+ <span asp-validation-for="LoyaltyPointsSettings.ExchangeRate"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.MinimumLoyaltyPointsToUse" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="LoyaltyPointsSettings.MinimumLoyaltyPointsToUse"/>
+ <span asp-validation-for="LoyaltyPointsSettings.MinimumLoyaltyPointsToUse"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="note note-info">
+ @Loc["Admin.Settings.LoyaltyPoints.Earning"]
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.PointsForRegistration" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="LoyaltyPointsSettings.PointsForRegistration"/>
+ <span asp-validation-for="LoyaltyPointsSettings.PointsForRegistration"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.PointsForPurchases_Amount" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ @Loc["Admin.Settings.LoyaltyPoints.Earning.Hint1"]
+ <admin-input asp-for="LoyaltyPointsSettings.PointsForPurchases_Amount"/>
+ @Model.LoyaltyPointsSettings.PrimaryStoreCurrencyCode
+ &nbsp;
+ @Loc["Admin.Settings.LoyaltyPoints.Earning.Hint2"]
+ <admin-input asp-for="LoyaltyPointsSettings.PointsForPurchases_Points"/>
+ @Loc["Admin.Settings.LoyaltyPoints.Earning.Hint3"]
+ <span asp-validation-for="LoyaltyPointsSettings.PointsForPurchases_Amount"></span>
+ <span asp-validation-for="LoyaltyPointsSettings.PointsForPurchases_Points"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.PointsForPurchases_Awarded" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="LoyaltyPointsSettings.PointsForPurchases_Awarded" asp-items="Model.LoyaltyPointsSettings.PointsForPurchases_Awarded_OrderStatuses"/>
+ <span asp-validation-for="LoyaltyPointsSettings.PointsForPurchases_Awarded"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.ReduceLoyaltyPointsAfterCancelOrder" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="LoyaltyPointsSettings.ReduceLoyaltyPointsAfterCancelOrder"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="LoyaltyPointsSettings.ReduceLoyaltyPointsAfterCancelOrder"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.DisplayHowMuchWillBeEarned" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="LoyaltyPointsSettings.DisplayHowMuchWillBeEarned"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="LoyaltyPointsSettings.DisplayHowMuchWillBeEarned"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="LoyaltyPointsSettings.PointsAccumulatedForAllStores" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="LoyaltyPointsSettings.PointsAccumulatedForAllStores"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="LoyaltyPointsSettings.PointsAccumulatedForAllStores"></span>
+ </div>
+ </div>
+ </div>
+</div>
+<vc:admin-widget widget-zone="loyalty_points_settings_bottom" additional-data="null"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabMerchandiseReturn.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabMerchandiseReturn.cshtml
new file mode 100644
index 000000000..fd7dc01e4
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabMerchandiseReturn.cshtml
@@ -0,0 +1,72 @@
+@model SalesSettingsModel
+
+<div class="form-horizontal">
+ <div class="form-body">
+ <div class="form-group">
+ <div class="note note-info">
+ @Loc["Admin.Settings.Order.MerchandiseReturnsDescription1"]
+ <br/>
+ @Loc["Admin.Settings.Order.MerchandiseReturnsDescription2"]
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MerchandiseReturnsEnabled" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.MerchandiseReturnsEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.MerchandiseReturnsEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MerchandiseReturns_AllowToSpecifyPickupAddress" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.MerchandiseReturns_AllowToSpecifyPickupAddress"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.MerchandiseReturns_AllowToSpecifyPickupAddress"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MerchandiseReturns_AllowToSpecifyPickupDate" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.MerchandiseReturns_AllowToSpecifyPickupDate"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.MerchandiseReturns_AllowToSpecifyPickupDate"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MerchandiseReturns_PickupDateRequired" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.MerchandiseReturns_PickupDateRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.MerchandiseReturns_PickupDateRequired"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.NumberOfDaysMerchandiseReturnAvailable" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="OrderSettings.NumberOfDaysMerchandiseReturnAvailable"/>
+ <span asp-validation-for="OrderSettings.NumberOfDaysMerchandiseReturnAvailable"></span>
+ </div>
+ </div>
+ </div>
+</div>
+<partial name="Partials/MerchandiseReturnReasons"/>
+<partial name="Partials/MerchandiseReturnActions"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabOrderSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabOrderSettings.cshtml
new file mode 100644
index 000000000..a6f813c7d
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabOrderSettings.cshtml
@@ -0,0 +1,266 @@
+@model SalesSettingsModel
+<div class="form-horizontal">
+<div class="form-body">
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.IsReOrderAllowed" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.IsReOrderAllowed"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.IsReOrderAllowed"></span>
+ </div>
+</div>
+<div class="note note-warning">
+ <span>@Loc["Admin.Settings.Orders.MinOrderSubtotalAmount.Note"]</span>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MinOrderSubtotalAmount" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="OrderSettings.MinOrderSubtotalAmount"/>
+ <span asp-validation-for="OrderSettings.MinOrderSubtotalAmount"></span> @Model.OrderSettings.PrimaryStoreCurrencyCode
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MinOrderTotalAmount" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-input asp-for="OrderSettings.MinOrderTotalAmount"/>
+ <span asp-validation-for="OrderSettings.MinOrderTotalAmount"></span> @Model.OrderSettings.PrimaryStoreCurrencyCode
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MinOrderSubtotalAmountIncludingTax" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.MinOrderSubtotalAmountIncludingTax"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.MinOrderSubtotalAmountIncludingTax"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.AnonymousCheckoutAllowed" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.AnonymousCheckoutAllowed"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.AnonymousCheckoutAllowed"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.TermsOfServiceOnShoppingCartPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.TermsOfServiceOnShoppingCartPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.TermsOfServiceOnShoppingCartPage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.TermsOfServiceOnOrderConfirmPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.TermsOfServiceOnOrderConfirmPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.TermsOfServiceOnOrderConfirmPage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.DisableOrderCompletedPage" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.DisableOrderCompletedPage"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.DisableOrderCompletedPage"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.AttachPdfInvoiceToOrderPlacedEmail" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.AttachPdfInvoiceToOrderPlacedEmail"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.AttachPdfInvoiceToOrderPlacedEmail"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.AttachPdfInvoiceToOrderPaidEmail" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.AttachPdfInvoiceToOrderPaidEmail"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.AttachPdfInvoiceToOrderPaidEmail"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.AttachPdfInvoiceToOrderCompletedEmail" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.AttachPdfInvoiceToOrderCompletedEmail"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.AttachPdfInvoiceToOrderCompletedEmail"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.GiftVouchers_Activated_OrderStatusId" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <admin-select asp-for="OrderSettings.GiftVouchers_Activated_OrderStatusId" asp-items="Model.OrderSettings.GiftVouchers_Activated_OrderStatuses"/>
+ <span asp-validation-for="OrderSettings.GiftVouchers_Activated_OrderStatusId"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.DeactivateGiftVouchersAfterCancelOrder" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.DeactivateGiftVouchersAfterCancelOrder"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.DeactivateGiftVouchersAfterCancelOrder"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.DeactivateGiftVouchersAfterDeletingOrder" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.DeactivateGiftVouchersAfterDeletingOrder"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.DeactivateGiftVouchersAfterDeletingOrder"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.GiftVouchers_Assign_StoreId" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.GiftVouchers_Assign_StoreId"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.GiftVouchers_Assign_StoreId"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.CompleteOrderWhenDelivered" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.CompleteOrderWhenDelivered"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.CompleteOrderWhenDelivered"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.AllowCustomerToAddOrderNote" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.AllowCustomerToAddOrderNote"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.AllowCustomerToAddOrderNote"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.UserCanCancelUnpaidOrder" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.UserCanCancelUnpaidOrder"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.UserCanCancelUnpaidOrder"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-xs-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.LengthCode" class="control-label"/>
+ </div>
+ <div class="col-xs-4 col-md-8 col-sm-8">
+ <admin-input asp-for="OrderSettings.LengthCode"/>
+ <span asp-validation-for="OrderSettings.LengthCode"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-xs-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.MinimumOrderPlacementInterval" class="control-label"/>
+ </div>
+ <div class="col-xs-4 col-md-8 col-sm-8">
+ <admin-input asp-for="OrderSettings.MinimumOrderPlacementInterval"/>
+ <span asp-validation-for="OrderSettings.MinimumOrderPlacementInterval"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.UnpublishAuctionProduct" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.UnpublishAuctionProduct"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.UnpublishAuctionProduct"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-xs-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.PageSize" class="control-label"/>
+ </div>
+ <div class="col-xs-4 col-md-8 col-sm-8">
+ <admin-input asp-for="OrderSettings.PageSize"/>
+ <span asp-validation-for="OrderSettings.PageSize"></span>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-8 col-md-4 col-sm-4 text-right">
+ <admin-label asp-for="OrderSettings.AttachPdfInvoiceToBinary" class="control-label"/>
+ </div>
+ <div class="col-4 col-md-8 col-sm-8">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="OrderSettings.AttachPdfInvoiceToBinary"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="OrderSettings.AttachPdfInvoiceToBinary"></span>
+ </div>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabShoppingCart.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabShoppingCart.cshtml
new file mode 100644
index 000000000..fdef08894
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/Sales.TabShoppingCart.cshtml
@@ -0,0 +1,305 @@
+@model SalesSettingsModel
+
+<vc:admin-widget widget-zone="shopping_cart_settings_top" additional-data="null"/>
+<div class="form-horizontal">
+<div class="form-body">
+<div class="col-6">
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.DisplayCartAfterAddingProduct" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.DisplayCartAfterAddingProduct"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.DisplayCartAfterAddingProduct"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.DisplayWishlistAfterAddingProduct" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.DisplayWishlistAfterAddingProduct"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.DisplayWishlistAfterAddingProduct"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.AllowOutOfStockItemsToBeAddedToWishlist"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.MaximumShoppingCartItems" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ShoppingCartSettings.MaximumShoppingCartItems"/>
+ <span asp-validation-for="ShoppingCartSettings.MaximumShoppingCartItems"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.MaximumWishlistItems" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ShoppingCartSettings.MaximumWishlistItems"/>
+ <span asp-validation-for="ShoppingCartSettings.MaximumWishlistItems"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.MoveItemsFromWishlistToCart" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.MoveItemsFromWishlistToCart"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.MoveItemsFromWishlistToCart"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.ShowProductImagesOnShoppingCart" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.ShowProductImagesOnShoppingCart"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.ShowProductImagesOnShoppingCart"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.ShowProductImagesOnWishList" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.ShowProductImagesOnWishList"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.ShowProductImagesOnWishList"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.ShowDiscountBox" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.ShowDiscountBox"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.ShowDiscountBox"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.ShowGiftVoucherBox" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.ShowGiftVoucherBox"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.ShowGiftVoucherBox"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.CrossSellsNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ShoppingCartSettings.CrossSellsNumber"/>
+ <span asp-validation-for="ShoppingCartSettings.CrossSellsNumber"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.EmailWishlistEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.EmailWishlistEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.EmailWishlistEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlAllowAnonymousUsersToEmailWishlist">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.AllowAnonymousUsersToEmailWishlist" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.AllowAnonymousUsersToEmailWishlist"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.AllowAnonymousUsersToEmailWishlist"></span>
+ </div>
+ </div>
+</div>
+<div class="col-6">
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.MiniShoppingCartEnabled" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.MiniShoppingCartEnabled"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.MiniShoppingCartEnabled"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlMiniShoppingCartProductNumber">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.MiniCartProductNumber" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ShoppingCartSettings.MiniCartProductNumber"/>
+ <span asp-validation-for="ShoppingCartSettings.MiniCartProductNumber"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlShowProductImagesInMiniShoppingCart">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.ShowImagesInsidebarCart" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.ShowImagesInsidebarCart"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.ShowImagesInsidebarCart"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.AllowCartItemEditing" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.AllowCartItemEditing"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.AllowCartItemEditing"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.SharedCartBetweenStores" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.SharedCartBetweenStores"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.SharedCartBetweenStores"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.AllowOnHoldCart" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.AllowOnHoldCart"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.AllowOnHoldCart"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.AllowToSelectWarehouse" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.AllowToSelectWarehouse"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.AllowToSelectWarehouse"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.GroupTierPrices" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.GroupTierPrices"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.GroupTierPrices"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.RoundPrices" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShoppingCartSettings.RoundPrices"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShoppingCartSettings.RoundPrices"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-label asp-for="ShoppingCartSettings.ReservationDateFormat" class="control-label"/>
+ </div>
+ <div class="col-6 col-md-6 col-sm-6">
+ <admin-input asp-for="ShoppingCartSettings.ReservationDateFormat"/>
+ <span asp-validation-for="ShoppingCartSettings.ReservationDateFormat"></span>
+ </div>
+ </div>
+</div>
+</div>
+</div>
+<vc:admin-widget widget-zone="shopping_cart_settings_bottom" additional-data="null"/>
+
+<script>
+ $(document).ready(function () {
+
+ $("#@Html.IdFor(model => model.ShoppingCartSettings.MiniShoppingCartEnabled)").click(toggleMiniShoppingCartEnabled);
+ $("#@Html.IdFor(model => model.ShoppingCartSettings.EmailWishlistEnabled)").click(toggleEmailWishlistEnabled);
+
+ toggleMiniShoppingCartEnabled();
+ toggleEmailWishlistEnabled();
+ });
+
+ function toggleMiniShoppingCartEnabled() {
+ if ($('#@Html.IdFor(model => model.ShoppingCartSettings.MiniShoppingCartEnabled)').is(':checked')) {
+ $('#pnlMiniShoppingCartProductNumber').show();
+ $('#pnlShowProductImagesInMiniShoppingCart').show();
+ }
+ else {
+ $('#pnlMiniShoppingCartProductNumber').hide();
+ $('#pnlShowProductImagesInMiniShoppingCart').hide();
+ }
+ }
+
+ function toggleEmailWishlistEnabled() {
+ if ($('#@Html.IdFor(model => model.ShoppingCartSettings.EmailWishlistEnabled)').is(':checked')) {
+ $('#pnlAllowAnonymousUsersToEmailWishlist').show();
+ }
+ else {
+ $('#pnlAllowAnonymousUsersToEmailWishlist').hide();
+ }
+ }
+
+</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Sales.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Sales.cshtml
new file mode 100644
index 000000000..6a0a35773
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Sales.cshtml
@@ -0,0 +1,60 @@
+@model SalesSettingsModel
+@{
+ ViewBag.Title = Loc["Admin.Settings.Sales"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="Setting" asp-action="Sales" method="post">
+ <div asp-validation-summary="All"></div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="x_panel light form-fit">
+ <div class="x_title">
+ <div class="caption">
+ <i class="fa fa-fw fa-sliders"></i>
+ @Loc["Admin.Settings.Sales"]
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <admin-tabstrip name="salessettings-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Settings.Order"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/Sales.TabOrderSettings" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.Order.MerchandiseReturnSettings"]" tab-index="1">
+ <content>
+ <div>
+ <partial name="Partials/Sales.TabMerchandiseReturn" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.ShoppingCart"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/Sales.TabShoppingCart" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Settings.LoyaltyPoints"]" tab-index="3">
+ <content>
+ <div>
+ <partial name="Partials/Sales.TabLoyaltyPoints" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ </items>
+ </admin-tabstrip>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml
index af197fbf1..0d49682e6 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml
@@ -33,6 +33,7 @@
@using Grand.Web.AdminShared.Models.Blogs
@using Grand.Web.AdminShared.Models.Messages
@using Grand.Web.AdminShared.Models.Pages
+@using Grand.Web.AdminShared.Models.Settings
@inject LocService Loc
@inject IEnumTranslationService EnumTranslationService
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Controllers/SettingController.cs b/src/Web/Grand.Web.Store/Controllers/SettingController.cs
new file mode 100644
index 000000000..11aa64f11
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Controllers/SettingController.cs
@@ -0,0 +1,684 @@
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Domain.Blogs;
+using Grand.Domain.Catalog;
+using Grand.Domain.Common;
+using Grand.Domain.Customers;
+using Grand.Domain.Directory;
+using Grand.Domain.Knowledgebase;
+using Grand.Domain.Localization;
+using Grand.Domain.Media;
+using Grand.Domain.News;
+using Grand.Domain.Orders;
+using Grand.Domain.Permissions;
+using Grand.Domain.Security;
+using Grand.Domain.Seo;
+using Grand.Domain.Stores;
+using Grand.Infrastructure;
+using Grand.Infrastructure.Caching;
+using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.AdminShared.Extensions.Mapping.Settings;
+using Grand.Web.AdminShared.Models.Settings;
+using Grand.Web.Common.DataSource;
+using Grand.Web.Common.Localization;
+using Grand.Web.Common.Security.Authorization;
+using Grand.Web.Common.Security.Captcha;
+using Grand.Web.Common.Themes;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Grand.Web.Store.Controllers;
+
+[PermissionAuthorize(PermissionSystemName.Settings)]
+public class SettingController(
+ ISettingService settingService,
+ IPictureService pictureService,
+ ITranslationService translationService,
+ IMerchandiseReturnService merchandiseReturnService,
+ ILanguageService languageService,
+ ICacheBase cacheBase,
+ IContextAccessor contextAccessor,
+ IEnumTranslationService enumTranslationService)
+ : BaseStoreController
+{
+ #region Utilities
+
+ private async Task ClearCache()
+ {
+ await cacheBase.Clear();
+ }
+
+ private string GetStoreScope() => contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
+
+ /// <summary>
+ /// Returns true if the store owner is allowed to access (edit/delete) the given store-linked item.
+ /// Store owners can only access items that are explicitly assigned to their store
+ /// (LimitedToStores = true and their storeId is in the Stores collection).
+ /// Items available to all stores (LimitedToStores = false) are not editable by store owners.
+ /// </summary>
+ private static bool IsStoreOwnerAccessAllowed(string storeId, bool limitedToStores, ICollection<string> stores)
+ => string.IsNullOrEmpty(storeId) || (limitedToStores && stores.Contains(storeId));
+
+ #endregion
+
+ #region General common settings
+
+ public async Task<IActionResult> GeneralCommon([FromServices] IEnumerable<IThemeView> themes,
+ [FromServices] IDateTimeService dateTimeService)
+ {
+ var storeScope = GetStoreScope();
+ var model = new GeneralCommonSettingsModel {
+ ActiveStore = storeScope
+ };
+
+ var dateTimeSettings = await settingService.LoadSetting<DateTimeSettings>(storeScope);
+ model.DateTimeSettings.DefaultStoreTimeZoneId = dateTimeSettings.DefaultStoreTimeZoneId;
+ var isWindows = Grand.Infrastructure.OperatingSystem.IsWindows();
+ foreach (var timeZone in dateTimeService.GetSystemTimeZones())
+ {
+ var name = isWindows ? timeZone.DisplayName : $"{timeZone.StandardName} ({timeZone.Id})";
+ model.DateTimeSettings.AvailableTimeZones.Add(new SelectListItem {
+ Text = name,
+ Value = timeZone.Id,
+ Selected = timeZone.Id.Equals(dateTimeSettings.DefaultStoreTimeZoneId,
+ StringComparison.OrdinalIgnoreCase)
+ });
+ }
+
+ var storeInformationSettings = await settingService.LoadSetting<StoreInformationSettings>(storeScope);
+ model.StoreInformationSettings = storeInformationSettings.ToModel();
+ model.StoreInformationSettings.AvailableStoreThemes =
+ themes.Where(x => x.AreaName == "").Select(x =>
+ new GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel {
+ ThemeName = x.ThemeName,
+ ThemeTitle = x.ThemeInfo.Title,
+ PreviewImageUrl = x.ThemeInfo.PreviewImageUrl,
+ PreviewText = x.ThemeInfo.PreviewText,
+ SupportRtl = x.ThemeInfo.SupportRtl,
+ Selected = x.ThemeName == storeInformationSettings.DefaultStoreTheme
+ }).ToList();
+
+ var commonSettings = await settingService.LoadSetting<CommonSettings>(storeScope);
+ model.CommonSettings = commonSettings.ToModel();
+
+ var seoSettings = await settingService.LoadSetting<SeoSettings>(storeScope);
+ model.SeoSettings = seoSettings.ToModel();
+
+ var captchaSettings = await settingService.LoadSetting<CaptchaSettings>(storeScope);
+ model.SecuritySettings = captchaSettings.ToModel();
+ model.SecuritySettings.AvailableReCaptchaVersions =
+ enumTranslationService.ToSelectList(GoogleReCaptchaVersion.V2, false).ToList();
+
+ var pdfSettings = await settingService.LoadSetting<PdfSettings>(storeScope);
+ model.PdfSettings = pdfSettings.ToModel();
+
+ var displayMenuItemSettings = await settingService.LoadSetting<MenuItemSettings>(storeScope);
+ model.DisplayMenuSettings = displayMenuItemSettings.ToModel();
+
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> GeneralCommon(GeneralCommonSettingsModel model)
+ {
+ var storeScope = GetStoreScope();
+
+ var storeInformationSettings = await settingService.LoadSetting<StoreInformationSettings>(storeScope);
+ storeInformationSettings = model.StoreInformationSettings.ToEntity(storeInformationSettings);
+ await settingService.SaveSetting(storeInformationSettings, storeScope);
+
+ var dateTimeSettings = await settingService.LoadSetting<DateTimeSettings>(storeScope);
+ dateTimeSettings.DefaultStoreTimeZoneId = model.DateTimeSettings.DefaultStoreTimeZoneId;
+ await settingService.SaveSetting(dateTimeSettings, storeScope);
+
+ var commonSettings = await settingService.LoadSetting<CommonSettings>(storeScope);
+ commonSettings = model.CommonSettings.ToEntity(commonSettings);
+ await settingService.SaveSetting(commonSettings, storeScope);
+
+ var seoSettings = await settingService.LoadSetting<SeoSettings>(storeScope);
+ seoSettings = model.SeoSettings.ToEntity(seoSettings);
+ await settingService.SaveSetting(seoSettings, storeScope);
+
+ var captchaSettings = await settingService.LoadSetting<CaptchaSettings>(storeScope);
+ captchaSettings = model.SecuritySettings.ToEntity(captchaSettings);
+ await settingService.SaveSetting(captchaSettings, storeScope);
+ if (captchaSettings.Enabled &&
+ (string.IsNullOrWhiteSpace(captchaSettings.ReCaptchaPublicKey) ||
+ string.IsNullOrWhiteSpace(captchaSettings.ReCaptchaPrivateKey)))
+ Error("Captcha is enabled but the appropriate keys are not entered");
+
+ var pdfSettings = await settingService.LoadSetting<PdfSettings>(storeScope);
+ pdfSettings = model.PdfSettings.ToEntity(pdfSettings);
+ await settingService.SaveSetting(pdfSettings, storeScope);
+
+ var displayMenuItemSettings = await settingService.LoadSetting<MenuItemSettings>(storeScope);
+ displayMenuItemSettings = model.DisplayMenuSettings.ToEntity(displayMenuItemSettings);
+ await settingService.SaveSetting(displayMenuItemSettings, storeScope);
+
+ await ClearCache();
+
+ Success(translationService.GetResource("Admin.Configuration.Updated"));
+ await SaveSelectedTabIndex();
+ return RedirectToAction("GeneralCommon");
+ }
+
+ #endregion
+
+ #region Catalog settings
+
+ public async Task<IActionResult> Catalog()
+ {
+ var storeScope = GetStoreScope();
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
+ var model = catalogSettings.ToModel();
+ model.ActiveStore = storeScope;
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> Catalog(CatalogSettingsModel model)
+ {
+ var storeScope = GetStoreScope();
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
+ catalogSettings = model.ToEntity(catalogSettings);
+ await settingService.SaveSetting(catalogSettings, storeScope);
+ await ClearCache();
+ Success(translationService.GetResource("Admin.Configuration.Updated"));
+ await SaveSelectedTabIndex();
+ return RedirectToAction("Catalog");
+ }
+
+ #region Sort options
+
+ [HttpPost]
+ public async Task<IActionResult> SortOptionsList(DataSourceRequest command)
+ {
+ var storeScope = GetStoreScope();
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
+ var model = new List<SortOptionModel>();
+ foreach (int option in Enum.GetValues(typeof(ProductSortingEnum)))
+ model.Add(new SortOptionModel {
+ Id = option,
+ Name = enumTranslationService.GetTranslationEnum((ProductSortingEnum)option),
+ IsActive = !catalogSettings.ProductSortingEnumDisabled.Contains(option),
+ DisplayOrder = catalogSettings.ProductSortingEnumDisplayOrder.TryGetValue(option, out var value)
+ ? value
+ : option
+ });
+ var gridModel = new DataSourceResult {
+ Data = model.OrderBy(option => option.DisplayOrder),
+ Total = model.Count
+ };
+ return Json(gridModel);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> SortOptionUpdate(SortOptionModel model)
+ {
+ var storeScope = GetStoreScope();
+ var catalogSettings = await settingService.LoadSetting<CatalogSettings>(storeScope);
+ catalogSettings.ProductSortingEnumDisplayOrder[model.Id] = model.DisplayOrder;
+ switch (model.IsActive)
+ {
+ case true when catalogSettings.ProductSortingEnumDisabled.Contains(model.Id):
+ catalogSettings.ProductSortingEnumDisabled.Remove(model.Id);
+ break;
+ case false when !catalogSettings.ProductSortingEnumDisabled.Contains(model.Id):
+ catalogSettings.ProductSortingEnumDisabled.Add(model.Id);
+ break;
+ }
+
+ await settingService.SaveSetting(catalogSettings, storeScope);
+ await ClearCache();
+ return new JsonResult("");
+ }
+
+ #endregion
+
+ #endregion
+
+ #region Sales settings
+
+ public async Task<IActionResult> Sales([FromServices] IOrderStatusService orderStatusService,
+ [FromServices] ICurrencyService currencyService)
+ {
+ var storeScope = GetStoreScope();
+ var loyaltyPointsSettings = await settingService.LoadSetting<LoyaltyPointsSettings>(storeScope);
+ var orderSettings = await settingService.LoadSetting<OrderSettings>(storeScope);
+ var shoppingCartSettings = await settingService.LoadSetting<ShoppingCartSettings>(storeScope);
+
+ var model = new SalesSettingsModel {
+ LoyaltyPointsSettings = loyaltyPointsSettings.ToModel(),
+ OrderSettings = orderSettings.ToModel(),
+ ShoppingCartSettings = shoppingCartSettings.ToModel(),
+ ActiveStore = storeScope
+ };
+
+ var currencySettings = await settingService.LoadSetting<CurrencySettings>();
+ var currency = await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId);
+
+ model.LoyaltyPointsSettings.PrimaryStoreCurrencyCode = currency?.CurrencyCode;
+ var status = await orderStatusService.GetAll();
+ model.LoyaltyPointsSettings.PointsForPurchases_Awarded_OrderStatuses = status
+ .Select(x => new SelectListItem { Value = x.StatusId.ToString(), Text = x.Name }).ToList();
+
+ model.OrderSettings.PrimaryStoreCurrencyCode = currency?.CurrencyCode;
+ model.OrderSettings.GiftVouchers_Activated_OrderStatuses = status
+ .Select(x => new SelectListItem { Value = x.StatusId.ToString(), Text = x.Name }).ToList();
+ model.OrderSettings.GiftVouchers_Activated_OrderStatuses.Insert(0,
+ new SelectListItem { Text = "---", Value = "0" });
+
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> Sales(SalesSettingsModel model,
+ [FromServices] IOrderStatusService orderStatusService,
+ [FromServices] ICurrencyService currencyService)
+ {
+ var storeScope = GetStoreScope();
+
+ if (ModelState.IsValid)
+ {
+ var loyaltyPointsSettings = await settingService.LoadSetting<LoyaltyPointsSettings>(storeScope);
+ loyaltyPointsSettings = model.LoyaltyPointsSettings.ToEntity(loyaltyPointsSettings);
+ await settingService.SaveSetting(loyaltyPointsSettings, storeScope);
+
+ var shoppingCartSettings = await settingService.LoadSetting<ShoppingCartSettings>(storeScope);
+ shoppingCartSettings = model.ShoppingCartSettings.ToEntity(shoppingCartSettings);
+ await settingService.SaveSetting(shoppingCartSettings, storeScope);
+
+ var orderSettings = await settingService.LoadSetting<OrderSettings>(storeScope);
+ orderSettings = model.OrderSettings.ToEntity(orderSettings);
+ await settingService.SaveSetting(orderSettings, storeScope);
+
+ await ClearCache();
+ Success(translationService.GetResource("Admin.Configuration.Updated"));
+ await SaveSelectedTabIndex();
+ return RedirectToAction("Sales");
+ }
+ else
+ {
+ foreach (var modelState in ModelState.Values)
+ foreach (var error in modelState.Errors)
+ Error(error.ErrorMessage);
+
+ var currencySettings = await settingService.LoadSetting<CurrencySettings>();
+ var currency = await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId);
+ model.LoyaltyPointsSettings.PrimaryStoreCurrencyCode = currency?.CurrencyCode;
+ model.OrderSettings.PrimaryStoreCurrencyCode = currency?.CurrencyCode;
+
+ var status = await orderStatusService.GetAll();
+ model.LoyaltyPointsSettings.PointsForPurchases_Awarded_OrderStatuses = status
+ .Select(x => new SelectListItem { Value = x.StatusId.ToString(), Text = x.Name }).ToList();
+ model.OrderSettings.GiftVouchers_Activated_OrderStatuses = status
+ .Select(x => new SelectListItem { Value = x.StatusId.ToString(), Text = x.Name }).ToList();
+ model.OrderSettings.GiftVouchers_Activated_OrderStatuses.Insert(0,
+ new SelectListItem { Text = "---", Value = "0" });
+
+ model.ActiveStore = storeScope;
+ return View(model);
+ }
+ }
+
+ #region Merchandise return reasons
+
+ public async Task<IActionResult> MerchandiseReturnReasonList()
+ {
+ const int customerFormFieldIndex = 1;
+ await SaveSelectedTabIndex(customerFormFieldIndex);
+ return RedirectToAction("Sales", "Setting");
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> MerchandiseReturnReasonList(DataSourceRequest command)
+ {
+ var storeId = GetStoreScope();
+ var reasons = await merchandiseReturnService.GetAllMerchandiseReturnReasons(storeId);
+ var gridModel = new DataSourceResult {
+ Data = reasons.Select(x => x.ToModel()),
+ Total = reasons.Count
+ };
+ return Json(gridModel);
+ }
+
+ public async Task<IActionResult> MerchandiseReturnReasonCreate()
+ {
+ var storeId = GetStoreScope();
+ var model = new MerchandiseReturnReasonModel {
+ Stores = !string.IsNullOrEmpty(storeId) ? [storeId] : []
+ };
+ await AddLocales(languageService, model.Locales);
+ return View(model);
+ }
+
+ [HttpPost]
+ [Grand.Web.Common.Filters.ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> MerchandiseReturnReasonCreate(MerchandiseReturnReasonModel model,
+ bool continueEditing)
+ {
+ if (ModelState.IsValid)
+ {
+ var storeId = GetStoreScope();
+ if (!string.IsNullOrEmpty(storeId))
+ model.Stores = [storeId];
+ var rrr = model.ToEntity();
+ await merchandiseReturnService.InsertMerchandiseReturnReason(rrr);
+ Success(translationService.GetResource("Admin.Settings.Order.MerchandiseReturnReasons.Added"));
+ return continueEditing
+ ? RedirectToAction("MerchandiseReturnReasonEdit", new { id = rrr.Id })
+ : RedirectToAction("MerchandiseReturnReasonList");
+ }
+
+ return View(model);
+ }
+
+ public async Task<IActionResult> MerchandiseReturnReasonEdit(string id)
+ {
+ var rrr = await merchandiseReturnService.GetMerchandiseReturnReasonById(id);
+ if (rrr == null) return RedirectToAction("MerchandiseReturnReasonList");
+
+ var storeId = GetStoreScope();
+ if (!IsStoreOwnerAccessAllowed(storeId, rrr.LimitedToStores, rrr.Stores))
+ return RedirectToAction("MerchandiseReturnReasonList");
+
+ var model = rrr.ToModel();
+ await AddLocales(languageService, model.Locales, (locale, languageId) => {
+ locale.Name = rrr.GetTranslation(x => x.Name, languageId, false);
+ });
+ return View(model);
+ }
+
+ [HttpPost]
+ [Grand.Web.Common.Filters.ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> MerchandiseReturnReasonEdit(MerchandiseReturnReasonModel model,
+ bool continueEditing)
+ {
+ var rrr = await merchandiseReturnService.GetMerchandiseReturnReasonById(model.Id);
+ if (rrr == null) return RedirectToAction("MerchandiseReturnReasonList");
+
+ var storeId = GetStoreScope();
+ if (!IsStoreOwnerAccessAllowed(storeId, rrr.LimitedToStores, rrr.Stores))
+ return RedirectToAction("MerchandiseReturnReasonList");
+
+ if (ModelState.IsValid)
+ {
+ var existingStores = rrr.Stores;
+ var existingLimitedToStores = rrr.LimitedToStores;
+ rrr = model.ToEntity(rrr);
+ rrr.Stores = existingStores;
+ rrr.LimitedToStores = existingLimitedToStores;
+ await merchandiseReturnService.UpdateMerchandiseReturnReason(rrr);
+ Success(translationService.GetResource("Admin.Settings.Order.MerchandiseReturnReasons.Updated"));
+ if (continueEditing)
+ {
+ await SaveSelectedTabIndex();
+ return RedirectToAction("MerchandiseReturnReasonEdit", new { id = rrr.Id });
+ }
+
+ return RedirectToAction("MerchandiseReturnReasonList");
+ }
+
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> MerchandiseReturnReasonDelete(string id)
+ {
+ var rrr = await merchandiseReturnService.GetMerchandiseReturnReasonById(id);
+ if (rrr == null) return RedirectToAction("MerchandiseReturnReasonList");
+
+ var storeId = GetStoreScope();
+ if (!IsStoreOwnerAccessAllowed(storeId, rrr.LimitedToStores, rrr.Stores))
+ return RedirectToAction("MerchandiseReturnReasonList");
+
+ await merchandiseReturnService.DeleteMerchandiseReturnReason(rrr);
+ Success(translationService.GetResource("Admin.Settings.Order.MerchandiseReturnReasons.Deleted"));
+ return RedirectToAction("MerchandiseReturnReasonList");
+ }
+
+ #endregion
+
+ #region Merchandise return actions
+
+ public async Task<IActionResult> MerchandiseReturnActionList()
+ {
+ const int customerFormFieldIndex = 1;
+ await SaveSelectedTabIndex(customerFormFieldIndex);
+ return RedirectToAction("Sales", "Setting");
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> MerchandiseReturnActionList(DataSourceRequest command)
+ {
+ var storeId = GetStoreScope();
+ var actions = await merchandiseReturnService.GetAllMerchandiseReturnActions(storeId);
+ var gridModel = new DataSourceResult {
+ Data = actions.Select(x => x.ToModel()),
+ Total = actions.Count
+ };
+ return Json(gridModel);
+ }
+
+ public async Task<IActionResult> MerchandiseReturnActionCreate()
+ {
+ var storeId = GetStoreScope();
+ var model = new MerchandiseReturnActionModel {
+ Stores = !string.IsNullOrEmpty(storeId) ? [storeId] : []
+ };
+ await AddLocales(languageService, model.Locales);
+ return View(model);
+ }
+
+ [HttpPost]
+ [Grand.Web.Common.Filters.ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> MerchandiseReturnActionCreate(MerchandiseReturnActionModel model,
+ bool continueEditing)
+ {
+ if (ModelState.IsValid)
+ {
+ var storeId = GetStoreScope();
+ if (!string.IsNullOrEmpty(storeId))
+ model.Stores = [storeId];
+ var rra = model.ToEntity();
+ await merchandiseReturnService.InsertMerchandiseReturnAction(rra);
+ await ClearCache();
+ Success(translationService.GetResource("Admin.Settings.Order.MerchandiseReturnActions.Added"));
+ return continueEditing
+ ? RedirectToAction("MerchandiseReturnActionEdit", new { id = rra.Id })
+ : RedirectToAction("MerchandiseReturnActionList");
+ }
+
+ return View(model);
+ }
+
+ public async Task<IActionResult> MerchandiseReturnActionEdit(string id)
+ {
+ var rra = await merchandiseReturnService.GetMerchandiseReturnActionById(id);
+ if (rra == null) return RedirectToAction("MerchandiseReturnActionList");
+
+ var storeId = GetStoreScope();
+ if (!IsStoreOwnerAccessAllowed(storeId, rra.LimitedToStores, rra.Stores))
+ return RedirectToAction("MerchandiseReturnActionList");
+
+ var model = rra.ToModel();
+ await AddLocales(languageService, model.Locales, (locale, languageId) => {
+ locale.Name = rra.GetTranslation(x => x.Name, languageId, false);
+ });
+ return View(model);
+ }
+
+ [HttpPost]
+ [Grand.Web.Common.Filters.ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> MerchandiseReturnActionEdit(MerchandiseReturnActionModel model,
+ bool continueEditing)
+ {
+ var rra = await merchandiseReturnService.GetMerchandiseReturnActionById(model.Id);
+ if (rra == null) return RedirectToAction("MerchandiseReturnActionList");
+
+ var storeId = GetStoreScope();
+ if (!IsStoreOwnerAccessAllowed(storeId, rra.LimitedToStores, rra.Stores))
+ return RedirectToAction("MerchandiseReturnActionList");
+
+ if (ModelState.IsValid)
+ {
+ var existingStores = rra.Stores;
+ var existingLimitedToStores = rra.LimitedToStores;
+ rra = model.ToEntity(rra);
+ rra.Stores = existingStores;
+ rra.LimitedToStores = existingLimitedToStores;
+ await merchandiseReturnService.UpdateMerchandiseReturnAction(rra);
+ Success(translationService.GetResource("Admin.Settings.Order.MerchandiseReturnActions.Updated"));
+ if (continueEditing)
+ {
+ await SaveSelectedTabIndex();
+ return RedirectToAction("MerchandiseReturnActionEdit", new { id = rra.Id });
+ }
+
+ return RedirectToAction("MerchandiseReturnActionList");
+ }
+
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> MerchandiseReturnActionDelete(string id)
+ {
+ var rra = await merchandiseReturnService.GetMerchandiseReturnActionById(id);
+ if (rra == null) return RedirectToAction("MerchandiseReturnActionList");
+
+ var storeId = GetStoreScope();
+ if (!IsStoreOwnerAccessAllowed(storeId, rra.LimitedToStores, rra.Stores))
+ return RedirectToAction("MerchandiseReturnActionList");
+
+ await merchandiseReturnService.DeleteMerchandiseReturnAction(rra);
+ Success(translationService.GetResource("Admin.Settings.Order.MerchandiseReturnActions.Deleted"));
+ return RedirectToAction("MerchandiseReturnActionList");
+ }
+
+ #endregion
+
+ #endregion
+
+ #region Media settings
+
+ public async Task<IActionResult> Media()
+ {
+ var storeScope = GetStoreScope();
+ var mediaSettings = await settingService.LoadSetting<MediaSettings>(storeScope);
+ var model = mediaSettings.ToModel();
+ model.ActiveStore = storeScope;
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> Media(MediaSettingsModel model)
+ {
+ var storeScope = GetStoreScope();
+ var mediaSettings = await settingService.LoadSetting<MediaSettings>(storeScope);
+
+ // Preserve file manager settings - store owners cannot change these
+ var allowedFileTypes = mediaSettings.AllowedFileTypes;
+ var fileManagerEnabledCommands = mediaSettings.FileManagerEnabledCommands;
+ var fileManagerDisabledUICommands = mediaSettings.FileManagerDisabledUICommands;
+
+ mediaSettings = model.ToEntity(mediaSettings);
+
+ // Restore preserved file manager settings
+ mediaSettings.AllowedFileTypes = allowedFileTypes;
+ mediaSettings.FileManagerEnabledCommands = fileManagerEnabledCommands;
+ mediaSettings.FileManagerDisabledUICommands = fileManagerDisabledUICommands;
+
+ await settingService.SaveSetting(mediaSettings, storeScope);
+ await ClearCache();
+ await pictureService.ClearThumbs();
+ Success(translationService.GetResource("Admin.Configuration.Updated"));
+ return RedirectToAction("Media");
+ }
+
+ #endregion
+
+ #region Customer settings
+
+ public async Task<IActionResult> Customer()
+ {
+ var storeScope = GetStoreScope();
+ var customerSettings = await settingService.LoadSetting<CustomerSettings>(storeScope);
+ var addressSettings = await settingService.LoadSetting<AddressSettings>(storeScope);
+
+ var model = new CustomerSettingsModel {
+ CustomerSettings = customerSettings.ToModel(),
+ AddressSettings = addressSettings.ToModel()
+ };
+
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> Customer(CustomerSettingsModel model)
+ {
+ var storeScope = GetStoreScope();
+ var customerSettings = await settingService.LoadSetting<CustomerSettings>(storeScope);
+ var addressSettings = await settingService.LoadSetting<AddressSettings>(storeScope);
+
+ customerSettings = model.CustomerSettings.ToEntity(customerSettings);
+ await settingService.SaveSetting(customerSettings, storeScope);
+
+ addressSettings = model.AddressSettings.ToEntity(addressSettings);
+ await settingService.SaveSetting(addressSettings, storeScope);
+
+ await ClearCache();
+ Success(translationService.GetResource("Admin.Configuration.Updated"));
+ await SaveSelectedTabIndex();
+ return RedirectToAction("Customer");
+ }
+
+ #endregion
+
+ #region Content settings
+
+ public async Task<IActionResult> Content()
+ {
+ var storeScope = GetStoreScope();
+ var blogSettings = await settingService.LoadSetting<BlogSettings>(storeScope);
+ var newsSettings = await settingService.LoadSetting<NewsSettings>(storeScope);
+ var knowledgebaseSettings = await settingService.LoadSetting<KnowledgebaseSettings>(storeScope);
+ var model = new ContentSettingsModel {
+ BlogSettings = blogSettings.ToModel(),
+ NewsSettings = newsSettings.ToModel(),
+ KnowledgebaseSettings = knowledgebaseSettings.ToModel(),
+ ActiveStore = storeScope
+ };
+
+ return View(model);
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> Content(ContentSettingsModel model)
+ {
+ var storeScope = GetStoreScope();
+
+ var blogSettings = await settingService.LoadSetting<BlogSettings>(storeScope);
+ blogSettings = model.BlogSettings.ToEntity(blogSettings);
+ await settingService.SaveSetting(blogSettings, storeScope);
+
+ var newsSettings = await settingService.LoadSetting<NewsSettings>(storeScope);
+ newsSettings = model.NewsSettings.ToEntity(newsSettings);
+ await settingService.SaveSetting(newsSettings, storeScope);
+
+ var knowledgeBaseSettings = await settingService.LoadSetting<KnowledgebaseSettings>(storeScope);
+ knowledgeBaseSettings = model.KnowledgebaseSettings.ToEntity(knowledgeBaseSettings);
+ await settingService.SaveSetting(knowledgeBaseSettings, storeScope);
+
+ await SaveSelectedTabIndex();
+ await ClearCache();
+ Success(translationService.GetResource("Admin.Configuration.Updated"));
+ return RedirectToAction("Content");
+ }
+
+ #endregion
+}
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
index 91c715952..f3469b3f6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
@@ -84,7 +84,7 @@ public class GetMerchandiseReturnHandler : IRequestHandler<GetMerchandiseReturn,
private async Task<IList<MerchandiseReturnModel.MerchandiseReturnReasonModel>> PrepareAvailableReturnReasons()
{
var reasons = new List<MerchandiseReturnModel.MerchandiseReturnReasonModel>();
- foreach (var rrr in await _merchandiseReturnService.GetAllMerchandiseReturnReasons())
+ foreach (var rrr in await _merchandiseReturnService.GetAllMerchandiseReturnReasons(_contextAccessor.StoreContext.CurrentStore.Id))
reasons.Add(new MerchandiseReturnModel.MerchandiseReturnReasonModel {
Id = rrr.Id,
Name = rrr.GetTranslation(x => x.Name, _contextAccessor.WorkContext.WorkingLanguage.Id)
@@ -95,7 +95,7 @@ public class GetMerchandiseReturnHandler : IRequestHandler<GetMerchandiseReturn,
private async Task<IList<MerchandiseReturnModel.MerchandiseReturnActionModel>> PrepareAvailableReturnActions()
{
var actions = new List<MerchandiseReturnModel.MerchandiseReturnActionModel>();
- foreach (var rra in await _merchandiseReturnService.GetAllMerchandiseReturnActions())
+ foreach (var rra in await _merchandiseReturnService.GetAllMerchandiseReturnActions(_contextAccessor.StoreContext.CurrentStore.Id))
actions.Add(new MerchandiseReturnModel.MerchandiseReturnActionModel {
Id = rra.Id,
Name = rra.GetTranslation(x => x.Name, _contextAccessor.WorkContext.WorkingLanguage.Id)