IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/9723

Browse Source
This commit is contained in:
James Cole 2025-02-01 13:01:13 +01:00
parent f8ded66869
commit 695bb31894
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Handlers/Events/PreferencesEventHandler.php
View File

@ -61,8 +61,11 @@ class PreferencesEventHandler
$this->resetTransactions($event->userGroup); $this->resetTransactions($event->userGroup);
// fire laravel command to recalculate them all. // fire laravel command to recalculate them all.
if (Amount::convertToNative()) { if (Amount::convertToNative()) {
Log::debug('Will now convert to native.');
Artisan::call('correction:recalculate-native-amounts'); Artisan::call('correction:recalculate-native-amounts');
return;
} }
Log::debug('Will NOT convert to native.');
} }
private function resetPiggyBanks(UserGroup $userGroup): void private function resetPiggyBanks(UserGroup $userGroup): void

1
app/Http/Controllers/PreferencesController.php
View File

@ -264,6 +264,7 @@ class PreferencesController extends Controller
if ($convertToNative && !$this->convertToNative) { if ($convertToNative && !$this->convertToNative) {
// set to true! // set to true!
Log::debug('User sets convertToNative to true.'); Log::debug('User sets convertToNative to true.');
Preferences::set('convert_to_native', $convertToNative);
event(new UserGroupChangedDefaultCurrency(auth()->user()->userGroup)); event(new UserGroupChangedDefaultCurrency(auth()->user()->userGroup));
} }
Preferences::set('convert_to_native', $convertToNative); Preferences::set('convert_to_native', $convertToNative);

6
app/Support/Http/Controllers/PeriodOverview.php
View File

@ -203,11 +203,11 @@ trait PeriodOverview
$currencySymbol = $journal['currency_symbol']; $currencySymbol = $journal['currency_symbol'];
$currencyDecimalPlaces = $journal['currency_decimal_places']; $currencyDecimalPlaces = $journal['currency_decimal_places'];
$foreignCurrencyId = $journal['foreign_currency_id']; $foreignCurrencyId = $journal['foreign_currency_id'];
$amount = $journal['amount']; $amount = $journal['amount'] ?? '0';
if ($this->convertToNative && $currencyId !== $this->defaultCurrency->id && $foreignCurrencyId !== $this->defaultCurrency->id) { if ($this->convertToNative && $currencyId !== $this->defaultCurrency->id && $foreignCurrencyId !== $this->defaultCurrency->id) {
$amount = $journal['native_amount']; $amount = $journal['native_amount'] ?? '0';
$currencyId = $this->defaultCurrency->id; $currencyId = $this->defaultCurrency->id;
$currencyCode = $this->defaultCurrency->code; $currencyCode = $this->defaultCurrency->code;
$currencyName = $this->defaultCurrency->name; $currencyName = $this->defaultCurrency->name;
@ -220,7 +220,7 @@ trait PeriodOverview
$currencyName = $journal['foreign_currency_name']; $currencyName = $journal['foreign_currency_name'];
$currencySymbol = $journal['foreign_currency_symbol']; $currencySymbol = $journal['foreign_currency_symbol'];
$currencyDecimalPlaces = $journal['foreign_currency_decimal_places']; $currencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
$amount = $journal['foreign_amount']; $amount = $journal['foreign_amount'] ?? '0';
} }
$return[$currencyId] ??= [ $return[$currencyId] ??= [
'amount' => '0', 'amount' => '0',