diff --git a/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php b/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php index c1cbc05..9c50975 100644 --- a/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php +++ b/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php @@ -1,5 +1,13 @@ token)->first()) { return false; }; $object = $bxId->bitrixable; - //print_r($object);die(); switch ($request->action) { case $this::ACTION_CONFIRM_DEAL: - $this->confirmDeal($object, $request); + return $this->confirmDeal($object, $request); break; case $this::ACTION_UPDATE_CONTRACT: - $this->updateContract($object, $request); + return $this->updateContract($object, $request); break; case $this::ACTION_CONFIRM_COMPANY: - $this->confirmCompany($request, $object); + return $this->confirmCompany($request, $object); break; } return false; @@ -45,7 +52,7 @@ public function index(Request $request) public function confirmCompany(Request $request, $company) { $confirmer = new ConfirmCompanyController; - $confirmer($request, $company); + return $confirmer($request, $company); } public function confirmDeal(Deal $deal, Request $request) { @@ -61,31 +68,17 @@ public function confirmDeal(Deal $deal, Request $request) $deal->status = DealStatus::NOT_UNIQUE; $agent->user->notify(new NotUniqueContact($deal)); } - if (!$agent->bitrixId()) { $agent->setBitrixId($request->agent_id); } - - Log::build([ - 'driver' => 'single', - 'path' => storage_path('logs/bitrix.log'), - ])->error( - json_encode( - [ - 'is_unique' => $request->is_unique, - 'deal' => $deal->id, - 'status' => $deal->status - ] - ) - ); $deal->save(); - return $deal->id; + return true; } public function updateContract(Deal $deal, Request $request) { //print_r($request->all());die(); $contract = new ContractUpdateController; - $contract($deal, $request); + return $contract($deal, $request); } } diff --git a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php index bcf3012..9f809a6 100644 --- a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php +++ b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php @@ -172,18 +172,18 @@ class="bi bi-plus-circle" viewBox="0 0 16 16"> -