kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +00:00
Code Issues Projects Releases Wiki Activity

Small edit and show updates

Browse Source
This commit is contained in:
James Cole
2024-01-08 20:11:27 +01:00
parent ad981c2bf0
commit 0a45a2485b
3 changed files with 164 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/v2/pages/transactions/shared/parse-downloaded-splits.js
View File

@@ -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;

6
resources/assets/v2/pages/transactions/show.js
View File

@@ -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;
}