diff --git a/app/Http/Controllers/Contracts/ContractAdminController.php b/app/Http/Controllers/Contracts/ContractAdminController.php index 974ef7cfd..69213bf95 100644 --- a/app/Http/Controllers/Contracts/ContractAdminController.php +++ b/app/Http/Controllers/Contracts/ContractAdminController.php @@ -38,20 +38,7 @@ class ContractAdminController extends Controller } public function displayPastContracts() { - $contracts = Contract::where(['finished' => true])->where('updated_at', '>', Carbon::now()->subMonths(2))->get()->toArray(); - - //Get the accepted bid for the contract and load it into the array - foreach($contracts as $contract) { - //Get the accepted bid for the contract and add it to the array - $accepted = AcceptedBid::where([ - 'contract_id' => $contract['contract_id'], - ])->get(); - - $contract['accepted'] = $accepted->bid_amount; - $contract['accepted_notes'] = $accepted->notes; - } - - dd($contracts); + $contractsTemp = Contract::where(['finished' => true])->where('updated_at', '>', Carbon::now()->subMonths(2))->get(); return view('contracts.admin.past')->with('contracts', $contracts); } diff --git a/resources/views/contracts/admin/past.blade.php b/resources/views/contracts/admin/past.blade.php index 3054a071d..3ec6d2b25 100644 --- a/resources/views/contracts/admin/past.blade.php +++ b/resources/views/contracts/admin/past.blade.php @@ -27,10 +27,7 @@ End Date: {{ $contract['end_date'] }}