From 5ab8cb38d32175260f3d2c9ea72e283b298dcdf7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 16 May 2016 12:47:43 +0200 Subject: [PATCH] Small change in report [skip ci] --- app/Helpers/Collection/BillLine.php | 9 --------- app/Helpers/Report/ReportHelper.php | 3 ++- app/Repositories/Account/AccountRepository.php | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/Helpers/Collection/BillLine.php b/app/Helpers/Collection/BillLine.php index 24fb790fec..8c85380cd1 100644 --- a/app/Helpers/Collection/BillLine.php +++ b/app/Helpers/Collection/BillLine.php @@ -141,13 +141,4 @@ class BillLine $this->hit = $hit; } - /** - * @return bool - */ - public function isHitAndActive():bool - { - return $this->hit && $this->active; - } - - } diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 78f01bb4e1..edcb7752b7 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -23,6 +23,7 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use Log; /** * Class ReportHelper @@ -92,7 +93,7 @@ class ReportHelper implements ReportHelperInterface $billLine->setHit(true); } - if ($billLine->isHitAndActive()) { + if ($billLine->isActive()) { $collection->addBill($billLine); } } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index b775164f47..ae2a388eb0 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -524,8 +524,7 @@ class AccountRepository implements AccountRepositoryInterface $sum = '0'; foreach ($incomes as $entry) { $amount = TransactionJournal::amountPositive($entry); - Log::debug('spentInPeriod amount: ' . $amount); - $sum = bcadd($sum, $amount); + $sum = bcadd($sum, $amount); } return $sum;