diff --git a/app/Support/Amount.php b/app/Support/Amount.php index cc1d3b7bf2..3c5a915e11 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -155,13 +155,21 @@ class Amount return $user->currencies()->orderBy('code', 'ASC')->get(); } + /** + * @deprecated + */ public function getDefaultCurrency(): TransactionCurrency + { + return $this->getNativeCurrency(); + } + + public function getNativeCurrency(): TransactionCurrency { if (auth()->check()) { /** @var User $user */ $user = auth()->user(); if (null !== $user->userGroup) { - return $this->getDefaultCurrencyByUserGroup($user->userGroup); + return $this->getNativeCurrencyByUserGroup($user->userGroup); } } diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.php index c94782513d..83a9bd62f6 100644 --- a/app/Support/Export/ExportDataGenerator.php +++ b/app/Support/Export/ExportDataGenerator.php @@ -758,22 +758,22 @@ class ExportDataGenerator $metaData = $repository->getMetaFields($journal['transaction_journal_id'], $metaFields); $amount = Steam::bcround(Steam::negative($journal['amount']), $journal['currency_decimal_places']); $foreignAmount = null === $journal['foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['foreign_amount']), $journal['foreign_currency_decimal_places']); - $nativeAmount = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount'], $default->decimal_places)); - $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount'], $default->decimal_places)); + $nativeAmount = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount']), $default->decimal_places); + $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount']), $default->decimal_places); if (TransactionTypeEnum::WITHDRAWAL->value !== $journal['transaction_type_type']) { $amount = Steam::bcround(Steam::positive($journal['amount']), $journal['currency_decimal_places']); $foreignAmount = null === $journal['foreign_amount'] ? null : Steam::bcround(Steam::positive($journal['foreign_amount']), $journal['foreign_currency_decimal_places']); - $nativeAmount = null === $journal['native_amount'] ? null : Steam::bcround(Steam::positive($journal['native_amount'], $default->decimal_places)); - $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::positive($journal['native_foreign_amount'], $default->decimal_places)); + $nativeAmount = null === $journal['native_amount'] ? null : Steam::bcround(Steam::positive($journal['native_amount']), $default->decimal_places); + $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::positive($journal['native_foreign_amount']), $default->decimal_places); } // opening balance depends on source account type. if (TransactionTypeEnum::OPENING_BALANCE->value === $journal['transaction_type_type'] && AccountTypeEnum::ASSET->value === $journal['source_account_type']) { $amount = Steam::bcround(Steam::negative($journal['amount']), $journal['currency_decimal_places']); $foreignAmount = null === $journal['foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['foreign_amount']), $journal['foreign_currency_decimal_places']); - $nativeAmount = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount'], $default->decimal_places)); - $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount'], $default->decimal_places)); + $nativeAmount = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount']), $default->decimal_places); + $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount']), $default->decimal_places); } $records[] = [ diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index 2a50c41c6a..9db039f734 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -77,7 +77,7 @@ class AccountTransformer extends AbstractTransformer $date = $this->getDate(); $date->endOfDay(); - [$currencyId, $currencyCode, $currencySymbol, $decimalPlaces] = $this->getCurrency($account, $default); + [$currencyId, $currencyCode, $currencySymbol, $decimalPlaces] = $this->getCurrency($account); [$creditCardType, $monthlyPaymentDate] = $this->getCCInfo($account, $accountRole, $accountType); [$openingBalance, $nativeOpeningBalance, $openingBalanceDate] = $this->getOpeningBalance($account, $accountType, $convertToNative); [$interest, $interestPeriod] = $this->getInterest($account, $accountType);