mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-17 00:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

show exchange rate in transaction edit page when the currencies of source account and destination account are different

Browse Source
This commit is contained in:
MaysWind
2024-03-04 00:08:53 +08:00
parent bed2aef7f8
commit deb465377e
3 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/desktop/transactions/list/dialogs/EditDialog.vue
+22 -1
View File
@@ -73,7 +73,7 @@
:disabled="loading || submitting"
:persistent-placeholder="true"
:hide="transaction.hideAmount"
:label="$t('Transfer In Amount')"
:label="transferInAmountTitle"
:placeholder="$t('Transfer In Amount')"
v-model="transaction.destinationAmount"/>
</v-col>
@@ -325,6 +325,9 @@ import {
getTimezoneOffsetMinutes,
getCurrentUnixTime
} from '@/lib/datetime.js';
import {
getAdaptiveDisplayAmountRate
} from '@/lib/currency.js';
import {
getFirstAvailableCategoryId
} from '@/lib/category.js';
@@ -417,6 +420,24 @@ export default {
return 'Account';
}
},
transferInAmountTitle() {
const sourceAccount = this.allAccountsMap[this.transaction.sourceAccountId];
const destinationAccount = this.allAccountsMap[this.transaction.destinationAccountId];
if (!sourceAccount || !destinationAccount || sourceAccount.currency === destinationAccount.currency) {
return this.$t('Transfer In Amount');
}
const fromExchangeRate = this.exchangeRatesStore.latestExchangeRateMap[sourceAccount.currency];
const toExchangeRate = this.exchangeRatesStore.latestExchangeRateMap[destinationAccount.currency];
const amountRate = getAdaptiveDisplayAmountRate(this.transaction.sourceAmount, this.transaction.destinationAmount, fromExchangeRate, toExchangeRate, this.settingsStore.appSettings.thousandsSeparator);
if (!amountRate) {
return this.$t('Transfer In Amount');
}
return this.$t('Transfer In Amount') + ` (${amountRate})`;
},
defaultCurrency() {
return this.userStore.currentUserDefaultCurrency;
},
src/views/mobile/transactions/EditPage.vue
+22 -1
View File
@@ -66,7 +66,7 @@
class="transaction-edit-amount text-color-primary"
link="#" no-chevron
:class="destinationAmountClass"
:header="$t('Transfer In Amount')"
:header="transferInAmountTitle"
:title="getDisplayAmount(transaction.destinationAmount, transaction.hideAmount)"
@click="showDestinationAmountSheet = true"
v-if="transaction.type === allTransactionTypes.Transfer"
@@ -358,6 +358,9 @@ import {
getUtcOffsetByUtcOffsetMinutes,
getActualUnixTimeForStore
} from '@/lib/datetime.js';
import {
getAdaptiveDisplayAmountRate
} from '@/lib/currency.js';
import {
getTransactionPrimaryCategoryName,
getTransactionSecondaryCategoryName,
@@ -435,6 +438,24 @@ export default {
return 'Account';
}
},
transferInAmountTitle() {
const sourceAccount = this.allAccountsMap[this.transaction.sourceAccountId];
const destinationAccount = this.allAccountsMap[this.transaction.destinationAccountId];
if (!sourceAccount || !destinationAccount || sourceAccount.currency === destinationAccount.currency) {
return this.$t('Transfer In Amount');
}
const fromExchangeRate = this.exchangeRatesStore.latestExchangeRateMap[sourceAccount.currency];
const toExchangeRate = this.exchangeRatesStore.latestExchangeRateMap[destinationAccount.currency];
const amountRate = getAdaptiveDisplayAmountRate(this.transaction.sourceAmount, this.transaction.destinationAmount, fromExchangeRate, toExchangeRate, this.settingsStore.appSettings.thousandsSeparator);
if (!amountRate) {
return this.$t('Transfer In Amount');
}
return this.$t('Transfer In Amount') + ` (${amountRate})`;
},
defaultCurrency() {
return this.userStore.currentUserDefaultCurrency;
},