diff --git a/app/Console/Commands/calculatemarkettax.php b/app/Console/Commands/calculatemarkettax.php index 9db39fb80..f2be0f642 100644 --- a/app/Console/Commands/calculatemarkettax.php +++ b/app/Console/Commands/calculatemarkettax.php @@ -99,7 +99,6 @@ class CalculateMarketTax extends Command SendEveMail::dispatch($mail)->delay(Carbon::now()->addSeconds(15)); } - //Mark the job as finished $task->SetStopStatus(); } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index b9013ba72..648eb1749 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -15,7 +15,6 @@ class Kernel extends ConsoleKernel protected $commands = [ Commands\CorpJournal::class, Commands\GetCorps::class, - Commands\SendMail::class, Commands\UpdateMoonPricing::class, Commands\CalculateMarketTax::class, Commands\holdingfinances::class, diff --git a/app/Library/Structures/StructureTaxHelper.php b/app/Library/Structures/StructureTaxHelper.php index bf5020cce..ccc396771 100644 --- a/app/Library/Structures/StructureTaxHelper.php +++ b/app/Library/Structures/StructureTaxHelper.php @@ -37,14 +37,9 @@ class StructureTaxHelper { //Calculate the fuel cost for one type of structure $fuelCost = $this->CalculateFuelBlockCost($refType); - - //Calculate the average tax for a given structure type - $tax = $this->GetStructureTax($corpId, $refType); - - //Calculate the tax ratio to later be divided against the tax to find the - //actual tax owed to the alliance. Revenue will be a separate function - //$ratio = $this->CalculateTaxRatio($corpId, $tax, $refType); - //Get the ratio from the table + + //Get the ratio from the table to be divided against the tax to find the + //acutal tax owed to the alliance. Revenue will be a separate function $ratio = CorpTaxRatio::where([ 'corporation_id' => $corpId, 'structure_type' => $refType,