kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Small change in report [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-05-16 12:47:43 +02:00
parent fc4ab29244
commit 5ab8cb38d3
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Helpers/Collection/BillLine.php
View File

@@ -141,13 +141,4 @@ class BillLine
$this->hit = $hit; $this->hit = $hit;
} }
/**
* @return bool
*/
public function isHitAndActive():bool
{
return $this->hit && $this->active;
}
} }

3
app/Helpers/Report/ReportHelper.php
View File

@@ -23,6 +23,7 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log;
/** /**
* Class ReportHelper * Class ReportHelper
@@ -92,7 +93,7 @@ class ReportHelper implements ReportHelperInterface
$billLine->setHit(true); $billLine->setHit(true);
} }
if ($billLine->isHitAndActive()) { if ($billLine->isActive()) {
$collection->addBill($billLine); $collection->addBill($billLine);
} }
} }

3
app/Repositories/Account/AccountRepository.php
View File

@@ -524,8 +524,7 @@ class AccountRepository implements AccountRepositoryInterface
$sum = '0'; $sum = '0';
foreach ($incomes as $entry) { foreach ($incomes as $entry) {
$amount = TransactionJournal::amountPositive($entry); $amount = TransactionJournal::amountPositive($entry);
Log::debug('spentInPeriod amount: ' . $amount); $sum = bcadd($sum, $amount);
$sum = bcadd($sum, $amount);
} }
return $sum; return $sum;