kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Catch some more weird exceptions.

Browse Source
This commit is contained in:
James Cole
2020-03-11 10:39:53 +01:00
parent f375934b41
commit f6ecb143fe
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
resources/assets/js/components/transactions/Amount.vue
View File

@@ -63,9 +63,6 @@
changeData: function () {
let transactionType = this.transactionType;
// reset of all are empty:
//console.log('Type "' + transactionType + '"');
//console.log('Source "' + this.source.name + '"');
//console.log('Dest "' + this.destination.name + '"');
if (!transactionType && !this.source.name && !this.destination.name) {
$(this.$refs.cur).text('');
@@ -82,15 +79,35 @@
$(this.$refs.cur).text(this.destination.currency_name);
return;
}
// for normal transactions, the source leads the currency
if (transactionType.toLowerCase() === 'withdrawal' ||
transactionType.toLowerCase() === 'reconciliation' ||
transactionType.toLowerCase() === 'transfer') {
$(this.$refs.cur).text(this.source.currency_name);
return;
}
if (transactionType === 'Deposit') {
// for deposits, the destination leads the currency
// but source must not be a liability
if (transactionType.toLowerCase() === 'deposit'
&&
!('debt' === this.source.type.toLowerCase() ||
'loan' === this.source.type.toLowerCase() ||
'mortgage' === this.source.type.toLowerCase()
)
) {
$(this.$refs.cur).text(this.destination.currency_name);
}
// for deposits, the destination leads the currency
// unless source is liability, then source leads:
if (transactionType.toLowerCase() === 'deposit'
&&
('debt' === this.source.type.toLowerCase() ||
'loan' === this.source.type.toLowerCase() ||
'mortgage' === this.source.type.toLowerCase()
)
) {
$(this.$refs.cur).text(this.source.currency_name);
}
}
},
watch: {