Просмотр исходного кода

gestionale - fix calcolo uscite

ferrari 1 месяц назад
Родитель
Сommit
d90c8c55a8
1 измененных файлов с 16 добавлено и 4 удалено
  1. 16 4
      app/Http/Livewire/RecordINOUT.php

+ 16 - 4
app/Http/Livewire/RecordINOUT.php

@@ -211,7 +211,10 @@ class RecordINOUT extends Component
                     ->where(function ($query) {
                     ->where(function ($query) {
                         $query->where('financial_movement', false)->orWhere('financial_movement', null);
                         $query->where('financial_movement', false)->orWhere('financial_movement', null);
                     })
                     })
-                    ->whereNotIn('member_id', $exclude_from_records)
+                    ->where(function ($query) use ($exclude_from_records) {
+                        $query->whereNotIn('member_id', $exclude_from_records)
+                            ->orWhere('member_id', null);
+                    })
                     ->whereRaw('records_rows.when REGEXP ?', [$pairs]);
                     ->whereRaw('records_rows.when REGEXP ?', [$pairs]);
                 $incomeRecords = $incomeQuery->get();
                 $incomeRecords = $incomeQuery->get();
 
 
@@ -250,7 +253,10 @@ class RecordINOUT extends Component
                     ->where(function ($query) {
                     ->where(function ($query) {
                         $query->where('financial_movement', false)->orWhere('financial_movement', null);
                         $query->where('financial_movement', false)->orWhere('financial_movement', null);
                     })
                     })
-                    ->whereNotIn('member_id', $exclude_from_records)
+                    ->where(function ($query) use ($exclude_from_records) {
+                        $query->whereNotIn('member_id', $exclude_from_records)
+                            ->orWhere('member_id', null);
+                    })
                     ->whereRaw('records_rows.when REGEXP ?', [$pairs]);
                     ->whereRaw('records_rows.when REGEXP ?', [$pairs]);
                 $expenseRecords = $expenseQuery->get();
                 $expenseRecords = $expenseQuery->get();
 
 
@@ -505,7 +511,10 @@ class RecordINOUT extends Component
                 ->where(function ($query) {
                 ->where(function ($query) {
                     $query->where('financial_movement', false)->orWhere('financial_movement', null);
                     $query->where('financial_movement', false)->orWhere('financial_movement', null);
                 })
                 })
-                ->whereNotIn('member_id', $exclude_from_records)
+                ->where(function ($query) use ($exclude_from_records) {
+                    $query->whereNotIn('member_id', $exclude_from_records)
+                        ->orWhere('member_id', null);
+                })
                 ->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
                 ->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
             //$records = $records->orderBy('date', 'DESC')->get();
             //$records = $records->orderBy('date', 'DESC')->get();
 
 
@@ -535,7 +544,10 @@ class RecordINOUT extends Component
                 ->where(function ($query) {
                 ->where(function ($query) {
                     $query->where('financial_movement', false)->orWhere('financial_movement', null);
                     $query->where('financial_movement', false)->orWhere('financial_movement', null);
                 })
                 })
-                ->whereNotIn('member_id', $exclude_from_records)
+                ->where(function ($query) use ($exclude_from_records) {
+                    $query->whereNotIn('member_id', $exclude_from_records)
+                        ->orWhere('member_id', null);
+                })
                 ->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
                 ->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
             //$records = $records->orderBy('date', 'DESC')->get();
             //$records = $records->orderBy('date', 'DESC')->get();