diff --git a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs index f34a7ae..ff705a5 100644 --- a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs +++ b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs @@ -24,8 +24,7 @@ namespace SushiBarDatabaseImplement.Implements return context.Orders .Include(o => o.Sushi) .Where(o => - (model.Id.HasValue && o.Id == model.Id) || - (model.DateFrom.HasValue && model.DateTo.HasValue && model.DateFrom < o.DateCreate && o.DateCreate < model.DateTo)) + (model.Id.HasValue && o.Id == model.Id)) .Select(o => o.GetViewModel) .ToList(); } @@ -79,6 +78,7 @@ namespace SushiBarDatabaseImplement.Implements { using var context = new SushiBarDatabase(); var element = context.Orders + .Include(o => o.Sushi) .FirstOrDefault(o => o.Id == model.Id); if (element != null) {