Merkez validations
This commit is contained in:
@@ -15,6 +15,9 @@ use App\Repos\System\Settings\Legal\EducationRepo;
|
|||||||
use App\Repos\System\Settings\Legal\MarriageRepo;
|
use App\Repos\System\Settings\Legal\MarriageRepo;
|
||||||
use App\Repos\System\Settings\Legal\PassportRepo;
|
use App\Repos\System\Settings\Legal\PassportRepo;
|
||||||
use App\Repos\System\Settings\Location\RegionRepo;
|
use App\Repos\System\Settings\Location\RegionRepo;
|
||||||
|
use App\Rules\DowranAgaAllowed;
|
||||||
|
use App\Rules\OnlyLetters;
|
||||||
|
use App\Rules\PassportIdValidation;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laravel\Nova\Fields\Badge;
|
use Laravel\Nova\Fields\Badge;
|
||||||
use Laravel\Nova\Fields\Date;
|
use Laravel\Nova\Fields\Date;
|
||||||
@@ -159,15 +162,15 @@ class LoanOrder extends Resource
|
|||||||
new Panel(__('Personal data'), [
|
new Panel(__('Personal data'), [
|
||||||
Text::make(__('Name'), 'customer_name')
|
Text::make(__('Name'), 'customer_name')
|
||||||
->size('w-1/3')
|
->size('w-1/3')
|
||||||
->rules('required', 'string', 'max:255'),
|
->rules('required', 'string', new OnlyLetters(), 'max:255'),
|
||||||
|
|
||||||
Text::make(__('Surname'), 'customer_surname')
|
Text::make(__('Surname'), 'customer_surname')
|
||||||
->size('w-1/3')
|
->size('w-1/3')
|
||||||
->rules('required', 'string', 'max:255'),
|
->rules('required', 'string', new OnlyLetters(), 'max:255'),
|
||||||
|
|
||||||
Text::make(__('Patronic name'), 'customer_patronic_name')
|
Text::make(__('Patronic name'), 'customer_patronic_name')
|
||||||
->size('w-1/3')
|
->size('w-1/3')
|
||||||
->rules('required', 'string', 'max:255'),
|
->rules('required', 'string', new OnlyLetters(), 'max:255'),
|
||||||
|
|
||||||
Select::make(__('Education'), 'education')
|
Select::make(__('Education'), 'education')
|
||||||
->displayUsingLabels()
|
->displayUsingLabels()
|
||||||
@@ -189,15 +192,15 @@ class LoanOrder extends Resource
|
|||||||
|
|
||||||
Date::make(__('Date of birth'), 'born_at')
|
Date::make(__('Date of birth'), 'born_at')
|
||||||
->size('w-1/3')
|
->size('w-1/3')
|
||||||
->rules('required'),
|
->rules('required', 'before_or_equal:today'),
|
||||||
|
|
||||||
Text::make(__('Residence (passport)'), 'passport_address')
|
Text::make(__('Residence (passport)'), 'passport_address')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('required', 'string', 'max:255'),
|
->rules('required', 'string', new DowranAgaAllowed(), 'max:255'),
|
||||||
|
|
||||||
Text::make(__('Current Residence'), 'real_address')
|
Text::make(__('Current Residence'), 'real_address')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('required', 'string', 'max:255'),
|
->rules('required', 'string', new DowranAgaAllowed(), 'max:255'),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
new Panel(__('Passport'), [
|
new Panel(__('Passport'), [
|
||||||
@@ -211,49 +214,52 @@ class LoanOrder extends Resource
|
|||||||
|
|
||||||
Number::make(__('Passport id'), 'passport_id')
|
Number::make(__('Passport id'), 'passport_id')
|
||||||
->size('w-1/3')
|
->size('w-1/3')
|
||||||
->rules('required'),
|
->rules('required', 'numeric', 'digits:6'),
|
||||||
|
|
||||||
Date::make(__('Passport date of issue'), 'passport_given_at')
|
Date::make(__('Passport date of issue'), 'passport_given_at')
|
||||||
->size('w-1/3')
|
->size('w-1/3')
|
||||||
->rules('required'),
|
->rules('required', 'before_or_equal:today'),
|
||||||
|
|
||||||
Text::make(__('Passport given by'), 'passport_given_by')
|
Text::make(__('Passport given by'), 'passport_given_by')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('required'),
|
->rules('required', 'string', new DowranAgaAllowed(), 'max:255'),
|
||||||
|
|
||||||
Text::make(__('Born place (passport)'), 'born_place')
|
Text::make(__('Born place (passport)'), 'born_place')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('required'),
|
->rules('required', 'string', new DowranAgaAllowed(), 'max:255'),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
new Panel(__('Contact data'), [
|
new Panel(__('Contact data'), [
|
||||||
Email::make(__('Email'), 'email')
|
Email::make(__('Email'), 'email')
|
||||||
->size('w-1/4')
|
->size('w-1/4')
|
||||||
->rules('nullable', 'email'),
|
->rules('nullable', 'email', 'max:255'),
|
||||||
|
|
||||||
NovaInputmask::make(__('Phone'), 'phone')
|
NovaInputmask::make(__('Phone'), 'phone')
|
||||||
->mask('+(\\9\\93)-99-99-99-99')
|
->mask('+(\\9\\93)-99-99-99-99')
|
||||||
->storeRawValue()
|
->storeRawValue()
|
||||||
->size('w-1/4')
|
->size('w-1/4')
|
||||||
->rules('required'),
|
->rules('required', 'integer', 'between:61000000, 71999999'),
|
||||||
|
|
||||||
NovaInputmask::make(__('Phone Additional'), 'phone_additional')
|
NovaInputmask::make(__('Phone Additional'), 'phone_additional')
|
||||||
->mask('+(\\9\\93)-99-99-99-99')
|
->mask('+(\\9\\93)-99-99-99-99')
|
||||||
->storeRawValue()
|
->storeRawValue()
|
||||||
->size('w-1/4')
|
->size('w-1/4')
|
||||||
->rules('nullable'),
|
->rules('nullable', 'integer', 'between:61000000, 71999999'),
|
||||||
|
|
||||||
NovaInputmask::make(__('Home phone'), 'phone_home')
|
NovaInputmask::make(__('Home phone'), 'phone_home')
|
||||||
|
->mask('+(\\9\\93)-9{8}')
|
||||||
|
->storeRawValue()
|
||||||
->size('w-1/4')
|
->size('w-1/4')
|
||||||
->rules('required'),
|
->rules('required'),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
new Panel(__('Job'), [
|
new Panel(__('Job'), [
|
||||||
Text::make(__('Work company name'), 'work_company')
|
Text::make(__('Work company name'), 'work_company')
|
||||||
->rules('required', 'string', 'max:255')
|
->rules('required', 'string', new DowranAgaAllowed(), 'max:255')
|
||||||
->size('w-1/2'),
|
->size('w-1/2'),
|
||||||
|
|
||||||
NovaInputmask::make(__('HR department work number'), 'work_company_accountant_number')
|
NovaInputmask::make(__('HR department work number'), 'work_company_accountant_number')
|
||||||
|
->mask('+(\\9\\93)-9{8}')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('required'),
|
->rules('required'),
|
||||||
|
|
||||||
@@ -275,33 +281,33 @@ class LoanOrder extends Resource
|
|||||||
|
|
||||||
Text::make(__('Position'), 'work_position')
|
Text::make(__('Position'), 'work_position')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('required'),
|
->rules('required', 'string', new DowranAgaAllowed(), 'max:255'),
|
||||||
|
|
||||||
Text::make(__('Salary'), 'work_salary')
|
Text::make(__('Salary'), 'work_salary')
|
||||||
->size('w-1/4')
|
->size('w-1/4')
|
||||||
->rules('required'),
|
->rules('required', 'max_digits:8'),
|
||||||
|
|
||||||
Date::make(__('Work started at'), 'work_started_at')
|
Date::make(__('Work started at'), 'work_started_at')
|
||||||
->size('w-1/4')
|
->size('w-1/4')
|
||||||
->rules('required'),
|
->rules('required', 'before_or_equal:today'),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
new Panel(__('Passport'), [
|
new Panel(__('Passport'), [
|
||||||
Image::make(__('Passport (page 1)'), 'passport_one')
|
Image::make(__('Passport (page 1)'), 'passport_one')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('nullable', 'max:2048'),
|
->rules('required', 'max:2048'),
|
||||||
|
|
||||||
Image::make(__('Passport (page 2-3)'), 'passport_two')
|
Image::make(__('Passport (page 2-3)'), 'passport_two')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('nullable', 'max:2048'),
|
->rules('required', 'max:2048'),
|
||||||
|
|
||||||
Image::make(__('Passport (page 8-9)'), 'passport_three')
|
Image::make(__('Passport (page 8-9)'), 'passport_three')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('nullable', 'max:2048'),
|
->rules('required', 'max:2048'),
|
||||||
|
|
||||||
Image::make(__('Passport (page 32)'), 'passport_four')
|
Image::make(__('Passport (page 32)'), 'passport_four')
|
||||||
->size('w-1/2')
|
->size('w-1/2')
|
||||||
->rules('nullable', 'max:2048'),
|
->rules('required', 'max:2048'),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
// $table->foreignId('filled_by')->constrained('users')->restrictOnDelete();
|
// $table->foreignId('filled_by')->constrained('users')->restrictOnDelete();
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
namespace App\Nova\Resources;
|
namespace App\Nova\Resources;
|
||||||
|
|
||||||
use App\Nova\Resource;
|
use App\Nova\Resource;
|
||||||
|
use App\Rules\DowranAgaAllowed;
|
||||||
|
use App\Rules\OnlyLetters;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laravel\Nova\Fields\ID;
|
use Laravel\Nova\Fields\ID;
|
||||||
use Laravel\Nova\Fields\Text;
|
use Laravel\Nova\Fields\Text;
|
||||||
@@ -45,12 +47,11 @@ class Test extends Resource
|
|||||||
return [
|
return [
|
||||||
ID::make()->sortable(),
|
ID::make()->sortable(),
|
||||||
|
|
||||||
Text::make('phone'),
|
NovaInputmask::make(__('Phone'), 'phone')
|
||||||
|
->mask('+(\\9\\93)-99-99-99-99')
|
||||||
// NovaInputmask::make('Phone', 'phone')
|
->storeRawValue()
|
||||||
// ->mask('+(\\9\\93)-69-99-99-99')
|
->size('w-1/4')
|
||||||
// ->storeRawValue(),
|
->rules('required', 'integer', 'between:61000000,65999999'),
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
23
app/Rules/DowranAgaAllowed.php
Normal file
23
app/Rules/DowranAgaAllowed.php
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Rules;
|
||||||
|
|
||||||
|
use Closure;
|
||||||
|
use Illuminate\Contracts\Validation\ValidationRule;
|
||||||
|
|
||||||
|
class DowranAgaAllowed implements ValidationRule
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the validation rule.
|
||||||
|
*
|
||||||
|
* @param \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString $fail
|
||||||
|
*/
|
||||||
|
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||||
|
{
|
||||||
|
$pattern = "/^[a-zA-Z0-9\s\(\)\"\'\-\žŽäÄňŇöÖşŞüÜçÇýÝ\/,]+$/u";
|
||||||
|
|
||||||
|
if (! preg_match($pattern, $value)) {
|
||||||
|
$fail(__('Write a correct data please'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,7 +15,7 @@ class OnlyLetters implements ValidationRule
|
|||||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||||
{
|
{
|
||||||
if (! preg_match('/^([a-zA-Zа-яZžŽäÄňŇöÖşŞüÜçÇýÝ])+$/', $value)) {
|
if (! preg_match('/^([a-zA-Zа-яZžŽäÄňŇöÖşŞüÜçÇýÝ])+$/', $value)) {
|
||||||
$fail('The :attribute field must only contain letters.');
|
$fail(__('validation.alpha'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
lang/tk.json
13
lang/tk.json
@@ -66,7 +66,7 @@
|
|||||||
"Invalid SSL Certificate": "Nädogry SSL şahadatnamasy",
|
"Invalid SSL Certificate": "Nädogry SSL şahadatnamasy",
|
||||||
"Job": "Iş",
|
"Job": "Iş",
|
||||||
"Lebap": "Lebap",
|
"Lebap": "Lebap",
|
||||||
"Legal Marriage": "Kanuny nika",
|
"Legal Marriage": "Raýat nika",
|
||||||
"Length Required": "Uzynlyk talap edilýär",
|
"Length Required": "Uzynlyk talap edilýär",
|
||||||
"Loan": "Karz",
|
"Loan": "Karz",
|
||||||
"Loan order": "Karz sargyt",
|
"Loan order": "Karz sargyt",
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
"Loop Detected": "Aýlaw tapyldy",
|
"Loop Detected": "Aýlaw tapyldy",
|
||||||
"Maintenance Mode": "Bejeriş tertibi",
|
"Maintenance Mode": "Bejeriş tertibi",
|
||||||
"Marriage status": "Nika ýagdaýy",
|
"Marriage status": "Nika ýagdaýy",
|
||||||
"Married": "Öýlenen",
|
"Married": "Öýlenen/Durmuşa çykan",
|
||||||
"Mary": "Mary",
|
"Mary": "Mary",
|
||||||
"Masters ED": "Ussalar",
|
"Masters ED": "Ussalar",
|
||||||
"Maturity": "Kämillik",
|
"Maturity": "Kämillik",
|
||||||
@@ -166,7 +166,7 @@
|
|||||||
"Service Unavailable": "Hyzmat elýeterli däl",
|
"Service Unavailable": "Hyzmat elýeterli däl",
|
||||||
"Session Has Expired": "Sessiýa gutardy",
|
"Session Has Expired": "Sessiýa gutardy",
|
||||||
"Showing": "Görkezmek",
|
"Showing": "Görkezmek",
|
||||||
"Single": "Leeke",
|
"Single": "Öýlenmedik/Durmuşa çykmadyk",
|
||||||
"SSL Handshake Failed": "SSL el çarpmak şowsuz boldy",
|
"SSL Handshake Failed": "SSL el çarpmak şowsuz boldy",
|
||||||
"Surname": "Familiýa",
|
"Surname": "Familiýa",
|
||||||
"Switching Protocols": "Protokollary çalyşmak",
|
"Switching Protocols": "Protokollary çalyşmak",
|
||||||
@@ -198,11 +198,12 @@
|
|||||||
"Verify Your Email Address": "E-poçta salgyňyzy barlaň",
|
"Verify Your Email Address": "E-poçta salgyňyzy barlaň",
|
||||||
"Web Server is Down": "Web Serwer ýapyk",
|
"Web Server is Down": "Web Serwer ýapyk",
|
||||||
"Whoops!": "Wah!",
|
"Whoops!": "Wah!",
|
||||||
"Widow": "Dul aýal",
|
"Widow": "Adamsy ýa-da aýaly aradan çykan",
|
||||||
"Work company name": "Işleýän edaranyň/kärhananyň ady",
|
"Work company name": "Işleýän edaranyň/kärhananyň ady",
|
||||||
"Work province": "Işleýän etrabyňyz",
|
"Work province": "Işleýän etrabyňyz",
|
||||||
"Work region": "Işleýän welaýatyňyz",
|
"Work region": "Işleýän welaýatyňyz",
|
||||||
"Work started at": "Işe başlan wagtyňyz",
|
"Work started at": "Işe başlan wagtyňyz",
|
||||||
"You are logged in!": "Sessiýa açdyňyz",
|
"You are logged in!": "Sessiýa açdyňyz",
|
||||||
"You are receiving this email because we received a password reset request for your account.": "Bu e-poçta alýarsyňyz, sebäbi hasabyňyz üçin paroly täzeden düzmek haýyşyny aldyk."
|
"You are receiving this email because we received a password reset request for your account.": "Bu e-poçta alýarsyňyz, sebäbi hasabyňyz üçin paroly täzeden düzmek haýyşyny aldyk.",
|
||||||
}
|
"Write a correct data please": "Dogry maglumat girizmegiňizi Sizden haýyş edýäris."
|
||||||
|
}
|
||||||
|
|||||||
14
lang/vendor/nova/tk.json
vendored
14
lang/vendor/nova/tk.json
vendored
@@ -5,15 +5,15 @@
|
|||||||
"90 Days": "90 gün",
|
"90 Days": "90 gün",
|
||||||
":amount selected": ":Amount sanysy saýlandy",
|
":amount selected": ":Amount sanysy saýlandy",
|
||||||
":amount Total": "Jemi :Amount",
|
":amount Total": "Jemi :Amount",
|
||||||
":resource Details": ":Resource Jikme-jiklik",
|
":resource Details": "Giňişleýin :Resource",
|
||||||
":resource Details: :title": ":Resource Jikme-jiklik: :title",
|
":resource Details: :title": ":Resource giňişleýin: :title",
|
||||||
"Action": "Hereket",
|
"Action": "Hereket",
|
||||||
"Action Happened At": "Boldy",
|
"Action Happened At": "Boldy",
|
||||||
"Action Initiated By": "Başlady",
|
"Action Initiated By": "Başlady",
|
||||||
"Action Name": "Ady",
|
"Action Name": "Amalyň ady",
|
||||||
"Action Status": ".Agdaý",
|
"Action Status": "Amalyň statusy",
|
||||||
"Action Target": "Nyşana",
|
"Action Target": "Amalyň nyşany (targedi)",
|
||||||
"Actions": "Hereketler",
|
"Actions": "Ammallar",
|
||||||
"Add :resource": ":Resource goşuň",
|
"Add :resource": ":Resource goşuň",
|
||||||
"Add row": "Setir goş",
|
"Add row": "Setir goş",
|
||||||
"Afghanistan": "Owganystan",
|
"Afghanistan": "Owganystan",
|
||||||
@@ -471,4 +471,4 @@
|
|||||||
"Zambia": "Zambiýa",
|
"Zambia": "Zambiýa",
|
||||||
"Zimbabwe": "Zimbabwe",
|
"Zimbabwe": "Zimbabwe",
|
||||||
"—": "—"
|
"—": "—"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user