kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 19:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/5226

Browse Source
This commit is contained in:
James Cole
2021-11-05 07:48:22 +01:00
parent 341478db73
commit 16ee3df31f
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/BillStoreRequest.php
View File

@@ -69,7 +69,7 @@ class BillStoreRequest extends FormRequest
'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'date' => 'required|date', 'date' => 'required|date',
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',
'skip' => 'required|between:0,31', 'skip' => 'required|integer|gte:0|lte:31',
'active' => 'boolean', 'active' => 'boolean',
]; ];
} }

2
app/Http/Requests/BillUpdateRequest.php
View File

@@ -73,7 +73,7 @@ class BillUpdateRequest extends FormRequest
'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'date' => 'required|date', 'date' => 'required|date',
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',
'skip' => 'required|between:0,31', 'skip' => 'required|integer|gte:0|lte:31',
'active' => 'boolean', 'active' => 'boolean',
]; ];
} }

2
app/Http/Requests/BudgetFormStoreRequest.php
View File

@@ -63,7 +63,7 @@ class BudgetFormStoreRequest extends FormRequest
return [ return [
'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name', 'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name',
'active' => 'numeric|between:0,1', 'active' => 'numeric|between:0,1',
'auto_budget_type' => 'numeric|between:0,2', 'auto_budget_type' => 'numeric|integer|gte:0|lte:2',
'auto_budget_currency_id' => 'exists:transaction_currencies,id', 'auto_budget_currency_id' => 'exists:transaction_currencies,id',
'auto_budget_amount' => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2', 'auto_budget_amount' => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2',
'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly', 'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly',

2
app/Http/Requests/BudgetFormUpdateRequest.php
View File

@@ -73,7 +73,7 @@ class BudgetFormUpdateRequest extends FormRequest
return [ return [
'name' => $nameRule, 'name' => $nameRule,
'active' => 'numeric|between:0,1', 'active' => 'numeric|between:0,1',
'auto_budget_type' => 'numeric|between:0,2', 'auto_budget_type' => 'numeric|integer|gte:0|lte:31',
'auto_budget_currency_id' => 'exists:transaction_currencies,id', 'auto_budget_currency_id' => 'exists:transaction_currencies,id',
'auto_budget_amount' => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2', 'auto_budget_amount' => 'min:0|max:1000000000|required_if:auto_budget_type,1|required_if:auto_budget_type,2',
'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly', 'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly',

2
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -192,7 +192,7 @@ class RecurrenceFormRequest extends FormRequest
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
'first_date' => 'required|date|after:' . $today->format('Y-m-d'), 'first_date' => 'required|date|after:' . $today->format('Y-m-d'),
'repetition_type' => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'], 'repetition_type' => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'],
'skip' => 'required|numeric|between:0,31', 'skip' => 'required|numeric|integer|gte:0|lte:31',
// optional for recurrence: // optional for recurrence:
'recurring_description' => 'between:0,65000', 'recurring_description' => 'between:0,65000',