validation rules should be seperated from attributes

akaunting · Mar 21, 2020 · 7d03d45 · 7d03d45
1 parent 307e93c
commit 7d03d45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/Http/Requests/Setting/Module.php b/app/Http/Requests/Setting/Module.php
@@ -29,8 +29,8 @@ public function rules()
 
         if ($module->get('settings')) {
             foreach ($module->get('settings') as $field) {
-                if (isset($field['attributes']['required'])) {
-                    $rules[$field['name']] = $field['attributes']['required'];
+                if (isset($field['rules'])) {
+                    $rules[$field['name']] = $field['rules'];
                 }
             }
         }

diff --git a/modules/PaypalStandard/module.json b/modules/PaypalStandard/module.json
@@ -20,7 +20,8 @@
             "icon": "fa fa-font",
             "attributes": {
                 "required": "required"
-            }
+            },
+            "rules": "required"
         },
         {
             "type": "textGroup",
@@ -29,7 +30,8 @@
             "icon": "envelope",
             "attributes": {
                 "required": "required"
-            }
+            },
+            "rules": "required"
         },
         {
             "type": "selectGroup",