diff --git a/app/Http/Controllers/Dashboard/AdminDashboardController.php b/app/Http/Controllers/Dashboard/AdminDashboardController.php
index 698c706a3..aef179b69 100644
--- a/app/Http/Controllers/Dashboard/AdminDashboardController.php
+++ b/app/Http/Controllers/Dashboard/AdminDashboardController.php
@@ -163,6 +163,7 @@ class AdminDashboardController extends Controller
$corpId = 98287666;
$srpActual = array();
$srpLoss = array();
+ $miningTaxes = array();
/** Taxes Pane */
//Declare classes needed for displaying items on the page
@@ -215,6 +216,11 @@ class AdminDashboardController extends Controller
'date' => $date['start']->toFormattedDateString(),
'gross' => number_format($tHelper->GetJumpGateGross($date['start'], $date['end']), 2, ".", ","),
];
+
+ $miningTaxes[] = [
+ 'date' => $date['start']->toFormattedDateString(),
+ 'gross' => number_format($thelper->GetMoonMiningTaxesGross($date['start'], $date['end']), 2, ".", ","),
+ ];
}
return view('admin.dashboards.taxes')->with('pis', $pis)
@@ -224,7 +230,8 @@ class AdminDashboardController extends Controller
->with('jumpgates', $jumpgates)
->with('reprocessings', $reprocessings)
->with('srpActual', $srpActual)
- ->with('srpLoss', $srpLoss);
+ ->with('srpLoss', $srpLoss)
+ ->with('miningTaxes', $miningTaxes);
}
/**
diff --git a/app/Library/Helpers/TaxesHelper.php b/app/Library/Helpers/TaxesHelper.php
index 8b0b9168d..a38c1a183 100644
--- a/app/Library/Helpers/TaxesHelper.php
+++ b/app/Library/Helpers/TaxesHelper.php
@@ -25,6 +25,19 @@ class TaxesHelper {
$this->end = $en;
}
+ public function GetMoonMiningTaxesGross($start, $end) {
+ $revenue = 0.00;
+
+ $revenue = Invoice::where([
+ 'status' => 'Paid',
+ ])->orWhere([
+ 'status' => 'Paid Late',
+ ])->whereBetween('date_issued', [$start, $end])
+ ->sum('invoice_amount');
+
+ return $revenue;
+ }
+
public function GetAllianceMarketGross($start, $end) {
$revenue = 0.00;
diff --git a/resources/views/admin/dashboards/taxes.blade.php b/resources/views/admin/dashboards/taxes.blade.php
index a126bc7eb..2d6f7ee41 100644
--- a/resources/views/admin/dashboards/taxes.blade.php
+++ b/resources/views/admin/dashboards/taxes.blade.php
@@ -157,6 +157,29 @@
| Month | +SRP Actual | + + + @foreach($miningTaxes as $mining) +
|---|---|
| {{ $mining['date'] }} | +{{ $mining['gross'] }} | +