diff --git a/app/Http/Controllers/ContractAdminController.php b/app/Http/Controllers/ContractAdminController.php index 3a70755fc..3751e922f 100644 --- a/app/Http/Controllers/ContractAdminController.php +++ b/app/Http/Controllers/ContractAdminController.php @@ -48,10 +48,10 @@ class ContractAdminController extends Controller public function storeNewContract(Request $request) { $this->validate($request, [ - 'name', - 'date', - 'body', - 'type', + 'name' => 'required', + 'date' => 'required', + 'body' => 'required', + 'type' => 'required', ]); $date = new Carbon($request->date); @@ -73,10 +73,10 @@ class ContractAdminController extends Controller */ public function storeAcceptContract(Request $request) { $this->validate($request, [ - 'contract_id', - 'bid_id', - 'character_id', - 'bid_amount', + 'contract_id' => 'required', + 'bid_id' => 'required', + 'character_id' => 'required', + 'bid_amount' => 'required', ]); //Update the contract @@ -123,8 +123,8 @@ class ContractAdminController extends Controller public function storeEndContract(Request $request) { $this->validate($request, [ - 'contract_id', - 'accept', + 'contract_id' => 'required', + 'accept' => 'required', ]); //Declare class variables diff --git a/app/Http/Controllers/ContractController.php b/app/Http/Controllers/ContractController.php index e252e185a..7da128637 100644 --- a/app/Http/Controllers/ContractController.php +++ b/app/Http/Controllers/ContractController.php @@ -197,6 +197,7 @@ class ContractController extends Controller $this->validate($request, [ 'contract_id' => 'required', 'bid' => 'required', + 'notes' => 'required', ]); //Delcare some class variables we will need @@ -213,6 +214,8 @@ class ContractController extends Controller $amount = $request->bid * 1.00; } + $notes = nl2br($request->notes); + //Get the character id and character name from the auth of the user calling //this function $characterId = auth()->user()->getId(); @@ -238,7 +241,7 @@ class ContractController extends Controller $bid->character_name = $characterName; $bid->corporation_id = $corporationId; $bid->corporation_name = $corporationName; - $bid->notes = $request->notes; + $bid->notes = $notes; $bid->save(); //Redirect to the correct page @@ -277,7 +280,7 @@ class ContractController extends Controller */ public function modifyBid(Request $request) { $this->validate($request, [ - 'bid', + 'bid' => 'required', ]); $amount = $request->bid;