Quellcode durchsuchen

fix uscite gestionale

FabioFratini vor 8 Monaten
Ursprung
Commit
d0f0d6ae27
1 geänderte Dateien mit 12 neuen und 13 gelöschten Zeilen
  1. 12 13
      app/Http/Livewire/RecordINOUT.php

+ 12 - 13
app/Http/Livewire/RecordINOUT.php

@@ -211,6 +211,7 @@ class RecordINOUT extends Component
                     ->where('records_rows.when', 'like', '%"' . $f . '"%')
                     ->get();
 
+                    //Log::info('Record In' . $records);
                 foreach($records as $record)
                 {
                     $amount = $record->amount;
@@ -229,21 +230,19 @@ class RecordINOUT extends Component
                     // Aggiorno i dati del padre
                     $this->updateParent("IN", $record->causal_id, $amount, $filter);
                 }
-
                 $records = \App\Models\Record::where('type', 'OUT')
-                    ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
-                    ->whereNotIn('records_rows.causal_id', $this->excludeCausals)
-                    ->where(function ($query)  {
-                        $query->where('deleted', false)->orWhere('deleted', null);
-                    })
-                    ->where(function ($query)  {
-                        $query->where('financial_movement', false)->orWhere('financial_movement', null);
-                    })
-                    ->orWhere(function ($subquery) use ($exclude_from_records) {
-                        $subquery->whereNotIn('member_id', $exclude_from_records);
-                    })
-                    ->where('records_rows.when', 'like', '%"' . $f . '"%')->get();
+                ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
+                ->whereNotIn('records_rows.causal_id', $this->excludeCausals)
+                ->where(function ($query) {
+                    $query->where('deleted', false)->orWhere('deleted', null);
+                })
 
+                ->where(function ($query) use ($exclude_from_records) {
+                    $query->whereNull('member_id')
+                          ->orWhereNotIn('member_id', $exclude_from_records);
+                })
+                ->where('records_rows.when', 'like', '%"' . $f . '"%')->get();
+                Log::info('Record Out' . $records);
                 foreach($records as $record)
                 {
                     $amount = $record->amount;