From b9f3c112e883d1cd93beb9371614e341d8c4759d Mon Sep 17 00:00:00 2001 From: Thekindbull Date: Thu, 20 Mar 2025 13:51:46 +0800 Subject: [PATCH] api for contracts updated --- .../Bitrix/ContractApiController.php | 23 ++++++++++--------- .../Controllers/ClientsTableController.php | 4 +++- app/Models/Deal/ContractStatus.php | 12 +++++----- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Bitrix/ContractApiController.php b/app/Http/Controllers/Bitrix/ContractApiController.php index 6d2b788..88dfe1b 100644 --- a/app/Http/Controllers/Bitrix/ContractApiController.php +++ b/app/Http/Controllers/Bitrix/ContractApiController.php @@ -13,17 +13,18 @@ class ContractApiController { public function __invoke(Deal $deal, Request $request) { - Contract::updateOrCreate( - ['deal_id' => $deal->id], - [ - 'status' => ContractStatus::NEW , - 'comment' => $request->comment, - 'price' => $request->price, - 'reward' => $request->reward, - 'square' => $request->square, - 'floor' => $request->floor - ] - ); + $status = + Contract::updateOrCreate( + ['deal_id' => $deal->id], + [ + 'status' => constant(ContractStatus::class . "::" . $request->status), + 'comment' => $request->comment, + 'price' => $request->price, + 'reward' => $request->reward, + 'square' => $request->square, + 'floor' => $request->floor + ] + ); return true; } } \ No newline at end of file diff --git a/app/Http/Controllers/ClientsTableController.php b/app/Http/Controllers/ClientsTableController.php index f844928..2cb07b9 100644 --- a/app/Http/Controllers/ClientsTableController.php +++ b/app/Http/Controllers/ClientsTableController.php @@ -10,6 +10,9 @@ use App\Models\City; +use App\Models\Deal\ContractStatus; + + class ClientsTableController extends Controller { public function index(Request $request) @@ -37,7 +40,6 @@ public function getAllDealsInCompany(Request $request) $query->from('agents'); $query->where('company_id', $admin->company_id); })->get(); - return view( 'clients.table', [ diff --git a/app/Models/Deal/ContractStatus.php b/app/Models/Deal/ContractStatus.php index f294dd8..7602cca 100644 --- a/app/Models/Deal/ContractStatus.php +++ b/app/Models/Deal/ContractStatus.php @@ -1,11 +1,11 @@