kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-27 05:51:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove deprecated method.

Browse Source
This commit is contained in:
James Cole
2018-04-21 20:28:41 +02:00
parent 479648e7c1
commit 8dd765ee89
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Steam.php
View File

@@ -27,6 +27,7 @@ use Crypt;
use DB; use DB;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@@ -51,7 +52,11 @@ class Steam
if ($cache->has()) { if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore return $cache->get(); // @codeCoverageIgnore
} }
$currencyId = (int)$account->getMeta('currency_id'); //
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$currencyId = (int)$repository->getMetaValue($account, 'currency_id');
// use system default currency: // use system default currency:
if (0 === $currencyId) { if (0 === $currencyId) {
$currency = app('amount')->getDefaultCurrencyByUser($account->user); $currency = app('amount')->getDefaultCurrencyByUser($account->user);
@@ -71,6 +76,7 @@ class Steam
->where('transactions.foreign_currency_id', $currencyId) ->where('transactions.foreign_currency_id', $currencyId)
->where('transactions.transaction_currency_id', '!=', $currencyId) ->where('transactions.transaction_currency_id', '!=', $currencyId)
->sum('transactions.foreign_amount'); ->sum('transactions.foreign_amount');
$balance = bcadd($nativeBalance, $foreignBalance); $balance = bcadd($nativeBalance, $foreignBalance);
$virtual = null === $account->virtual_balance ? '0' : (string)$account->virtual_balance; $virtual = null === $account->virtual_balance ? '0' : (string)$account->virtual_balance;
$balance = bcadd($balance, $virtual); $balance = bcadd($balance, $virtual);