IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-26 17:01:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix max amount.

Browse Source
This commit is contained in:
James Cole 2018-07-22 08:36:30 +02:00
parent aed7e6d289
commit 662b832274
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,11 +161,11 @@ class JournalFormRequest extends Request
'due_date' => 'date|nullable', 'due_date' => 'date|nullable',
'payment_date' => 'date|nullable', 'payment_date' => 'date|nullable',
'invoice_date' => 'date|nullable', 'invoice_date' => 'date|nullable',
'internal_reference' => 'min:1,max:255|nullable', 'internal_reference' => 'min:1|max:255|nullable',
'notes' => 'min:1,max:50000|nullable', 'notes' => 'min:1|max:50000|nullable',
// and then transaction rules: // and then transaction rules:
'description' => 'required|between:1,255', 'description' => 'required|between:1,255',
'amount' => 'numeric|required|more:0', 'amount' => 'numeric|required|more:0|less:10000000',//
'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable', 'budget_id' => 'mustExist:budgets,id|belongsToUser:budgets,id|nullable',
'category' => 'between:1,255|nullable', 'category' => 'between:1,255|nullable',
'source_id' => 'numeric|belongsToUser:accounts,id|nullable', 'source_id' => 'numeric|belongsToUser:accounts,id|nullable',

2
app/Repositories/Budget/BudgetRepository.php
View File

@ -840,7 +840,7 @@ class BudgetRepository implements BudgetRepositoryInterface
Log::debug(sprintf('Updated trigger %d: %s', $trigger->id, $trigger->trigger_value)); Log::debug(sprintf('Updated trigger %d: %s', $trigger->id, $trigger->trigger_value));
} }
// find any rule actions related to budgets, with this budget name, and update them accordingly. // find any rule actions related to budgets, with this budget name, and update them accordingly.
$types = [ $types = [
'set_budget', 'set_budget',

17
app/Validation/FireflyValidator.php
View File

@ -203,6 +203,23 @@ class FireflyValidator extends Validator
return bccomp((string)$value, (string)$compare) > 0; return bccomp((string)$value, (string)$compare) > 0;
} }
/**
* @param $attribute
* @param $value
* @param $parameters
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return bool
*/
public function validateLess($attribute, $value, $parameters): bool
{
/** @var mixed $compare */
$compare = $parameters[0] ?? '0';
return bccomp((string)$value, (string)$compare) < 0;
}
/** /**
* @SuppressWarnings(PHPMD.UnusedFormalParameter) * @SuppressWarnings(PHPMD.UnusedFormalParameter)
* *

3
resources/lang/en_US/validation.php
View File

@ -50,7 +50,8 @@ return [
'at_least_one_action' => 'Rule must have at least one action.', 'at_least_one_action' => 'Rule must have at least one action.',
'base64' => 'This is not valid base64 encoded data.', 'base64' => 'This is not valid base64 encoded data.',
'model_id_invalid' => 'The given ID seems invalid for this model.', 'model_id_invalid' => 'The given ID seems invalid for this model.',
'more' => ':attribute must be larger than zero.', 'more' => ':attribute must be larger than :value.',
'less' => ':attribute must be less than 10,000,000',
'active_url' => 'The :attribute is not a valid URL.', 'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.', 'after' => 'The :attribute must be a date after :date.',
'alpha' => 'The :attribute may only contain letters.', 'alpha' => 'The :attribute may only contain letters.',