#2059 Add attributes info on return request list page

nopSolutions · Feb 6, 2017 · d136b76 · d136b76
1 parent 4f09c7e
commit d136b76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Presentation/Nop.Web/Administration/Controllers/ReturnRequestController.cs b/src/Presentation/Nop.Web/Administration/Controllers/ReturnRequestController.cs
@@ -82,6 +82,7 @@ public partial class ReturnRequestController : BaseAdminController
                 model.ProductId = orderItem.ProductId;
                 model.ProductName = orderItem.Product.Name;
                 model.OrderId = orderItem.OrderId;
+                model.AttributeInfo = orderItem.AttributeDescription;
             }
             model.Id = returnRequest.Id;
             model.CustomNumber = returnRequest.CustomNumber;

diff --git a/src/Presentation/Nop.Web/Administration/Models/Orders/ReturnRequestModel.cs b/src/Presentation/Nop.Web/Administration/Models/Orders/ReturnRequestModel.cs
@@ -24,6 +24,7 @@ public partial class ReturnRequestModel : BaseNopEntityModel
         public int ProductId { get; set; }
         [NopResourceDisplayName("Admin.ReturnRequests.Fields.Product")]
         public string ProductName { get; set; }
+        public string AttributeInfo { get; set; }
 
         [NopResourceDisplayName("Admin.ReturnRequests.Fields.Quantity")]
         public int Quantity { get; set; }

diff --git a/src/Presentation/Nop.Web/Administration/Views/ReturnRequest/List.cshtml b/src/Presentation/Nop.Web/Administration/Views/ReturnRequest/List.cshtml
@@ -128,9 +128,10 @@
                                             }, {
                                                 field: "ProductName",
                                                 title: "@T("Admin.ReturnRequests.Fields.Product")",
-                                                width: 200,
+                                                width: 350,
                                                 template:
-                                                    '# if(ProductId > 0) {# <a href="@Url.Content("~/Admin/Product/Edit/")#=ProductId#">#:ProductName#</a> #} else {# order item is deleted #} #'
+                                                    '# if(ProductId > 0) {# <a href="@Url.Content("~/Admin/Product/Edit/")#=ProductId#">#:ProductName#</a> ' +
+                                                        '# if(AttributeInfo && AttributeInfo.length > 0) {# <div>#=AttributeInfo#</div> #} # #} else {# order item is deleted #} #'
                                             }, {
                                                 field: "Quantity",
                                                 title: "@T("Admin.ReturnRequests.Fields.Quantity")",
@@ -144,7 +145,7 @@
                                             }, {
                                                 field: "OrderId",
                                                 title: "@T("Admin.ReturnRequests.Fields.Order")",
-                                                width: 200,
+                                                width: 100,
                                                 headerAttributes: { style: "text-align:center" },
                                                 attributes: { style: "text-align:center" },
                                                 template: '# if(OrderId > 0) {# <a class="btn btn-default" href="@Url.Content("~/Admin/Order/Edit/")#=OrderId#"><i class="fa fa-eye"></i>#=OrderId# - @T("Admin.Common.View")</a> #} else {# order item is deleted #} #'