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 #1463

Browse Source
This commit is contained in:
James Cole
2018-06-28 06:43:59 +02:00
parent 7bdf20fee5
commit cfd98a33fe
8 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Support/ExpandedForm.php
View File

@@ -45,6 +45,45 @@ use Session;
*/
class ExpandedForm
{
/**
* @param string $name
* @param null $options
*
* @return string
* @throws \Throwable
*/
public function activeAssetAccountList(string $name, $value = null, array $options = []): string
{
// make repositories
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
/** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class);
$assetAccounts = $repository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
$defaultCurrency = app('amount')->getDefaultCurrency();
$grouped = [];
// group accounts:
/** @var Account $account */
foreach ($assetAccounts as $account) {
$balance = app('steam')->balance($account, new Carbon);
$currencyId = (int)$account->getMeta('currency_id');
$currency = $currencyRepos->findNull($currencyId);
$role = $account->getMeta('accountRole');
if ('' === $role) {
$role = 'no_account_type'; // @codeCoverageIgnore
}
if (null === $currency) {
$currency = $defaultCurrency;
}
$key = (string)trans('firefly.opt_group_' . $role);
$grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')';
}
return $this->select($name, $grouped, $value, $options);
}
/**
* @param string $name
* @param null $value
@@ -101,7 +140,6 @@ class ExpandedForm
/**
* @param string $name
* @param $selected
* @param null $options
*
* @return string
@@ -263,7 +301,7 @@ class ExpandedForm
// get all currencies:
$list = $currencyRepos->get();
$array = [
0 => trans('firefly.no_currency')
0 => trans('firefly.no_currency'),
];
/** @var TransactionCurrency $currency */
foreach ($list as $currency) {
@@ -515,7 +553,7 @@ class ExpandedForm
*/
public function optionsList(string $type, string $name): string
{
$html = view('form.options', compact('type', 'name'))->render();
$html = view('form.options', compact('type', 'name'))->render();
return $html;
}