diff --git a/app/TransactionRules/Actions/UpdatePiggybank.php b/app/TransactionRules/Actions/UpdatePiggybank.php index 614c771b0f..7287581412 100644 --- a/app/TransactionRules/Actions/UpdatePiggybank.php +++ b/app/TransactionRules/Actions/UpdatePiggybank.php @@ -104,7 +104,7 @@ class UpdatePiggybank implements ActionInterface ) ); - return true; + return false; } /** diff --git a/app/Transformers/V2/TransactionGroupTransformer.php b/app/Transformers/V2/TransactionGroupTransformer.php index 1c2ae4f2ca..7fe79c85be 100644 --- a/app/Transformers/V2/TransactionGroupTransformer.php +++ b/app/Transformers/V2/TransactionGroupTransformer.php @@ -37,13 +37,12 @@ class TransactionGroupTransformer extends AbstractTransformer public function transform(array $group): array { $first = reset($group['transactions']); - return [ 'id' => (string) $group['id'], 'created_at' => $first['created_at']->toAtomString(), 'updated_at' => $first['updated_at']->toAtomString(), 'user' => (string) $first['user_id'], - 'group_title' => $group['group_title'] ?? null, + 'group_title' => $group['title'] ?? null, 'transactions' => $this->transformTransactions($group['transactions'] ?? []), 'links' => [ [ diff --git a/frontend/src/components/dashboard/NetWorthInsightBox.vue b/frontend/src/components/dashboard/NetWorthInsightBox.vue index 906feef6dd..2856a1fbd9 100644 --- a/frontend/src/components/dashboard/NetWorthInsightBox.vue +++ b/frontend/src/components/dashboard/NetWorthInsightBox.vue @@ -39,8 +39,8 @@ {{ formatAmount(currency, primary) }} - {{ formatAmount(item.code, item.sum) }} - + + {{ formatAmount(item.code, item.sum) }} + + @@ -104,16 +104,17 @@ export default { if (!current.converted) { this.primary = this.primary + parseFloat(current.sum); } - - this.netWorth.push( - { - sum: current.sum, - code: current.code, - native_sum: current.converted ? current.native_sum : current.sum, - native_code: current.converted ? current.native_code : current.code, - native: hasNative, - } - ); + if(parseFloat(current.sum) !== 0.0) { + this.netWorth.push( + { + sum: current.sum, + code: current.code, + native_sum: current.converted ? current.native_sum : current.sum, + native_code: current.converted ? current.native_code : current.code, + native: hasNative, + } + ); + } } } }, diff --git a/frontend/src/components/dashboard/TransactionList.vue b/frontend/src/components/dashboard/TransactionList.vue index 7fbad01b35..cdf077f6ed 100644 --- a/frontend/src/components/dashboard/TransactionList.vue +++ b/frontend/src/components/dashboard/TransactionList.vue @@ -23,18 +23,41 @@ - {{ accountName }} + {{ accountName }} (balance) - - - Content - - - - - + + + + Description + Opposing account + Amount + + + + + + + + {{ transaction.transactionGroupTitle }} + + + + + {{tr.description}} + + + + {{tr.description}} + + + + 159 + 6 + + + @@ -52,7 +75,8 @@ export default { data() { return { store: null, - accountName: '' + accountName: '', + transactions: [], } }, mounted() { @@ -86,20 +110,42 @@ export default { const end = new Date(this.store.getRange.end); let startStr = format(start, 'y-MM-dd'); let endStr = format(end, 'y-MM-dd'); - (new Get).transactions(this.accountId, { - start: startStr, - end: endStr - }).then((response) => this.parseTransactions(response.data)); + (new Get).transactions(this.accountId, + { + start: startStr, + end: endStr, + limit: 10 + }).then((response) => this.parseTransactions(response.data)); } }, - parseTransactions: function () { - + parseTransactions: function (data) { + for (let i in data.data) { + if (data.data.hasOwnProperty(i)) { + let group = data.data[i]; + let ic = { + transactionGroupId: group.id, + transactionGroupTitle: group.attributes.group_title, + transactions: [], + }; + for (let ii in group.attributes.transactions) { + if (group.attributes.transactions.hasOwnProperty(ii)) { + let transaction = group.attributes.transactions[ii]; + let iic = { + journalId: transaction.transaction_journal_id, + description: transaction.description, + amount: transaction.amount, + currency_code: transaction.currency_code, + destination_name: transaction.destination_name, + destination_id: transaction.destination_id, + type: transaction.type, + }; + ic.transactions.push(iic); + } + } + this.transactions.push(ic); + } + } } }, - } - - diff --git a/frontend/src/components/dashboard/TransactionLists.vue b/frontend/src/components/dashboard/TransactionLists.vue index ab7cb8e700..976e27097d 100644 --- a/frontend/src/components/dashboard/TransactionLists.vue +++ b/frontend/src/components/dashboard/TransactionLists.vue @@ -20,7 +20,7 @@ - +