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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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';
@ -68,4 +71,17 @@ class User extends FormRequest
'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,
];
}
}

18
app/Http/Requests/Common/Company.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Common;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
class Company extends FormRequest
{
@ -16,7 +17,9 @@ class Company extends FormRequest
$logo = 'nullable';
if ($this->files->get('logo')) {
$logo = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
$logo = 'mimes:' . config('filesystems.mimes')
. '|between:0,' . config('filesystems.max_size') * 1024
. '|dimensions:max_width=' . config('filesystems.max_width') . ',max_height=' . config('filesystems.max_height');
}
return [
@ -27,4 +30,17 @@ class Company extends FormRequest
'logo' => $logo,
];
}
public function messages()
{
$logo_dimensions = trans('validation.custom.invalid_dimension', [
'attribute' => Str::lower(trans('settings.company.logo')),
'width' => config('filesystems.max_width'),
'height' => config('filesystems.max_height'),
]);
return [
'logo.dimensions' => $logo_dimensions,
];
}
}

18
app/Http/Requests/Common/Contact.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
use Illuminate\Support\Str;
class Contact extends FormRequest
{
@ -46,7 +47,9 @@ class Contact extends FormRequest
}
if ($this->files->get('logo')) {
$logo = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
$logo = 'mimes:' . config('filesystems.mimes')
. '|between:0,' . config('filesystems.max_size') * 1024
. '|dimensions:max_width=' . config('filesystems.max_width') . ',max_height=' . config('filesystems.max_height');
}
return [
@ -59,4 +62,17 @@ class Contact extends FormRequest
'logo' => $logo,
];
}
public function messages()
{
$logo_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 [
'logo.dimensions' => $logo_dimensions,
];
}
}

18
app/Http/Requests/Common/Item.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
use Illuminate\Support\Str;
class Item extends FormRequest
{
@ -16,7 +17,9 @@ class Item extends FormRequest
$picture = $sale_price = $purchase_price = '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');
}
if ($this->request->get('sale_information') == 'true') {
@ -38,4 +41,17 @@ class Item extends FormRequest
'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,
];
}
}

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

@ -112,6 +112,12 @@ class Document extends FormRequest
}
}
$messages['company_logo.dimensions'] = trans('validation.custom.invalid_dimension', [
'attribute' => Str::lower(trans('settings.company.logo')),
'width' => '1000',
'height' => '1000',
]);
return $messages;
}
}

18
app/Http/Requests/Portal/Profile.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Portal;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
class Profile extends FormRequest
{
@ -18,7 +19,9 @@ class Profile 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|unique:users,email,' . $id . ',id,deleted_at,NULL';
@ -39,4 +42,17 @@ class Profile extends FormRequest
'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,
];
}
}

20
app/Http/Requests/Setting/Setting.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Requests\Setting;
use App\Abstracts\Http\FormRequest;
use Illuminate\Support\Str;
class Setting extends FormRequest
{
@ -19,10 +20,14 @@ class Setting extends FormRequest
switch ($prefix) {
case 'company':
$logo = 'mimes:' . config('filesystems.mimes')
. '|between:0,' . config('filesystems.max_size') * 1024
. '|dimensions:max_width=' . config('filesystems.max_width') . ',max_height=' . config('filesystems.max_height');
$rules = [
'name' => 'required|string',
'email' => 'required|email',
'logo' => 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000',
'logo' => $logo,
];
break;
@ -38,4 +43,17 @@ class Setting extends FormRequest
return $rules;
}
public function messages()
{
$logo_dimensions = trans('validation.custom.invalid_dimension', [
'attribute' => Str::lower(trans('settings.company.logo')),
'width' => config('filesystems.max_width'),
'height' => config('filesystems.max_height'),
]);
return [
'logo.dimensions' => $logo_dimensions,
];
}
}

18
app/Http/Requests/Wizard/Company.php
View File

@ -5,6 +5,7 @@ namespace App\Http\Requests\Wizard;
use App\Abstracts\Http\FormRequest;
use App\Traits\Modules as RemoteModules;
use Illuminate\Validation\Factory as ValidationFactory;
use Illuminate\Support\Str;
class Company extends FormRequest
{
@ -31,7 +32,9 @@ class Company extends FormRequest
$logo = 'nullable';
if ($this->files->get('logo')) {
$logo = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
$logo = 'mimes:' . config('filesystems.mimes')
. '|between:0,' . config('filesystems.max_size') * 1024
. '|dimensions:max_width=' . config('filesystems.max_width') . ',max_height=' . config('filesystems.max_height');
}
$rules = [
@ -44,4 +47,17 @@ class Company extends FormRequest
return $rules;
}
public function messages()
{
$logo_dimensions = trans('validation.custom.invalid_dimension', [
'attribute' => Str::lower(trans('settings.company.logo')),
'width' => config('filesystems.max_width'),
'height' => config('filesystems.max_height'),
]);
return [
'logo.dimensions' => $logo_dimensions,
];
}
}

18
config/filesystems.php
View File

@ -45,6 +45,24 @@ return [
'max_size' => env('FILESYSTEM_MAX_SIZE', '2'),
/*
|--------------------------------------------------------------------------
| Allowed image max width, in pixes
|--------------------------------------------------------------------------
*/
'max_width' => env('FILESYSTEM_MAX_WIDTH', '1000'),
/*
|--------------------------------------------------------------------------
| Allowed image max height, in pixes
|--------------------------------------------------------------------------
*/
'max_height' => env('FILESYSTEM_MAX_HEIGHT', '1000'),
/*
|--------------------------------------------------------------------------
| Filesystem Disks

1
resources/lang/en-GB/validation.php
View File

@ -141,6 +141,7 @@ return [
'invalid_currency' => 'The :attribute code is invalid.',
'invalid_amount' => 'The amount :attribute is invalid.',
'invalid_extension' => 'The file extension is invalid.',
'invalid_dimension' => 'The :attribute dimensions must be max :width x :height px.',
],
/*