records_in - fix visualizzazione utenti

app/Http/Livewire/RecordIN.php

@@ -266,12 +266,29 @@ class RecordIN extends Component
     {
         if ($this->add || $this->update) {
             if ($this->commercial) {
-                $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->orderBy('last_name')->orderBy('first_name')->get();
+                $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->where(function ($query) {
+                    $query->where('is_archived', false)->orWhereNull('is_archived');
+                })
+                    ->where(function ($query) {
+                        $query->where('is_deleted', false)->orWhereNull('is_deleted');
+                    })->orderBy('last_name')->orderBy('first_name')->get();
             } else {
-                $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->where('current_status', 2)->orWhere('current_status', 1)->orderBy('last_name')->orderBy('first_name')->get();
+                $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->where(function ($query) {
+                    $query->where('is_archived', false)->orWhereNull('is_archived');
+                })
+                    ->where(function ($query) {
+                        $query->where('is_deleted', false)->orWhereNull('is_deleted');
+                    })->where('current_status', 2)->orWhere('current_status', 1)->orderBy('last_name')->orderBy('first_name')->get();
             }
         } else
-            $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->orderBy('last_name')->orderBy('first_name')->get();
+            $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])->where(function ($query) {
+                $query->where('is_archived', false)
+                    ->orWhereNull('is_archived');
+            })
+                ->where(function ($query) {
+                    $query->where('is_deleted', false)
+                        ->orWhereNull('is_deleted');
+                })->orderBy('last_name')->orderBy('first_name')->get();
     }
 
     public function setAmount()
@@ -1044,7 +1061,12 @@ class RecordIN extends Component
         if ($this->commercial) {
             $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])
                 ->where(function ($query) {
-                    $query->where('status', '!=', 'archived');
+                    $query->where('is_archived', false)
+                        ->orWhereNull('is_archived');
+                })
+                ->where(function ($query) {
+                    $query->where('is_deleted', false)
+                        ->orWhereNull('is_deleted');
                 })
                 ->orderBy('last_name')
                 ->orderBy('first_name')
@@ -1052,10 +1074,12 @@ class RecordIN extends Component
         } else {
             $this->members = \App\Models\Member::select(['id', 'first_name', 'last_name', 'fiscal_code'])
                 ->where(function ($query) {
-                    $query->where('current_status', 2)->orWhere('current_status', 1);
+                    $query->where('is_archived', false)
+                        ->orWhereNull('is_archived');
                 })
                 ->where(function ($query) {
-                    $query->where('status', '!=', 'archived');
+                    $query->where('is_deleted', false)
+                        ->orWhereNull('is_deleted');
                 })
                 ->orderBy('last_name')
                 ->orderBy('first_name')
@@ -1698,7 +1722,7 @@ class RecordIN extends Component
         $this->newMemberExists = \App\Models\Member::query()
             ->where(function ($q) {
                 $q->where('is_deleted', false)
-                ->orWhereNull('is_deleted');
+                    ->orWhereNull('is_deleted');
             })
             ->whereRaw('LOWER(TRIM(first_name)) = ?', [$first])
             ->whereRaw('LOWER(TRIM(last_name))  = ?', [$last])