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

industry taxes testing

Browse Source
This commit is contained in:
drkthunder02
2019-01-05 23:40:17 -06:00
parent 6e6cb2446b
commit ee15ed55c9
4 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/StructureController.php
View File

@@ -29,6 +29,30 @@ class StructureController extends Controller
$this->middleware('permission:structure.operator');
}
public function displayReprocessingTaxes() {
$this->middleware('role:Admin');
$months = 3;
$taxes = array();
//Declare the structure tax helper class
$sHelper = new StructureTaxHelper();
//Get the dates we are working with
$dates = $sHelper->GetTimeFrameInMonths($months);
foreach($dates as $date) {
$taxes[] = [
'date' => $date['start']->toFormattedDateString(),
'tax' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $date['start'], $date['end']), 2, '.', ','),
'revenue' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $date['start'], $date['end']), 2, '.', ',')
];
}
//Return the view with the data passed to it
return view('structures.reprocessingtaxes')->with('taxes', $taxes);
}
public function displayIndustryTaxes() {
$this->middleware('role:Admin');

1
resources/views/layouts/navbar.blade.php
View File

@@ -64,6 +64,7 @@
@can('isAdmin')
<a class="dropdown-item" href="/structures/admin/taxes/display">Corp Taxes</a>
<a class="dropdown-item" href="/structures/admin/taxes/industry">Industry Taxes</a>
<a class="dropdown-item" href="/structures/admin/taxes/reprocessing">Reprocessing Taxes</a>
@endcan
</div>
</li>

30
resources/views/structures/reprocessingtaxes.blade.php Normal file
View File

@@ -0,0 +1,30 @@
@extends('layouts.b4')
@section('content')
<div class="container">
<div class="card">
<div class="card-header">
Structure Industry Taxes
</div>
<div class="card-body">
<table class="table table-striped">
<thead>
<th>Month</th>
<th>Reprocessing Taxes Minus Fuel Cost / Month</th>
<th>Reprocessing Revenue</th>
</thead>
<tbody>
@foreach($taxes as $tax)
<tr>
<td>{{ $tax['date'] }}</td>
<td>{{ $tax['tax'] }}</td>
<td>{{ $tax['revenue'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endsection

7
routes/web.php
View File

@@ -31,9 +31,7 @@ Route::group(['middleware' => ['auth']], function(){
//Moon Admin Controller display pages
Route::get('/moons/admin/addmoon', 'MoonsAdminController@addMoon');
Route::post('/moon/admin/addmoon', 'MoonsAdminController@storemoon');
//Route::post('/moons/admin/storeMoon', 'MoonsAdminController@storeMoon');
Route::get('/moons/admin/display', 'MoonsAdminController@displayMoonsAdmin');
//Route::post('/moons/admin/storeUpdateMoon', 'MoonsAdminController@storeUpdateMoon');
Route::get('/moons/admin/updatemoon', 'MoonsAdminController@updateMoon');
Route::post('/moons/admin/updatemoon', 'MoonsAdminController@storeUpdateMoon');
Route::get('/moons/admin/journal', 'MoonsAdminController@showJournalEntries');
@@ -43,8 +41,6 @@ Route::group(['middleware' => ['auth']], function(){
Route::post('/wiki/register', 'WikiController@storeRegister');
Route::get('/wiki/changepassword', 'WikiController@displayChangePassword');
Route::post('/wiki/changepassword', 'WikiController@changePassword');
//Route::post('/wiki/storeRegister', 'WikiController@storeRegister');
//Route::post('/wiki/changePassword', 'WikiController@changePassword');
//Fleet Controller display pages
Route::get('/fleets/display', 'FleetsController@displayFleets');
@@ -53,7 +49,6 @@ Route::group(['middleware' => ['auth']], function(){
Route::get('/fleets/{fleet_id}/addpilot/{id}', 'FleetsController@addPilot')->name('addpilot');
Route::get('/fleets/{fleet_id}/addpilot/{name}', 'Fleetscontroller@addPilotName');
Route::get('/fleets/{fleet_id}/delete', 'FleetsController@deleteFleet')->name('deletefleet');
//Route::post('/fleets/registerFleet', 'FleetsController@registerFleet');
//Admin Controller display pages
Route::get('/admin/dashboard', 'AdminController@displayDashboard');
@@ -64,12 +59,12 @@ Route::group(['middleware' => ['auth']], function(){
//Register Structures Controller display pages
Route::get('/structures/register', 'RegisterStructureController@displayRegisterstructure');
Route::post('/structures/register', 'RegisterstructureController@storeStructure');
//Route::post('/structures/store', 'RegisterStructureController@storeStructure');
//Structure Controller display pages
Route::get('/structures/taxes/display', 'StructureController@displayTaxes');
Route::get('/structures/admin/taxes/display', 'StructureController@chooseCorpTaxes');
Route::get('/structures/admin/taxes/display/execute', 'StructureController@displayCorpTaxes');
Route::get('/structures/admin/taxes/industry', 'StructureController@displayIndustryTaxes');
Route::get('/structures/admin/taxes/reprocessing', 'StructureController@displayReprocessingTaxes');
//Scopes Controller display pages
Route::get('/scopes/select', 'EsiScopeController@displayScopes');