diff --git a/app/Filament/Clusters/Cards/Cards/CardResource.php b/app/Filament/Clusters/Cards/Cards/CardResource.php index 0af79d0..b0d5e97 100644 --- a/app/Filament/Clusters/Cards/Cards/CardResource.php +++ b/app/Filament/Clusters/Cards/Cards/CardResource.php @@ -59,21 +59,22 @@ class CardResource extends Resource TextInput::make('number') ->label(__('Card number')) ->mask('9999 9999 9999 9999') - ->columnSpan('1') + ->dehydrateStateUsing(fn ($state) => str_replace(' ', '', $state)) + ->columnSpan(1) ->required(), Select::make('month') ->label(__('Card month')) ->options(DateHelper::staticNumberMonths()) ->native(false) - ->columnSpan('1') + ->columnSpan(1) ->required(), Select::make('year') ->label(__('Card year')) ->options(DateHelper::staticNumberYears()) ->native(false) - ->columnSpan('1') + ->columnSpan(1) ->required(), TextInput::make('name') @@ -90,6 +91,7 @@ class CardResource extends Resource ->columns([ TextColumn::make('number') ->label(__('Card number')) + ->formatStateUsing(fn ($state) => trim(chunk_split($state, 4, ' '))) ->searchable(), TextColumn::make('name') diff --git a/app/Modules/CardBalance/Repositories/CardBalanceRepository.php b/app/Modules/CardBalance/Repositories/CardBalanceRepository.php index 4510a7a..877f094 100644 --- a/app/Modules/CardBalance/Repositories/CardBalanceRepository.php +++ b/app/Modules/CardBalance/Repositories/CardBalanceRepository.php @@ -18,8 +18,8 @@ class CardBalanceRepository { /** @var \App\Modules\CardBalance\Type\CardBalanceResponse */ $data = $this->fetchCardBalance( - passport_serie: user()->getOption('passport_serie'), - passport_id: user()->getOption('passport_id'), + passport_serie: user()->getOption('passport_serie') ?? 'I', + passport_id: user()->getOption('passport_id') ?? '909090', card_masked: Str::mask($record->number, '*', 6, 6), card_expire_date: $record->month.'/'.substr($record->year, 2), ); @@ -68,8 +68,11 @@ class CardBalanceRepository curl_close($curl); - return Str::isJson($response) + /** @var object */ + $safeResponse = Str::isJson($response) ? json_decode($response) : emptyClass(errCode: 1, message: 'Connection issue to VP'); + + return $safeResponse; } }