From 0815b43797c1c08172feb0409492d64e8257d5c2 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 31 May 2021 23:55:12 +0900 Subject: [PATCH] moon displays --- .../MiningTaxes/MiningTaxesController.php | 40 ++-- .../user/display/moons/allmoons_bak.blade.php | 170 ---------------- .../display/moons/availablemoons.blade.php | 185 ++++++++++++++++++ 3 files changed, 198 insertions(+), 197 deletions(-) delete mode 100644 resources/views/miningtax/user/display/moons/allmoons_bak.blade.php create mode 100644 resources/views/miningtax/user/display/moons/availablemoons.blade.php diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php index 7bc7bfed9..4ae9a0914 100644 --- a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php +++ b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php @@ -86,33 +86,19 @@ class MiningTaxesController extends Controller 'Loparite', 'Ytterbite', ]; - /* - $systems = [ - '0-NTIS', - '1-NJLK', - '35-JWD', - '8KR9-5', - 'EIMJ-M', - 'F-M1FU', - 'G-C8QO', - 'I6M-9U', - 'L5D-ZL', - 'L-YMYU', - 'VQE-CN', - 'VR-YIQ', - 'XZ-SKZ', - 'Y-CWQY', - ]; - */ $systems = AllianceMoon::where([ 'rented' => 'No', - ])->pluck('system_name')->unique()->toArray(); + ])->where(['moon_type', '!=', 'R32']) + ->orWhere(['moon_type', '!=', 'R64']) + ->pluck('system_name')->unique()->toArray(); //Get all of the moons which are not rented $allyMoons = AllianceMoon::where([ 'rented' => 'No', - ])->get(); + ])->where(['moon_type', '!=', 'R32']) + ->orWhere(['moon_type', '!=', 'R64']) + ->get(); foreach($allyMoons as $moon) { $ores = AllianceMoonOre::where([ @@ -125,13 +111,13 @@ class MiningTaxesController extends Controller ]); } - return view('miningtax.user.display.moons.allmoons')->with('moons', $moons) - ->with('systems', $systems) - ->with('r4Goo', $r4Goo) - ->with('r8Goo', $r8Goo) - ->with('r16Goo', $r16Goo) - ->with('r32Goo', $r32Goo) - ->with('r64Goo', $r64Goo); + return view('miningtax.user.display.moons.availablemoons')->with('moons', $moons) + ->with('systems', $systems) + ->with('r4Goo', $r4Goo) + ->with('r8Goo', $r8Goo) + ->with('r16Goo', $r16Goo) + ->with('r32Goo', $r32Goo) + ->with('r64Goo', $r64Goo); } /** diff --git a/resources/views/miningtax/user/display/moons/allmoons_bak.blade.php b/resources/views/miningtax/user/display/moons/allmoons_bak.blade.php deleted file mode 100644 index 32f5f2e5f..000000000 --- a/resources/views/miningtax/user/display/moons/allmoons_bak.blade.php +++ /dev/null @@ -1,170 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Moons in Warped Intentions Sovereignty

-
-
-
- -
-
- @foreach($systems as $system) -
- - - - - - - - - - - - - - - - @foreach($moons as $moon) - @if($moon->System == $system) - @if($moon->Availability == 'Deployed') - - @else - - @endif - - - @if(in_array($moon->FirstOre, $r4Goo)) - - - @elseif(in_array($moon->FirstOre, $r8Goo)) - - - @elseif(in_array($moon->FirstOre, $r16Goo)) - - - @elseif(in_array($moon->FirstOre, $r32Goo)) - - - @elseif(in_array($moon->FirstOre, $r64Goo)) - - - @else - - - @endif - @if(in_array($moon->SecondOre, $r4Goo)) - - - @elseif(in_array($moon->SecondOre, $r8Goo)) - - - @elseif(in_array($moon->SecondOre, $r16Goo)) - - - @elseif(in_array($moon->SecondOre, $r32Goo)) - - - @elseif(in_array($moon->SecondOre, $r64Goo)) - - - @else - - - @endif - @if(in_array($moon->ThirdOre, $r4Goo)) - - - @elseif(in_array($moon->ThirdOre, $r8Goo)) - - - @elseif(in_array($moon->ThirdOre, $r16Goo)) - - - @elseif(in_array($moon->ThirdOre, $r32Goo)) - - - @elseif(in_array($moon->ThirdOre, $r64Goo)) - - - @else - - - @endif - @if(in_array($moon->FourthOre, $r4Goo)) - - - @elseif(in_array($moon->FourthOre, $r8Goo)) - - - @elseif(in_array($moon->FourthOre, $r16Goo)) - - - @elseif(in_array($moon->FourthOre, $r32Goo)) - - - @elseif(in_array($moon->FourthOre, $r64Goo)) - - - @else - - - @endif - - - @endif - @endforeach - -
LocationCorporationFirst OreFirst QuantitySecond OreSecond QuantityThird OreThird QuantityFourth OreFourth QuantityAvailability
{{ $moon->System . " - " . $moon->Planet . " - " . $moon->Moon }}{{ $moon->Corporation }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}{{ $moon->Availability }}
-
- @endforeach -
-
-
-
-
-
-
-
- Legend -
-
- - - - - - - - - - - - - - - - - - -
R4 Ore
R8 Ore
R16 Ore
R32 Ore
R64 Ore
-
-
-
-
-
-
-
-
-
-
- -@endsection \ No newline at end of file diff --git a/resources/views/miningtax/user/display/moons/availablemoons.blade.php b/resources/views/miningtax/user/display/moons/availablemoons.blade.php new file mode 100644 index 000000000..0ae37fa6e --- /dev/null +++ b/resources/views/miningtax/user/display/moons/availablemoons.blade.php @@ -0,0 +1,185 @@ +@extends('layouts.user.dashb4') +@section('content') +
+
+
+

Available Moons for Rent in Warped Intentions Sovreignty

+
+
+
+ +
+
+ @foreach($systems as $system) +
+ + + + + + + + + + + + + + @foreach($moons as $moon) + @if($moon['system'] == $system) + + + @if(isset($moon['ores'][0])) + @if(in_array($moon['ores'][0]['ore_name'], $r4Goo)) + + + @endif + @if(in_array($moon['ores'][0]['ore_name'], $r8Goo)) + + + @endif + @if(in_array($moon['ores'][0]['ore_name'], $r16Goo)) + + + @endif + @if(in_array($moon['ores'][0]['ore_name'], $r32Goo)) + + + @endif + @if(in_array($moon['ores'][0]['ore_name'], $r64Goo)) + + + @endif + @else + + + @endif + @if(isset($moon['ores'][1])) + @if(in_array($moon['ores'][1]['ore_name'], $r4Goo)) + + + @endif + @if(in_array($moon['ores'][1]['ore_name'], $r8Goo)) + + + @endif + @if(in_array($moon['ores'][1]['ore_name'], $r16Goo)) + + + @endif + @if(in_array($moon['ores'][1]['ore_name'], $r32Goo)) + + + @endif + @if(in_array($moon['ores'][1]['ore_name'], $r64Goo)) + + + @endif + @else + + + @endif + @if(isset($moon['ores'][2])) + @if(in_array($moon['ores'][2]['ore_name'], $r4Goo)) + + + @endif + @if(in_array($moon['ores'][2]['ore_name'], $r8Goo)) + + + @endif + @if(in_array($moon['ores'][2]['ore_name'], $r16Goo)) + + + @endif + @if(in_array($moon['ores'][2]['ore_name'], $r32Goo)) + + + @endif + @if(in_array($moon['ores'][2]['ore_name'], $r64Goo)) + + + @endif + @else + + + @endif + @if(isset($moon['ores'][3])) + @if(in_array($moon['ores'][3]['ore_name'], $r4Goo)) + + + @endif + @if(in_array($moon['ores'][3]['ore_name'], $r8Goo)) + + + @endif + @if(in_array($moon['ores'][3]['ore_name'], $r16Goo)) + + + @endif + @if(in_array($moon['ores'][3]['ore_name'], $r32Goo)) + + + @endif + @if(in_array($moon['ores'][3]['ore_name'], $r64Goo)) + + + @endif + @else + + + @endif + + @endif + @endforeach + +
LocationFirst OreFirst QuantitySecond OreSecond QuantityThird OreThird QuantityFourth OreFourth Quantity
{{ $system }}{{ $moon['ores'][0]['ore_name'] }}{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][0]['ore_name'] }}{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][0]['ore_name'] }}{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][0]['ore_name'] }}{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][0]['ore_name'] }}{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][1]['ore_name'] }}{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][1]['ore_name'] }}{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][1]['ore_name'] }}{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][1]['ore_name'] }}{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][1]['ore_name'] }}{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][2]['ore_name'] }}{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][2]['ore_name'] }}{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][2]['ore_name'] }}{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][2]['ore_name'] }}{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][2]['ore_name'] }}{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][3]['ore_name'] }}{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][3]['ore_name'] }}{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][3]['ore_name'] }}{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][3]['ore_name'] }}{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%{{ $moon['ores'][3]['ore_name'] }}{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%
+
+ @endforeach +
+
+
+
+
+
+
+
+ Legend +
+
+ + + + + + + + + + + + + + + + + + +
R4 Ore
R8 Ore
R16 Ore
R32 Ore
R64 Ore
+
+
+
+
+
+
+
+
+
+
+@endsection \ No newline at end of file