archivio utenti - fix

app/Http/Livewire/CourseList.php

@@ -109,7 +109,15 @@ class CourseList extends Component
     public function render()
     {
 
-        $member_course = \App\Models\MemberCourse::with('member')->with('course');
+        $member_course = \App\Models\MemberCourse::with('member')->with('course')
+                ->where(function($query) {
+                    $query->where('members.is_archived', false)
+                        ->orWhereNull('members.is_archived');
+                })
+                ->where(function($query) {
+                    $query->where('members.is_deleted', false)
+                        ->orWhereNull('members.is_deleted');
+                });
 
         if ($this->search != '')
         {
@@ -117,14 +125,6 @@ class CourseList extends Component
             $member_ids = \App\Models\Member::where(function ($query) use ($v) {
                     $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
                         ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
-                })
-                ->where(function($query) {
-                    $query->where('is_archived', false)
-                        ->orWhereNull('is_archived');
-                })
-                ->where(function($query) {
-                    $query->where('is_deleted', false)
-                        ->orWhereNull('is_deleted');
                 })->pluck('id');
             /*
             $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
@@ -152,14 +152,6 @@ class CourseList extends Component
                     $member_ids = \App\Models\Member::where(function ($query) use ($v) {
                             $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
                                 ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
-                        })
-                        ->where(function($query) {
-                            $query->where('is_archived', false)
-                                ->orWhereNull('is_archived');
-                        })
-                        ->where(function($query) {
-                            $query->where('is_deleted', false)
-                                ->orWhereNull('is_deleted');
                         })->pluck('id');
                     /*
                     $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));

app/Http/Livewire/CourseMember.php

@@ -71,7 +71,15 @@ class CourseMember extends Component
 
         // Carico tutti i corsi associati
         $this->filter = '';
-        $datas = \App\Models\MemberCourse::with('member');
+        $datas = \App\Models\MemberCourse::with('member')
+                ->where(function($query) {
+                    $query->where('members.is_archived', false)
+                        ->orWhereNull('members.is_archived');
+                })
+                ->where(function($query) {
+                    $query->where('members.is_deleted', false)
+                        ->orWhereNull('members.is_deleted');
+                });
 
         if (sizeof($this->filterCourse) > 0)
         {
@@ -169,54 +177,22 @@ class CourseMember extends Component
         }
         if ($this->fromYear != "")
         {
-            $m_ids = \App\Models\Member::where('birth_date', '<', date("Y-m-d", strtotime("-" . $this->fromYear . " year", time())))
-                ->where(function($query) {
-                    $query->where('is_archived', false)
-                        ->orWhereNull('is_archived');
-                })
-                ->where(function($query) {
-                    $query->where('is_deleted', false)
-                        ->orWhereNull('is_deleted');
-                })->pluck('id');
+            $m_ids = \App\Models\Member::where('birth_date', '<', date("Y-m-d", strtotime("-" . $this->fromYear . " year", time())))->pluck('id');
             $datas = $datas->whereIn('member_id', $m_ids);
         }
         if ($this->toYear != "")
         {
-            $m_ids = \App\Models\Member::where('birth_date', '>', date("Y-m-d", strtotime("-" . $this->toYear . " year", time())))
-                ->where(function($query) {
-                    $query->where('is_archived', false)
-                        ->orWhereNull('is_archived');
-                })
-                ->where(function($query) {
-                    $query->where('is_deleted', false)
-                        ->orWhereNull('is_deleted');
-                })->pluck('id');
+            $m_ids = \App\Models\Member::where('birth_date', '>', date("Y-m-d", strtotime("-" . $this->toYear . " year", time())))->pluck('id');
             $datas = $datas->whereIn('member_id', $m_ids);
         }
         if ($this->fromFromYear != "")
         {
-            $m_ids = \App\Models\Member::whereYear('birth_date', '>=', $this->fromFromYear)
-                ->where(function($query) {
-                    $query->where('is_archived', false)
-                        ->orWhereNull('is_archived');
-                })
-                ->where(function($query) {
-                    $query->where('is_deleted', false)
-                        ->orWhereNull('is_deleted');
-                })->pluck('id');
+            $m_ids = \App\Models\Member::whereYear('birth_date', '>=', $this->fromFromYear)->pluck('id');
             $datas = $datas->whereIn('member_id', $m_ids);
         }
         if ($this->toToYear != "")
         {
-            $m_ids = \App\Models\Member::whereYear('birth_date', '<=', $this->toToYear)
-                ->where(function($query) {
-                    $query->where('is_archived', false)
-                        ->orWhereNull('is_archived');
-                })
-                ->where(function($query) {
-                    $query->where('is_deleted', false)
-                        ->orWhereNull('is_deleted');
-                })->pluck('id');
+            $m_ids = \App\Models\Member::whereYear('birth_date', '<=', $this->toToYear)->pluck('id');
             $datas = $datas->whereIn('member_id', $m_ids);
         }
         /*if ($_GET["toYear"] != "")

app/Http/Livewire/RecordIN.php

@@ -969,10 +969,6 @@ class RecordIN extends Component
         if ($this->newMemberFiscalCode != '')
         {
             $check = \App\Models\Member::where('fiscal_code', $this->newMemberFiscalCode)
-                ->where(function($query) {
-                    $query->where('is_archived', false)
-                        ->orWhereNull('is_archived');
-                })
                 ->where(function($query) {
                     $query->where('is_deleted', false)
                         ->orWhereNull('is_deleted');