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

moon displays

Browse Source
This commit is contained in:
drkthunder02
2021-06-01 00:03:31 +09:00
parent 49257e4cf4
commit 20cc7f22dc
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/MiningTaxes/MiningTaxesController.php
View File

@@ -103,7 +103,8 @@ class MiningTaxesController extends Controller
if($moon->moon_type != 'R32' || $moon->moon_type != 'R64') { if($moon->moon_type != 'R32' || $moon->moon_type != 'R64') {
$moons->push([ $moons->push([
'system' => $moon->name, 'system' => $moon->system_name,
'moon_name' => $moon->name,
'ores' => $ores, 'ores' => $ores,
]); ]);
} }
@@ -192,7 +193,8 @@ class MiningTaxesController extends Controller
])->get(['ore_name', 'quantity'])->toArray(); ])->get(['ore_name', 'quantity'])->toArray();
$moons->push([ $moons->push([
'system' => $moon->name, 'system' => $moon->system_name,
'moon_name' => $moon->name,
'ores' => $ores, 'ores' => $ores,
]); ]);
} }

18
resources/views/miningtax/user/display/moons/allmoons.blade.php
View File

@@ -34,7 +34,7 @@
@foreach($moons as $moon) @foreach($moons as $moon)
@if($moon['system'] == $system) @if($moon['system'] == $system)
<tr> <tr>
<td>{{ $system }}</td> <td>{{ $moon['moon_name'] }}</td>
@if(isset($moon['ores'][0])) @if(isset($moon['ores'][0]))
@if(in_array($moon['ores'][0]['ore_name'], $r4Goo)) @if(in_array($moon['ores'][0]['ore_name'], $r4Goo))
<td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td> <td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td>
@@ -57,8 +57,8 @@
<td class="table-danger">{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%</td> <td class="table-danger">{{ number_format(($moon['ores'][0]['quantity'] * 100.00), 2, ".", ",") }}%</td>
@endif @endif
@else @else
<td></td> <td></td>
<td></td> <td></td>
@endif @endif
@if(isset($moon['ores'][1])) @if(isset($moon['ores'][1]))
@if(in_array($moon['ores'][1]['ore_name'], $r4Goo)) @if(in_array($moon['ores'][1]['ore_name'], $r4Goo))
@@ -82,8 +82,8 @@
<td class="table-danger">{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%</td> <td class="table-danger">{{ number_format(($moon['ores'][1]['quantity'] * 100.00), 2, ".", ",") }}%</td>
@endif @endif
@else @else
<td></td> <td></td>
<td></td> <td></td>
@endif @endif
@if(isset($moon['ores'][2])) @if(isset($moon['ores'][2]))
@if(in_array($moon['ores'][2]['ore_name'], $r4Goo)) @if(in_array($moon['ores'][2]['ore_name'], $r4Goo))
@@ -107,8 +107,8 @@
<td class="table-danger">{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%</td> <td class="table-danger">{{ number_format(($moon['ores'][2]['quantity'] * 100.00), 2, ".", ",") }}%</td>
@endif @endif
@else @else
<td></td> <td></td>
<td></td> <td></td>
@endif @endif
@if(isset($moon['ores'][3])) @if(isset($moon['ores'][3]))
@if(in_array($moon['ores'][3]['ore_name'], $r4Goo)) @if(in_array($moon['ores'][3]['ore_name'], $r4Goo))
@@ -132,8 +132,8 @@
<td class="table-danger">{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%</td> <td class="table-danger">{{ number_format(($moon['ores'][3]['quantity'] * 100.00), 2, ".", ",") }}%</td>
@endif @endif
@else @else
<td></td> <td></td>
<td></td> <td></td>
@endif @endif
</tr> </tr>
@endif @endif

2
resources/views/miningtax/user/display/moons/availablemoons.blade.php
View File

@@ -34,7 +34,7 @@
@foreach($moons as $moon) @foreach($moons as $moon)
@if($moon['system'] == $system) @if($moon['system'] == $system)
<tr> <tr>
<td>{{ $system }}</td> <td>{{ $moon['moon_name'] }}</td>
@if(isset($moon['ores'][0])) @if(isset($moon['ores'][0]))
@if(in_array($moon['ores'][0]['ore_name'], $r4Goo)) @if(in_array($moon['ores'][0]['ore_name'], $r4Goo))
<td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td> <td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td>