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

Expand create transaction form.

Browse Source
This commit is contained in:
James Cole
2024-01-04 14:59:37 +01:00
parent 1ba7847d84
commit 566bb2f097
26 changed files with 877 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
resources/views/v2/components/messages.blade.php
View File

@@ -1,21 +1,32 @@
<div class="row mb-2">
<div class="col">
<template x-if="showSuccessMessage">
<template x-if="notifications.success.show">
<div class="alert alert-success alert-dismissible fade show" role="alert">
<a :href="successMessageLink" class="alert-link" x-text="successMessageText"></a>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
<template x-if="notifications.success.url != ''">
<a :href="notifications.success.url" class="alert-link" x-text="notifications.success.text"></a>
</template>
<template x-if="notifications.success.url == ''">
<span x-text="notifications.success.text"></span>
</template>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</template>
<template x-if="showErrorMessage">
<div class="alert alert-danger alert-dismissible fade show" role="alert"
x-text="errorMessageText">
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
<template x-if="notifications.error.show">
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<template x-if="notifications.error.url != ''">
<a :href="notifications.error.url" class="alert-link" x-text="notifications.error.text"></a>
</template>
<template x-if="notifications.error.url == ''">
<span x-text="notifications.error.text"></span>
</template>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</template>
<template x-if="showWaitMessage">
<template x-if="notifications.wait.show">
<div class="alert alert-info alert-dismissible fade show" role="alert">
<em class="fa-solid fa-spinner fa-spin"></em> Please wait for the attachments to upload.
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
<em class="fa-solid fa-spinner fa-spin"></em>
<span x-text="notifications.wait.text"></span>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</template>
</div>

6
resources/views/v2/components/transaction-split.blade.php
View File

@@ -109,7 +109,7 @@
<div class="card-footer">
<div class="row">
<div class="col text-end">
<button class="btn btn-success" :disabled="submitting" @click="submitTransaction()">Submit</button>
<button class="btn btn-success" :disabled="formStates.isSubmitting" @click="submitTransaction()">Submit</button>
</div>
</div>
</div>
@@ -117,11 +117,11 @@
</div>
<div class="col-12">
<template x-if="0 !== index">
<button :disabled="submitting" class="btn btn-danger" @click="removeSplit(index)">
<button :disabled="formStates.isSubmitting" class="btn btn-danger" @click="removeSplit(index)">
Remove this split
</button>
</template>
<button class="btn btn-info" :disabled="submitting">Add another split</button>
<button class="btn btn-info" :disabled="formStates.isSubmitting">Add another split</button>
</div>
</div>
</div>

2
resources/views/v2/partials/form/transaction/amount.blade.php
View File

@@ -9,7 +9,7 @@
<template x-if="!formStates.loadingCurrencies">
<select class="form-control" :id="'currency_code_' + index" x-model="transaction.currency_code">
<template x-for="currency in formData.nativeCurrencies">
<option :selected="currency.id == defaultCurrency.id"
<option :selected="currency.id == formData.defaultCurrency.id"
:label="currency.name" :value="currency.code"
x-text="currency.name"></option>
</template>

6
resources/views/v2/partials/form/transaction/description.blade.php
View File

@@ -7,7 +7,13 @@
:id="'description_' + index"
@change="changedDescription"
x-model="transaction.description"
:class="{'is-invalid': transaction.errors.description.length > 0, 'form-control': true}"
:data-index="index"
placeholder="{{ __('firefly.description') }}">
<template x-if="transaction.errors.description.length > 0">
<div class="invalid-feedback"
x-text="transaction.errors.description[0]">
</div>
</template>
</div>
</div>

9
resources/views/v2/partials/form/transaction/destination-account.blade.php
View File

@@ -5,11 +5,16 @@
</label>
<div class="col-sm-10">
<input type="text"
class="form-control ac-dest"
:class="{'is-invalid': transaction.errors.destination_account.length > 0, 'form-control': true, 'ac-dest': true}"
:id="'dest_' + index"
@changed="changedDestinationAccount"
x-model="transaction.destination_account.alpine_name"
:data-index="index"
@changed="changedDestinationAccount"
placeholder="{{ __('firefly.destination_account') }}">
<template x-if="transaction.errors.destination_account.length > 0">
<div class="invalid-feedback"
x-text="transaction.errors.destination_account[0]">
</div>
</template>
</div>
</div>

7
resources/views/v2/partials/form/transaction/source-account.blade.php
View File

@@ -5,11 +5,16 @@
</label>
<div class="col-sm-10">
<input type="text"
class="form-control ac-source"
:class="{'is-invalid': transaction.errors.source_account.length > 0, 'form-control': true, 'ac-source': true}"
:id="'source_' + index"
x-model="transaction.source_account.alpine_name"
:data-index="index"
@changed="changedSourceAccount"
placeholder="{{ __('firefly.source_account') }}">
<template x-if="transaction.errors.source_account.length > 0">
<div class="invalid-feedback"
x-text="transaction.errors.source_account[0]">
</div>
</template>
</div>
</div>

2
resources/views/v2/transactions/create.blade.php
View File

@@ -15,7 +15,7 @@
</div>
<div class="row">
<div class="col text-end">
<button class="btn btn-success" :disabled="submitting" @click="submitTransaction()">Submit</button>
<button class="btn btn-success" :disabled="formStates.isSubmitting" @click="submitTransaction()">Submit</button>
</div>
</div>
</div>