From 3da0cec4a149883b5a9f4f7b3c3d0bc155fb3309 Mon Sep 17 00:00:00 2001 From: Christopher Mancuso Date: Sun, 18 Jul 2021 00:39:02 -0500 Subject: [PATCH] added moon rentals into tax performance metrics --- .../Controllers/Dashboard/AdminDashboardController.php | 5 +++++ app/Library/Helpers/TaxesHelper.php | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/Http/Controllers/Dashboard/AdminDashboardController.php b/app/Http/Controllers/Dashboard/AdminDashboardController.php index 227cf5d48..c3b194ec2 100644 --- a/app/Http/Controllers/Dashboard/AdminDashboardController.php +++ b/app/Http/Controllers/Dashboard/AdminDashboardController.php @@ -239,6 +239,11 @@ class AdminDashboardController extends Controller 'date' => $date['start']->toFormattedDateString(), 'gross' => number_format($tHelper->GetMoonMiningTaxesLateGross($date['start'], $date['end']), 2, ".", ","), ]; + + $moonRentalTaxes[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetMoonRentalTaxesGross($date['start'], $date['end']), 2, ".", ","), + ]; } return view('admin.dashboards.taxes')->with('pis', $pis) diff --git a/app/Library/Helpers/TaxesHelper.php b/app/Library/Helpers/TaxesHelper.php index c0136c045..9ec81da1b 100644 --- a/app/Library/Helpers/TaxesHelper.php +++ b/app/Library/Helpers/TaxesHelper.php @@ -11,6 +11,7 @@ use App\Models\User\UserRole; use App\Models\User\UserPermission; use App\Models\Finances\AllianceWalletJournal; use App\Models\MiningTax\Invoice; +use App\Models\MoonRental\AllianceMoonRental; class TaxesHelper { @@ -26,6 +27,15 @@ class TaxesHelper { $this->end = $en; } + public function GetMoonRentalTaxesGross($start, $end) { + $revenue = 0.00; + + $revenue = AllianceMoonRental::whereBetween('rental_start', [$start, $end]) + ->sum('rental_amount'); + + return $revenue; + } + public function GetMoonMiningTaxesGross($start, $end) { $revenue = 0.00;