kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Various bugfixes and code clean up.

Browse Source
This commit is contained in:
James Cole
2018-07-27 04:46:21 +02:00
parent 2ad8e7f343
commit 0312ba8ad7
60 changed files with 223 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Requests/ExportFormRequest.php
View File

@@ -47,6 +47,7 @@ class ExportFormRequest extends Request
*/
public function rules(): array
{
/** @var Carbon $sessionFirst */
$sessionFirst = clone session('first');
$first = $sessionFirst->subDay()->format('Y-m-d');
$today = Carbon::create()->addDay()->format('Y-m-d');

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

@@ -190,7 +190,7 @@ class RecurrenceFormRequest extends Request
$rules['repetitions'] = 'required|numeric|between:0,254';
}
// if foreign amount, currency must be different.
if (0.0 !== $this->float('foreign_amount')) {
if (null !== $this->float('foreign_amount')) {
$rules['foreign_currency_id'] = 'exists:transaction_currencies,id|different:transaction_currency_id';
}

10
app/Http/Requests/Request.php
View File

@@ -56,11 +56,15 @@ class Request extends FormRequest
*
* @param string $field
*
* @return float
* @return float|null
*/
public function float(string $field): float
public function float(string $field): ?float
{
return (float)$this->get($field);
$res = $this->get($field);
if(null === $res) {
return null;
}
return (float)$res;
}
/**

1
app/Http/Requests/SelectTransactionsRequest.php
View File

@@ -50,6 +50,7 @@ class SelectTransactionsRequest extends Request
public function rules(): array
{
// fixed
/** @var Carbon $sessionFirst */
$sessionFirst = clone session('first');
$first = $sessionFirst->subDay()->format('Y-m-d');
$today = Carbon::create()->addDay()->format('Y-m-d');