diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php index 398277280..fec385c2c 100644 --- a/app/Http/Controllers/StructureController.php +++ b/app/Http/Controllers/StructureController.php @@ -39,11 +39,10 @@ class StructureController extends Controller //Declare the structure tax helper class $sHelper = new StructureTaxHelper(); + //Get the dates we are working with $dates = $sHelper->GetTimeFrame(); - dd($sHelper->GetTaxes($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd'])); - //Get the market taxes for this month from the database $totalTaxes = [ 'thisMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','), @@ -58,6 +57,7 @@ class StructureController extends Controller 'lastMonthStart' => $dates['LastMonthStart']->toFormattedDateString(), ]; + //Return the view with the data passed to it return view('structures.choosecorptaxes')->with('totalTaxes', $totalTaxes); } diff --git a/app/Library/Structures/StructureTaxHelper.php b/app/Library/Structures/StructureTaxHelper.php index 8cb32aad9..b378254f6 100644 --- a/app/Library/Structures/StructureTaxHelper.php +++ b/app/Library/Structures/StructureTaxHelper.php @@ -35,27 +35,19 @@ class StructureTaxHelper { //Get the total taxes produced by the structure(s) over a given set of dates $revenue = $this->GetRevenue($corpId, $refType, $start, $end); + //Calculate the total fuel block cost $totalFuelCost = $fuelCost * $count; - var_dump($revenue); - printf("
"); + + //Calculate the total revenue minus the fuel block cost $totalRevenue = $revenue - $totalFuelCost; - var_dump($totalRevenue); - printf("
"); - var_dump($totalFuelCost); - printf("
"); - var_dump($ratio); - printf("
"); + //Check to see if the revenue is greater than zero to avoid division by zero error. //Then calculate the tax owed which is revenue divided by ratio previously calcualted. - if($revenue > 0.00) { + if($totalRevenue > 0.00) { $taxOwed = $totalRevenue / $ratio; } else { $taxOwed = 0.00; } - //Check for negative number, and if negative, zero it out. - if($taxOwed < 0.00){ - $taxOwed = 0.00; - } //Return the amount return $taxOwed;