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

Update translations.

Browse Source
This commit is contained in:
James Cole
2024-01-10 20:29:00 +01:00
parent 3a8162d3c5
commit 8e2546da9d
46 changed files with 418 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/assets/v2/api/v2/model/transaction/put.js Normal file
View File

@@ -0,0 +1,28 @@
/*
* post.js
* Copyright (c) 2023 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {api} from "../../../../boot/axios";
export default class Put {
put(submission, params) {
let url = '/api/v2/transactions/' + parseInt(params.id);
return api.put(url, submission);
}
}

2
resources/assets/v2/pages/transactions/create.js
View File

@@ -427,7 +427,7 @@ let transactions = function () {
this.notifications.error.text = i18next.t('firefly.errors_submission', {errorMessage: data.message});
if (data.hasOwnProperty('errors')) {
this.entries = spliceErrorsIntoTransactions(i18n, data.errors, this.entries);
this.entries = spliceErrorsIntoTransactions(data.errors, this.entries);
}
},

115
resources/assets/v2/pages/transactions/edit.js
View File

@@ -38,6 +38,11 @@ import {loadPiggyBanks} from "./shared/load-piggy-banks.js";
import {loadSubscriptions} from "./shared/load-subscriptions.js";
import Tags from "bootstrap5-tags";
import i18next from "i18next";
import {defaultErrorSet} from "./shared/create-empty-split.js";
import {parseFromEntries} from "./shared/parse-from-entries.js";
import Put from "../../api/v2/model/transaction/put.js";
import {processAttachments} from "./shared/process-attachments.js";
import {spliceErrorsIntoTransactions} from "./shared/splice-errors-into-transactions.js";
// TODO upload attachments to other file
// TODO fix two maps, perhaps disconnect from entries entirely.
@@ -102,7 +107,74 @@ let transactions = function () {
}
},
// submit the transaction form.
// TODO pretty much duplicate of create.js
submitTransaction() {
// reset all messages:
this.notifications.error.show = false;
this.notifications.success.show = false;
this.notifications.wait.show = false;
// reset all errors in the entries array:
for (let i in this.entries) {
if (this.entries.hasOwnProperty(i)) {
this.entries[i].errors = defaultErrorSet();
}
}
// form is now submitting:
this.formStates.isSubmitting = true;
// parse transaction:
let transactions = parseFromEntries(this.entries, this.groupProperties.transactionType);
let submission = {
group_title: this.groupProperties.title,
fire_webhooks: this.formStates.webhooksButton,
apply_rules: this.formStates.rulesButton,
transactions: transactions
};
// catch for group title:
if (null === this.groupProperties.title && transactions.length > 1) {
submission.group_title = transactions[0].description;
}
// submit the transaction. Multi-stage process thing going on here!
let putter = new Put();
console.log(submission);
putter.put(submission, {id: this.groupProperties.id}).then((response) => {
const group = response.data.data;
// submission was a success!
this.groupProperties.id = parseInt(group.id);
this.groupProperties.title = group.attributes.group_title ?? group.attributes.transactions[0].description
// process attachments, if any:
const attachmentCount = processAttachments(this.groupProperties.id, group.attributes.transactions);
if (attachmentCount > 0) {
// if count is more than zero, system is processing transactions in the background.
this.notifications.wait.show = true;
this.notifications.wait.text = i18next.t('firefly.wait_attachments');
return;
}
// if not, respond to user options:
this.showMessageOrRedirectUser();
}).catch((error) => {
this.submitting = false;
console.log(error);
// todo put errors in form
if (typeof error.response !== 'undefined') {
this.parseErrors(error.response.data);
}
});
},
// part of the account selection auto-complete
filters: {
source: [], destination: [],
@@ -291,7 +363,48 @@ let transactions = function () {
this.groupProperties.totalAmount = this.groupProperties.totalAmount + parseFloat(this.entries[i].amount);
}
}
}
},
// TODO is a duplicate
showMessageOrRedirectUser() {
// disable all messages:
this.notifications.error.show = false;
this.notifications.success.show = false;
this.notifications.wait.show = false;
if (this.formStates.returnHereButton) {
this.notifications.success.show = true;
this.notifications.success.url = 'transactions/show/' + this.groupProperties.id;
this.notifications.success.text = i18next.t('firefly.updated_journal_js', {description: this.groupProperties.title});
return;
}
window.location = 'transactions/show/' + this.groupProperties.id + '?transaction_group_id=' + this.groupProperties.id + '&message=updated';
},
// TODO is a duplicate
parseErrors(data) {
// disable all messages:
this.notifications.error.show = true;
this.notifications.success.show = false;
this.notifications.wait.show = false;
this.formStates.isSubmitting = false;
this.notifications.error.text = i18next.t('firefly.errors_submission', {errorMessage: data.message});
if (data.hasOwnProperty('errors')) {
this.entries = spliceErrorsIntoTransactions(data.errors, this.entries);
}
},
// TODO is a duplicate
processUpload(event) {
this.showMessageOrRedirectUser();
},
// TODO is a duplicate
processUploadError(event) {
this.notifications.success.show = false;
this.notifications.wait.show = false;
this.notifications.error.show = true;
this.formStates.isSubmitting = false;
this.notifications.error.text = i18next.t('firefly.errors_upload');
console.error(event);
},
}
}

8
resources/assets/v2/pages/transactions/shared/splice-errors-into-transactions.js
View File

@@ -17,6 +17,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import i18next from "i18next";
function cleanupErrors(fullName, shortName, errors) {
let newErrors = [];
let message = '';
@@ -28,7 +30,7 @@ function cleanupErrors(fullName, shortName, errors) {
return newErrors;
}
export function spliceErrorsIntoTransactions(i18n, errors, transactions) {
export function spliceErrorsIntoTransactions(errors, transactions) {
let transactionIndex;
let fieldName;
let errorArray;
@@ -78,8 +80,8 @@ export function spliceErrorsIntoTransactions(i18n, errors, transactions) {
break;
case 'type':
// add custom error to source and destination account
transactions[transactionIndex].errors.source_account = transactions[transactionIndex].errors.source_account.concat([i18n.t('validation.bad_type_source')]);
transactions[transactionIndex].errors.destination_account = transactions[transactionIndex].errors.destination_account.concat([i18n.t('validation.bad_type_destination')]);
transactions[transactionIndex].errors.source_account = transactions[transactionIndex].errors.source_account.concat([i18next.t('validation.bad_type_source')]);
transactions[transactionIndex].errors.destination_account = transactions[transactionIndex].errors.destination_account.concat([i18next.t('validation.bad_type_destination')]);
break;
case 'destination_name':
case 'destination_id':