drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

structure controller

Browse Source
This commit is contained in:
drkthunder02
2018-12-07 23:40:10 -06:00
parent b1ed61372a
commit cc3fde74ee
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/StructureController.php
View File

@@ -66,7 +66,8 @@ class StructureController extends Controller
/** /**
* In this next section we are removing the cost of fuel blocks from one structure * In this next section we are removing the cost of fuel blocks from one structure
*/ */
$fuelCost = $hFinances->CalculateFuelBlockCost('market'); $marketFuelCost = $hFinances->CalculateFuelBlockCost('market');
$refineryFuelCost = $hFinances->CalculateFuelBlockCost('refinery');
/** /**
* Calculate the final taxes and send to display * Calculate the final taxes and send to display
@@ -74,25 +75,25 @@ class StructureController extends Controller
$tax = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Citadel'])->avg('tax'); $tax = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Citadel'])->avg('tax');
$rTax = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Refinery'])->avg('tax'); $rTax = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Refinery'])->avg('tax');
$monthTaxesMarket = $tempMonthTaxesMarket - $fuelCost; $monthTaxesMarket = $tempMonthTaxesMarket - $marketFuelCost;
$monthTaxesMarket = $hFinances->CalculateTax($monthTaxesMarket, 2.5, 'market'); $monthTaxesMarket = $hFinances->CalculateTax($monthTaxesMarket, 2.5, 'market');
if($monthTaxesMarket < 0.00) { if($monthTaxesMarket < 0.00) {
$monthTaxesMarket = 0.00; $monthTaxesMarket = 0.00;
} }
$lastTaxesMarket = $tempLastTaxesMarket - $fuelCost; $lastTaxesMarket = $tempLastTaxesMarket - $marketFuelCost;
$lastTaxesMarket = $hFinances->CalculateTax($lastTaxesMarket, 2.5, 'market'); $lastTaxesMarket = $hFinances->CalculateTax($lastTaxesMarket, 2.5, 'market');
if($lastTaxesMarket < 0.00) { if($lastTaxesMarket < 0.00) {
$lastTaxesMarket = 0.00; $lastTaxesMarket = 0.00;
} }
$monthTaxesReprocessing = $tempMonthTaxesReprocessing - $fuelCost; $monthTaxesReprocessing = $tempMonthTaxesReprocessing - $refineryFuelCost;
$monthTaxesReprocessing = $hFinances->CalculateTax($monthTaxesReprocessing, 2.5, 'refinery'); $monthTaxesReprocessing = $hFinances->CalculateTax($monthTaxesReprocessing, 2.5, 'refinery');
if($monthTaxesReprocessing < 0.00) { if($monthTaxesReprocessing < 0.00) {
$monthTaxesReprocessing = 0.00; $monthTaxesReprocessing = 0.00;
} }
$lastTaxesReprocessing = $tempLastTaxesReprocessing - $fuelCost; $lastTaxesReprocessing = $tempLastTaxesReprocessing - $refineryFuelCost;
$lastTaxesReprocessing = $hFinances->CalculateTax($lastTaxesReprocessing, 2.5, 'refinery'); $lastTaxesReprocessing = $hFinances->CalculateTax($lastTaxesReprocessing, 2.5, 'refinery');
if($lastTaxesReprocessing < 0.00) { if($lastTaxesReprocessing < 0.00) {
$lastTaxesReprocessing = 0.00; $lastTaxesReprocessing = 0.00;

2
app/Library/FinanceHelper.php
View File

@@ -33,7 +33,7 @@ class FinanceHelper {
//Calculate how many fuel blocks are used in a month by a structure type //Calculate how many fuel blocks are used in a month by a structure type
if($type === 'market') { if($type === 'market') {
$fuelBlocks = 24*30*32; $fuelBlocks = 24*30*32;
} else if ($type === 'reprocessing') { } else if ($type === 'refinery') {
$fuelBlocks = 24*30*8; $fuelBlocks = 24*30*8;
} else { } else {
$fuelBlocks = 0; $fuelBlocks = 0;