From 96605ab7b247be008202bfa55351c8e3413a957f Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Mon, 11 Mar 2024 01:52:37 +0500 Subject: [PATCH] wip --- app/Nova/Resources/Order/Card/Pin/CardPin.php | 29 ++++++++++--------- .../Concerns/CardRequisiteFieldsForDetail.php | 6 ---- lang/tk.json | 3 +- .../views/vendor/nova/pages/login.blade.php | 3 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/Nova/Resources/Order/Card/Pin/CardPin.php b/app/Nova/Resources/Order/Card/Pin/CardPin.php index 9e2672a..1ecd9aa 100644 --- a/app/Nova/Resources/Order/Card/Pin/CardPin.php +++ b/app/Nova/Resources/Order/Card/Pin/CardPin.php @@ -8,6 +8,9 @@ use App\Nova\Filters\RegionFilter; use App\Nova\Filters\StatusFilter; use App\Nova\Nova; use App\Nova\Resource; +use App\Nova\Resources\Order\Card\Requisite\Concerns\CardRequisiteFieldsForDetail; +use App\Nova\Resources\Order\Card\Requisite\Concerns\CardRequisiteFieldsForIndex; +use App\Repos\Order\Card\CardOrderRepo; use App\Repos\Order\Card\CardTypeRepo; use App\Repos\Order\OrderRepo; use App\Repos\System\Nova\NovaRepo; @@ -144,24 +147,24 @@ class CardPin extends Resource */ public static function afterCreate(NovaRequest $request, Model $model): void { - // CardOrderRepo::created()($model); + $model->update(['unique_id' => CardOrderRepo::fillUniqueId($model)]); } /** * Get the fields for index. */ - // public function fieldsForIndex(NovaRequest $request): array - // { - // return CardOrderFieldsForIndex::make($this); - // } + public function fieldsForIndex(NovaRequest $request): array + { + return CardRequisiteFieldsForIndex::make($this, $request); + } - // /** - // * Get the fields for detail - // */ - // public function fieldsForDetail(): array - // { - // return CardOrderFieldsForDetail::make($this); - // } + /** + * Get the fields for detail + */ + public function fieldsForDetail(): array + { + return CardRequisiteFieldsForDetail::make($this); + } /** * Get the fields displayed by the resource. @@ -201,7 +204,7 @@ class CardPin extends Resource ->mask('9999 9999 9999 9999') ->storeRawValue() ->size('w-1/2') - ->rules('required'), + ->rules('required', 'int', 'digits:16'), ]), new Panel(__('Location'), [ diff --git a/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php b/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php index 1a4f1b9..d580b0e 100644 --- a/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php +++ b/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php @@ -92,12 +92,6 @@ class CardRequisiteFieldsForDetail Image::make(__('Passport (page 8-9)'), 'passport_three'), Image::make(__('Passport (page 32)'), 'passport_four'), ]), - - new Panel(__('Ready files'), [ - File::make(__('Card requisite'), 'ready_files') - ->disk('public') - ->canSeeWhen('systemUser', $resource), - ]) ]; } } diff --git a/lang/tk.json b/lang/tk.json index c0c7e5e..df03476 100644 --- a/lang/tk.json +++ b/lang/tk.json @@ -29,7 +29,7 @@ "Connection Closed Without Response": "Jogapsyz birikme ýapyldy", "Connection Timed Out": "Baglanyşyk wagty gutardy", "Contact data": "Habarlaşmak üçin maglumatlar", - "Continue": "Dowam et", + "Continue": "Dowam etmek", "Created": "Döredildi", "Current Residence": "Häzirki ýaşaýyş ýeri", "Dashboard": "Dolandyryş paneli", @@ -261,6 +261,7 @@ "Help": "Kömek", "Successfully logged in": "Üstünlik bilen girdiňiz", "Please wait while we redirect you to your personal account": "Şahsy hasabyňyza geçýänçä garaşyň", + "Press continue": "Dowam etmek dümwme basyň", "Order new card": "Täze kart açmak", "Card requisite": "Kart rekwizit", "Card requisites": "Kart rekwizitler", diff --git a/resources/views/vendor/nova/pages/login.blade.php b/resources/views/vendor/nova/pages/login.blade.php index dab97c6..9089865 100644 --- a/resources/views/vendor/nova/pages/login.blade.php +++ b/resources/views/vendor/nova/pages/login.blade.php @@ -15,7 +15,8 @@ async function login(event) { await Swal.fire({ title: '{{ __('Successfully logged in') }}', - text: '{{ __('Please wait while we redirect you to your personal account') }}', + text: '{{ __('Press continue') }}', + confirmButtonText: '{{ __('Continue') }}', icon: 'success', showDenyButton: false, showCancelButton: false,