kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 03:08:11 +00:00
Code Issues Projects Releases Wiki Activity

Fixes tests

Browse Source
This commit is contained in:
James Cole
2018-07-13 16:07:30 +02:00
parent 8b33ec1339
commit aa25007431
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/CategoryController.php
View File

@@ -399,7 +399,7 @@ class CategoryController extends Controller
$collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class); $collector->removeFilter(InternalTransferFilter::class);
$transferred = app('steam')->positive($collector->getJournals()->sum('transaction_amount')); $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount'));
// amount spent // amount spent
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
@@ -481,7 +481,7 @@ class CategoryController extends Controller
$collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category) $collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category)
->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class); $collector->removeFilter(InternalTransferFilter::class);
$transferred = app('steam')->positive($collector->getJournals()->sum('transaction_amount')); $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount'));
$entries->push( $entries->push(
[ [