diff --git a/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php b/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php index 75e2fee..8f1198d 100644 --- a/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php +++ b/app/Modules/CardRequisite/Repositories/CardRequisiteRepository.php @@ -6,8 +6,10 @@ 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; use Illuminate\Support\Str; use Livewire\Component; +use PhpOffice\PhpWord\TemplateProcessor; class CardRequisiteRepository { @@ -61,26 +63,25 @@ class CardRequisiteRepository /** * Generate file * - * @param \App\Models\Order\Card\Requisite\CardRequisite $model - * @param \App\Nova\Resources\Order\Card\CardTransaction\Actions\ResponseTypes\AzatApiClientInfoAllResponse $data + * @param \App\Modules\CardTransaction\Types\CardTransactionResponse $response * @return string */ - public function generateFile($model, $data) + public function generateFile(Card $model, object $response) { - $doc_path = app_path('Nova/Resources/Order/Card/Requisite/Docs/card-requisite.docx'); + $doc_path = modules_path('CardRequisite/Resources/Docs/card-requisite.docx'); $templateProcessor = new TemplateProcessor($doc_path); $templateProcessor->setValues([ 'year' => date('Y'), - 'name' => $data->clientName, - 'contract' => $data->cardAccountNumber, - 'bank' => $data->depName, - 'hasap' => $data->accountNumber, - 'sb' => $data->inn, - 'bab' => $data->mfo, - 'card_type' => $data->cardName, - 'card_number' => $data->cardPan, - 'phone' => $data->mobilPhone ?? '-', + 'name' => $response->clientName, + 'contract' => $response->cardAccountNumber, + 'bank' => $response->depName, + 'hasap' => $response->accountNumber, + 'sb' => $response->inn, + 'bab' => $response->mfo, + 'card_type' => $response->cardName, + 'card_number' => $response->cardPan, + 'phone' => $response->mobilPhone ?? '-', 'contract_date' => '---YOK---', 'card_order_date' => '---YOK---', 'card_given_date' => '---YOK---', diff --git a/app/Modules/ModuleServiceProvider.php b/app/Modules/ModuleServiceProvider.php index 635e6b7..7854a51 100644 --- a/app/Modules/ModuleServiceProvider.php +++ b/app/Modules/ModuleServiceProvider.php @@ -63,7 +63,7 @@ class ModuleServiceProvider extends ServiceProvider foreach ($module->app->getComposerRequirements() as $package) { $packageInstalled = match ($package->type) { ModulePackageType::PACKAGE => InstalledVersions::isInstalled($package->name), - ModulePackageType::MODULE => module_exists($package->name), + ModulePackageType::MODULE => module_exists($package->name), // @phpstan-ignore-line default => true, }; @@ -84,7 +84,7 @@ class ModuleServiceProvider extends ServiceProvider foreach ($module->app->getComposerRequirements() as $package) { $packageInstalled = match ($package->type) { ModulePackageType::PACKAGE => InstalledVersions::isInstalled($package->name), - ModulePackageType::MODULE => module_exists($package->name), + ModulePackageType::MODULE => module_exists($package->name), // @phpstan-ignore-line default => true, }; diff --git a/app/Modules/module-helpers.php b/app/Modules/module-helpers.php index 73a734c..cfca1bc 100644 --- a/app/Modules/module-helpers.php +++ b/app/Modules/module-helpers.php @@ -49,7 +49,7 @@ function emptyModule(): ModuleContract /** * Module exists */ -function module_exists(string $moduleName) +function module_exists(string $moduleName): bool { return modular()->moduleExists($moduleName); }