kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Refactor methods that request the old currency preference.

Browse Source
This commit is contained in:
James Cole
2023-10-22 07:55:36 +02:00
parent 4cec0a9f97
commit 80237d8bc3
7 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/Support/Amount.php
View File

@@ -108,35 +108,10 @@ class Amount
*/
public function getCurrencies(): Collection
{
throw new FireflyException(sprintf('Method "%s" needs a refactor', __METHOD__));
return TransactionCurrency::where('enabled', true)->orderBy('code', 'ASC')->get();
}
/**
* @return string
* @throws FireflyException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function getCurrencyCode(): string
{
$cache = new CacheProperties();
$cache->addProperty('getCurrencyCode');
if ($cache->has()) {
return $cache->get();
}
$currencyPreference = app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR'));
$currency = TransactionCurrency::where('code', $currencyPreference->data)->first();
if ($currency) {
$cache->store($currency->code);
return $currency->code;
}
$cache->store(config('firefly.default_currency', 'EUR'));
return (string)config('firefly.default_currency', 'EUR');
}
/**
* @return TransactionCurrency
* @throws FireflyException
@@ -163,22 +138,14 @@ class Amount
if ($cache->has()) {
return $cache->get();
}
$currencyPreference = app('preferences')->getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR'));
$currencyPrefStr = $currencyPreference ? $currencyPreference->data : 'EUR';
// at this point the currency preference could be encrypted, if coming from an old version.
$currencyCode = $this->tryDecrypt((string)$currencyPrefStr);
// could still be json encoded:
/** @var TransactionCurrency|null $currency */
$currency = TransactionCurrency::where('code', $currencyCode)->first();
if (null === $currency) {
// get EUR
$currency = TransactionCurrency::where('code', 'EUR')->first();
$default = $user->currencies()->where('user_default', true)->first();
if(null === $default) {
$default = $this->getSystemCurrency();
$user->currencies()->sync([$default->id => ['user_default' => true]]);
}
$cache->store($currency);
$cache->store($default);
return $currency;
return $default;
}
/**