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

Simpler get currency routine

Browse Source
This commit is contained in:
James Cole
2020-07-27 07:06:44 +02:00
parent c5489a7c55
commit fade9ae6f9
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/JavascriptController.php
View File

@@ -132,16 +132,9 @@ class JavascriptController extends Controller
public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
{ {
$account = $repository->findNull((int) $request->get('account')); $account = $repository->findNull((int) $request->get('account'));
$currencyId = 0; $currency = app('amount')->getDefaultCurrency();
if (null !== $account) { if(null !== $account) {
// TODO we can use getAccountCurrency() instead $currency = $repository->getAccountCurrency($account) ?? $currency;
$currencyId = (int) $repository->getMetaValue($account, 'currency_id');
}
/** @var TransactionCurrency $currency */
$currency = $currencyRepository->findNull($currencyId);
if (null === $currency) {
/** @var TransactionCurrency $currency */
$currency = app('amount')->getDefaultCurrency();
} }
$localeconv = app('amount')->getLocaleInfo(); $localeconv = app('amount')->getLocaleInfo();