fix gestionale e cleanup

app/Http/Livewire/Record.php

@@ -118,20 +118,6 @@ class Record extends Component
         $this->totals = array();
 
         $exclude_from_records = \App\Models\Member::where('exclude_from_records', true)->pluck('id')->toArray();
-
-        /*
-        $fromDate = '';
-        $toDate = '';
-
-        if ($this->selectedFilterFromDay != '' && $this->selectedFilterFromMonth != '' && $this->selectedFilterFromYear != '')
-        {
-            $fromDate = date($this->selectedFilterFromYear . "-" . $this->selectedFilterFromMonth . "-" . $this->selectedFilterFromDay);
-        }
-        if ($this->selectedFilterToDay != '' && $this->selectedFilterToMonth != '' && $this->selectedFilterToYear != '')
-        {
-            $toDate = date($this->selectedFilterToYear . "-" . $this->selectedFilterToMonth . "-" . $this->selectedFilterToDay . " 23:59:59");
-        }
-        */
         $datas = \App\Models\Record::with('member', 'supplier', 'payment_method')
                     ->select('records.*', 'records_rows.*') // Ensure all columns are selected
                     ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
@@ -143,9 +129,6 @@ class Record extends Component
                                   ->orWhere('records.commercial', false);
                         });
                     })
-                    /*->where(function ($query)  {
-                        $query->where('deleted', false)->orWhere('deleted', null);
-                    })*/
                     ->where(function ($query) use ($exclude_from_records) {
                         $query->where('type', 'OUT')
                               ->orWhere(function ($subquery) use ($exclude_from_records) {
@@ -200,12 +183,6 @@ class Record extends Component
                 {
                     $amount = $data->amount;
                 }
-                /*$when = sizeof(json_decode($data->when));
-
-                if ($when > 1)
-                {
-                    $amount = $amount / $when;
-                }*/
 
                 $prefix = '';
                 if (!$data->commercial)
@@ -213,7 +190,6 @@ class Record extends Component
 
 
                 // aggiungere il nome * * *
-                //$causal = $prefix . $data->date . "§" . $causalCheck->getTree();
                 $causal = $prefix . $data->date . "§" . $causalCheck->getTree() . "§" .
                 ($data->type == "IN" ? ($data->member ? ($data->member->last_name . " " . $data->member->first_name) : "") :
                 $data->supplier->name ?? "") . "§" . $data->note . "§" . ($data->deleted ? 'DELETED' : '') .

app/Http/Livewire/RecordINOUT.php

@@ -179,10 +179,7 @@ class RecordINOUT extends Component
     }
 
     public function show($m, $y)
-    //public function show($dt)
     {
-        //list($m, $y) = explode("_", $dt);
-
         if ($m != "" && $y != "" && !in_array($m . "-" . $y, $this->datas))
             $this->datas[] = $m . "-" . $y;
 
@@ -196,16 +193,11 @@ class RecordINOUT extends Component
         {
             foreach($this->datas as $filter)
             {
-                // $filter = $m . "-" . $this->year;
-
                 $this->columns[] = $filter;
 
                 $f = $filter;
                 if ($m == 'x')
                     $f = str_replace("x-", "", $filter);
-
-                //$dt = $y . "-0" . $m;
-
                 $records = \App\Models\Record::where('type', 'IN')
                     ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
                     ->whereNotIn('records_rows.causal_id', $this->excludeCausals)
@@ -216,12 +208,8 @@ class RecordINOUT extends Component
                         $query->where('financial_movement', false)->orWhere('financial_movement', null);
                     })
                     ->whereNotIn('member_id', $exclude_from_records)
-                    /*->where(function ($query) use ($f, $dt)  {
-                        $query->where('records.date', 'like', '%' . $dt . '%')->orWhere('records_rows.when', 'like', '%' . $f . '%');
-                    })*/
                     ->where('records_rows.when', 'like', '%"' . $f . '"%')
                     ->get();
-                //$records = $records->orderBy('date', 'DESC')->get();
 
                 foreach($records as $record)
                 {
@@ -251,9 +239,10 @@ class RecordINOUT extends Component
                     ->where(function ($query)  {
                         $query->where('financial_movement', false)->orWhere('financial_movement', null);
                     })
-                    ->whereNotIn('member_id', $exclude_from_records)
+                    ->orWhere(function ($subquery) use ($exclude_from_records) {
+                        $subquery->whereNotIn('member_id', $exclude_from_records);
+                    })
                     ->where('records_rows.when', 'like', '%"' . $f . '"%')->get();
-                //$records = $records->orderBy('date', 'DESC')->get();
 
                 foreach($records as $record)
                 {