From bd1f8b2497c3e0df557419d9ee02b32faadf7ad6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Jan 2025 11:54:40 +0100 Subject: [PATCH] [chore] Move to native from default. [skip ci] --- .../Commands/Correction/CorrectsCurrencies.php | 2 +- .../Commands/Correction/CorrectsNativeAmounts.php | 2 +- .../Correction/CorrectsOpeningBalanceCurrencies.php | 2 +- .../Commands/Upgrade/UpgradesAccountCurrencies.php | 2 +- .../Commands/Upgrade/UpgradesBudgetLimits.php | 2 +- .../Commands/Upgrade/UpgradesMultiPiggyBanks.php | 2 +- app/Factory/BillFactory.php | 2 +- app/Factory/TransactionJournalFactory.php | 2 +- app/Generator/Report/Audit/MonthReportGenerator.php | 2 +- app/Handlers/Observer/AccountObserver.php | 2 +- app/Handlers/Observer/AutoBudgetObserver.php | 2 +- app/Handlers/Observer/AvailableBudgetObserver.php | 2 +- app/Handlers/Observer/BillObserver.php | 2 +- app/Handlers/Observer/BudgetLimitObserver.php | 2 +- app/Handlers/Observer/PiggyBankEventObserver.php | 2 +- app/Handlers/Observer/PiggyBankObserver.php | 2 +- app/Handlers/Observer/TransactionObserver.php | 2 +- app/Models/TransactionCurrency.php | 2 +- app/Repositories/Account/AccountTasker.php | 6 +++--- app/Repositories/Budget/BudgetLimitRepository.php | 4 ++-- app/Repositories/Budget/BudgetRepository.php | 4 ++-- app/Repositories/PiggyBank/ModifiesPiggyBanks.php | 4 ++-- app/Repositories/PiggyBank/PiggyBankRepository.php | 2 +- .../TransactionGroup/TransactionGroupRepository.php | 2 +- .../UserGroups/Currency/CurrencyRepository.php | 4 ++-- .../Internal/Support/AccountServiceTrait.php | 12 ++++++------ .../Internal/Support/RecurringTransactionTrait.php | 2 +- app/Services/Internal/Update/BillUpdateService.php | 2 +- app/Support/Report/Budget/BudgetReportGenerator.php | 2 +- .../Report/Summarizer/TransactionSummarizer.php | 4 ++-- app/Support/Steam.php | 4 ++-- app/Transformers/PiggyBankEventTransformer.php | 2 +- app/Transformers/UserGroupTransformer.php | 2 +- app/Transformers/V2/PiggyBankTransformer.php | 2 +- 34 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/Console/Commands/Correction/CorrectsCurrencies.php b/app/Console/Commands/Correction/CorrectsCurrencies.php index dc812457ea..ada3f40a1b 100644 --- a/app/Console/Commands/Correction/CorrectsCurrencies.php +++ b/app/Console/Commands/Correction/CorrectsCurrencies.php @@ -63,7 +63,7 @@ class CorrectsCurrencies extends Command $repos = app(CurrencyRepositoryInterface::class); // first check if the user has any default currency (not necessarily the case, so can be forced). - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($userGroup); Log::debug(sprintf('Now correcting currencies for user group #%d', $userGroup->id)); $found = [$defaultCurrency->id]; diff --git a/app/Console/Commands/Correction/CorrectsNativeAmounts.php b/app/Console/Commands/Correction/CorrectsNativeAmounts.php index 47afadcee0..add485702b 100644 --- a/app/Console/Commands/Correction/CorrectsNativeAmounts.php +++ b/app/Console/Commands/Correction/CorrectsNativeAmounts.php @@ -88,7 +88,7 @@ class CorrectsNativeAmounts extends Command // do a check with the group's currency so we can skip some stuff. Preferences::mark(); - $currency = app('amount')->getDefaultCurrencyByUserGroup($userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($userGroup); $this->recalculatePiggyBanks($userGroup, $currency); $this->recalculateBudgets($userGroup, $currency); diff --git a/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php index 39cb9e9b2d..11578b00c0 100644 --- a/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php +++ b/app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php @@ -132,6 +132,6 @@ class CorrectsOpeningBalanceCurrencies extends Command $repos = app(AccountRepositoryInterface::class); $repos->setUser($account->user); - return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUserGroup($account->userGroup); + return $repos->getAccountCurrency($account) ?? app('amount')->getNativeCurrencyByUserGroup($account->userGroup); } } diff --git a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php index c524af0c6a..0c8dea4901 100644 --- a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php +++ b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php @@ -107,7 +107,7 @@ class UpgradesAccountCurrencies extends Command $accounts = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value]); // get user's currency preference: - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($user->userGroup); /** @var Account $account */ foreach ($accounts as $account) { diff --git a/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php b/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php index c94fe0d7dd..a1bbe571ed 100644 --- a/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php +++ b/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php @@ -66,7 +66,7 @@ class UpgradesBudgetLimits extends Command /** @var null|User $user */ $user = $budget->user; if (null !== $user) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($user->userGroup); $budgetLimit->transaction_currency_id = $currency->id; $budgetLimit->save(); $this->friendlyInfo( diff --git a/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php b/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php index 00843350ea..bf391a9916 100644 --- a/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php +++ b/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php @@ -90,7 +90,7 @@ class UpgradesMultiPiggyBanks extends Command $this->repository->setUser($piggyBank->account->user); $this->accountRepository->setUser($piggyBank->account->user); $repetition = $this->repository->getRepetition($piggyBank, true); - $currency = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrencyByUserGroup($piggyBank->account->user->userGroup); + $currency = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getNativeCurrencyByUserGroup($piggyBank->account->user->userGroup); // update piggy bank to have a currency. $piggyBank->transaction_currency_id = $currency->id; diff --git a/app/Factory/BillFactory.php b/app/Factory/BillFactory.php index 430997761a..62d1e79805 100644 --- a/app/Factory/BillFactory.php +++ b/app/Factory/BillFactory.php @@ -49,7 +49,7 @@ class BillFactory app('log')->debug(sprintf('Now in %s', __METHOD__), $data); $factory = app(TransactionCurrencyFactory::class); $currency = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null)) ?? - app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); try { $skip = array_key_exists('skip', $data) ? $data['skip'] : 0; diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index ff0af908cc..2902531db1 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -466,7 +466,7 @@ class TransactionJournalFactory $preference = $this->accountRepository->getAccountCurrency($account); if (null === $preference && null === $currency) { // return user's default: - return app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + return app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); } $result = $preference ?? $currency; app('log')->debug(sprintf('Currency is now #%d (%s) because of account #%d (%s)', $result->id, $result->code, $account->id, $account->name)); diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 87d67d20c4..08e0ea8e1f 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -135,7 +135,7 @@ class MonthReportGenerator implements ReportGeneratorInterface $journals = array_reverse($journals, true); $dayBeforeBalance = Steam::finalAccountBalance($account, $date); $startBalance = $dayBeforeBalance['balance']; - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); $currency = $accountRepository->getAccountCurrency($account) ?? $defaultCurrency; foreach ($journals as $index => $journal) { diff --git a/app/Handlers/Observer/AccountObserver.php b/app/Handlers/Observer/AccountObserver.php index 1360ca9656..7b07ab9520 100644 --- a/app/Handlers/Observer/AccountObserver.php +++ b/app/Handlers/Observer/AccountObserver.php @@ -47,7 +47,7 @@ class AccountObserver if (!Amount::convertToNative($account->user)) { return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); $repository = app(AccountRepositoryInterface::class); $currency = $repository->getAccountCurrency($account); if (null !== $currency && $currency->id !== $userCurrency->id && '' !== (string) $account->virtual_balance && 0 !== bccomp($account->virtual_balance, '0')) { diff --git a/app/Handlers/Observer/AutoBudgetObserver.php b/app/Handlers/Observer/AutoBudgetObserver.php index 6109617b52..108cda092b 100644 --- a/app/Handlers/Observer/AutoBudgetObserver.php +++ b/app/Handlers/Observer/AutoBudgetObserver.php @@ -48,7 +48,7 @@ class AutoBudgetObserver if (!Amount::convertToNative($autoBudget->budget->user)) { return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($autoBudget->budget->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($autoBudget->budget->user->userGroup); $autoBudget->native_amount = null; if ($autoBudget->transactionCurrency->id !== $userCurrency->id) { $converter = new ExchangeRateConverter(); diff --git a/app/Handlers/Observer/AvailableBudgetObserver.php b/app/Handlers/Observer/AvailableBudgetObserver.php index 7d749af5b2..c98d44d8b6 100644 --- a/app/Handlers/Observer/AvailableBudgetObserver.php +++ b/app/Handlers/Observer/AvailableBudgetObserver.php @@ -50,7 +50,7 @@ class AvailableBudgetObserver return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($availableBudget->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($availableBudget->user->userGroup); $availableBudget->native_amount = null; if ($availableBudget->transactionCurrency->id !== $userCurrency->id) { $converter = new ExchangeRateConverter(); diff --git a/app/Handlers/Observer/BillObserver.php b/app/Handlers/Observer/BillObserver.php index fbf90cfa56..39e89c1f9c 100644 --- a/app/Handlers/Observer/BillObserver.php +++ b/app/Handlers/Observer/BillObserver.php @@ -59,7 +59,7 @@ class BillObserver if (!Amount::convertToNative($bill->user)) { return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($bill->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($bill->user->userGroup); $bill->native_amount_min = null; $bill->native_amount_max = null; if ($bill->transactionCurrency->id !== $userCurrency->id) { diff --git a/app/Handlers/Observer/BudgetLimitObserver.php b/app/Handlers/Observer/BudgetLimitObserver.php index aaac82cb5d..8343caf68b 100644 --- a/app/Handlers/Observer/BudgetLimitObserver.php +++ b/app/Handlers/Observer/BudgetLimitObserver.php @@ -50,7 +50,7 @@ class BudgetLimitObserver return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($budgetLimit->budget->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($budgetLimit->budget->user->userGroup); $budgetLimit->native_amount = null; if ($budgetLimit->transactionCurrency->id !== $userCurrency->id) { $converter = new ExchangeRateConverter(); diff --git a/app/Handlers/Observer/PiggyBankEventObserver.php b/app/Handlers/Observer/PiggyBankEventObserver.php index b764fed9d6..650f3e5345 100644 --- a/app/Handlers/Observer/PiggyBankEventObserver.php +++ b/app/Handlers/Observer/PiggyBankEventObserver.php @@ -48,7 +48,7 @@ class PiggyBankEventObserver if (!Amount::convertToNative($event->piggyBank->accounts()->first()->user)) { return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup); $event->native_amount = null; if ($event->piggyBank->transactionCurrency->id !== $userCurrency->id) { $converter = new ExchangeRateConverter(); diff --git a/app/Handlers/Observer/PiggyBankObserver.php b/app/Handlers/Observer/PiggyBankObserver.php index 824ef86621..e8e55f8f9f 100644 --- a/app/Handlers/Observer/PiggyBankObserver.php +++ b/app/Handlers/Observer/PiggyBankObserver.php @@ -70,7 +70,7 @@ class PiggyBankObserver return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($group); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($group); $piggyBank->native_target_amount = null; if ($piggyBank->transactionCurrency->id !== $userCurrency->id) { $converter = new ExchangeRateConverter(); diff --git a/app/Handlers/Observer/TransactionObserver.php b/app/Handlers/Observer/TransactionObserver.php index 201a3d6947..172ded4226 100644 --- a/app/Handlers/Observer/TransactionObserver.php +++ b/app/Handlers/Observer/TransactionObserver.php @@ -71,7 +71,7 @@ class TransactionObserver if (!Amount::convertToNative($transaction->transactionJournal->user)) { return; } - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($transaction->transactionJournal->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($transaction->transactionJournal->user->userGroup); $transaction->native_amount = null; $transaction->native_foreign_amount = null; // first normal amount diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index ae32181ad7..f20211ff17 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -73,7 +73,7 @@ class TransactionCurrency extends Model public function refreshForUser(User $user): void { $current = $user->userGroup->currencies()->where('transaction_currencies.id', $this->id)->first(); - $native = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup); + $native = app('amount')->getNativeCurrencyByUserGroup($user->userGroup); $this->userGroupNative = $native->id === $this->id; $this->userGroupEnabled = null !== $current; } diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 94cedca5d3..27bf91a9c7 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -53,7 +53,7 @@ class AccountTasker implements AccountTaskerInterface /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); $return = [ 'accounts' => [], @@ -143,7 +143,7 @@ class AccountTasker implements AccountTaskerInterface */ private function groupExpenseByDestination(array $array): array { - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); @@ -231,7 +231,7 @@ class AccountTasker implements AccountTaskerInterface */ private function groupIncomeBySource(array $array): array { - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index 19822fb4c7..c7ffe4b45d 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/app/Repositories/Budget/BudgetLimitRepository.php @@ -279,7 +279,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface $factory = app(TransactionCurrencyFactory::class); $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); } $currency->enabled = true; $currency->save(); @@ -377,7 +377,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface } // catch unexpected null: if (null === $currency) { - $currency = $budgetLimit->transactionCurrency ?? app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $currency = $budgetLimit->transactionCurrency ?? app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); } $currency->enabled = true; $currency->save(); diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 49ac568e48..153e01b906 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -396,7 +396,7 @@ class BudgetRepository implements BudgetRepositoryInterface $autoBudget = $this->getAutoBudget($budget); // grab default currency: - $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); if (null === $autoBudget) { // at this point it's a blind assumption auto_budget_type is 1 or 2. @@ -782,7 +782,7 @@ class BudgetRepository implements BudgetRepositoryInterface $currency = $repos->findByCode((string) $data['currency_code']); } if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); } $autoBudget = new AutoBudget(); diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 001b4c34bb..6e52c4856b 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -68,7 +68,7 @@ trait ModifiesPiggyBanks $pivot->native_current_amount = null; // also update native_current_amount. - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); if ($userCurrency->id !== $piggyBank->transaction_currency_id) { $converter = new ExchangeRateConverter(); $converter->setIgnoreSettings(true); @@ -91,7 +91,7 @@ trait ModifiesPiggyBanks $pivot->native_current_amount = null; // also update native_current_amount. - $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $userCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); if ($userCurrency->id !== $piggyBank->transaction_currency_id) { $converter = new ExchangeRateConverter(); $converter->setIgnoreSettings(true); diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 631670ec21..31cc3dd9c1 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -150,7 +150,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $accountRepos = app(AccountRepositoryInterface::class); $accountRepos->setUser($this->user); - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); app('log')->debug(sprintf('Piggy bank #%d currency is %s', $piggyBank->id, $piggyBank->transactionCurrency->code)); diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index 88b64dd255..0182ee40a2 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -345,7 +345,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface { $return = []; $journals = $group->transactionJournals->pluck('id')->toArray(); - $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); $data = PiggyBankEvent::whereIn('transaction_journal_id', $journals) ->with('piggyBank', 'piggyBank.account') ->get(['piggy_bank_events.*']) diff --git a/app/Repositories/UserGroups/Currency/CurrencyRepository.php b/app/Repositories/UserGroups/Currency/CurrencyRepository.php index 0e59eb6184..428ddf0da3 100644 --- a/app/Repositories/UserGroups/Currency/CurrencyRepository.php +++ b/app/Repositories/UserGroups/Currency/CurrencyRepository.php @@ -245,7 +245,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface app('log')->debug('Grabbing default currency for this user...'); /** @var null|TransactionCurrency $result */ - $result = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $result = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); } app('log')->debug(sprintf('Final result: %s', $result->code)); @@ -376,7 +376,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface public function makeDefault(TransactionCurrency $currency): void { - $current = app('amount')->getDefaultCurrencyByUserGroup($this->userGroup); + $current = app('amount')->getNativeCurrencyByUserGroup($this->userGroup); app('log')->debug(sprintf('Enabled + made default currency %s for user #%d', $currency->code, $this->userGroup->id)); $this->userGroup->currencies()->detach($currency->id); foreach ($this->userGroup->currencies()->get() as $item) { diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index a827e97311..77f9e08b4d 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -233,7 +233,7 @@ trait AccountServiceTrait // get or grab currency: $currency = $this->accountRepository->getAccountCurrency($account); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); } // submit to factory: @@ -351,7 +351,7 @@ trait AccountServiceTrait if (null === $currency) { // use default currency: - $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup); } $currency->enabled = true; $currency->save(); @@ -391,7 +391,7 @@ trait AccountServiceTrait // if exists, update: $currency = $this->accountRepository->getAccountCurrency($account); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); } // simply grab the first journal and change it: @@ -457,7 +457,7 @@ trait AccountServiceTrait // get or grab currency: $currency = $this->accountRepository->getAccountCurrency($account); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); } // submit to factory: @@ -573,7 +573,7 @@ trait AccountServiceTrait // if exists, update: $currency = $this->accountRepository->getAccountCurrency($account); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); } // simply grab the first journal and change it: @@ -654,7 +654,7 @@ trait AccountServiceTrait // get or grab currency: $currency = $this->accountRepository->getAccountCurrency($account); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); } // submit to factory: diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 2199468a02..9df6075d19 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -107,7 +107,7 @@ trait RecurringTransactionTrait $currency = $factory->find($array['currency_id'] ?? null, $array['currency_code'] ?? null); $foreignCurrency = $factory->find($array['foreign_currency_id'] ?? null, $array['foreign_currency_code'] ?? null); if (null === $currency) { - $currency = app('amount')->getDefaultCurrencyByUserGroup($recurrence->user->userGroup); + $currency = app('amount')->getNativeCurrencyByUserGroup($recurrence->user->userGroup); } app('log')->debug( diff --git a/app/Services/Internal/Update/BillUpdateService.php b/app/Services/Internal/Update/BillUpdateService.php index df7823e038..3905b21d62 100644 --- a/app/Services/Internal/Update/BillUpdateService.php +++ b/app/Services/Internal/Update/BillUpdateService.php @@ -55,7 +55,7 @@ class BillUpdateService if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) { $factory = app(TransactionCurrencyFactory::class); $currency = $factory->find((int) ($data['currency_id'] ?? null), $data['currency_code'] ?? null) ?? - app('amount')->getDefaultCurrencyByUserGroup($bill->user->userGroup); + app('amount')->getNativeCurrencyByUserGroup($bill->user->userGroup); // enable the currency if it isn't. $currency->enabled = true; diff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.php index 2de00d88c0..91c58b4b30 100644 --- a/app/Support/Report/Budget/BudgetReportGenerator.php +++ b/app/Support/Report/Budget/BudgetReportGenerator.php @@ -347,6 +347,6 @@ class BudgetReportGenerator $this->blRepository->setUser($user); $this->opsRepository->setUser($user); $this->nbRepository->setUser($user); - $this->currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup); + $this->currency = app('amount')->getNativeCurrencyByUserGroup($user->userGroup); } } diff --git a/app/Support/Report/Summarizer/TransactionSummarizer.php b/app/Support/Report/Summarizer/TransactionSummarizer.php index b9ed46e74d..bc7b1a3777 100644 --- a/app/Support/Report/Summarizer/TransactionSummarizer.php +++ b/app/Support/Report/Summarizer/TransactionSummarizer.php @@ -45,7 +45,7 @@ class TransactionSummarizer public function setUser(User $user): void { $this->user = $user; - $this->default = Amount::getDefaultCurrencyByUserGroup($user->userGroup); + $this->default = Amount::getNativeCurrencyByUserGroup($user->userGroup); $this->convertToNative = Amount::convertToNative($user); } @@ -117,7 +117,7 @@ class TransactionSummarizer $idKey = sprintf('%s_account_id', $direction); $nameKey = sprintf('%s_account_name', $direction); $convertToNative = Amount::convertToNative($this->user); - $default = Amount::getDefaultCurrencyByUserGroup($this->user->userGroup); + $default = Amount::getNativeCurrencyByUserGroup($this->user->userGroup); diff --git a/app/Support/Steam.php b/app/Support/Steam.php index bf1d02e6ec..7adee6137b 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -75,7 +75,7 @@ class Steam $balances = []; $formatted = $start->format('Y-m-d'); $startBalance = $this->finalAccountBalance($account, $start); - $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); $accountCurrency = $this->getAccountCurrency($account); $hasCurrency = null !== $accountCurrency; $currency = $accountCurrency ?? $defaultCurrency; @@ -305,7 +305,7 @@ class Steam Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s'))); - $native = Amount::getDefaultCurrencyByUserGroup($account->user->userGroup); + $native = Amount::getNativeCurrencyByUserGroup($account->user->userGroup); $convertToNative = Amount::convertToNative($account->user); $accountCurrency = $this->getAccountCurrency($account); $hasCurrency = null !== $accountCurrency; diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index 657fb7b560..57c066f5a7 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -61,7 +61,7 @@ class PiggyBankEventTransformer extends AbstractTransformer $this->piggyRepos->setUser($account->user); // get associated currency or fall back to the default: - $currency = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup); + $currency = $this->repository->getAccountCurrency($account) ?? app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup); // get associated journal and transaction, if any: $journalId = $event->transaction_journal_id; diff --git a/app/Transformers/UserGroupTransformer.php b/app/Transformers/UserGroupTransformer.php index a8b22dcd6d..a001ca7c60 100644 --- a/app/Transformers/UserGroupTransformer.php +++ b/app/Transformers/UserGroupTransformer.php @@ -106,7 +106,7 @@ class UserGroupTransformer extends AbstractTransformer */ public function transform(UserGroup $userGroup): array { - $currency = Amount::getDefaultCurrencyByUserGroup($userGroup); + $currency = Amount::getNativeCurrencyByUserGroup($userGroup); return [ 'id' => $userGroup->id, diff --git a/app/Transformers/V2/PiggyBankTransformer.php b/app/Transformers/V2/PiggyBankTransformer.php index 54e599b1cd..87da0653f6 100644 --- a/app/Transformers/V2/PiggyBankTransformer.php +++ b/app/Transformers/V2/PiggyBankTransformer.php @@ -137,7 +137,7 @@ class PiggyBankTransformer extends AbstractTransformer } Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__)); - $this->default = app('amount')->getDefaultCurrencyByUserGroup(auth()->user()->userGroup); + $this->default = app('amount')->getNativeCurrencyByUserGroup(auth()->user()->userGroup); $this->converter = new ExchangeRateConverter(); return $objects;