diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs index 13a7754..1b3c19e 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Requests/Integrations/IntegrationMaterialFreeGoodsRequest.cs @@ -45,10 +45,10 @@ public class IntegrationMaterialFreeGoodItemRequest public string? FocUnitOfMeasure { get; set; } [Required(ErrorMessage = "ValidFrom is required.")] - public DateOnly ValidFrom { get; set; } + public DateTime ValidFrom { get; set; } [Required(ErrorMessage = "ValidTo is required.")] - public DateOnly ValidTo { get; set; } + public DateTime ValidTo { get; set; } [StringLength(1, MinimumLength = 1, ErrorMessage = "Status must be 1 character.")] public string? Status { get; set; } // NULL = Active, X = Inactive diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs index 860369f..0ef993f 100644 --- a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs +++ b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/Integrations/IntegrationService.cs @@ -400,8 +400,8 @@ public class IntegrationService : IIntegrationService if (request.Slabs != null && request.Slabs.Count > 0) { - fromValid =Convert.ToDateTime( request.Slabs.Max(x => x.ValidFrom)); - toValid = Convert.ToDateTime(request.Slabs.Max(x => x.ValidTo)); + fromValid =request.Slabs.Max(x => x.ValidFrom); + toValid = request.Slabs.Max(x => x.ValidTo); } IntegrationMaterialFreeGoodsResponse meterialFreeGoods = await GetMaterialFreeGoodsByFilterAsync(tc, @@ -418,9 +418,8 @@ public class IntegrationService : IIntegrationService MaterialCode = request.MaterialCode, CustomerNumber = request.CustomerNumber }); - if (meterialFreeGoods != null && !string.IsNullOrWhiteSpace(meterialFreeGoods.MaterialCode)) - { + { UpdateMaterialFreeGoods(tc, request); response.IsUpdated = true; }