|
|
@@ -1207,7 +1207,7 @@ Route::group(['middleware' => 'tenant'], function () {
|
|
|
$course_ids = \App\Models\Course::whereIn('course_frequency_id', $frequencies)->pluck('id');
|
|
|
$member_course = $member_course->whereIn('course_id', $course_ids);
|
|
|
}
|
|
|
- if ($_GET["filterType"] != "null") {
|
|
|
+ if ($_GET["filterType"] != "null" && $_GET["filterType"] != "undefined") {
|
|
|
$types = explode(",", $_GET["filterType"]);
|
|
|
$course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
|
|
|
$member_course = $member_course->whereIn('course_id', $course_ids);
|
|
|
@@ -1538,7 +1538,7 @@ Route::group(['middleware' => 'tenant'], function () {
|
|
|
->leftJoin('courses', 'member_courses.course_id', '=', 'courses.id')
|
|
|
->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
|
|
|
|
|
|
- if (isset($_GET["search"]["value"])) {
|
|
|
+ if (isset($_GET["search"]["value"]) && trim($_GET["search"]["value"]) != "") {
|
|
|
$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
|
|
|
|
$member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
|
@@ -1578,7 +1578,7 @@ Route::group(['middleware' => 'tenant'], function () {
|
|
|
$course_ids = \App\Models\Course::whereIn('course_frequency_id', $frequencies)->pluck('id');
|
|
|
$datas = $datas->whereIn('course_id', $course_ids);
|
|
|
}
|
|
|
- if ($_GET["filterType"] != "null") {
|
|
|
+ if ($_GET["filterType"] != "null" && $_GET["filterType"] != "undefined") {
|
|
|
$types = explode(",", $_GET["filterType"]);
|
|
|
$course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
|
|
|
$datas = $datas->whereIn('course_id', $course_ids);
|