diff --git a/resources/assets/v2/pages/transactions/shared/parse-downloaded-splits.js b/resources/assets/v2/pages/transactions/shared/parse-downloaded-splits.js index 1684dd2a2b..ea633d8305 100644 --- a/resources/assets/v2/pages/transactions/shared/parse-downloaded-splits.js +++ b/resources/assets/v2/pages/transactions/shared/parse-downloaded-splits.js @@ -32,9 +32,13 @@ export function parseDownloadedSplits(downloads) { // meta data current.bill_id = download.bill_id; + current.bill_name = download.bill_name; current.budget_id = download.budget_id; + current.budget_name = download.budget_name; current.category_name = download.category_name; + current.category_id = download.category_id; current.piggy_bank_id = download.piggy_bank_id; + current.piggy_bank_name = download.piggy_bank_name; // meta dates current.book_date = download.book_date; diff --git a/resources/assets/v2/pages/transactions/show.js b/resources/assets/v2/pages/transactions/show.js index 1f4bfee41b..009dc38ed0 100644 --- a/resources/assets/v2/pages/transactions/show.js +++ b/resources/assets/v2/pages/transactions/show.js @@ -44,9 +44,10 @@ let show = function () { transactionType: '', transactionTypeTranslated: '', title: '', - totalAmount: 0, date: new Date, }, + dateFields: ["book_date", "due_date", "interest_date", "invoice_date", "payment_date", "process_date"], + metaFields: ['external_id','internal_reference','sepa_batch_id','sepa_ct_id','sepa_ct_op','sepa_db','sepa_country','sepa_cc','sepa_ep','sepa_ci','external_url'], // parse amounts per currency amounts: {}, @@ -72,7 +73,6 @@ let show = function () { this.groupProperties.transactionType = data.attributes.transactions[0].type; this.groupProperties.transactionTypeTranslated = i18next.t('firefly.' + data.attributes.transactions[0].type); this.groupProperties.title = data.attributes.title ?? data.attributes.transactions[0].description; - this.groupProperties.totalAmount = 0; this.entries = parseDownloadedSplits(data.attributes.transactions); // remove waiting thing. this.notifications.wait.show = false; @@ -90,8 +90,6 @@ let show = function () { this.amounts[foreignCurrencyCode] = 0; this.amounts[foreignCurrencyCode] += parseFloat(this.entries[i].foreign_amount); } - - this.groupProperties.totalAmount = this.groupProperties.totalAmount + parseFloat(this.entries[i].amount); if(0 === parseInt(i)) { this.groupProperties.date = this.entries[i].date; } diff --git a/resources/views/v2/transactions/show.blade.php b/resources/views/v2/transactions/show.blade.php index 78adb55d40..6c3f8f7531 100644 --- a/resources/views/v2/transactions/show.blade.php +++ b/resources/views/v2/transactions/show.blade.php @@ -90,7 +90,9 @@
- center - From A to B (summary) - | -|
category icon | -category | -
---|---|
budget icon | -budget | -
subscription icon | -subscription | -
dates (x6) icon | -subscription | -
meta fields | -meta | -
recurring things | -meta | -
tags | -meta | -
notes | -