From 7102f09fb25dd88393409f4acfc8f36560f15258 Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 15 Jan 2026 23:47:55 +0800 Subject: [PATCH] =?UTF-8?q?fix!=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81?= =?UTF-8?q?=D0=B0=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=81=D1=82=D0=B2=D0=B0?= =?UTF-8?q?,=20=D0=BF=D1=80=D0=B8=D1=88=D0=B5=D0=B4=D1=88=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=B8=D0=B7=20=D0=B1=D0=B8=D1=82=D1=80=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ConfirmCompanyController.php | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php b/app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php index 88c26be..2939fb3 100644 --- a/app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php +++ b/app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php @@ -8,7 +8,7 @@ use Illuminate\Foundation\Auth\RegistersUsers; use Modules\Main\Models\Company\Company; use Modules\Main\Models\Company\CompanyAdmin; -use App\Models\User; +use Modules\User\Models\User; class ConfirmCompanyController extends Controller { @@ -22,31 +22,24 @@ class ConfirmCompanyController extends Controller */ public function __invoke(Request $request, Company $company) { - if ($company->secret == $request->token) - { - $company->status = $request->status; - $company->save(); - $user = User::where('email', $company->email); - if ($user->count() == 1) - { - $user = $user->first(); - } - else - { - $user = User::create([ - 'name' => $request->user_name, - 'email' => $company->email, - 'phone' => $request->user_phone - ]); - $user->setForcedPassword(); - } - CompanyAdmin::where('user_id', $user->id)->delete();//удаляю, если уже была админская учетка - CompanyAdmin::create([ - 'user_id' => $user->id, - 'company_id' => $company->id + $company->status = $request->status; + $company->save(); + $user = User::where('email', $company->email); + if ($user->count() == 1) { + $user = $user->first(); + } else { + $user = User::create([ + 'name' => $request->user_name, + 'email' => $company->email, + 'phone' => $request->user_phone ]); - return true; + $user->setForcedPassword(); } - return false; + CompanyAdmin::where('user_id', $user->id)->delete();//удаляю, если уже была админская учетка + CompanyAdmin::create([ + 'user_id' => $user->id, + 'company_id' => $company->id + ]); + return true; } } \ No newline at end of file