From 2f8444f4a41ff2e68fda9e16cd09169975655360 Mon Sep 17 00:00:00 2001 From: Thekindbull Date: Fri, 27 Dec 2024 17:00:34 +0800 Subject: [PATCH] company confirmer fixed --- app/Http/Controllers/Company/CreateCompanyController.php | 6 +++--- app/Models/Bitrix/BitrixSender.php | 1 - app/Models/Bitrix/SendCompany.php | 2 +- resources/views/company/create.blade.php | 2 +- resources/views/layouts/guest.blade.php | 3 +++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Company/CreateCompanyController.php b/app/Http/Controllers/Company/CreateCompanyController.php index 1baca20..a125ae1 100644 --- a/app/Http/Controllers/Company/CreateCompanyController.php +++ b/app/Http/Controllers/Company/CreateCompanyController.php @@ -24,17 +24,17 @@ public function __invoke(Request $request) $company = Company::create($data); if (!$company) { - return back()->with('error', __('Company creation error'))->withInput(); + return back()->withErrors(['msg' => 'Company creation error'])->withInput(); } $data['callback_url'] = route('company.status.update', [ - 'company' => $company->id, + 'company_id' => $company->id, 'secret' => $company->secret ]); $companyConfirmByBitrix = new SendCompany($company->id, $data); if (!$sender = $companyConfirmByBitrix->send()) { $company->delete(); - return back()->with('error', __('Company creation error'))->withInput(); + return back()->withErrors(['msg' => 'Company creation error'])->withInput(); } return view('company.created'); } diff --git a/app/Models/Bitrix/BitrixSender.php b/app/Models/Bitrix/BitrixSender.php index 1ea0bab..811b9fb 100644 --- a/app/Models/Bitrix/BitrixSender.php +++ b/app/Models/Bitrix/BitrixSender.php @@ -30,7 +30,6 @@ public function send() 'content' => $postdata ) ); - try { $context = stream_context_create($opts); diff --git a/app/Models/Bitrix/SendCompany.php b/app/Models/Bitrix/SendCompany.php index 11f24c0..35b60f6 100644 --- a/app/Models/Bitrix/SendCompany.php +++ b/app/Models/Bitrix/SendCompany.php @@ -55,7 +55,7 @@ public function send() $data = [ 'IBLOCK_TYPE_ID' => $this->IBLOCK_TYPE_ID, 'IBLOCK_ID' => $this->IBLOCK_ID, - 'ELEMENT_CODE' => $this->ID, + 'ELEMENT_CODE' => 'lk' . $this->ID, 'FIELDS' => $this->data ]; $sender = new BitrixSender($this->URL, $data); diff --git a/resources/views/company/create.blade.php b/resources/views/company/create.blade.php index 52e09ec..109cfa7 100644 --- a/resources/views/company/create.blade.php +++ b/resources/views/company/create.blade.php @@ -9,7 +9,7 @@
-
{{ __('Create company form') }}
+
Форма регистрации агентства
@csrf diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 4ccebde..6938dd1 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -37,6 +37,9 @@ Alfa logo
+ @if ($errors->any()) + {!! implode('', $errors->all('
:message
')) !!} + @endif @yield('content')