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
Merchandise return address - fix model validation
support013c71cbd792
diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.csindex 72caa1e32..826cb58f7 100644--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs@@ -80,13 +80,12 @@ namespace Grand.Web.Controllersprotected async Task<Address> PrepareAddress(MerchandiseReturnModel model, IFormCollection form){- string pickupAddressId = form["pickup_address_id"];var address = new Address();if (_orderSettings.MerchandiseReturns_AllowToSpecifyPickupAddress){- if (!string.IsNullOrEmpty(pickupAddressId))+ if (!string.IsNullOrEmpty(model.PickupAddressId)){- address = _workContext.CurrentCustomer.Addresses.FirstOrDefault(a => a.Id == pickupAddressId);+ address = _workContext.CurrentCustomer.Addresses.FirstOrDefault(a => a.Id == model.PickupAddressId);}else{@@ -97,8 +96,7 @@ namespace Grand.Web.Controllers{ModelState.AddModelError("", error);}- await TryUpdateModelAsync(model.NewAddress, "MerchandiseReturnNewAddress");- address = model.NewAddress.ToEntity(_workContext.CurrentCustomer, _addressSettings);+ address = model.MerchandiseReturnNewAddress.ToEntity(_workContext.CurrentCustomer, _addressSettings);model.NewAddressPreselected = true;address.Attributes = customAttributes;address.CreatedOnUtc = DateTime.UtcNow;@@ -157,8 +155,6 @@ namespace Grand.Web.Controllersif (!await _mediator.Send(new IsMerchandiseReturnAllowedQuery() { Order = order }))return RedirectToRoute("HomePage");- ModelState.Clear();-if (_orderSettings.MerchandiseReturns_AllowToSpecifyPickupDate && _orderSettings.MerchandiseReturns_PickupDateRequired && model.PickupDate == null){ModelState.AddModelError("", _translationService.GetResource("MerchandiseReturns.PickupDateRequired"));@@ -166,7 +162,7 @@ namespace Grand.Web.Controllersvar address = await PrepareAddress(model, form);- if (!ModelState.IsValid && ModelState.ErrorCount > 0)+ if (ModelState is { IsValid: false }){var returnmodel = await _mediator.Send(new GetMerchandiseReturn(){@@ -174,14 +170,14 @@ namespace Grand.Web.ControllersLanguage = _workContext.WorkingLanguage,Store = _workContext.CurrentStore});- returnmodel.Error = string.Join(", ", ModelState.Keys.SelectMany(k => ModelState[k].Errors).Select(m => m.ErrorMessage).ToArray());+ returnmodel.Error = string.Join(", ", ModelState.Keys.SelectMany(k => ModelState[k]!.Errors).Select(m => m.ErrorMessage).ToArray());returnmodel.Comments = model.Comments;returnmodel.PickupDate = model.PickupDate;returnmodel.NewAddressPreselected = model.NewAddressPreselected;- returnmodel.NewAddress = model.NewAddress;+ returnmodel.MerchandiseReturnNewAddress = model.MerchandiseReturnNewAddress;if (returnmodel.NewAddressPreselected || _orderSettings.MerchandiseReturns_AllowToSpecifyPickupAddress){- await PrepareModelAddress(model.NewAddress, address);+ await PrepareModelAddress(model.MerchandiseReturnNewAddress, address);}return View(returnmodel);}@@ -206,10 +202,10 @@ namespace Grand.Web.Controllersreturnmodel.Comments = model.Comments;returnmodel.PickupDate = model.PickupDate;returnmodel.NewAddressPreselected = model.NewAddressPreselected;- returnmodel.NewAddress = model.NewAddress;+ returnmodel.MerchandiseReturnNewAddress = model.MerchandiseReturnNewAddress;if (returnmodel.NewAddressPreselected || _orderSettings.MerchandiseReturns_AllowToSpecifyPickupAddress){- await PrepareModelAddress(model.NewAddress, address);+ await PrepareModelAddress(model.MerchandiseReturnNewAddress, address);}return View(returnmodel);}diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.csindex 5055bfc41..b17a3f109 100644--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs@@ -196,7 +196,7 @@ namespace Grand.Web.Features.Handlers.Orders//new addressvar countries = await _countryService.GetAllCountriesForShipping(request.Language.Id, request.Store.Id);- model.NewAddress = await _mediator.Send(new GetAddressModel()+ model.MerchandiseReturnNewAddress = await _mediator.Send(new GetAddressModel(){Language = request.Language,Store = request.Store,diff --git a/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs b/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.csindex e3a48d719..639fadcb5 100644--- a/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs+++ b/src/Web/Grand.Web/Models/Orders/MerchandiseReturnModel.cs@@ -12,7 +12,7 @@ namespace Grand.Web.Models.OrdersAvailableReturnReasons = new List<MerchandiseReturnReasonModel>();AvailableReturnActions = new List<MerchandiseReturnActionModel>();ExistingAddresses = new List<AddressModel>();- NewAddress = new AddressModel();+ MerchandiseReturnNewAddress = new AddressModel();}public string OrderId { get; set; }@@ -37,8 +37,8 @@ namespace Grand.Web.Models.Orderspublic bool NewAddressPreselected { get; set; }- public AddressModel NewAddress { get; set; }-+ public AddressModel MerchandiseReturnNewAddress { get; set; }+ public string PickupAddressId { get; set; }public bool ShowPickupAddress { get; set; }public bool ShowPickupDate { get; set; }diff --git a/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml b/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtmlindex ba1be6103..15e500624 100644--- a/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml+++ b/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml@@ -149,7 +149,7 @@<div class="section select-pickup-address"><label for="pickup-address-select">@Loc["MerchandiseReturns.SelectPickupAddressOrEnterNewOne"]</label><div>- <select name="pickup_address_id" id="pickup-address-select" class="custom-select address-select"+ <select name="PickupAddressId" id="pickup-address-select" class="custom-select address-select"title="" @@change="merchandisereturns.isNewAddress()">@foreach (var address in Model.ExistingAddresses){@@ -189,7 +189,7 @@@{var dataDictAddress = new ViewDataDictionary(ViewData);dataDictAddress.TemplateInfo.HtmlFieldPrefix = "MerchandiseReturnNewAddress";- <partial name="Partials/CreateOrUpdateAddress" model="Model.NewAddress" view-data="dataDictAddress" />+ <partial name="Partials/CreateOrUpdateAddress" model="Model.MerchandiseReturnNewAddress" view-data="dataDictAddress" />}</div></div>