Merge pull request #3179 from CihanSenturk/fix-default-setting-validation
Fixed default settings validation
This commit is contained in:
commit
9214b5bfd5
|
|
@ -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',
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue