Can not remove default currency. #11tvzng

akaunting · Oct 5, 2021 · 8e5abbf · 8e5abbf
1 parent 3c71560
commit 8e5abbf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/app/Http/Controllers/Settings/Settings.php b/app/Http/Controllers/Settings/Settings.php
@@ -128,6 +128,12 @@ public function update(Request $request)
             }
 
             if ($real_key == 'default.currency') {
+                $currencies = Currency::enabled()->pluck('code')->toArray();
+
+                if (!in_array($value, $currencies)) {
+                    continue;
+                }
+
                 $currency = Currency::code($value)->first();
                 $currency->rate = '1';
                 $currency->save();

diff --git a/app/Http/Requests/Setting/Setting.php b/app/Http/Requests/Setting/Setting.php
@@ -13,20 +13,29 @@ class Setting extends FormRequest
      */
     public function rules()
     {
-        $name = 'nullable';
-        $email = 'nullable';
-        $logo = 'nullable';
-
-        if ($this->request->get('_prefix', null) == 'company') {
-            $name = 'required|string';
-            $email = 'required|email';
-            $logo = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
+        $rules = [];
+
+        $prefix = $this->request->get('_prefix', null);
+
+        switch ($prefix) {
+            case 'company':
+                $rules = [
+                    'name' => 'required|string',
+                    'email' => 'required|email',
+                    'logo' => 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000',
+                ];
+
+                break;
+            case 'default':
+                $rules = [
+                    'currency' => 'required|string|currency',
+                    'locale' => 'required|string',
+                    'payment_method' => 'required|string',
+                ];
+
+                break;
         }
 
-        return [
-            'name' => $name,
-            'email' => $email,
-            'logo' => $logo,
-        ];
+        return $rules;
     }
 }