diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php index 868f2edbc..fafbafef1 100644 --- a/app/Http/Controllers/StructureController.php +++ b/app/Http/Controllers/StructureController.php @@ -24,7 +24,6 @@ class StructureController extends Controller } public function chooseCorpTaxes() { - //$corps = DB::table('CorpStructures')->select('corporation_name')->groupBy('corporation_name')->get(); $corps = CorpStructure::pluck('corporation_name', 'corporation_id'); return view('structures.choosecorporation')->with('corps', $corps); } @@ -46,13 +45,13 @@ class StructureController extends Controller //Get the market taxes for this month from the database $totalTaxes = [ 'thisMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), - 'thisMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), + //'thisMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), 'lastMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), - 'lastMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), + //'lastMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), 'thisMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), - 'thisMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), + //'thisMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), 'lastMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), - 'lastMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), + //'lastMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), 'thisMonthStart' => $dates['ThisMonthStart']->toFormattedDateString(), 'lastMonthStart' => $dates['LastMonthStart']->toFormattedDateString(), ]; @@ -78,13 +77,13 @@ class StructureController extends Controller //Get the market taxes for this month from the database $totalTaxes = [ 'thisMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), - 'thisMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), + //'thisMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), 'lastMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), - 'lastMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), + //'lastMonthRefinery' => number_format($sHelper->GetTaxes($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), 'thisMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), - 'thisMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), + //'thisMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), 'lastMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), - 'lastMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), + //'lastMonthRevRefinery' => number_format($sHelper->GetRevenue($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), 'thisMonthStart' => $dates['ThisMonthStart']->toFormattedDateString(), 'lastMonthStart' => $dates['LastMonthStart']->toFormattedDateString(), ]; diff --git a/resources/views/structures/choosecorptaxes.blade.php b/resources/views/structures/choosecorptaxes.blade.php index e75f95d77..8b2964bc4 100644 --- a/resources/views/structures/choosecorptaxes.blade.php +++ b/resources/views/structures/choosecorptaxes.blade.php @@ -12,23 +12,17 @@ Month Market Tax Market Revenue Minus Fuel Cost - Refinery Tax - Refinery Revenue Minus Fuel Cost {{ $totalTaxes['thisMonthStart'] }} {{ $totalTaxes['thisMonthMarket'] }} {{ $totalTaxes['thisMonthRevMarket'] }} - {{ $totalTaxes['thisMonthRefinery'] }} - {{ $totalTaxes['thisMonthRevRefinery'] }} {{ $totalTaxes['lastMonthStart'] }} {{ $totalTaxes['lastMonthMarket'] }} {{ $totalTaxes['lastMonthRevMarket'] }} - {{ $totalTaxes['lastMonthRefinery'] }} - {{ $totalTaxes['lastMonthRevRefinery'] }} diff --git a/resources/views/structures/taxes.blade.php b/resources/views/structures/taxes.blade.php index b6139dd5e..656df4804 100644 --- a/resources/views/structures/taxes.blade.php +++ b/resources/views/structures/taxes.blade.php @@ -12,23 +12,17 @@ Month Market Tax Minus Fuel Cost / Month Market Revenue - Refinery Tax Minus Fuel Cost / Month - Refinery Revenue {{ $totalTaxes['thisMonthStart'] }} {{ $totalTaxes['thisMonthMarket'] }} {{ $totalTaxes['thisMonthRevMarket'] }} - {{ $totalTaxes['thisMonthRefinery'] }} - {{ $totalTaxes['thisMonthRevRefinery'] }} {{ $totalTaxes['lastMonthStart'] }} {{ $totalTaxes['lastMonthMarket'] }} {{ $totalTaxes['lastMonthRevMarket'] }} - {{ $totalTaxes['lastMonthRefinery'] }} - {{ $totalTaxes['lastMonthRevRefinery'] }} diff --git a/resources/views/structures/taxhistory.blade.php b/resources/views/structures/taxhistory.blade.php index fc6779a69..a687a4c2e 100644 --- a/resources/views/structures/taxhistory.blade.php +++ b/resources/views/structures/taxhistory.blade.php @@ -12,8 +12,6 @@ Month Market Tax Market Revenue Minus Fuel Cost - Refinery Tax - Refinery Revenue Minus Fuel Cost @for($i = 0; $i < 12; $i++) @@ -21,8 +19,6 @@ {{ $totalTaxes[$i]['start'] }} {{ $totalTaxes[$i]['MarketTax'] }} {{ $totalTaxes[$i]['MarketRevenue'] }} - {{ $totalTaxes[$i]['RefineryTax'] }} - {{ $totalTaxes[$i]['RefineryRevenue'] }} @endfor