kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #3739

Browse Source
This commit is contained in:
James Cole
2020-08-26 18:18:53 +02:00
parent a24b6711d1
commit 59ab0c9f0d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -54,8 +54,7 @@ class ConvertController extends Controller
{ {
use ModelInformation, UserNavigation; use ModelInformation, UserNavigation;
/** @var JournalRepositoryInterface Journals and transactions overview */ private JournalRepositoryInterface $repository;
private $repository;
/** /**
* ConvertController constructor. * ConvertController constructor.
@@ -260,7 +259,7 @@ class ConvertController extends Controller
// group accounts: // group accounts:
/** @var Account $account */ /** @var Account $account */
foreach ($accountList as $account) { foreach ($accountList as $account) {
$balance = app('steam')->balance($account); $balance = app('steam')->balance($account, today());
$currency = $repository->getAccountCurrency($account) ?? $defaultCurrency; $currency = $repository->getAccountCurrency($account) ?? $defaultCurrency;
$role = (string) $repository->getMetaValue($account, 'account_role'); $role = (string) $repository->getMetaValue($account, 'account_role');
if ('' === $role) { if ('' === $role) {
@@ -289,7 +288,7 @@ class ConvertController extends Controller
// group accounts: // group accounts:
/** @var Account $account */ /** @var Account $account */
foreach ($accountList as $account) { foreach ($accountList as $account) {
$balance = app('steam')->balance($account); $balance = app('steam')->balance($account, today());
$currency = $repository->getAccountCurrency($account) ?? $defaultCurrency; $currency = $repository->getAccountCurrency($account) ?? $defaultCurrency;
$role = 'l_' . $account->accountType->type; $role = 'l_' . $account->accountType->type;
$key = (string) trans('firefly.opt_group_' . $role); $key = (string) trans('firefly.opt_group_' . $role);