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
Fix selected state province if state province is enabled
KrzysztofPajak31a4fba1b219
diff --git a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs b/src/API/Grand.Api/Validators/Customers/AddressValidator.csindex b986d119b..396d11450 100644--- a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs+++ b/src/API/Grand.Api/Validators/Customers/AddressValidator.cs@@ -6,6 +6,7 @@ using Grand.Domain.Common;using Grand.Infrastructure.Validators;using System;using System.Collections.Generic;+using System.Linq;namespace Grand.Api.Validators.Customers{@@ -41,18 +42,19 @@ namespace Grand.Api.Validators.Customers{RuleFor(x => x.StateProvinceId).MustAsync(async (x, y, context) =>{- //does selected country has states?- var countryId = !String.IsNullOrEmpty(x.CountryId) ? x.CountryId : "";- var hasStates = (await countryService.GetStateProvincesByCountryId(countryId)).Count > 0;- if (hasStates)+ var countryId = !string.IsNullOrEmpty(x.CountryId) ? x.CountryId : "";+ var country = await countryService.GetCountryById(countryId);+ if (country.StateProvinces.Any()){//if yes, then ensure that state is selectedif (String.IsNullOrEmpty(y)){return false;}+ if (country.StateProvinces.FirstOrDefault(x => x.Id == y) != null)+ return true;}- return true;+ return false;}).WithMessage(translationService.GetResource("Api.Customers.Address.Fields.StateProvince.Required"));}if (addressSettings.CompanyRequired && addressSettings.CompanyEnabled)diff --git a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs b/src/API/Grand.Api/Validators/Customers/CustomerValidator.csindex 18cb8b146..4f5ccdd70 100644--- a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs+++ b/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs@@ -7,6 +7,7 @@ using Grand.Business.Customers.Interfaces;using Grand.Domain.Customers;using Grand.Infrastructure.Validators;using System.Collections.Generic;+using System.Linq;namespace Grand.Api.Validators.Customers{@@ -74,18 +75,19 @@ namespace Grand.Api.Validators.CustomersRuleFor(x => x.StateProvinceId).MustAsync(async (x, y, context) =>{- //does selected country has states?var countryId = !string.IsNullOrEmpty(x.CountryId) ? x.CountryId : "";- var hasStates = (await countryService.GetStateProvincesByCountryId(countryId)).Count > 0;- if (hasStates)+ var country = await countryService.GetCountryById(countryId);+ if (country.StateProvinces.Any()){//if yes, then ensure that state is selectedif (string.IsNullOrEmpty(y)){return false;}+ if (country.StateProvinces.FirstOrDefault(x => x.Id == y) != null)+ return true;}- return true;+ return false;}).WithMessage(translationService.GetResource("pi.Customers.Customer.Fields.StateProvince.Required"));}if (customerSettings.CompanyRequired && customerSettings.CompanyEnabled)diff --git a/src/Plugins/Shipping.ByWeight/Controllers/ShippingByWeightController.cs b/src/Plugins/Shipping.ByWeight/Controllers/ShippingByWeightController.csindex 72187488a..c0c2ab277 100644--- a/src/Plugins/Shipping.ByWeight/Controllers/ShippingByWeightController.cs+++ b/src/Plugins/Shipping.ByWeight/Controllers/ShippingByWeightController.cs@@ -197,7 +197,7 @@ namespace Shipping.ByWeight.Controllersforeach (var c in countries)model.AvailableCountries.Add(new SelectListItem { Text = c.Name, Value = c.Id.ToString() });//states- model.AvailableStates.Add(new SelectListItem { Text = "*", Value = " " });+ model.AvailableStates.Add(new SelectListItem { Text = "*", Value = "" });return View("~/Plugins/Shipping.ByWeight/Views/AddPopup.cshtml", model);}diff --git a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs b/src/Web/Grand.Web.Admin/Controllers/HomeController.csindex b9ab6e6fe..fca1665b2 100644--- a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs@@ -171,20 +171,11 @@ namespace Grand.Web.Admin.Controllers{result.Insert(0, new { id = "", name = _translationService.GetResource("Admin.Address.SelectState") });}- else- {- result.Insert(0, new { id = "", name = _translationService.GetResource("Admin.Address.OtherNonUS") });- }}else{//some country is selected- if (result.Count == 0)- {- //country does not have states- result.Insert(0, new { id = "", name = _translationService.GetResource("Admin.Address.OtherNonUS") });- }- else+ if (result.Any()){//country has some statesif (addSelectStateItem.HasValue && addSelectStateItem.Value)diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.csindex e7b384459..26c64f3b8 100644--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs@@ -97,8 +97,6 @@ namespace Grand.Web.Admin.Controllersforeach (var s in states)model.Address.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == model.Address.StateProvinceId) });}- else- model.Address.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });model.Address.CountryEnabled = true;model.Address.StateProvinceEnabled = true;@@ -123,8 +121,6 @@ namespace Grand.Web.Admin.Controllersforeach (var s in states)model.Address.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == model.Address.StateProvinceId) });}- else- model.Address.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });model.Address.CountryEnabled = true;model.Address.StateProvinceEnabled = true;@@ -366,8 +362,6 @@ namespace Grand.Web.Admin.Controllersforeach (var s in states)model.ShippingOriginAddress.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == originAddress.StateProvinceId) });}- else- model.ShippingOriginAddress.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });model.ShippingOriginAddress.CountryEnabled = true;model.ShippingOriginAddress.StateProvinceEnabled = true;diff --git a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs b/src/Web/Grand.Web.Admin/Controllers/TaxController.csindex fca69bbd4..087f13a25 100644--- a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs@@ -171,8 +171,7 @@ namespace Grand.Web.Admin.Controllersforeach (var s in states)model.DefaultTaxAddress.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == defaultAddress.StateProvinceId) });}- else- model.DefaultTaxAddress.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });+model.DefaultTaxAddress.CountryEnabled = true;model.DefaultTaxAddress.StateProvinceEnabled = true;model.DefaultTaxAddress.ZipPostalCodeEnabled = true;diff --git a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.csindex 54c2ea217..e1ccebf53 100644--- a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs@@ -106,8 +106,6 @@ namespace Grand.Web.Admin.Servicesforeach (var s in states)model.Address.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (affiliate != null && s.Id == affiliate.Address.StateProvinceId) });}- else- model.Address.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });}}diff --git a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.csindex a5fc811e5..1008f15df 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs@@ -188,8 +188,7 @@ namespace Grand.Web.Admin.Servicesvar customerTag2 = await _customerTagService.GetCustomerTagByName(customerTagName);if (customerTag2 == null){- customerTag = new CustomerTag- {+ customerTag = new CustomerTag {Name = customerTagName,};await _customerTagService.InsertCustomerTag(customerTag);@@ -232,8 +231,7 @@ namespace Grand.Web.Admin.Servicesif (method == null)continue;- result.Add(new CustomerModel.AssociatedExternalAuthModel- {+ result.Add(new CustomerModel.AssociatedExternalAuthModel {Id = record.Id,Email = record.Email,ExternalIdentifier = record.ExternalIdentifier,@@ -246,8 +244,7 @@ namespace Grand.Web.Admin.Servicesprotected virtual async Task<CustomerModel> PrepareCustomerModelForList(Customer customer){- return new CustomerModel- {+ return new CustomerModel {Id = customer.Id,Email = !string.IsNullOrEmpty(customer.Email) ? customer.Email : _translationService.GetResource("Admin.Customers.Guest"),Username = customer.Username,@@ -267,16 +264,14 @@ namespace Grand.Web.Admin.Servicesif (model == null)throw new ArgumentNullException(nameof(model));- model.AvailableSalesEmployees.Add(new SelectListItem- {+ model.AvailableSalesEmployees.Add(new SelectListItem {Text = _translationService.GetResource("Admin.Customers.Customers.Fields.SalesEmployee.None"),Value = ""});var employees = await _salesEmployeeService.GetAll();foreach (var employee in employees.Where(x => x.Active)){- model.AvailableSalesEmployees.Add(new SelectListItem- {+ model.AvailableSalesEmployees.Add(new SelectListItem {Text = employee.Name,Value = employee.Id});@@ -289,16 +284,14 @@ namespace Grand.Web.Admin.Servicesif (model == null)throw new ArgumentNullException(nameof(model));- model.AvailableStores.Add(new SelectListItem- {+ model.AvailableStores.Add(new SelectListItem {Text = _translationService.GetResource("Admin.Customers.Customers.Fields.StaffStore.None"),Value = ""});var stores = await _storeService.GetAllStores();foreach (var store in stores){- model.AvailableStores.Add(new SelectListItem- {+ model.AvailableStores.Add(new SelectListItem {Text = store.Shortcut,Value = store.Id.ToString()});@@ -310,8 +303,7 @@ namespace Grand.Web.Admin.Servicesvar customerAttributes = await _customerAttributeService.GetAllCustomerAttributes();foreach (var attribute in customerAttributes){- var attributeModel = new CustomerModel.CustomerAttributeModel- {+ var attributeModel = new CustomerModel.CustomerAttributeModel {Id = attribute.Id,Name = attribute.Name,IsRequired = attribute.IsRequired,@@ -324,8 +316,7 @@ namespace Grand.Web.Admin.Servicesvar attributeValues = attribute.CustomerAttributeValues;foreach (var attributeValue in attributeValues){- var attributeValueModel = new CustomerModel.CustomerAttributeValueModel- {+ var attributeValueModel = new CustomerModel.CustomerAttributeValueModel {Id = attributeValue.Id,Name = attributeValue.Name,IsPreSelected = attributeValue.IsPreSelected@@ -397,8 +388,7 @@ namespace Grand.Web.Admin.Services{var registered = await _groupService.GetCustomerGroupBySystemName(SystemCustomerGroupNames.Registered);var customerGroups = await _groupService.GetAllCustomerGroups(showHidden: true);- var model = new CustomerListModel- {+ var model = new CustomerListModel {UsernamesEnabled = _customerSettings.UsernamesEnabled,CompanyEnabled = _customerSettings.CompanyEnabled,PhoneEnabled = _customerSettings.PhoneEnabled,@@ -559,8 +549,7 @@ namespace Grand.Web.Admin.Servicesmodel.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.SelectCountry"), Value = "" });foreach (var c in await _countryService.GetAllCountries(showHidden: true)){- model.AvailableCountries.Add(new SelectListItem- {+ model.AvailableCountries.Add(new SelectListItem {Text = c.Name,Value = c.Id.ToString(),Selected = c.Id == model.CountryId@@ -571,24 +560,11 @@ namespace Grand.Web.Admin.Services{//statesvar states = (await _countryService.GetCountryById(model.CountryId))?.StateProvinces;- if (states.Count > 0)- {- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.SelectState"), Value = "" });+ model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.SelectState"), Value = "" });- foreach (var s in states)- {- model.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });- }- }- else+ foreach (var s in states){- bool anyCountrySelected = model.AvailableCountries.Any(x => x.Selected);-- model.AvailableStates.Add(new SelectListItem- {- Text = _translationService.GetResource(anyCountrySelected ? "Admin.Address.OtherNonUS" : "Admin.Address.SelectState"),- Value = ""- });+ model.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });}}}@@ -609,8 +585,7 @@ namespace Grand.Web.Admin.Services//storesforeach (var store in allStores){- model.LoyaltyPointsAvailableStores.Add(new SelectListItem- {+ model.LoyaltyPointsAvailableStores.Add(new SelectListItem {Text = store.Shortcut,Value = store.Id.ToString(),Selected = (store.Id == _workContext.CurrentStore.Id)@@ -681,8 +656,7 @@ namespace Grand.Web.Admin.ServicesownerId = customerOwner.Id;}}- var customer = new Customer- {+ var customer = new Customer {CustomerGuid = Guid.NewGuid(),Email = model.Email,Username = model.Username,@@ -741,8 +715,7 @@ namespace Grand.Web.Admin.Services//subscribedif (newsletterSubscription == null){- await _newsLetterSubscriptionService.InsertNewsLetterSubscription(new NewsLetterSubscription- {+ await _newsLetterSubscriptionService.InsertNewsLetterSubscription(new NewsLetterSubscription {NewsLetterSubscriptionGuid = Guid.NewGuid(),CustomerId = customer.Id,Email = customer.Email,@@ -942,8 +915,7 @@ namespace Grand.Web.Admin.Services//subscribedif (newsletterSubscription == null){- await _newsLetterSubscriptionService.InsertNewsLetterSubscription(new NewsLetterSubscription- {+ await _newsLetterSubscriptionService.InsertNewsLetterSubscription(new NewsLetterSubscription {NewsLetterSubscriptionGuid = Guid.NewGuid(),CustomerId = customer.Id,Email = customer.Email,@@ -1085,8 +1057,7 @@ namespace Grand.Web.Admin.Servicesif (emailAccount == null)throw new GrandException("Email account can't be loaded");- var email = new QueuedEmail- {+ var email = new QueuedEmail {PriorityId = QueuedEmailPriority.High,EmailAccountId = emailAccount.Id,FromName = emailAccount.DisplayName,@@ -1109,8 +1080,7 @@ namespace Grand.Web.Admin.Servicesforeach (var rph in await _loyaltyPointsService.GetLoyaltyPointsHistory(customerId, showAll: true)){var store = await _storeService.GetStoreById(rph.StoreId);- model.Add(new CustomerModel.LoyaltyPointsHistoryModel- {+ model.Add(new CustomerModel.LoyaltyPointsHistoryModel {StoreName = store != null ? store.Shortcut : "Unknown",Points = rph.Points,PointsBalance = rph.PointsBalance,@@ -1233,8 +1203,7 @@ namespace Grand.Web.Admin.Servicesforeach (var s in states)model.Address.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == model.Address.StateProvinceId) });}- else- model.Address.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });+//customer attribute servicesawait model.Address.PrepareCustomAddressAttributes(address, _addressAttributeService, _addressAttributeParser);}@@ -1265,8 +1234,7 @@ namespace Grand.Web.Admin.Servicesif (product != null){var price = (await taxService.GetProductPrice(product, (await priceCalculationService.GetUnitPrice(sci, product)).unitprice)).productprice;- var sciModel = new ShoppingCartItemModel- {+ var sciModel = new ShoppingCartItemModel {Id = sci.Id,Store = store != null ? store.Shortcut : "Unknown",ProductId = sci.ProductId,@@ -1326,8 +1294,7 @@ namespace Grand.Web.Admin.Servicesvar items = new List<CustomerModel.ProductPriceModel>();foreach (var x in productPrices){- var m = new CustomerModel.ProductPriceModel- {+ var m = new CustomerModel.ProductPriceModel {Id = x.Id,Price = x.Price,ProductId = x.ProductId,@@ -1343,8 +1310,7 @@ namespace Grand.Web.Admin.Servicesvar items = new List<CustomerModel.ProductModel>();foreach (var x in products){- var m = new CustomerModel.ProductModel- {+ var m = new CustomerModel.ProductModel {Id = x.Id,DisplayOrder = x.DisplayOrder,ProductId = x.ProductId,@@ -1446,8 +1412,7 @@ namespace Grand.Web.Admin.Servicesvar items = new List<CustomerModel.ActivityLogModel>();foreach (var x in activityLog){- var m = new CustomerModel.ActivityLogModel- {+ var m = new CustomerModel.ActivityLogModel {Id = x.Id,ActivityLogTypeName = (await _customerActivityService.GetActivityTypeById(x.ActivityLogTypeId))?.Name,Comment = x.Comment,@@ -1487,8 +1452,7 @@ namespace Grand.Web.Admin.Services{var store = await _storeService.GetStoreById(x.StoreId);var product = await _productService.GetProductById(x.ProductId);- var m = new CustomerModel.OutOfStockSubscriptionModel- {+ var m = new CustomerModel.OutOfStockSubscriptionModel {Id = x.Id,StoreName = store != null ? store.Shortcut : "Unknown",ProductId = x.ProductId,@@ -1509,8 +1473,7 @@ namespace Grand.Web.Admin.Services.OrderByDescending(on => on.CreatedOnUtc)){var download = !string.IsNullOrEmpty(customerNote.DownloadId) ? await downloadService.GetDownloadById(customerNote.DownloadId) : null;- customerNoteModels.Add(new CustomerModel.CustomerNote- {+ customerNoteModels.Add(new CustomerModel.CustomerNote {Id = customerNote.Id,CustomerId = customerId,DownloadId = string.IsNullOrEmpty(customerNote.DownloadId) ? "" : customerNote.DownloadId,@@ -1525,8 +1488,7 @@ namespace Grand.Web.Admin.Services}public virtual async Task<CustomerNote> InsertCustomerNote(string customerId, string downloadId, bool displayToCustomer, string title, string message){- var customerNote = new CustomerNote- {+ var customerNote = new CustomerNote {DisplayToCustomer = displayToCustomer,Title = title,Note = message,diff --git a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.csindex 6387f0ca0..15f2cdb4b 100644--- a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs@@ -226,8 +226,6 @@ namespace Grand.Web.Admin.Servicesforeach (var s in states)model.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });}- else- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });//customer attribute servicesawait model.PrepareCustomAddressAttributes(address, _addressAttributeService, _addressAttributeParser);diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.csindex 591a4ace6..88ab6ebff 100644--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs@@ -981,8 +981,7 @@ namespace Grand.Web.Admin.Servicesforeach (var s in states)model.Address.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (s.Id == address.StateProvinceId) });}- else- model.Address.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });+//customer attribute servicesawait model.Address.PrepareCustomAddressAttributes(address, _addressAttributeService, _addressAttributeParser);diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.csindex 590777f96..e68e2c07d 100644--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs@@ -148,8 +148,6 @@ namespace Grand.Web.Admin.Servicesforeach (var s in states)model.Address.AvailableStates.Add(new SelectListItem { Text = s.Name, Value = s.Id.ToString(), Selected = (vendor != null && s.Id == vendor.Address.StateProvinceId) });}- else- model.Address.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.OtherNonUS"), Value = "" });}public virtual async Task PrepareStore(VendorModel model)diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.csindex 719ca07c1..114e16eef 100644--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs@@ -5,6 +5,7 @@ using Grand.Business.Common.Interfaces.Directory;using Grand.Business.Common.Interfaces.Localization;using Grand.Web.Admin.Models.Customers;using System.Collections.Generic;+using System.Linq;namespace Grand.Web.Admin.Validators.Customers{@@ -33,18 +34,19 @@ namespace Grand.Web.Admin.Validators.Customers{RuleFor(x => x.StateProvinceId).MustAsync(async (x, y, context) =>{- //does selected country has states?var countryId = !string.IsNullOrEmpty(x.CountryId) ? x.CountryId : "";- var hasStates = (await countryService.GetStateProvincesByCountryId(countryId)).Count > 0;- if (hasStates)+ var country = await countryService.GetCountryById(countryId);+ if (country.StateProvinces.Any()){//if yes, then ensure that state is selectedif (string.IsNullOrEmpty(y)){return false;}+ if (country.StateProvinces.FirstOrDefault(x => x.Id == y) != null)+ return true;}- return true;+ return false;}).WithMessage(translationService.GetResource("Account.Fields.StateProvince.Required"));}if (customerSettings.CompanyRequired && customerSettings.CompanyEnabled)diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex cec13491f..2e9ad9943 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -1305,9 +1305,6 @@<Resource Name="Address.Fields.ZipPostalCode.Required"><Value>Zip / postal code is required.</Value></Resource>- <Resource Name="Address.OtherNonUS">- <Value>Other (Non US)</Value>- </Resource><Resource Name="Address.SelectCountry"><Value>Select country</Value></Resource>@@ -1533,9 +1530,6 @@<Resource Name="Admin.Address.Fields.ZipPostalCode.Required"><Value>Zip / postal code is required.</Value></Resource>- <Resource Name="Admin.Address.OtherNonUS">- <Value>Other (Non US)</Value>- </Resource><Resource Name="Admin.Address.SelectCountry"><Value>Select country</Value></Resource>diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.csindex 3cf5283e3..1b95fdb52 100644--- a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs@@ -126,8 +126,7 @@ namespace Grand.Web.Features.Handlers.Commonmodel.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectCountry"), Value = "" });foreach (var c in loadCountries()){- model.AvailableCountries.Add(new SelectListItem- {+ model.AvailableCountries.Add(new SelectListItem {Text = c.GetTranslation(x => x.Name, language.Id),Value = c.Id.ToString(),Selected = !string.IsNullOrEmpty(model.CountryId) ? c.Id == model.CountryId : (c.Id == store.DefaultCountryId)@@ -139,27 +138,14 @@ namespace Grand.Web.Features.Handlers.Commonvar states = await _countryService.GetStateProvincesByCountryId(!string.IsNullOrEmpty(model.CountryId) ? model.CountryId : store.DefaultCountryId, language.Id);- if (states.Any())- {- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });+ model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });- foreach (var s in states)- {- model.AvailableStates.Add(new SelectListItem- {- Text = s.GetTranslation(x => x.Name, language.Id),- Value = s.Id.ToString(),- Selected = (s.Id == model.StateProvinceId)- });- }- }- else+ foreach (var s in states){- bool anyCountrySelected = model.AvailableCountries.Any(x => x.Selected);- model.AvailableStates.Add(new SelectListItem- {- Text = _translationService.GetResource(anyCountrySelected ? "Address.OtherNonUS" : "Address.SelectState"),- Value = ""+ model.AvailableStates.Add(new SelectListItem {+ Text = s.GetTranslation(x => x.Name, language.Id),+ Value = s.Id.ToString(),+ Selected = (s.Id == model.StateProvinceId)});}}@@ -195,8 +181,7 @@ namespace Grand.Web.Features.Handlers.Commonvar attributes = await _addressAttributeService.GetAllAddressAttributes();foreach (var attribute in attributes){- var attributeModel = new AddressAttributeModel- {+ var attributeModel = new AddressAttributeModel {Id = attribute.Id,Name = attribute.GetTranslation(x => x.Name, language.Id),IsRequired = attribute.IsRequired,@@ -209,8 +194,7 @@ namespace Grand.Web.Features.Handlers.Commonvar attributeValues = attribute.AddressAttributeValues;foreach (var attributeValue in attributeValues){- var attributeValueModel = new AddressAttributeValueModel- {+ var attributeValueModel = new AddressAttributeValueModel {Id = attributeValue.Id,Name = attributeValue.GetTranslation(x => x.Name, language.Id),IsPreSelected = attributeValue.IsPreSelecteddiff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.csindex 805795137..efd56d236 100644--- a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs@@ -29,19 +29,9 @@ namespace Grand.Web.Features.Handlers.Common{var states = await _countryService.GetStateProvincesByCountryId(request.CountryId, _workContext.WorkingLanguage.Id);var model = (from s in states select new StateProvinceModel { id = s.Id, name = s.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id) }).ToList();- //some country is selected- if (!model.Any())+ if (request.AddSelectStateItem){- //country does not have states- model.Insert(0, new StateProvinceModel { id = "", name = _translationService.GetResource("Address.OtherNonUS") });- }- else- {- //country has some states- if (request.AddSelectStateItem)- {- model.Insert(0, new StateProvinceModel { id = "", name = _translationService.GetResource("Address.SelectState") });- }+ model.Insert(0, new StateProvinceModel { id = "", name = _translationService.GetResource("Address.SelectState") });}return model;}diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.csindex bedc2d428..90fcbbfd3 100644--- a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs@@ -49,7 +49,7 @@ namespace Grand.Web.Features.Handlers.Commonmodel.StateProvinceId = request.Address.StateProvinceId;StateProvince state = null;if (!String.IsNullOrEmpty(request.Address.StateProvinceId) && country != null)- state = country.StateProvinces.FirstOrDefault(x=>x.Id == request.Address.StateProvinceId);+ state = country.StateProvinces.FirstOrDefault(x => x.Id == request.Address.StateProvinceId);model.StateProvinceName = state != null ? state.GetTranslation(x => x.Name, request.Language.Id) : null;model.City = request.Address.City;@@ -85,8 +85,7 @@ namespace Grand.Web.Features.Handlers.Commonmodel.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectCountry"), Value = "" });foreach (var c in request.LoadCountries()){- model.AvailableCountries.Add(new SelectListItem- {+ model.AvailableCountries.Add(new SelectListItem {Text = c.GetTranslation(x => x.Name, request.Language.Id),Value = c.Id.ToString(),Selected = c.Id == model.CountryId@@ -97,27 +96,14 @@ namespace Grand.Web.Features.Handlers.Common{var states = await _countryService.GetStateProvincesByCountryId(!String.IsNullOrEmpty(model.CountryId) ? model.CountryId : "", request.Language.Id);- if (states.Any())- {- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });-- foreach (var s in states)- {- model.AvailableStates.Add(new SelectListItem- {- Text = s.GetTranslation(x => x.Name, request.Language.Id),- Value = s.Id.ToString(),- Selected = (s.Id == model.StateProvinceId)- });- }- }- else++ model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });+ foreach (var s in states){- bool anyCountrySelected = model.AvailableCountries.Any(x => x.Selected);- model.AvailableStates.Add(new SelectListItem- {- Text = _translationService.GetResource(anyCountrySelected ? "Address.OtherNonUS" : "Address.SelectState"),- Value = ""+ model.AvailableStates.Add(new SelectListItem {+ Text = s.GetTranslation(x => x.Name, request.Language.Id),+ Value = s.Id.ToString(),+ Selected = (s.Id == model.StateProvinceId)});}}diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.csindex 4e98d35a9..44591c121 100644--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs@@ -75,8 +75,7 @@ namespace Grand.Web.Features.Handlers.Customersawait PrepareExternalAuth(model, request);//custom customer attributes- var customAttributes = await _mediator.Send(new GetCustomAttributes()- {+ var customAttributes = await _mediator.Send(new GetCustomAttributes() {Customer = request.Customer,Language = request.Language,OverrideAttributes = request.OverrideCustomCustomerAttributes@@ -124,8 +123,7 @@ namespace Grand.Web.Features.Handlers.Customersmodel.Newsletter = newsletter != null && newsletter.Active;var categories = (await _newsletterCategoryService.GetAllNewsletterCategory()).ToList();- categories.ForEach(x => model.NewsletterCategories.Add(new NewsletterSimpleCategory()- {+ categories.ForEach(x => model.NewsletterCategories.Add(new NewsletterSimpleCategory() {Id = x.Id,Description = x.GetTranslation(y => y.Description, request.Language.Id),Name = x.GetTranslation(y => y.Name, request.Language.Id),@@ -141,8 +139,7 @@ namespace Grand.Web.Features.Handlers.Customersmodel.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectCountry"), Value = "" });foreach (var c in await _countryService.GetAllCountries(request.Language.Id, request.Store.Id)){- model.AvailableCountries.Add(new SelectListItem- {+ model.AvailableCountries.Add(new SelectListItem {Text = c.GetTranslation(x => x.Name, request.Language.Id),Value = c.Id.ToString(),Selected = c.Id == model.CountryId@@ -153,26 +150,12 @@ namespace Grand.Web.Features.Handlers.Customers{//statesvar states = await _countryService.GetStateProvincesByCountryId(model.CountryId, request.Language.Id);- if (states.Any())- {- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });+ model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });- foreach (var s in states)- {- model.AvailableStates.Add(new SelectListItem { Text = s.GetTranslation(x => x.Name, request.Language.Id), Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });- }- }- else+ foreach (var s in states){- bool anyCountrySelected = model.AvailableCountries.Any(x => x.Selected);-- model.AvailableStates.Add(new SelectListItem- {- Text = _translationService.GetResource(anyCountrySelected ? "Address.OtherNonUS" : "Address.SelectState"),- Value = ""- });+ model.AvailableStates.Add(new SelectListItem { Text = s.GetTranslation(x => x.Name, request.Language.Id), Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });}-}}@@ -221,8 +204,7 @@ namespace Grand.Web.Features.Handlers.Customersvar authMethod = _externalAuthenticationService.LoadAuthenticationProviderBySystemName(ear.ProviderSystemName);- model.AssociatedExternalAuthRecords.Add(new CustomerInfoModel.AssociatedExternalAuthModel- {+ model.AssociatedExternalAuthRecords.Add(new CustomerInfoModel.AssociatedExternalAuthModel {Id = ear.Id,Email = ear.Email,ExternalIdentifier = ear.ExternalDisplayIdentifier,diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.csindex dc971593c..eb2795204 100644--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs@@ -92,8 +92,7 @@ namespace Grand.Web.Features.Handlers.Customersforeach (var c in await _countryService.GetAllCountries(request.Language.Id, request.Store.Id)){- model.AvailableCountries.Add(new SelectListItem- {+ model.AvailableCountries.Add(new SelectListItem {Text = c.GetTranslation(x => x.Name, request.Language.Id),Value = c.Id.ToString(),Selected = c.Id == model.CountryId@@ -104,32 +103,17 @@ namespace Grand.Web.Features.Handlers.Customers{//statesvar states = await _countryService.GetStateProvincesByCountryId(model.CountryId, request.Language.Id);- if (states.Any())- {- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });+ model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectState"), Value = "" });- foreach (var s in states)- {- model.AvailableStates.Add(new SelectListItem { Text = s.GetTranslation(x => x.Name, request.Language.Id), Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });- }- }- else+ foreach (var s in states){- bool anyCountrySelected = model.AvailableCountries.Any(x => x.Selected);-- model.AvailableStates.Add(new SelectListItem- {- Text = _translationService.GetResource(anyCountrySelected ? "Address.OtherNonUS" : "Address.SelectState"),- Value = ""- });+ model.AvailableStates.Add(new SelectListItem { Text = s.GetTranslation(x => x.Name, request.Language.Id), Value = s.Id.ToString(), Selected = (s.Id == model.StateProvinceId) });}-}}//custom customer attributes- var customAttributes = await _mediator.Send(new GetCustomAttributes()- {+ var customAttributes = await _mediator.Send(new GetCustomAttributes() {Customer = request.Customer,Language = request.Language,OverrideAttributes = request.OverrideCustomCustomerAttributes@@ -143,8 +127,7 @@ namespace Grand.Web.Features.Handlers.Customersvar newsletterCategories = await _newsletterCategoryService.GetNewsletterCategoriesByStore(request.Store.Id);foreach (var item in newsletterCategories){- model.NewsletterCategories.Add(new NewsletterSimpleCategory()- {+ model.NewsletterCategories.Add(new NewsletterSimpleCategory() {Id = item.Id,Name = item.GetTranslation(x => x.Name, request.Language.Id),Description = item.GetTranslation(x => x.Description, request.Language.Id),diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.csindex 574500526..2215f34cf 100644--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs@@ -46,8 +46,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCartmodel.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Address.SelectCountry"), Value = "" });foreach (var c in await _countryService.GetAllCountriesForShipping(request.Language.Id, request.Store.Id))- model.AvailableCountries.Add(new SelectListItem- {+ model.AvailableCountries.Add(new SelectListItem {Text = c.GetTranslation(x => x.Name, request.Language.Id),Value = c.Id.ToString(),Selected = c.Id == defaultEstimateCountryId@@ -57,14 +56,11 @@ namespace Grand.Web.Features.Handlers.ShoppingCartvar states = !String.IsNullOrEmpty(defaultEstimateCountryId) ? await _countryService.GetStateProvincesByCountryId(defaultEstimateCountryId, request.Language.Id) : new List<StateProvince>();if (states.Any())foreach (var s in states)- model.AvailableStates.Add(new SelectListItem- {+ model.AvailableStates.Add(new SelectListItem {Text = s.GetTranslation(x => x.Name, request.Language.Id),Value = s.Id.ToString(),Selected = s.Id == defaultEstimateStateId});- else- model.AvailableStates.Add(new SelectListItem { Text = _translationService.GetResource("Address.OtherNonUS"), Value = "" });if (request.SetEstimateShippingDefaultAddress && request.Customer.ShippingAddress != null)model.ZipPostalCode = request.Customer.ShippingAddress.ZipPostalCode;diff --git a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web/Validators/Common/AddressValidator.csindex 78776a430..ab2f1580d 100644--- a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs+++ b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs@@ -6,6 +6,7 @@ using Grand.Business.Common.Interfaces.Localization;using Grand.Web.Models.Common;using System;using System.Collections.Generic;+using System.Linq;namespace Grand.Web.Validators.Common{@@ -43,18 +44,19 @@ namespace Grand.Web.Validators.Common{RuleFor(x => x.StateProvinceId).MustAsync(async (x, y, context) =>{- //does selected country has states?- var countryId = !String.IsNullOrEmpty(x.CountryId) ? x.CountryId : "";- var hasStates = (await countryService.GetCountryById(countryId))?.StateProvinces.Count > 0;- if (hasStates)+ var countryId = !string.IsNullOrEmpty(x.CountryId) ? x.CountryId : "";+ var country = await countryService.GetCountryById(countryId);+ if (country.StateProvinces.Any()){//if yes, then ensure that state is selectedif (String.IsNullOrEmpty(y)){return false;}+ if (country.StateProvinces.FirstOrDefault(x => x.Id == y) != null)+ return true;}- return true;+ return false;}).WithMessage(translationService.GetResource("Address.Fields.StateProvince.Required"));}if (addressSettings.CompanyRequired && addressSettings.CompanyEnabled)