diff --git a/customerapi/controllers/EventController.php b/customerapi/controllers/EventController.php index 443e90c..a6962a7 100644 --- a/customerapi/controllers/EventController.php +++ b/customerapi/controllers/EventController.php @@ -66,13 +66,16 @@ class EventController extends CustomerApiController // 'COUNT({{event_registration}}.id) AS reservationCount' ]); + $paramEventStartMax = clone $interval->lastActiveDate; + $paramEventStartMax = $paramEventStartMax->modify('+1 day'); + $paramEventStartMax = $paramEventStartMax->getTimestamp(); + $events = $query ->innerJoinWith('trainer') ->innerJoinWith('eventType') ->innerJoinWith('room') -// ->leftJoin('activeEventRegistrationsForCustomer') ->andWhere(['>=', 'event.start', $interval->firstActiveDate->getTimestamp()]) - ->andWhere(['<', 'event.start', (clone $interval->lastActiveDate)->modify('+1 day')->getTimestamp()]) + ->andWhere(['<', 'event.start', $paramEventStartMax]) ->andWhere(['event.active' => '1']) ->all();