shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved settings rules

Browse Source
This commit is contained in:
denisdulici 2020-03-22 18:40:08 +03:00
parent e798c1bfcc
commit 1852a76859
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Requests/Setting/Module.php
View File

@ -27,13 +27,17 @@ class Module extends FormRequest
$module = module($this->request->get('module_alias')); $module = module($this->request->get('module_alias'));
if ($module->get('settings')) { if (!$fields = $module->get('settings')) {
foreach ($module->get('settings') as $field) { return $rules;
if (isset($field['rules'])) { }
foreach ($fields as $field) {
if (empty($field['rules'])) {
continue;
}
$rules[$field['name']] = $field['rules']; $rules[$field['name']] = $field['rules'];
} }
}
}
return $rules; return $rules;
} }

27
modules/PaypalStandard/module.json
View File

@ -21,7 +21,7 @@
"attributes": { "attributes": {
"required": "required" "required": "required"
}, },
"rules": "required" "rules": "required|string"
}, },
{ {
"type": "textGroup", "type": "textGroup",
@ -31,7 +31,7 @@
"attributes": { "attributes": {
"required": "required" "required": "required"
}, },
"rules": "required" "rules": "required|email"
}, },
{ {
"type": "selectGroup", "type": "selectGroup",
@ -42,8 +42,11 @@
"live": "Live", "live": "Live",
"sandbox": "Sandbox" "sandbox": "Sandbox"
}, },
"selected": null, "selected": "live",
"attributes": {} "attributes": {
"required": "required"
},
"rules": "required|string"
}, },
{ {
"type": "selectGroup", "type": "selectGroup",
@ -54,8 +57,11 @@
"authorization": "Authorization", "authorization": "Authorization",
"sale": "Sale" "sale": "Sale"
}, },
"selected": null, "selected": "sale",
"attributes": {} "attributes": {
"required": "required"
},
"rules": "required|string"
}, },
{ {
"type": "radioGroup", "type": "radioGroup",
@ -63,7 +69,8 @@
"title": "paypal-standard::general.form.customer", "title": "paypal-standard::general.form.customer",
"enable": "general.yes", "enable": "general.yes",
"disable": "general.no", "disable": "general.no",
"attributes": {} "attributes": {},
"rules": "required|integer"
}, },
{ {
"type": "radioGroup", "type": "radioGroup",
@ -71,14 +78,16 @@
"title": "paypal-standard::general.form.debug", "title": "paypal-standard::general.form.debug",
"enable": "general.yes", "enable": "general.yes",
"disable": "general.no", "disable": "general.no",
"attributes": {} "attributes": {},
"rules": "required|integer"
}, },
{ {
"type": "textGroup", "type": "textGroup",
"name": "order", "name": "order",
"title": "paypal-standard::general.form.order", "title": "paypal-standard::general.form.order",
"icon": "sort", "icon": "sort",
"attributes": {} "attributes": {},
"rules": "nullable|integer"
} }
] ]
} }