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

Code for #3057

Browse Source
This commit is contained in:
James Cole
2020-03-22 18:27:20 +01:00
parent cdebde5a2b
commit 1797880488
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/create_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

13
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@@ -87,7 +87,7 @@
v-on:select:account="selectedDestinationAccount(index, $event)" v-on:select:account="selectedDestinationAccount(index, $event)"
:error="transaction.errors.destination_account" :error="transaction.errors.destination_account"
></account-select> ></account-select>
<standard-date <standard-date v-if="0===index"
v-model="transaction.date" v-model="transaction.date"
:index="index" :index="index"
:error="transaction.errors.date" :error="transaction.errors.date"
@@ -263,10 +263,7 @@
'debt': 'Debt', 'debt': 'Debt',
'mortgage': 'Mortgage' 'mortgage': 'Mortgage'
}; };
let value = arr[searchType] ?? searchType; return arr[searchType] ?? searchType;
// console.log('FULL account type: ' + value);
return value;
}, },
convertData: function () { convertData: function () {
// console.log('Now in convertData()'); // console.log('Now in convertData()');
@@ -303,6 +300,12 @@
data.transactions.push(this.convertDataRow(this.transactions[key], key, transactionType)); data.transactions.push(this.convertDataRow(this.transactions[key], key, transactionType));
} }
} }
// overrule group title in case its empty:
if(''===data.group_title && data.transactions.length > 1) {
data.group_title = data.transactions[0].description;
}
return data; return data;
}, },
convertDataRow(row, index, transactionType) { convertDataRow(row, index, transactionType) {