From eeb715f169aa2c949357ff920140db956dc11bf1 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 11 Apr 2018 17:52:41 +0300 Subject: [PATCH] skip transfers in reports --- app/Http/Controllers/Reports/ExpenseSummary.php | 2 +- app/Http/Controllers/Reports/IncomeExpenseSummary.php | 4 ++-- app/Http/Controllers/Reports/IncomeSummary.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index dbae1aea3..3f605c47e 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -87,7 +87,7 @@ class ExpenseSummary extends Controller // Payments if ($status != 'upcoming') { - $payments = Payment::monthsOfYear('paid_at')->get(); + $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($expenses_graph, $totals, $expenses, $payments, 'payment', 'paid_at'); } diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 86c7b138c..8aae900ee 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -115,7 +115,7 @@ class IncomeExpenseSummary extends Controller // Revenues if ($status != 'upcoming') { - $revenues = Revenue::monthsOfYear('paid_at')->get(); + $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at'); } @@ -137,7 +137,7 @@ class IncomeExpenseSummary extends Controller // Payments if ($status != 'upcoming') { - $payments = Payment::monthsOfYear('paid_at')->get(); + $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($profit_graph, $totals, $compares, $payments, 'payment', 'paid_at'); } diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 338d677c1..896f568a5 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -87,7 +87,7 @@ class IncomeSummary extends Controller // Revenues if ($status != 'upcoming') { - $revenues = Revenue::monthsOfYear('paid_at')->get(); + $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($incomes_graph, $totals, $incomes, $revenues, 'revenue', 'paid_at'); }