master
cody 2 weeks ago
parent aeacd0f5d1
commit 8829c1b069

@ -233,8 +233,8 @@ class OtherController extends CommonController
$calendar = Calendar::where(function ($query) use ($start_date, $end_date) { $calendar = Calendar::where(function ($query) use ($start_date, $end_date) {
$query->whereBetween('start_time', [$start_date, $end_date]) $query->whereBetween('start_time', [$start_date, $end_date])
->orWhereBetween('end_time', [$start_date, $end_date]); ->orWhereBetween('end_time', [$start_date, $end_date]);
})->where(function ($query) use ($start_date, $courses) { })->where(function ($query) use ($courses) {
if ($start_date != CourseType::START_DATE) { if (request('course_type_id')) {
$query->whereIn('course_id', $courses->pluck('id')); $query->whereIn('course_id', $courses->pluck('id'));
} }
}); });

Loading…
Cancel
Save