From 774227ea6826dcbade293613b12b5f65aa249def Mon Sep 17 00:00:00 2001 From: Thekindbull Date: Sun, 9 Nov 2025 19:26:23 +0800 Subject: [PATCH] api updated & migration updated --- ...26_copy_client_field_from_deals_table.php} | 0 .../Controllers/AdminBitrixController.php | 17 ------------ .../Http/Controllers/BitrixApiController.php} | 26 ++++++++++++------- .../Controllers}/ConfirmCompanyController.php | 11 ++++++-- .../Controllers/ContractUpdateController.php} | 8 +++--- ..._05_070035_create_deal_contacts_table.php} | 0 .../Controllers/Company/DetailsController.php | 2 +- .../Main/Models/Company/CompanyType.php | 4 +-- app/Modules/Main/Models/Company/Details.php | 4 +-- lang/ru.json | 1 + .../views}/company/agents/table.blade.php | 0 .../views}/company/create.blade.php | 0 .../views}/company/created.blade.php | 0 .../views}/company/details/agency.blade.php | 0 .../views}/company/details/selfemp.blade.php | 0 .../views}/company/details/soleprop.blade.php | 0 .../views}/company/post_confirmer.blade.php | 0 routes/api.php | 9 ++++--- routes/web.php | 1 + 19 files changed, 43 insertions(+), 40 deletions(-) rename app/Modules/Bitrix/Database/Migrations/{2025_11_08_456725_copy_client_field_from_deals_table.php => 2025_11_08_456726_copy_client_field_from_deals_table.php} (100%) delete mode 100644 app/Modules/Bitrix/Http/Controllers/AdminBitrixController.php rename app/{Http/Controllers/Bitrix/ClientsApiController.php => Modules/Bitrix/Http/Controllers/BitrixApiController.php} (71%) rename app/Modules/{Main/Http/Controllers/Company => Bitrix/Http/Controllers}/ConfirmCompanyController.php (75%) rename app/{Http/Controllers/Bitrix/ContractApiController.php => Modules/Bitrix/Http/Controllers/ContractUpdateController.php} (92%) rename app/Modules/Main/Database/Migrations/{2025_11_11_070035_create_deal_contacts_table.php => 2025_11_05_070035_create_deal_contacts_table.php} (100%) rename {app/Modules/Main/Views => resources/views}/company/agents/table.blade.php (100%) rename {app/Modules/Main/Views => resources/views}/company/create.blade.php (100%) rename {app/Modules/Main/Views => resources/views}/company/created.blade.php (100%) rename {app/Modules/Main/Views => resources/views}/company/details/agency.blade.php (100%) rename {app/Modules/Main/Views => resources/views}/company/details/selfemp.blade.php (100%) rename {app/Modules/Main/Views => resources/views}/company/details/soleprop.blade.php (100%) rename {app/Modules/Main/Views => resources/views}/company/post_confirmer.blade.php (100%) diff --git a/app/Modules/Bitrix/Database/Migrations/2025_11_08_456725_copy_client_field_from_deals_table.php b/app/Modules/Bitrix/Database/Migrations/2025_11_08_456726_copy_client_field_from_deals_table.php similarity index 100% rename from app/Modules/Bitrix/Database/Migrations/2025_11_08_456725_copy_client_field_from_deals_table.php rename to app/Modules/Bitrix/Database/Migrations/2025_11_08_456726_copy_client_field_from_deals_table.php diff --git a/app/Modules/Bitrix/Http/Controllers/AdminBitrixController.php b/app/Modules/Bitrix/Http/Controllers/AdminBitrixController.php deleted file mode 100644 index c37b875..0000000 --- a/app/Modules/Bitrix/Http/Controllers/AdminBitrixController.php +++ /dev/null @@ -1,17 +0,0 @@ -hash)->first()) { switch ( $request->action ) { - case $this::ACTION_CONFIRM: - $this->confirm($deal, $request); + case $this::ACTION_CONFIRM_DEAL: + $this->confirmDeal($deal, $request); break; case $this::ACTION_UPDATE_CONTRACT: $this->updateContract($deal, $request); break; + case $this::ACTION_CONFIRM_COMPANY: + $this->confirmCompany($request); + break; } return true; } return false; } - public function confirm(Deal $deal, Request $request) + public function confirmCompany(Request $request) + { + $confirmer = new ConfirmCompanyController; + $confirmer($request); + } + public function confirmDeal(Deal $deal, Request $request) { $agent = $deal->agent; if ((bool) $request->is_unique) @@ -76,7 +84,7 @@ public function confirm(Deal $deal, Request $request) public function updateContract(Deal $deal, Request $request) { - $contract = new ContractApiController; + $contract = new ContractUpdateController; $contract($deal, $request); } } diff --git a/app/Modules/Main/Http/Controllers/Company/ConfirmCompanyController.php b/app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php similarity index 75% rename from app/Modules/Main/Http/Controllers/Company/ConfirmCompanyController.php rename to app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php index 1bcdf49..efed76b 100644 --- a/app/Modules/Main/Http/Controllers/Company/ConfirmCompanyController.php +++ b/app/Modules/Bitrix/Http/Controllers/ConfirmCompanyController.php @@ -1,6 +1,6 @@ company_id); - if ($company->secret == $request->secret) + if ($company->secret == $request->token) { $company->status = $request->status; $company->save(); diff --git a/app/Http/Controllers/Bitrix/ContractApiController.php b/app/Modules/Bitrix/Http/Controllers/ContractUpdateController.php similarity index 92% rename from app/Http/Controllers/Bitrix/ContractApiController.php rename to app/Modules/Bitrix/Http/Controllers/ContractUpdateController.php index 9d2f5ef..b463304 100644 --- a/app/Http/Controllers/Bitrix/ContractApiController.php +++ b/app/Modules/Bitrix/Http/Controllers/ContractUpdateController.php @@ -1,6 +1,6 @@ agent; - if (!$deal->bitrixId) + /*if (!$deal->bitrixId) { $deal->bitrixId()->create(['bx_id' => $request->deal_id]); - } + }*/ $agent->user->notify(new ContractUpdated($deal->contract)); return true; diff --git a/app/Modules/Main/Database/Migrations/2025_11_11_070035_create_deal_contacts_table.php b/app/Modules/Main/Database/Migrations/2025_11_05_070035_create_deal_contacts_table.php similarity index 100% rename from app/Modules/Main/Database/Migrations/2025_11_11_070035_create_deal_contacts_table.php rename to app/Modules/Main/Database/Migrations/2025_11_05_070035_create_deal_contacts_table.php diff --git a/app/Modules/Main/Http/Controllers/Company/DetailsController.php b/app/Modules/Main/Http/Controllers/Company/DetailsController.php index bc1834b..a1d7a3b 100644 --- a/app/Modules/Main/Http/Controllers/Company/DetailsController.php +++ b/app/Modules/Main/Http/Controllers/Company/DetailsController.php @@ -35,7 +35,7 @@ public function index($companyId = null) $details = new Details($company); $details = $details->get(); - if ($company->type == CompanyType::SelfEmployer || $company->type == CompanyType::SoleProperty) + if ($company->type == CompanyType::SoleProperty) { return view('main::company.details.selfemp', [ 'company' => $company, diff --git a/app/Modules/Main/Models/Company/CompanyType.php b/app/Modules/Main/Models/Company/CompanyType.php index 705b886..f8b1d6e 100644 --- a/app/Modules/Main/Models/Company/CompanyType.php +++ b/app/Modules/Main/Models/Company/CompanyType.php @@ -2,7 +2,7 @@ namespace Modules\Main\Models\Company; enum CompanyType: string { - case Agency = "AGENCY"; - case SelfEmployer = "SELFEMP"; + case Agency = "AGENCY"; + // case SelfEmployer = "SELFEMP"; case SoleProperty = "SOLEPROP"; } \ No newline at end of file diff --git a/app/Modules/Main/Models/Company/Details.php b/app/Modules/Main/Models/Company/Details.php index 07dc65e..f8c97ae 100644 --- a/app/Modules/Main/Models/Company/Details.php +++ b/app/Modules/Main/Models/Company/Details.php @@ -29,12 +29,12 @@ public function create() { if (!$this->company->details) { - if ($this->company->type == CompanyType::SelfEmployer) + /*if ($this->company->type == CompanyType::SelfEmployer) { $this->company->details = $this->emptyForSelfEmp(); $this->company->save(); } - ; + ;*/ if ($this->company->type == CompanyType::SoleProperty) { $this->company->details = $this->emptyForSelfEmp(); diff --git a/lang/ru.json b/lang/ru.json index 97c098b..b9e0614 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -24,6 +24,7 @@ "SelfEmployer": "Самозанятый", "SoleProperty": "Индивидуальный предприниматель", "Agency name": "Название агентства", + "Soleprop name": "ФИО индивидуального предпринимателя (полностью)", "Inn": "ИНН", "Legal address": "Юридический адрес", "Phone": "Номер телефона", diff --git a/app/Modules/Main/Views/company/agents/table.blade.php b/resources/views/company/agents/table.blade.php similarity index 100% rename from app/Modules/Main/Views/company/agents/table.blade.php rename to resources/views/company/agents/table.blade.php diff --git a/app/Modules/Main/Views/company/create.blade.php b/resources/views/company/create.blade.php similarity index 100% rename from app/Modules/Main/Views/company/create.blade.php rename to resources/views/company/create.blade.php diff --git a/app/Modules/Main/Views/company/created.blade.php b/resources/views/company/created.blade.php similarity index 100% rename from app/Modules/Main/Views/company/created.blade.php rename to resources/views/company/created.blade.php diff --git a/app/Modules/Main/Views/company/details/agency.blade.php b/resources/views/company/details/agency.blade.php similarity index 100% rename from app/Modules/Main/Views/company/details/agency.blade.php rename to resources/views/company/details/agency.blade.php diff --git a/app/Modules/Main/Views/company/details/selfemp.blade.php b/resources/views/company/details/selfemp.blade.php similarity index 100% rename from app/Modules/Main/Views/company/details/selfemp.blade.php rename to resources/views/company/details/selfemp.blade.php diff --git a/app/Modules/Main/Views/company/details/soleprop.blade.php b/resources/views/company/details/soleprop.blade.php similarity index 100% rename from app/Modules/Main/Views/company/details/soleprop.blade.php rename to resources/views/company/details/soleprop.blade.php diff --git a/app/Modules/Main/Views/company/post_confirmer.blade.php b/resources/views/company/post_confirmer.blade.php similarity index 100% rename from app/Modules/Main/Views/company/post_confirmer.blade.php rename to resources/views/company/post_confirmer.blade.php diff --git a/routes/api.php b/routes/api.php index f664be5..23d41fc 100644 --- a/routes/api.php +++ b/routes/api.php @@ -4,8 +4,9 @@ use Illuminate\Support\Facades\Route; use App\Http\Controllers\ConfirmClientFromBitrix; -use App\Http\Controllers\Company\ConfirmCompanyController; -use App\Http\Controllers\Bitrix\ClientsApiController; +use Modles\Main\Http\Controllers\Company\ConfirmCompanyController; +use Modules\Bitrix\Http\Controllers\Bitrix\BitrixApiController; +use Modules\Bitrix\Http\Controllers\Bitrix\CompanyConfirmController; /* |-------------------------------------------------------------------------- @@ -23,7 +24,9 @@ return $request->user(); }); -Route::post('/client', [ClientsApiController::class, 'index'])->name('api.client'); +Route::post('/client', [BitrixApiController::class, 'index'])->name('api.client'); +Route::post('/company/confirm', [BitrixApiController::class, 'index'])->name('api.company.confirm'); + //Route::post('/client/confirm', [ConfirmClientFromBitrix::class, 'confirm'])->name('deal.confirm'); //Route::post('/client/{$deal}/contract', CoController::class)->name('company.status.update'); diff --git a/routes/web.php b/routes/web.php index ae28f1c..667411d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,6 +21,7 @@ }); Auth::routes(); + Route::get('/email/verify/{id}/{hash}', function (EmailVerificationRequest $request) { $request->fulfill();