Skip to content

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.

Fix - Shipping Status filter in Orders page is not filtering in some cases #445

support83d1c82e0691
diff --git a/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs
index 286a11032..1f2a9b7d1 100644
--- a/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Orders/OrderListModel.cs
@@ -43,7 +43,7 @@ namespace Grand.Web.Admin.Models.Orders
public int PaymentStatusId { get; set; }
[GrandResourceDisplayName("Admin.Orders.List.ShippingStatus")]
- public int ShippingStatusId { get; set; }
+ public int? ShippingStatusId { get; set; }
[GrandResourceDisplayName("Admin.Orders.List.PaymentMethod")]
public string PaymentMethodSystemName { get; set; }
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 5e6d70eec..d97fbb602 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -111,7 +111,7 @@ namespace Grand.Web.Admin.Services
AddressSettings addressSettings,
IOrderTagService orderTagService,
IOrderStatusService orderStatusService,
- IMediator mediator,
+ IMediator mediator,
IProductAttributeFormatter productAttributeFormatter)
{
_orderService = orderService;
@@ -218,9 +218,10 @@ namespace Grand.Web.Admin.Services
//shipping statuses
model.AvailableShippingStatuses =
- ShippingStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();
+ ShippingStatus.ShippingNotRequired.ToSelectList(_translationService, _workContext, false).ToList();
model.AvailableShippingStatuses.Insert(0,
new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });
+
if (shippingStatusId.HasValue)
{
//pre-select value?
@@ -287,7 +288,7 @@ namespace Grand.Web.Admin.Services
int? orderStatus = model.OrderStatusId > 0 ? model.OrderStatusId : null;
PaymentStatus? paymentStatus = model.PaymentStatusId > 0 ? (PaymentStatus?)model.PaymentStatusId : null;
ShippingStatus? shippingStatus =
- model.ShippingStatusId > 0 ? (ShippingStatus?)model.ShippingStatusId : null;
+ model.ShippingStatusId.HasValue ? (ShippingStatus?)model.ShippingStatusId : null;
var filterByProductId = "";
@@ -409,7 +410,7 @@ namespace Grand.Web.Admin.Services
model.SalesEmployeeName = salesEmployee.Name;
}
}
-
+
//order's tags
if (order.OrderTags.Any())
{
@@ -1217,7 +1218,6 @@ namespace Grand.Web.Admin.Services
await _mediator.Send(new InsertOrderItemCommand
{ Order = order, OrderItem = orderItem, Product = product });
-
}
return warnings;