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 - Vendor settings (address) - use automapper

KrzysztofPajak0779d0e9cdc8
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index ca5247876..123db08f0 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -162,22 +162,7 @@ namespace Grand.Web.Admin.Controllers
var storeScope = await GetActiveStore();
var vendorSettings = _settingService.LoadSetting<VendorSettings>(storeScope);
var model = vendorSettings.ToModel();
- model.AddressSettings.CityEnabled = vendorSettings.CityEnabled;
- model.AddressSettings.CityRequired = vendorSettings.CityRequired;
- model.AddressSettings.CompanyEnabled = vendorSettings.CompanyEnabled;
- model.AddressSettings.CompanyRequired = vendorSettings.CompanyRequired;
- model.AddressSettings.CountryEnabled = vendorSettings.CountryEnabled;
- model.AddressSettings.FaxEnabled = vendorSettings.FaxEnabled;
- model.AddressSettings.FaxRequired = vendorSettings.FaxRequired;
- model.AddressSettings.PhoneEnabled = vendorSettings.PhoneEnabled;
- model.AddressSettings.PhoneRequired = vendorSettings.PhoneRequired;
- model.AddressSettings.StateProvinceEnabled = vendorSettings.StateProvinceEnabled;
- model.AddressSettings.StreetAddress2Enabled = vendorSettings.StreetAddress2Enabled;
- model.AddressSettings.StreetAddress2Required = vendorSettings.StreetAddress2Required;
- model.AddressSettings.StreetAddressEnabled = vendorSettings.StreetAddressEnabled;
- model.AddressSettings.StreetAddressRequired = vendorSettings.StreetAddressRequired;
- model.AddressSettings.ZipPostalCodeEnabled = vendorSettings.ZipPostalCodeEnabled;
- model.AddressSettings.ZipPostalCodeRequired = vendorSettings.ZipPostalCodeRequired;
+
model.ActiveStore = storeScope;
return View(model);
@@ -189,23 +174,7 @@ namespace Grand.Web.Admin.Controllers
var storeScope = await GetActiveStore();
var vendorSettings = _settingService.LoadSetting<VendorSettings>(storeScope);
vendorSettings = model.ToEntity(vendorSettings);
- vendorSettings.CityEnabled = model.AddressSettings.CityEnabled;
- vendorSettings.CityRequired = model.AddressSettings.CityRequired;
- vendorSettings.CompanyEnabled = model.AddressSettings.CompanyEnabled;
- vendorSettings.CompanyRequired = model.AddressSettings.CompanyRequired;
- vendorSettings.CountryEnabled = model.AddressSettings.CountryEnabled;
- vendorSettings.FaxEnabled = model.AddressSettings.FaxEnabled;
- vendorSettings.FaxRequired = model.AddressSettings.FaxRequired;
- vendorSettings.PhoneEnabled = model.AddressSettings.PhoneEnabled;
- vendorSettings.PhoneRequired = model.AddressSettings.PhoneRequired;
- vendorSettings.StateProvinceEnabled = model.AddressSettings.StateProvinceEnabled;
- vendorSettings.StreetAddress2Enabled = model.AddressSettings.StreetAddress2Enabled;
- vendorSettings.StreetAddress2Required = model.AddressSettings.StreetAddress2Required;
- vendorSettings.StreetAddressEnabled = model.AddressSettings.StreetAddressEnabled;
- vendorSettings.StreetAddressRequired = model.AddressSettings.StreetAddressRequired;
- vendorSettings.ZipPostalCodeEnabled = model.AddressSettings.ZipPostalCodeEnabled;
- vendorSettings.ZipPostalCodeRequired = model.AddressSettings.ZipPostalCodeRequired;
-
+
await _settingService.SaveSetting(vendorSettings, storeScope);
//now clear cache
diff --git a/src/Web/Grand.Web.Admin/Mapper/VendorSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/VendorSettingsProfile.cs
index 8ca9a3055..509d4a266 100644
--- a/src/Web/Grand.Web.Admin/Mapper/VendorSettingsProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/VendorSettingsProfile.cs
@@ -11,11 +11,41 @@ namespace Grand.Web.Admin.Mapper
{
CreateMap<VendorSettings, VendorSettingsModel>()
.ForMember(dest => dest.ActiveStore, mo => mo.Ignore())
- .ForMember(dest => dest.AddressSettings, mo => mo.Ignore())
- .ForMember(dest => dest.UserFields, mo => mo.Ignore());
+ .ForPath(dest => dest.AddressSettings.CityEnabled, mo => mo.MapFrom(p => p.CityEnabled))
+ .ForPath(dest => dest.AddressSettings.CityRequired, mo => mo.MapFrom(p => p.CityRequired))
+ .ForPath(dest => dest.AddressSettings.CompanyEnabled, mo => mo.MapFrom(p => p.CompanyEnabled))
+ .ForPath(dest => dest.AddressSettings.CompanyRequired, mo => mo.MapFrom(p => p.CompanyRequired))
+ .ForPath(dest => dest.AddressSettings.CountryEnabled, mo => mo.MapFrom(p => p.CountryEnabled))
+ .ForPath(dest => dest.AddressSettings.FaxEnabled, mo => mo.MapFrom(p => p.FaxEnabled))
+ .ForPath(dest => dest.AddressSettings.FaxRequired, mo => mo.MapFrom(p => p.FaxRequired))
+ .ForPath(dest => dest.AddressSettings.PhoneEnabled, mo => mo.MapFrom(p => p.PhoneEnabled))
+ .ForPath(dest => dest.AddressSettings.PhoneRequired, mo => mo.MapFrom(p => p.PhoneRequired))
+ .ForPath(dest => dest.AddressSettings.StateProvinceEnabled, mo => mo.MapFrom(p => p.StateProvinceEnabled))
+ .ForPath(dest => dest.AddressSettings.StreetAddress2Enabled, mo => mo.MapFrom(p => p.StreetAddress2Enabled))
+ .ForPath(dest => dest.AddressSettings.StreetAddress2Required, mo => mo.MapFrom(p => p.StreetAddress2Required))
+ .ForPath(dest => dest.AddressSettings.StreetAddressEnabled, mo => mo.MapFrom(p => p.StreetAddressEnabled))
+ .ForPath(dest => dest.AddressSettings.StreetAddressRequired, mo => mo.MapFrom(p => p.StreetAddressRequired))
+ .ForPath(dest => dest.AddressSettings.ZipPostalCodeEnabled, mo => mo.MapFrom(p => p.ZipPostalCodeEnabled))
+ .ForPath(dest => dest.AddressSettings.ZipPostalCodeRequired, mo => mo.MapFrom(p => p.ZipPostalCodeRequired))
+ .ForPath(dest => dest.UserFields, mo => mo.Ignore());
CreateMap<VendorSettingsModel, VendorSettings>()
- .ForMember(dest => dest.DefaultVendorPageSizeOptions, mo => mo.Ignore());
+ .ForPath(dest => dest.CityEnabled, mo => mo.MapFrom(p => p.AddressSettings.CityEnabled))
+ .ForPath(dest => dest.CityRequired, mo => mo.MapFrom(p => p.AddressSettings.CityRequired))
+ .ForPath(dest => dest.CompanyEnabled, mo => mo.MapFrom(p => p.AddressSettings.CompanyEnabled))
+ .ForPath(dest => dest.CompanyRequired, mo => mo.MapFrom(p => p.AddressSettings.CompanyRequired))
+ .ForPath(dest => dest.CountryEnabled, mo => mo.MapFrom(p => p.AddressSettings.CountryEnabled))
+ .ForPath(dest => dest.FaxEnabled, mo => mo.MapFrom(p => p.AddressSettings.FaxEnabled))
+ .ForPath(dest => dest.FaxRequired, mo => mo.MapFrom(p => p.AddressSettings.FaxRequired))
+ .ForPath(dest => dest.PhoneEnabled, mo => mo.MapFrom(p => p.AddressSettings.PhoneEnabled))
+ .ForPath(dest => dest.PhoneRequired, mo => mo.MapFrom(p => p.AddressSettings.PhoneRequired))
+ .ForPath(dest => dest.StateProvinceEnabled, mo => mo.MapFrom(p => p.AddressSettings.StateProvinceEnabled))
+ .ForPath(dest => dest.StreetAddress2Enabled, mo => mo.MapFrom(p => p.AddressSettings.StreetAddress2Enabled))
+ .ForPath(dest => dest.StreetAddress2Required, mo => mo.MapFrom(p => p.AddressSettings.StreetAddress2Required))
+ .ForPath(dest => dest.StreetAddressEnabled, mo => mo.MapFrom(p => p.AddressSettings.StreetAddressEnabled))
+ .ForPath(dest => dest.StreetAddressRequired, mo => mo.MapFrom(p => p.AddressSettings.StreetAddressRequired))
+ .ForPath(dest => dest.ZipPostalCodeEnabled, mo => mo.MapFrom(p => p.AddressSettings.ZipPostalCodeEnabled))
+ .ForPath(dest => dest.ZipPostalCodeRequired, mo => mo.MapFrom(p => p.AddressSettings.ZipPostalCodeRequired));
}
public int Order => 0;