fleet stuff

app/Http/Controllers/FleetsController.php

@@ -23,7 +23,6 @@ class FleetsController extends Controller
     }
 
     public function displayFleets() {
-        //$fleets = DB::table('Fleets')->get();
         $fleets = \App\Models\Fleet::all();
         $data = array();
         $fc = array();
@@ -51,7 +50,14 @@ class FleetsController extends Controller
     }
 
     public function registerFleet(Request $request) {
+        //Register a new instance of the fleet class
         $fleet = new Fleet(Auth::user()->character_id);
+        //Check to see if the character registering the fleet has the correct scope
+        if(!$fleet->HaveEsiScope($fc, 'esi-fleets.write_fleet.v1')) {
+            return view('inc.error')->with('error', 'User does not have the write fleet scope.');
+        }
+        
+        //Make the fleet uri so we can call later functions
         $fleetUri = $fleet->SetFleetUri($request->fleetUri);
         
         //Check for the fleet in the database
@@ -102,7 +108,13 @@ class FleetsController extends Controller
         //Add a pilot to the fleet
         $error = $newPilot->AddPilot($fleet[0]->character_id, $charId, $fleetId);
         
-        return view('/dashboard');
+        if($error === null) {
+            return view('/dashboard')->with('success', 'Invite for fleet sent.');
+        } else {
+            return view('inc.error')->with('error', $error);
+        }
+
+        
     }
 
     public function updateFleet() {

app/Http/Controllers/MoonsController.php

@@ -124,6 +124,30 @@ class MoonsController extends Controller
             'structure' => 'required',
         ]);
 
+        if($request->input('firstquan') < 1.00) {
+            $firstQuan = $request->input('firstquan') * 100.00;
+        } else {
+            $firstQuan = $request->input('firstquan');
+        }
+
+        if($request->input('secondquan') < 1.00) {
+            $firstQuan = $request->input('secondquan') * 100.00;
+        } else {
+            $firstQuan = $request->input('secondquan');
+        }
+
+        if($request->input('thirdquan') < 1.00) {
+            $firstQuan = $request->input('thirdquan') * 100.00;
+        } else {
+            $firstQuan = $request->input('thirdquan');
+        }
+
+        if($request->input('fourthquan') < 1.00) {
+            $firstQuan = $request->input('fourthquan') * 100.00;
+        } else {
+            $firstQuan = $request->input('fourthquan');
+        }
+
         // Add new moon
         $moon = new Moon;
         $moon->Region = $request->input('region');

app/Library/Fleet.php

@@ -85,11 +85,7 @@ class Fleet {
     }
 
     public function AddPilot($fc, $charId, $fleetId) {
-         //Check if the fc has the right scope
+                
-        if(!$this->HaveEsiScope($fc, 'esi-fleets.write_fleet.v1')) {
-            return 'Incorrect Scopes.';
-        }
-        
         //Get the ESI token for the FC to add the new pilot
         $token = DB::table('EsiTokens')->where('character_id', $fc)->get();
         // Disable all caching by setting the NullCache as the
@@ -128,16 +124,17 @@ class Fleet {
             // ESI as a normal array.
             print_r($e->getEsiResponse());
             dd($e->getEsiResponse());
+            return $e->getEsiResponse;
         }
 
-        return 'Invite Sent';
+        return null;
     }
 
     public function RenderFleetDisplay() {
         //
     }
 
-    private function HaveEsiScope($charId, $scope) {
+    public function HaveEsiScope($charId, $scope) {
         //Check for an esi scope
         $checks = DB::table('EsiScopes')->where('character_id', $charId)->get();
         foreach($checks as $check) {

resources/views/inc/error.blade.php

@@ -0,0 +1,16 @@
+@extends('layout.b4')
+@section('content')
+<div class="container">
+    <div class="card-header">
+        Error
+    </div>
+    <div class="card-body">
+    @foreach($errors as $error)
+        <div class="alert alert-error" role="alert">
+            You have encountered an error.<br>
+            <?php printf($error); ?><br>
+        </div>
+    @endforeach
+    </div>
+</div>
+@endsection