drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ending contracts

Browse Source
This commit is contained in:
drkthunder02
2019-05-03 00:16:26 -05:00
parent 0ac663ef21
commit 17daaf84cd
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/ContractAdminController.php
View File

@@ -48,10 +48,10 @@ class ContractAdminController extends Controller
public function storeNewContract(Request $request) { public function storeNewContract(Request $request) {
$this->validate($request, [ $this->validate($request, [
'name', 'name' => 'required',
'date', 'date' => 'required',
'body', 'body' => 'required',
'type', 'type' => 'required',
]); ]);
$date = new Carbon($request->date); $date = new Carbon($request->date);
@@ -73,10 +73,10 @@ class ContractAdminController extends Controller
*/ */
public function storeAcceptContract(Request $request) { public function storeAcceptContract(Request $request) {
$this->validate($request, [ $this->validate($request, [
'contract_id', 'contract_id' => 'required',
'bid_id', 'bid_id' => 'required',
'character_id', 'character_id' => 'required',
'bid_amount', 'bid_amount' => 'required',
]); ]);
//Update the contract //Update the contract
@@ -123,8 +123,8 @@ class ContractAdminController extends Controller
public function storeEndContract(Request $request) { public function storeEndContract(Request $request) {
$this->validate($request, [ $this->validate($request, [
'contract_id', 'contract_id' => 'required',
'accept', 'accept' => 'required',
]); ]);
//Declare class variables //Declare class variables

7
app/Http/Controllers/ContractController.php
View File

@@ -197,6 +197,7 @@ class ContractController extends Controller
$this->validate($request, [ $this->validate($request, [
'contract_id' => 'required', 'contract_id' => 'required',
'bid' => 'required', 'bid' => 'required',
'notes' => 'required',
]); ]);
//Delcare some class variables we will need //Delcare some class variables we will need
@@ -213,6 +214,8 @@ class ContractController extends Controller
$amount = $request->bid * 1.00; $amount = $request->bid * 1.00;
} }
$notes = nl2br($request->notes);
//Get the character id and character name from the auth of the user calling //Get the character id and character name from the auth of the user calling
//this function //this function
$characterId = auth()->user()->getId(); $characterId = auth()->user()->getId();
@@ -238,7 +241,7 @@ class ContractController extends Controller
$bid->character_name = $characterName; $bid->character_name = $characterName;
$bid->corporation_id = $corporationId; $bid->corporation_id = $corporationId;
$bid->corporation_name = $corporationName; $bid->corporation_name = $corporationName;
$bid->notes = $request->notes; $bid->notes = $notes;
$bid->save(); $bid->save();
//Redirect to the correct page //Redirect to the correct page
@@ -277,7 +280,7 @@ class ContractController extends Controller
*/ */
public function modifyBid(Request $request) { public function modifyBid(Request $request) {
$this->validate($request, [ $this->validate($request, [
'bid', 'bid' => 'required',
]); ]);
$amount = $request->bid; $amount = $request->bid;