This commit is contained in:
James Cole
2020-07-23 19:40:10 +02:00
parent 93a0338678
commit e1f4cd7565
85 changed files with 233 additions and 23 deletions

View File

@@ -140,6 +140,7 @@ class TransactionStoreRequest extends FormRequest
'transactions.*.external_id' => 'min:1,max:255|nullable',
'transactions.*.recurrence_id' => 'min:1,max:255|nullable',
'transactions.*.bunq_payment_id' => 'min:1,max:255|nullable',
'transactions.*.external_uri' => 'min:1,max:255|nullable|url',
// SEPA fields:
'transactions.*.sepa_cc' => 'min:1,max:255|nullable',
@@ -273,6 +274,7 @@ class TransactionStoreRequest extends FormRequest
'original_source' => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
'recurrence_id' => $this->integerFromValue($object['recurrence_id']),
'bunq_payment_id' => $this->stringFromValue((string) $object['bunq_payment_id']),
'external_uri' => $this->stringFromValue((string) $object['external_uri']),
'sepa_cc' => $this->stringFromValue($object['sepa_cc']),
'sepa_ct_op' => $this->stringFromValue($object['sepa_ct_op']),

View File

@@ -129,6 +129,7 @@ class TransactionUpdateRequest extends FormRequest
'sepa_ep',
'sepa_ci',
'sepa_batch_id',
'external_uri'
];
$this->booleanFields = [
'reconciled',
@@ -206,6 +207,7 @@ class TransactionUpdateRequest extends FormRequest
'transactions.*.external_id' => 'min:1,max:255|nullable',
'transactions.*.recurrence_id' => 'min:1,max:255|nullable',
'transactions.*.bunq_payment_id' => 'min:1,max:255|nullable',
'transactions.*.external_uri' => 'min:1,max:255|nullable|url',
// SEPA fields:
'transactions.*.sepa_cc' => 'min:1,max:255|nullable',

View File

@@ -92,7 +92,7 @@ class TransactionJournalFactory
// sepa
'sepa_cc', 'sepa_ct_op', 'sepa_ct_id',
'sepa_db', 'sepa_country', 'sepa_ep',
'sepa_ci', 'sepa_batch_id',
'sepa_ci', 'sepa_batch_id', 'external_uri',
// dates
'interest_date', 'book_date', 'process_date',

View File

@@ -206,6 +206,7 @@ class PreferencesController extends Controller
'internal_reference' => isset($setOptions['internal_reference']),
'notes' => isset($setOptions['notes']),
'attachments' => isset($setOptions['attachments']),
'external_uri' => isset($setOptions['external_uri']),
];
app('preferences')->set('transaction_journal_optional_fields', $optionalTj);

View File

@@ -93,7 +93,7 @@ class JournalUpdateService
$this->accountRepository = app(AccountRepositoryInterface::class);
$this->currencyRepository = app(CurrencyRepositoryInterface::class);
$this->metaString = ['sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id', 'recurrence_id',
'internal_reference', 'bunq_payment_id', 'external_id',];
'internal_reference', 'bunq_payment_id', 'external_id', 'external_uri'];
$this->metaDate = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date',];
}

View File

@@ -60,7 +60,7 @@ class TransactionGroupTransformer extends AbstractTransformer
$this->metaFields = [
'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep',
'sepa_ci', 'sepa_batch_id', 'internal_reference', 'bunq_payment_id', 'import_hash_v2',
'recurrence_id', 'external_id', 'original_source',
'recurrence_id', 'external_id', 'original_source', 'external_uri'
];
$this->metaDateFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
@@ -500,6 +500,7 @@ class TransactionGroupTransformer extends AbstractTransformer
'original_source' => $metaFieldData['original_source'],
'recurrence_id' => $metaFieldData['recurrence_id'],
'bunq_payment_id' => $metaFieldData['bunq_payment_id'],
'external_uri' => $metaFieldData['external_uri'],
'import_hash_v2' => $metaFieldData['import_hash_v2'],
'sepa_cc' => $metaFieldData['sepa_cc'],

2
public/v1/js/app.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -644,6 +644,7 @@
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
},
};
}
@@ -740,6 +741,7 @@
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
},
},
budget: 0,
@@ -753,7 +755,8 @@
"invoice_date": "",
"internal_reference": "",
"notes": "",
"attachments": []
"attachments": [],
"external_uri": "",
},
foreign_amount: {
amount: "",

View File

@@ -49,6 +49,10 @@
:error="error.attachments"
v-model="value.attachments" v-if="this.fields.attachments" name="attachments[]" v-bind:title="$t('firefly.attachments')" v-bind:is="attachmentComponent"></component>
<component
:error="error.external_uri"
v-model="value.external_uri" v-if="this.fields.external_uri" name="external_uri[]" v-bind:title="$t('firefly.external_uri')" v-bind:is="uriComponent"></component>
<component
:error="error.notes"
v-model="value.notes" v-if="this.fields.notes" name="notes[]" v-bind:title="$t('firefly.notes')" v-bind:is="textareaComponent"></component>
@@ -75,7 +79,8 @@
"invoice_date": false,
"internal_reference": false,
"notes": false,
"attachments": false
"attachments": false,
"external_uri": false
}
]
};
@@ -93,6 +98,9 @@
},
textareaComponent () {
return 'custom-textarea';
},
uriComponent () {
return 'custom-uri';
}
},
methods: {

View File

@@ -0,0 +1,77 @@
<!--
- CustomString.vue
- Copyright (c) 2019 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/>.
-->
<template>
<div class="form-group"
v-bind:class="{ 'has-error': hasError()}"
>
<div class="col-sm-12 text-sm">
{{ title }}
</div>
<div class="col-sm-12">
<div class="input-group">
<input type="url" class="form-control" :name="name"
:title="title" autocomplete="off"
ref="uri"
:value="value" @input="handleInput"
:placeholder="title">
<span class="input-group-btn">
<button
tabIndex="-1"
v-on:click="clearField"
class="btn btn-default"
type="button"><i class="fa fa-trash-o"></i></button>
</span>
</div>
<ul class="list-unstyled" v-for="error in this.error">
<li class="text-danger">{{ error }}</li>
</ul>
</div>
</div>
</template>
<script>
export default {
name: "CustomString",
props: {
title: String,
name: String,
value: String,
error: Array
},
methods: {
handleInput(e) {
this.$emit('input', this.$refs.uri.value);
},
clearField: function () {
this.name = '';
this.$refs.uri.value = '';
this.$emit('input', this.$refs.uri.value);
},
hasError: function () {
return this.error.length > 0;
}
}
}
</script>
<style scoped>
</style>

View File

@@ -416,6 +416,7 @@
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
},
},
budget: transaction.budget_id,
@@ -428,7 +429,8 @@
payment_date: transaction.payment_date,
invoice_date: transaction.invoice_date,
internal_reference: transaction.internal_reference,
notes: transaction.notes
notes: transaction.notes,
external_uri: transaction.external_uri
},
foreign_amount: {
amount: this.roundNumber(this.positiveAmount(transaction.foreign_amount), transaction.foreign_currency_decimal_places),
@@ -608,6 +610,7 @@
payment_date: row.custom_fields.payment_date,
invoice_date: row.custom_fields.invoice_date,
internal_reference: row.custom_fields.internal_reference,
external_uri: row.custom_fields.external_uri,
notes: row.custom_fields.notes,
tags: tagList
};
@@ -830,6 +833,7 @@
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
},
},
budget: 0,
@@ -843,7 +847,8 @@
"invoice_date": "",
"internal_reference": "",
"notes": "",
"attachments": []
"attachments": [],
"external_uri": "",
},
foreign_amount: {
amount: "",
@@ -903,6 +908,10 @@
case 'tags':
this.transactions[transactionIndex].errors[fieldName] = errors.errors[key];
break;
case 'external_uri':
console.log('Found ext error in field "'+fieldName+'": ' + errors.errors[key]);
this.transactions[transactionIndex].errors.custom_errors[fieldName] = errors.errors[key];
break;
case 'source_name':
case 'source_id':
this.transactions[transactionIndex].errors.source_account =
@@ -954,6 +963,7 @@
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
},
};
}

View File

@@ -35,6 +35,7 @@ import ForeignAmountSelect from "./components/transactions/ForeignAmountSelect";
import TransactionType from "./components/transactions/TransactionType";
import AccountSelect from "./components/transactions/AccountSelect";
import Budget from "./components/transactions/Budget";
import CustomUri from "./components/transactions/CustomUri";
/**
* First we will load Axios via bootstrap.js
@@ -50,6 +51,7 @@ Vue.component('custom-date', CustomDate);
Vue.component('custom-string', CustomString);
Vue.component('custom-attachments', CustomAttachments);
Vue.component('custom-textarea', CustomTextarea);
Vue.component('custom-uri', CustomUri);
Vue.component('standard-date', StandardDate);
Vue.component('group-description', GroupDescription);
Vue.component('transaction-description', TransactionDescription);

View File

@@ -35,6 +35,7 @@ import ForeignAmountSelect from "./components/transactions/ForeignAmountSelect";
import TransactionType from "./components/transactions/TransactionType";
import AccountSelect from "./components/transactions/AccountSelect";
import Budget from "./components/transactions/Budget";
import CustomUri from "./components/transactions/CustomUri";
/**
* First we will load Axios via bootstrap.js
@@ -50,6 +51,7 @@ Vue.component('custom-date', CustomDate);
Vue.component('custom-string', CustomString);
Vue.component('custom-attachments', CustomAttachments);
Vue.component('custom-textarea', CustomTextarea);
Vue.component('custom-uri', CustomUri);
Vue.component('standard-date', StandardDate);
Vue.component('group-description', GroupDescription);
Vue.component('transaction-description', TransactionDescription);

View File

@@ -27,6 +27,7 @@
"category": "Kategorie",
"attachments": "P\u0159\u00edlohy",
"notes": "Pozn\u00e1mky",
"external_uri": "External URI",
"update_transaction": "Update transaction",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -27,6 +27,7 @@
"category": "Kategorie",
"attachments": "Anh\u00e4nge",
"notes": "Notizen",
"external_uri": "External URI",
"update_transaction": "Buchung aktualisieren",
"after_update_create_another": "Nach dem Aktualisieren hierher zur\u00fcckkehren, um weiter zu bearbeiten.",
"store_as_new": "Als neue Buchung speichern statt zu aktualisieren.",

View File

@@ -27,6 +27,7 @@
"category": "\u039a\u03b1\u03c4\u03b7\u03b3\u03bf\u03c1\u03af\u03b1",
"attachments": "\u03a3\u03c5\u03bd\u03b7\u03bc\u03bc\u03ad\u03bd\u03b1",
"notes": "\u03a3\u03b7\u03bc\u03b5\u03b9\u03ce\u03c3\u03b5\u03b9\u03c2",
"external_uri": "External URI",
"update_transaction": "\u0395\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2",
"after_update_create_another": "\u039c\u03b5\u03c4\u03ac \u03c4\u03b7\u03bd \u03b5\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7, \u03b5\u03c0\u03b9\u03c3\u03c4\u03c1\u03ad\u03c8\u03c4\u03b5 \u03b5\u03b4\u03ce \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03c3\u03c5\u03bd\u03b5\u03c7\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1.",
"store_as_new": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c9\u03c2 \u03bd\u03ad\u03b1 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03b1\u03bd\u03c4\u03af \u03b3\u03b9\u03b1 \u03b5\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7.",

View File

@@ -27,6 +27,7 @@
"category": "Category",
"attachments": "Attachments",
"notes": "Notes",
"external_uri": "External URI",
"update_transaction": "Update transaction",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -27,6 +27,7 @@
"category": "Categoria",
"attachments": "Archivos adjuntos",
"notes": "Notas",
"external_uri": "External URI",
"update_transaction": "Actualizar transacci\u00f3n",
"after_update_create_another": "Despu\u00e9s de actualizar, vuelve aqu\u00ed para continuar editando.",
"store_as_new": "Almacenar como una nueva transacci\u00f3n en lugar de actualizar.",

View File

@@ -27,6 +27,7 @@
"category": "Kategoria",
"attachments": "Liitteet",
"notes": "Muistiinpanot",
"external_uri": "External URI",
"update_transaction": "P\u00e4ivit\u00e4 tapahtuma",
"after_update_create_another": "P\u00e4ivityksen j\u00e4lkeen, palaa takaisin jatkamaan muokkausta.",
"store_as_new": "Tallenna uutena tapahtumana p\u00e4ivityksen sijaan.",

View File

@@ -27,6 +27,7 @@
"category": "Cat\u00e9gorie",
"attachments": "Pi\u00e8ces jointes",
"notes": "Notes",
"external_uri": "External URI",
"update_transaction": "Mettre \u00e0 jour l'op\u00e9ration",
"after_update_create_another": "Apr\u00e8s la mise \u00e0 jour, revenir ici pour continuer l'\u00e9dition.",
"store_as_new": "Enregistrer comme une nouvelle op\u00e9ration au lieu de mettre \u00e0 jour.",

View File

@@ -27,6 +27,7 @@
"category": "Kateg\u00f3ria",
"attachments": "Mell\u00e9kletek",
"notes": "Megjegyz\u00e9sek",
"external_uri": "External URI",
"update_transaction": "Tranzakci\u00f3 friss\u00edt\u00e9se",
"after_update_create_another": "A friss\u00edt\u00e9s ut\u00e1n t\u00e9rjen vissza ide a szerkeszt\u00e9s folytat\u00e1s\u00e1hoz.",
"store_as_new": "T\u00e1rol\u00e1s \u00faj tranzakci\u00f3k\u00e9nt friss\u00edt\u00e9s helyett.",

View File

@@ -27,6 +27,7 @@
"category": "Kategori",
"attachments": "Lampiran",
"notes": "Notes",
"external_uri": "External URI",
"update_transaction": "Update transaction",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -27,6 +27,7 @@
"category": "Categoria",
"attachments": "Allegati",
"notes": "Note",
"external_uri": "External URI",
"update_transaction": "Aggiorna transazione",
"after_update_create_another": "Dopo l'aggiornamento, torna qui per continuare la modifica.",
"store_as_new": "Salva come nuova transazione invece di aggiornarla.",

View File

@@ -27,6 +27,7 @@
"category": "Kategori",
"attachments": "Vedlegg",
"notes": "Notater",
"external_uri": "External URI",
"update_transaction": "Update transaction",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -27,6 +27,7 @@
"category": "Categorie",
"attachments": "Bijlagen",
"notes": "Notities",
"external_uri": "External URI",
"update_transaction": "Update transactie",
"after_update_create_another": "Na het opslaan terug om door te gaan met wijzigen.",
"store_as_new": "Opslaan als nieuwe transactie ipv de huidige bij te werken.",

View File

@@ -27,6 +27,7 @@
"category": "Kategoria",
"attachments": "Za\u0142\u0105czniki",
"notes": "Notatki",
"external_uri": "External URI",
"update_transaction": "Zaktualizuj transakcj\u0119",
"after_update_create_another": "Po aktualizacji wr\u00f3\u0107 tutaj, aby kontynuowa\u0107 edycj\u0119.",
"store_as_new": "Zapisz jako now\u0105 zamiast aktualizowa\u0107.",

View File

@@ -27,6 +27,7 @@
"category": "Categoria",
"attachments": "Anexos",
"notes": "Notas",
"external_uri": "External URI",
"update_transaction": "Atualizar transa\u00e7\u00e3o",
"after_update_create_another": "Depois de atualizar, retorne aqui para continuar editando.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -27,6 +27,7 @@
"category": "Categorie",
"attachments": "Ata\u0219amente",
"notes": "Noti\u021be",
"external_uri": "External URI",
"update_transaction": "Actualiza\u021bi tranzac\u021bia",
"after_update_create_another": "Dup\u0103 actualizare, reveni\u021bi aici pentru a continua editarea.",
"store_as_new": "Stoca\u021bi ca o tranzac\u021bie nou\u0103 \u00een loc s\u0103 actualiza\u021bi.",

View File

@@ -27,6 +27,7 @@
"category": "\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
"attachments": "\u0412\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
"notes": "\u0417\u0430\u043c\u0435\u0442\u043a\u0438",
"external_uri": "External URI",
"update_transaction": "\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e",
"after_update_create_another": "\u041f\u043e\u0441\u043b\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0432\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c \u0441\u044e\u0434\u0430, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435.",
"store_as_new": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a \u043d\u043e\u0432\u0443\u044e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044e \u0432\u043c\u0435\u0441\u0442\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f.",

View File

@@ -27,6 +27,7 @@
"category": "Kategori",
"attachments": "Bilagor",
"notes": "Noteringar",
"external_uri": "External URI",
"update_transaction": "Uppdatera transaktion",
"after_update_create_another": "Efter uppdaterat, \u00e5terkom hit f\u00f6r att forts\u00e4tta redigera.",
"store_as_new": "Spara en ny transaktion ist\u00e4llet f\u00f6r att uppdatera.",

View File

@@ -27,6 +27,7 @@
"category": "Kategori",
"attachments": "Ekler",
"notes": "Notlar",
"external_uri": "External URI",
"update_transaction": "Update transaction",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -27,6 +27,7 @@
"category": "Danh m\u1ee5c",
"attachments": "T\u1ec7p \u0111\u00ednh k\u00e8m",
"notes": "Ghi ch\u00fa",
"external_uri": "External URI",
"update_transaction": "C\u1eadp nh\u1eadt giao d\u1ecbch",
"after_update_create_another": "Sau khi c\u1eadp nh\u1eadt, quay l\u1ea1i \u0111\u00e2y \u0111\u1ec3 ti\u1ebfp t\u1ee5c ch\u1ec9nh s\u1eeda.",
"store_as_new": "L\u01b0u tr\u1eef nh\u01b0 m\u1ed9t giao d\u1ecbch m\u1edbi thay v\u00ec c\u1eadp nh\u1eadt.",

View File

@@ -27,6 +27,7 @@
"category": "\u5206\u7c7b",
"attachments": "\u9644\u52a0\u6863\u6848",
"notes": "\u6ce8\u91ca",
"external_uri": "External URI",
"update_transaction": "\u66f4\u65b0\u4ea4\u6613",
"after_update_create_another": "\u66f4\u65b0\u540e\uff0c\u8fd4\u56de\u6b64\u9875\u9762\u7ee7\u7eed\u7f16\u8f91\u3002",
"store_as_new": "\u4fdd\u5b58\u4e3a\u65b0\u4ea4\u6613\u800c\u4e0d\u662f\u66f4\u65b0\u6b64\u4ea4\u6613\u3002",

View File

@@ -27,6 +27,7 @@
"category": "\u5206\u985e",
"attachments": "\u9644\u52a0\u6a94\u6848",
"notes": "\u5099\u8a3b",
"external_uri": "External URI",
"update_transaction": "Update transaction",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Interní reference',
'pref_optional_tj_notes' => 'Poznámky',
'pref_optional_tj_attachments' => 'Přílohy',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Datumy',
'optional_field_meta_business' => 'Business',
'optional_field_attachments' => 'Přílohy',
'optional_field_meta_data' => 'Volitelná metadata',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Typ účtu',
'created_at' => 'Vytvořeno',
'account' => 'Účet',
'external_uri' => 'External URI',
'matchingAmount' => 'Částka',
'destination' => 'Cíl',
'source' => 'Zdroj',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Interner Verweis',
'pref_optional_tj_notes' => 'Notizen',
'pref_optional_tj_attachments' => 'Anhänge',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Daten',
'optional_field_meta_business' => 'Geschäftlich',
'optional_field_attachments' => 'Anhänge',
'optional_field_meta_data' => 'Optionale Metadaten',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Daten aus Firefly III löschen',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Kontotyp',
'created_at' => 'Erstellt am',
'account' => 'Konto',
'external_uri' => 'External URI',
'matchingAmount' => 'Betrag',
'destination' => 'Empfänger',
'source' => 'Quelle',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Εσωτερική αναφορά',
'pref_optional_tj_notes' => 'Σημειώσεις',
'pref_optional_tj_attachments' => 'Συνημμένα',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Ημερομηνίες',
'optional_field_meta_business' => 'Επιχείρηση',
'optional_field_attachments' => 'Συνημμένα',
'optional_field_meta_data' => 'Προαιρετικά μετα-δεδομένα',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Διαγραφή δεδομένων από το Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Τύπος λογαριασμού',
'created_at' => 'Δημιουργήθηκε στις',
'account' => 'Λογαριασμός',
'external_uri' => 'External URI',
'matchingAmount' => 'Ποσό',
'destination' => 'Προορισμός',
'source' => 'Προέλευση',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Internal reference',
'pref_optional_tj_notes' => 'Notes',
'pref_optional_tj_attachments' => 'Attachments',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Dates',
'optional_field_meta_business' => 'Business',
'optional_field_attachments' => 'Attachments',
'optional_field_meta_data' => 'Optional meta data',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Account type',
'created_at' => 'Created at',
'account' => 'Account',
'external_uri' => 'External URI',
'matchingAmount' => 'Amount',
'destination' => 'Destination',
'source' => 'Source',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Internal reference',
'pref_optional_tj_notes' => 'Notes',
'pref_optional_tj_attachments' => 'Attachments',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Dates',
'optional_field_meta_business' => 'Business',
'optional_field_attachments' => 'Attachments',
'optional_field_meta_data' => 'Optional meta data',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Account type',
'created_at' => 'Created at',
'account' => 'Account',
'external_uri' => 'External URI',
'matchingAmount' => 'Amount',
'destination' => 'Destination',
'source' => 'Source',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Referencia interna',
'pref_optional_tj_notes' => 'Notas',
'pref_optional_tj_attachments' => 'Adjuntos',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Fechas',
'optional_field_meta_business' => 'Negocios',
'optional_field_attachments' => 'Adjuntos',
'optional_field_meta_data' => 'Opcional meta datos',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Eliminar datos de Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Tipo de cuenta',
'created_at' => 'Fecha de creación',
'account' => 'Cuenta',
'external_uri' => 'External URI',
'matchingAmount' => 'Cantidad',
'destination' => 'Destino',
'source' => 'Origen',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Sisäinen viite',
'pref_optional_tj_notes' => 'Muistiinpanot',
'pref_optional_tj_attachments' => 'Liitteet',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Päivämäärät',
'optional_field_meta_business' => 'Yritys',
'optional_field_attachments' => 'Liitteet',
'optional_field_meta_data' => 'Valinnainen metatieto',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Tilin tyyppi',
'created_at' => 'Luotu',
'account' => 'Tili',
'external_uri' => 'External URI',
'matchingAmount' => 'Summa',
'destination' => 'Kohde',
'source' => 'Lähde',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Référence interne',
'pref_optional_tj_notes' => 'Notes',
'pref_optional_tj_attachments' => 'Pièces jointes',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Dates',
'optional_field_meta_business' => 'Commerce',
'optional_field_attachments' => 'Pièces jointes',
'optional_field_meta_data' => 'Métadonnées facultatives',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Supprimer des données de Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Type de compte',
'created_at' => 'Créé le',
'account' => 'Compte',
'external_uri' => 'External URI',
'matchingAmount' => 'Montant',
'destination' => 'Destination',
'source' => 'Source',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Belső hivatkozás',
'pref_optional_tj_notes' => 'Megjegyzések',
'pref_optional_tj_attachments' => 'Mellékletek',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Dátumok',
'optional_field_meta_business' => 'Üzleti',
'optional_field_attachments' => 'Mellékletek',
'optional_field_meta_data' => 'Opcionális metaadat',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Bankszámla típusa',
'created_at' => 'Létrehozva',
'account' => 'Bankszámla',
'external_uri' => 'External URI',
'matchingAmount' => 'Összeg',
'destination' => 'Cél',
'source' => 'Forrás',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Referensi internal',
'pref_optional_tj_notes' => 'Catatan',
'pref_optional_tj_attachments' => 'Lampiran',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Tanggal',
'optional_field_meta_business' => 'Bisnis',
'optional_field_attachments' => 'Lampiran',
'optional_field_meta_data' => 'Data meta opsional',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Jenis akun',
'created_at' => 'Dibuat di',
'account' => 'Akun',
'external_uri' => 'External URI',
'matchingAmount' => 'Jumlah',
'destination' => 'Tujuan',
'source' => 'Sumber',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Riferimento interno',
'pref_optional_tj_notes' => 'Note',
'pref_optional_tj_attachments' => 'Allegati',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Dati',
'optional_field_meta_business' => 'Attività commerciale',
'optional_field_attachments' => 'Allegati',
'optional_field_meta_data' => 'Metadati opzionali',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Elimina i dati da Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Tipo conto',
'created_at' => 'Creato il',
'account' => 'Conto',
'external_uri' => 'External URI',
'matchingAmount' => 'Importo',
'destination' => 'Destinazione',
'source' => 'Origine',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Intern referanse',
'pref_optional_tj_notes' => 'Notater',
'pref_optional_tj_attachments' => 'Vedlegg',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Datoer',
'optional_field_meta_business' => 'Bedrift',
'optional_field_attachments' => 'Vedlegg',
'optional_field_meta_data' => 'Valgfri metadata',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Kontotype',
'created_at' => 'Opprettet',
'account' => 'Konto',
'external_uri' => 'External URI',
'matchingAmount' => 'Beløp',
'destination' => 'Mål',
'source' => 'Kilde',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Interne verwijzing',
'pref_optional_tj_notes' => 'Notities',
'pref_optional_tj_attachments' => 'Bijlagen',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Data',
'optional_field_meta_business' => 'Zakelijk',
'optional_field_attachments' => 'Bijlagen',
'optional_field_meta_data' => 'Optionele meta-gegevens',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Gegevens verwijderen uit Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Accounttype',
'created_at' => 'Gemaakt op',
'account' => 'Rekening',
'external_uri' => 'External URI',
'matchingAmount' => 'Bedrag',
'destination' => 'Doel',
'source' => 'Bron',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Wewnętrzny numer',
'pref_optional_tj_notes' => 'Notatki',
'pref_optional_tj_attachments' => 'Załączniki',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Daty',
'optional_field_meta_business' => 'Biznesowe',
'optional_field_attachments' => 'Załączniki',
'optional_field_meta_data' => 'Opcjonalne metadane',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Usuń dane z Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Typ konta',
'created_at' => 'Utworzono',
'account' => 'Konto',
'external_uri' => 'External URI',
'matchingAmount' => 'Kwota',
'destination' => 'Cel',
'source' => 'Źródło',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Referência interna',
'pref_optional_tj_notes' => 'Notas',
'pref_optional_tj_attachments' => 'Anexos',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Datas',
'optional_field_meta_business' => 'Negócios',
'optional_field_attachments' => 'Anexos',
'optional_field_meta_data' => 'Meta dados opcionais',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Excluir dados do Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Tipo de conta',
'created_at' => 'Criado em',
'account' => 'Conta',
'external_uri' => 'External URI',
'matchingAmount' => 'Total',
'destination' => 'Destino',
'source' => 'Fonte',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Referință internă',
'pref_optional_tj_notes' => 'Notițe',
'pref_optional_tj_attachments' => 'Ataşamente',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Date',
'optional_field_meta_business' => 'Afaceri',
'optional_field_attachments' => 'Ataşamente',
'optional_field_meta_data' => 'Meta date opționale',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Tip de cont',
'created_at' => 'Creat la',
'account' => 'Cont',
'external_uri' => 'External URI',
'matchingAmount' => 'Sumă',
'destination' => 'Destinație',
'source' => 'Sursă',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Внутренняя ссылка',
'pref_optional_tj_notes' => 'Заметки',
'pref_optional_tj_attachments' => 'Вложения',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Даты',
'optional_field_meta_business' => 'Бизнес',
'optional_field_attachments' => 'Вложения',
'optional_field_meta_data' => 'Расширенные данные',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Удалить данные из Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Тип профиля',
'created_at' => 'Создан',
'account' => 'Счёт',
'external_uri' => 'External URI',
'matchingAmount' => 'Сумма',
'destination' => 'Получатель',
'source' => 'Источник',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Intern referens',
'pref_optional_tj_notes' => 'Anteckningar',
'pref_optional_tj_attachments' => 'Bilagor',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Datum',
'optional_field_meta_business' => 'Affärsverksamhet',
'optional_field_attachments' => 'Bilagor',
'optional_field_meta_data' => 'Valfri metadata',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Kontotyp',
'created_at' => 'Skapad den',
'account' => 'Konto',
'external_uri' => 'External URI',
'matchingAmount' => 'Belopp',
'destination' => 'Destination',
'source' => 'Källa',

View File

@@ -621,10 +621,12 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
'pref_optional_tj_internal_reference' => 'Dahili referans',
'pref_optional_tj_notes' => 'Notlar',
'pref_optional_tj_attachments' => 'Ekler',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Tarih',
'optional_field_meta_business' => 'İş',
'optional_field_attachments' => 'Ekler',
'optional_field_meta_data' => 'İsteğe bağlı meta veriler',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -46,6 +46,7 @@ return [
'account_type' => 'Hesap Türü',
'created_at' => 'Tarihinde oluşturuldu',
'account' => 'Hesap',
'external_uri' => 'External URI',
'matchingAmount' => 'Miktar',
'destination' => 'Hedef',
'source' => 'Kaynak',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => 'Tài liệu tham khảo nội bộ',
'pref_optional_tj_notes' => 'Ghi chú',
'pref_optional_tj_attachments' => 'Tài liệu đính kèm',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => 'Ngày',
'optional_field_meta_business' => 'Kinh doanh',
'optional_field_attachments' => 'Tài liệu đính kèm',
'optional_field_meta_data' => 'Dữ liệu meta tùy chọn',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => 'Loại tài khoản',
'created_at' => 'Được tạo tại',
'account' => 'Tài khoản',
'external_uri' => 'External URI',
'matchingAmount' => 'Số tiền',
'destination' => 'Nơi đến',
'source' => 'Nơi gửi',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => '内部参考',
'pref_optional_tj_notes' => '注释',
'pref_optional_tj_attachments' => '附加档案',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => '日期',
'optional_field_meta_business' => '商务',
'optional_field_attachments' => '附加档案',
'optional_field_meta_data' => '可选后设资料',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => '帐户类型',
'created_at' => '建立于',
'account' => '帐户',
'external_uri' => 'External URI',
'matchingAmount' => '金额',
'destination' => '目标',
'source' => '来源',

View File

@@ -619,10 +619,12 @@ return [
'pref_optional_tj_internal_reference' => '內部參照',
'pref_optional_tj_notes' => '備註',
'pref_optional_tj_attachments' => '附加檔案',
'pref_optional_tj_external_uri' => 'External URI',
'optional_field_meta_dates' => '日期',
'optional_field_meta_business' => '商務',
'optional_field_attachments' => '附加檔案',
'optional_field_meta_data' => '可選中繼資料',
'external_uri' => 'External URI',
// profile:
'delete_stuff_header' => 'Delete data from Firefly III',

View File

@@ -45,6 +45,7 @@ return [
'account_type' => '帳戶類型',
'created_at' => '建立於',
'account' => '帳戶',
'external_uri' => 'External URI',
'matchingAmount' => '金額',
'destination' => '目標',
'source' => '來源',

View File

@@ -111,6 +111,7 @@
<h4>{{ 'optional_tj_business_fields'|_ }}</h4>
{{ ExpandedForm.checkbox('tj[internal_reference]','1', tjOptionalFields.internal_reference,{ 'label' : 'pref_optional_tj_internal_reference'|_ }) }}
{{ ExpandedForm.checkbox('tj[external_uri]','1', tjOptionalFields.external_uri,{ 'label' : 'pref_optional_tj_external_uri'|_ }) }}
{{ ExpandedForm.checkbox('tj[notes]','1', tjOptionalFields.notes,{ 'label' : 'pref_optional_tj_notes'|_ }) }}
<h4>{{ 'optional_tj_attachment_fields'|_ }}</h4>

View File

@@ -248,11 +248,25 @@
</tr>
{% endif %}
{% endfor %}
{% for metaField in ['external_id','bunq_payment_id','internal_reference','sepa_batch_id','sepa_ct_id','sepa_ct_op','sepa_db','sepa_country','sepa_cc','sepa_ep','sepa_ci'] %}
{% for metaField in ['external_id','bunq_payment_id','internal_reference','sepa_batch_id','sepa_ct_id','sepa_ct_op','sepa_db','sepa_country','sepa_cc','sepa_ep','sepa_ci','external_uri'] %}
{% if journalHasMeta(journal.transaction_journal_id, metaField) %}
<tr>
<td>{{ trans('list.'~metaField) }}</td>
<td>{{ journalGetMetaField(journal.transaction_journal_id, metaField) }}</td>
<td>
{% if 'external_uri' == metaField %}
{% set uri = journalGetMetaField(journal.transaction_journal_id, metaField) %}
<a href="{{ uri }}" rel="noopener noreferrer nofollow" target="_blank">
{% if uri|length > 60 %}
{{ uri|slice(0, 60) ~ '...' }}
{% else %}
{{ uri }}
{% endif %}
</a>
{% endif %}
{% if 'external_uri' != metaField %}
{{ journalGetMetaField(journal.transaction_journal_id, metaField) }}
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %}
@@ -373,7 +387,7 @@
{% block scripts %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var modalDialogURI = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';
var acURI = '{{ route('json.autocomplete.all-journals-with-id') }}';
var acURI = '{{ route('api.v1.autocomplete.transactions-with-id') }}';
var groupURI = '{{ route('transactions.show',['%GROUP%']) }}';
var newCloneInstructions = '{{ 'new_clone_instructions'|_|escape('js') }}';
</script>

View File

@@ -2453,9 +2453,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.488:
version "1.3.504"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.504.tgz#54d6288202f8453053c006eb862e2e3b7bc867a5"
integrity sha512-yOXnuPaaLAIZUVuXHYDCo3EeaiEfbFgYWCPH1tBMp+jznCq/zQYKnf6HmkKBmLJ0VES81avl18JZO1lx/XAHOw==
version "1.3.505"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.505.tgz#0e55edbdfc13700b6742a73c81c0af7d0d71364f"
integrity sha512-Aunrp3HWtmdiJLIl+IPSFtEvJ/4Q9a3eKaxmzCthaZF1gbTbpHUTCU2zOVnFPH7r/AD7zQXyuFidYXzSHXBdsw==
elliptic@^6.0.0, elliptic@^6.5.2:
version "6.5.3"
@@ -4459,9 +4459,9 @@ node-notifier@^5.1.2:
which "^1.3.0"
node-releases@^1.1.58:
version "1.1.59"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.59.tgz#4d648330641cec704bff10f8e4fe28e453ab8e8e"
integrity sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw==
version "1.1.60"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
normalize-path@^2.1.1:
version "2.1.1"