diff --git a/app/Http/Controllers/ContractAdminController.php b/app/Http/Controllers/ContractAdminController.php index e59c3a9fd..308348e3c 100644 --- a/app/Http/Controllers/ContractAdminController.php +++ b/app/Http/Controllers/ContractAdminController.php @@ -96,9 +96,12 @@ class ContractAdminController extends Controller } public function displayEndContract($id) { - $contractId = $id; + //Gather the information for the contract, and all bids on the contract + $contract = Contract::where(['id' => $id])->first()->toArray(); + $bids = Bid::where(['contract_id' => $id])-get()->toArray(); - return view('contracts.admin.endcontract')->with('contractId', $contractId); + return view('contracts.admin.endcontract')->with('contract', $contract) + ->with('bids', $bids); } public function storeEndContract(Request $request) { diff --git a/resources/views/contracts/admin/contractpanel.blade.php b/resources/views/contracts/admin/contractpanel.blade.php index ccc6ad546..02aa75e08 100644 --- a/resources/views/contracts/admin/contractpanel.blade.php +++ b/resources/views/contracts/admin/contractpanel.blade.php @@ -27,13 +27,8 @@ Type: {{ $contract['type'] }}
- - {!! Form::open(['action' => 'ContractAdminController@deleteContract', 'method' => 'POST']) !!} - {{ Form::hidden('contract_id', $contract['contract_id']) }} - {{ Form::submit('Delete', ['class' => 'btn btn-danger']) }} - {!! Form::close() !!} - - + Delete Contract + End Contract
diff --git a/resources/views/contracts/admin/displayend.blade.php b/resources/views/contracts/admin/displayend.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/routes/web.php b/routes/web.php index 36e2b9d21..3f5492b03 100644 --- a/routes/web.php +++ b/routes/web.php @@ -90,8 +90,8 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/contracts/admin/new', 'ContractAdminController@displayNewContract'); Route::post('/contracts/admin/new', 'ContractAdminController@storeNewContract'); Route::post('/contracts/admin/store', 'ContractAdminController@storeAcceptContract'); - Route::post('/contracts/admin/delete', 'ContractAdminController@deleteContract'); - Route::get('/contracts/admin/end/{id}', 'ContractAdminController@endContract'); + Route::get('/contracts/admin/delete/{id}', 'ContractAdminController@deleteContract'); + Route::get('/contracts/admin/end/{id}', 'ContractAdminController@displayEndContract'); });