kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-02 11:04:53 +00:00
Code Issues Projects Releases Wiki Activity

[chore] Fix https://github.com/firefly-iii/firefly-iii/issues/9683 and rename default to native.

Browse Source
This commit is contained in:
James Cole
2025-01-22 05:24:12 +01:00
parent d57327fd11
commit 6f63ddf5b0
11 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V1/Controllers/Autocomplete/AccountController.php
View File

@@ -84,12 +84,12 @@ class AccountController extends Controller
/** @var Account $account */
foreach ($result as $account) {
$nameWithBalance = $account->name;
$currency = $this->repository->getAccountCurrency($account) ?? $this->defaultCurrency;
$currency = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
$useCurrency = $currency;
if (in_array($account->accountType->type, $this->balanceTypes, true)) {
$balance = Steam::finalAccountBalance($account, $date);
$key = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? 'native_balance' : 'balance';
$useCurrency = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? $this->defaultCurrency : $currency;
$key = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
$useCurrency = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? $this->nativeCurrency : $currency;
$amount = $balance[$key] ?? '0';
$nameWithBalance = sprintf(
'%s (%s)',