From d52a33963780c94a77ba8c395df474b55f76ceb1 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Wed, 13 Feb 2019 21:07:21 -0600 Subject: [PATCH] re-ordered all of the view directories setup corp tax ratio for structure tax helper modified all view functions for new directory layout --- app/Http/Controllers/AdminController.php | 55 ++++++++++- app/Http/Controllers/DashboardController.php | 2 +- app/Http/Controllers/MoonsAdminController.php | 8 +- app/Http/Controllers/MoonsController.php | 6 +- .../RegisterStructureController.php | 50 +++++++++- app/Http/Controllers/StructureController.php | 14 +-- app/Http/Controllers/WikiController.php | 4 +- app/Library/Structures/StructureTaxHelper.php | 12 ++- resources/views/auth/login.blade.php | 71 --------------- .../views/auth/passwords/email.blade.php | 47 ---------- .../views/auth/passwords/reset.blade.php | 65 ------------- resources/views/auth/register.blade.php | 91 ------------------- resources/views/auth/verify.blade.php | 24 ----- resources/views/custom/login.blade.php | 4 - resources/views/finances/holding.blade.php | 4 - resources/views/logistics/dashboard.blade.php | 4 - .../views/moons/{ => admin}/addmoon.blade.php | 0 .../moons/{ => admin}/adminmoon.blade.php | 0 .../moons/{ => admin}/moonjournal.blade.php | 0 .../moons/{ => admin}/updatemoon.blade.php | 0 .../{ => user}/displayTotalWorth.blade.php | 0 .../moons/{ => user}/formTotalWorth.blade.php | 0 .../views/moons/{ => user}/moon.blade.php | 0 .../{ => admin}/choosecorporation.blade.php | 0 .../{ => admin}/choosecorptaxes.blade.php | 0 .../structures/admin/dashboard.blade.php | 0 .../{ => register}/register.blade.php | 0 .../structures/register/taxratio.blade.php | 0 .../structures/{ => user}/display.blade.php | 0 .../{ => user}/industrytaxes.blade.php | 0 .../{ => user}/reprocessingtaxes.blade.php | 0 .../structures/{ => user}/taxes.blade.php | 0 .../{ => user}/taxhistory.blade.php | 0 .../views/structures/user/taxratio.blade.php | 0 .../wiki/{ => user}/changepassword.blade.php | 0 .../views/wiki/{ => user}/register.blade.php | 0 routes/web.php | 4 +- 37 files changed, 132 insertions(+), 333 deletions(-) delete mode 100644 resources/views/auth/login.blade.php delete mode 100644 resources/views/auth/passwords/email.blade.php delete mode 100644 resources/views/auth/passwords/reset.blade.php delete mode 100644 resources/views/auth/register.blade.php delete mode 100644 resources/views/auth/verify.blade.php delete mode 100644 resources/views/custom/login.blade.php delete mode 100644 resources/views/finances/holding.blade.php delete mode 100644 resources/views/logistics/dashboard.blade.php rename resources/views/moons/{ => admin}/addmoon.blade.php (100%) rename resources/views/moons/{ => admin}/adminmoon.blade.php (100%) rename resources/views/moons/{ => admin}/moonjournal.blade.php (100%) rename resources/views/moons/{ => admin}/updatemoon.blade.php (100%) rename resources/views/moons/{ => user}/displayTotalWorth.blade.php (100%) rename resources/views/moons/{ => user}/formTotalWorth.blade.php (100%) rename resources/views/moons/{ => user}/moon.blade.php (100%) rename resources/views/structures/{ => admin}/choosecorporation.blade.php (100%) rename resources/views/structures/{ => admin}/choosecorptaxes.blade.php (100%) create mode 100644 resources/views/structures/admin/dashboard.blade.php rename resources/views/structures/{ => register}/register.blade.php (100%) create mode 100644 resources/views/structures/register/taxratio.blade.php rename resources/views/structures/{ => user}/display.blade.php (100%) rename resources/views/structures/{ => user}/industrytaxes.blade.php (100%) rename resources/views/structures/{ => user}/reprocessingtaxes.blade.php (100%) rename resources/views/structures/{ => user}/taxes.blade.php (100%) rename resources/views/structures/{ => user}/taxhistory.blade.php (100%) create mode 100644 resources/views/structures/user/taxratio.blade.php rename resources/views/wiki/{ => user}/changepassword.blade.php (100%) rename resources/views/wiki/{ => user}/register.blade.php (100%) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 3c59732fe..1502be7c6 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -12,6 +12,7 @@ use App\Models\User\AvailableUserPermission; use App\Models\Esi\EsiScope; use App\Models\Esi\EsiToken; use App\Models\Corporation\CorpStructure; +use App\Models\Admin\AllowedLogin; class AdminController extends Controller { @@ -91,14 +92,62 @@ class AdminController extends Controller } public function displayAllowedLogins() { + $logins = AllowedLogin::all(); + return view('admin.allowedlogins')->with('logins', $logins); } - public function addAllowedLogin() { + public function addAllowedLogin(Request $request) { + //Set the parameters to validate the form + $this->validate($request, [ + 'entity_id' => 'required', + 'entity_type' => 'required', + 'entity_name' => 'required', + 'login_type' => 'required', + ]); + //Check to see if the entity exists in the database already + $found = AllowedLogin::where([ + 'entity_type' => $request->entityType, + 'entity_name' => $request->entityName, + ])->get(); + if($found != null) { + AllowedLogin::where([ + 'entity_type' => $request->entityType, + 'entity_name' => $request->entityName, + ])->update([ + 'entity_id' => $request->entityId, + 'entity_type' => $request->entityType, + 'entity_name' => $request->entityName, + 'login_type' => $request->loginType, + ]); + } else { + $login = new AllowedLogin; + $login->entity_id = $request->entityId; + $login->entity_name = $request->entityName; + $login->entity_type = $request->entityType; + $login->login_type = $request->loginType; + } + + return redirect('/admin/dashboard')->with('success', 'Entity added to allowed login list.'); } - public function removeAllowedLogin() { - + public function removeAllowedLogin(Request $request) { + //Set the parameters to validate the form + $this->validate($request, [ + 'entity_id' => 'required', + 'entity_type' => 'required', + 'entity_name' => 'required', + 'login_type' => 'required', + ]); + + AllowedLogin::where([ + 'entity_id' => $request->entityId, + 'entity_type' => $request->entityType, + 'entity_name' => $request->entityName, + 'login_type' => $request->loginType, + ])->delete(); + + return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.'); } } diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 705d57a85..3849fd780 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -51,6 +51,6 @@ class DashboardController extends Controller 'roles' => $roles, ]; - return view('/dashboard/profile')->with('data', $data); + return view('dashboard.profile')->with('data', $data); } } diff --git a/app/Http/Controllers/MoonsAdminController.php b/app/Http/Controllers/MoonsAdminController.php index 215c51484..a9c9fffd6 100644 --- a/app/Http/Controllers/MoonsAdminController.php +++ b/app/Http/Controllers/MoonsAdminController.php @@ -33,11 +33,11 @@ class MoonsAdminController extends Controller $journal = DB::select('SELECT amount,reason,description,date FROM `player_donation_journal` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC'); - return view('moons.moonjournal')->with('journal', $journal); + return view('moons.admin.moonjournal')->with('journal', $journal); } public function updateMoon() { - return view('moons.updatemoon'); + return view('moons.admin.updatemoon'); } public function storeUpdateMoon2(Request $request) { @@ -119,7 +119,7 @@ class MoonsAdminController extends Controller } public function addMoon() { - return view('moons.addmoon'); + return view('moons.admin.addmoon'); } /** @@ -217,6 +217,6 @@ class MoonsAdminController extends Controller $html .= ''; } - return view('moons.adminmoon')->with('html', $html); + return view('moons.admin.adminmoon')->with('html', $html); } } diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php index fcebfccbe..89b94d435 100644 --- a/app/Http/Controllers/MoonsController.php +++ b/app/Http/Controllers/MoonsController.php @@ -68,11 +68,11 @@ class MoonsController extends Controller $html .= ''; } - return view('moons.moon')->with('html', $html); + return view('moons.user.moon')->with('html', $html); } public function displayTotalWorthForm() { - return view('moons.formTotalWorth'); + return view('moons.user.formTotalWorth'); } public function displayTotalWorth(Request $request) { @@ -102,6 +102,6 @@ class MoonsController extends Controller $fourthOre, $fourthQuantity); $totalWorth = number_format($totalWorth, 2, ".", ","); - return view('moons.displayTotalWorth')->with(['totalWorth' => $totalWorth, 'totalGoo' => $totalGoo]); + return view('moons.user.displayTotalWorth')->with(['totalWorth' => $totalWorth, 'totalGoo' => $totalGoo]); } } diff --git a/app/Http/Controllers/RegisterStructureController.php b/app/Http/Controllers/RegisterStructureController.php index b7e85f8a1..99c1d248c 100644 --- a/app/Http/Controllers/RegisterStructureController.php +++ b/app/Http/Controllers/RegisterStructureController.php @@ -8,6 +8,7 @@ use Auth; use DB; use App\Models\Corporation\CorpStructure; +use App\Models\Corporation\CorpTaxRatio; use App\Library\Esi\Esi; class RegisterStructureController extends Controller @@ -18,10 +19,57 @@ class RegisterStructureController extends Controller $this->middleware('permission:structure.operator'); } + public function displayRegisterTaxRatio() { + $this->middleware('role:Admin'); + + return view('structures.register.taxratio'); + } + + public function storeTaxRatio(Request $request) { + $this->validate($request, [ + 'corpId', + 'corporation', + 'type', + 'ratio', + ]); + + $ratio = new CorpTaxRatio; + $ratio->corporation_id = $request->corpId; + $ratio->corporation_name = $request->corporation; + $ratio->structure_type = $request->type; + $ratio->ratio = $request->ratio; + $ratio->save(); + + return redirect('structure.admin.dashboard'); + } + + public function updateTaxRatio(Request $request) { + $this->validate($request, [ + 'corporation', + 'type', + 'ratio', + ]); + + CorpTaxRatio::where([ + 'corporation_name' => $request->corporation, + 'structure_type' => $request->type, + ])->update([ + 'ratio' => $request->ratio, + ]); + + return redirect('structure.admin.dashboard')->with('success', 'Tax Ratio updated for structure type: ' . $request->type . ' and corporation: ' . $request->corporation); + } + + public function displayTaxRatios() { + $taxRatios = CorpTaxRation::all(); + + return view('structure.admin.taxratios')->with('structures', $structures); + } + public function displayRegisterStructure() { //Check to see if the user has the read corp journal esi scope before allowing to register a structure if(Auth()->user()->hasEsiScope('esi-wallet.read_corporation_wallets.v1')) { - return view('structures.register'); + return view('structures.register.register'); } else { return view('dashboard')->with('error', 'You need to setup your esi scope for read corporation wallets'); } diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php index 88b6bd612..5488ec5a2 100644 --- a/app/Http/Controllers/StructureController.php +++ b/app/Http/Controllers/StructureController.php @@ -53,7 +53,7 @@ class StructureController extends Controller } //Return the view with the data passed to it - return view('structures.reprocessingtaxes')->with('taxes', $taxes); + return view('structures.user.reprocessingtaxes')->with('taxes', $taxes); } public function displayIndustryTaxes() { @@ -78,12 +78,14 @@ class StructureController extends Controller ]; } - return view('structures.industrytaxes')->with('taxes', $taxes); + return view('structures.user.industrytaxes')->with('taxes', $taxes); } public function chooseCorpTaxes() { + $this->middleware('role:Admin'); + $corps = CorpStructure::pluck('corporation_name', 'corporation_id'); - return view('structures.choosecorporation')->with('corps', $corps); + return view('structures.admin.choosecorporation')->with('corps', $corps); } public function displayCorpTaxes(Request $request) { @@ -107,7 +109,7 @@ class StructureController extends Controller } //Return the view with the data passed to it - return view('structures.choosecorptaxes')->with('totalTaxes', $totalTaxes); + return view('structures.admin.choosecorptaxes')->with('totalTaxes', $totalTaxes); } public function displayTaxes() { @@ -135,7 +137,7 @@ class StructureController extends Controller ]; } - return view('structures.taxes')->with('totalTaxes', $totalTaxes); + return view('structures.user.taxes')->with('totalTaxes', $totalTaxes); } public function displayTaxHistory(Request $request) { @@ -165,6 +167,6 @@ class StructureController extends Controller ]; } - return view('structures.taxhistory')->with(compact('totalTaxes', 'months')); + return view('structures.user.taxhistory')->with(compact('totalTaxes', 'months')); } } diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php index aab8113a5..7178febb6 100644 --- a/app/Http/Controllers/WikiController.php +++ b/app/Http/Controllers/WikiController.php @@ -30,7 +30,7 @@ class WikiController extends Controller return redirect('/dashboard')->with('error', 'Already registered for the wiki!'); } - return view('wiki.register')->with('name', $name); + return view('wiki.user.register')->with('name', $name); } public function storeRegister(Request $request) { @@ -83,7 +83,7 @@ class WikiController extends Controller return redirect('/dashboard')->with('error', 'Login Not Found!'); } - return view('wiki.changepassword')->with('name', $name); + return view('wiki.user.changepassword')->with('name', $name); } public function changePassword(Request $request) { diff --git a/app/Library/Structures/StructureTaxHelper.php b/app/Library/Structures/StructureTaxHelper.php index c0494238a..e164e28e1 100644 --- a/app/Library/Structures/StructureTaxHelper.php +++ b/app/Library/Structures/StructureTaxHelper.php @@ -10,6 +10,7 @@ use App\User; use App\Models\User\UserRole; use App\Models\User\UserPermission; use App\Models\Corporation\CorpStructure; +use App\Models\Corporation\CorpTaxRatio; use App\Models\Finances\CorpMarketJournal; use App\Models\Finances\ReprocessingTaxJournal; use App\Models\Finances\StructureIndustryTaxJournal; @@ -40,7 +41,16 @@ class StructureTaxHelper { //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($corpId, $tax, $refType); + //$ratio = $this->CalculateTaxRatio($corpId, $tax, $refType); + //Get the ratio from the table + $ratio = CorpTaxRatio::where([ + 'corporation_id' => $corpId, + 'structure_type' => $refType, + ])->get(['ratio']); + $ratio = $ratio[0]; + if($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); diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php deleted file mode 100644 index 47e3f5306..000000000 --- a/resources/views/auth/login.blade.php +++ /dev/null @@ -1,71 +0,0 @@ -@extends('layouts.app') - -@section('content') -
-
-
-
-
{{ __('Login') }}
- -
-
- @csrf - -
- - -
- - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
- -
- - -
- - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
-
- -
-
-
- - - -
-
-
- -
-
- - - - {{ __('Forgot Your Password?') }} - -
-
-
-
-
-
-
-
-@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php deleted file mode 100644 index ccbee595c..000000000 --- a/resources/views/auth/passwords/email.blade.php +++ /dev/null @@ -1,47 +0,0 @@ -@extends('layouts.app') - -@section('content') -
-
-
-
-
{{ __('Reset Password') }}
- -
- @if (session('status')) - - @endif - -
- @csrf - -
- - -
- - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
- -
-
- -
-
-
-
-
-
-
-
-@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php deleted file mode 100644 index bf27f4c85..000000000 --- a/resources/views/auth/passwords/reset.blade.php +++ /dev/null @@ -1,65 +0,0 @@ -@extends('layouts.app') - -@section('content') -
-
-
-
-
{{ __('Reset Password') }}
- -
-
- @csrf - - - -
- - -
- - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
- -
- - -
- - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
-
- -
- - -
- -
-
- -
-
- -
-
-
-
-
-
-
-
-@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php deleted file mode 100644 index ed331d499..000000000 --- a/resources/views/auth/register.blade.php +++ /dev/null @@ -1,91 +0,0 @@ -@extends('layouts.app') - -@section('content') -
-
-
-
-
{{ __('Register') }}
- -
-
- @csrf - -
- - -
- - - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
-
- -
- - -
- - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
- -
- - -
- - - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
-
- -
- - -
- - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
-
- -
- - -
- -
-
- -
-
- -
-
-
-
-
-
-
-
-@endsection diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php deleted file mode 100644 index c742cb4bd..000000000 --- a/resources/views/auth/verify.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -@extends('layouts.app') - -@section('content') -
-
-
-
-
{{ __('Verify Your Email Address') }}
- -
- @if (session('resent')) - - @endif - - {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, {{ __('click here to request another') }}. -
-
-
-
-
-@endsection diff --git a/resources/views/custom/login.blade.php b/resources/views/custom/login.blade.php deleted file mode 100644 index 99060937c..000000000 --- a/resources/views/custom/login.blade.php +++ /dev/null @@ -1,4 +0,0 @@ -@extends('layouts.b4') -@include('inc.messages') - -{!! $html !!} \ No newline at end of file diff --git a/resources/views/finances/holding.blade.php b/resources/views/finances/holding.blade.php deleted file mode 100644 index 997b7c412..000000000 --- a/resources/views/finances/holding.blade.php +++ /dev/null @@ -1,4 +0,0 @@ -@extends('layouts.b4') -@section('contents') -{!! $chart->render() !!} -@endsection \ No newline at end of file diff --git a/resources/views/logistics/dashboard.blade.php b/resources/views/logistics/dashboard.blade.php deleted file mode 100644 index 7cf47edd1..000000000 --- a/resources/views/logistics/dashboard.blade.php +++ /dev/null @@ -1,4 +0,0 @@ -@extends('layouts.b4') -@section('content') - -@endsection \ No newline at end of file diff --git a/resources/views/moons/addmoon.blade.php b/resources/views/moons/admin/addmoon.blade.php similarity index 100% rename from resources/views/moons/addmoon.blade.php rename to resources/views/moons/admin/addmoon.blade.php diff --git a/resources/views/moons/adminmoon.blade.php b/resources/views/moons/admin/adminmoon.blade.php similarity index 100% rename from resources/views/moons/adminmoon.blade.php rename to resources/views/moons/admin/adminmoon.blade.php diff --git a/resources/views/moons/moonjournal.blade.php b/resources/views/moons/admin/moonjournal.blade.php similarity index 100% rename from resources/views/moons/moonjournal.blade.php rename to resources/views/moons/admin/moonjournal.blade.php diff --git a/resources/views/moons/updatemoon.blade.php b/resources/views/moons/admin/updatemoon.blade.php similarity index 100% rename from resources/views/moons/updatemoon.blade.php rename to resources/views/moons/admin/updatemoon.blade.php diff --git a/resources/views/moons/displayTotalWorth.blade.php b/resources/views/moons/user/displayTotalWorth.blade.php similarity index 100% rename from resources/views/moons/displayTotalWorth.blade.php rename to resources/views/moons/user/displayTotalWorth.blade.php diff --git a/resources/views/moons/formTotalWorth.blade.php b/resources/views/moons/user/formTotalWorth.blade.php similarity index 100% rename from resources/views/moons/formTotalWorth.blade.php rename to resources/views/moons/user/formTotalWorth.blade.php diff --git a/resources/views/moons/moon.blade.php b/resources/views/moons/user/moon.blade.php similarity index 100% rename from resources/views/moons/moon.blade.php rename to resources/views/moons/user/moon.blade.php diff --git a/resources/views/structures/choosecorporation.blade.php b/resources/views/structures/admin/choosecorporation.blade.php similarity index 100% rename from resources/views/structures/choosecorporation.blade.php rename to resources/views/structures/admin/choosecorporation.blade.php diff --git a/resources/views/structures/choosecorptaxes.blade.php b/resources/views/structures/admin/choosecorptaxes.blade.php similarity index 100% rename from resources/views/structures/choosecorptaxes.blade.php rename to resources/views/structures/admin/choosecorptaxes.blade.php diff --git a/resources/views/structures/admin/dashboard.blade.php b/resources/views/structures/admin/dashboard.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/resources/views/structures/register.blade.php b/resources/views/structures/register/register.blade.php similarity index 100% rename from resources/views/structures/register.blade.php rename to resources/views/structures/register/register.blade.php diff --git a/resources/views/structures/register/taxratio.blade.php b/resources/views/structures/register/taxratio.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/resources/views/structures/display.blade.php b/resources/views/structures/user/display.blade.php similarity index 100% rename from resources/views/structures/display.blade.php rename to resources/views/structures/user/display.blade.php diff --git a/resources/views/structures/industrytaxes.blade.php b/resources/views/structures/user/industrytaxes.blade.php similarity index 100% rename from resources/views/structures/industrytaxes.blade.php rename to resources/views/structures/user/industrytaxes.blade.php diff --git a/resources/views/structures/reprocessingtaxes.blade.php b/resources/views/structures/user/reprocessingtaxes.blade.php similarity index 100% rename from resources/views/structures/reprocessingtaxes.blade.php rename to resources/views/structures/user/reprocessingtaxes.blade.php diff --git a/resources/views/structures/taxes.blade.php b/resources/views/structures/user/taxes.blade.php similarity index 100% rename from resources/views/structures/taxes.blade.php rename to resources/views/structures/user/taxes.blade.php diff --git a/resources/views/structures/taxhistory.blade.php b/resources/views/structures/user/taxhistory.blade.php similarity index 100% rename from resources/views/structures/taxhistory.blade.php rename to resources/views/structures/user/taxhistory.blade.php diff --git a/resources/views/structures/user/taxratio.blade.php b/resources/views/structures/user/taxratio.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/resources/views/wiki/changepassword.blade.php b/resources/views/wiki/user/changepassword.blade.php similarity index 100% rename from resources/views/wiki/changepassword.blade.php rename to resources/views/wiki/user/changepassword.blade.php diff --git a/resources/views/wiki/register.blade.php b/resources/views/wiki/user/register.blade.php similarity index 100% rename from resources/views/wiki/register.blade.php rename to resources/views/wiki/user/register.blade.php diff --git a/routes/web.php b/routes/web.php index b1fec2510..a82db8e75 100644 --- a/routes/web.php +++ b/routes/web.php @@ -52,6 +52,8 @@ Route::group(['middleware' => ['auth']], function(){ //Register Structures Controller display pages Route::get('/structures/register', 'RegisterStructureController@displayRegisterstructure'); Route::post('/structures/register', 'RegisterstructureController@storeStructure'); + Route::get('/structures/admin/taxratio', 'RegisterStructureController@displayTaxRatioForm'); + Route::post('/structures/admin/taxratio', 'RegisterStructureController@storeTaxRatio'); //Structure Controller display pages Route::get('/structures/taxes/display', 'StructureController@displayTaxes'); Route::get('/structures/admin/taxes/display', 'StructureController@chooseCorpTaxes'); @@ -59,8 +61,6 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/structures/admin/taxes/industry', 'StructureController@displayIndustryTaxes'); Route::get('/structures/admin/taxes/reprocessing', 'StructureController@displayReprocessingTaxes'); Route::get('/structures/admin/display', 'StructureController@displayAdminPanel'); - Route::get('/structures/admin/taxratio', 'StructureController@displayTaxRatioForm'); - Route::post('/structures/admin/taxratio', 'StructureController@storeTaxRatio'); //Scopes Controller display pages Route::get('/scopes/select', 'EsiScopeController@displayScopes');