ferrari 3 месяцев назад
Родитель
Сommit
35a2670c54
1 измененных файлов с 14 добавлено и 0 удалено
  1. 14 0
      app/Http/Livewire/Reports.php

+ 14 - 0
app/Http/Livewire/Reports.php

@@ -316,12 +316,26 @@ class Reports extends Component
 
         $totalIncome = DB::table('records')
             ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
+            ->join('causals', function ($join) {
+                $join->on('causals.id', '=', 'records_rows.causal_id')
+                    ->where(function ($query) {
+                        $query->where('causals.no_reports', 0)
+                            ->orWhereNull('causals.no_reports');
+                    });
+            })
             ->whereBetween('records.date', [$dateRange['start'], $dateRange['end']])
             ->where('records.type', 'IN')
             ->sum('records_rows.amount');
 
         $totalExpenses = DB::table('records')
             ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
+            ->join('causals', function ($join) {
+                $join->on('causals.id', '=', 'records_rows.causal_id')
+                    ->where(function ($query) {
+                        $query->where('causals.no_reports', 0)
+                            ->orWhereNull('causals.no_reports');
+                    });
+            })
             ->whereBetween('records.date', [$dateRange['start'], $dateRange['end']])
             ->where('records.type', 'OUT')
             ->sum('records_rows.amount');