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

Make sure the convert controller works again.

Browse Source
This commit is contained in:
James Cole
2019-07-05 19:43:16 +02:00
parent 3c5c14ff5a
commit 7fd3f77c3e
17 changed files with 703 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/ExpandedForm.php
View File

@@ -75,7 +75,7 @@ class ExpandedForm
$balance = app('steam')->balance($account, new Carbon);
$currencyId = (int)$repository->getMetaValue($account, 'currency_id');
$currency = $currencyRepos->findNull($currencyId);
$role = $repository->getMetaValue($account, 'accountRole');
$role = $repository->getMetaValue($account, 'account_role');
if ('' === $role) {
$role = 'no_account_type'; // @codeCoverageIgnore
}
@@ -321,7 +321,7 @@ class ExpandedForm
// group accounts:
/** @var Account $account */
foreach ($assetAccounts as $account) {
$role = $repository->getMetaValue($account, 'accountRole');
$role = $repository->getMetaValue($account, 'account_role');
if (null === $role) {
$role = 'no_account_type'; // @codeCoverageIgnore
}
@@ -364,7 +364,7 @@ class ExpandedForm
$balance = app('steam')->balance($account, new Carbon);
$currencyId = (int)$repository->getMetaValue($account, 'currency_id');
$currency = $currencyRepos->findNull($currencyId);
$role = (string)$repository->getMetaValue($account, 'accountRole');
$role = (string)$repository->getMetaValue($account, 'account_role');
if ('' === $role) {
$role = 'no_account_type'; // @codeCoverageIgnore
}
@@ -618,7 +618,7 @@ class ExpandedForm
$balance = app('steam')->balance($account, new Carbon);
$currencyId = (int)$repository->getMetaValue($account, 'currency_id');
$currency = $currencyRepos->findNull($currencyId);
$role = (string)$repository->getMetaValue($account, 'accountRole');
$role = (string)$repository->getMetaValue($account, 'account_role'); // TODO bad form for currency
if ('' === $role) {
$role = 'no_account_type'; // @codeCoverageIgnore
}