rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixing

Browse Source
This commit is contained in:
Roland Schneider 2021-09-28 19:15:27 +02:00
parent 9fd7862d58
commit 9e93416011
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
customerapi/controllers/EventController.php
View File

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