From e8821532236dc8277bdfd6f29ac76042de6aa46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?=
 <53110792+CihanSenturk@users.noreply.github.com>
Date: Fri, 12 Jul 2024 12:46:24 +0300
Subject: [PATCH] fixed default settings validation

---
 app/Http/Requests/Setting/Setting.php           | 3 +++
 resources/views/settings/default/edit.blade.php | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/Setting/Setting.php b/app/Http/Requests/Setting/Setting.php
index 11996c2df..eb01e8231 100644
--- a/app/Http/Requests/Setting/Setting.php
+++ b/app/Http/Requests/Setting/Setting.php
@@ -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',
                 ];
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index aa197e970..0b4f10a89 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -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>