diff --git a/ComputerShopFileImplement/Implements/OrderStorage.cs b/ComputerShopFileImplement/Implements/OrderStorage.cs index 111640e..65bc162 100644 --- a/ComputerShopFileImplement/Implements/OrderStorage.cs +++ b/ComputerShopFileImplement/Implements/OrderStorage.cs @@ -38,7 +38,7 @@ namespace ComputerShopFileImplement.Implements return new(); } return source.Orders - .Where(x => x.Id == model.Id) + .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) .Select(x => x.GetViewModel) .ToList(); } diff --git a/ComputerShopListImplement/Implements/OrderStorage.cs b/ComputerShopListImplement/Implements/OrderStorage.cs index db5d2c4..c61cd24 100644 --- a/ComputerShopListImplement/Implements/OrderStorage.cs +++ b/ComputerShopListImplement/Implements/OrderStorage.cs @@ -45,7 +45,7 @@ namespace ComputerShopListImplement.Implements } foreach (var order in _source.Orders) { - if (order.Id == model.Id) + if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo) { result.Add(order.GetViewModel); }