diff --git a/app/Console/Commands/corpJournal.php b/app/Console/Commands/corpJournal.php index 966929e48..6a010aa28 100644 --- a/app/Console/Commands/corpJournal.php +++ b/app/Console/Commands/corpJournal.php @@ -68,6 +68,7 @@ class CorpJournal extends Command foreach($structures as $structure) { foreach($finishedCorps as $finished) { if($finished == $structure->corporation_id) { + $this->line('Finished Journal for ' . $structure->corporation_name . '\n'); $corpCompleted = true; break; } else { @@ -79,6 +80,7 @@ class CorpJournal extends Command } //If we didn't find the corporation was already done, then complete it. if($corpCompleted === false) { + $this->line('Getting Journal for ' . $structure->corporation_name . '\n'); $this->GetJournal($structure->character_id); $finishedCorps[sizeof($finishedCorps)] = $structure->corporation_id; //After the corporation has been done set the variable back to false diff --git a/app/Http/Controllers/JumpBridgeController.php b/app/Http/Controllers/JumpBridgeController.php new file mode 100644 index 000000000..b418e625b --- /dev/null +++ b/app/Http/Controllers/JumpBridgeController.php @@ -0,0 +1,10 @@ +middleware('auth'); + $this->middleware('role:Admin'); + } + + public function updateMoon() { + return view('moons.updatemoon'); + } + + public function storeUpdateMoon(Request $request) { + $this->validate($request, [ + 'system' => 'required', + 'planet' => 'required', + 'moon' => 'required', + 'renter' => 'required', + 'date' => 'required' + ]); + + $date = strtotime($request->date . '00:00:01'); + //Update the database entry + DB::table('Moons') + ->where([ + ['System', '=', $request->system], + ['Planet', '=', $request->planet], + ['Moon', '=', $request->moon] + ]) + ->update([ + 'RentalCorp' => $request->renter, + 'RentalEnd' => $date, + ]); + + return redirect('/moons/display')->with('success', 'Moon Updated'); + } + + public function addMoon() { + return view('moons.addmoon'); + } + + /** + * Add a new moon into the database + * + * @return \Illuminate\Http\Reponse + */ + public function storeMoon(Request $request) { + $this->validate($request, [ + 'region' => 'required', + 'system' => 'required', + 'structure' => 'required', + ]); + + if($request->input('firstquan') < 1.00) { + $firstQuan = $request->input('firstquan') * 100.00; + } else { + $firstQuan = $request->input('firstquan'); + } + + if($request->input('secondquan') < 1.00) { + $firstQuan = $request->input('secondquan') * 100.00; + } else { + $firstQuan = $request->input('secondquan'); + } + + if($request->input('thirdquan') < 1.00) { + $firstQuan = $request->input('thirdquan') * 100.00; + } else { + $firstQuan = $request->input('thirdquan'); + } + + if($request->input('fourthquan') < 1.00) { + $firstQuan = $request->input('fourthquan') * 100.00; + } else { + $firstQuan = $request->input('fourthquan'); + } + + // Add new moon + $moon = new Moon; + $moon->Region = $request->input('region'); + $moon->System = $request->input('system'); + $moon->Planet = $request->input('planet'); + $moon->Moon = $request->input('moon'); + $moon->StructureName = $request->input('structure'); + $moon->FirstOre = $request->input('firstore'); + $moon->FirstQuantity = $request->input('firstquan'); + $moon->SecondOre = $request->input('secondore'); + $moon->SecondQuantity = $request->input('secondquan'); + $moon->ThirdOre = $request->input('thirdore'); + $moon->ThirdQuantity = $request->input('thirdquan'); + $moon->FourthOre = $request->input('fourthore'); + $moon->FourthQuantity = $request->input('fourthquan'); + $moon->save(); + + return redirect('/dashboard')->with('success', 'Moon Added'); + } + + /** + * Function to display the moons to admins + */ + public function displayMoonsAdmin() { + //Setup calls to the MoonCalc class + $moonCalc = new MoonCalc(); + //Update the prices for the moon + $moonCalc->FetchNewPrices(); + //get all of the moons from the database + $moons = DB::table('Moons')->orderBy('System', 'asc')->get(); + //declare the html variable and set it to null + $html = ''; + foreach($moons as $moon) { + //Setup formats as needed + $spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon; + $rentalEnd = date('m/d/Y', $moon->RentalEnd); + $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, + $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); + //Add the data to the html string to be passed to the view + $html .= ''; + $html .= '' . $spm . ''; + $html .= '' . $moon->StructureName . ''; + $html .= '' . $moon->FirstOre . ''; + $html .= '' . $moon->FirstQuantity . ''; + $html .= '' . $moon->SecondOre . ''; + $html .= '' . $moon->SecondQuantity . ''; + $html .= '' . $moon->ThirdOre . ''; + $html .= '' . $moon->ThirdQuantity . ''; + $html .= '' . $moon->FourthOre . ''; + $html .= '' . $moon->FourthQuantity . ''; + $html .= '' . $price['alliance'] . ''; + $html .= '' . $price['outofalliance'] . ''; + $html .= '' . $moon->RentalCorp . ''; + $html .= '' . $rentalEnd . ''; + $html .= ''; + } + + return view('moons.adminmoon')->with('html', $html); + } +} diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php index 71885f5c4..eeec52df3 100644 --- a/app/Http/Controllers/MoonsController.php +++ b/app/Http/Controllers/MoonsController.php @@ -22,46 +22,6 @@ class MoonsController extends Controller $this->middleware('role:User'); } - /** - * Function to display the moons to admins - */ - public function displayMoonsAdmin() { - //Setup calls to the MoonCalc class - $moonCalc = new MoonCalc(); - //Update the prices for the moon - $moonCalc->FetchNewPrices(); - //get all of the moons from the database - $moons = DB::table('Moons')->orderBy('System', 'asc')->get(); - //declare the html variable and set it to null - $html = ''; - foreach($moons as $moon) { - //Setup formats as needed - $spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon; - $rentalEnd = date('m/d/Y', $moon->RentalEnd); - $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, - $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); - //Add the data to the html string to be passed to the view - $html .= ''; - $html .= '' . $spm . ''; - $html .= '' . $moon->StructureName . ''; - $html .= '' . $moon->FirstOre . ''; - $html .= '' . $moon->FirstQuantity . ''; - $html .= '' . $moon->SecondOre . ''; - $html .= '' . $moon->SecondQuantity . ''; - $html .= '' . $moon->ThirdOre . ''; - $html .= '' . $moon->ThirdQuantity . ''; - $html .= '' . $moon->FourthOre . ''; - $html .= '' . $moon->FourthQuantity . ''; - $html .= '' . $price['alliance'] . ''; - $html .= '' . $price['outofalliance'] . ''; - $html .= '' . $moon->RentalCorp . ''; - $html .= '' . $rentalEnd . ''; - $html .= ''; - } - - return view('moons.adminmoon')->with('html', $html); - } - /** * Function to display the moons and pass data to the blade template */ @@ -109,99 +69,6 @@ class MoonsController extends Controller return view('moons.moon')->with('html', $html); } - public function addMoon() { - $this->middleware('role:SuperUser'); - return view('moons.addmoon'); - } - - /** - * Add a new moon into the database - * - * @return \Illuminate\Http\Reponse - */ - public function storeMoon(Request $request) { - $this->middleware('role:SuperUser'); - $this->validate($request, [ - 'region' => 'required', - 'system' => 'required', - 'structure' => 'required', - ]); - - if($request->input('firstquan') < 1.00) { - $firstQuan = $request->input('firstquan') * 100.00; - } else { - $firstQuan = $request->input('firstquan'); - } - - if($request->input('secondquan') < 1.00) { - $firstQuan = $request->input('secondquan') * 100.00; - } else { - $firstQuan = $request->input('secondquan'); - } - - if($request->input('thirdquan') < 1.00) { - $firstQuan = $request->input('thirdquan') * 100.00; - } else { - $firstQuan = $request->input('thirdquan'); - } - - if($request->input('fourthquan') < 1.00) { - $firstQuan = $request->input('fourthquan') * 100.00; - } else { - $firstQuan = $request->input('fourthquan'); - } - - // Add new moon - $moon = new Moon; - $moon->Region = $request->input('region'); - $moon->System = $request->input('system'); - $moon->Planet = $request->input('planet'); - $moon->Moon = $request->input('moon'); - $moon->StructureName = $request->input('structure'); - $moon->FirstOre = $request->input('firstore'); - $moon->FirstQuantity = $request->input('firstquan'); - $moon->SecondOre = $request->input('secondore'); - $moon->SecondQuantity = $request->input('secondquan'); - $moon->ThirdOre = $request->input('thirdore'); - $moon->ThirdQuantity = $request->input('thirdquan'); - $moon->FourthOre = $request->input('fourthore'); - $moon->FourthQuantity = $request->input('fourthquan'); - $moon->save(); - - return redirect('/dashboard')->with('success', 'Moon Added'); - } - - public function updateMoon() { - $this->middleware('role:Admin'); - return view('moons.updatemoon'); - } - - public function storeUpdateMoon(Request $request) { - $this->middleware('role:Admin'); - $this->validate($request, [ - 'system' => 'required', - 'planet' => 'required', - 'moon' => 'required', - 'renter' => 'required', - 'date' => 'required' - ]); - - $date = strtotime($request->date . '00:00:01'); - //Update the database entry - DB::table('Moons') - ->where([ - ['System', '=', $request->system], - ['Planet', '=', $request->planet], - ['Moon', '=', $request->moon] - ]) - ->update([ - 'RentalCorp' => $request->renter, - 'RentalEnd' => $date, - ]); - - return redirect('/moons/display')->with('success', 'Moon Updated'); - } - public function displayTotalWorthForm() { return view('moons.formTotalWorth'); } diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php index 1bc298334..b33654c18 100644 --- a/app/Http/Controllers/StructureController.php +++ b/app/Http/Controllers/StructureController.php @@ -64,7 +64,9 @@ class StructureController extends Controller //Calculate the tax ratio to later be divided against the tax to find the //actual tax owed to the alliance. Revenue will be a separate function $ratio = $this->CalculateTaxRatio($tax, $refType, $start, $end); - + if($ratio == 0 || $ratio == null) { + $ratio = 1.0; + } //Get the total taxes produced by the structure(s) over a given set of dates $revenue = $this->GetRevenue($corpId, $refType, $start, $end); @@ -76,6 +78,7 @@ class StructureController extends Controller if($taxOwed < 0.00){ $taxOwed = 0.00; } + //Return the amount return $taxOwed; } @@ -94,7 +97,6 @@ class StructureController extends Controller $revenue = 0.00; } - return $revenue; } diff --git a/routes/web.php b/routes/web.php index 9b3b9ed4e..cbfa804d8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -25,14 +25,15 @@ Route::get('/dashboard', 'DashboardController@index'); //Moon Controller display pages Route::get('/moons/display', 'MoonsController@displayMoons'); -Route::get('/moons/addmoon', 'MoonsController@addMoon'); -Route::get('/moons/updatemoon', 'MoonsController@updateMoon'); Route::get('/moons/display/worth', 'MoonsController@displayTotalWorthForm'); -Route::get('/moons/admin/display', 'MoonsController@displayMoonsAdmin'); -//Moon Controller POST requests -Route::post('storeMoon', 'MoonsController@storeMoon'); -Route::post('storeUpdateMoon', 'MoonsController@storeUpdateMoon'); Route::post('displayTotalWorth', 'MoonsController@displayTotalWorth'); +//Moon Admin Controller display pages +Route::get('/moons/addmoon', 'MoonsAdminController@addMoon'); +Route::post('storeMoon', 'MoonsAdminController@storeMoon'); +Route::get('/moons/admin/display', 'MoonsAdminController@displayMoonsAdmin'); +Route::post('storeUpdateMoon', 'MoonsAdminController@storeUpdateMoon'); +Route::get('/moons/updatemoon', 'MoonsAdminController@updateMoon'); + //Wiki Controller display pages Route::get('/wiki/register', 'WikiController@displayRegister');