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

added moon rentals into tax performance metrics

Browse Source
This commit is contained in:
Christopher Mancuso
2021-07-18 00:39:02 -05:00
parent bca5179cc3
commit 3da0cec4a1
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Dashboard/AdminDashboardController.php
View File

@@ -239,6 +239,11 @@ class AdminDashboardController extends Controller
'date' => $date['start']->toFormattedDateString(), 'date' => $date['start']->toFormattedDateString(),
'gross' => number_format($tHelper->GetMoonMiningTaxesLateGross($date['start'], $date['end']), 2, ".", ","), '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) return view('admin.dashboards.taxes')->with('pis', $pis)

10
app/Library/Helpers/TaxesHelper.php
View File

@@ -11,6 +11,7 @@ use App\Models\User\UserRole;
use App\Models\User\UserPermission; use App\Models\User\UserPermission;
use App\Models\Finances\AllianceWalletJournal; use App\Models\Finances\AllianceWalletJournal;
use App\Models\MiningTax\Invoice; use App\Models\MiningTax\Invoice;
use App\Models\MoonRental\AllianceMoonRental;
class TaxesHelper { class TaxesHelper {
@@ -26,6 +27,15 @@ class TaxesHelper {
$this->end = $en; $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) { public function GetMoonMiningTaxesGross($start, $end) {
$revenue = 0.00; $revenue = 0.00;