From f6ca5292bf4750dff81daa0a0bbc3dbea7559db3 Mon Sep 17 00:00:00 2001
From: ilmedova <milmedova96@gmail.com>
Date: Tue, 22 Nov 2022 15:46:38 +0500
Subject: [PATCH] check this final up

---
 app/Http/Controllers/API/ContractController.php | 3 +--
 app/Http/Resources/ContractResource.php         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/API/ContractController.php b/app/Http/Controllers/API/ContractController.php
index 44b4f885..b739dcbf 100644
--- a/app/Http/Controllers/API/ContractController.php
+++ b/app/Http/Controllers/API/ContractController.php
@@ -13,8 +13,7 @@
 class ContractController extends Controller
 {
     public function contract(ContractRequest $request){
-        $contract = Contract::with('resolution_basis')->where('InputNumber',$request->get('number'))->first();
-        if($contract)
+        if($contract = Contract::with('resolution_basis')->where('InputNumber',$request->get('number'))->first())
         {
             return ContractResource::make($contract);
         }
diff --git a/app/Http/Resources/ContractResource.php b/app/Http/Resources/ContractResource.php
index 90c90766..544255fc 100644
--- a/app/Http/Resources/ContractResource.php
+++ b/app/Http/Resources/ContractResource.php
@@ -22,7 +22,7 @@ public function toArray($request)
             'Workflow_ID' => $this->Workflow_ID,
             'Workflow' => trans('imported.workflow.'.$this->Workflow_ID),
             'Remark'      => $this->Remark,
-            'ResolutionBasis' => ResolutionBasesResource::collection($this->resolutions),
+            'ResolutionBasis' => ResolutionBasesResource::collection($this->resolution_basis),
         ];
     }
 }