removed refinery taxes temporarily
This commit is contained in:
@@ -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(),
|
||||
];
|
||||
|
||||
@@ -12,23 +12,17 @@
|
||||
<th>Month</th>
|
||||
<th>Market Tax</th>
|
||||
<th>Market Revenue Minus Fuel Cost</th>
|
||||
<th>Refinery Tax</th>
|
||||
<th>Refinery Revenue Minus Fuel Cost</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ $totalTaxes['thisMonthStart'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthRevMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthRefinery'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthRevRefinery'] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ $totalTaxes['lastMonthStart'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthRevMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthRefinery'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthRevRefinery'] }}</td>
|
||||
</tr>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -12,23 +12,17 @@
|
||||
<th>Month</th>
|
||||
<th>Market Tax Minus Fuel Cost / Month</th>
|
||||
<th>Market Revenue</th>
|
||||
<th>Refinery Tax Minus Fuel Cost / Month</th>
|
||||
<th>Refinery Revenue</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ $totalTaxes['thisMonthStart'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthRevMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthRefinery'] }}</td>
|
||||
<td>{{ $totalTaxes['thisMonthRevRefinery'] }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ $totalTaxes['lastMonthStart'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthRevMarket'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthRefinery'] }}</td>
|
||||
<td>{{ $totalTaxes['lastMonthRevRefinery'] }}</td>
|
||||
</tr>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -12,8 +12,6 @@
|
||||
<th>Month</th>
|
||||
<th>Market Tax</th>
|
||||
<th>Market Revenue Minus Fuel Cost</th>
|
||||
<th>Refinery Tax</th>
|
||||
<th>Refinery Revenue Minus Fuel Cost</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for($i = 0; $i < 12; $i++)
|
||||
@@ -21,8 +19,6 @@
|
||||
<td>{{ $totalTaxes[$i]['start'] }}</td>
|
||||
<td>{{ $totalTaxes[$i]['MarketTax'] }}</td>
|
||||
<td>{{ $totalTaxes[$i]['MarketRevenue'] }}</td>
|
||||
<td>{{ $totalTaxes[$i]['RefineryTax'] }}</td>
|
||||
<td>{{ $totalTaxes[$i]['RefineryRevenue'] }}</td>
|
||||
</tr>
|
||||
@endfor
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user