display streams

This commit is contained in:
2019-02-27 23:11:23 -06:00
parent 0922f54764
commit cdf92fe180
3 changed files with 83 additions and 3 deletions
+13 -1
View File
@@ -57,12 +57,24 @@ class TaxesController extends Controller
'date' => $date['start']->toFormattedDateString(),
'gross' => number_format($tHelper->GetOfficeGross($date['start'], $date['end']), 2, ".", ","),
];
$markets[] = [
'date' => $date['start']->toFormattedDateString(),
'gross' => number_format($tHelper->GetMarketGross($date['start'], $date['end']), 2, ".", ","),
];
$jumpgates[] = [
'date' => $date['start']->toFormattedDateString(),
'gross' => number_format($tHelper->GetJumpGateGross($date['start'], $date['end']), 2, ".", ","),
];
}
//Return the view with the compact variable list
return view('/taxes/admin/displaystreams')->with('pis', $pis)
->with('industrys', $industrys)
->with('reprocessings', $reprocessings)
->with('offices', $offices);
->with('offices', $offices)
->with('markets', $markets)
->with('jumpgates', $jumpgates);
}
}
+23 -1
View File
@@ -14,6 +14,8 @@ use App\Models\Finances\ReprocessingTaxJournal;
use App\Models\Finances\StructureIndustryTaxJournal;
use App\Models\Finances\PlanetProductionTaxJournal;
use App\Models\Finances\OfficeFeesJournal;
use App\Models\Finances\CorpMarketJournal;
use App\Models\Finances\JumpBridgeJournal;
class TaxesHelper {
@@ -30,10 +32,30 @@ class TaxesHelper {
$this->end = $en;
}
public function GetJumpGateGross($start, $end) {
$revenue = 0.00;
$revenue = JumpBridgeJournal::where(['ref_type' => 'structure_gate_jump', 'second_party_id' => '98287666'])
->whereBetween('date', [$start, $end])
->sum('amount');
return $revenue;
}
public function GetMarketGross($start, $end) {
$revenue = 0.00;
$revenue = CorpMarketJournal::where(['ref_type' => 'brokers_fee', 'second_party_id' => '98287666'])
->whereBetween('date', [$start, $end])
->sum('amount');
return $revenue;
}
public function GetIndustryGross($start, $end) {
$revenue = 0.00;
$revenue = StructureIndustryTaxJournal::where(['ref_type' => 'facility_industry_tax', 'second_party_id' => '98287666'])
$revenue = StructureIndustryTaxJournal::where(['ref_type' => 'industry_job_tax', 'second_party_id' => '98287666'])
->whereBetween('date', [$start, $end])
->sum('amount');