diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php index e94addf9f..b0355a0c2 100644 --- a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php +++ b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php @@ -10,7 +10,6 @@ use Log; use Carbon\Carbon; use Khill\Lavacharts\Lavacharts; use Auth; -//Collection Stuff use Illuminate\Support\Collection; use Illuminate\Support\Str; @@ -19,6 +18,7 @@ use App\Library\Helpers\LookupHelper; use App\Library\Helpers\StructureHelper; use Seat\Eseye\Exceptions\RequestFailedException; use App\Library\Esi\Esi; +use App\Library\Moons\MoonCalc; //Models use App\Models\Moon\ItemComposition; @@ -29,6 +29,8 @@ use App\Models\MiningTax\Invoice; use App\Models\Esi\EsiToken; use App\Models\Esi\EsiScope; use App\Models\User\User; +use App\Models\MoonRental\AllianceMoon; +use App\Models\MoonRental\AllianceMoonOre; class MiningTaxesController extends Controller { @@ -40,6 +42,181 @@ class MiningTaxesController extends Controller $this->middleware('role:User'); } + public function displayAvailableMoons() { + //Declare variables + $moons = new Collection; + $mHelper = new MoonCalc; + $lookup = new LookupHelper; + $system = array(); + + /** + * Declare our different flavors of moon goo for the blade + */ + $r4Goo = [ + 'Zeolites', + 'Sylvite', + 'Bitumens', + 'Coesite', + ]; + + $r8Goo = [ + 'Cobaltite', + 'Euxenite', + 'Titanite', + 'Scheelite', + ]; + + $r16Goo = [ + 'Otavite', + 'Sperrylite', + 'Vanadinite', + 'Chromite', + ]; + + $r32Goo = [ + 'Carnotite', + 'Zircon', + 'Pollucite', + 'Cinnabar', + ]; + + $r64Goo = [ + 'Xenotime', + 'Monazite', + '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', + ]; + + //Get all of the moons which are not rented + $allyMoons = AllianceMoon::where([ + 'rented' => 'No', + ])->get(); + + foreach($allyMoons as $moon) { + $ores = AllianceMoonOre::where([ + 'moon_id' => $moon->moon_id, + ])->get()->toArray(); + + $moons->push([ + 'system' => $moon->system_name, + 'ores' => $ores; + ]); + } + + 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); + } + + /** + * Display all the moons in Warped Intentions Sovreignty + */ + public function displayAllMoons() { + //Declare variables + $moons = new Collection; + $mHelper = new MoonCalc; + $lookup = new LookupHelper; + $system = array(); + + /** + * Declare our different flavors of moon goo for the blade + */ + $r4Goo = [ + 'Zeolites', + 'Sylvite', + 'Bitumens', + 'Coesite', + ]; + + $r8Goo = [ + 'Cobaltite', + 'Euxenite', + 'Titanite', + 'Scheelite', + ]; + + $r16Goo = [ + 'Otavite', + 'Sperrylite', + 'Vanadinite', + 'Chromite', + ]; + + $r32Goo = [ + 'Carnotite', + 'Zircon', + 'Pollucite', + 'Cinnabar', + ]; + + $r64Goo = [ + 'Xenotime', + 'Monazite', + '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', + ]; + + //Get all of the moons which are not rented + $allyMoons = AllianceMoon::all(); + + foreach($allyMoons as $moon) { + $ores = AllianceMoonOre::where([ + 'moon_id' => $moon->moon_id, + ])->get()->toArray(); + + $moons->push([ + 'system' => $moon->system_name, + 'ores' => $ores; + ]); + } + + 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); + } + /** * Display an invoice based on it's id * @@ -114,12 +291,12 @@ class MiningTaxesController extends Controller $paidAmount += $p->invoice_amount; } - return view('miningtax.user.display.invoices')->with('unpaid', $unpaid) - ->with('late', $late) - ->with('deferred', $deferred) - ->with('paid', $paid) - ->with('unpaidAmount', $unpaidAmount) - ->with('paidAmount', $paidAmount); + return view('miningtax.user.display.invoices.invoices')->with('unpaid', $unpaid) + ->with('late', $late) + ->with('deferred', $deferred) + ->with('paid', $paid) + ->with('unpaidAmount', $unpaidAmount) + ->with('paidAmount', $paidAmount); } /** @@ -228,7 +405,7 @@ class MiningTaxesController extends Controller ]); //Return the view with the extractions variable for html processing - return view('miningtax.user.display.upcoming')->with('structures', $structures) + return view('miningtax.user.display.pulls.upcoming')->with('structures', $structures) ->with('lava', $lava) ->with('calendar', $calendar); } @@ -304,7 +481,7 @@ class MiningTaxesController extends Controller } //Return the view - return view('miningtax.user.display.ledger')->with('miningLedgers', $miningLedgers) + return view('miningtax.user.display.details.ledger')->with('miningLedgers', $miningLedgers) ->with('structures', $structures); } } diff --git a/app/Http/Controllers/MoonRental/MoonRentalAdminController.php b/app/Http/Controllers/MoonRental/MoonRentalAdminController.php deleted file mode 100644 index 4a05fd4b3..000000000 --- a/app/Http/Controllers/MoonRental/MoonRentalAdminController.php +++ /dev/null @@ -1,46 +0,0 @@ -middleware('role:Admin'); - $this->middleware('permission:moon.rental.manager'); - } - - /** - * Display rental requests - */ - public function displayRentalRequests() { - - } - - /** - * Create monthly moon rental - */ - public function storeRentalRequest() { - - } - - /** - * Delete / remove monthly moon rental - */ - public function updateRentalRequest() { - - } - - /** - * Display current monthly moon rentals - */ - public function displayCurrentRentals() { - - } - -} diff --git a/app/Http/Controllers/MoonRental/MoonRentalController.php b/app/Http/Controllers/MoonRental/MoonRentalController.php deleted file mode 100644 index fc006e90c..000000000 --- a/app/Http/Controllers/MoonRental/MoonRentalController.php +++ /dev/null @@ -1,48 +0,0 @@ -middleware('role:user'); - } - - /** - * Display all of the available moons for rental - */ - public function displayMoons() { - $moons = AllianceMoon::where([ - 'rented' => 'No', - ])->get(); - - return view('moon.rental.available.display')->with('moons', $moons); - } - - /** - * Display moon rental request form - */ - public function displayMoonRentalRequestForm() { - - } - - /** - * Store moon rental from the request form - */ - public function storeMoonRentalRequest() { - - } - - /** - * Request a mail job be added to the mail queue to resend mining bill instantly - */ - public function requestMoonRentalBill() { - - } -} diff --git a/resources/views/miningtax/user/display/ledger.blade.php b/resources/views/miningtax/user/display/details/ledger.blade.php similarity index 100% rename from resources/views/miningtax/user/display/ledger.blade.php rename to resources/views/miningtax/user/display/details/ledger.blade.php diff --git a/resources/views/miningtax/user/display/invoices.blade.php b/resources/views/miningtax/user/display/invoices/invoices.blade.php similarity index 100% rename from resources/views/miningtax/user/display/invoices.blade.php rename to resources/views/miningtax/user/display/invoices/invoices.blade.php diff --git a/resources/views/miningtax/user/display/moons/allmoons.blade.php b/resources/views/miningtax/user/display/moons/allmoons.blade.php new file mode 100644 index 000000000..e0c5b11ba --- /dev/null +++ b/resources/views/miningtax/user/display/moons/allmoons.blade.php @@ -0,0 +1,184 @@ +@extends('layouts.user.dashb4') +@section('content') +
+
+
+

Moons 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], $r4Goo)) + + + + + + + + @endif + @if(isset($moon['ores'][1])) + @if(in_array($moon['ores'][1], $r4Goo)) + + + + + + + + @endif + @if(isset($moon['ores'][2])) + @if(in_array($moon['ores'][2], $r4Goo)) + + + + + + + + @endif + @if(isset($moon['ores'][3])) + @if(in_array($moon['ores'][3], $r4Goo)) + + + + + + + + @endif + + @endif + @endforeach + +
LocationFirst OreFirst QuantitySecond OreSecond QuantityThird OreThird QuantityFourth OreFourth Quantity
{{ $moon['ores'][0]['ore_name'] }}{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][0], $r8Goo)) + {{ $moon['ores'][0]['ore_name'] }}{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][0], $r16Goo)) + {{ $moon['ores'][0]['ore_name'] }}{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][0], $r32Goo)) + {{ $moon['ores'][0]['ore_name'] }}{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][0], $r64Goo)) + {{ $moon['ores'][0]['ore_name'] }}{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }} + @endif + @else + {{ $moon['ores'][1]['ore_name'] }}{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][1], $r8Goo)) + {{ $moon['ores'][1]['ore_name'] }}{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][1], $r16Goo)) + {{ $moon['ores'][1]['ore_name'] }}{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][1], $r32Goo)) + {{ $moon['ores'][1]['ore_name'] }}{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][1], $r64Goo)) + {{ $moon['ores'][1]['ore_name'] }}{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }} + @endif + @else + {{ $moon['ores'][2]['ore_name'] }}{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][2], $r8Goo)) + {{ $moon['ores'][2]['ore_name'] }}{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][2], $r16Goo)) + {{ $moon['ores'][2]['ore_name'] }}{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][2], $r32Goo)) + {{ $moon['ores'][2]['ore_name'] }}{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][2], $r64Goo)) + {{ $moon['ores'][2]['ore_name'] }}{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }} + @endif + @else + {{ $moon['ores'][3]['ore_name'] }}{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][3], $r8Goo)) + {{ $moon['ores'][3]['ore_name'] }}{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][3], $r16Goo)) + {{ $moon['ores'][3]['ore_name'] }}{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][3], $r32Goo)) + {{ $moon['ores'][3]['ore_name'] }}{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }} + @endif + @if(in_array($moon['ores'][3], $r64Goo)) + {{ $moon['ores'][3]['ore_name'] }}{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }} + @endif + @else +
+
+ @endforeach +
+
+
+
+
+
+
+
+ Legend +
+
+ + + + + + + + + + + + + + + + + + +
R4 Ore
R8 Ore
R16 Ore
R32 Ore
R64 Ore
+
+
+
+
+
+
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/moons/user/allmoons.blade.php b/resources/views/miningtax/user/display/moons/allmoons_bak.blade.php similarity index 96% rename from resources/views/moons/user/allmoons.blade.php rename to resources/views/miningtax/user/display/moons/allmoons_bak.blade.php index d91f756f5..32f5f2e5f 100644 --- a/resources/views/moons/user/allmoons.blade.php +++ b/resources/views/miningtax/user/display/moons/allmoons_bak.blade.php @@ -42,7 +42,7 @@ @endif {{ $moon->System . " - " . $moon->Planet . " - " . $moon->Moon }} {{ $moon->Corporation }} - @if(in_array($moon->FirstOre, $gasGoo)) + @if(in_array($moon->FirstOre, $r4Goo)) {{ $moon->FirstOre }} {{ $moon->FirstQuantity }} @elseif(in_array($moon->FirstOre, $r8Goo)) @@ -61,7 +61,7 @@ {{ $moon->FirstOre }} {{ $moon->FirstQuantity }} @endif - @if(in_array($moon->SecondOre, $gasGoo)) + @if(in_array($moon->SecondOre, $r4Goo)) {{ $moon->SecondOre }} {{ $moon->SecondQuantity }} @elseif(in_array($moon->SecondOre, $r8Goo)) @@ -80,7 +80,7 @@ {{ $moon->SecondOre }} {{ $moon->SecondQuantity }} @endif - @if(in_array($moon->ThirdOre, $gasGoo)) + @if(in_array($moon->ThirdOre, $r4Goo)) {{ $moon->ThirdOre }} {{ $moon->ThirdQuantity }} @elseif(in_array($moon->ThirdOre, $r8Goo)) @@ -99,7 +99,7 @@ {{ $moon->ThirdOre }} {{ $moon->ThirdQuantity }} @endif - @if(in_array($moon->FourthOre, $gasGoo)) + @if(in_array($moon->FourthOre, $r4Goo)) {{ $moon->FourthOre }} {{ $moon->FourthQuantity }} @elseif(in_array($moon->FourthOre, $r8Goo)) @@ -140,7 +140,7 @@ - + diff --git a/resources/views/miningtax/user/display/upcoming.blade.php b/resources/views/miningtax/user/display/pulls/upcoming.blade.php similarity index 100% rename from resources/views/miningtax/user/display/upcoming.blade.php rename to resources/views/miningtax/user/display/pulls/upcoming.blade.php diff --git a/routes/web.php b/routes/web.php index d1bc36189..7f1135ad1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -94,14 +94,8 @@ Route::group(['middleware' => ['auth']], function(){ Route::post('/miningtax/admin/delete/invoice', 'MiningTaxes\MiningTaxesAdminController@DeleteInvoice'); Route::get('/miningtax/admin/display/paid', 'MiningTaxes\MiningTaxesAdminController@DisplayPaidInvoices'); Route::any('/miningtax/admin/display/unpaid/search', 'MiningTaxes\MiningTaxesAdminController@SearchUnpaidInvoice'); - - /** - * Moon Rental display pages - */ - - /** - * Planetary Interaction Display pages - */ + Route::get('/miningtax/display/availablemoons', 'MiningTaxes\MiningTaxesController@displayAvailableMoons'); + Route::get('/miningtax/display/allmoons', 'MiningTaxes\MiningTaxesController@displayAllMoons'); /** * Scopes Controller display pages
Gas OreR4 Ore
R8 Ore