jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Pass amount as string and add transaction correctly
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
Jan Bader
2022-02-27 21:06:34 +00:00
parent bd686e0c00
commit faef975f1a
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/pages/Account.vue
View File

@ -31,7 +31,7 @@ function submitReconcilation() {
}
function createReconcilationTransaction() {
const diff = accounts.ReconcilingBalance - TargetReconcilingBalance.value;
const diff = TargetReconcilingBalance.value - accounts.ReconcilingBalance ;
accounts.SubmitReconcilation(diff);
accounts.Reconciling = false;
}
@ -91,7 +91,7 @@ function createReconcilationTransaction() {
</tr>
<TransactionInputRow :budgetid="budgetid" :accountid="accountid" />
<TransactionRow
v-for="(transaction, index) in accounts.TransactionsList"
v-for="(transaction, index) in accounts.TransactionsList" :key="transaction.ID"
:transaction="transaction"
:index="index"
/>

16
web/src/stores/budget-account.ts
View File

@ -135,13 +135,16 @@ export const useAccountStore = defineStore("budget/account", {
useSessionStore().setTitle(account.Name);
await this.FetchAccount(account);
},
AddTransaction(account: Account, transaction: any) {
transaction.Date = new Date(transaction.Date);
this.Transactions.set(transaction.ID, transaction);
},
async FetchAccount(account: Account) {
const result = await GET("/account/" + account.ID + "/transactions");
const response = await result.json();
account.Transactions = [];
for (const transaction of response.Transactions) {
transaction.Date = new Date(transaction.Date);
this.Transactions.set(transaction.ID, transaction);
this.AddTransaction(account, transaction);
account.Transactions.push(transaction.ID);
}
},
@ -177,7 +180,7 @@ export const useAccountStore = defineStore("budget/account", {
transaction.Reconciled = value;
}
},
async SubmitReconcilation(reconciliationTransactionAmount : number) {
async SubmitReconcilation(reconciliationTransactionAmount: number) {
const account = this.CurrentAccount!;
const reconciledTransactions = this.TransactionsList.filter(x => x.Reconciled);
for (const transaction of reconciledTransactions) {
@ -187,9 +190,14 @@ export const useAccountStore = defineStore("budget/account", {
}
const result = await POST("/account/" + this.CurrentAccountID + "/reconcile", JSON.stringify({
transactionIDs: reconciledTransactions.map(x => x.ID),
reconciliationTransactionAmount: reconciliationTransactionAmount,
reconciliationTransactionAmount: reconciliationTransactionAmount.toString(),
}));
const response = await result.json();
const recTrans = response.ReconciliationTransaction;
if (recTrans) {
this.AddTransaction(account, recTrans);
account.Transactions.unshift(recTrans.ID);
}
console.log("Reconcile: " + response.message);
},
logout() {