Luca Parisio 1 年間 前
コミット
d3c9e3ab63
2 ファイル変更3 行追加2 行削除
  1. 1 0
      resources/views/livewire/course_list.blade.php
  2. 2 2
      routes/web.php

+ 1 - 0
resources/views/livewire/course_list.blade.php

@@ -341,6 +341,7 @@
             $('.filterLevel').val(null).trigger("change");
             $('.filterFrequency').val(null).trigger("change");
             $('.filterDuration').val(null).trigger("change");
+            $('.filterType').val(null).trigger("change");
 
             destroyDataTable();
             loadDataTable();

+ 2 - 2
routes/web.php

@@ -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")