Skip to content

Issue-405 : Orders search with OrderNumber field #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SunilParisi123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue-405 : Orders search with OrderNumber field #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ public Task<IQueryable<Order>> Handle(GetOrderQuery request, CancellationToken c
{
query = query.Where(o => o.Code == request.OrderCode.ToUpperInvariant());
}
if (!string.IsNullOrEmpty(request.OrderNumber) && int.TryParse(request.OrderNumber, out int orderNumber))
{
query = query.Where(o => o.OrderNumber == orderNumber);
}

//tag filtering
if (!string.IsNullOrEmpty(request.OrderTagId))
Expand Down
11 changes: 6 additions & 5 deletions src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ public virtual Task<Order> GetOrderByGuid(Guid orderGuid)
/// <param name="pageIndex">Page index</param>
/// <param name="pageSize">Page size</param>
/// <param name="orderTagId">Order tag identifier</param>
/// <param name="orderNumber">Order number</param>
/// <returns>Orders</returns>
public virtual async Task<IPagedList<Order>> SearchOrders(string storeId = "",
string vendorId = "", string customerId = "",
Expand All @@ -160,10 +161,9 @@ public virtual async Task<IPagedList<Order>> SearchOrders(string storeId = "",
DateTime? createdFromUtc = null, DateTime? createdToUtc = null,
int? os = null, PaymentStatus? ps = null, ShippingStatus? ss = null,
string billingEmail = null, string billingLastName = "", string orderGuid = null,
string orderCode = null, int pageIndex = 0, int pageSize = int.MaxValue, string orderTagId = "")
string orderCode = null, int pageIndex = 0, int pageSize = int.MaxValue, string orderTagId = "", string orderNumber = "")
{
var queryModel = new GetOrderQuery
{
var queryModel = new GetOrderQuery {
AffiliateId = affiliateId,
BillingCountryId = billingCountryId,
BillingEmail = billingEmail,
Expand All @@ -185,7 +185,8 @@ public virtual async Task<IPagedList<Order>> SearchOrders(string storeId = "",
WarehouseId = warehouseId,
OrderTagId = orderTagId,
OwnerId = ownerId,
SalesEmployeeId = salesEmployeeId
SalesEmployeeId = salesEmployeeId,
OrderNumber = orderNumber
};
var query = await _mediator.Send(queryModel);
return await PagedList<Order>.Create(query, pageIndex, pageSize);
Expand Down Expand Up @@ -232,7 +233,7 @@ public async Task CancelExpiredOrders(DateTime expirationDateUtc)
{
var orders = _orderRepository.Table
.Where(o => o.CreatedOnUtc < expirationDateUtc && o.PaymentStatusId == PaymentStatus.Pending &&
o.OrderStatusId == (int)OrderStatusSystem.Pending && (o.ShippingStatusId == ShippingStatus.Pending
o.OrderStatusId == (int)OrderStatusSystem.Pending && (o.ShippingStatusId == ShippingStatus.Pending
|| o.ShippingStatusId == ShippingStatus.ShippingNotRequired))
.ToList();

Expand Down
2 changes: 1 addition & 1 deletion src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Task<IPagedList<Order>> SearchOrders(string storeId = "",
DateTime? createdFromUtc = null, DateTime? createdToUtc = null,
int? os = null, PaymentStatus? ps = null, ShippingStatus? ss = null,
string billingEmail = null, string billingLastName = "", string orderGuid = null,
string orderCode = null, int pageIndex = 0, int pageSize = int.MaxValue, string orderTagId = "");
string orderCode = null, int pageIndex = 0, int pageSize = int.MaxValue, string orderTagId = "",string orderNumber = "");

/// <summary>
/// Inserts an order
Expand Down
1 change: 1 addition & 0 deletions src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ public class GetOrderQuery : IRequest<IQueryable<Order>>
public int PageIndex { get; set; } = 0;
public int PageSize { get; set; } = int.MaxValue;
public string OrderTagId { get; set; } = "";
public string OrderNumber { get; set; } = "";
}
}