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.

Admin panel - General settings - use automapper

KrzysztofPajak7ef1f485533c
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
index 89c4aaf38..cf4148ca9 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
@@ -206,146 +206,146 @@
</div>
<div class="form-group">
<div class="col-8 col-md-4 col-sm-4 text-right">
- <admin-label asp-for="StoreInformationSettings.StoreInDatabaseContactUsForm" class="control-label" />
+ <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="StoreInformationSettings.StoreInDatabaseContactUsForm" />
+ <admin-input asp-for="CommonSettings.StoreInDatabaseContactUsForm" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.StoreInDatabaseContactUsForm"></span>
+ <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="StoreInformationSettings.SubjectFieldOnContactUsForm" class="control-label" />
+ <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="StoreInformationSettings.SubjectFieldOnContactUsForm" />
+ <admin-input asp-for="CommonSettings.SubjectFieldOnContactUsForm" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.SubjectFieldOnContactUsForm"></span>
+ <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="StoreInformationSettings.UseSystemEmailForContactUsForm" class="control-label" />
+ <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="StoreInformationSettings.UseSystemEmailForContactUsForm" />
+ <admin-input asp-for="CommonSettings.UseSystemEmailForContactUsForm" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.UseSystemEmailForContactUsForm"></span>
+ <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="StoreInformationSettings.AllowToReadLetsEncryptFile" class="control-label" />
+ <admin-label asp-for="CommonSettings.AllowToReadLetsEncryptFile" 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.AllowToReadLetsEncryptFile" />
+ <admin-input asp-for="CommonSettings.AllowToReadLetsEncryptFile" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.AllowToReadLetsEncryptFile"></span>
+ <span asp-validation-for="CommonSettings.AllowToReadLetsEncryptFile"></span>
</div>
</div>
<div class="form-group">
<div class="col-8 col-md-4 col-sm-4 text-right">
- <admin-label asp-for="StoreInformationSettings.AllowToSelectStore" class="control-label" />
+ <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="StoreInformationSettings.AllowToSelectStore" />
+ <admin-input asp-for="CommonSettings.AllowToSelectStore" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.AllowToSelectStore"></span>
+ <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="StoreInformationSettings.PopupForTermsOfServiceLinks" class="control-label" />
+ <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="StoreInformationSettings.PopupForTermsOfServiceLinks" />
+ <admin-input asp-for="CommonSettings.PopupForTermsOfServiceLinks" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.PopupForTermsOfServiceLinks"></span>
+ <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="StoreInformationSettings.Log404Errors" class="control-label" />
+ <admin-label asp-for="CommonSettings.Log404Errors" 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.Log404Errors" />
+ <admin-input asp-for="CommonSettings.Log404Errors" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.Log404Errors"></span>
+ <span asp-validation-for="CommonSettings.Log404Errors"></span>
</div>
</div>
<div class="form-group">
<div class="col-8 col-md-4 col-sm-4 text-right">
- <admin-label asp-for="StoreInformationSettings.SitemapEnabled" class="control-label" />
+ <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="StoreInformationSettings.SitemapEnabled" />
+ <admin-input asp-for="CommonSettings.SitemapEnabled" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.SitemapEnabled"></span>
+ <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="StoreInformationSettings.SitemapIncludeCategories" class="control-label" />
+ <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="StoreInformationSettings.SitemapIncludeCategories" />
+ <admin-input asp-for="CommonSettings.SitemapIncludeCategories" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.SitemapIncludeCategories"></span>
+ <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="StoreInformationSettings.SitemapIncludeImage" class="control-label" />
+ <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="StoreInformationSettings.SitemapIncludeImage" />
+ <admin-input asp-for="CommonSettings.SitemapIncludeImage" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.SitemapIncludeImage"></span>
+ <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="StoreInformationSettings.SitemapIncludeBrands" class="control-label" />
+ <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="StoreInformationSettings.SitemapIncludeBrands" />
+ <admin-input asp-for="CommonSettings.SitemapIncludeBrands" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.SitemapIncludeBrands"></span>
+ <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="StoreInformationSettings.SitemapIncludeProducts" class="control-label" />
+ <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="StoreInformationSettings.SitemapIncludeProducts" />
+ <admin-input asp-for="CommonSettings.SitemapIncludeProducts" />
<div class="control__indicator"></div>
</label>
- <span asp-validation-for="StoreInformationSettings.SitemapIncludeProducts"></span>
+ <span asp-validation-for="CommonSettings.SitemapIncludeProducts"></span>
</div>
</div>
</div>
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index 123db08f0..b7999782a 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -665,20 +665,16 @@ namespace Grand.Web.Admin.Controllers
return RedirectToAction("Customer");
}
+
public async Task<IActionResult> GeneralCommon()
{
var model = new GeneralCommonSettingsModel();
var storeScope = await GetActiveStore();
model.ActiveStore = storeScope;
- //store information
- var storeInformationSettings = _settingService.LoadSetting<StoreInformationSettings>(storeScope);
- var commonSettings = _settingService.LoadSetting<CommonSettings>(storeScope);
- var googleAnalyticsSettings = _settingService.LoadSetting<GoogleAnalyticsSettings>(storeScope);
- var adminareasettings = _settingService.LoadSetting<AdminAreaSettings>(storeScope);
+ //datettime settings
var dateTimeSettings = _settingService.LoadSetting<DateTimeSettings>(storeScope);
-
model.DateTimeSettings.DefaultStoreTimeZoneId = dateTimeSettings.DefaultStoreTimeZoneId;
- var iswindows = Grand.Infrastructure.OperatingSystem.IsWindows();
+ var iswindows = Infrastructure.OperatingSystem.IsWindows();
foreach (TimeZoneInfo timeZone in _dateTimeService.GetSystemTimeZones())
{
var name = iswindows ? timeZone.DisplayName : $"{timeZone.StandardName} ({timeZone.Id})";
@@ -688,11 +684,10 @@ namespace Grand.Web.Admin.Controllers
Selected = timeZone.Id.Equals(dateTimeSettings.DefaultStoreTimeZoneId, StringComparison.OrdinalIgnoreCase)
});
}
+ //store information
+ var storeInformationSettings = _settingService.LoadSetting<StoreInformationSettings>(storeScope);
+ model.StoreInformationSettings = storeInformationSettings.ToModel();
- model.StoreInformationSettings.StoreClosed = storeInformationSettings.StoreClosed;
-
- //themes
- model.StoreInformationSettings.DefaultStoreTheme = storeInformationSettings.DefaultStoreTheme;
model.StoreInformationSettings.AvailableStoreThemes = _themeProvider
.GetConfigurations()
.Select(x => new GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel {
@@ -705,56 +700,21 @@ namespace Grand.Web.Admin.Controllers
Selected = x.Name.Equals(storeInformationSettings.DefaultStoreTheme, StringComparison.OrdinalIgnoreCase)
})
.ToList();
- model.StoreInformationSettings.AllowCustomerToSelectTheme = storeInformationSettings.AllowCustomerToSelectTheme;
- model.StoreInformationSettings.AllowToSelectAdminTheme = storeInformationSettings.AllowToSelectAdminTheme;
-
- model.StoreInformationSettings.LogoPicture = storeInformationSettings.LogoPicture;
- //EU Cookie law
- model.StoreInformationSettings.DisplayCookieInformation = storeInformationSettings.DisplayCookieInformation;
- model.StoreInformationSettings.DisplayPrivacyPreference = storeInformationSettings.DisplayPrivacyPreference;
- //social pages
- model.StoreInformationSettings.FacebookLink = storeInformationSettings.FacebookLink;
- model.StoreInformationSettings.TwitterLink = storeInformationSettings.TwitterLink;
- model.StoreInformationSettings.YoutubeLink = storeInformationSettings.YoutubeLink;
- model.StoreInformationSettings.InstagramLink = storeInformationSettings.InstagramLink;
- model.StoreInformationSettings.LinkedInLink = storeInformationSettings.LinkedInLink;
- model.StoreInformationSettings.PinterestLink = storeInformationSettings.PinterestLink;
//common
- model.StoreInformationSettings.StoreInDatabaseContactUsForm = commonSettings.StoreInDatabaseContactUsForm;
- model.StoreInformationSettings.SubjectFieldOnContactUsForm = commonSettings.SubjectFieldOnContactUsForm;
- model.StoreInformationSettings.UseSystemEmailForContactUsForm = commonSettings.UseSystemEmailForContactUsForm;
- model.StoreInformationSettings.SitemapEnabled = commonSettings.SitemapEnabled;
- model.StoreInformationSettings.SitemapIncludeCategories = commonSettings.SitemapIncludeCategories;
- model.StoreInformationSettings.SitemapIncludeImage = commonSettings.SitemapIncludeBrands;
- model.StoreInformationSettings.SitemapIncludeBrands = commonSettings.SitemapIncludeBrands;
- model.StoreInformationSettings.SitemapIncludeProducts = commonSettings.SitemapIncludeProducts;
- model.StoreInformationSettings.AllowToSelectStore = commonSettings.AllowToSelectStore;
- model.StoreInformationSettings.AllowToReadLetsEncryptFile = commonSettings.AllowToReadLetsEncryptFile;
- model.StoreInformationSettings.Log404Errors = commonSettings.Log404Errors;
- model.StoreInformationSettings.PopupForTermsOfServiceLinks = commonSettings.PopupForTermsOfServiceLinks;
+ var commonSettings = _settingService.LoadSetting<CommonSettings>(storeScope);
+ model.CommonSettings = commonSettings.ToModel();
//seo settings
var seoSettings = _settingService.LoadSetting<SeoSettings>(storeScope);
- model.SeoSettings.PageTitleSeparator = seoSettings.PageTitleSeparator;
- model.SeoSettings.PageTitleSeoAdjustment = seoSettings.PageTitleSeoAdjustment;
- model.SeoSettings.DefaultTitle = seoSettings.DefaultTitle;
- model.SeoSettings.DefaultMetaKeywords = seoSettings.DefaultMetaKeywords;
- model.SeoSettings.DefaultMetaDescription = seoSettings.DefaultMetaDescription;
- model.SeoSettings.GenerateProductMetaDescription = seoSettings.GenerateProductMetaDescription;
- model.SeoSettings.ConvertNonWesternChars = seoSettings.ConvertNonWesternChars;
- model.SeoSettings.SeoCharConversion = seoSettings.SeoCharConversion;
- model.SeoSettings.CanonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;
- model.SeoSettings.TwitterMetaTags = seoSettings.TwitterMetaTags;
- model.SeoSettings.OpenGraphMetaTags = seoSettings.OpenGraphMetaTags;
- model.SeoSettings.StorePictureId = seoSettings.StorePictureId;
- model.SeoSettings.AllowSlashChar = seoSettings.AllowSlashChar;
- model.SeoSettings.AllowUnicodeCharsInUrls = seoSettings.AllowUnicodeCharsInUrls;
- model.SeoSettings.CustomHeadTags = seoSettings.CustomHeadTags;
+ model.SeoSettings = seoSettings.ToModel();
//security settings
var securitySettings = _settingService.LoadSetting<SecuritySettings>(storeScope);
+ //captcha settings
var captchaSettings = _settingService.LoadSetting<CaptchaSettings>(storeScope);
+ model.SecuritySettings = captchaSettings.ToModel();
+
if (securitySettings.AdminAreaAllowedIpAddresses != null)
for (int i = 0; i < securitySettings.AdminAreaAllowedIpAddresses.Count; i++)
{
@@ -762,45 +722,21 @@ namespace Grand.Web.Admin.Controllers
if (i != securitySettings.AdminAreaAllowedIpAddresses.Count - 1)
model.SecuritySettings.AdminAreaAllowedIpAddresses += ",";
}
- model.SecuritySettings.CaptchaEnabled = captchaSettings.Enabled;
- model.SecuritySettings.CaptchaShowOnLoginPage = captchaSettings.ShowOnLoginPage;
- model.SecuritySettings.CaptchaShowOnRegistrationPage = captchaSettings.ShowOnRegistrationPage;
- model.SecuritySettings.CaptchaShowOnPasswordRecoveryPage = captchaSettings.ShowOnPasswordRecoveryPage;
- model.SecuritySettings.CaptchaShowOnContactUsPage = captchaSettings.ShowOnContactUsPage;
- model.SecuritySettings.CaptchaShowOnEmailWishlistToFriendPage = captchaSettings.ShowOnEmailWishlistToFriendPage;
- model.SecuritySettings.CaptchaShowOnEmailProductToFriendPage = captchaSettings.ShowOnEmailProductToFriendPage;
- model.SecuritySettings.CaptchaShowOnAskQuestionPage = captchaSettings.ShowOnAskQuestionPage;
- model.SecuritySettings.CaptchaShowOnBlogCommentPage = captchaSettings.ShowOnBlogCommentPage;
- model.SecuritySettings.CaptchaShowOnArticleCommentPage = captchaSettings.ShowOnArticleCommentPage;
- model.SecuritySettings.CaptchaShowOnNewsCommentPage = captchaSettings.ShowOnNewsCommentPage;
- model.SecuritySettings.CaptchaShowOnProductReviewPage = captchaSettings.ShowOnProductReviewPage;
- model.SecuritySettings.CaptchaShowOnApplyVendorPage = captchaSettings.ShowOnApplyVendorPage;
- model.SecuritySettings.ReCaptchaVersion = captchaSettings.ReCaptchaVersion;
+
model.SecuritySettings.AvailableReCaptchaVersions = GoogleReCaptchaVersion.V2.ToSelectList(HttpContext, false).ToList();
- model.SecuritySettings.ReCaptchaPublicKey = captchaSettings.ReCaptchaPublicKey;
- model.SecuritySettings.ReCaptchaPrivateKey = captchaSettings.ReCaptchaPrivateKey;
//PDF settings
var pdfSettings = _settingService.LoadSetting<PdfSettings>(storeScope);
- model.PdfSettings.LogoPictureId = pdfSettings.LogoPictureId;
- model.PdfSettings.DisablePdfInvoicesForPendingOrders = pdfSettings.DisablePdfInvoicesForPendingOrders;
- model.PdfSettings.InvoiceHeaderText = pdfSettings.InvoiceHeaderText;
- model.PdfSettings.InvoiceFooterText = pdfSettings.InvoiceFooterText;
+ model.PdfSettings = pdfSettings.ToModel();
//google analytics
- model.GoogleAnalyticsSettings.GaprivateKey = googleAnalyticsSettings.gaprivateKey;
- model.GoogleAnalyticsSettings.GaserviceAccountEmail = googleAnalyticsSettings.gaserviceAccountEmail;
- model.GoogleAnalyticsSettings.GaviewID = googleAnalyticsSettings.gaviewID;
+ var googleAnalyticsSettings = _settingService.LoadSetting<GoogleAnalyticsSettings>(storeScope);
+ model.GoogleAnalyticsSettings = googleAnalyticsSettings.ToModel();
//display menu settings
var displayMenuItemSettings = _settingService.LoadSetting<MenuItemSettings>(storeScope);
- model.DisplayMenuSettings.DisplayHomePageMenu = displayMenuItemSettings.DisplayHomePageMenu;
- model.DisplayMenuSettings.DisplayNewProductsMenu = displayMenuItemSettings.DisplayNewProductsMenu;
- model.DisplayMenuSettings.DisplaySearchMenu = displayMenuItemSettings.DisplaySearchMenu;
- model.DisplayMenuSettings.DisplayCustomerMenu = displayMenuItemSettings.DisplayCustomerMenu;
- model.DisplayMenuSettings.DisplayBlogMenu = displayMenuItemSettings.DisplayBlogMenu;
- model.DisplayMenuSettings.DisplayContactUsMenu = displayMenuItemSettings.DisplayContactUsMenu;
-
+ model.DisplayMenuSettings = displayMenuItemSettings.ToModel();
+
return View(model);
}
@@ -812,97 +748,43 @@ namespace Grand.Web.Admin.Controllers
//store information settings
var storeInformationSettings = _settingService.LoadSetting<StoreInformationSettings>(storeScope);
- var commonSettings = _settingService.LoadSetting<CommonSettings>(storeScope);
-
- storeInformationSettings.StoreClosed = model.StoreInformationSettings.StoreClosed;
- storeInformationSettings.DefaultStoreTheme = model.StoreInformationSettings.DefaultStoreTheme;
- storeInformationSettings.AllowCustomerToSelectTheme = model.StoreInformationSettings.AllowCustomerToSelectTheme;
- storeInformationSettings.AllowToSelectAdminTheme = model.StoreInformationSettings.AllowToSelectAdminTheme;
- storeInformationSettings.LogoPicture = model.StoreInformationSettings.LogoPicture;
- //EU Cookie law
- storeInformationSettings.DisplayCookieInformation = model.StoreInformationSettings.DisplayCookieInformation;
- storeInformationSettings.DisplayPrivacyPreference = model.StoreInformationSettings.DisplayPrivacyPreference;
- //social pages
- storeInformationSettings.FacebookLink = model.StoreInformationSettings.FacebookLink;
- storeInformationSettings.TwitterLink = model.StoreInformationSettings.TwitterLink;
- storeInformationSettings.YoutubeLink = model.StoreInformationSettings.YoutubeLink;
- storeInformationSettings.InstagramLink = model.StoreInformationSettings.InstagramLink;
- storeInformationSettings.LinkedInLink = model.StoreInformationSettings.LinkedInLink;
- storeInformationSettings.PinterestLink = model.StoreInformationSettings.PinterestLink;
-
+ storeInformationSettings = model.StoreInformationSettings.ToEntity(storeInformationSettings);
await _settingService.SaveSetting(storeInformationSettings, storeScope);
+ //datetime settings
var dateTimeSettings = _settingService.LoadSetting<DateTimeSettings>(storeScope);
dateTimeSettings.DefaultStoreTimeZoneId = model.DateTimeSettings.DefaultStoreTimeZoneId;
await _settingService.SaveSetting(dateTimeSettings, storeScope);
- //contact us
- commonSettings.StoreInDatabaseContactUsForm = model.StoreInformationSettings.StoreInDatabaseContactUsForm;
- commonSettings.SubjectFieldOnContactUsForm = model.StoreInformationSettings.SubjectFieldOnContactUsForm;
- commonSettings.UseSystemEmailForContactUsForm = model.StoreInformationSettings.UseSystemEmailForContactUsForm;
- commonSettings.SitemapEnabled = model.StoreInformationSettings.SitemapEnabled;
- commonSettings.SitemapIncludeCategories = model.StoreInformationSettings.SitemapIncludeCategories;
- commonSettings.SitemapIncludeImage = model.StoreInformationSettings.SitemapIncludeImage;
- commonSettings.SitemapIncludeBrands = model.StoreInformationSettings.SitemapIncludeBrands;
- commonSettings.SitemapIncludeProducts = model.StoreInformationSettings.SitemapIncludeProducts;
- commonSettings.AllowToSelectStore = model.StoreInformationSettings.AllowToSelectStore;
- commonSettings.AllowToReadLetsEncryptFile = model.StoreInformationSettings.AllowToReadLetsEncryptFile;
- commonSettings.Log404Errors = model.StoreInformationSettings.Log404Errors;
- commonSettings.PopupForTermsOfServiceLinks = model.StoreInformationSettings.PopupForTermsOfServiceLinks;
-
+ //common settings
+ var commonSettings = _settingService.LoadSetting<CommonSettings>(storeScope);
+ commonSettings = model.CommonSettings.ToEntity(commonSettings);
await _settingService.SaveSetting(commonSettings, storeScope);
//seo settings
var seoSettings = _settingService.LoadSetting<SeoSettings>(storeScope);
- seoSettings.PageTitleSeparator = model.SeoSettings.PageTitleSeparator;
- seoSettings.PageTitleSeoAdjustment = model.SeoSettings.PageTitleSeoAdjustment;
- seoSettings.DefaultTitle = model.SeoSettings.DefaultTitle;
- seoSettings.DefaultMetaKeywords = model.SeoSettings.DefaultMetaKeywords;
- seoSettings.DefaultMetaDescription = model.SeoSettings.DefaultMetaDescription;
- seoSettings.GenerateProductMetaDescription = model.SeoSettings.GenerateProductMetaDescription;
- seoSettings.ConvertNonWesternChars = model.SeoSettings.ConvertNonWesternChars;
- seoSettings.SeoCharConversion = model.SeoSettings.SeoCharConversion;
- seoSettings.CanonicalUrlsEnabled = model.SeoSettings.CanonicalUrlsEnabled;
- seoSettings.TwitterMetaTags = model.SeoSettings.TwitterMetaTags;
- seoSettings.OpenGraphMetaTags = model.SeoSettings.OpenGraphMetaTags;
- seoSettings.StorePictureId = model.SeoSettings.StorePictureId;
- seoSettings.AllowSlashChar = model.SeoSettings.AllowSlashChar;
- seoSettings.AllowUnicodeCharsInUrls = model.SeoSettings.AllowUnicodeCharsInUrls;
- seoSettings.CustomHeadTags = model.SeoSettings.CustomHeadTags;
-
+ seoSettings = model.SeoSettings.ToEntity(seoSettings);
await _settingService.SaveSetting(seoSettings, storeScope);
//security settings
var securitySettings = _settingService.LoadSetting<SecuritySettings>(storeScope);
- var captchaSettings = _settingService.LoadSetting<CaptchaSettings>(storeScope);
+
if (securitySettings.AdminAreaAllowedIpAddresses == null)
securitySettings.AdminAreaAllowedIpAddresses = new List<string>();
securitySettings.AdminAreaAllowedIpAddresses.Clear();
- if (!String.IsNullOrEmpty(model.SecuritySettings.AdminAreaAllowedIpAddresses))
- foreach (string s in model.SecuritySettings.AdminAreaAllowedIpAddresses.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
- if (!String.IsNullOrWhiteSpace(s))
+ if (!string.IsNullOrEmpty(model.SecuritySettings.AdminAreaAllowedIpAddresses))
+ foreach (var s in model.SecuritySettings.AdminAreaAllowedIpAddresses.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+ if (!string.IsNullOrWhiteSpace(s))
securitySettings.AdminAreaAllowedIpAddresses.Add(s.Trim());
await _settingService.SaveSetting(securitySettings);
- captchaSettings.Enabled = model.SecuritySettings.CaptchaEnabled;
- captchaSettings.ShowOnLoginPage = model.SecuritySettings.CaptchaShowOnLoginPage;
- captchaSettings.ShowOnRegistrationPage = model.SecuritySettings.CaptchaShowOnRegistrationPage;
- captchaSettings.ShowOnPasswordRecoveryPage = model.SecuritySettings.CaptchaShowOnPasswordRecoveryPage;
- captchaSettings.ShowOnContactUsPage = model.SecuritySettings.CaptchaShowOnContactUsPage;
- captchaSettings.ShowOnEmailWishlistToFriendPage = model.SecuritySettings.CaptchaShowOnEmailWishlistToFriendPage;
- captchaSettings.ShowOnAskQuestionPage = model.SecuritySettings.CaptchaShowOnAskQuestionPage;
- captchaSettings.ShowOnEmailProductToFriendPage = model.SecuritySettings.CaptchaShowOnEmailProductToFriendPage;
- captchaSettings.ShowOnBlogCommentPage = model.SecuritySettings.CaptchaShowOnBlogCommentPage;
- captchaSettings.ShowOnArticleCommentPage = model.SecuritySettings.CaptchaShowOnArticleCommentPage;
- captchaSettings.ShowOnNewsCommentPage = model.SecuritySettings.CaptchaShowOnNewsCommentPage;
- captchaSettings.ShowOnProductReviewPage = model.SecuritySettings.CaptchaShowOnProductReviewPage;
- captchaSettings.ShowOnApplyVendorPage = model.SecuritySettings.CaptchaShowOnApplyVendorPage;
- captchaSettings.ReCaptchaVersion = model.SecuritySettings.ReCaptchaVersion;
- captchaSettings.ReCaptchaPublicKey = model.SecuritySettings.ReCaptchaPublicKey;
- captchaSettings.ReCaptchaPrivateKey = model.SecuritySettings.ReCaptchaPrivateKey;
+
+ //captcha settings
+ var captchaSettings = _settingService.LoadSetting<CaptchaSettings>(storeScope);
+ captchaSettings = model.SecuritySettings.ToEntity(captchaSettings);
await _settingService.SaveSetting(captchaSettings);
if (captchaSettings.Enabled &&
- (String.IsNullOrWhiteSpace(captchaSettings.ReCaptchaPublicKey) || String.IsNullOrWhiteSpace(captchaSettings.ReCaptchaPrivateKey)))
+ (string.IsNullOrWhiteSpace(captchaSettings.ReCaptchaPublicKey) || string.IsNullOrWhiteSpace(captchaSettings.ReCaptchaPrivateKey)))
{
//captcha is enabled but the keys are not entered
Error("Captcha is enabled but the appropriate keys are not entered");
@@ -910,34 +792,17 @@ namespace Grand.Web.Admin.Controllers
//PDF settings
var pdfSettings = _settingService.LoadSetting<PdfSettings>(storeScope);
- pdfSettings.LogoPictureId = model.PdfSettings.LogoPictureId;
- pdfSettings.DisablePdfInvoicesForPendingOrders = model.PdfSettings.DisablePdfInvoicesForPendingOrders;
- pdfSettings.InvoiceHeaderText = model.PdfSettings.InvoiceHeaderText;
- pdfSettings.InvoiceFooterText = model.PdfSettings.InvoiceFooterText;
+ pdfSettings = model.PdfSettings.ToEntity(pdfSettings);
await _settingService.SaveSetting(pdfSettings, storeScope);
-
- //admin settings
- var adminareasettings = _settingService.LoadSetting<AdminAreaSettings>(storeScope);
-
- await _settingService.SaveSetting(adminareasettings);
-
+
//googleanalytics settings
var googleAnalyticsSettings = _settingService.LoadSetting<GoogleAnalyticsSettings>(storeScope);
- googleAnalyticsSettings.gaprivateKey = model.GoogleAnalyticsSettings.GaprivateKey;
- googleAnalyticsSettings.gaserviceAccountEmail = model.GoogleAnalyticsSettings.GaserviceAccountEmail;
- googleAnalyticsSettings.gaviewID = model.GoogleAnalyticsSettings.GaviewID;
-
+ googleAnalyticsSettings = model.GoogleAnalyticsSettings.ToEntity(googleAnalyticsSettings);
await _settingService.SaveSetting(googleAnalyticsSettings, storeScope);
- //Menu item settings
+ //menu item settings
var displayMenuItemSettings = _settingService.LoadSetting<MenuItemSettings>(storeScope);
- displayMenuItemSettings.DisplayHomePageMenu = model.DisplayMenuSettings.DisplayHomePageMenu;
- displayMenuItemSettings.DisplayNewProductsMenu = model.DisplayMenuSettings.DisplayNewProductsMenu;
- displayMenuItemSettings.DisplaySearchMenu = model.DisplayMenuSettings.DisplaySearchMenu;
- displayMenuItemSettings.DisplayCustomerMenu = model.DisplayMenuSettings.DisplayCustomerMenu;
- displayMenuItemSettings.DisplayBlogMenu = model.DisplayMenuSettings.DisplayBlogMenu;
- displayMenuItemSettings.DisplayContactUsMenu = model.DisplayMenuSettings.DisplayContactUsMenu;
-
+ displayMenuItemSettings = model.DisplayMenuSettings.ToEntity(displayMenuItemSettings);
await _settingService.SaveSetting(displayMenuItemSettings, storeScope);
//now clear cache
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs
new file mode 100644
index 000000000..5395d241a
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/CommonSettingsMappingExtensions.cs
@@ -0,0 +1,19 @@
+using Grand.Domain.Common;
+using Grand.Domain.Seo;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class CommonSettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.CommonSettingsModel ToModel(this CommonSettings entity)
+ {
+ return entity.MapTo<CommonSettings, GeneralCommonSettingsModel.CommonSettingsModel>();
+ }
+ public static CommonSettings ToEntity(this GeneralCommonSettingsModel.CommonSettingsModel model, CommonSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/GoogleAnalyticsSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/GoogleAnalyticsSettingsMappingExtensions.cs
new file mode 100644
index 000000000..38bdc154c
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/GoogleAnalyticsSettingsMappingExtensions.cs
@@ -0,0 +1,18 @@
+using Grand.Domain.Seo;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class GoogleAnalyticsSettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.GoogleAnalyticsSettingsModel ToModel(this GoogleAnalyticsSettings entity)
+ {
+ return entity.MapTo<GoogleAnalyticsSettings, GeneralCommonSettingsModel.GoogleAnalyticsSettingsModel>();
+ }
+ public static GoogleAnalyticsSettings ToEntity(this GeneralCommonSettingsModel.GoogleAnalyticsSettingsModel model, GoogleAnalyticsSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/MenuItemSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/MenuItemSettingsMappingExtensions.cs
new file mode 100644
index 000000000..ec634bda8
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/MenuItemSettingsMappingExtensions.cs
@@ -0,0 +1,18 @@
+using Grand.Domain.Common;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class MenuItemSettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.DisplayMenuSettingsModel ToModel(this MenuItemSettings entity)
+ {
+ return entity.MapTo<MenuItemSettings, GeneralCommonSettingsModel.DisplayMenuSettingsModel>();
+ }
+ public static MenuItemSettings ToEntity(this GeneralCommonSettingsModel.DisplayMenuSettingsModel model, MenuItemSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/PdfSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/PdfSettingsMappingExtensions.cs
new file mode 100644
index 000000000..21363f950
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/PdfSettingsMappingExtensions.cs
@@ -0,0 +1,18 @@
+using Grand.Domain.Common;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class PdfSettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.PdfSettingsModel ToModel(this PdfSettings entity)
+ {
+ return entity.MapTo<PdfSettings, GeneralCommonSettingsModel.PdfSettingsModel>();
+ }
+ public static PdfSettings ToEntity(this GeneralCommonSettingsModel.PdfSettingsModel model, PdfSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/SecuritySettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/SecuritySettingsMappingExtensions.cs
new file mode 100644
index 000000000..e7ab8b861
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/SecuritySettingsMappingExtensions.cs
@@ -0,0 +1,18 @@
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+using Grand.Web.Common.Security.Captcha;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class SecuritySettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.SecuritySettingsModel ToModel(this CaptchaSettings entity)
+ {
+ return entity.MapTo<CaptchaSettings, GeneralCommonSettingsModel.SecuritySettingsModel>();
+ }
+ public static CaptchaSettings ToEntity(this GeneralCommonSettingsModel.SecuritySettingsModel model, CaptchaSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/SeoSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/SeoSettingsMappingExtensions.cs
new file mode 100644
index 000000000..5bdbea941
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/SeoSettingsMappingExtensions.cs
@@ -0,0 +1,18 @@
+using Grand.Domain.Seo;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class SeoSettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.SeoSettingsModel ToModel(this SeoSettings entity)
+ {
+ return entity.MapTo<SeoSettings, GeneralCommonSettingsModel.SeoSettingsModel>();
+ }
+ public static SeoSettings ToEntity(this GeneralCommonSettingsModel.SeoSettingsModel model, SeoSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/StoreInformationSettingsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/StoreInformationSettingsMappingExtensions.cs
new file mode 100644
index 000000000..15bdfb03c
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/StoreInformationSettingsMappingExtensions.cs
@@ -0,0 +1,18 @@
+using Grand.Domain.Stores;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Extensions
+{
+ public static class StoreInformationSettingsMappingExtensions
+ {
+ public static GeneralCommonSettingsModel.StoreInformationSettingsModel ToModel(this StoreInformationSettings entity)
+ {
+ return entity.MapTo<StoreInformationSettings, GeneralCommonSettingsModel.StoreInformationSettingsModel>();
+ }
+ public static StoreInformationSettings ToEntity(this GeneralCommonSettingsModel.StoreInformationSettingsModel model, StoreInformationSettings destination)
+ {
+ return model.MapTo(destination);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs
new file mode 100644
index 000000000..aade96697
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs
@@ -0,0 +1,53 @@
+using AutoMapper;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+using Grand.Web.Common.Security.Captcha;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class CaptchaSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public CaptchaSettingsProfile()
+ {
+ CreateMap<CaptchaSettings, GeneralCommonSettingsModel.SecuritySettingsModel>()
+ .ForMember(dest => dest.CaptchaEnabled, mo => mo.MapFrom(p => p.Enabled))
+ .ForMember(dest => dest.CaptchaShowOnLoginPage, mo => mo.MapFrom(p => p.ShowOnLoginPage))
+ .ForMember(dest => dest.CaptchaShowOnRegistrationPage, mo => mo.MapFrom(p => p.ShowOnRegistrationPage))
+ .ForMember(dest => dest.CaptchaShowOnPasswordRecoveryPage, mo => mo.MapFrom(p => p.ShowOnPasswordRecoveryPage))
+ .ForMember(dest => dest.CaptchaShowOnContactUsPage, mo => mo.MapFrom(p => p.ShowOnContactUsPage))
+ .ForMember(dest => dest.CaptchaShowOnEmailWishlistToFriendPage, mo => mo.MapFrom(p => p.ShowOnEmailWishlistToFriendPage))
+ .ForMember(dest => dest.CaptchaShowOnEmailProductToFriendPage, mo => mo.MapFrom(p => p.ShowOnEmailProductToFriendPage))
+ .ForMember(dest => dest.CaptchaShowOnAskQuestionPage, mo => mo.MapFrom(p => p.ShowOnAskQuestionPage))
+ .ForMember(dest => dest.CaptchaShowOnBlogCommentPage, mo => mo.MapFrom(p => p.ShowOnBlogCommentPage))
+ .ForMember(dest => dest.CaptchaShowOnArticleCommentPage, mo => mo.MapFrom(p => p.ShowOnArticleCommentPage))
+ .ForMember(dest => dest.CaptchaShowOnNewsCommentPage, mo => mo.MapFrom(p => p.ShowOnNewsCommentPage))
+ .ForMember(dest => dest.CaptchaShowOnProductReviewPage, mo => mo.MapFrom(p => p.ShowOnProductReviewPage))
+ .ForMember(dest => dest.CaptchaShowOnApplyVendorPage, mo => mo.MapFrom(p => p.ShowOnApplyVendorPage))
+ .ForMember(dest => dest.ReCaptchaVersion, mo => mo.MapFrom(p => p.ReCaptchaVersion))
+ .ForMember(dest => dest.ReCaptchaPublicKey, mo => mo.MapFrom(p => p.ReCaptchaPublicKey))
+ .ForMember(dest => dest.ReCaptchaPrivateKey, mo => mo.MapFrom(p => p.ReCaptchaPrivateKey))
+ .ForMember(dest => dest.AvailableReCaptchaVersions, mo => mo.Ignore())
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+
+ CreateMap<GeneralCommonSettingsModel.SecuritySettingsModel, CaptchaSettings>()
+ .ForMember(dest => dest.Enabled, mo => mo.MapFrom(p => p.CaptchaEnabled))
+ .ForMember(dest => dest.ShowOnLoginPage, mo => mo.MapFrom(p => p.CaptchaShowOnLoginPage))
+ .ForMember(dest => dest.ShowOnRegistrationPage, mo => mo.MapFrom(p => p.CaptchaShowOnRegistrationPage))
+ .ForMember(dest => dest.ShowOnPasswordRecoveryPage, mo => mo.MapFrom(p => p.CaptchaShowOnPasswordRecoveryPage))
+ .ForMember(dest => dest.ShowOnContactUsPage, mo => mo.MapFrom(p => p.CaptchaShowOnContactUsPage))
+ .ForMember(dest => dest.ShowOnEmailWishlistToFriendPage, mo => mo.MapFrom(p => p.CaptchaShowOnEmailWishlistToFriendPage))
+ .ForMember(dest => dest.ShowOnEmailProductToFriendPage, mo => mo.MapFrom(p => p.CaptchaShowOnEmailProductToFriendPage))
+ .ForMember(dest => dest.ShowOnAskQuestionPage, mo => mo.MapFrom(p => p.CaptchaShowOnAskQuestionPage))
+ .ForMember(dest => dest.ShowOnBlogCommentPage, mo => mo.MapFrom(p => p.CaptchaShowOnBlogCommentPage))
+ .ForMember(dest => dest.ShowOnArticleCommentPage, mo => mo.MapFrom(p => p.CaptchaShowOnArticleCommentPage))
+ .ForMember(dest => dest.ShowOnNewsCommentPage, mo => mo.MapFrom(p => p.CaptchaShowOnNewsCommentPage))
+ .ForMember(dest => dest.ShowOnProductReviewPage, mo => mo.MapFrom(p => p.CaptchaShowOnProductReviewPage))
+ .ForMember(dest => dest.ShowOnApplyVendorPage, mo => mo.MapFrom(p => p.CaptchaShowOnApplyVendorPage))
+ .ForMember(dest => dest.ReCaptchaVersion, mo => mo.MapFrom(p => p.ReCaptchaVersion))
+ .ForMember(dest => dest.ReCaptchaPublicKey, mo => mo.MapFrom(p => p.ReCaptchaPublicKey))
+ .ForMember(dest => dest.ReCaptchaPrivateKey, mo => mo.MapFrom(p => p.ReCaptchaPrivateKey));
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/CommonSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CommonSettingsProfile.cs
new file mode 100644
index 000000000..0f3301b52
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/CommonSettingsProfile.cs
@@ -0,0 +1,19 @@
+using AutoMapper;
+using Grand.Domain.Common;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class CommonSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public CommonSettingsProfile()
+ {
+ CreateMap<CommonSettings, GeneralCommonSettingsModel.CommonSettingsModel>()
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ CreateMap<GeneralCommonSettingsModel.CommonSettingsModel, CommonSettings>();
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/GoogleAnalyticsSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/GoogleAnalyticsSettingsProfile.cs
new file mode 100644
index 000000000..fc13addc0
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/GoogleAnalyticsSettingsProfile.cs
@@ -0,0 +1,19 @@
+using AutoMapper;
+using Grand.Domain.Seo;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class GoogleAnalyticsSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public GoogleAnalyticsSettingsProfile()
+ {
+ CreateMap<GoogleAnalyticsSettings, GeneralCommonSettingsModel.GoogleAnalyticsSettingsModel>()
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ CreateMap<GeneralCommonSettingsModel.GoogleAnalyticsSettingsModel, GoogleAnalyticsSettings>();
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/MenuItemSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/MenuItemSettingsProfile.cs
new file mode 100644
index 000000000..9475f81a5
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/MenuItemSettingsProfile.cs
@@ -0,0 +1,19 @@
+using AutoMapper;
+using Grand.Domain.Common;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class MenuItemSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public MenuItemSettingsProfile()
+ {
+ CreateMap<MenuItemSettings, GeneralCommonSettingsModel.DisplayMenuSettingsModel>()
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ CreateMap<GeneralCommonSettingsModel.DisplayMenuSettingsModel, MenuItemSettings>();
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/PdfSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/PdfSettingsProfile.cs
new file mode 100644
index 000000000..f7b7f4880
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/PdfSettingsProfile.cs
@@ -0,0 +1,19 @@
+using AutoMapper;
+using Grand.Domain.Common;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class PdfSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public PdfSettingsProfile()
+ {
+ CreateMap<PdfSettings, GeneralCommonSettingsModel.PdfSettingsModel>()
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ CreateMap<GeneralCommonSettingsModel.PdfSettingsModel, PdfSettings>();
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/SeoSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/SeoSettingsProfile.cs
new file mode 100644
index 000000000..8407d61ee
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/SeoSettingsProfile.cs
@@ -0,0 +1,19 @@
+using AutoMapper;
+using Grand.Domain.Seo;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class SeoSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public SeoSettingsProfile()
+ {
+ CreateMap<SeoSettings, GeneralCommonSettingsModel.SeoSettingsModel>()
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ CreateMap<GeneralCommonSettingsModel.SeoSettingsModel, SeoSettings>();
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Mapper/StoreInformationSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/StoreInformationSettingsProfile.cs
new file mode 100644
index 000000000..a80595198
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Mapper/StoreInformationSettingsProfile.cs
@@ -0,0 +1,20 @@
+using AutoMapper;
+using Grand.Domain.Stores;
+using Grand.Infrastructure.Mapper;
+using Grand.Web.Admin.Models.Settings;
+
+namespace Grand.Web.Admin.Mapper
+{
+ public class StoreInformationSettingsProfile : Profile, IAutoMapperProfile
+ {
+ public StoreInformationSettingsProfile()
+ {
+ CreateMap<StoreInformationSettings, GeneralCommonSettingsModel.StoreInformationSettingsModel>()
+ .ForMember(dest => dest.AvailableStoreThemes, mo => mo.Ignore())
+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ CreateMap<GeneralCommonSettingsModel.StoreInformationSettingsModel, StoreInformationSettings>();
+ }
+
+ public int Order => 0;
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
index 4af64d8a4..e39d9463a 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
@@ -12,6 +12,7 @@ namespace Grand.Web.Admin.Models.Settings
public GeneralCommonSettingsModel()
{
StoreInformationSettings = new StoreInformationSettingsModel();
+ CommonSettings = new CommonSettingsModel();
DateTimeSettings = new DateTimeSettingsModel();
SeoSettings = new SeoSettingsModel();
SecuritySettings = new SecuritySettingsModel();
@@ -21,6 +22,7 @@ namespace Grand.Web.Admin.Models.Settings
}
public string ActiveStore { get; set; }
public StoreInformationSettingsModel StoreInformationSettings { get; set; }
+ public CommonSettingsModel CommonSettings { get; set; }
public DateTimeSettingsModel DateTimeSettings { get; set; }
public SeoSettingsModel SeoSettings { get; set; }
public SecuritySettingsModel SecuritySettings { get; set; }
@@ -79,7 +81,26 @@ namespace Grand.Web.Admin.Models.Settings
[GrandResourceDisplayName("Admin.Settings.GeneralCommon.PinterestLink")]
public string PinterestLink { get; set; }
+
+ #region Nested classes
+
+ public partial class ThemeConfigurationModel
+ {
+ public string ThemeName { get; set; }
+ public string ThemeVersion { get; set; }
+ public string ThemeTitle { get; set; }
+ public string PreviewImageUrl { get; set; }
+ public string PreviewText { get; set; }
+ public bool SupportRtl { get; set; }
+ public bool Selected { get; set; }
+ }
+ #endregion
+ }
+
+ public partial class CommonSettingsModel : BaseModel
+ {
+
[GrandResourceDisplayName("Admin.Settings.GeneralCommon.StoreInDatabaseContactUsForm")]
public bool StoreInDatabaseContactUsForm { get; set; }
@@ -117,22 +138,7 @@ namespace Grand.Web.Admin.Models.Settings
public bool SitemapIncludeProducts { get; set; }
- #region Nested classes
-
- public partial class ThemeConfigurationModel
- {
- public string ThemeName { get; set; }
- public string ThemeVersion { get; set; }
- public string ThemeTitle { get; set; }
- public string PreviewImageUrl { get; set; }
- public string PreviewText { get; set; }
- public bool SupportRtl { get; set; }
- public bool Selected { get; set; }
- }
-
- #endregion
}
-
public partial class DateTimeSettingsModel : BaseModel
{
public DateTimeSettingsModel()