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
Product SKU in merchandise return admin view (#417)
Nikhil Scaria96d6bf771a78
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtmlindex 84d024492..2821bc955 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml@@ -124,6 +124,11 @@title: "@Loc["Admin.Orders.MerchandiseReturns.Fields.Item"]",width: 200,template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaAdmin })/#=ProductId#">#=kendo.htmlEncode(ProductName)#</a>'+ }, {+ field: "ProductSku",+ title: "@Loc["Admin.Catalog.Products.Fields.Sku"]",+ width: 200,+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaAdmin })/#=ProductId#">#=kendo.htmlEncode(ProductSku)#</a>'}, {field: "Quantity",title: "@Loc["Admin.Orders.MerchandiseReturns.Fields.Quantity"]",diff --git a/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.csindex d8c6c6872..b45de168d 100644--- a/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Orders/MerchandiseReturnModel.cs@@ -78,6 +78,8 @@ namespace Grand.Web.Admin.Models.Orderspublic string ProductName { get; set; }+ public string ProductSku { get; set; }+public string UnitPrice { get; set; }public int Quantity { get; set; }diff --git a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.csindex 752a16444..1326e11e4 100644--- a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs@@ -254,11 +254,11 @@ namespace Grand.Web.Admin.Servicesforeach (var item in merchandiseReturn.MerchandiseReturnItems){var orderItem = order.OrderItems.FirstOrDefault(x => x.Id == item.OrderItemId);-items.Add(new MerchandiseReturnModel.MerchandiseReturnItemModel{ProductId = orderItem.ProductId,ProductName = (await _productService.GetProductByIdIncludeArch(orderItem.ProductId)).Name,+ ProductSku = orderItem.Sku,Quantity = item.Quantity,UnitPrice = _priceFormatter.FormatPrice(orderItem.UnitPriceInclTax),ReasonForReturn = item.ReasonForReturn,