Merge pull request #3179 from CihanSenturk/fix-default-setting-validation

Fixed default settings validation
This commit is contained in:
Cüneyt Şentürk 2024-07-12 12:31:43 +01:00 committed by GitHub
commit 9214b5bfd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions

View File

@ -33,8 +33,11 @@ class Setting extends FormRequest
break;
case 'default':
$rules = [
'account' => 'required|string',
'currency' => 'required|string|currency',
'locale' => 'required|string',
'expense_category' => 'required|integer',
'income_category' => 'required|integer',
'payment_method' => 'required|string|payment_method',
];

View File

@ -15,14 +15,13 @@
label="{{ trans_choice('general.accounts', 1) }}"
:options="$accounts"
:selected="setting('default.account')"
not-required
/>
<x-form.group.currency name="currency" not-required />
<x-form.group.currency name="currency" />
<x-form.group.select name="tax" label="{{ trans_choice('general.taxes', 1) }}" :options="$taxes" :selected="setting('default.tax')" :clearable="'false'" not-required />
<x-form.group.payment-method :clearable="'false'" not-required />
<x-form.group.payment-method :clearable="'false'" />
</x-slot>
</x-form.section>