diff --git a/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php b/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php index 788ccf4..ca4a046 100644 --- a/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php +++ b/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php @@ -2,8 +2,8 @@ namespace App\Modules\CardRequisite\Repositories; -use App\Modules\CardTransaction\Repositories\CardTransactionRepository; use App\Modules\Card\Models\Card; +use App\Modules\CardTransaction\Repositories\CardTransactionRepository; use App\Modules\Makeable; use Filament\Notifications\Notification; use Illuminate\Support\Facades\File; @@ -16,7 +16,7 @@ class CardRequisiteRepository { use Makeable; - public function downloadCardRequisite(Card $record, Component $livewire) + public function downloadCardRequisite(Card $record, Component $livewire): ?\Symfony\Component\HttpFoundation\BinaryFileResponse { /** @var \App\Modules\CardTransaction\Types\CardTransactionResponse */ $response = $this->fetchApi($record); @@ -27,7 +27,7 @@ class CardRequisiteRepository ->title($response->message) ->send(); - return; + return null; } $path = $this->generateFile($record, $response); @@ -37,10 +37,8 @@ class CardRequisiteRepository /** * Fetch api - * - * @return object */ - public function fetchApi(Card $record) + public function fetchApi(Card $record): object { $date = today()->format('d.m.Y'); @@ -53,9 +51,12 @@ class CardRequisiteRepository end_date: $date, ); - return Str::isJson($response) + /** @var \App\Modules\CardTransaction\Types\CardTransactionResponse */ + $response = Str::isJson($response) ? json_decode($response) : emptyClass(errCode: 1, message: 'Connection issue to VP'); + + return $response; } /** @@ -85,7 +86,7 @@ class CardRequisiteRepository 'card_given_date' => '---YOK---', ]); - $unique_folder_name = Str::snake(str_replace(':', '-', $model->created_at->toDateTimeString())); + $unique_folder_name = Str::snake(str_replace(':', '-', now()->toDateTimeString())); $dir = Storage::disk('local')->path("card-requisite/{$unique_folder_name}"); File::makeDirectory($dir, 0777, true, true);