kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Catch null in currency pref. [skip ci]

Browse Source
This commit is contained in:
James Cole
2018-04-08 16:21:17 +02:00
parent 5850ad06b1
commit b561e79a6c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Chart/AccountController.php
View File

@@ -439,13 +439,14 @@ class AccountController extends Controller
/** @var CurrencyRepositoryInterface $repository */ /** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class); $repository = app(CurrencyRepositoryInterface::class);
$chartData = []; $default = app('amount')->getDefaultCurrency();
$chartData = [];
foreach ($accounts as $account) { foreach ($accounts as $account) {
Log::debug(sprintf('Now at account #%d', $account->id)); $currency = $repository->findNull((int)$account->getMeta('currency_id'));
Log::debug(sprintf('Currency preference is: %d', (int)$account->getMeta('currency_id'))); if (null === $currency) {
$currency = $repository->findNull((int)$account->getMeta('currency_id')); $currency = $default;
Log::debug(sprintf('Currency is null? %s', var_export($currency === null, true))); }
$currentSet = [ $currentSet = [
'label' => $account->name, 'label' => $account->name,
'currency_symbol' => $currency->symbol, 'currency_symbol' => $currency->symbol,
'entries' => [], 'entries' => [],