mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-19 02:52:44 +00:00
Code to fix issue with missing button information.
This commit is contained in:
James Cole
@@ -69,7 +69,7 @@
|
||||
<span v-if="transactions.length === 1">{{ $t('firefly.transaction_journal_information') }}</span>
|
||||
</h3>
|
||||
<div class="box-tools pull-right" v-if="transactions.length > 1" x>
|
||||
<button type="button" v-on:click="deleteTransaction(index, $event)" class="btn btn-xs btn-danger"><i
|
||||
<button type="button" v-on:click="deleteTransaction(index, $event)" class="btn btn-xs btn-danger"><i
|
||||
class="fa fa-trash"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -77,9 +77,9 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-4">
|
||||
<transaction-description v-if="transactionType.toLowerCase() !== 'reconciliation'"
|
||||
v-model="transaction.description"
|
||||
:index="index"
|
||||
:error="transaction.errors.description"
|
||||
v-model="transaction.description"
|
||||
:index="index"
|
||||
:error="transaction.errors.description"
|
||||
>
|
||||
</transaction-description>
|
||||
<account-select v-if="transactionType.toLowerCase() !== 'reconciliation'"
|
||||
@@ -97,7 +97,7 @@
|
||||
<div class="col-sm-12">
|
||||
<p id="ffInput_source" class="form-control-static">
|
||||
<em>
|
||||
{{ $t('firefly.source_account_reconciliation') }}
|
||||
{{ $t('firefly.source_account_reconciliation') }}
|
||||
</em>
|
||||
</p>
|
||||
</div>
|
||||
@@ -117,7 +117,7 @@
|
||||
<div class="col-sm-12">
|
||||
<p id="ffInput_dest" class="form-control-static">
|
||||
<em>
|
||||
{{ $t('firefly.destination_account_reconciliation') }}
|
||||
{{ $t('firefly.destination_account_reconciliation') }}
|
||||
</em>
|
||||
</p>
|
||||
</div>
|
||||
@@ -148,13 +148,13 @@
|
||||
:transactionType="transactionType"
|
||||
></amount>
|
||||
<foreign-amount v-if="transactionType.toLowerCase() !== 'reconciliation'"
|
||||
:source="transaction.source_account"
|
||||
:destination="transaction.destination_account"
|
||||
v-model="transaction.foreign_amount"
|
||||
:transactionType="transactionType"
|
||||
:error="transaction.errors.foreign_amount"
|
||||
:no_currency="$t('firefly.none_in_select_list')"
|
||||
v-bind:title="$t('form.foreign_amount')"
|
||||
:source="transaction.source_account"
|
||||
:destination="transaction.destination_account"
|
||||
v-model="transaction.foreign_amount"
|
||||
:transactionType="transactionType"
|
||||
:error="transaction.errors.foreign_amount"
|
||||
:no_currency="$t('firefly.none_in_select_list')"
|
||||
v-bind:title="$t('form.foreign_amount')"
|
||||
></foreign-amount>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
@@ -302,7 +302,7 @@
|
||||
}
|
||||
},
|
||||
setTransactionType(type) {
|
||||
if(null !== type) {
|
||||
if (null !== type) {
|
||||
this.transactionType = type;
|
||||
}
|
||||
},
|
||||
@@ -386,7 +386,7 @@
|
||||
this.setTransactionType(transaction.type);
|
||||
|
||||
let newTags = [];
|
||||
for(let key in transaction.tags) {
|
||||
for (let key in transaction.tags) {
|
||||
if (transaction.tags.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
|
||||
newTags.push({text: transaction.tags[key], tiClasses: []});
|
||||
}
|
||||
@@ -407,58 +407,58 @@
|
||||
budget_id: [],
|
||||
foreign_amount: [],
|
||||
category: [],
|
||||
piggy_bank: [],
|
||||
tags: [],
|
||||
// custom fields:
|
||||
custom_errors: {
|
||||
interest_date: [],
|
||||
book_date: [],
|
||||
process_date: [],
|
||||
due_date: [],
|
||||
payment_date: [],
|
||||
invoice_date: [],
|
||||
internal_reference: [],
|
||||
notes: [],
|
||||
attachments: [],
|
||||
},
|
||||
},
|
||||
budget: transaction.budget_id,
|
||||
tags: newTags,
|
||||
custom_fields: {
|
||||
interest_date: transaction.interest_date,
|
||||
book_date: transaction.book_date,
|
||||
process_date: transaction.process_date,
|
||||
due_date: transaction.due_date,
|
||||
payment_date: transaction.payment_date,
|
||||
invoice_date: transaction.invoice_date,
|
||||
internal_reference: transaction.internal_reference,
|
||||
notes: transaction.notes
|
||||
},
|
||||
foreign_amount: {
|
||||
amount: this.roundNumber(this.positiveAmount(transaction.foreign_amount), transaction.foreign_currency_decimal_places),
|
||||
currency_id: transaction.foreign_currency_id
|
||||
},
|
||||
source_account: {
|
||||
id: transaction.source_id,
|
||||
name: transaction.source_name,
|
||||
type: transaction.source_type,
|
||||
currency_id: transaction.currency_id,
|
||||
currency_name: transaction.currency_name,
|
||||
currency_code: transaction.currency_code,
|
||||
currency_decimal_places: transaction.currency_decimal_places,
|
||||
allowed_types: [transaction.source_type]
|
||||
},
|
||||
destination_account: {
|
||||
id: transaction.destination_id,
|
||||
name: transaction.destination_name,
|
||||
type: transaction.destination_type,
|
||||
currency_id: transaction.currency_id,
|
||||
currency_name: transaction.currency_name,
|
||||
currency_code: transaction.currency_code,
|
||||
currency_decimal_places: transaction.currency_decimal_places,
|
||||
allowed_types: [transaction.destination_type]
|
||||
}
|
||||
});
|
||||
piggy_bank: [],
|
||||
tags: [],
|
||||
// custom fields:
|
||||
custom_errors: {
|
||||
interest_date: [],
|
||||
book_date: [],
|
||||
process_date: [],
|
||||
due_date: [],
|
||||
payment_date: [],
|
||||
invoice_date: [],
|
||||
internal_reference: [],
|
||||
notes: [],
|
||||
attachments: [],
|
||||
},
|
||||
},
|
||||
budget: transaction.budget_id,
|
||||
tags: newTags,
|
||||
custom_fields: {
|
||||
interest_date: transaction.interest_date,
|
||||
book_date: transaction.book_date,
|
||||
process_date: transaction.process_date,
|
||||
due_date: transaction.due_date,
|
||||
payment_date: transaction.payment_date,
|
||||
invoice_date: transaction.invoice_date,
|
||||
internal_reference: transaction.internal_reference,
|
||||
notes: transaction.notes
|
||||
},
|
||||
foreign_amount: {
|
||||
amount: this.roundNumber(this.positiveAmount(transaction.foreign_amount), transaction.foreign_currency_decimal_places),
|
||||
currency_id: transaction.foreign_currency_id
|
||||
},
|
||||
source_account: {
|
||||
id: transaction.source_id,
|
||||
name: transaction.source_name,
|
||||
type: transaction.source_type,
|
||||
currency_id: transaction.currency_id,
|
||||
currency_name: transaction.currency_name,
|
||||
currency_code: transaction.currency_code,
|
||||
currency_decimal_places: transaction.currency_decimal_places,
|
||||
allowed_types: [transaction.source_type]
|
||||
},
|
||||
destination_account: {
|
||||
id: transaction.destination_id,
|
||||
name: transaction.destination_name,
|
||||
type: transaction.destination_type,
|
||||
currency_id: transaction.currency_id,
|
||||
currency_name: transaction.currency_name,
|
||||
currency_code: transaction.currency_code,
|
||||
currency_decimal_places: transaction.currency_decimal_places,
|
||||
allowed_types: [transaction.destination_type]
|
||||
}
|
||||
});
|
||||
},
|
||||
convertData: function () {
|
||||
let data = {
|
||||
@@ -630,26 +630,22 @@
|
||||
url: uri,
|
||||
data: data,
|
||||
}).then(response => {
|
||||
|
||||
if (0 === this.collectAttachmentData(response)) {
|
||||
this.redirectUser(response.data.data.id, button);
|
||||
}
|
||||
}).catch(error => {
|
||||
if (0 === this.collectAttachmentData(response)) {
|
||||
this.redirectUser(response.data.data.id);
|
||||
}
|
||||
}).catch(error => {
|
||||
// give user errors things back.
|
||||
// something something render errors.
|
||||
this.parseErrors(error.response.data);
|
||||
// something.
|
||||
button.prop("disabled", false);
|
||||
});
|
||||
if (e) {
|
||||
e.preventDefault();
|
||||
}
|
||||
button.prop("disabled", false);
|
||||
},
|
||||
|
||||
redirectUser(groupId, button) {
|
||||
// console.log('In redirectUser()');
|
||||
// if count is 0, send user onwards.
|
||||
|
||||
redirectUser(groupId) {
|
||||
if (this.returnAfter) {
|
||||
this.setDefaultErrors();
|
||||
// do message if update or new:
|
||||
@@ -660,7 +656,6 @@
|
||||
this.success_message = '<a href="transactions/show/' + groupId + '">The transaction</a> has been updated.';
|
||||
this.error_message = '';
|
||||
}
|
||||
button.prop("disabled", false);
|
||||
} else {
|
||||
if (this.storeAsNew) {
|
||||
window.location.href = window.previousUri + '?transaction_group_id=' + groupId + '&message=created';
|
||||
@@ -757,17 +752,17 @@
|
||||
if (uploads === count) {
|
||||
// finally we can redirect the user onwards.
|
||||
// console.log('FINAL UPLOAD');
|
||||
this.redirectUser(groupId);
|
||||
this.redirectUser(groupId, null);
|
||||
}
|
||||
// console.log('Upload complete!');
|
||||
return true;
|
||||
}).catch(error => {
|
||||
console.error('Could not upload file.');
|
||||
console.error(error);
|
||||
uploads++;
|
||||
this.error_message = 'Could not upload attachment: ' + error;
|
||||
console.error('Could not upload file.');
|
||||
console.error(error);
|
||||
uploads++;
|
||||
this.error_message = 'Could not upload attachment: ' + error;
|
||||
if (uploads === count) {
|
||||
this.redirectUser(groupId);
|
||||
this.redirectUser(groupId, null);
|
||||
}
|
||||
// console.error(error);
|
||||
return false;
|
||||
@@ -781,74 +776,74 @@
|
||||
|
||||
addTransaction: function (e) {
|
||||
this.transactions.push({
|
||||
transaction_journal_id: 0,
|
||||
description: "",
|
||||
date: "",
|
||||
amount: "",
|
||||
category: "",
|
||||
piggy_bank: 0,
|
||||
errors: {
|
||||
source_account: [],
|
||||
destination_account: [],
|
||||
description: [],
|
||||
amount: [],
|
||||
date: [],
|
||||
budget_id: [],
|
||||
foreign_amount: [],
|
||||
category: [],
|
||||
piggy_bank: [],
|
||||
tags: [],
|
||||
// custom fields:
|
||||
custom_errors: {
|
||||
interest_date: [],
|
||||
book_date: [],
|
||||
process_date: [],
|
||||
due_date: [],
|
||||
payment_date: [],
|
||||
invoice_date: [],
|
||||
internal_reference: [],
|
||||
notes: [],
|
||||
attachments: [],
|
||||
},
|
||||
},
|
||||
budget: 0,
|
||||
tags: [],
|
||||
custom_fields: {
|
||||
"interest_date": "",
|
||||
"book_date": "",
|
||||
"process_date": "",
|
||||
"due_date": "",
|
||||
"payment_date": "",
|
||||
"invoice_date": "",
|
||||
"internal_reference": "",
|
||||
"notes": "",
|
||||
"attachments": []
|
||||
},
|
||||
foreign_amount: {
|
||||
amount: "",
|
||||
currency_id: 0
|
||||
},
|
||||
source_account: {
|
||||
id: 0,
|
||||
name: "",
|
||||
type: "",
|
||||
currency_id: 0,
|
||||
currency_name: '',
|
||||
currency_code: '',
|
||||
currency_decimal_places: 2,
|
||||
allowed_types: []
|
||||
},
|
||||
destination_account: {
|
||||
id: 0,
|
||||
name: "",
|
||||
type: "",
|
||||
currency_id: 0,
|
||||
currency_name: '',
|
||||
currency_code: '',
|
||||
currency_decimal_places: 2,
|
||||
allowed_types: []
|
||||
}
|
||||
});
|
||||
transaction_journal_id: 0,
|
||||
description: "",
|
||||
date: "",
|
||||
amount: "",
|
||||
category: "",
|
||||
piggy_bank: 0,
|
||||
errors: {
|
||||
source_account: [],
|
||||
destination_account: [],
|
||||
description: [],
|
||||
amount: [],
|
||||
date: [],
|
||||
budget_id: [],
|
||||
foreign_amount: [],
|
||||
category: [],
|
||||
piggy_bank: [],
|
||||
tags: [],
|
||||
// custom fields:
|
||||
custom_errors: {
|
||||
interest_date: [],
|
||||
book_date: [],
|
||||
process_date: [],
|
||||
due_date: [],
|
||||
payment_date: [],
|
||||
invoice_date: [],
|
||||
internal_reference: [],
|
||||
notes: [],
|
||||
attachments: [],
|
||||
},
|
||||
},
|
||||
budget: 0,
|
||||
tags: [],
|
||||
custom_fields: {
|
||||
"interest_date": "",
|
||||
"book_date": "",
|
||||
"process_date": "",
|
||||
"due_date": "",
|
||||
"payment_date": "",
|
||||
"invoice_date": "",
|
||||
"internal_reference": "",
|
||||
"notes": "",
|
||||
"attachments": []
|
||||
},
|
||||
foreign_amount: {
|
||||
amount: "",
|
||||
currency_id: 0
|
||||
},
|
||||
source_account: {
|
||||
id: 0,
|
||||
name: "",
|
||||
type: "",
|
||||
currency_id: 0,
|
||||
currency_name: '',
|
||||
currency_code: '',
|
||||
currency_decimal_places: 2,
|
||||
allowed_types: []
|
||||
},
|
||||
destination_account: {
|
||||
id: 0,
|
||||
name: "",
|
||||
type: "",
|
||||
currency_id: 0,
|
||||
currency_name: '',
|
||||
currency_code: '',
|
||||
currency_decimal_places: 2,
|
||||
allowed_types: []
|
||||
}
|
||||
});
|
||||
if (e) {
|
||||
e.preventDefault();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user