From 5266e667601b0bfe01a07f0a6398a720267cf50d Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Tue, 24 Sep 2024 14:17:33 +0500 Subject: [PATCH] wip --- .../Concerns/LoanOrderFieldsForDetail.php | 9 +- app/Nova/Resources/Order/Loan/LoanOrder.php | 205 ---------------- .../Resources/Order/Loan/LoanOrderMobile.php | 15 +- .../Loan/LoanOrderMobileFieldsForDetail.php | 223 ++++++++++++++++++ app/Repos/System/Nova/NovaMenuRepo.php | 2 +- 5 files changed, 235 insertions(+), 219 deletions(-) create mode 100644 app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php diff --git a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php index 15f2b5d..ae9b67d 100644 --- a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php +++ b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php @@ -7,7 +7,6 @@ use App\Nova\Resources\Branch\Branch; use App\Nova\Resources\Order\Loan\LoanType; use App\Nova\Resources\System\Location\Province; use App\Nova\User; -use App\Repos\Order\Loan\LoanTypeRepo; use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Legal\EducationRepo; use App\Repos\System\Settings\Legal\MarriageRepo; @@ -98,12 +97,12 @@ class LoanOrderFieldsForDetail Text::make(__('Name on card'), 'card_name'), - Select::make(__('Card'). ' ' . __('Expiration month'), 'card_month') + Select::make(__('Card').' '.__('Expiration month'), 'card_month') ->displayUsingLabels() ->searchable() ->options(DateHelperRepository::monthsAsNumber()), - Select::make(__('Card'). ' ' . __('Expiration year'), 'card_year') + Select::make(__('Card').' '.__('Expiration year'), 'card_year') ->displayUsingLabels() ->searchable() ->options(DateHelperRepository::yearsUntil()), @@ -182,7 +181,7 @@ class LoanOrderFieldsForDetail ->size('w-1/2'), ]), - new Panel('1. ' . __('Guarantor'), [ + new Panel('1. '.__('Guarantor'), [ Text::make(__('Guarantor name'), 'guarantor_name'), Text::make(__('Guarantor Surname'), 'guarantor_surname'), @@ -204,7 +203,7 @@ class LoanOrderFieldsForDetail ->options(DateHelperRepository::yearsUntil()), ]), - new Panel('2. ' . __('Guarantor'), [ + new Panel('2. '.__('Guarantor'), [ Text::make(__('Guarantor name'), 'guarantor_2_name'), Text::make(__('Guarantor Surname'), 'guarantor_2_surname'), Text::make(__('Guarantor Patronic name'), 'guarantor_2_patronic_name'), diff --git a/app/Nova/Resources/Order/Loan/LoanOrder.php b/app/Nova/Resources/Order/Loan/LoanOrder.php index 61988cb..27b0164 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanOrder.php @@ -5,7 +5,6 @@ namespace App\Nova\Resources\Order\Loan; use App\Models\Branch\Branch; use App\Models\Order\Loan\LoanOrder as LoanOrderModel; use App\Models\System\Location\Province; -use App\Modules\DateHelper\Repositories\DateHelperRepository; use App\Nova\Filters\RegionFilter; use App\Nova\Filters\StatusFilter; use App\Nova\Resource; @@ -179,15 +178,6 @@ class LoanOrder extends Resource ->options(LoanTypeRepo::values()) ->rules('required') ->sortable(), - - Number::make(__('Amount of loan'), 'loan_amount') - ->hide() - ->fullWidth() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type === LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required', 'integer', 'max:40000'); - } - }), ]), new Panel(__('Location'), [ @@ -253,50 +243,6 @@ class LoanOrder extends Resource ->rules('required', 'string', new DowranAgaAllowed, 'max:255'), ]), - new Panel(__('Card'), [ - Number::make(__('Card number'), 'card_number') - ->size('w-1/4') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required'); - } - }), - - Text::make(__('Name on card'), 'card_name') - ->size('w-1/4') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required'); - } - }), - - Select::make(__('Expiration month'), 'card_month') - ->displayUsingLabels() - ->searchable() - ->options(DateHelperRepository::monthsAsNumber()) - ->size('w-1/4') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required'); - } - }), - - Select::make(__('Expiration year'), 'card_year') - ->displayUsingLabels() - ->searchable() - ->options(DateHelperRepository::yearsUntil()) - ->size('w-1/4') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required'); - } - }), - ]), - new Panel(__('Passport'), [ Select::make(__('Passport serie'), 'passport_serie') ->displayUsingLabels() @@ -415,157 +361,6 @@ class LoanOrder extends Resource ->creationRules('required') ->updateRules('nullable'), ]), - - new Panel(__('1. Guarantor'), [ - Text::make(__('Guarantor name'), 'guarantor_name') - ->fullWidth() - ->size('w-1/3') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required', 'string', 'max:255'); - } - }), - - Text::make(__('Guarantor Surname'), 'guarantor_surname') - ->fullWidth() - ->size('w-1/3') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required', 'string', 'max:255'); - } - }), - - Text::make(__('Guarantor Patronic name'), 'guarantor_patronic_name') - ->fullWidth() - ->size('w-1/3') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('nullable', 'string', 'max:255'); - } - }), - - Number::make(__('Card number'), 'guarantor_card_number') - ->size('w-1/2') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required', 'integer', 'digits:16'); - } - }), - - Text::make(__('Name on card'), 'guarantor_card_name') - ->size('w-1/2') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required', 'string', 'max:255'); - } - }), - - Select::make(__('Expiration month'), 'guarantor_card_month') - ->displayUsingLabels() - ->searchable() - ->options(DateHelperRepository::monthsAsNumber()) - ->size('w-1/2') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required'); - } - }), - - Select::make(__('Expiration year'), 'guarantor_card_year') - ->displayUsingLabels() - ->searchable() - ->options(DateHelperRepository::yearsUntil()) - ->size('w-1/2') - ->hide() - ->dependsOn('loan_type', function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId()) { - $field->show()->rules('required'); - } - }), - ]), - - new Panel(__('2. Guarantor'), [ - Text::make(__('Guarantor name'), 'guarantor_2_name') - ->fullWidth() - ->size('w-1/3') - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('required', 'string', 'max:255'); - } - }), - - Text::make(__('Guarantor Surname'), 'guarantor_2_surname') - ->fullWidth() - ->size('w-1/3') - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('required', 'string', 'max:255'); - } - }), - - Text::make(__('Guarantor Patronic name'), 'guarantor_2_patronic_name') - ->fullWidth() - ->size('w-1/3') - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('nullable', 'string', 'max:255'); - } - }), - - Number::make(__('Card number'), 'guarantor_2_card_number') - ->size('w-1/2') - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('nullable', 'string', 'max:255'); - } - }), - - Text::make(__('Name on card'), 'guarantor_2_card_name') - ->size('w-1/2') - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('required', 'string', 'max:255'); - } - }), - - Select::make(__('Expiration month'), 'guarantor_2_card_month') - ->displayUsingLabels() - ->searchable() - ->options(DateHelperRepository::monthsAsNumber()) - ->size('w-1/2') - ->sortable() - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('required'); - } - }), - - Select::make(__('Expiration year'), 'guarantor_2_card_year') - ->displayUsingLabels() - ->searchable() - ->options(DateHelperRepository::yearsUntil()) - ->size('w-1/2') - ->sortable() - ->hide() - ->dependsOn(['loan_type', 'loan_amount'], function ($field, $request, $formData) { - if ($formData->loan_type == LoanTypeRepo::loanTypeGuarantorId() && $formData->loan_amount && floatval($formData->loan_amount) > 20000) { - $field->show()->rules('required'); - } - }), - ]), - ]; } diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobile.php b/app/Nova/Resources/Order/Loan/LoanOrderMobile.php index a513b4d..99148a8 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrderMobile.php +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobile.php @@ -9,7 +9,6 @@ use App\Modules\DateHelper\Repositories\DateHelperRepository; use App\Nova\Filters\RegionFilter; use App\Nova\Filters\StatusFilter; use App\Nova\Resource; -use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForDetail; use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForIndex; use App\Repos\Order\Loan\LoanTypeRepo; use App\Repos\Order\OrderRepo; @@ -141,7 +140,7 @@ class LoanOrderMobile extends Resource */ public function fieldsForDetail(): array { - return LoanOrderFieldsForDetail::make($this); + return LoanOrderMobileFieldsForDetail::make(); } /** @@ -260,14 +259,14 @@ class LoanOrderMobile extends Resource ->size('w-1/4') ->rules('required'), - Select::make(__('Card'). ' ' . __('Expiration month'), 'card_month') + Select::make(__('Card').' '.__('Expiration month'), 'card_month') ->displayUsingLabels() ->searchable() ->options(DateHelperRepository::monthsAsNumber()) ->size('w-1/4') ->rules('required'), - Select::make(__('Card'). ' ' . __('Expiration year'), 'card_year') + Select::make(__('Card').' '.__('Expiration year'), 'card_year') ->displayUsingLabels() ->searchable() ->options(DateHelperRepository::yearsUntil()) @@ -394,7 +393,7 @@ class LoanOrderMobile extends Resource ->updateRules('nullable'), ]), - new Panel('1. ' . __('Guarantor'), [ + new Panel('1. '.__('Guarantor'), [ Text::make(__('Guarantor name'), 'guarantor_name') ->fullWidth() ->size('w-1/3') @@ -433,7 +432,7 @@ class LoanOrderMobile extends Resource ->rules('required'), ]), - new Panel('2. ' . __('Guarantor'), [ + new Panel('2. '.__('Guarantor'), [ Text::make(__('Guarantor name'), 'guarantor_2_name') ->fullWidth() ->size('w-1/3') @@ -482,7 +481,7 @@ class LoanOrderMobile extends Resource } }), - Select::make(__('Card') .' ' . __('Expiration month'), 'guarantor_2_card_month') + Select::make(__('Card').' '.__('Expiration month'), 'guarantor_2_card_month') ->displayUsingLabels() ->searchable() ->options(DateHelperRepository::monthsAsNumber()) @@ -495,7 +494,7 @@ class LoanOrderMobile extends Resource } }), - Select::make(__('Card') .' ' .__('Expiration year'), 'guarantor_2_card_year') + Select::make(__('Card').' '.__('Expiration year'), 'guarantor_2_card_year') ->displayUsingLabels() ->searchable() ->options(DateHelperRepository::yearsUntil()) diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php new file mode 100644 index 0000000..53f1f8d --- /dev/null +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php @@ -0,0 +1,223 @@ +hide(), + Text::make(__('ID'), 'unique_id'), + + DateTime::make(__('Created at'), 'created_at') + ->turkmenDateTime(), + + Badge::make(__('Status'), 'status') + ->map(OrderRepo::statusClasses()) + ->addTypes([ + 'primary' => 'dark:bg-gray-900 bg-gray-600 text-white', + ]) + ->labels(OrderRepo::statusValues()) + ->withIcons() + ->icons(OrderRepo::statusIcons()), + + Text::make(__('Note'), 'notes'), + + BelongsTo::make(__('Created by').': ', 'user', User::class), + + new Panel(__('Loan'), [ + BelongsTo::make(__('Loan type'), 'loanType', LoanType::class), + Number::make(__('Amount of loan'), 'loan_amount'), + ]), + + new Panel(__('Location'), [ + Select::make(__('Region'), 'region') + ->displayUsingLabels() + ->options(RegionRepo::values()) + ->size('w-1/2'), + + BelongsTo::make(__('Branch'), 'branch', Branch::class), + ]), + + new Panel(__('Personal data'), [ + Text::make( + __('Full Name'), + fn ($model) => sprintf('%s %s %s', $model->customer_name, $model->customer_surname, $model->customer_patronic_name) + ), + + Select::make(__('Education'), 'education') + ->displayUsingLabels() + ->options(EducationRepo::values()) + ->size('w-1/3'), + + Select::make(__('Marriage status'), 'marriage_status') + ->displayUsingLabels() + ->options(MarriageRepo::values()) + ->size('w-1/3'), + + Date::make(__('Date of birth'), 'born_at') + ->size('w-1/3') + ->toTurkmenFormat(), + + Text::make(__('Residence (passport)'), 'passport_address') + ->size('w-1/2'), + + Text::make(__('Current Residence'), 'real_address') + ->size('w-1/2'), + ]), + + new Panel(__('Card'), [ + Number::make(__('Card number'), 'card_number'), + + Text::make(__('Name on card'), 'card_name'), + + Select::make(__('Card').' '.__('Expiration month'), 'card_month') + ->displayUsingLabels() + ->searchable() + ->options(DateHelperRepository::monthsAsNumber()), + + Select::make(__('Card').' '.__('Expiration year'), 'card_year') + ->displayUsingLabels() + ->searchable() + ->options(DateHelperRepository::yearsUntil()), + ]), + + new Panel(__('Contact data'), [ + Email::make(__('Email'), 'email') + ->size('w-1/4'), + + NovaInputmask::make(__('Phone'), 'phone') + ->mask('+(\\9\\93)-99-99-99-99') + ->storeRawValue() + ->size('w-1/4'), + + NovaInputmask::make(__('Phone Additional'), 'phone_additional') + ->mask('+(\\9\\93)-99-99-99-99') + ->storeRawValue() + ->size('w-1/4'), + + NovaInputmask::make(__('Home phone'), 'phone_home') + ->mask('+(\\9\\93)-9{8}') + ->storeRawValue() + ->size('w-1/4'), + ]), + + new Panel(__('Job'), [ + Text::make(__('Work company name'), 'work_company') + ->size('w-1/2'), + + NovaInputmask::make(__('HR department work number'), 'work_company_accountant_number') + ->mask('+(\\9\\93)-9{8}') + ->size('w-1/2'), + + Select::make(__('Work region'), 'work_region') + ->displayUsingLabels() + ->options(RegionRepo::values()) + ->size('w-1/2'), + + BelongsTo::make(__('Work province'), 'workProvince', Province::class), + + Text::make(__('Position'), 'work_position') + ->size('w-1/2'), + + Text::make(__('Salary'), 'work_salary') + ->size('w-1/4'), + + Date::make(__('Work started at'), 'work_started_at') + ->size('w-1/4') + ->toTurkmenFormat(), + ]), + + new Panel(__('Passport'), [ + Text::make(__('Passport'), fn ($model) => sprintf( + '%s %s, %sý', + $model->passport_serie, + $model->passport_id, + $model->passport_given_at?->format('d.m.Y') + ))->asHtml(), + + Text::make(__('Passport given by'), 'passport_given_by') + ->size('w-1/2'), + + Text::make(__('Born place (passport)'), 'born_place') + ->size('w-1/2'), + + Image::make(__('Passport (page 1)'), 'passport_one') + ->size('w-1/2'), + + Image::make(__('Passport (page 2-3)'), 'passport_two') + ->size('w-1/2'), + + Image::make(__('Passport (page 8-9)'), 'passport_three') + ->size('w-1/2'), + + Image::make(__('Passport (page 32)'), 'passport_four') + ->size('w-1/2'), + ]), + + new Panel('1. '.__('Guarantor'), [ + Text::make(__('Guarantor name'), 'guarantor_name'), + + Text::make(__('Guarantor Surname'), 'guarantor_surname'), + + Text::make(__('Guarantor Patronic name'), 'guarantor_patronic_name'), + + Number::make(__('Card number'), 'guarantor_card_number'), + + Text::make(__('Name on card'), 'guarantor_card_name'), + + Select::make(__('Expiration month'), 'guarantor_card_month') + ->displayUsingLabels() + ->searchable() + ->options(DateHelperRepository::monthsAsNumber()), + + Select::make(__('Expiration year'), 'guarantor_card_year') + ->displayUsingLabels() + ->searchable() + ->options(DateHelperRepository::yearsUntil()), + ]), + + new Panel('2. '.__('Guarantor'), [ + Text::make(__('Guarantor name'), 'guarantor_2_name'), + Text::make(__('Guarantor Surname'), 'guarantor_2_surname'), + Text::make(__('Guarantor Patronic name'), 'guarantor_2_patronic_name'), + + Number::make(__('Card number'), 'guarantor_2_card_number'), + Text::make(__('Name on card'), 'guarantor_2_card_name'), + + Select::make(__('Expiration month'), 'guarantor_2_card_month') + ->displayUsingLabels() + ->searchable() + ->options(DateHelperRepository::monthsAsNumber()), + + Select::make(__('Expiration year'), 'guarantor_2_card_year') + ->displayUsingLabels() + ->searchable() + ->options(DateHelperRepository::yearsUntil()), + ]), + + ]; + } +} diff --git a/app/Repos/System/Nova/NovaMenuRepo.php b/app/Repos/System/Nova/NovaMenuRepo.php index b06c049..0961d26 100644 --- a/app/Repos/System/Nova/NovaMenuRepo.php +++ b/app/Repos/System/Nova/NovaMenuRepo.php @@ -44,7 +44,7 @@ class NovaMenuRepo MenuGroup::make(__('Loan department'), [ MenuItem::resource(LoanOrder::class), MenuItem::resource(LoanOrderMobile::class) - ->name(__('Loan order') . ' (Mobile)'), + ->name(__('Loan order').' (Mobile)'), MenuItem::resource(LoanPaidOffLetterOrder::class), ])->collapsedByDefault(),