|
|
@@ -359,7 +359,7 @@ Route::group(['middleware' => 'auth'],function(){
|
|
|
});
|
|
|
//where('first_name', 'like', '%' . $_GET["search"]["value"] . '%');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
//$x = $x->where(function ($query) use ($v) {
|
|
|
|
|
|
@@ -913,6 +913,16 @@ Route::group(['middleware' => 'auth'],function(){
|
|
|
|
|
|
$datas = \App\Models\MemberCourse::select('member_courses.*', 'members.first_name', 'members.last_name', 'members.email', 'members.phone', 'members.birth_date')->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
|
|
|
|
|
|
+ if (isset($_GET["search"]["value"]))
|
|
|
+ {
|
|
|
+ $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
|
|
|
+ $member_ids = \App\Models\Member::where(function ($query) use ($v) {
|
|
|
+ $query->where('first_name', 'like', '%' . $v . '%')
|
|
|
+ ->orWhere('last_name', 'like', '%' . $v . '%');
|
|
|
+ })->pluck('id');
|
|
|
+ $datas = $datas->whereIn('member_id', $member_ids);
|
|
|
+ }
|
|
|
+
|
|
|
if ($_GET["filterCourse"] != "null")
|
|
|
{
|
|
|
$course_ids = [];
|