|
|
@@ -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');
|