shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added proper validation message for dimensions

Browse Source
This commit is contained in:
Denis Duliçi
2022-07-24 00:36:20 +03:00
parent 4abd58ad1d
commit 38b2b02281
10 changed files with 200 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Http/Requests/Auth/User.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
class User extends FormRequest
{
@ -26,7 +27,9 @@ class User extends FormRequest
$picture = 'nullable';
if ($this->files->get('picture')) {
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
$picture = 'mimes:' . config('filesystems.mimes')
. '|between:0,' . config('filesystems.max_size') * 1024
. '|dimensions:max_width=' . config('filesystems.max_width') . ',max_height=' . config('filesystems.max_height');
}
$email = 'required|email:rfc,dns';
@ -59,13 +62,26 @@ class User extends FormRequest
$password = $change_password ? '|confirmed' : '';
return [
'name' => 'required|string',
'email' => $email,
'current_password' => 'required_if:change_password,true' . $current_password,
'password' => 'required_if:change_password,true' . $password,
'companies' => $companies,
'roles' => $roles,
'picture' => $picture,
'name' => 'required|string',
'email' => $email,
'current_password' => 'required_if:change_password,true' . $current_password,
'password' => 'required_if:change_password,true' . $password,
'companies' => $companies,
'roles' => $roles,
'picture' => $picture,
];
}
public function messages()
{
$picture_dimensions = trans('validation.custom.invalid_dimension', [
'attribute' => Str::lower(trans_choice('general.pictures', 1)),
'width' => config('filesystems.max_width'),
'height' => config('filesystems.max_height'),
]);
return [
'picture.dimensions' => $picture_dimensions,
];
}
}