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

28
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,15 +17,30 @@ 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 [
'name' => 'required|string',
'email' => 'required|email:rfc,dns',
'currency' => 'required|string',
'domain' => 'nullable|string',
'logo' => $logo,
'name' => 'required|string',
'email' => 'required|email:rfc,dns',
'currency' => 'required|string',
'domain' => 'nullable|string',
'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,
];
}
}

30
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,17 +47,32 @@ 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 [
'type' => 'required|string',
'name' => 'required|string',
'email' => $email,
'user_id' => 'integer|nullable',
'type' => 'required|string',
'name' => 'required|string',
'email' => $email,
'user_id' => 'integer|nullable',
'currency_code' => 'required|string|currency',
'enabled' => 'integer|boolean',
'logo' => $logo,
'enabled' => 'integer|boolean',
'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,
];
}
}

34
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') {
@ -28,14 +31,27 @@ class Item extends FormRequest
}
return [
'type' => 'required|string',
'name' => 'required|string',
'sale_price' => $sale_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/',
'purchase_price'=> $purchase_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/',
'tax_ids' => 'nullable|array',
'category_id' => 'nullable|integer',
'enabled' => 'integer|boolean',
'picture' => $picture,
'type' => 'required|string',
'name' => 'required|string',
'sale_price' => $sale_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/',
'purchase_price' => $purchase_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/',
'tax_ids' => 'nullable|array',
'category_id' => 'nullable|integer',
'enabled' => 'integer|boolean',
'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,
];
}
}