IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue validating budget amounts.

Browse Source
This commit is contained in:
James Cole 2024-01-02 07:08:15 +01:00
parent 09a25957d0
commit 85bde79fd1
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
15 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Account/CreateController.php
View File

@ -157,7 +157,6 @@ class CreateController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Account/EditController.php
View File

@ -182,7 +182,6 @@ class EditController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string) trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Bill/CreateController.php
View File

@ -117,7 +117,6 @@ class CreateController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Bill/EditController.php
View File

@ -129,7 +129,6 @@ class EditController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string) trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Budget/CreateController.php
View File

@ -128,7 +128,6 @@ class CreateController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Budget/EditController.php
View File

@ -138,7 +138,6 @@ class EditController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Category/CreateController.php
View File

@ -101,7 +101,6 @@ class CreateController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Category/EditController.php
View File

@ -105,7 +105,6 @@ class EditController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

17
app/Http/Controllers/Controller.php
View File

@ -121,21 +121,4 @@ abstract class Controller extends BaseController
}
);
}
final protected function auditLogAttachmentInfo(?array $files): void
{
if (null === $files) {
Log::channel('audit')->info('No files found');
return;
}
/**
* @var int $index
* @var UploadedFile $file
*/
foreach ($files as $index => $file) {
Log::channel('audit')->info(sprintf('File [%d/%d] upload attachment "%s", mime is: "%s".', $index + 1, count($files), $file->getClientOriginalName(), $file->getMimeType()));
}
}
}

1
app/Http/Controllers/PiggyBank/CreateController.php
View File

@ -108,7 +108,6 @@ class CreateController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/PiggyBank/EditController.php
View File

@ -128,7 +128,6 @@ class EditController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Recurring/CreateController.php
View File

@ -243,7 +243,6 @@ class CreateController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

1
app/Http/Controllers/Recurring/EditController.php
View File

@ -181,7 +181,6 @@ class EditController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

2
app/Http/Controllers/TagController.php
View File

@ -306,7 +306,6 @@ class TagController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}
@ -342,7 +341,6 @@ class TagController extends Controller
}
if (null !== $files && auth()->user()->hasRole('demo')) {
Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
$this->auditLogAttachmentInfo($files);
session()->flash('info', (string)trans('firefly.no_att_demo_user'));
}

6
app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php
View File

@ -47,8 +47,12 @@ trait ValidatesAutoBudgetRequest
if ('' === $type || 0 === $type) {
return;
}
// TODO should be present at more places, stop scientific notification
if (str_contains(strtoupper($amount), 'E')) {
$amount = '';
}
// basic float check:
if (!is_numeric($amount)) {
if (!is_numeric($amount) || '' === $amount) {
$validator->errors()->add('auto_budget_amount', (string) trans('validation.amount_required_for_auto_budget'));
return;