diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php index e823a7922..8d5deebad 100644 --- a/app/Http/Controllers/StructureController.php +++ b/app/Http/Controllers/StructureController.php @@ -43,7 +43,7 @@ class StructureController extends Controller 'thisMonthRevRefinery' => number_format($this->GetRevenue($corpId, 'Refinery', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), 'lastMonthRevMarket' => number_format($this->GetRevenue($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), 'lastMonthRevRefinery' => number_format($this->GetRevenue($corpId, 'Refinery', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','), - 'thisMonthStart' => $dates['ThisMonthStart'], + 'thisMonthStart' => $dates['ThisMonthStart']->month, 'thisMonthEnd' => $dates['ThisMonthEnd'], 'lastMonthStart' => $dates['LastMonthStart'], 'lastMonthEnd' => $dates['LastMonthEnd'], diff --git a/resources/views/structures/taxes.blade.php b/resources/views/structures/taxes.blade.php index aaff61e2d..39b7fff42 100644 --- a/resources/views/structures/taxes.blade.php +++ b/resources/views/structures/taxes.blade.php @@ -11,9 +11,9 @@ Month Market Tax - Market Revenue + Market Revenue Minus Fuel Cost Refinery Tax - Refinery Revenue + Refinery Revenue Minus Fuel Cost