From bc0b3336c5a204abd937e60b74cf736c873735f9 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 31 May 2021 23:59:32 +0900 Subject: [PATCH] moon displays --- .../MiningTaxes/MiningTaxesController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php index 3c5609bbc..aafa43491 100644 --- a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php +++ b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php @@ -89,15 +89,17 @@ class MiningTaxesController extends Controller $systems = AllianceMoon::where([ 'rented' => 'No', - ])->where('moon_type', '!=', 'R32') - ->orWhere('moon_type', '!=', 'R64') + ])->where('moon_type', '=', 'R4') + ->orWhere('moon_type', '=', 'R8') + ->orWhere('moon_type', '=', 'R16') ->pluck('system_name')->unique()->toArray(); //Get all of the moons which are not rented $allyMoons = AllianceMoon::where([ 'rented' => 'No', - ])->where('moon_type', '!=', 'R32') - ->orWhere('moon_type', '!=', 'R64') + ])->where('moon_type', '=', 'R4') + ->orWhere('moon_type', '=', 'R8') + ->orWhere('moon_type', '=', 'R16') ->get(); foreach($allyMoons as $moon) { @@ -106,7 +108,7 @@ class MiningTaxesController extends Controller ])->get(['ore_name', 'quantity'])->toArray(); $moons->push([ - 'system' => $moon->system_name, + 'system' => $moon->name, 'ores' => $ores, ]); } @@ -194,7 +196,7 @@ class MiningTaxesController extends Controller ])->get(['ore_name', 'quantity'])->toArray(); $moons->push([ - 'system' => $moon->system_name, + 'system' => $moon->name, 'ores' => $ores, ]); }