kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 14:58:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix empty pop-ups in report.

Browse Source
This commit is contained in:
James Cole
2016-09-25 14:47:55 +02:00
parent e4e0e21293
commit 2fc09ff9d7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Popup/ReportController.php
View File

@@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers\Popup;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Crud\Account\AccountCrudInterface;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collection\BalanceLine; use FireflyIII\Helpers\Collection\BalanceLine;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
@@ -184,7 +185,7 @@ class ReportController extends Controller
{ {
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class); $repository = app(AccountRepositoryInterface::class);
$crud = app('FireflyIII\Crud\Account\AccountCrudInterface'); $crud = app(AccountCrudInterface::class);
$account = $crud->find(intval($attributes['accountId'])); $account = $crud->find(intval($attributes['accountId']));
$types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
$journals = $repository->journalsInPeriod($attributes['accounts'], $types, $attributes['startDate'], $attributes['endDate']); $journals = $repository->journalsInPeriod($attributes['accounts'], $types, $attributes['startDate'], $attributes['endDate']);
@@ -192,7 +193,8 @@ class ReportController extends Controller
// filter for transfers and withdrawals TO the given $account // filter for transfers and withdrawals TO the given $account
$journals = $journals->filter( $journals = $journals->filter(
function (TransactionJournal $journal) use ($account) { function (TransactionJournal $journal) use ($account) {
if ($journal->destination_account_id === $account->id) { $destinations = TransactionJournal::destinationAccountList($journal)->pluck('id')->toArray();
if (in_array($account->id, $destinations)) {
return true; return true;
} }

5
app/Http/Controllers/ReportController.php
View File

@@ -187,8 +187,9 @@ class ReportController extends Controller
$transactionAmount = $journal->source_amount; $transactionAmount = $journal->source_amount;
// get currently relevant transaction: // get currently relevant transaction:
if (intval($journal->destination_account_id) === $account->id) { $destinations = TransactionJournal::destinationAccountList($journal)->pluck('id')->toArray();
$transactionAmount = $journal->destination_amount; if (in_array($account->id, $destinations)) {
$transactionAmount = TransactionJournal::amountPositive($journal);
} }
$newBalance = bcadd($startBalance, $transactionAmount); $newBalance = bcadd($startBalance, $transactionAmount);
$journal->after = $newBalance; $journal->after = $newBalance;