From 5edcde1e4cf67dc69c942a9e676f7d2aaa8b7ee8 Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Tue, 28 Oct 2025 21:59:12 +0500
Subject: [PATCH] wip

---
 .../Repositories/CardBalanceRepository.php       |  4 ++--
 .../Repositories/CardTransactionRepository.php   | 15 ++++++++-------
 .../UserAdjustments/Traits/UserAdjustments.php   | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/Modules/CardBalance/Repositories/CardBalanceRepository.php b/app/Modules/CardBalance/Repositories/CardBalanceRepository.php
index 5df1e99..004a01e 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\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),
         );
diff --git a/app/Modules/CardTransaction/Repositories/CardTransactionRepository.php b/app/Modules/CardTransaction/Repositories/CardTransactionRepository.php
index dca57df..8af7894 100644
--- a/app/Modules/CardTransaction/Repositories/CardTransactionRepository.php
+++ b/app/Modules/CardTransaction/Repositories/CardTransactionRepository.php
@@ -20,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'),
@@ -47,7 +47,7 @@ class CardTransactionRepository
                 ->title($response->message)
                 ->send();
 
-            return;
+            return null;
         }
 
         $url = $this->generateFileUrl($record, $response);
@@ -55,6 +55,7 @@ class CardTransactionRepository
         // Tell Livewire to open it in a new tab
         $livewire->js("window.open('{$url}', '_blank')");
 
+        return null;
     }
 
     /**
diff --git a/app/Modules/UserAdjustments/Traits/UserAdjustments.php b/app/Modules/UserAdjustments/Traits/UserAdjustments.php
index 52d5db0..330986c 100644
--- a/app/Modules/UserAdjustments/Traits/UserAdjustments.php
+++ b/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');
+    }
 }