From 0f6265ed159b9ae880ef082e450c905a1560f255 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Mon, 27 Oct 2025 20:08:37 +0500 Subject: [PATCH] wip --- .../Clusters/Cards/Cards/CardResource.php | 23 +++---------------- .../Repositories/CardBalanceRepository.php | 3 ++- app/Providers/Filament/WorkPanelProvider.php | 1 - 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/app/Filament/Clusters/Cards/Cards/CardResource.php b/app/Filament/Clusters/Cards/Cards/CardResource.php index 9914f45..0af79d0 100644 --- a/app/Filament/Clusters/Cards/Cards/CardResource.php +++ b/app/Filament/Clusters/Cards/Cards/CardResource.php @@ -21,7 +21,7 @@ use Filament\Schemas\Schema; use Filament\Support\Icons\Heroicon; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; -use Illuminate\Support\Str; +use Illuminate\Contracts\View\View; class CardResource extends Resource { @@ -120,25 +120,8 @@ class CardResource extends Resource Action::make('card_balance') ->label(__('Card balance')) ->icon('heroicon-m-credit-card') - ->modalContent(function (Card $record) { - /** @var \App\Modules\CardBalance\Type\CardBalanceResponse */ - $data = CardBalanceRepository::make()->fetchCardBalance( - passport_serie: user()->getOption('passport_serie'), - passport_id: user()->getOption('passport_id'), - card_masked: Str::mask($record->number, '*', 6, 6), - card_expire_date: $record->month.'/'.substr($record->year, 2), - ); - - if ($data->errCode != 0) { - info(['err' => $data]); - - return null; - } - - info(['data' => $data]); - - return view('module.card-balance::card-balance-modal', compact('data')); - }), + ->requiresConfirmation(false) + ->modalContent(fn (Card $record): View => CardBalanceRepository::make()->showCardBalance($record)), EditAction::make() ->label(''), diff --git a/app/Modules/CardBalance/Repositories/CardBalanceRepository.php b/app/Modules/CardBalance/Repositories/CardBalanceRepository.php index 3a5e337..28ed67c 100644 --- a/app/Modules/CardBalance/Repositories/CardBalanceRepository.php +++ b/app/Modules/CardBalance/Repositories/CardBalanceRepository.php @@ -4,6 +4,7 @@ namespace App\Modules\CardBalance\Repositories; use App\Modules\Card\Models\Card; use App\Modules\Makeable; +use Illuminate\Contracts\View\View; use Illuminate\Support\Str; class CardBalanceRepository @@ -13,7 +14,7 @@ class CardBalanceRepository /** * Show card balance */ - public function showCardBalance(Card $record) + public function showCardBalance(Card $record): View { /** @var \App\Modules\CardBalance\Type\CardBalanceResponse */ $data = $this->fetchCardBalance( diff --git a/app/Providers/Filament/WorkPanelProvider.php b/app/Providers/Filament/WorkPanelProvider.php index 167f5c8..38e4bd5 100644 --- a/app/Providers/Filament/WorkPanelProvider.php +++ b/app/Providers/Filament/WorkPanelProvider.php @@ -24,7 +24,6 @@ use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; use Joaopaulolndev\FilamentEditProfile\FilamentEditProfilePlugin; -use Joaopaulolndev\FilamentEditProfile\Pages\EditProfilePage; class WorkPanelProvider extends PanelProvider {