diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/MobileApp/OrderRequest.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/MobileApp/OrderRequest.cs index f2b2e99..f67c66e 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/MobileApp/OrderRequest.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/MobileApp/OrderRequest.cs @@ -28,6 +28,7 @@ public class SaveOrderRequest public string FocCode { get; set; } public decimal FocValue { get; set; } public decimal DiscountValue { get; set; } + public decimal? TotalVatValue { get; set; } public decimal GrossValue { get; set; } public decimal NetValue { get; set; } public OrderStatusEnum OrderStatus { get; set; } @@ -51,6 +52,7 @@ public class SaveOrderItemRequest public decimal DiscountAmount { get; set; } public bool IsFocItem { get; set; } public decimal LineTotalValue { get; set; } + public decimal? VatValue { get; set; } } public class SaveOrderPromotionRequest diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/OrderResponse.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/OrderResponse.cs index 91c7677..42eafab 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/OrderResponse.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/OrderResponse.cs @@ -38,6 +38,7 @@ public class GetSalesOrderResponse public string FocCode { get; set; } public decimal DiscountValue { get; set; } public decimal GrossValue { get; set; } + public decimal? TotalVatValue { get; set; } public decimal NetValue { get; set; } public int OrderStatus { get; set; } @@ -58,6 +59,7 @@ public class GetSalesOrderItemResponse public decimal? ApprovedQuantity { get; set; } public decimal? DiscountPercentage { get; set; } public decimal? DiscountAmount { get; set; } + public decimal? VatValue { get; set; } public bool IsFocItem { get; set; } public decimal LineTotalValue { get; set; } } diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/OrderService.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/OrderService.cs index d52960a..d0a8156 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/OrderService.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/OrderService.cs @@ -74,22 +74,22 @@ public class OrderService : IOrderService item.OrderId = request.OrderId; } - var materialStock = await _httpService.GetMaterialStockAsync(request.PlantCode); - if(materialStock is null || materialStock?.Count==0) - { - throw new Exception($"Material Stocks not found against this Plant Code-{request.PlantCode}"); - } + //var materialStock = await _httpService.GetMaterialStockAsync(request.PlantCode); + //if(materialStock is null || materialStock?.Count==0) + //{ + // throw new Exception($"Material Stocks not found against this Plant Code-{request.PlantCode}"); + //} - foreach (var item in request.Items) - { - decimal currentStock = materialStock.FirstOrDefault(x => x.MaterialCode == item.MaterialCode)?.AvailableStock ?? 0; + //foreach (var item in request.Items) + //{ + // decimal currentStock = materialStock.FirstOrDefault(x => x.MaterialCode == item.MaterialCode)?.AvailableStock ?? 0; - if(currentStock 0, - LineTotalValue = dr.GetDecimal(13) + LineTotalValue = dr.GetDecimal(13), + VatValue = dr.IsDBNull(14) ? null : dr.GetDecimal(14) }); } }