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

StructureController

Browse Source
This commit is contained in:
drkthunder02
2018-12-07 03:38:17 -06:00
parent de90425e50
commit 00eff22032
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,15 +49,7 @@ class StructureController extends Controller
//Get the number of structures registered to a corporation //Get the number of structures registered to a corporation
$citadelCount = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Citadel'])->count(); $citadelCount = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Citadel'])->count();
$refineryCount = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Refinery'])->count(); $refineryCount = CorpStructure::where(['corporation_id' => $corporation, 'structure_type' => 'Refinery'])->count();
//$citadelCount = DB::select("SELECT COUNT(structure_name) FROM CorpStructures WHERE corporation_id='" . $corporation . "' AND structure_type='Citadel'");
//$refineryCount = DB::select("SELECT COUNT(structure_name) FROM CorpStructures WHERE corporation_id='" . $corporation . "' aND structure_type='Refinery'");
//Get the taxes for the corporation
//$monthTaxesMarket = DB::select("SELECT SUM(amount) FROM CorpJournals WHERE ref_type='brokers_fee' AND corporation_id='" . $corpId . "' AND date BETWEEN '" . $start . "' AND '" . $end . "'");
//$lastTaxesMarket = DB::select("SELECT SUM(amount) FROM CorpJournals WHERE ref_type='brokers_fee' AND corporation_id='" . $corpId . "' AND date BETWEEN '" . $startLast . "' AND '" . $endLast . "'");
//$monthTaxesReprocessing = DB::select("SELECT SUM(amount) FROM CorpJournals WHERE ref_type='reprocessing_fee' AND corporation_id='" . $corpId . "' AND date BETWEEN '" . $start . "' AND '" . $end . "'");
//$lastTaxesReprocessing = DB::select("SELECT SUM(amount) FROM CorpJournals WHERE ref_type='reprocessing_fee' AND corporation_id='" . $corpId . "' AND date BETWEEN '" . $startLast . "' AND '" . $endLast . "'");
$monthTaxesMarket = CorpJournal::where(['ref_type' => 'brokers_fee', 'corporation_id' => $corpId]) $monthTaxesMarket = CorpJournal::where(['ref_type' => 'brokers_fee', 'corporation_id' => $corpId])
->whereBetween('date', [$start, $end]) ->whereBetween('date', [$start, $end])
->sum('amount'); ->sum('amount');
@@ -76,31 +68,31 @@ class StructureController extends Controller
*/ */
$fuelCost = $hFinances->CalculateFuelBlockCost('market'); $fuelCost = $hFinances->CalculateFuelBlockCost('market');
$monthlyTaxesMarket = $monthTaxesMarket - $fuelCost; $monthTaxesMarket = $monthTaxesMarket - $fuelCost;
if($monthTaxesMarket < 0.00) { if($monthTaxesMarket < 0.00) {
$monthTaxesMarket = 0.00; $monthTaxesMarket = 0.00;
} }
$lastMonthTaxesMarket = $lastTaxesMarket - $fuelCost; $lastTaxesMarket = $lastTaxesMarket - $fuelCost;
if($lastTaxesMarket < 0.00) { if($lastTaxesMarket < 0.00) {
$lastTaxesMarket = 0.00; $lastTaxesMarket = 0.00;
} }
$monthlyTaxesReprocessing = $monthTaxesReprocessing - $fuelCost; $monthTaxesReprocessing = $monthTaxesReprocessing - $fuelCost;
if($monthTaxesReprocessing < 0.00) { if($monthTaxesReprocessing < 0.00) {
$monthTaxesReprocessing = 0.00; $monthTaxesReprocessing = 0.00;
} }
$lastMonthTaxesReprocessing = $lastTaxesReprocessing - $fuelCost; $lastTaxesReprocessing = $lastTaxesReprocessing - $fuelCost;
if($lastTaxesReprocessing < 0.00) { if($lastTaxesReprocessing < 0.00) {
$lastTaxesReprocessing = 0.00; $lastTaxesReprocessing = 0.00;
} }
//Create the array to pass to the blade view //Create the array to pass to the blade view
$totalTaxes = [ $totalTaxes = [
'thisMonthReprocessing' => number_format($monthlyTaxesReprocessing, 2, '.', ','), 'thisMonthReprocessing' => number_format($monthTaxesReprocessing, 2, '.', ','),
'lastMonthReprocessing' => number_format($lastMonthTaxesReprocessing, 2, '.', ','), 'lastMonthReprocessing' => number_format($lastMonthTaxesReprocessing, 2, '.', ','),
'thisMonthMarket' => number_format($monthlyTaxesMarket, 2, '.', ','), 'thisMonthMarket' => number_format($monthTaxesMarket, 2, '.', ','),
'lastMonthMarket' => number_format($lastMonthTaxesMarket, 2, '.', ','), 'lastMonthMarket' => number_format($lastMonthTaxesMarket, 2, '.', ','),
]; ];