Open source personal finance application
feat (trns): prepare for transfer
ilkomef7577bbe09b6
diff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vueindex 39fbb226..3e8f9f8a 100644--- a/components/trnForm/TrnForm.vue+++ b/components/trnForm/TrnForm.vue@@ -115,8 +115,6 @@ export default {if (!isTransfer.value) {normalizedValues = {amount: getResult.value,- amountFrom: getResult.value,- amountTo: getResult.value,categoryId: $store.state.trnForm.values.categoryId,date: dayjs($store.state.trnForm.values.date).valueOf(),description: $store.state.trnForm.values.description || null,@@ -130,8 +128,6 @@ export default {if (isTransfer.value) {normalizedValues = {amount: getResult.value,- amountFrom: getResult.value,- amountTo: getResult.value,categoryId: 'transfer',date: dayjs($store.state.trnForm.values.date).valueOf(),walletId: $store.state.trnForm.values.walletFromId,@@ -139,7 +135,15 @@ export default {walletToId: $store.state.trnForm.values.walletToId,type: 2,description: $store.state.trnForm.values.description || null,- groups: $store.state.trnForm.values.groups || null+ groups: $store.state.trnForm.values.groups || null,+ expense: {+ walletId: $store.state.trnForm.values.walletFromId,+ amount: getResult.value+ },+ income: {+ walletId: $store.state.trnForm.values.walletToId,+ amount: getResult.value+ }}}diff --git a/store/trnForm/actions.js b/store/trnForm/actions.jsindex b407ebcc..f43276d2 100644--- a/store/trnForm/actions.js+++ b/store/trnForm/actions.js@@ -54,8 +54,6 @@ export default {commit('setTrnFormValues', {...trn,amount: trn.amount,- amountFrom: trn.amount,- amountTo: trn.amount,amountType: trn.type,categoryId: trn.categoryId,date: trn.date,diff --git a/store/trns/getters.js b/store/trns/getters.jsindex 18d92cd9..11203a40 100644--- a/store/trns/getters.js+++ b/store/trns/getters.js@@ -50,10 +50,10 @@ export default {if (trn.type === 2 && inculdeTrnasfers) {if (walletId === trn.walletFromId)- expenses = expenses + trn.amountFrom+ expenses = expenses + trn.amountif (walletId === trn.walletToId)- incomes = incomes + trn.amountTo+ incomes = incomes + trn.amount}}}