IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing external url field.

Browse Source
This commit is contained in:
James Cole 2022-01-24 07:50:33 +01:00
parent 75d52b7024
commit 7718deb4a5
41 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Requests/Models/Transaction/StoreRequest.php
View File

@ -137,7 +137,7 @@ class StoreRequest 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->clearString((string)$object['bunq_payment_id'], false),
'external_uri' => $this->clearString((string)$object['external_uri'], false),
'external_url' => $this->clearString((string)$object['external_url'], false),
'sepa_cc' => $this->clearString((string)$object['sepa_cc'], false),
'sepa_ct_op' => $this->clearString((string)$object['sepa_ct_op'], false),
@ -228,7 +228,7 @@ class StoreRequest 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',
'transactions.*.external_url' => 'min:1,max:255|nullable|url',
// SEPA fields:
'transactions.*.sepa_cc' => 'min:1,max:255|nullable',

4
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
View File

@ -113,7 +113,7 @@ class UpdateRequest extends FormRequest
'sepa_ep',
'sepa_ci',
'sepa_batch_id',
'external_uri',
'external_url',
];
$this->booleanFields = [
'reconciled',
@ -335,7 +335,7 @@ class UpdateRequest 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',
'transactions.*.external_url' => 'min:1,max:255|nullable|url',
// SEPA fields:
'transactions.*.sepa_cc' => 'min:1,max:255|nullable',

2
app/Http/Controllers/PreferencesController.php
View File

@ -214,7 +214,7 @@ class PreferencesController extends Controller
'internal_reference' => array_key_exists('internal_reference', $setOptions),
'notes' => array_key_exists('notes', $setOptions),
'attachments' => array_key_exists('attachments', $setOptions),
'external_uri' => array_key_exists('external_uri', $setOptions),
'external_url' => array_key_exists('external_url', $setOptions),
'location' => array_key_exists('location', $setOptions),
'links' => array_key_exists('links', $setOptions),
];

2
app/Services/Internal/Update/JournalUpdateService.php
View File

@ -84,7 +84,7 @@ class JournalUpdateService
$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', 'external_uri'];
'internal_reference', 'bunq_payment_id', 'external_id', 'external_url'];
$this->metaDate = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date',];
}

2
app/Support/Export/ExportDataGenerator.php
View File

@ -709,7 +709,7 @@ class ExportDataGenerator
$metaData['sepa_ep'],
$metaData['sepa_ci'],
$metaData['sepa_batch_id'],
$metaData['external_uri'],
$metaData['external_url'],
// dates
$metaData['interest_date'],

4
app/Transformers/TransactionGroupTransformer.php
View File

@ -58,7 +58,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', 'external_uri',
'recurrence_id', 'external_id', 'original_source', 'external_url',
'recurrence_count', 'recurrence_total',
];
$this->metaDateFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
@ -189,7 +189,7 @@ class TransactionGroupTransformer extends AbstractTransformer
'recurrence_total' => $this->integerFromArray($metaFieldData->getArrayCopy(), 'recurrence_total'),
'recurrence_count' => $this->integerFromArray($metaFieldData->getArrayCopy(), 'recurrence_count'),
'bunq_payment_id' => $metaFieldData['bunq_payment_id'],
'external_uri' => $metaFieldData['external_uri'],
'external_url' => $metaFieldData['external_url'],
'import_hash_v2' => $metaFieldData['import_hash_v2'],
'sepa_cc' => $metaFieldData['sepa_cc'],

2
config/firefly.php
View File

@ -864,7 +864,7 @@ return [
// sepa
'sepa_cc', 'sepa_ct_op', 'sepa_ct_id',
'sepa_db', 'sepa_country', 'sepa_ep',
'sepa_ci', 'sepa_batch_id', 'external_uri',
'sepa_ci', 'sepa_batch_id', 'external_url',
// dates
'interest_date', 'book_date', 'process_date',

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -673,7 +673,7 @@ export default {
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
external_url: [],
},
};
}
@ -776,7 +776,7 @@ export default {
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
external_url: [],
},
},
budget: 0,
@ -792,7 +792,7 @@ export default {
"internal_reference": "",
"notes": "",
"attachments": [],
"external_uri": "",
"external_url": "",
},
foreign_amount: {
amount: "",

6
resources/assets/js/components/transactions/CustomTransactionFields.vue
View File

@ -59,8 +59,8 @@
<component
v-bind:is="uriComponent"
v-if="this.fields.external_uri" v-model="value.external_uri" :error="error.external_uri"
name="external_uri[]" v-bind:title="$t('firefly.external_uri')"></component>
v-if="this.fields.external_url" v-model="value.external_url" :error="error.external_url"
name="external_url[]" v-bind:title="$t('firefly.external_url')"></component>
<component
v-bind:is="textareaComponent"
@ -90,7 +90,7 @@ export default {
"internal_reference": false,
"notes": false,
"attachments": false,
"external_uri": false
"external_url": false
}
]
};

14
resources/assets/js/components/transactions/EditTransaction.vue
View File

@ -437,7 +437,7 @@ export default {
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
external_url: [],
},
},
budget: transaction.budget_id,
@ -452,7 +452,7 @@ export default {
invoice_date: transaction.invoice_date,
internal_reference: transaction.internal_reference,
notes: transaction.notes,
external_uri: transaction.external_uri
external_url: transaction.external_url
},
foreign_amount: {
amount: this.roundNumber(this.positiveAmount(transaction.foreign_amount), transaction.foreign_currency_decimal_places),
@ -640,7 +640,7 @@ export default {
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,
external_url: row.custom_fields.external_url,
notes: row.custom_fields.notes,
tags: tagList
};
@ -877,7 +877,7 @@ export default {
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
external_url: [],
},
},
budget: 0,
@ -893,7 +893,7 @@ export default {
"internal_reference": "",
"notes": "",
"attachments": [],
"external_uri": "",
"external_url": "",
},
foreign_amount: {
amount: "",
@ -965,7 +965,7 @@ export default {
case 'tags':
this.transactions[transactionIndex].errors[fieldName] = errors.errors[key];
break;
case 'external_uri':
case 'external_url':
//console.log('Found ext error in field "' + fieldName + '": ' + errors.errors[key]);
this.transactions[transactionIndex].errors.custom_errors[fieldName] = errors.errors[key];
break;
@ -1021,7 +1021,7 @@ export default {
internal_reference: [],
notes: [],
attachments: [],
external_uri: [],
external_url: [],
},
};
}

2
resources/assets/js/locales/bg.json
View File

@ -30,7 +30,7 @@
"category": "\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
"attachments": "\u041f\u0440\u0438\u043a\u0430\u0447\u0435\u043d\u0438 \u0444\u0430\u0439\u043b\u043e\u0432\u0435",
"notes": "\u0411\u0435\u043b\u0435\u0436\u043a\u0438",
"external_uri": "External URL",
"external_url": "External URL",
"update_transaction": "\u041e\u0431\u043d\u043e\u0432\u0438 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0442\u0430",
"after_update_create_another": "\u0421\u043b\u0435\u0434 \u043e\u0431\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u0441\u0435 \u0432\u044a\u0440\u043d\u0435\u0442\u0435 \u0442\u0443\u043a, \u0437\u0430 \u0434\u0430 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u0441 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044f\u0442\u0430.",
"store_as_new": "\u0421\u044a\u0445\u0440\u0430\u043d\u0435\u0442\u0435 \u043a\u0430\u0442\u043e \u043d\u043e\u0432\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f, \u0432\u043c\u0435\u0441\u0442\u043e \u0434\u0430 \u044f \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u0442\u0435.",

2
resources/assets/js/locales/cs.json
View File

@ -30,7 +30,7 @@
"category": "Kategorie",
"attachments": "P\u0159\u00edlohy",
"notes": "Pozn\u00e1mky",
"external_uri": "Extern\u00ed URL",
"external_url": "Extern\u00ed URL adresa",
"update_transaction": "Aktualizovat transakci",
"after_update_create_another": "After updating, return here to continue editing.",
"store_as_new": "Store as a new transaction instead of updating.",

2
resources/assets/js/locales/de.json
View File

@ -30,7 +30,7 @@
"category": "Kategorie",
"attachments": "Anh\u00e4nge",
"notes": "Notizen",
"external_uri": "Externe URL",
"external_url": "Externe URL",
"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.",

2
resources/assets/js/locales/el.json
View File

@ -30,7 +30,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": "\u0395\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc URL",
"external_url": "\u0395\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc URL",
"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.",

2
resources/assets/js/locales/en-gb.json
View File

@ -30,7 +30,7 @@
"category": "Category",
"attachments": "Attachments",
"notes": "Notes",
"external_uri": "External URL",
"external_url": "External URL",
"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.",

2
resources/assets/js/locales/en.json
View File

@ -30,7 +30,7 @@
"category": "Category",
"attachments": "Attachments",
"notes": "Notes",
"external_uri": "External URL",
"external_url": "External URL",
"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.",

2
resources/assets/js/locales/es.json
View File

@ -30,7 +30,7 @@
"category": "Categoria",
"attachments": "Archivos adjuntos",
"notes": "Notas",
"external_uri": "URL externa",
"external_url": "URL externa",
"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.",

32
resources/assets/js/locales/fi.json
View File

@ -7,13 +7,13 @@
"split_transaction_title": "Jaetun tapahtuman kuvaus",
"errors_submission": "There was something wrong with your submission. Please check out the errors.",
"split": "Jaa",
"single_split": "Split",
"single_split": "Jako",
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
"transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> (\"{title}\") has been updated.",
"transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
"transaction_journal_information": "Tapahtumatiedot",
"no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
"no_bill_pointer": "You seem to have no bills yet. You should create some on the <a href=\"bills\">bills<\/a>-page. Bills can help you keep track of expenses.",
"no_budget_pointer": "Sinulla ei n\u00e4yt\u00e4 olevan viel\u00e4 budjetteja. Sinun pit\u00e4isi luoda joitakin <a href=\"budgets\">budjetit<\/a>-sivulla. Budjetit auttavat sinua pit\u00e4m\u00e4\u00e4n kirjaa kuluista.",
"no_bill_pointer": "Sinulla ei n\u00e4yt\u00e4 olevan viel\u00e4 laskuja. Sinun pit\u00e4isi luoda joitakin <a href=\"bills\">laskut<\/a>-sivulla. Laskut auttavat sinua pit\u00e4m\u00e4\u00e4n kirjaa kuluista.",
"source_account": "L\u00e4hdetili",
"hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
"destination_account": "Kohdetili",
@ -26,11 +26,11 @@
"date": "P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4",
"tags": "T\u00e4git",
"no_budget": "(ei budjettia)",
"no_bill": "(no bill)",
"no_bill": "(ei laskua)",
"category": "Kategoria",
"attachments": "Liitteet",
"notes": "Muistiinpanot",
"external_uri": "External URL",
"external_url": "Ulkoinen URL",
"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.",
@ -52,8 +52,8 @@
"profile_whoops": "Hupsis!",
"profile_something_wrong": "Jokin meni vikaan!",
"profile_try_again": "Jokin meni vikaan. Yrit\u00e4 uudelleen.",
"profile_oauth_clients": "OAuth Clients",
"profile_oauth_no_clients": "You have not created any OAuth clients.",
"profile_oauth_clients": "OAuth Asiakkaat",
"profile_oauth_no_clients": "Et ole luonut yht\u00e4\u00e4n OAuth-asiakasta.",
"profile_oauth_clients_header": "Asiakasohjelmat",
"profile_oauth_client_id": "Asiakastunnus",
"profile_oauth_client_name": "Nimi",
@ -64,14 +64,14 @@
"profile_oauth_name_help": "Jotain k\u00e4ytt\u00e4jillesi tuttua ja luotettavaa.",
"profile_oauth_redirect_url": "URL:n uudelleenohjaus",
"profile_oauth_redirect_url_help": "Your application's authorization callback URL.",
"profile_authorized_apps": "Authorized applications",
"profile_authorized_clients": "Authorized clients",
"profile_authorized_apps": "Valtuutetut sovellukset",
"profile_authorized_clients": "Valtuutetut asiakkaat",
"profile_scopes": "Scopes",
"profile_revoke": "Peruuta",
"profile_personal_access_tokens": "Henkil\u00f6kohtaiset K\u00e4ytt\u00f6oikeuskoodit",
"profile_personal_access_token": "Henkil\u00f6kohtainen K\u00e4ytt\u00f6oikeuskoodi",
"profile_personal_access_token_explanation": "Here is your new personal access token. This is the only time it will be shown so don't lose it! You may now use this token to make API requests.",
"profile_no_personal_access_token": "You have not created any personal access tokens.",
"profile_personal_access_token_explanation": "T\u00e4ss\u00e4 on uusi henkil\u00f6kohtainen p\u00e4\u00e4sytunnuksesi. T\u00e4m\u00e4 on ainoa kerta, kun se n\u00e4ytet\u00e4\u00e4n, joten \u00e4l\u00e4 h\u00e4vit\u00e4 sit\u00e4! Voit nyt k\u00e4ytt\u00e4\u00e4 t\u00e4t\u00e4 tunnusta tehd\u00e4ksesi API-pyynt\u00f6j\u00e4.",
"profile_no_personal_access_token": "Et ole luonut henkil\u00f6kohtaisia k\u00e4ytt\u00f6oikeustunnuksia.",
"profile_create_new_token": "Luo uusi tunnus",
"profile_create_token": "Luo tunnus",
"profile_create": "Luo",
@ -80,12 +80,12 @@
"piggy_bank": "S\u00e4\u00e4st\u00f6possu",
"profile_oauth_client_secret_title": "Client Secret",
"profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
"profile_oauth_confidential": "Confidential",
"profile_oauth_confidential": "Luottamuksellinen",
"profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
"multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
"multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
"multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",
"multi_account_warning_transfer": "Keep in mind that the source + destination account of subsequent splits will be overruled by whatever is defined in the first split of the transfer."
"multi_account_warning_unknown": "Riippuen luomasi tapahtuman tyypist\u00e4, my\u00f6hempien jaotteluiden l\u00e4hde- ja\/tai kohdetilin tyyppi voidaan kumota sen mukaan, mit\u00e4 on m\u00e4\u00e4ritelty tapahtuman ensimm\u00e4isess\u00e4 jaossa.",
"multi_account_warning_withdrawal": "Muista, ett\u00e4 my\u00f6hempien jakojen l\u00e4hdetili m\u00e4\u00e4r\u00e4ytyy noston ensimm\u00e4isen jaon m\u00e4\u00e4ritysten mukaan.",
"multi_account_warning_deposit": "Muista, ett\u00e4 my\u00f6hempien jakojen kohdetili m\u00e4\u00e4r\u00e4ytyy talletuksen ensimm\u00e4isen jaon m\u00e4\u00e4ritysten mukaan.",
"multi_account_warning_transfer": "Muista, ett\u00e4 my\u00f6hempien jakojen l\u00e4hde- ja kohdetili m\u00e4\u00e4r\u00e4ytyv\u00e4t ensimm\u00e4isen jaon m\u00e4\u00e4ritysten mukaan."
},
"form": {
"interest_date": "Korkop\u00e4iv\u00e4",

2
resources/assets/js/locales/fr.json
View File

@ -30,7 +30,7 @@
"category": "Cat\u00e9gorie",
"attachments": "Pi\u00e8ces jointes",
"notes": "Notes",
"external_uri": "URL externe",
"external_url": "URL externe",
"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.",

2
resources/assets/js/locales/hu.json
View File

@ -30,7 +30,7 @@
"category": "Kateg\u00f3ria",
"attachments": "Mell\u00e9kletek",
"notes": "Megjegyz\u00e9sek",
"external_uri": "External URL",
"external_url": "External URL",
"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.",

2
resources/assets/js/locales/it.json
View File

@ -30,7 +30,7 @@
"category": "Categoria",
"attachments": "Allegati",
"notes": "Note",
"external_uri": "URL esterno",
"external_url": "URL esterno",
"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.",

2
resources/assets/js/locales/ja.json
View File

@ -30,7 +30,7 @@
"category": "\u30ab\u30c6\u30b4\u30ea",
"attachments": "\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb",
"notes": "\u5099\u8003",
"external_uri": "\u5916\u90e8 URL",
"external_url": "\u5916\u90e8 URL",
"update_transaction": "\u30c1\u30e3\u30f3\u30cd\u30eb\u3092\u66f4\u65b0",
"after_update_create_another": "\u4fdd\u5b58\u5f8c\u3001\u3053\u3053\u3078\u623b\u3063\u3066\u304d\u3066\u304f\u3060\u3055\u3044\u3002",
"store_as_new": "\u65b0\u3057\u3044\u53d6\u5f15\u3092\u4fdd\u5b58",

2
resources/assets/js/locales/nb.json
View File

@ -30,7 +30,7 @@
"category": "Kategori",
"attachments": "Vedlegg",
"notes": "Notater",
"external_uri": "External URL",
"external_url": "External URL",
"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.",

2
resources/assets/js/locales/nl.json
View File

@ -30,7 +30,7 @@
"category": "Categorie",
"attachments": "Bijlagen",
"notes": "Notities",
"external_uri": "Externe URL",
"external_url": "Externe URL",
"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.",

2
resources/assets/js/locales/pl.json
View File

@ -30,7 +30,7 @@
"category": "Kategoria",
"attachments": "Za\u0142\u0105czniki",
"notes": "Notatki",
"external_uri": "Zewn\u0119trzny adres URL",
"external_url": "Zewn\u0119trzny adres URL",
"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.",

2
resources/assets/js/locales/pt-br.json
View File

@ -30,7 +30,7 @@
"category": "Categoria",
"attachments": "Anexos",
"notes": "Notas",
"external_uri": "URL externa",
"external_url": "URL externa",
"update_transaction": "Atualizar transa\u00e7\u00e3o",
"after_update_create_another": "Depois de atualizar, retorne aqui para continuar editando.",
"store_as_new": "Armazene como uma nova transa\u00e7\u00e3o em vez de atualizar.",

2
resources/assets/js/locales/pt.json
View File

@ -30,7 +30,7 @@
"category": "Categoria",
"attachments": "Anexos",
"notes": "Notas",
"external_uri": "URL Externo",
"external_url": "URL Externo",
"update_transaction": "Actualizar transac\u00e7\u00e3o",
"after_update_create_another": "Ap\u00f3s a atualiza\u00e7\u00e3o, regresse aqui para continuar a editar.",
"store_as_new": "Guarde como uma nova transa\u00e7\u00e3o em vez de atualizar.",

2
resources/assets/js/locales/ro.json
View File

@ -30,7 +30,7 @@
"category": "Categorie",
"attachments": "Ata\u0219amente",
"notes": "Noti\u021be",
"external_uri": "URL extern",
"external_url": "URL extern",
"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.",

2
resources/assets/js/locales/ru.json
View File

@ -30,7 +30,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": "\u0412\u043d\u0435\u0448\u043d\u0438\u0439 URL",
"external_url": "\u0412\u043d\u0435\u0448\u043d\u0438\u0439 URL-\u0430\u0434\u0440\u0435\u0441",
"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.",

2
resources/assets/js/locales/sk.json
View File

@ -30,7 +30,7 @@
"category": "Kateg\u00f3ria",
"attachments": "Pr\u00edlohy",
"notes": "Pozn\u00e1mky",
"external_uri": "Extern\u00e1 URL",
"external_url": "Extern\u00e1 URL",
"update_transaction": "Upravi\u0165 transakciu",
"after_update_create_another": "Po aktualiz\u00e1cii sa vr\u00e1ti\u0165 sp\u00e4\u0165 a pokra\u010dova\u0165 v \u00faprav\u00e1ch.",
"store_as_new": "Namiesto aktualiz\u00e1cie ulo\u017ei\u0165 ako nov\u00fa transakciu.",

2
resources/assets/js/locales/sv.json
View File

@ -30,7 +30,7 @@
"category": "Kategori",
"attachments": "Bilagor",
"notes": "Noteringar",
"external_uri": "Extern URL",
"external_url": "Extern URL",
"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.",

2
resources/assets/js/locales/vi.json
View File

@ -30,7 +30,7 @@
"category": "Danh m\u1ee5c",
"attachments": "T\u1ec7p \u0111\u00ednh k\u00e8m",
"notes": "Ghi ch\u00fa",
"external_uri": "URL b\u00ean ngo\u00e0i",
"external_url": "URL b\u00ean ngo\u00e0i",
"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.",

2
resources/assets/js/locales/zh-cn.json
View File

@ -30,7 +30,7 @@
"category": "\u5206\u7c7b",
"attachments": "\u9644\u4ef6",
"notes": "\u5907\u6ce8",
"external_uri": "\u5916\u90e8\u94fe\u63a5",
"external_url": "\u5916\u90e8\u94fe\u63a5",
"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",

2
resources/assets/js/locales/zh-tw.json
View File

@ -30,7 +30,7 @@
"category": "\u5206\u985e",
"attachments": "\u9644\u52a0\u6a94\u6848",
"notes": "\u5099\u8a3b",
"external_uri": "External URL",
"external_url": "External URL",
"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.",

4
resources/lang/en_US/firefly.php
View File

@ -711,14 +711,14 @@ return [
'pref_optional_tj_internal_reference' => 'Internal reference',
'pref_optional_tj_notes' => 'Notes',
'pref_optional_tj_attachments' => 'Attachments',
'pref_optional_tj_external_uri' => 'External URL',
'pref_optional_tj_external_url' => 'External URL',
'pref_optional_tj_location' => 'Location',
'pref_optional_tj_links' => 'Transaction links',
'optional_field_meta_dates' => 'Dates',
'optional_field_meta_business' => 'Business',
'optional_field_attachments' => 'Attachments',
'optional_field_meta_data' => 'Optional meta data',
'external_uri' => 'External URL',
'external_url' => 'External URL',
// profile:
'delete_stuff_header' => 'Delete data',

2
resources/lang/en_US/list.php
View File

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

2
resources/views/v1/preferences/index.twig
View File

@ -109,7 +109,7 @@
<h4>{{ 'optional_tj_other_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[external_url]','1', tjOptionalFields.external_url,{ 'label' : 'pref_optional_tj_external_url'|_ }) }}
{{ ExpandedForm.checkbox('tj[notes]','1', tjOptionalFields.notes,{ 'label' : 'pref_optional_tj_notes'|_ }) }}
{{ ExpandedForm.checkbox('tj[location]','1', tjOptionalFields.location,{ 'label' : 'pref_optional_tj_location'|_ }) }}
{{ ExpandedForm.checkbox('tj[links]','1', tjOptionalFields.links,{ 'label' : 'pref_optional_tj_links'|_ }) }}

6
resources/views/v1/transactions/show.twig
View File

@ -289,12 +289,12 @@
</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','external_uri'] %}
{% 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_url'] %}
{% if journalHasMeta(journal.transaction_journal_id, metaField) %}
<tr>
<td>{{ trans('list.'~metaField) }}</td>
<td>
{% if 'external_uri' == metaField %}
{% if 'external_url' == metaField %}
{% set uri = journalGetMetaField(journal.transaction_journal_id, metaField) %}
<a href="{{ uri }}" rel="noopener noreferrer nofollow" target="_blank">
{% if uri|length > 60 %}
@ -304,7 +304,7 @@
{% endif %}
</a>
{% endif %}
{% if 'external_uri' != metaField %}
{% if 'external_url' != metaField %}
{{ journalGetMetaField(journal.transaction_journal_id, metaField) }}
{% endif %}
</td>