|
|
@@ -203,7 +203,7 @@ Route::group(['middleware' => 'auth'],function(){
|
|
|
|
|
|
if ($_GET["filterCertificateType"] != "null")
|
|
|
{
|
|
|
- $types = \App\Models\MemberCertificate::where('type', $_GET["filterCertificateType"])->pluck('member_id');
|
|
|
+ $types = \App\Models\MemberCertificate::where('type', $_GET["filterCertificateType"])->where('expire_date', '>', date("Y-m-d"))->pluck('member_id');
|
|
|
$x = $x->whereIn('id', $types->toArray());;
|
|
|
//$ids = array_merge($ids, $types->toArray());
|
|
|
}
|
|
|
@@ -960,7 +960,7 @@ Route::group(['middleware' => 'auth'],function(){
|
|
|
|
|
|
if ($_GET["filterCertificateType"] != "null")
|
|
|
{
|
|
|
- $ctypes = \App\Models\MemberCertificate::where('type', $_GET["filterCertificateType"])->pluck('member_id');
|
|
|
+ $ctypes = \App\Models\MemberCertificate::where('type', $_GET["filterCertificateType"])->where('expire_date', '>', date("Y-m-d"))->pluck('member_id');
|
|
|
$datas = $datas->whereIn('member_id', $ctypes);
|
|
|
}
|
|
|
if ($_GET["filterCertificateScadenza"] != "null")
|