Add translations, fix error message.

This commit is contained in:
James Cole
2024-03-24 12:07:26 +01:00
parent bcfb134b6e
commit 46c49ddbd8
76 changed files with 297 additions and 26 deletions

View File

@@ -1,4 +1,5 @@
<div :class="{'tab-pane fade pt-2':true, 'show active': index ===0}" :id="'split-'+index+'-pane'" role="tabpanel" :aria-labelledby="'split-'+index+'-tab'" tabindex="0" x-init="addedSplit()">
<div :class="{'tab-pane fade pt-2':true, 'show active': index ===0}" :id="'split-'+index+'-pane'" role="tabpanel"
:aria-labelledby="'split-'+index+'-tab'" tabindex="0" x-init="addedSplit()">
<div class="row mb-2">
<div class="col-xl-6 col-lg-6 col-md-12 col-xs-12 mb-2">
<!-- BASIC TRANSACTION INFORMATION -->
@@ -109,19 +110,23 @@
<div class="card-footer">
<div class="row">
<div class="col text-end">
<button class="btn btn-success" :disabled="formStates.isSubmitting" @click="submitTransaction()">Submit</button>
<div class="btn-group">
<template x-if="1 !== entries.length">
<button :disabled="formStates.isSubmitting" class="btn btn-danger text-white"
@click="removeSplit(index)">{{ __('firefly.transaction_remove_split') }}</button>
</template>
<button @click="addSplit()" class="btn btn-info"
:disabled="formStates.isSubmitting">{{ __('firefly.add_another_split') }}</button>
<button class="btn btn-success text-white" :disabled="formStates.isSubmitting"
@click="submitTransaction()">{{ __('firefly.submit') }}</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12">
<template x-if="0 !== index">
<button :disabled="formStates.isSubmitting" class="btn btn-danger" @click="removeSplit(index)">
Remove this split
</button>
</template>
<button class="btn btn-info" :disabled="formStates.isSubmitting">Add another split</button>
</div>
</div>
</div>

View File

@@ -23,6 +23,7 @@
:data-index="index"
:class="{'is-invalid': transaction.errors.amount.length > 0, 'input-mask' : true, 'form-control': true}"
x-model="transaction.amount"
@keyup.enter="submitTransaction()"
@change="changedAmount"
placeholder="0.00">
<template x-if="transaction.errors.amount.length > 0">

View File

@@ -12,6 +12,7 @@
<select class="form-control"
:id="'budget_id_' + index"
x-model="transaction.budget_id"
@keyup.enter="submitTransaction()"
>
<template x-for="budget in formData.budgets">
<option :label="budget.name" :value="budget.id" :selected="budget.id == transaction.budget_id"

View File

@@ -6,6 +6,7 @@
<input type="search"
class="form-control ac-category"
:id="'category_name_' + index"
@keyup.enter="submitTransaction()"
x-model="transaction.category_name"
:data-index="index"
placeholder="{{ __('firefly.category') }}">

View File

@@ -5,6 +5,7 @@
<div class="col-sm-10">
<input type="datetime-local" class="form-control" :id="'date_' + index"
@change="changedDateTime"
@keyup.enter="submitTransaction()"
x-model="transaction.date"
>
</div>

View File

@@ -6,6 +6,7 @@
<input type="text" class="form-control ac-description"
:id="'description_' + index"
@change="changedDescription"
@keyup.enter="submitTransaction()"
x-model="transaction.description"
:class="{'is-invalid': transaction.errors.description.length > 0, 'form-control': true}"
:data-index="index"

View File

@@ -11,6 +11,7 @@
<template x-if="!formStates.loadingPiggyBanks">
<select class="form-control"
:id="'piggy_bank_id_' + index"
@keyup.enter="submitTransaction()"
x-model="transaction.piggy_bank_id">
<template x-for="group in formData.piggyBanks">
<optgroup :label="group.name">

View File

@@ -34,6 +34,6 @@
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" id="webhookButton" :checked="formStates.webhookButton">
<label class="form-check-label" for="webhookButton">{{ __('firefly.fire_webhooks_checkbox') }}</label>
<input class="form-check-input" type="checkbox" id="webhooksButton" :checked="formStates.webhooksButton">
<label class="form-check-label" for="webhooksButton">{{ __('firefly.fire_webhooks_checkbox') }}</label>
</div>

View File

@@ -10,6 +10,7 @@
<template x-if="!formStates.loadingSubscriptions">
<select class="form-control"
:id="'bill_id_' + index"
@keyup.enter="submitTransaction()"
x-model="transaction.bill_id">
<template x-for="group in formData.subscriptions">
<optgroup :label="group.name">

View File

@@ -18,11 +18,6 @@
:optionalDateFields="$optionalDateFields"></x-transaction-split>
</template>
</div>
<div class="row">
<div class="col text-end">
<button class="btn btn-success" :disabled="formStates.isSubmitting" @click="submitTransaction()">Submit</button>
</div>
</div>
</div>
</div>