kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug where the balance routine forgot to account for accounts without a currency preference.

Browse Source
This commit is contained in:
James Cole
2017-06-08 10:35:02 +02:00
parent 5c18794122
commit b48de98865
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,7 @@ class AccountController extends Controller
$chartData[$account->name] = $diff; $chartData[$account->name] = $diff;
} }
} }
arsort($chartData); arsort($chartData);
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData); $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data); $cache->store($data);

6
app/Support/Steam.php
View File

@@ -13,6 +13,7 @@ declare(strict_types=1);
namespace FireflyIII\Support; namespace FireflyIII\Support;
use Amount;
use Carbon\Carbon; use Carbon\Carbon;
use Crypt; use Crypt;
use DB; use DB;
@@ -47,6 +48,11 @@ class Steam
return $cache->get(); // @codeCoverageIgnore return $cache->get(); // @codeCoverageIgnore
} }
$currencyId = intval($account->getMeta('currency_id')); $currencyId = intval($account->getMeta('currency_id'));
// if null, use system default currency:
if ($currencyId === 0) {
$currency = Amount::getDefaultCurrency();
$currencyId = $currency->id;
}
// first part: get all balances in own currency: // first part: get all balances in own currency:
$nativeBalance = strval( $nativeBalance = strval(
$account->transactions() $account->transactions()