mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2024-07-27 17:06:32 +03:30
parent f5666c705d
commit 97c30ce438
8 changed files with 206 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Back/Services/ServOrders.cs
View File

@@ -33,8 +33,8 @@ namespace Back.Services
return await request
.Select(w => new OrderDto
{
ApprovalDate = w.ApprovalDate,
DateCreate = w.DateCreate,
ApprovalDate = w.ApprovalDate.ShamciToFormatShamci(),
DateCreate = w.DateCreate.ShamciToFormatShamci(),
ID = w.ID,
PreDiscount = w.PreDiscount,
Status = w.Status,
@@ -46,7 +46,9 @@ namespace Back.Services
}
public async Task<List<OrderItemDto>> GetOrderItems(int OrderID,int CompanyID)
{
return await _repoOrderItem.Get(w => w.OrderID == OrderID && w.Order.CompanyID== CompanyID)
return await _repoOrderItem.Get(w => w.OrderID == OrderID && w.Order.CompanyID == CompanyID)
.Include(inc=>inc.Permission)
.Include(inc=>inc.Promotion)
.Select(s=>new OrderItemDto
{
OrderID = OrderID,
@@ -55,9 +57,18 @@ namespace Back.Services
Discount=s.Discount,
ID = s.ID,
Tax = s.Tax,
Type= s.PermissionID.HasValue && !s.PromotionID.HasValue ? "" : !s.PermissionID.HasValue && s.PromotionID.HasValue ? "تعرفه" : "نامشخص",
IDForType = s.PermissionID.HasValue && !s.PromotionID.HasValue ? s.PermissionID.Value : !s.PermissionID.HasValue && s.PromotionID.HasValue ? s.PromotionID.Value : 0
Type= s.PermissionID.HasValue && !s.PromotionID.HasValue ? "سرویس" : !s.PermissionID.HasValue && s.PromotionID.HasValue ? "تعرفه" : "نامشخص",
IDForType = s.PermissionID.HasValue && !s.PromotionID.HasValue ? s.PermissionID.Value : !s.PermissionID.HasValue && s.PromotionID.HasValue ? s.PromotionID.Value : 0,
Title = s.PermissionID.HasValue && !s.PromotionID.HasValue ? s.Permission.Title : !s.PermissionID.HasValue && s.PromotionID.HasValue ? s.Promotion.Name : "",
}).ToListAsync();
}
public async Task<Order> GetOrder(int OrderID, int CompanyID)
{
return await _repoOrder.Get(w => w.ID == OrderID && w.CompanyID == CompanyID) .FirstOrDefaultAsync();
}
public async Task<bool> UpdateOrder(Order order)
{
return await _repoOrder.UpdateAsync(order);
}
}
}