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

Last minute fixes in test code and UI

Browse Source
This commit is contained in:
James Cole
2019-08-09 18:06:43 +02:00
parent 392317b01f
commit 1e3d85439e
9 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -573,7 +573,7 @@ trait PeriodOverview
'currency_decimal_places' => $journal['currency_decimal_places'],
];
}
$return[$currencyId]['amount'] = bcadd($return[$currencyId]['amount'], $journal['amount']);
$return[$currencyId]['amount'] = bcadd($return[$currencyId]['amount'], $journal['amount'] ?? '0');
$return[$currencyId]['count']++;

5
app/Support/Preferences.php
View File

@@ -104,7 +104,10 @@ class Preferences
/** @var User $user */
$user = auth()->user();
if (null === $user) {
return $default;
$preference = new Preference;
$preference->data = $default;
return $preference;
}
return $this->getForUser($user, $name, $default);