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

Fix chart balance.

Browse Source
This commit is contained in:
James Cole
2024-12-26 08:53:16 +01:00
parent 00147e98dd
commit d313f5fdf5
3 changed files with 65 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Account/ShowController.php
View File

@@ -173,6 +173,7 @@ class ShowController extends Controller
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
$end = today(config('app.timezone'));
$today = today(config('app.timezone'));
$accountCurrency = $this->repository->getAccountCurrency($account);
$start = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
$subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
$page = (int) $request->get('page');
@@ -193,7 +194,7 @@ class ShowController extends Controller
$groups->setPath(route('accounts.show.all', [$account->id]));
$chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$showAll = true;
$balance = Steam::finalAccountBalance($account, $end)['balance'];
$balances = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);
return view(
'accounts.show',
@@ -213,7 +214,7 @@ class ShowController extends Controller
'subTitle',
'start',
'end',
'balance'
'balances'
)
);
}