gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-23 03:31:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2021-05-02 06:27:32 +02:00
parent a83578d1ae 8f6655f85e
commit d0622dbcd3
99 changed files with 1254 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/components/dashboard/MainAccount.vue
View File

@@ -33,9 +33,6 @@
<div v-if="error" class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
</div>
<div v-if="timezoneDifference" class="text-muted small">
{{ $t('firefly.timezone_difference', {local: localTimeZone, system: systemTimeZone}) }}
</div>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./accounts/asset"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_asset_accounts') }}</a>
@@ -66,24 +63,16 @@ export default {
dataCollection: {},
chartOptions: {},
_chart: null,
localTimeZone: '',
systemTimeZone: '',
}
},
created() {
this.chartOptions = DefaultLineOptions.methods.getDefaultOptions();
this.localTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
this.systemTimeZone = this.timezone;
this.ready = true;
},
computed: {
...mapGetters('dashboard/index', ['start', 'end']),
...mapGetters('root', ['timezone']),
'datesReady': function () {
return null !== this.start && null !== this.end && this.ready;
},
timezoneDifference: function () {
return this.localTimeZone !== this.systemTimeZone;
}
},
watch: {

2
frontend/src/components/dashboard/MainCategoryList.vue
View File

@@ -42,7 +42,7 @@
<thead>
<tr>
<th scope="col">{{ $t('firefly.category') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
<th scope="col">{{ $t('firefly.spent') }} / {{ $t('firefly.earned') }}</th>
</tr>
</thead>
<tbody>

4
frontend/src/components/dashboard/MainCreditList.vue
View File

@@ -41,8 +41,8 @@
<caption style="display:none;">{{ $t('firefly.revenue_accounts') }}</caption>
<thead>
<tr>
<th scope="col">{{ $t('firefly.category') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
<th scope="col">{{ $t('firefly.account') }}</th>
<th scope="col">{{ $t('firefly.earned') }}</th>
</tr>
</thead>
<tbody>

2
frontend/src/components/dashboard/MainDebitList.vue
View File

@@ -41,7 +41,7 @@
<caption style="display:none;">{{ $t('firefly.expense_accounts') }}</caption>
<thead>
<tr>
<th scope="col">{{ $t('firefly.category') }}</th>
<th scope="col">{{ $t('firefly.account') }}</th>
<th scope="col">{{ $t('firefly.spent') }}</th>
</tr>
</thead>

9
frontend/src/components/dashboard/TopBoxes.vue
View File

@@ -20,7 +20,7 @@
<template>
<div class="row">
<div class="col"> <!-- col-md-3 col-sm-6 col-12 -->
<div class="col" v-if="0 !== prefCurrencyBalances.length || 0 !== notPrefCurrencyBalances.length">
<div class="info-box">
<span class="info-box-icon"><i class="far fa-bookmark text-info"></i></span>
@@ -45,7 +45,7 @@
</div>
</div>
<div class="col">
<div class="col" v-if="0!==prefBillsUnpaid.length || 0 !== notPrefBillsUnpaid.length">
<div class="info-box">
<span class="info-box-icon"><i class="far fa-calendar-alt text-teal"></i></span>
@@ -55,7 +55,6 @@
<span v-if="error" class="info-box-text"><i class="fas fa-exclamation-triangle text-danger"></i></span>
<!-- bills unpaid, in preferred currency. -->
<span v-for="balance in prefBillsUnpaid" class="info-box-number">{{ balance.value_parsed }}</span>
<span v-if="0===prefBillsUnpaid.length" class="info-box-number">&nbsp;</span>
<div class="progress bg-teal">
<div class="progress-bar" style="width: 0"></div>
@@ -71,7 +70,7 @@
</div>
</div>
<!-- left to spend -->
<div class="col">
<div class="col" v-if="0 !== prefLeftToSpend.length || 0 !== notPrefLeftToSpend.length">
<div class="info-box">
<span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span>
@@ -98,7 +97,7 @@
</div>
<!-- net worth -->
<div class="col">
<div class="col" v-if="0 !== notPrefNetWorth.length || 0 !== prefNetWorth.length">
<div class="info-box">
<span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span>

198
frontend/src/components/transactions/Edit.vue
View File

@@ -25,21 +25,26 @@
<Alert :message="warningMessage" type="warning"/>
<form @submit="submitTransaction" autocomplete="off">
<SplitPills :transactions="transactions"/>
<SplitPills
:transactions="transactions"
:count="transactions.length"
/>
<div class="tab-content">
<SplitForm
v-for="(transaction, index) in this.transactions"
v-bind:key="index"
:count="transactions.length"
:index="index"
v-bind:key="transaction.transaction_journal_id"
:key="transaction.transaction_journal_id"
:transaction="transaction"
:date="date"
:count="transactions.length"
:transaction-type="transactionType"
:source-allowed-types="sourceAllowedTypes"
:allowed-opposing-types="allowedOpposingTypes"
:custom-fields="customFields"
:date="date"
:index="index"
:transaction-type="transactionType"
:destination-allowed-types="destinationAllowedTypes"
:source-allowed-types="sourceAllowedTypes"
:allow-switch="false"
v-on:uploaded-attachments="uploadedAttachment($event)"
v-on:set-marker-location="storeLocation($event)"
@@ -122,56 +127,97 @@ const lodashClonedeep = require('lodash.clonedeep');
export default {
name: "Edit",
created() {
// console.log('Created');
let parts = window.location.pathname.split('/');
this.groupId = parseInt(parts[parts.length - 1]);
this.transactions = [];
this.getTransactionGroup();
this.getAllowedOpposingTypes();
this.getCustomFields();
},
data() {
return {
successMessage: '',
errorMessage: '',
warningMessage: '',
successMessage: {type: String, default: ''},
errorMessage: {type: String, default: ''},
warningMessage: {type: String, default: ''},
// transaction props
transactions: [],
originalTransactions: [],
groupTitle: '',
originalGroupTitle: '',
transactionType: 'any',
groupId: 0,
transactions: {
type: Array,
default: function () {
return [];
}
},
originalTransactions: {
type: Array,
default: function () {
return [];
}
},
groupTitle: {type: String, default: ''},
originalGroupTitle: {type: String, default: ''},
transactionType: {type: String, default: 'any'},
groupId: {type: Number, default: 0},
// errors in the group title:
groupTitleErrors: [],
groupTitleErrors: {
type: Array,
default: function () {
return [];
}
},
// which custom fields to show
customFields: {},
customFields: {
type: Object,
default: function () {
return {};
}
},
// group ID + title once submitted:
returnedGroupId: 0,
returnedGroupTitle: '',
returnedGroupId: {type: Number, default: 0},
returnedGroupTitle: {type: String, default: ''},
// date and time of the transaction,
date: '',
originalDate: '',
date: {type: String, default: ''},
originalDate: {type: String, default: ''},
// things the process is done working on (3 phases):
submittedTransaction: false,
submittedTransaction: {type: Boolean, default: false},
// submittedLinks: false,
submittedAttachments: -1, // -1 = no attachments, 0 = uploading, 1 = uploaded
inError: false,
submittedAttachments: {type: Number, default: -1}, // -1 = no attachments, 0 = uploading, 1 = uploaded
inError: {type: Boolean, default: false},
// number of uploaded attachments
// its an object because we count per transaction journal (which can have multiple attachments)
// and array doesn't work right.
submittedAttCount: {},
submittedAttCount: {
type: Object,
default: function () {
return {};
}
},
// meta data for accounts
allowedOpposingTypes: {},
destinationAllowedTypes: [],
sourceAllowedTypes: [],
allowedOpposingTypes: {
type: Object,
default: function () {
return {};
}
},
destinationAllowedTypes: {
type: Array,
default: function () {
return [];
}
},
sourceAllowedTypes: {
type: Array,
default: function () {
return [];
}
},
// states for the form (makes sense right)
enableSubmit: true,
@@ -195,16 +241,17 @@ export default {
methods: {
...mapMutations('transactions/create', ['updateField',]),
/**
* Grap transaction group from URL and submit GET.
* Grab transaction group from URL and submit GET.
*/
getTransactionGroup: function () {
// console.log('getTransactionGroup');
axios.get('./api/v1/transactions/' + this.groupId)
.then(response => {
this.parseTransactionGroup(response.data);
}
).catch(error => {
console.log('I failed :(');
console.log(error);
//console.log('I failed :(');
//console.log(error);
});
},
/**
@@ -219,12 +266,16 @@ export default {
this.groupTitle = attributes.group_title;
this.originalGroupTitle = attributes.group_title;
this.transactions = [];
this.originalTransactions = [];
//this.returnedGroupId = parseInt(response.data.id);
this.returnedGroupTitle = null === this.originalGroupTitle ? response.data.attributes.transactions[0].description : this.originalGroupTitle;
for (let i in transactions) {
if (transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
console.log('Parsing transaction nr ' + i);
let result = this.parseTransaction(parseInt(i), transactions[i]);
this.transactions.push(result);
this.originalTransactions.push(lodashClonedeep(result));
@@ -431,16 +482,30 @@ export default {
},
removeTransaction: function (payload) {
//console.log('removeTransaction()');
//console.log(payload);
//console.log('length: ' + this.transactions.length);
this.transactions.splice(payload.index, 1);
//console.log('length: ' + this.transactions.length);
// console.log('removeTransaction()');
// console.log('length : ' + this.transactions.length);
// console.log('Remove index: ' + payload.index);
let index = 0;
for (let i in this.transactions) {
if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
console.log('Now at index: ' + i);
if (index === payload.index) {
console.log('Delete!');
this.transactions.splice(index, 1);
//console.log(delete this.transactions[i]);
}
index++;
}
}
$('#transactionTabs li:first-child a').tab('show');
//this.originalTransactions.splice(payload.index, 1);
// this.transactions.splice(payload.index, 1);
// console.log('length: ' + this.transactions.length);
// this.originalTransactions.splice(payload.index, 1);
// this kills the original transactions.
this.originalTransactions = [];
//this.originalTransactions = [];
},
storeGroupTitle: function (payload) {
this.groupTitle = payload;
@@ -466,6 +531,7 @@ export default {
},
submitTransaction: function (event) {
event.preventDefault();
this.enableSubmit = false;
let submission = {transactions: []};
// parse data to see if we should submit anything at all:
@@ -584,6 +650,10 @@ export default {
if (typeof currentTransaction.selectedAttachments !== 'undefined' && true === currentTransaction.selectedAttachments) {
shouldUpload = true;
}
if(true === shouldSubmit) {
// set the date to whatever the date is:
diff.date = this.date;
}
if (this.date !== this.originalDate) {
shouldSubmit = true;
@@ -662,9 +732,10 @@ export default {
return this.deleteAllOriginalLinks().then(() => this.submitNewLinks());
},
submitAttachments: function (shouldSubmit, response) {
//console.log('submitAttachments');
console.log('submitAttachments');
if (!shouldSubmit) {
//console.log('no need!');
console.log('no need!');
this.submittedAttachments = 1;
return new Promise((resolve) => {
resolve({});
});
@@ -697,17 +768,20 @@ export default {
}
},
finaliseSubmission: function () {
//console.log('finaliseSubmission');
// console.log('finaliseSubmission (' + this.submittedAttachments + ')');
if (0 === this.submittedAttachments) {
return;
}
//console.log('continue (' + this.submittedAttachments + ')');
// console.log('continue (' + this.submittedAttachments + ')');
// console.log(this.stayHere);
// console.log(this.inError);
if (true === this.stayHere && false === this.inError) {
//console.log('no error + no changes + no redirect');
// show message:
this.errorMessage = '';
this.warningMessage = '';
this.successMessage = this.$t('firefly.transaction_updated_link', {ID: this.groupId, title: this.returnedGroupTitle});
}
// no error + changes + redirect
if (false === this.stayHere && false === this.inError) {
@@ -843,23 +917,23 @@ export default {
}
return JSON.stringify(compare);
},
uploadAttachments: function (result) {
//console.log('TODO, upload attachments.');
if (0 === Object.keys(result).length) {
for (let i in this.transactions) {
if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
//console.log('updateField(' + i + ', transaction_journal_id, ' + result[i].transaction_journal_id + ')');
this.updateField({index: i, field: 'transaction_journal_id', value: result[i].transaction_journal_id});
}
}
//console.log('Transactions not changed, use original objects.');
} else {
//console.log('Transactions changed!');
}
this.submittedAttachments = true;
},
// uploadAttachments: function (result) {
// //console.log('TODO, upload attachments.');
// if (0 === Object.keys(result).length) {
//
// for (let i in this.transactions) {
// if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
//
// //console.log('updateField(' + i + ', transaction_journal_id, ' + result[i].transaction_journal_id + ')');
// this.updateField({index: i, field: 'transaction_journal_id', value: result[i].transaction_journal_id});
// }
// }
// //console.log('Transactions not changed, use original objects.');
// } else {
// //console.log('Transactions changed!');
// }
// this.submittedAttachments = 0;
// },
parseErrors: function (errors) {
for (let i in this.transactions) {

18
frontend/src/components/transactions/SplitForm.vue
View File

@@ -19,7 +19,7 @@
-->
<template>
<div :id="'split_' + index" :class="'tab-pane' + (0===index ? ' active' : '')">
<div :id="'split_' + index" :class="'tab-pane' + (0 === index ? ' active' : '')">
<div class="row">
<div class="col">
<div class="card">
@@ -32,6 +32,7 @@
<button type="button" class="btn btn-danger btn-xs" @click="removeTransaction"><i class="fas fa-trash-alt"></i></button>
</div>
</div>
<div class="card-body">
<!-- start of body -->
<div class="row">
@@ -330,7 +331,7 @@ export default {
},
count: {
type: Number,
required: false
required: true
},
customFields: {
type: Object,
@@ -351,21 +352,28 @@ export default {
sourceAllowedTypes: {
type: Array,
required: false,
default: []
default: function () {
return [];
}
}, // allowed source account types.
destinationAllowedTypes: {
type: Array,
required: false,
default: []
default: function () {
return [];
}
},
// allow switch?
allowSwitch: {
type: Boolean,
required: false,
default: true
default: false
}
},
created() {
console.log('SplitForm(' + this.index + ')');
},
methods: {
removeTransaction: function () {
// console.log('Will remove transaction ' + this.index);

21
frontend/src/components/transactions/SplitPills.vue
View File

@@ -22,9 +22,10 @@
<div v-if="transactions.length > 1" class="row">
<div class="col">
<!-- tabs -->
<ul class="nav nav-pills ml-auto p-2">
<li v-for="(transaction, index) in this.transactions" class="nav-item"><a :class="'nav-link' + (0===index ? ' active' : '')" :href="'#split_' + index"
data-toggle="tab">
<ul class="nav nav-pills ml-auto p-2" id="transactionTabs">
<li v-for="(transaction, index) in this.transactions" class="nav-item"><a :class="'nav-link' + (0 === index ? ' active' : '')"
:href="'#split_' + index"
data-toggle="pill">
<span v-if="'' !== transaction.description">{{ transaction.description }}</span>
<span v-if="'' === transaction.description">Split {{ index + 1 }}</span>
</a></li>
@@ -36,6 +37,18 @@
<script>
export default {
name: "SplitPills",
props: ['transactions']
props: {
transactions: {
type: Array,
required: true,
default: function() {
return [];
}
},
count: {
type: Number,
required: true
},
}
}
</script>