display streams

app/Http/Controllers/TaxesController.php

@@ -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);
     }
 }

app/Library/Taxes/TaxesHelper.php

@@ -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');
 

resources/views/taxes/admin/displaystreams.blade.php

@@ -90,5 +90,51 @@
         </div>
     </div>
 </div>
-
+<br>
+<div class="container">
+    <div class="row">
+        <div class="card">
+            <div class="card-header">
+                Market Taxes
+            </div>
+            <div class="card-body">
+                <table class="table table-striped">
+                    <thead>
+                        <th>Month</th>
+                        <th>Market Taxes</th>
+                    </thead>
+                    <tbody>
+                        @foreach($markets as $market)
+                            <tr>
+                                <td>{{ $market['date'] }}</td>
+                                <td>{{ $market['gross'] }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-header">
+                Jump Gate Taxes
+            </div>
+            <div class="card-body">
+                <table class="table table-striped">
+                    <thead>
+                        <th>Month</th>
+                        <th>Jump Gate Taxes</th>
+                    </thead>
+                    <tbody>
+                        @foreach($jumpgates as $jumpgate)
+                            <tr>
+                                <td>{{ $jumpgate['date'] }}</td>
+                                <td>{{ $jumpgate['gross'] }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
 @endsection