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 - remove IFormCollection
support649a29105799
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.csindex a3f65f383..7f9d50b96 100644--- a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs+++ b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs@@ -13,7 +13,8 @@ using MediatR;namespace Grand.Web.Commands.Handler.Orders{- public class MerchandiseReturnSubmitCommandHandler : IRequestHandler<MerchandiseReturnSubmitCommand, (MerchandiseReturnModel model, MerchandiseReturn rr)>+ public class MerchandiseReturnSubmitCommandHandler : IRequestHandler<MerchandiseReturnSubmitCommand, (+ MerchandiseReturnModel model, MerchandiseReturn rr)>{private readonly IWorkContext _workContext;private readonly IProductService _productService;@@ -41,13 +42,16 @@ namespace Grand.Web.Commands.Handler.Orders_languageSettings = languageSettings;}- public async Task<(MerchandiseReturnModel model, MerchandiseReturn rr)> Handle(MerchandiseReturnSubmitCommand request, CancellationToken cancellationToken)+ public async Task<(MerchandiseReturnModel model, MerchandiseReturn rr)> Handle(+ MerchandiseReturnSubmitCommand request, CancellationToken cancellationToken){var rr = new MerchandiseReturn {StoreId = _workContext.CurrentStore.Id,OrderId = request.Order.Id,CustomerId = _workContext.CurrentCustomer.Id,- OwnerId = await _groupService.IsOwner(_workContext.CurrentCustomer) ? _workContext.CurrentCustomer.Id : _workContext.CurrentCustomer.OwnerId,+ OwnerId = await _groupService.IsOwner(_workContext.CurrentCustomer)+ ? _workContext.CurrentCustomer.Id+ : _workContext.CurrentCustomer.OwnerId,SeId = request.Order.SeId,CustomerComments = request.Model.Comments,StaffNotes = string.Empty,@@ -63,58 +67,46 @@ namespace Grand.Web.Commands.Handler.Ordersforeach (var orderItem in request.Order.OrderItems){var product = await _productService.GetProductById(orderItem.ProductId);- if (!product.NotReturnable)- {- int quantity = 0; //parse quantity- string rrrId = "";- string rraId = "";+ if (product.NotReturnable) continue;- foreach (string formKey in request.Form.Keys)- {- if (formKey.Equals(string.Format("quantity{0}", orderItem.Id), StringComparison.OrdinalIgnoreCase))- {- int.TryParse(request.Form[formKey], out quantity);- }+ var quantity = request.Model.Items.FirstOrDefault(x => x.Id == orderItem.Id)?.Quantity;+ var rrrId = request.Model.Items.FirstOrDefault(x => x.Id == orderItem.Id)?.MerchandiseReturnReasonId;+ var rraId = request.Model.Items.FirstOrDefault(x => x.Id == orderItem.Id)?.MerchandiseReturnActionId;- if (formKey.Equals(string.Format("reason{0}", orderItem.Id), StringComparison.OrdinalIgnoreCase))- {- rrrId = request.Form[formKey];- }+ if (quantity is not > 0) continue;- if (formKey.Equals(string.Format("action{0}", orderItem.Id), StringComparison.OrdinalIgnoreCase))- {- rraId = request.Form[formKey];- }- }-- if (quantity > 0)- {- var rrr = await _merchandiseReturnService.GetMerchandiseReturnReasonById(rrrId);- var rra = await _merchandiseReturnService.GetMerchandiseReturnActionById(rraId);- rr.MerchandiseReturnItems.Add(new MerchandiseReturnItem {- RequestedAction = rra != null ? rra.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id) : "not available",- ReasonForReturn = rrr != null ? rrr.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id) : "not available",- Quantity = quantity,- OrderItemId = orderItem.Id- });- rr.VendorId = orderItem.VendorId;- vendors.Add(orderItem.VendorId);- }- }+ var rrr = await _merchandiseReturnService.GetMerchandiseReturnReasonById(rrrId);+ var rra = await _merchandiseReturnService.GetMerchandiseReturnActionById(rraId);+ rr.MerchandiseReturnItems.Add(new MerchandiseReturnItem {+ RequestedAction = rra != null+ ? rra.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id)+ : "not available",+ ReasonForReturn = rrr != null+ ? rrr.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id)+ : "not available",+ Quantity = quantity.Value,+ OrderItemId = orderItem.Id+ });+ rr.VendorId = orderItem.VendorId;+ vendors.Add(orderItem.VendorId);}+if (vendors.Distinct().Count() > 1){request.Model.Error = _translationService.GetResource("MerchandiseReturns.MultiVendorsItems");return (request.Model, rr);}+if (rr.MerchandiseReturnItems.Any()){await _merchandiseReturnService.InsertMerchandiseReturn(rr);//notify store owner here (email)- await _messageProviderService.SendNewMerchandiseReturnStoreOwnerMessage(rr, request.Order, _languageSettings.DefaultAdminLanguageId);+ await _messageProviderService.SendNewMerchandiseReturnStoreOwnerMessage(rr, request.Order,+ _languageSettings.DefaultAdminLanguageId);//notify customer- await _messageProviderService.SendNewMerchandiseReturnCustomerMessage(rr, request.Order, request.Order.CustomerLanguageId);+ await _messageProviderService.SendNewMerchandiseReturnCustomerMessage(rr, request.Order,+ request.Order.CustomerLanguageId);}else{@@ -124,4 +116,4 @@ namespace Grand.Web.Commands.Handler.Ordersreturn (request.Model, rr);}}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs b/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.csindex 13be32252..7f1785b00 100644--- a/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs+++ b/src/Web/Grand.Web/Commands/Models/Orders/MerchandiseReturnSubmitCommand.cs@@ -2,7 +2,6 @@using Grand.Domain.Orders;using Grand.Web.Models.Orders;using MediatR;-using Microsoft.AspNetCore.Http;namespace Grand.Web.Commands.Models.Orders{@@ -11,6 +10,5 @@ namespace Grand.Web.Commands.Models.Orderspublic MerchandiseReturnModel Model { get; set; }public Order Order { get; set; }public Address Address { get; set; }- public IFormCollection Form { get; set; }}}diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.csindex aec553c0f..e71a5424d 100644--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs@@ -144,7 +144,7 @@ namespace Grand.Web.Controllers[HttpPost, ActionName("MerchandiseReturn")][AutoValidateAntiforgeryToken]- public virtual async Task<IActionResult> MerchandiseReturnSubmit(string orderId, MerchandiseReturnModel model, IFormCollection form)+ public virtual async Task<IActionResult> MerchandiseReturnSubmit(string orderId, MerchandiseReturnModel model){var order = await _orderService.GetOrderById(orderId);if (!await order.Access(_workContext.CurrentCustomer, _groupService))@@ -181,7 +181,7 @@ namespace Grand.Web.Controllers}else{- var result = await _mediator.Send(new MerchandiseReturnSubmitCommand() { Address = address, Model = model, Form = form, Order = order });+ var result = await _mediator.Send(new MerchandiseReturnSubmitCommand() { Address = address, Model = model, Order = order });if (result.rr.ReturnNumber > 0){model.Result = string.Format(_translationService.GetResource("MerchandiseReturns.Submitted"), result.rr.ReturnNumber, Url.Link("MerchandiseReturnDetails", new { merchandiseReturnId = result.rr.Id }));diff --git a/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml b/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtmlindex 15e500624..21fac2fe7 100644--- a/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml+++ b/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml@@ -1,5 +1,5 @@-@model MerchandiseReturnModel-@using Grand.Web.Models.Orders;+@using ZstdSharp.Unsafe+@model MerchandiseReturnModel@inject IPageHeadBuilder pagebuilder@{Layout = "_SingleColumn";@@ -29,11 +29,6 @@<h2 class="h5 mt-3"><strong>@Loc["MerchandiseReturns.SelectProduct(s)"]</strong></h2><div class="table-responsive"><table class="table table-hover merchandise-table data-table">- <colgroup>- <col />- <col width="200" />- <col width="150" />- </colgroup><thead class="table-inverse"><tr><th class="product">@@ -54,31 +49,12 @@</tr></thead><tbody>- @{- int index = 0;- }- <tr>- <td>- <validation-provider tag="div" rules="required|exact_length:1,@Loc["merchandisereturns.noitemssubmitted"]" v-slot="{ errors, classes }">- @foreach (var item in Model.Items)- {- index++;- <div>- <label class="custom-control custom-checkbox">- <input type="checkbox" class="custom-control-input" v-model="merchandisereturns.checkboxes" value="@index" @@change="merchandisereturns.allowed($event.target ,'quantity@(item.Id)')" name="checkbox_@(item.Id)" id="check_@(item.Id)">- <span class="custom-control-label"></span>- <span class="custom-control-description"></span>- </label>- </div>- }- <span class="field-validation-error" v-if="errors[0]">{{ errors[0] }}</span>- </validation-provider>- </td>+ <tr></tr><tr>- @foreach (var item in Model.Items)+ @for(var j = 0; j < Model.Items.Count; j++){- index++;+ var item = Model.Items[j];<td><div class="product"><a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })">@item.ProductName</a>@@ -97,8 +73,13 @@@item.UnitPrice</div><div class="quantity">+ <input type="hidden" asp-for="@Model.Items[j].Id"/>+ <input type="hidden" asp-for="@Model.Items[j].ProductName"/><validation-provider tag="div" rules="required" v-slot="{ errors, classes }">- <select data-val-required="@(string.Format(Loc["Fields.IsRequired"], Loc["MerchandiseReturns.Products.Quantity"]))" v-bind:class="[classes , 'custom-select form-control']" disabled="disabled" v-model="merchandisereturns.quantity_@(item.Id)" ref="quantity@(item.Id)" name="quantity@(item.Id)">+ <select data-val-required="@(string.Format(Loc["Fields.IsRequired"], Loc["MerchandiseReturns.Products.Quantity"]))"+ v-bind:class="[classes , 'custom-select form-control']" v-model="merchandisereturns.quantity_@(item.Id)"+ ref="quantity@(item.Id)"+ asp-for="@Model.Items[j].Quantity">@for (int i = 0; i <= item.Quantity; i++){<option value="@(i)">@(i)</option>@@ -115,7 +96,8 @@Value = x.Id.ToString()}).ToList();}- <select asp-for="@item.MerchandiseReturnReasonId" asp-items="@reasonsSelectList" name="reason@(item.Id)" class="form-control custom-select return-reasons"></select>+ <select asp-for="@Model.Items[j].MerchandiseReturnReasonId"+ asp-items="@reasonsSelectList" class="form-control custom-select return-reasons"></select></div><div>@{@@ -125,7 +107,8 @@Value = x.Id.ToString()}).ToList();}- <select asp-for="@item.MerchandiseReturnReasonId" asp-items="@actionsSelectList" name="action@(item.Id)" class="form-control custom-select return-actions"></select>+ <select asp-for="@Model.Items[j].MerchandiseReturnActionId"+ asp-items="@actionsSelectList" class="form-control custom-select return-actions"></select></div></td>}diff --git a/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.css b/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.cssindex 4427ae576..b2b9ed15c 100644--- a/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.css+++ b/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.css@@ -78,7 +78,7 @@ table .status.cancelled {.merchandise-table tbody tr:nth-child(1) {display: flex;flex-direction: column;- min-width: 50px;+ /*min-width: 50px;*/}.merchandise-table tbody tr:nth-child(1) td {height: 100%;diff --git a/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.rtl.css b/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.rtl.cssindex b0e5c0589..33ca2fd12 100644--- a/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.rtl.css+++ b/src/Web/Grand.Web/wwwroot/theme/css/customer/customer.rtl.css@@ -78,7 +78,7 @@ table .status.cancelled {.merchandise-table tbody tr:nth-child(1) {display: flex;flex-direction: column;- min-width: 50px;+ /*min-width: 50px;*/}.merchandise-table tbody tr:nth-child(1) td {height: 100%;