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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Address name field is shown even after disabling it under the customer setting (#323)
jithendraprasad9999ddc2e52fa881
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.csindex 9b3a8ff5c..379632991 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs@@ -1171,7 +1171,7 @@ namespace Grand.Web.Admin.Servicesif (model.Address == null)model.Address = new AddressModel();- model.Address.NameEnabled = true;+ model.Address.NameEnabled = _addressSettings.NameEnabled;model.Address.FirstNameEnabled = true;model.Address.FirstNameRequired = true;model.Address.LastNameEnabled = true;diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.csindex b21047734..2a1f3a092 100644--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs@@ -589,7 +589,7 @@ namespace Grand.Web.Admin.Servicesmodel.BillingAddress = await order.BillingAddress.ToModel(_countryService);model.BillingAddress.FormattedCustomAddressAttributes = await _addressAttributeParser.FormatAttributes(_workContext.WorkingLanguage, order.BillingAddress.Attributes);- model.BillingAddress.NameEnabled = true;+ model.BillingAddress.NameEnabled = _addressSettings.NameEnabled;model.BillingAddress.FirstNameEnabled = true;model.BillingAddress.FirstNameRequired = true;model.BillingAddress.LastNameEnabled = true;@@ -628,7 +628,7 @@ namespace Grand.Web.Admin.Services{model.ShippingAddress = await order.ShippingAddress.ToModel(_countryService);model.ShippingAddress.FormattedCustomAddressAttributes = await _addressAttributeParser.FormatAttributes(_workContext.WorkingLanguage, order.ShippingAddress.Attributes);- model.ShippingAddress.NameEnabled = true;+ model.ShippingAddress.NameEnabled = _addressSettings.NameEnabled;model.ShippingAddress.FirstNameEnabled = true;model.ShippingAddress.FirstNameRequired = true;model.ShippingAddress.LastNameEnabled = true;@@ -888,7 +888,7 @@ namespace Grand.Web.Admin.ServicesAddress = await address.ToModel(_countryService)};model.Address.Id = address.Id;- model.Address.NameEnabled = true;+ model.Address.NameEnabled = _addressSettings.NameEnabled;model.Address.FirstNameEnabled = true;model.Address.FirstNameRequired = true;model.Address.LastNameEnabled = true;