kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Max amounts

Browse Source
This commit is contained in:
James Cole
2019-09-12 07:11:20 +02:00
parent 26ac57facb
commit 8235138a5d
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/AccountFormRequest.php
View File

@@ -94,11 +94,11 @@ class AccountFormRequest extends Request
$ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes'))); $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
$rules = [ $rules = [
'name' => 'required|min:1|uniqueAccountForUser', 'name' => 'required|min:1|uniqueAccountForUser',
'opening_balance' => 'numeric|required_with:opening_balance_date|nullable', 'opening_balance' => 'numeric|required_with:opening_balance_date|nullable|max:1000000000',
'opening_balance_date' => 'date|required_with:opening_balance|nullable', 'opening_balance_date' => 'date|required_with:opening_balance|nullable',
'iban' => ['iban', 'nullable', new UniqueIban(null, $this->string('objectType'))], 'iban' => ['iban', 'nullable', new UniqueIban(null, $this->string('objectType'))],
'BIC' => 'bic|nullable', 'BIC' => 'bic|nullable',
'virtual_balance' => 'numeric|nullable', 'virtual_balance' => 'numeric|nullable|max:1000000000',
'currency_id' => 'exists:transaction_currencies,id', 'currency_id' => 'exists:transaction_currencies,id',
'account_number' => 'between:1,255|uniqueAccountNumberForUser|nullable', 'account_number' => 'between:1,255|uniqueAccountNumberForUser|nullable',
'account_role' => 'in:' . $accountRoles, 'account_role' => 'in:' . $accountRoles,
@@ -111,7 +111,7 @@ class AccountFormRequest extends Request
]; ];
if ('liabilities' === $this->get('objectType')) { if ('liabilities' === $this->get('objectType')) {
$rules['opening_balance'] = ['numeric', 'required']; $rules['opening_balance'] = ['numeric', 'required','max:1000000000'];
$rules['opening_balance_date'] = 'date|required'; $rules['opening_balance_date'] = 'date|required';
} }

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

@@ -49,7 +49,7 @@ class BudgetIncomeRequest extends Request
{ {
// fixed // fixed
return [ return [
'amount' => 'numeric|required|min:0', 'amount' => 'numeric|required|min:0|max:1000000000',
'start' => 'required|date|before:end', 'start' => 'required|date|before:end',
'end' => 'required|date|after:start', 'end' => 'required|date|after:start',
]; ];

6
app/Http/Requests/NewUserFormRequest.php
View File

@@ -50,9 +50,9 @@ class NewUserFormRequest extends Request
// fixed // fixed
return [ return [
'bank_name' => 'required|between:1,200', 'bank_name' => 'required|between:1,200',
'bank_balance' => 'required|numeric', 'bank_balance' => 'required|numeric|max:1000000000',
'savings_balance' => 'numeric', 'savings_balance' => 'numeric|max:1000000000',
'credit_card_limit' => 'numeric', 'credit_card_limit' => 'numeric|max:1000000000',
'amount_currency_id_bank_balance' => 'exists:transaction_currencies,id', 'amount_currency_id_bank_balance' => 'exists:transaction_currencies,id',
'amount_currency_id_savings_balance' => 'exists:transaction_currencies,id', 'amount_currency_id_savings_balance' => 'exists:transaction_currencies,id',
'amount_currency_id_credit_card_limit' => 'exists:transaction_currencies,id', 'amount_currency_id_credit_card_limit' => 'exists:transaction_currencies,id',

6
app/Http/Requests/ReconciliationStoreRequest.php
View File

@@ -77,9 +77,9 @@ class ReconciliationStoreRequest extends Request
return [ return [
'start' => 'required|date', 'start' => 'required|date',
'end' => 'required|date', 'end' => 'required|date',
'startBalance' => 'numeric', 'startBalance' => 'numeric|max:1000000000',
'endBalance' => 'numeric', 'endBalance' => 'numeric|max:1000000000',
'difference' => 'required|numeric', 'difference' => 'required|numeric|max:1000000000',
'journals' => [new ValidJournals], 'journals' => [new ValidJournals],
'reconcile' => 'required|in:create,nothing', 'reconcile' => 'required|in:create,nothing',
]; ];

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

@@ -160,7 +160,7 @@ class RecurrenceFormRequest extends Request
'transaction_description' => 'required|between:1,255', 'transaction_description' => 'required|between:1,255',
'transaction_type' => 'required|in:withdrawal,deposit,transfer', 'transaction_type' => 'required|in:withdrawal,deposit,transfer',
'transaction_currency_id' => 'required|exists:transaction_currencies,id', 'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'amount' => 'numeric|required|more:0', 'amount' => 'numeric|required|more:0|max:1000000000',
// mandatory account info: // mandatory account info:
'source_id' => 'numeric|belongsToUser:accounts,id|nullable', 'source_id' => 'numeric|belongsToUser:accounts,id|nullable',
'source_name' => 'between:1,255|nullable', 'source_name' => 'between:1,255|nullable',
@@ -168,7 +168,7 @@ class RecurrenceFormRequest extends Request
'destination_name' => 'between:1,255|nullable', 'destination_name' => 'between:1,255|nullable',
// foreign amount data: // foreign amount data:
'foreign_amount' => 'nullable|more:0', 'foreign_amount' => 'nullable|more:0|max:1000000000',
// optional fields: // optional fields:
'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable', 'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable',