Autocommit at 07.05.2022 @ 20:39

1 files changed, 4 insertions, 1 deletions

diff --git a/src/Services/EventService.cpp b/src/Services/EventService.cpp
index 4c00a9a..38a3a8c 100644
--- a/src/Services/EventService.cpp
+++ b/src/Services/EventService.cpp
@@ -206,8 +206,11 @@ bool cond_event_dates(const Event& event, const Date& start, const Date& end) {
 
 StatusCode EventService::reportBoughtTickets(int hallNumber, const Date& start, const Date& end, bool all) {
 	List<Event> result;
+	bool (*cond_hall)(const Event&, int) = cond_event_hallNumber;
+	if (all) cond_hall = cond_event_all;
+
 	for (unsigned i = 0; i < events.get_count(); i++) {
-		if (events[i].get_hall().get_number() == hallNumber)
+		if (cond_hall(events[i], hallNumber) && cond_event_dates(events[i], start, end))
 			result.add(events[i]);
 	}
 }