wip

app/Filament/Clusters/Cards/Cards/CardResource.php

@@ -149,7 +149,9 @@ class CardResource extends Resource
                             ->beforeOrEqual('today'),
                     ])
                     ->openUrlInNewTab()
-                    ->action(fn (array $data, Card $record, Component $livewire) => CardTransactionRepository::make()->downloadCardTransaction($data, $record, $livewire)),
+                    ->action(
+                        fn (array $data, Card $record, Component $livewire) => CardTransactionRepository::make()->downloadCardTransaction($data, $record, $livewire)
+                    ),
 
                 EditAction::make()
                     ->label(''),

app/Modules/CardBalance/Repositories/CardBalanceRepository.php

@@ -18,8 +18,8 @@ class CardBalanceRepository
     {
         /** @var \App\Modules\CardBalance\Types\CardBalanceResponse */
         $data = $this->fetchCardBalance(
-            passport_serie: user()->getOption('passport_serie') ?? 'I',
-            passport_id: user()->getOption('passport_id') ?? '909090',
+            passport_serie: user()->passport_serie(),
+            passport_id: user()->passport_id(),
             card_masked: Str::mask($record->number, '*', 6, 6),
             card_expire_date: $record->month.'/'.substr($record->year, 2),
         );

app/Modules/CardTransaction/Repositories/CardTransactionRepository.php

@@ -5,7 +5,6 @@ namespace App\Modules\CardTransaction\Repositories;
 use App\Modules\Card\Models\Card;
 use App\Modules\Makeable;
 use Filament\Notifications\Notification;
-use Illuminate\Queue\Events\JobRetryRequested;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\File;
@@ -21,16 +20,16 @@ class CardTransactionRepository
     /**
      * Download card transaction
      *
-     * @param  array{start_date: string, end_date: string}  $data
+     * @param  array<inst, string>|array{start_date: string, end_date: string}  $data
      */
-    public function downloadCardTransaction(array $data, Card $record, Component $livewire)
+    public function downloadCardTransaction(array $data, Card $record, Component $livewire): null
     {
-        $start_date = Carbon::create($data['start_date']);
-        $end_date = Carbon::create($data['end_date']);
+        $start_date = new Carbon($data['start_date']);
+        $end_date = new Carbon($data['end_date']);
 
         $apiResponse = $this->fetchApi(
-            passport_serie: user()->getOption('passport_serie') ?? 'I',
-            passport_id: user()->getOption('passport_id') ?? '909090',
+            passport_serie: user()->passport_serie(),
+            passport_id: user()->passport_id(),
             card_number_masked: Str::mask($record->number, '*', 6, 6),
             card_expire_date: $record->month.'/'.substr($record->year, 2),
             start_date: $start_date->format('d.m.Y'),
@@ -48,15 +47,15 @@ class CardTransactionRepository
                 ->title($response->message)
                 ->send();
 
-            return;
+            return null;
         }
 
-        $url = $this->handleFiles($record, $response);
+        $url = $this->generateFileUrl($record, $response);
 
         // Tell Livewire to open it in a new tab
         $livewire->js("window.open('{$url}', '_blank')");
 
-        return;
+        return null;
     }
 
     /**
@@ -102,7 +101,7 @@ class CardTransactionRepository
      *
      * @param  \App\Modules\CardTransaction\Types\CardTransactionResponse  $response
      */
-    public function handleFiles(Card $model, object $response): string
+    public function generateFileUrl(Card $model, object $response): string
     {
         $unique_folder_name = Str::snake(str_replace(':', '-', $model->created_at->toDateTimeString()));
         $dir = public_path("files/{$unique_folder_name}");

app/Modules/UserAdjustments/Traits/UserAdjustments.php

@@ -40,4 +40,20 @@ trait UserAdjustments
     {
         return $this->options && array_key_exists($option, $this->options) ? $this->options[$option] : '';
     }
+
+    /**
+     * Passport serie
+     */
+    public function passport_serie(): string
+    {
+        return (string) $this->getOption('passport_serie');
+    }
+
+    /**
+     * Passport id
+     */
+    public function passport_id(): string
+    {
+        return (string) $this->getOption('passport_id');
+    }
 }