Bump lodash from 4.17.11 to 4.17.19

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

.env

@@ -4,7 +4,7 @@ APP_KEY=base64:PBOxrGFJAtwj9SDF4F0DZ1J+6MjrJmRiPZJQwRdy3XQ=
 APP_DEBUG=true
 APP_URL=http://localhost
 
-LOG_CHANNEL=stack
+LOG_CHANNEL=daily
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
@@ -16,8 +16,8 @@ DB_PASSWORD=strtmage
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 
-QUEUE_CONNECTION=database
-QUEUE_DRIVER=database
+QUEUE_DRIVER=redis
+QUEUE_CONNECTION=sync
 
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
@@ -33,18 +33,12 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
 ESI_CLIENT_ID=e5848fea3618427a8ee0dccb6a04fc62
 ESI_SECRET_KEY=TdnNGRM8RTNSifZdaIc9yHTTkYPgYEEXHRIbT6oY
 ESI_USERAGENT='W4RP Services'
 ESI_CALLBACK_URI='http://services.w4rp.space/callback'
+ESI_PRIMARY_CHAR=93738489
+ESI_ALLIANCE=99004116
 
 EVEONLINE_CLIENT_ID=e5848fea3618427a8ee0dccb6a04fc62
 EVEONLINE_CLIENT_SECRET=TdnNGRM8RTNSifZdaIc9yHTTkYPgYEEXHRIbT6oY

.gitignore

@@ -1,4 +1,9 @@
 /node_modules
 /logs
-.editorconfig
+/.editorconfig
 /cache
+/public/logs/*
+worker.log
+/public/cache/*
+/.env
+.vscode

app/Console/Commands/Assets/GetAssets.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Console\Commands\Assets;
+
+use Illuminate\Console\Command;
+use DB;
+use Log;
+
+//Job
+use App\Jobs\ProcessAssetsJob;
+
+//Library
+use App\Library\Esi\Esi;
+use Commands\Library\CommandHelper;
+use App\Library\Assets\AssetHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+
+class GetAssetsCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:GetAssets';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Gets all of the assets of the holding corporation.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $assets = null;
+        $pages = 0;
+
+        //Create the command helper container
+        $task = new CommandHelper('GetAssets');
+        //Add the entry into the jobs table saying the job is starting
+        $task->SetStartStatus();
+
+        //Setup the esi authentication container
+        $config = config('esi');
+
+        //Declare some variables
+        $charId = $config['primary'];
+        $corpId = 98287666;
+
+        //ESI Scope Check
+        $esiHelper = new Esi();
+        $assetScope = $esiHelper->HaveEsiScope($config['primary'], 'esi-assets.read_corporation_assets.v1');
+
+        if($assetScope == false) {
+            Log::critical("Scope check for esi-assets.read_corporation_assets.v1 failed.");
+            return null;
+        }
+        
+        //Get the refresh token from the database
+        $token = $esiHelper->GetRefreshToken($charId);
+        //Create the authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+
+        try {
+            $assets = $esi->page(1)
+                          ->invoke('get', '/corporations/{corporation_id}/assets/', [
+                              'corporation_id' => $corpId,
+                          ]);
+        } catch (RequestFailedException $e) {
+            Log::critical("Failed to get asset list.");
+            return null;
+        }
+
+        $pages = $assets->pages;
+        
+        for($i = 1; $i <= $pages; $i++) {
+            ProcessAssetsJob::dispatch($charId, $corpId, $i)->onQueue('assets');
+        }
+    }
+}

app/Console/Commands/Corps/GetCorps.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Console\Commands\Corps;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Commands\Library\CommandHelper;
+
+//Models
+use App\Models\Corporation\AllianceCorp;
+use App\Models\ScheduledTask\ScheduleJob;
+
+//Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+
+class GetCorpsCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:GetCorps';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get corporations in alliance and store in db.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Create the command helper container
+        $task = new CommandHelper('CorpJournal');
+        //Add the entry into the jobs table saying the job is starting
+        $task->SetStartStatus();
+
+        //Declare some variables
+        $esiHelper = new Esi;
+        
+        $esi = $esiHelper->SetupEsiAuthentication();
+
+        //try the  esi call to get all of the corporations in the alliance
+        try {
+            $corporations = $esi->invoke('get', '/alliances/{alliance_id}/corporations/', [
+                'alliance_id' => 99004116,
+            ]);
+        } catch(RequestFailedException $e){
+            dd($e->getEsiResponse());
+        }
+        //Delete all of the entries in the AllianceCorps table
+        AllianceCorp::truncate();
+
+        //Foreach corporation, make entries into the database.
+        foreach($corporations as $corp) {
+            try {
+                $corpInfo = $esi->invoke('get', '/corporations/{corporation_id}/', [
+                    'corporation_id' => $corp,
+                ]);
+            } catch(RequestFailedException $e) {
+                return $e->getEsiResponse();
+            }
+            $entry = new AllianceCorp;
+            $entry->corporation_id = $corp;
+            $entry->name = $corpInfo->name;
+            $entry->save();
+        }
+
+        //Mark the job as finished
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Data/CleanStaleDataCommand.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+use Log;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Models
+use App\Models\Lookups\AllianceLookup;
+use App\Models\Lookups\CharacterLookup;
+use App\Models\Lookups\CorporationLookup;
+use App\Models\Lookups\ItemLookup;
+use App\Models\Finances\AllianceMarketJournal;
+use App\Models\Finances\JumpBridgeJournal;
+use App\Models\Finances\OfficeFeesJournal;
+use App\Models\Finances\PISaleJournal;
+use App\Models\Finances\PlanetProductionTaxJournal;
+use App\Models\Finances\ReprocessingTaxJournal;
+use App\Models\Finances\SovBillJournal;
+use App\Models\Finances\StructureIndustryTaxJournal;
+
+class CleanStaleDataCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:CleanData';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Clean old database data';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $command = new CommandHelper;
+        $command->CleanJobStatusTable();
+
+        //Empty the item lookup table
+        ItemLookup::truncate();
+
+        //Empty the character lookup table
+        CharacterLookup::truncate();
+
+        //Empty the corporation lookup table
+        CorporationLookup::truncate();
+
+        //Empty the alliance lookup table
+        AllianceLookup::truncate();
+
+        //Setup today's carbon date
+        $today = Carbon::now();
+        $ago = $today->subMonths(6);
+
+        //Clean old data from the Alliance Market Tax Journal
+        $markets = AllianceMarketJournal::all();
+        foreach($markets as $market) {
+            $date = new Carbon($market->created_at);
+            if($date->lessThan($ago)) {
+                AllianceMarketJournal::where([
+                    'id' => $market->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old data from Jump Bridge Journal
+        $jumps = JumpBridgeJournal::all();
+        foreach($jumps as $jump) {
+            $date = new Carbon($jump->created_at);
+            if($date->lessThan($ago)) {
+                JumpBridgeJournal::where([
+                    'id' => $jump->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old data from office fees journal
+        $offices = OfficeFeesJournal::all();
+        foreach($offices as $office) {
+            $date = new Carbon($office->created_at);
+            if($date->lessThan($ago)) {
+                OfficeFeesJournal::where([
+                    'id' => $office->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old data from pi sale journal
+        $pisales = PISaleJournal::all();
+        foreach($pisales as $sale) {
+            $date = new Carbon($sale->created_at);
+            if($date->lessThan($ago)) {
+                PISaleJournal::where([
+                    'id' => $sale->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old data from planet production tax journal
+        $pis = PlanetProductionTaxJournal::all();
+        foreach($pis as $pi) {
+            $date = new Carbon($pi->created_at);
+            if($date->lessThan($ago)) {
+                PlanetProductionTaxJournal::where([
+                    'id' => $pi->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old data from player donation journal
+        $donations = PlayerDonationJournal::all();
+        foreach($donations as $donation) {
+            $date = new Carbon($donation->created_at);
+            if($date->lessThan($ago)) {
+                PlayerDonationJournal::where([
+                    'id' => $donation->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old data from Reprocessing Tax Journal
+        $reps = ReprocessingTaxJournal::all();
+        foreach($reps as $rep) {
+            $date = new Carbon($rep->created_at);
+            if($date->lessThan($ago)) {
+                ReprocessingTaxJournal::where([
+                    'id' => $rep->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old sov bill journal data
+        $sovs = SovBillJournal::all();
+        foreach($sovs as $sov) {
+            $date = new Carbon($sov->created_at);
+            if($date->lessThan($ago)) {
+                SovBillJournal::where([
+                    'id' => $sov->id,
+                ])->delete();
+            }
+        }
+
+        //Clean old structure industry tax journal data
+        $industrys = StructureIndustryTaxJournal::all();
+        foreach($industrys as $indy) {
+            $date = new Carbon($indy->created_at);
+            if($date->lessThan($ago)) {
+                StructureIndustryTaxJournal::where([
+                    'id' => $indy->id,
+                ])->delete();
+            }
+        }
+    }
+}

app/Console/Commands/Data/EmptyJumpBridges.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Models
+use App\Models\Structure\Structure;
+use App\Models\Structure\Service;
+use App\Models\Stock\Asset;
+
+class EmptyJumpBridges extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:EmptyJumpBridges';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reset the jump bridge fuel related tables.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $task = new CommandHelper('EmptyJumpBridges');
+
+        //Add entry into the table saying the job is starting
+        $task->SetStartStatus();
+
+        Structure::truncate();
+        Service::truncate();
+        Asset::truncate();
+
+        //Mark the job as finished
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Data/PurgeCorpMoonLedgers.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+use Log;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Jobs
+use App\Jobs\Commands\Moons\PurgeMoonLedgerJob;
+
+class PurgeCorpMoonLedgers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'data:PurgeCorpLedgers';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Purge old corp ledgers data';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $task = new CommandHelper('PurgeCorpLedgers');
+        $task->SetStartStatus();
+
+        PurgeMoonLedgerJob::dispatch();
+
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Eve/GetEveRegionsCommand.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Console\Commands\Eve;
+
+//Internal Library
+use Illuminate\Console\Command;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Job
+use App\Jobs\Commands\Eve\GetEveRegionsJob;
+
+class GetEveRegionsCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'eve:getRegions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Gets all of the information for regions from the eve esi';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        GetEveRegionsJob::dispatch();
+    }
+}

app/Console/Commands/Files/MoonFormatter.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Console\Commands\Files;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\File;
+
+class MoonFormatter extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'file:moons';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a text file to put into sql to update the moons';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $lines = array();
+
+        //Create the file handler
+        $data = Storage::get('public/moon_data.txt');
+        //Split the string into separate arrays based on the line
+        $data = preg_split("/\n/", $data);
+        
+        //For each array of data, let's separate the data into more arrays built in arrays
+        for($i = 0; $i < sizeof($data); $i++) {
+            //Strip the beginning [ from the line
+            $temp = str_replace('[', '', $data[$i]);
+            //Strip the ending ] from the line
+            $temp = str_replace(']', '', $temp);
+            //Remove the spacees from the line
+            $temp = str_replace(' ', '', $temp);
+            //Remove the quotes from the line
+            $temp = str_replace("'", '', $temp);
+            //Split up the line into separate arrays after each comma
+            $lines[$i] = preg_split("/,/", $temp);
+        }
+
+        /**
+         * The output within the lines array
+         * 0 => System
+         * 1 => Planet
+         * 2 => Moon
+         * 3 => FirstOre
+         * 4 => FirstQuan
+         * 5 => SecondOre
+         * 6 => SecondQuan
+         * 7 => ThirdOre
+         * 8 => ThirdQuan
+         * 9 => FourthOre
+         * 10 => FourthQuan
+         */
+
+        var_dump($lines);
+        dd();
+    }
+}

app/Console/Commands/Finances/HoldingFinances.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Console\Commands\Finances;
+
+use Illuminate\Console\Command;
+use Log;
+
+use Commands\Library\CommandHelper;
+use App\Library\Finances\Helper\FinanceHelper;
+
+//Jobs
+use App\Jobs\ProcessWalletJournalJob;
+
+class HoldingFinancesCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:HoldingJournal';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get the holding corps finances.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Create the command helper container
+        $task = new CommandHelper('HoldingFinances');
+
+        //Add the entry into the jobs table saying the job is starting
+        $task->SetStartStatus();
+
+        //Setup the Finances container
+        $finance = new FinanceHelper();
+
+        //Get the esi configuration
+        $config = config('esi');
+
+        //Get the total pages for the journal for the holding corporation
+        $pages = $finance->GetJournalPageCount(1, $config['primary']);
+
+        //Dispatch a single job for each page to process
+        for($i = 1; $i <= $pages; $i++) {
+            ProcessWalletJournalJob::dispatch(1, $config['primary'], $i)->onQueue('journal');
+        }
+
+        //Get the total pages for the journal for the sov bills from the holding corporation
+        $pages = $finance->GetJournalPageCount(6, $config['primary']);
+
+        //Dispatch a job for each page to process
+        for($i = 1; $i <= $pages; $i++) {
+            ProcessWalletJournalJob::dispatch(6, $config['primary'], $i)->onQueue('journal');
+        }
+
+        //Mark the job as finished
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Finances/SovBills.php

@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Console\Commands\Finances;
+
+use Illuminate\Console\Command;
+use Log;
+
+use Commands\Library\CommandHelper;
+use App\Library\Finances\Helper\FinanceHelper;
+
+//Jobs
+use App\Jobs\ProcessWalletJournalJob;
+
+//Models
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
+//Library
+use App\Library\Esi\Esi;
+use App\Library\Finances\AllianceMarketTax;
+use App\Library\Finances\CorpMarketTax;
+use App\Library\Finances\MarketTax;
+use App\Library\Finances\PlayerDonation;
+use App\Library\Finances\ReprocessingTax;
+use App\Library\Finances\JumpBridgeTax;
+use App\Library\Finances\StructureIndustryTax;
+use App\Library\Finances\OfficeFee;
+use App\Library\Finances\PlanetProductionTax;
+use App\Library\Finances\PISale;
+use App\Library\Lookups\LookupHelper;
+use App\Library\Finances\SovBillExpenses;
+
+//Seat Stuff
+use Seat\Eseye\Exceptions\RequestFailedException;
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+
+class SovBillsCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:SovBills';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get the holding corps sov bills from wallet 6.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $sovBill = new SovBillExpenses;
+        $esiHelper = new Esi;
+        $finance = new FinanceHelper();
+        $lookup = new LookupHelper;
+
+        //Create the command helper container
+        $task = new CommandHelper('SovBills');
+
+        //Add the entry into the jobs table saying the job is starting
+        $task->SetStartStatus();
+        
+
+        //Get the esi configuration
+        $config = config('esi');
+        //Set caching to null
+        $configuration = Configuration::getInstance();
+        $configuration->cache = NullCache::class;
+
+        $token = $esiHelper->GetRefreshToken($config['primary']);
+        if($token == null) {
+            return null;
+        }
+
+        //Create an ESI authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+        $esi->setVersion('v4');
+
+        //Reference to see if the character is in our look up table for corporations and characters
+        $char = $lookup->GetCharacterInfo($config['primary']);
+        $corpId = $char->corporation_id;
+
+        //Get the total pages for the journal for the sov bills from the holding corporation
+        $pages = $finance->GetJournalPageCount(6, $config['primary']);
+
+        //Try to figure it out from the command itself.
+        for($i = 1; $i <= $pages; $i++) {
+            printf("Getting page: " . $i . "\n");
+
+            try {
+                $journals = $esi->page($i)
+                                ->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [
+                    'corporation_id' => $corpId,
+                    'division'  => 6,
+                ]);
+            } catch(RequestFailedException $e) {
+                return null;
+            }
+
+            //Decode the wallet from json into an array
+            $wallet = json_decode($journals->raw, true);
+            dd($wallet);
+            foreach($wallet as $entry) {
+                if($entry['ref_type'] == 'infrastructure_hub_maintenance' && $entry['first_party_id'] == 98287666) {
+                    $sovBill->InsertSovBillExpense($entry, $corpId, $division);
+                }
+            }
+        }
+
+        //Mark the job as finished
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Flex/FlexStructureCommand.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Console\Commands\Flex;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+
+//Jobs
+use App\Jobs\ProcessSendEveMailJob;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Models
+use App\Models\Flex\FlexStructure;
+use App\Models\Mail\SentMail;
+
+class FlexStructureCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:FlexStructures';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Mail out reminder for flex structure bills';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Create the new command helper container
+        $task = new CommandHelper('FlexStructureMailer');
+        //Add the entry into the jobs table saying the job has started
+        $task->SetStartStatus();
+
+        //Create other variables
+        $body = null;
+        $delay = 5;
+
+        //Get today's date
+        $today = Carbon::now();
+        $today->second = 2;
+        $today->minute = 0;
+        $today->hour = 0;
+
+        //Get the esi configuration
+        $config = config('esi');
+
+        //Get all of the contacts for the flex structures
+        $contacts = FlexStructure::select('requestor_id')->orderBy('requestor_id')->get();
+
+        //For each of the contacts, send a reminder mail about the total of the structures they are paying for
+        foreach($contacts as $contact) {
+            //Get all of the structures for requestor
+            $structures = FlexStructure::where([
+                'requestor_id' => $contact->requestor_id,
+            ])->get();
+
+            //Totalize the total cost of everything
+            $totalCost = $this->TotalizeCost($structures);
+
+            //Build the body of the mail
+            $body = "Flex Structure Overhead Cost is due for the following structures:<br>";
+            foreach($structures as $structure) {
+
+                $body .= "System: " . $structure->system . " - " . $structure->structure_type . ": " . $structure->structure_cost . " ISK<br>";
+            }
+            $body .= "Total Cost: " . number_format($totalCost, 2,".", ",");
+            $body .= "Please remit payment to Spatial Forces by the 3rd of the month.<br>";
+            $body .= "Sincerely,<br>";
+            $body .= "Warped Intentions Leadership<br>";
+
+            //Dispatch the mail job
+            $subject = "Warped Intentions Flex Structures Payment Due for " . $today->englishMonth;
+            ProcessSendEveMailJob::dispatch($body, (int)$structure->requestor_id, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($delay));
+
+            //Increment the delay for the mail to not hit the rate limits
+            $delay += 60;
+
+            //After the mail is dispatched, save the sent mail record
+            $this->SaveSentRecord($config['primary'], $subject, $body, (int)$structure->requestor_id, 'character');
+        }
+
+        //Mark the job as finished
+        $task->SetStopStatus();
+    }
+
+    private function TotalizeCost($structures) {
+        //Declare the total cost
+        $totalCost = 0.00;
+        
+        foreach($structures as $structure) {
+            $totalCost += $structure->structure_cost;
+        }
+
+        return $totalCost;
+    }
+
+    private function SaveSentRecord($sender, $subject, $body, $recipient, $recipientType) {
+        $sentmail = new SentMail;
+        $sentmail->sender = $sender;
+        $sentmail->subject = $subject;
+        $sentmail->body = $body;
+        $sentmail->recipient = $recipient;
+        $sentmail->recipient_type = $recipientType;
+        $sentmail->save();
+    }
+}

app/Console/Commands/Library/CommandHelper.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Commands\Library;
+
+//Internal Libraries
+use Carbon\Carbon;
+
+//Models
+use App\Models\ScheduledTask\ScheduleJob;
+
+class CommandHelper {
+
+    private $job_name;
+    private $job_state;
+    private $system_time;
+
+    public function __construct($name) {
+        $this->job_name = $name;
+        $this->job_state = 'Starting';
+        $this->system_time = Carbon::now();
+    }
+
+    public function SetStartStatus() {
+        //Add an entry into the jobs table
+        $job = new ScheduleJob;
+        $job->job_name = $this->job_name;
+        $job->job_state = $this->job_state;
+        $job->system_time = $this->system_time;
+        $job->save();
+    }
+
+    public function SetStopStatus() {
+        //Mark the job as finished
+        ScheduleJob::where([
+            'system_time' => $this->system_time,
+            'job_name' => $this->job_name,
+        ])->update([
+            'job_state' => 'Finished',
+        ]);
+    }
+
+    public function CleanJobStatusTable() {
+        //Delete old jobs
+        ScheduleJob::where(['system_time', '<', Carbon::now()->subMonths(3)])->delete();
+    }
+}
+
+?>

app/Console/Commands/Library/helper.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Commands\Library;
-
-//Internal Libraries
-use DB;
-use Carbon\Carbon;
-
-//Models
-use App\Models\ScheduledTask\ScheduleJob;
-
-class CommandHelper {
-
-    private $job_name;
-    private $job_state;
-    private $system_time;
-
-    public function __construct($name) {
-        $this->job_name = $name;
-        $this->job_state = 'Starting';
-        $this->system_time = Carbon::now();
-    }
-
-    public function SetStartStatus() {
-        //Add an entry into the jobs table
-        $job = new ScheduleJob;
-        $job->job_name = $this->job_name;
-        $job->job_state = $this->job_state;
-        $job->system_time = $this->system_time;
-        $job->save();
-    }
-
-    public function SetStopStatus() {
-        //Mark the job as finished
-        DB::table('schedule_jobs')->where([
-            'system_time' => $this->system_time,
-            'job_name' => $this->job_name,
-        ])->update([
-            'job_state' => 'Finished',
-        ]);
-    }
-
-    public function CleanJobStatusTable() {
-        DB::table('schedule_jobs')->where('system_time', '<', Carbon::now()->subMonths(3))->delete();
-    }
-}
-
-?>

app/Console/Commands/Market/GetMarketDataCommand.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Console\Commands;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Jobs
+use App\Jobs\Commands\Market\GetMarketRegionOrderJob;
+
+class GetMarketDataCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:MarketData';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get the market data for regions';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $task = new CommandHelper('GetMarketData');
+        $task->SetStartStatus();
+
+        $regions = [
+            'Immensea' => 10000025,
+            'Catch' => 10000014,
+            'Tenerifis' => 10000061,
+            'The Forge' => 10000002,
+            'Impass' => 10000031,
+            'Esoteria' => 10000039,
+            'Detorid' => 10000005,
+            'Omist' => 10000062,
+            'Feythabolis' => 10000056,
+            'Insmother' => 10000009,
+        ];
+
+        foreach($regions as $key => $value) {
+            GetMarketRegionOrderJob::dispatch($value);
+        }
+
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Market/PurgeMarketDataCommand.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Console\Commands;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Jobs
+use App\Jobs\Commands\Market\PurgeMarketRegionOrderJob;
+
+class PurgeMarketDataCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:PurgeMarketData';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Purges old market data from the database';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        PurgeMarketDataJob::dispatch();
+    }
+}

app/Console/Commands/Moons/MoonsUpdateCommand.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Console\Commands\Moons;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+use Log;
+
+//Jobs
+use App\Jobs\Commands\Moons\FetchMoonLedgerJob;
+use App\Jobs\Commands\Moons\FetchMoonObserverJob;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Models
+use App\Models\Esi\EsiScope;
+
+class MoonsUpdateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:MoonUpdate';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update all of the moons registered for observers and ledgers.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Declare variables
+        $delay = 0;
+        $characters = array();
+
+        //Create the new command helper container
+        $task = new CommandHelper('MoonsUpdateCommand');
+        //Set the task start status
+        $task->SetStartStatus();
+
+        //Get all of the characters who have registered structures for moon ledgers
+        $miningChars = EsiScope::where([
+            'scope' => 'esi-industry.read_corporation_mining.v1',
+        ])->get();
+
+        foreach($miningChars as $mChars) {
+            $universe = EsiScope::where([
+                'character_id' => $mChars->character_id,
+                'scope' => 'esi-universe.read_structures.v1',
+            ])->first();
+
+            if($universe != null) {
+                array_push($characters, $universe->character_id);
+            }
+        }
+
+        //Cycle through each of the character Ids which have the correct scopes,
+        //and dispatch jobs accordingly.
+        foreach($characters as $charId) {
+            //Fetch all of the corp observers with the job dispatch
+            FetchMoonObserverJob::dispatch($charId);
+            //Fetch all of the corp ledgers with the job dispatch
+            FetchMoonLedgerJob::dispatch($charId);
+        }
+
+        //Set task done status
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands\RentalMoons;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Jobs
+use App\Jobs\Commands\RentalMoons\SendMoonRentalPaymentReminderJob;
+use App\Jobs\Commands\RentalMoons\UpdateMoonRentalPaidState;
+
+class AllianceRentalMoonInvoiceCreationCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:RentalInvoices';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send out rental invoice reminders';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Set the task as started
+        $task = new CommandHelper('AllianceRentalInvoice');
+        $task->SetStartStatus();
+
+        //Send the job for the invoice creation command
+        SendMoonRentalPaymentReminderJob::dispatch()->delay(Carbon::now()->addSeconds(10));
+
+        //Update the paid state for the moons
+        UpdateMoonRentalPaidState::dispatch()->delay(Carbon::now()->addSeconds(600));
+
+        //Set the task as stopped
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/RentalMoons/AllianceRentalMoonUpdatePricingCommand.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands\RentalMoons;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+
+//Library
+use Commands\Library\CommandHelper;
+
+//Job
+use App\Jobs\Commands\RentalMoons\UpdateMoonRentalPrice;
+
+class AllianceRentalMoonUpdatePricingCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:UpdateRentalPrice';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update alliance rental moon prices.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Setup the task handler
+        $task = new CommandHelper('AllianceRentalMoonPriceUpdater');
+        $task->SetStartStatus();
+
+        UpdateMoonRentalPrice::dispatch();
+
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/Structures/GetStructures.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Console\Commands\Structures;
+
+use Illuminate\Console\Command;
+use Log;
+
+//Library
+use App\Library\Structures\StructureHelper;
+use App\Library\Esi\Esi;
+use Commands\Library\CommandHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+
+//Job
+use App\Jobs\ProcessStructureJob;
+
+//Models
+use App\Models\Esi\EsiScope;
+use App\Models\Esi\EsiToken;
+
+class GetStructuresCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:GetStructures';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get the list of structures ';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Create the command helper container
+        $task = new CommandHelper('GetStructures');
+        //Add the entry into the jobs table saying the job is starting
+        $task->SetStartStatus();
+
+        //Get the esi config
+        $config = config('esi');
+
+        //Declare some variables
+        $charId = $config['primary'];
+        $corpId = 98287666;
+        $sHelper = new StructureHelper($charId, $corpId);
+        $structures = null;
+
+        //ESI Scope Check
+        $esiHelper = new Esi;
+        $structureScope = $esiHelper->HaveEsiScope($charId, 'esi-universe.read_structures.v1');
+        $corpStructureScope = $esiHelper->HaveEsiScope($charId, 'esi-corporations.read_structures.v1');
+
+        //Check scopes
+        if($structureScope == false || $corpStructureScope == false) {
+            if($structureScope == false) {
+                Log::critical("Scope check for esi-universe.read_structures.v1 has failed.");
+            }
+            if($corpStructureScope == false) {
+                Log::critical("Scope check for esi-corporations.read_structures.v1 has failed.");
+            }
+            return null;
+        }
+
+        //Get the refresh token from the database
+        $token = $esiHelper->GetRefreshToken($charId);
+        //Create the esi authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+
+        //Set the current page
+        $currentPage = 1;
+        //Set our default total pages, and we will refresh this later
+        $totalPages = 1;
+
+        //Try to get the ESI data
+        try {
+            $structures = $esi->page($currentPage)
+                              ->invoke('get', '/corporations/{corporation_id}/structures/', [
+                                'corporation_id' => $corpId,
+                                ]);
+        } catch (RequestFailedException $e) {
+            Log::critical("Failed to get structure list.");
+            return null;
+        }
+
+        $totalPages = $structures->pages;
+
+        for($i = 1; $i <= $totalPages; $i++) {
+            ProcessStructureJob::dispatch($charId, $corpId, $currentPage)->onQueue('structures');
+        }      
+
+        //Mark the job as finished
+        $task->SetStopStatus();
+    }
+}

app/Console/Commands/UpdateMoonPricing.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use DB;
-use Carbon\Carbon;
-use Commands\Library\CommandHelper;
-
-use App\Library\Moons\MoonCalc;
-
-class UpdateMoonPriceCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:UpdateMoonPrice';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Update moon pricing on a scheduled basis';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the command helper container
-        $task = new CommandHelper('CorpJournal');
-        //Add the entry into the jobs table saying the job is starting
-        $task->SetStartStatus();
-
-        $moonCalc = new MoonCalc();
-        $moonCalc->FetchNewPrices();
-
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-}

app/Console/Commands/UpdateMoonRental.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class UpdateMoonRental extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:UpdateMoonRental';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //
-    }
-}

app/Console/Commands/Users/PurgeUsers.php

@@ -0,0 +1,203 @@
+<?php
+
+namespace App\Console\Commands\Users;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+
+//Libraries
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Wiki\WikiHelper;
+
+//Models
+use App\Models\User\User;
+use App\Models\User\UserAlt;
+use App\Models\Esi\EsiScope;
+use App\Models\Esi\EsiToken;
+use App\Models\User\UserPermission;
+use App\Models\User\UserRole;
+use App\Models\Admin\AllowedLogin;
+use App\Models\Doku\DokuMember;
+use App\Models\Doku\DokuUser;
+
+
+/**
+ * The PurgeUsers command takes care of updating any user changes in terms of login role, as well as purging any users without at least
+ * the 'User' role.  This command heavily relies on ESI being available.  If no ESI is available, then the function does nothing, in order to prevent
+ * unwanted changes.
+ */
+class PurgeUsers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:PurgeUsers';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update and purge users from the database.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Declare some variables
+        $esiHelper = new Esi;
+
+        //Setup the esi variable
+        $esi = $esiHelper->SetupEsiAuthentication();
+
+        //Get all of the users from the database
+        $users = User::all();
+
+        //Get the allowed logins
+        $legacy = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_id')->toArray();
+        $renter = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_id')->toArray();
+
+        //Cycle through all of the users, and either update their role, or delete them.
+        foreach($users as $user) {
+            //Set the fail bit to false for the next user to check
+            $failed = false;
+
+            //Note a screen entry for when doing cli stuff
+            printf("Processing character with id of " . $user->character_id . "\r\n");
+
+            //Get the character information
+            try {
+                $character_info = $esi->invoke('get', '/characters/{character_id}/', [
+                    'character_id' => $user->character_id,
+                ]);
+
+                $corp_info = $esi->invoke('get', '/corporations/{corporation_id}/', [
+                    'corporation_id' => $character_info->corporation_id,
+                ]);
+            } catch(RequestFailedException $e) {
+                Log::warning('Failed to get character information in purge user command for user ' . $user->character_id);
+                $failed = true;
+            }
+
+            //If the fail bit is still false, then continue
+            if($failed === false) {
+                //Get the user's role
+                $role = UserRole::where(['character_id' => $user->character_id])->first();
+                
+                //We don't want to modify Admin and SuperUsers.  Admins and SuperUsers are removed via a different process.
+                if($role->role != 'Admin') {
+                    //Check if the user is allowed to login
+                    if(isset($corp_info->alliance_id)) {
+                        //Warped Intentions is allowed to login
+                        if($corp_info->alliance_id == '99004116') {
+                            //If the alliance is Warped Intentions, then modify the role if we need to
+                            if($role->role != 'User') {
+                                //Upate the role of the user
+                                UserRole::where([
+                                    'character_id' => $user->character_id,
+                                ])->update([
+                                    'role' => 'User',
+                                ]);
+
+                                //Update the user type
+                                User::where([
+                                    'character_id' => $user->character_id,
+                                ])->update([
+                                    'user_type' => 'W4RP',
+                                ]);
+                            }
+                        } else if(in_array($corp_info->alliance_id, $legacy)) {  //Legacy Users
+                            if($role->role != 'User') {
+                                //Update the role of the user
+                                UserRole::where([
+                                    'character_id' => $user->character_id,
+                                ])->update([
+                                    'role' => 'User',
+                                ]);
+
+                                //Update the user type
+                                User::where([
+                                    'character_id' => $user->character_id,
+                                ])->update([
+                                    'user_type' => 'Legacy',
+                                ]);
+                            }
+                        } else if(in_array($corp_info->alliance_id, $renter)) {  //Renter Users
+                            if($role->role != 'Renter') {
+                                //Update the role of the user
+                                UserRole::where([
+                                    'character_id' => $user->character_id,
+                                ])->update([
+                                    'role' => 'Renter',
+                                ]);
+
+                                //Update the user type
+                                User::where([
+                                    'character_id' => $user->character_id,
+                                ])->update([
+                                    'user_type' => 'Renter',
+                                ]);
+                            }
+                        } else {
+                            //If the user is part of no valid login group, then delete the user.
+                            //Delete all of the permissions first
+                            UserPermission::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
+
+                            //Delete the user's role
+                            UserRole::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
+
+                            //Delete any alts the user might have registered.
+                            $altCount = UserAlt::where(['main_id' => $user->character_id])->count();
+                            if($altCount > 0) {
+                                UserAlt::where([
+                                    'main_id' => $user->character_id,
+                                ])->delete();
+                            }
+
+                            //Delete the user from the user table
+                            User::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
+
+                            EsiScope::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
+
+                            EsiToken::where([
+                                'character_id' => $user->character_id,
+                            ])->delete();
+
+                            //Delete the user from the wiki
+                            $wikiHelper = new WikiHelper;
+
+                            //Get the uid from the wiki tables utilizing the character's name
+                            $uid = DokuUser::where(['name' => $user->name])->first();
+                            $wikiHelper->DeleteWikiUser($uid);                          
+                        }
+                    }
+                }
+            }
+        }   
+    }
+}

app/Console/Commands/Wormholes/PurgeWormholes.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Console\Commands\Wormholes;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Carbon\Carbon;
+
+//Models
+use App\Models\Wormholes\AllianceWormhole;
+
+class PurgeWormholes extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:PurgeWormholeData';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Purge stale wormhole data automatically';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Time of now
+        $currentTime = Carbon::now();
+
+        AllianceWormhole::where('created_at', '<', $currentTime->subHours(48))->delete();
+    }
+}

app/Console/Commands/calculatemarkettax.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Carbon\Carbon;
-use DB;
-
-//Jobs
-use App\Jobs\SendEveMailJob;
-
-//Libraries
-use Commands\Library\CommandHelper;
-use App\Library\Finances\Helper\FinanceHelper;
-use App\Library\Structures\StructureTaxHelper;
-use App\Library\Esi\Esi;
-
-//Models
-use App\Models\Market\MonthlyMarketTax;
-use App\Models\ScheduledTask\ScheduleJob;
-use App\Models\Corporation\CorpStructure;
-use App\Models\User\UserToCorporation;
-use App\Models\Jobs\JobSendEveMail;
-
-class CalculateMarketTaxCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:CalculateMarketTax';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Calculate the market taxes owed to the holding corporation and store in the database.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the command helper container
-        $task = new CommandHelper('CorpJournal');
-        //Add the entry into the jobs table saying the job is starting
-        $task->SetStartStatus();
-
-        //Setup helper classes
-        $hFinances = new FinanceHelper();
-        $sHelper = new StructureTaxHelper();
-        $start = Carbon::now()->startOfMonth()->subMonth();
-        $end = Carbon::now()->endOfMOnth()->subMonth();
-        $end->hour = 23;
-        $end->minute = 59;
-        $end->second = 59;
-
-        //Get the set of corporations from the structure table
-        $corps = CorpStructure::select('corporation_id')->groupBy('corporation_id')->get();
-        $this->line('Got all of the  corps with markets.' . sizeof($corps));
-        foreach($corps as $corp) {
-            if($corp->corporation_id != 98287666) {
-                $finalTaxes = $sHelper->GetTaxes($corp->corporation_id, 'Market', $start, $end);
-                if($finalTaxes < 0.00) {
-                    $finalTaxes = 0.00;
-                }
-
-                //Get the info about the structures from the database
-                $info = CorpStructure::where(['corporation_id' => $corp->corporation_id])->first();
-
-                $character = UserToCorporation::where(['character_id' => $info->character_id])->first();
-
-                $mail = new JobSendEveMail;
-                $mail->sender = 93738489;
-                $mail->subject = 'Market Taxes Owed';
-                $mail->body = 'Year ' . $start->year . ' ' .
-                            'Month: ' . 
-                            $start->month .
-                            '<br>Market Taxes Owed: ' .
-                            number_format($finalTaxes, 2, '.', ',') .
-                            '<br>Please remit to Spatial Forces';
-                $mail->recipient = (int)$info->character_id;
-                $mail->recipient_type = 'character';
-                SendEveMailJob::dispatch($mail);
-            }
-            
-        }
-        
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-}

app/Console/Commands/corpJournal.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use DB;
-use Carbon\Carbon;
-
-//Libraries
-use Commands\Library\CommandHelper;
-use App\Library\Finances\Helper\FinanceHelper;
-
-//Jobs
-use App\Jobs\ProcessWalletJournalJob;
-
-//Models
-use App\Models\Corporation\CorpStructure;
-use App\Models\Jobs\JobProcessWalletJournal;
-
-class CorpJournalCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:CorpJournal';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Grabs the corporation journals and deposit in db.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the command helper container
-        $task = new CommandHelper('CorpJournal');
-
-        //Add the entry into the jobs table saying the job is starting
-        $task->SetStartStatus();
-
-        //Setup the Finances Container
-        $finance = new FinanceHelper();
-
-        //Setup an array to store corporations which have been logged so we don't keep calling the same ones.  We need
-        //this step in order to save time during the cronjob.
-        $finishedCorps = array();
-        $corpCompleted = false;
-
-        //Get the corps with structures logged in the database
-        $corps = CorpStructure::select('corporation_id')->groupBy('corporation_id')->get();
-
-        //For all of the corporations, go through each structure and get wallet data
-        foreach($corps as $corp) {
-            //If the corporation isn't the holding corporation, then process the data.
-            //We process holding corporation data elsewhere.
-            if($corp->corporation_id != 98287666) {
-                $structure = CorpStructure::where(['corporation_id' => $corp->corporation_id])->first();
-                $pages = $finance->GetJournalPageCount(1, $structure->character_id);
-                for($i = 1; $i <= $pages; $i++) {
-                    $job = new JobProcessWalletJournal;
-                    $job->division = 1;
-                    $job->charId = $structure->character_id;
-                    $job->page = $i;
-                    ProcessWalletJournalJob::dispatch($job);
-                }
-            }
-        }
-
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-}

app/Console/Commands/getCorps.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use DB;
-use Commands\Library\CommandHelper;
-
-use App\Models\Corporation\AllianceCorp;
-use App\Models\ScheduledTask\ScheduleJob;
-
-use Seat\Eseye\Cache\NullCache;
-use Seat\Eseye\Configuration;
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-
-class GetCorpsCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:GetCorps';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Get corporations in alliance and store in db.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the command helper container
-        $task = new CommandHelper('CorpJournal');
-        //Add the entry into the jobs table saying the job is starting
-        $task->SetStartStatus();
-        
-        //Create the ESI container
-        $esi = new Eseye();
-        //try the  esi call to get all of the corporations in the alliance
-        try {
-            $corporations = $esi->invoke('get', '/alliances/{alliance_id}/corporations/', [
-                'alliance_id' => 99004116,
-            ]);
-        } catch(\Seat\Eseye\Exceptions\RequestFailedException $e){
-            dd($e->getEsiResponse());
-        }
-        //Delete all of the entries in the AllianceCorps table
-        DB::table('AllianceCorps')->delete();
-        foreach($corporations as $corp) {
-            try {
-                $corpInfo = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                    'corporation_id' => $corp,
-                ]);
-            } catch(\Seat\Eseye\Exceptions\RequestFailedException $e) {
-                return $e->getEsiResponse();
-            }
-            $entry = new AllianceCorp;
-            $entry->corporation_id = $corp;
-            $entry->name = $corpInfo->name;
-            $entry->save();
-        }
-
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-}

app/Console/Commands/holdingfinances.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-use Commands\Library\CommandHelper;
-use App\Library\Finances\Helper\FinanceHelper;
-
-//Jobs
-use App\Jobs\ProcessWalletJournalJob;
-
-//Models
-use App\Models\Jobs\JobProcessWalletJournal;
-
-class HoldingFinancesCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:HoldingJournal';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Get the holding corps finances.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the command helper container
-        $task = new CommandHelper('HoldingFinances');
-
-        //Add the entry into the jobs table saying the job is starting
-        $task->SetStartStatus();
-
-        //Setup the Finances container
-        $finance = new FinanceHelper();
-
-        //Get the total pages for the journal for the holding corporation
-        $pages = $finance->GetJournalPageCount(1, 93738489);
-
-        //Dispatch a single job for each page to process
-        for($i = 1; $i <= $pages; $i++) {
-            $job = new JobProcessWalletJournal;
-            $job->division = 1;
-            $job->charId = 93738489;
-            $job->page = $i;
-            ProcessWalletJournalJob::dispatch($job);
-        }
-
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-}

app/Console/Commands/moonmailer.php

@@ -1,224 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Carbon\Carbon;
-use DB;
-
-//Jobs
-use App\Jobs\SendEveMailJob;
-
-//Library
-use Commands\Library\CommandHelper;
-use App\Library\Moons\MoonMailer;
-use App\Library\Moons\MoonCalc;
-
-//Models
-use App\Models\Moon\Moon;
-use App\Models\MoonRent\MoonRental;
-use App\Models\Jobs\JobSendEveMail;
-use App\Models\Mail\SentMail;
-
-class MoonMailerCommand extends Command
-{
-    /**
-     * Next update will include checking for if the moon has been paid in advance.
-     */
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:MoonMailer';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Mail out the moon rental bills automatically';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the new command helper container
-        $task = new CommandHelper('MoonMailer');
-        //Add the entry into the jobs table saying the job has started
-        $task->SetStartStatus();
-
-        //Declare the moon calc class variable to utilize the library to update the price
-        $mailer = new MoonMailer;
-
-        //Create other variables
-        $body = null;
-
-        //Get today's date.
-        $today = Carbon::now();
-        $today->second = 1;
-        $today->minute = 0;
-        $today->hour = 0;
-
-        //Get all contacts from the rentals group
-        $contacts = MoonRental::select('Contact')->groupBy('Contact')->get();
-
-        //For each of the contacts totalize the moon rental, and create the mail to send to them,
-        //then update parameters of the moon
-        foreach($contacts as $contact) {
-            //Get the moons the renter is renting
-            $rentals = $this->GetRentalMoons($contact);
-            
-            //Totalize the cost of the moons
-            $cost = $this->TotalizeMoonCost($rentals);
-
-            //Get the list of moons in a list format
-            $listItems = $this->GetMoonList($rentals);
-
-            //Build the mail body
-            $body = "Moon Rent is due for the following moons:<br>";
-            foreach($listItems as $item) {
-                $body .= $item . "<br>";
-            }
-            $body .= "The price for the next month's rent is " . $cost . "<br>";
-            $body .= "Please remit payment to Spatial Forces on the 1st should you continue to wish to rent the moon.<br>";
-            $body .= "Sincerely,<br>";
-            $body .= "Warped Intentions Leadership<br>";
-
-            //Dispatch the mail job
-            $mail = new JobSendEveMail;
-            $mail->sender = 93738489;
-            $mail->subject = "Warped Intentions Moon Rental Payment Due";
-            $mail->body = $body;
-            $mail->recipient = (int)$contact;
-            $mail->recipient_type = 'character';
-            SendEveMailJob::dispatch($mail);
-
-            //After the mail is dispatched, saved the sent mail record
-            $this->SaveSentRecord($mail->sender, $mail->subject, $mail->body, $mail->recipient, $mail->recipient_type);
-
-            //Update the moon as not being paid for the next month?
-            foreach($rentals as $rental) {
-                if($today > $rental->Paid_Until)
-                $this->UpdateNotPaid($rental);
-            }
-            
-        }
-
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-
-    private function UpdateNotPaid(MoonRental $rental) {
-        $today = Carbon::now();
-
-        if($today >= $rental->Paid_Until) {
-            MoonRental::where([
-                'System' => $rental->System,
-                'Planet'=> $rental->Planet,
-                'Moon'=> $rental->Moon,
-            ])->update([
-                'Paid' => 'No',
-            ]);
-        }
-    }
-
-    private function SaveSentRecord($sender, $subject, $body, $recipient, $recipientType) {
-        $sentmail = new SentMail;
-        $sentmail->sender = $sender;
-        $sentmail->subject = $subject;
-        $sentmail->body = $body;
-        $sentmail->recipient = $recipient;
-        $sentmail->recipient_type = $recipientType;
-        $sentmail->save();
-    }
-
-    private function GetMoonList(MoonRental $moons) {
-        //Declare the variable to be used as a global part of the function
-        $list = array();
-
-        //For each of the moons, build the System Planet and Moon.
-        foreach($moons as $moon) {
-            $temp = 'System: ' . $moon->System;
-            $temp .= 'Planet: ' . $moon->Planet;
-            $temp .= 'Moon: ' . $moon->Moon;
-            //Push the new string onto the array list
-            array_push($list, $temp);
-        }
-
-        //Return the list
-        return $list;
-    }
-
-    private function GetRentalMoons($contact) {
-        $rentals = MoonRental::where([
-            'Contact' => $contact,
-        ])->get();
-
-        return $rentals;
-    }
-
-    private function TotalizeMoonCost($rentals) {
-        //Delcare variables and classes
-        $moonCalc = new MoonCalc;
-        $totalCost = 0.00;
-
-        foreach($rentals as $rental) {
-            $moon = Moon::where([
-                'System' => $rental->System,
-                'Planet' => $rental->Planet,
-                'Moon' => $rental->Moon,
-            ])->first();
-
-            //Get the updated price for the moon
-            $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, 
-                                                    $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
-
-            //Check the type and figure out which price to add in
-            if($rental->Type == 'alliance') {
-                $totalCost += $price['alliance'];
-            } else{
-                $totalCost += $price['outofalliance'];
-            }
-        }
-
-        //Return the total cost back to the calling function
-        return $totalCost;
-    }
-
-    private function GetRentalType($rentals) {
-        $alliance = 0;
-        $outofalliance = 0;
-  
-        //Go through the data and log whether the renter is in the alliance,
-        //or the renter is out of the alliance
-        foreach($rentals as $rental) {
-            if($rental->Type == 'alliance') {
-                $alliance++;
-            } else {
-                $outofalliance++;
-            }
-        }
-
-        //Return the rental type
-        if($alliance > $outofalliance) {
-            return 'alliance';
-        } else {
-            return 'outofalliance';
-        }
-    }
-}

app/Console/Commands/pitransactions.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-//Library
-use Commands\Library\CommandHelper;
-use App\Library\Finances\Helper\FinanceHelper;
-
-//Jobs
-use App\Jobs\ProcessWalletTransactionJob;
-
-//Models
-use App\Models\Jobs\JobProcessWalletTransaction;
-
-class PiTransactionsCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'services:PiTransactions';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Get the transactions from the market alt for the alliance';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        //Create the command helper container
-        $task = new CommandHelper('PiTransactions');
-
-        //Add the entry into the jobs table saying the job is starting
-        $task->SetStartStatus();
-
-        //Setup the Finances container
-        $finance = new FinanceHelper();
-
-        $job = new JobProcessWalletTransaction;
-        $job->division = 3;
-        $job->charId = 94415555;
-        ProcessWalletTransactionJob::dispatch($job);
-
-        //Mark the job as finished
-        $task->SetStopStatus();
-    }
-}

app/Console/Kernel.php

@@ -2,9 +2,13 @@
 
 namespace App\Console;
 
+//Internal Library
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
+//Library
+use Commands\Library\CommandHelper;
+
 class Kernel extends ConsoleKernel
 {
     /**
@@ -13,13 +17,23 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        Commands\CorpJournalCommand::class,
-        Commands\GetCorpsCommand::class,
-        Commands\UpdateMoonPriceCommand::class,
-        Commands\CalculateMarketTaxCommand::class,
-        Commands\HoldingFinancesCommand::class,
-        Commands\MoonMailerCommand::class,
-        Commands\PiTransactionsCommand::class,
+        Commands\Corps\GetCorpsCommand::class,
+        Commands\Finances\HoldingFinancesCommand::class,
+        Commands\Structures\GetStructuresCommand::class,
+        Commands\Assets\GetAssetsCommand::class,
+        Commands\Users\PurgeUsers::class,
+        Commands\Flex\FlexStructureCommand::class,
+        Commands\Data\EmptyJumpBridges::class,
+        Commands\Wormholes\PurgeWormholes::class,
+        Commands\Finances\SovBillsCommand::class,
+        Commands\Data\CleanStaleDataCommand::class,
+        Commands\Moons\MoonsUpdateCommand::class,
+        Commands\Data\PurgeCorpMoonLedgers::class,
+        /**
+         * Rental Moon Commands
+         */
+        Commands\RentalMoons\AllianceRentalMoonInvoiceCreationCommand::class,
+        Commands\RentalMoons\AllianceRentalMoonUpdatePricingCommand::class,
     ];
 
     /**
@@ -30,27 +44,49 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('services:CorpJournal')
-                 ->hourly()
+        //Horizon Graph Schedule
+        $schedule->command('horizon:snapshot')->everyFiveMinutes();
+
+        /**
+         * Rentals / Flex Schedule
+         */
+        $schedule->command('services:UpdateRentalPrice')
+                 ->dailyAt('11:00')
                  ->withoutOverlapping();
+        $schedule->command('services:FlexStructures')
+                 ->monthlyOn(2, '00:01');
+
+        /**
+         * Holding Corp Finance Schedule
+         */
         $schedule->command('services:HoldingJournal')
-                ->hourly()
-                ->withoutOverlapping();
-        $schedule->command('services:UpdateMoonPrice')
-                ->hourly()
+                 ->hourlyAt('45')
                  ->withoutOverlapping();
+        //$schedule->command('services:GetFinances')
+        //         ->hourlyAt('35')
+        //         ->withoutOverlapping();
+
+        /**
+         * Get Information Schedule
+         */
         $schedule->command('services:GetCorps')
-                 ->monthlyOn(1, '09:00')
-                 ->withoutOverlapping();
-        $schedule->command('services:CalculateMarketTax')
-                 ->monthlyOn(1, '08:00')
-                 ->withoutOverlapping();
-        $schedule->command('services:MoonMailer')
-                ->monthlyOn(1, '00:01')
-                ->withoutOverlapping();
-        $schedule->command('services:PiTransactions')
-                ->hourly()
-                ->withoutOverlapping();
+                 ->monthlyOn(1, '09:00');
+        $schedule->command('services:GetStructures')
+                ->dailyAt('09:00');
+        $schedule->command('services:GetAssets')
+                ->hourlyAt('22');        
+
+        /**
+         * Purge Data Schedule
+         */
+        $schedule->command('services:PurgeWormholeData')
+                ->hourlyAt(20);
+        $schedule->command('services:CleanData')
+                 ->weekly(7, '11:00');
+        $schedule->command('data:PurgeCorpLedgers')
+                 ->monthly();
+        $schedule->command('services:PurgeUsers')
+                 ->dailyAt('23:00');
     }
 
     /**

app/Http/Controllers/Auth/EsiScopeController.php

@@ -2,14 +2,15 @@
 
 namespace App\Http\Controllers\Auth;
 
+//Internal Library
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-
-use DB;
 use Socialite;
 use Auth;
 
-use App\User;
+//Models
+use App\Models\User\User;
+use App\Models\Esi\EsiScope;
 
 class EsiScopeController extends Controller
 {
@@ -20,7 +21,10 @@ class EsiScopeController extends Controller
 
     public function displayScopes() {
         //Get the ESI Scopes for the user
-        $scopes = DB::table('EsiScopes')->where('character_id', Auth::user()->character_id)->get();
+        $scopes = EsiScope::where([
+            'character_id' => Auth::user()->character_id,
+        ])->get();
+
         return view('scopes.select')->with('scopes', $scopes);
     }
 

app/Http/Controllers/Auth/LoginController.php

@@ -2,23 +2,27 @@
 
 namespace App\Http\Controllers\Auth;
 
+//Internal Library
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Socialite;
 use Auth;
 
-use App\User;
+//Library
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\User\User;
 use App\Models\Esi\EsiScope;
 use App\Models\Esi\EsiToken;
 use App\Models\User\UserPermission;
 use App\Models\User\UserRole;
 use App\Models\Admin\AllowedLogin;
+use App\Models\User\UserAlt;
 
-use Seat\Eseye\Cache\NullCache;
-use Seat\Eseye\Configuration;
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
 
 class LoginController extends Controller
 {
@@ -78,12 +82,68 @@ class LoginController extends Controller
      * Redirect to the dashboard if logging in successfully. 
      */
     public function handleProviderCallback() {
+        //Get the sso user from the socialite driver
         $ssoUser = Socialite::driver('eveonline')->user();
+
+        if(Auth::check()) {
+            //If a refresh token is present, then we are doing a scope callback
+            //to update scopes for an access token
+
+            if(isset($ssoUser->refreshToken)) {
+                //See if an access token is present already
+                $tokenCount = EsiToken::where('character_id', $ssoUser->id)->count();
+                if($tokenCount > 0) {
+                    //Update the esi token
+                    $this->UpdateEsiToken($ssoUser);
+                } else {
+                    //Save the ESI token
+                    $this->SaveEsiToken($ssoUser);
+                }
+
+                //After creating the token, we need to update the table for scopes
+                $this->SetScopes($ssoUser->user['Scopes'], $ssoUser->id);
+
+                return redirect()->to('/dashboard')->with('success', 'Successfully updated ESI Scopes.');
+            } else {
+                $created = $this->createAlt($ssoUser);
+                if($created == 1) {
+                    return redirect()->to('/profile')->with('success', 'Alt registered.');
+                } else {
+                    return redirect()->to('/profile')->with('error', 'Alt was previously registered.');
+                }
+            }
+        } else {
             $user = $this->createOrGetUser($ssoUser);
 
             auth()->login($user, true);
 
-        return redirect()->to('/dashboard')->with('success', 'Successfully Logged In or Updated ESI.');
+            return redirect()->to('/dashboard')->with('success', 'Successfully Logged In.');
+        }
+    }
+
+    /**
+     * Check if an alt exists in the database, else, create and 
+     * return the user object.
+     * 
+     * @param \Laravel\Socialite\Two\User $user
+     */
+    private function createAlt($user) {
+        $altCount = UserAlt::where('character_id', $user->id)->count();
+        if($altCount == 0) {
+            $newAlt = new UserAlt;
+            $newAlt->name = $user->getName();
+            $newAlt->main_id = auth()->user()->getId();
+            $newAlt->character_id = $user->id;
+            $newAlt->avatar = $user->avatar;
+            $newAlt->access_token = $user->token;
+            $newAlt->owner_hash = $user->owner_hash;
+            $newAlt->inserted_at = time();
+            $newAlt->expires_in = $user->expiresIn;
+            $newAlt->save();
+            return 1;
+        } else {
+            return 0;
+        }
     }
 
      /**
@@ -93,13 +153,19 @@ class LoginController extends Controller
      * @param \Laravel\Socialite\Two\User $user
      */
     private function createOrGetUser($eve_user) {
+        $authUser = null;
+
+        //Search to see if we have a matching user in the database.
+        //At this point we don't care about the information
+        $userCount = User::where('character_id', $eve_user->id)->count();
+        
+        //If the user is found, do more checks to see what type of login we are doing
+        if($userCount > 0) {
             //Search for user in the database
             $authUser = User::where('character_id', $eve_user->id)->first();
-        //If the user is found, do more checks to see what type of login we are doing
-        if($authUser) {
-            //if a refresh token is present, then we are doing a scope callback to update scopes for an access token
-            if($eve_user->refreshToken !== null) {
-                //Check if the owner hash has changed to call the user type if it needs to be updated
+
+            //Check to see if the owner has changed
+            //If the owner has changed, then update their roles and permissions
             if($this->OwnerHasChanged($authUser->owner_hash, $eve_user->owner_hash)) {
                 //Get the right role for the user
                 $role = $this->GetRole(null, $eve_user->id);
@@ -107,55 +173,12 @@ class LoginController extends Controller
                 $this->SetRole($role, $eve_user->id);
 
                 //Update the user information never the less.
-                    User::where('character_id', $eve_user->id)->update([
-                        'avatar' => $eve_user->avatar,
-                        'owner_hash' => $eve_user->owner_hash,
-                        'role' => $role,
-                    ]);
+                $this->UpdateUser($eve_user, $role);
+
                 //Update the user's roles and permission
-                    UserPermission::where(['character_id' => $eve_user->id])->delete();
-                    $perm = new UserPermission();
-                    $perm->character_id = $eve_user->id;
-                    $perm->permission = $role;
-                    $perm->save();
-                } else {
-                    //Update the user information never the less.
-                    User::where('character_id', $eve_user->id)->update([
-                        'avatar' => $eve_user->avatar,
-                    ]);
+                $this->UpdatePermission($eve_user, $role);
             }
 
-                //See if we have an access token for the user.
-                //If we have a token update the token, if not create an entry into the database
-                $token = EsiToken::where('character_id', $eve_user->id)->first();
-                if($token) {
-                    //Update the ESI Token
-                    EsiToken::where('character_id', $eve_user->id)->update([
-                        'character_id' => $eve_user->getId(),
-                        'access_token' => $eve_user->token,
-                        'refresh_token' => $eve_user->refreshToken,
-                        'expires_in' => $eve_user->expiresIn,
-                    ]);
-                } else {  //If a token entry is not found, then we create a new token entry into the database
-                    //Save the ESI Token in the database
-                    $token = new EsiToken;
-                    $token->character_id  = $eve_user->id;
-                    $token->access_token = $eve_user->token;
-                    $token->refresh_token = $eve_user->refreshToken;
-                    $token->expires_in = $eve_user->expiresIn;
-                    $token->save();
-                }
-
-                //After creating the token, we need to update the table for scopes
-                //First we look for all the scopes, then if need be add entries or delete entries from the database
-                $this->SetScopes($eve_user->user['Scopes'], $eve_user->id);
-
-            } else {
-                //If the user is already in the database, but no refresh token was present in the callback, then just update the user
-                User::where('character_id', $eve_user->id)->update([
-                    'avatar' => $eve_user->avatar,
-                ]);
-            }
             //Return the user to the calling auth function
             return $authUser;
         } else {
@@ -163,16 +186,7 @@ class LoginController extends Controller
             $role = $this->GetRole(null, $eve_user->id);
 
             //Create the user account
-            $user = User::create([
-                'name' => $eve_user->getName(),
-                'email' => null,
-                'avatar' => $eve_user->avatar,
-                'owner_hash' => $eve_user->owner_hash,
-                'character_id'=> $eve_user->getId(),
-                'expires_in' => $eve_user->expiresIn,
-                'access_token' => $eve_user->token,
-                'user_type' => $this->GetAccountType(null, $eve_user->id),
-            ]);
+            $user = $this->CreateNewUser($eve_user);
 
             //Set the role for the user
             $this->SetRole($role, $eve_user->id);
@@ -182,6 +196,81 @@ class LoginController extends Controller
         }
     }
 
+    /**
+     * Update the ESI Token
+     */
+    private function UpdateEsiToken($eve_user) {
+        EsiToken::where('character_id', $eve_user->id)->update([
+            'character_id' => $eve_user->getId(),
+            'access_token' => $eve_user->token,
+            'refresh_token' => $eve_user->refreshToken,
+            'inserted_at' => time(),
+            'expires_in' => $eve_user->expiresIn,
+        ]);
+    }
+
+    /**
+     * Create a new ESI Token in the database
+     */
+    private function SaveEsiToken($eve_user) {
+        $token = new EsiToken;
+        $token->character_id  = $eve_user->id;
+        $token->access_token = $eve_user->token;
+        $token->refresh_token = $eve_user->refreshToken;
+        $token->inserted_at = time();
+        $token->expires_in = $eve_user->expiresIn;
+        $token->save();
+    }
+
+    /**
+     * Update avatar
+     */
+    private function UpdateAvatar($eve_user) {
+        User::where('character_id', $eve_user->id)->update([
+            'avatar' => $eve_user->avatar,
+        ]);
+    }
+
+    /**
+     * Update user permission
+     */
+    private function UpdatePermission($eve_user, $role) {
+        UserPermission::where(['character_id' => $eve_user->id])->delete();
+        $perm = new UserPermission();
+        $perm->character_id = $eve_user->id;
+        $perm->permission = $role;
+        $perm->save();
+    }
+
+    /**
+     * Update the user
+     */
+    private function UpdateUser($eve_user, $role) {
+        User::where('character_id', $eve_user->id)->update([
+            'avatar' => $eve_user->avatar,
+            'owner_hash' => $eve_user->owner_hash,
+            'role' => $role,
+        ]);
+    }
+
+    /**
+     * Create a new user account
+     */
+    private function CreateNewUser($eve_user) {
+        $user = User::create([
+            'name' => $eve_user->getName(),
+            'avatar' => $eve_user->avatar,
+            'owner_hash' => $eve_user->owner_hash,
+            'character_id' => $eve_user->getId(),
+            'inserted_at' => time(),
+            'expires_in' => $eve_user->expiresIn,
+            'access_token' => $eve_user->token,
+            'user_type' => $this->GetAccountType(null, $eve_user->id),
+        ]);
+
+        return $user;
+    }
+
     /**
      * Set the user role in the database
      * 
@@ -259,22 +348,25 @@ class LoginController extends Controller
      * @return text
      */
     private function GetAccountType($refreshToken, $charId) {
+        //Declare some variables
+        $esiHelper = new Esi;
+
+        //Instantiate a new ESI isntance
+        $esi = $esiHelper->SetupEsiAuthentication();
+
         //Set caching to null
         $configuration = Configuration::getInstance();
         $configuration->cache = NullCache::class;
 
-        // Instantiate a new ESI instance
-        $esi = new Eseye();
-
         //Get the character information
-        $character_info = $esi->invoke('get', '/characters/{character_id}/', [
-            'character_id' => $charId,
-        ]);
+        $character_info = $esiHelper->GetCharacterData($charId);
 
         //Get the corporation information
-        $corp_info = $esi->invoke('get', '/corporations/{corporation_id}/', [
-            'corporation_id' => $character_info->corporation_id,
-        ]);
+        $corp_info = $esiHelper->GetCorporationData($character_info->corporation_id);
+
+        if($character_info == null || $corp_info == null) {
+            return redirect('/')->with('error', 'Could not create user at this time.');
+        }
 
         $legacy = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_id')->toArray();
         $renter = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_id')->toArray();

app/Http/Controllers/Blacklist/BlacklistController.php

@@ -0,0 +1,166 @@
+<?php
+
+namespace App\Http\Controllers\Blacklist;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Log;
+use DB;
+
+//Library
+use App\Library\Lookups\LookupHelper;
+
+//Models
+use App\Models\Blacklist\BlacklistEntity;
+use App\Models\User\User;
+use App\Models\User\UserRole;
+use App\Models\User\UserPermission;
+
+class BlacklistController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    public function DisplayAddToBlacklist() {
+        return view('blacklist.add');
+    }
+
+    public function DisplayRemoveFromBlacklist() {
+        return view('blacklist.remove');
+    }
+
+    public function DisplaySearch() {
+        return view('blacklist.search');
+    }
+
+    public function AddToBlacklist(Request $request) {
+        //Middleware needed for the function
+        $this->middleware('permission:blacklist.admin');
+
+        //Validate the user input
+        $this->validate($request, [
+            'name' => 'required',
+            'type' => 'required',
+            'reason' => 'required',
+        ]);
+
+        //Create the library variable
+        $lookup = new LookupHelper;
+        //Declare other necessary variables
+        $charId = null;
+        $corporationId = null;
+        $allianceId = null;
+        $entityId = null;
+        $entityType = null;
+
+        //See if the entity is already on the list
+        $count = BlacklistEntity::where([
+            'entity_name' => $request->name,
+        ])->count();
+        
+        //If the count is 0, then add the character to the blacklist
+        if($count === 0) {
+            if($request->type == 'Character') {
+                //Get the character id from the universe end point
+                $entityId = $lookup->CharacterNameToId($request->name);
+            } else if($request->type == 'Corporation') {
+                //Get the corporation id from the universe end point
+                $entityId = $lookup->CorporationNameToId($request->name);
+            } else if($request->type == 'Alliance') {
+                //Get the alliance id from the universe end point
+                $entityId = $lookup->AllianceNameToId($request->name);
+            } else {
+                //Redirect back to the view
+                return redirect('/blacklist/display/add')->with('error', 'Entity Type not allowed.');
+            }
+
+            //If all id's are null, then we couldn't find the entity
+            if($entityId == null) {
+                //Redirect back to the view
+                return redirect('/blacklist/display/add')->with('error', 'Entity Id was not found.');
+            }
+
+            //Store the entity in the table
+            BlacklistEntity::insert([
+                'entity_id' => $entityId,
+                'entity_name' => $request->name,
+                'entity_type' => $request->type,
+                'reason' => $request->reason,
+                'alts' => $request->alts,
+                'lister_id' => auth()->user()->getId(),
+                'lister_name' => auth()->user()->getName(),
+            ]);
+
+            //Return to the view
+            return redirect('/blacklist/display/add')->with('success', $request->name . ' added to the blacklist.');
+
+        } else {
+            //Return the view
+            return view('blacklist.add')->with('error', 'Entity of type '. $request->entity_type . ' is already on the black list.');
+        }
+
+        //If we get back to this point redirect to the blacklist with a general error.
+        return redirect('/blacklist/display/add')->with('error', 'General Error. Contact Support.');
+    }
+
+    public function RemoveFromBlacklist(Request $request) {
+        //Middleware needed
+        $this->middleware('permission:blacklist.admin');
+
+        //Validate the input request
+        $this->validate($request, [
+            'name' => 'required',
+        ]);
+
+        //Delete the blacklist character
+        BlacklistEntity::where([
+            'entity_name' => $request->name,
+        ])->delete();
+
+        //Return the view
+        return redirect('/blacklist/display')->with('success', 'Character removed from the blacklist.');
+    }
+
+    public function DisplayBlacklist() {
+
+        //Get the entire blacklist
+        $blacklist = BlacklistEntity::orderBy('entity_name', 'asc')->paginate(50);
+
+        //Return the view with the data
+        return view('blacklist.list')->with('blacklist', $blacklist);
+    }
+
+    public function SearchInBlacklist(Request $request) {
+
+        //Validate the input from the form
+        $this->validate($request, [
+            'parameter' => 'required',
+        ]);
+
+        $blacklist = DB::table('alliance_blacklist')->where('entity_name', 'like', $request->parameter . "%")
+                                       ->orWhere('entity_type', 'like', $request->parameter . "%")
+                                       ->orWhere('alts', 'like', $request->parameter . "%")
+                                       ->orWhere('reason', 'like', $request->parameter . "%")
+                                       ->orderBy('entity_name', 'asc')
+                                       ->paginate(50);
+
+        $blacklistCount = sizeof($blacklist);
+
+        //If the count for the blacklist is greater than 0, then  get the details, and send it to the view
+        if($blacklistCount > 0) {
+
+            //Send the data to the view
+            return view('blacklist.list')->with('blacklist', $blacklist)
+                                         ->with('success', 'Results were found on the blacklist');
+        } else {
+            //If they aren't found, then null out the blacklist variable, and send to the view
+            $blacklist = null;
+
+            return view('blacklist.list')->with('blacklist', $blacklist)
+                                         ->with('error', 'Results were not found on the blacklist.');
+        }
+    }
+}

app/Http/Controllers/Contracts/ContractAdminController.php

@@ -1,173 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Contracts;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use DB;
-use Carbon\Carbon;
-
-//Libraries
-use App\Library\Esi\Mail;
-
-//Models
-use App\User;
-use App\Models\User\UserPermission;
-use App\Models\Contracts\Contract;
-use App\Models\Contracts\Bid;
-use App\Models\Contracts\AcceptedBid;
-
-class ContractAdminController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $this->middleware('role:User');
-        $this->middleware('permission:contract.admin');
-    }
-
-    /**
-     * Contract display functions
-     */
-    public function displayContractDashboard() {
-        $contracts = Contract::where(['finished' => false])->get();
-
-        return view('contracts.admin.contractpanel')->with('contracts', $contracts);
-    }
-
-    public function displayPastContracts() {
-        $contracts = Contract::where(['finished' => true])->get();
-
-        return view('contracs.admin.past')->with('contracts', $contracts);
-    }
-
-    /**
-     * New contract functionality
-     */
-    public function displayNewContract() {
-        return view('contracts.admin.newcontract');
-    }
-
-    public function storeNewContract(Request $request) {
-        $this->validate($request, [
-            'name' => 'required',
-            'date' => 'required',
-            'body' => 'required',
-            'type' => 'required',
-        ]);
-
-        $date = new Carbon($request->date);
-        $body = nl2br($request->body);
-
-        //Store the contract in the database
-        $contract = new Contract;
-        $contract->title = $request->name;
-        $contract->end_date = $request->date;
-        $contract->body = $body;
-        $contract->type = $request->type;
-        $contract->save();
-
-        return redirect('/contracts/admin/display')->with('success', 'Contract written.');
-    }
-
-    /**
-     * Used to store a finished contract in the database
-     */
-    public function storeAcceptContract(Request $request) {
-        $this->validate($request, [
-            'contract_id' => 'required',
-            'bid_id' => 'required',
-            'character_id' => 'required',
-            'bid_amount' => 'required',
-        ]);
-
-        //Update the contract
-        Contract::where([
-            'contract_id' => $request->contract_id,
-        ])->update([
-            'finished' => true,
-            'final_cost' => $request->bid_amount,
-        ]);
-
-        //Save the accepted bid in the database
-        $accepted = new AcceptedBid;
-        $accepted->contract_id = $request->contract_id;
-        $accepted->bid_id = $request->bid_id;
-        $accepted->bid_amount = $request->bid_amount;
-        $accepted->save();
-
-        return redirect('/contracts/admin/display')->with('success', 'Contract accepted and closed.');
-    }
-
-    /**
-     * Delete a contract from every user
-     */
-    public function deleteContract($id) {
-
-        Contract::where(['contract_id' => $id])->delete();
-
-        Bid::where(['contract_id' => $id])->delete();
-
-        return redirect('/contracts/admin/display')->with('success', 'Contract has been deleted.');
-    }
-
-    /**
-     * End Contract Functionality
-     */
-    public function displayEndContract($id) {
-        //Gather the information for the contract, and all bids on the contract
-        $contract = Contract::where(['contract_id' => $id])->first()->toArray();
-        $bids = Bid::where(['contract_id' => $id])->get()->toArray();
-
-        return view('contracts.admin.displayend')->with('contract', $contract)
-                                                  ->with('bids', $bids);
-    }
-
-    public function storeEndContract(Request $request) {
-        $this->validate($request, [
-            'contract_id' => 'required',
-            'accept' => 'required',
-        ]);
-
-        //Declare class variables
-        $mail = new Mail;
-        $tries = 1;
-
-        $contract = Contract::where(['contract_id' => $request->contract_id])->first()->toArray();
-        $bid = Bid::where(['id' => $request->accept, 'contract_id' => $request->contract_id])->first()->toArray();
-
-        //Send mail out to winner of the contract
-        $subject = 'Contract Won';
-        $body = 'You have been accepted to perform the following contract:<br>';
-        $body .= $contract['contract_id'] . ' : ' . $contract['title'] . '<br>';
-        $body .= 'Notes:<br>';
-        $body .= $contract['body'] . '<br>';
-        $body .= 'Please remit contract when the items are ready to Spatial Forces.  Description should be the contract identification number.  Request ISK should be the bid amount.';
-        $body .= 'Sincerely,<br>Spatial Forces Contracting Department';
-        while($mail->SendMail($bid['character_id'], 'character', $subject, $body)) {
-            $tries++;
-            if($tries == 5) {
-                TidyContract($contract, $bid);
-
-                return redirect('/contracts/admin/display')->with('error', 'Could not deliver mail.  Please manually send the mail to the winner.');
-            }
-        }
-        
-        TidyContract($contract, $bid);
-        
-        return redirect('/contracts/admin/display')->with('success', 'Contract finalized.  Mail took ' . $tries . ' attempt to send to the winner.');
-    }
-
-    private function TidyContract($contract, $bid) {
-        Contract::where(['contract_id' => $contract['contract_id']])->update([
-            'finished' => true,
-        ]);
-
-        //Create the accepted contract entry into the table
-        $accepted = new AcceptedBid;
-        $accepted->contract_id = $contract['contract_id'];
-        $accepted->bid_id = $bid['id'];
-        $accepted->bid_amount = $bid['bid_amount'];
-        $accepted->notes = $bid['notes'];
-        $accepted->save();
-    }
-}

app/Http/Controllers/Contracts/ContractController.php

@@ -1,316 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Contracts;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use DB;
-use Carbon\Carbon;
-
-//Libraries
-use App\Library\Lookups\LookupHelper;
-//use App\Library\Contracts\ContractHelper;
-
-//Models
-use App\User;
-use App\Models\User\UserPermission;
-use App\Models\Contracts\Contract;
-use App\Models\Contracts\Bid;
-
-class ContractController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $this->middleware('role:User');
-        $this->middleware('permission:contract.canbid');
-    }
-
-    /**
-     * Controller function to display the bids placed on contracts
-     */
-    public function displayBids($id) {
-        $bids = Bids::where(['contract_id' => $id, 'character_name' => auth()->user()->getName()])->get();
-
-        return view('contracts.bids')->with('bids', $bids);
-    }
-
-    /**
-     * 
-     * Controller function to display all current open contracts
-     * 
-     */
-    public function displayContracts() {
-        //Calculate today's date to know which contracts to display
-        $today = Carbon::now();
-
-        //Declare our array variables
-        $bids = array();
-        $contracts = array();
-        $i = 0;
-
-        //Fetch all of the current contracts from the database
-        $contractsTemp = Contract::where('end_date', '>=', $today)
-                                 ->where(['finished' => false])->get()->toArray();
-
-        //Count the number of bids, and add them to the arrays
-        for($i = 0; $i < sizeof($contractsTemp); $i++) {
-            $tempCount = Bid::where(['contract_id' => $contractsTemp[$i]['contract_id']])->count('contract_id');
-            $bids = Bid::where(['contract_id' => $contractsTemp[$i]['contract_id']])->get()->toArray();
-
-            //Assemble the finaly array
-            $contracts[$i] = $contractsTemp[$i];
-            $contracts[$i]['bid_count'] = $tempCount;
-            $contracts[$i]['bids'] = $bids;
-        }        
-
-        //Call for the view to be displayed
-        return view('contracts.allcontracts')->with('contracts', $contracts);
-    }
-
-    /**
-     * Controller function to display all current public contracts
-     */
-    public function displayPublicContracts() {
-        //Calculate today's date to know which contracts to display
-        $today = Carbon::now();
-
-        //Declare our array variables
-        $bids = array();
-        $contracts = array();
-        $i = 0;
-        $lowestBid = null;
-        $lowestCorp = null;
-
-        //Fetch all of the current contracts from the database
-        $contractsTemp = Contract::where('end_date', '>=', $today)
-                             ->where(['type' => 'Public', 'finished' => false])->get()->toArray();
-
-        //Count the number of bids, and add them to the arrays
-        for($i = 0; $i < sizeof($contractsTemp); $i++) {
-            $tempCount = Bid::where(['contract_id' => $contractsTemp[$i]['contract_id']])->count('contract_id');
-            $bids = Bid::where(['contract_id' => $contractsTemp[$i]['contract_id']])->get()->toArray();
-
-            foreach($bids as $bid) {
-                if($lowestBid == null) {
-                    $lowestBid = $bid['bid_amount'];
-                    $lowestCorp = $bid['corporation_name'];
-                } else {
-                    if($bid['bid_amount'] < $lowestBid) {
-                        $lowestBid = $bid['bid_amount'];
-                        $lowestCorp = $bid['corporation_name'];
-                    }
-                }
-            }
-
-            if($lowestBid == null) {
-                $lowestBid = 'No Bids Placed.';
-                $lowestCorp = 'No Corporation has placed a bid.';
-            }
-
-            //Assemble the finaly array
-            $contracts[$i] = $contractsTemp[$i];
-            $contracts[$i]['bid_count'] = $tempCount;
-            $contracts[$i]['bids'] = $bids;
-            $contracts[$i]['lowestbid'] = $lowestBid;
-            $contracts[$i]['lowestcorp'] = $lowestCorp;
-            
-        }        
-
-        //Call for the view to be displayed
-        return view('contracts.publiccontracts')->with('contracts', $contracts);
-    }
-
-    /**
-     * Controller function to display current private contracts
-     */
-    public function displayPrivateContracts() {
-        //Declare our array variables
-        $bids = array();
-        $contracts = array();
-        $lowestBid = null;
-
-        //Calucate today's date to know which contracts to display
-        $today = Carbon::now();
-
-        //Fetch all of the current contracts from the database
-        $contractsTemp = Contract::where('end_date', '>=', $today)
-                             ->where(['type' => 'Private', 'finished' => false])->get();
-        
-        //Count the number of bids, and add them to the arrays
-        for($i = 0; $i < sizeof($contractsTemp); $i++) {
-            $tempCount = Bid::where(['contract_id' => $contractsTemp[$i]['contract_id']])->count('contract_id');
-            $bids = Bid::where(['contract_id' => $contractsTemp[$i]['contract_id']])->get()->toArray();
-
-            foreach($bids as $bid) {
-                if($lowestBid == null) {
-                    $lowestBid = $bid['bid_amount']; 
-                } else {
-                    if($bid['bid_amount'] < $lowestBid) {
-                        $lowestBid = $bid['bid_amount'];
-                    }
-                }
-            }
-
-            if($lowestBid == null) {
-                $lowestBid = 'No Bids Placed.';
-            }
-
-            //Assemble the finaly array
-            $contracts[$i] = $contractsTemp[$i];
-            $contracts[$i]['bid_count'] = $tempCount;
-            $contracts[$i]['bids'] = $bids;
-            $contracts[$i]['lowestbid'] = $lowestBid;            
-        }
-
-        return view ('contracts.privatecontracts')->with('contracts', $contracts);
-    }
-
-    /**
-     * Controller function to display expired contracts
-     * 
-     */
-    public function displayExpiredContracts() {
-        //Calculate today's date to know which contracts to display
-        $today = Carbon::now();
-
-        //Retrieve the contracts from the database
-        $contracts = Contract::where('end_date', '<', $today)->get();
-
-        return view('contracts.expiredcontracts')->with('contracts', $contracts);
-    }
-
-    /**
-     * Controller function to display a page to allow a bid
-     * 
-     */
-    public function displayNewBid($id) {
-
-        $contractId = $id;
-
-        return view('contracts.enterbid')->with('contractId', $contractId);
-    }
-
-    /**
-     * Controller function to store a new bid
-     */
-    public function storeBid(Request $request) {
-        //Valid the request from the enter bid page
-        $this->validate($request, [
-            'contract_id' => 'required',
-            'bid' => 'required',
-        ]);
-
-        //Delcare some class variables we will need
-        $lookup = new LookupHelper;
-
-        $amount = 0.00;
-
-        //Convert the amount to a whole number from abbreviations
-        if($request->suffix == 'B') {
-            $amount = $request->bid * 1000000000.00;
-        } else if($request->suffix == 'M') {
-            $amount = $request->bid * 1000000.00;
-        } else {
-            $amount = $request->bid * 1.00;
-        }
-
-        if(isset($request->notes)) {
-            $notes = nl2br($request->notes);
-        } else {
-            $notes = null;
-        }
-
-        //Get the character id and character name from the auth of the user calling
-        //this function
-        $characterId = auth()->user()->getId();
-        $characterName = auth()->user()->getName();
-        //Use the lookup helper in order to find the user's corporation id and name
-        $corporationId = $lookup->LookupCharacter($characterId);
-        $corporationName = $lookup->LookupCorporationName($corporationId);
-
-        //Before saving a bid let's check to see if the user already placed a bid on the contract
-        $found = Bid::where([
-            'contract_id' => $request->contract_id,
-            'character_id' => $characterId,
-        ])->first();
-
-        if(isset($found->contract_id)) {
-            return redirect('/contracts/display/all')->with('error', 'You have already placed a bid for this contract.  Please modify the existing bid.');
-        } else {
-            //Create the model object to save data to
-            $bid = new Bid;
-            $bid->contract_id = $request->contract_id;
-            $bid->bid_amount = $amount;
-            $bid->character_id = $characterId;
-            $bid->character_name = $characterName;
-            $bid->corporation_id = $corporationId;
-            $bid->corporation_name = $corporationName;
-            $bid->notes = $notes;
-            $bid->save();
-
-            //Redirect to the correct page
-            return redirect('/contracts/display/all')->with('success', 'Bid accepted.');
-        }
-    }
-
-    /**
-     * Controller function to delete a bid
-     */
-    public function deleteBid($id) {
-        //Delete the bid entry from the database
-        Bid::where([
-            'id' => $id,
-        ])->delete();
-
-        return redirect('/contracts/display/public')->with('success', 'Bid deleted.');
-    }
-
-    /**
-     * Controller function to display modify bid page
-     */
-    public function displayModifyBid($id) {
-        //With the bid id number, look up the bid in the database to get the contract information
-        $bid = Bid::where(['id' => $id])->first();
-
-        //Retrieve the contract from the database
-        $contract = Contract::where(['contract_id' => $bid->contract_id])->first()->toArray();
-
-        return view('contracts.modifybid')->with('contract', $contract)
-                                          ->with('bid', $bid);
-    }
-
-    /**
-     * Controller function to modify a bid
-     */
-    public function modifyBid(Request $request) {
-        $this->validate($request, [
-            'bid' => 'required',
-        ]);
-
-        $amount = $request->bid;
-        $type = $request->type;
-        $contractId = $request->contract_id;
-
-        if($request->suffix == 'B') {
-            $amount = $amount * 1000000000.00;
-        } else if($request->suffix == 'M') {
-            $amount = $amount * 1000000.00;
-        } else {
-            $amount = $amount * 1.00;
-        }
-        
-        Bid::where([
-            'character_id' => auth()->user()->getId(),
-            'contract_id' => $contractId,
-        ])->update([
-            'bid_amount' => $amount,
-        ]);
-
-        if($type == 'public') {
-            return redirect('/contracts/display/public')->with('success', 'Bid modified.');
-        } else {
-            return redirect('/contracts/display/private')->with('success', 'Bid modified');
-        }
-        
-    }
-}

app/Http/Controllers/Contracts/PublicContractController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+//Models
+use App\Models\Market\MarketRegionOrder;
+use App\Models\PublicContracts\PublicContract;
+use App\Models\PublicContracts\PublicContractItem;
+
+class PublicContractController extends Controller
+{
+    /**
+     * Private variables
+     */
+    private $regions = [
+        'Immensea' => 10000025,
+        'Catch' => 10000014,
+        'Tenerifis' => 10000061,
+        'The Forge' => 10000002,
+        'Impass' => 10000031,
+        'Esoteria' => 10000039,
+        'Detorid' => 10000005,
+        'Omist' => 10000062,
+        'Feythabolis' => 10000056,
+        'Insmother' => 10000009,
+    ];
+
+    /**
+     * Contracts construct
+     */
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    /**
+     * Display the contracts in a region
+     */
+    public function displayRegionalContracts() {
+        //Declare variables
+        $arrContracts = array();
+        
+        //Get the contracts by region
+        foreach($region as $key => $value) {
+            $contracts = PublicContract::where([
+                'region_id' => $value,
+            ])->get()->toArray();
+
+            //Compile the array
+            foreach($contracts as $contract) {
+                array_push($arrContracts, $contract);
+            }
+        }
+
+        return view('contracts.regional.user.displaycontracts');
+    }
+}

app/Http/Controllers/Contracts/SupplyChainController.php

@@ -0,0 +1,391 @@
+<?php
+
+namespace App\Http\Controllers\Contracts;
+
+//Internal Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+
+//Libraries
+use App\Library\Lookups\LookupHelper;
+
+//Models
+use App\Models\User\User;
+use App\Models\Contracts\SupplyChainBid;
+use App\Models\Contracts\SupplyChainContract;
+
+class SupplyChainController extends Controller
+{
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:Renter');
+    }
+
+    /**
+     * Display the supply chain dashboard
+     */
+    public function displaySupplyChainDashboard() {
+        $contracts = SupplyChainContract::where([
+            'state' => 'open',
+        ])->get();
+
+        return view('supplychain.dashboard.main')->with('contracts', $contracts);
+    }
+
+    /**
+     * Show the user's open contracts
+     */
+    public function displayMyOpenContractsDashboard() {
+        $contracts = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'state' => 'open',
+        ])->get();
+
+        return view('supplychain.dashboard.main')->with('contracts', $contracts);
+    }
+
+    /**
+     * Show the user's closed contracts
+     */
+    public function displayMyClosedContractsDashboard() {
+        $contracts = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'state' => 'closed',
+        ])->get();
+
+        return view('supplychain.dashboard.main')->with('contracts', $contracts);
+    }
+
+    /**
+     * Show the past contracts bidded on
+     */
+    public function displayPastContractsDashboard() {
+        $contracts = array();
+
+        $acceptedBids = SupplyChainBid::where([
+            'bid_type' => 'accepted',
+        ])->get();
+
+        foreach($acceptedBids as $bid) {
+            $contracts = null;
+
+            $temp = SupplyChainContract::where([
+                'state' => 'closed',
+            ])->get()->toArray();
+
+            $temp2 = SupplyChainContract::where([
+                'state' => 'completed',
+            ])->get()->toArray();
+
+            array_push($contracts, $temp);
+            array_push($contracts, $temp2);
+        }
+
+        return view('supplychain.dashboard.past')->with('contracts', $contracts);
+    }
+
+    /**
+     * Display new contract page
+     */
+    public function displayNewSupplyChainContract() {
+        return view('supplychain.forms.newcontract');
+    }
+
+    /**
+     * Store new contract page
+     */
+    public function storeNewSupplyChainContract(Request $request) {
+        $this->validate($request, [
+            'name' => 'required',
+            'date' => 'required',
+            'delivery' => 'required',
+            'body' => 'required',
+        ]);
+
+        $contract = new SupplyChainContract;
+        $contract->issuer_id = auth()->user()->getId();
+        $contract->issuer_name = auth()->user()->getName();
+        $contract->title = $request->name;
+        $contract->end_date = $request->date;
+        $contract->delivery_by = $request->delivery;
+        $contract->body = $request->body;
+        $contract->state = 'open';
+        $contract->bids = 0;
+        $contract->save();
+
+        $this->NewSupplyChainContractMail($contract);
+
+        return redirect('/supplychain/dashboard')->with('success', 'New Contract created.');
+    }
+
+    /**
+     * Display the delete contract page
+     */
+    public function displayDeleteSupplyChainContract() {
+        return view('supplychain.forms.delete');
+    }
+
+    /**
+     * Delete a supply chain contract
+     */
+    public function deleteSupplyChainContract(Request $request) {
+        $this->validate($request, [
+            'contractId' => 'required',
+        ]);
+
+        /**
+         * Remove the supply chain contract if it's yours.
+         */
+        $count = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'id' => $request->contractId,
+        ])->count();
+
+        if($count > 0) {
+            //Remove the supply chain contract
+            SupplyChainContract::where([
+                'issuer_id' => auth()->user()->getId(),
+                'id' => $request->contractId,
+            ])->delete();
+        }
+        
+        //Remove all the bids from the supply chain contract
+        SupplyChainBid::where([
+            'contract_id' => $request->contractId,
+        ])->delete();
+
+        return redirect('/supplychain/dashboard')->with('success', 'Supply Chain Contract deleted successfully.');
+    }
+
+    /**
+     * Display the end supply chain contrage page
+     */
+    public function displayEndSupplyChainContract() {
+        return view('supplychain.forms.end');
+    }
+
+    /**
+     * Process the end supply chain contract page
+     */
+    public function storeEndSupplyChainContract(Request $request) {
+        $this->validate($request, [
+            'accept' => 'required',
+            'contractId' => 'required',
+        ]);
+
+        //Check to make sure the user owns the contract
+        $count = SupplyChainContract::where([
+            'issuer_name' => auth()->user()->getName(),
+            'contract_id' => $request->contractId,
+        ])->count();
+
+        //If the count is greater than 0, the user owns the contract.
+        //Proceed with ending the contract
+        if($count > 0) {
+
+        } else {
+            //If the count is zero, then redirect with error messsage
+        }
+
+        return redirect('/supplychain/dashboard')->with('success', 'Contract ended, and mails sent to the winning bidder.');
+    }
+
+    /**
+     * Display supply chain contract bids page
+     */
+    public function displaySupplyChainBids() {
+
+        return view('supplychain.dashboard.bids');
+    }
+
+    /**
+     * Display expired supply chain contracts page
+     */
+    public function displayExpiredSupplyChainContracts() {
+
+        return view('supplychain.dashboard.expired');
+    }
+
+    /**
+     * Display the new bid on a supply chain contract page
+     */
+    public function displaySupplyChainContractBid(Request $request) {
+        $this->validate($request, [
+            'contract_id' => 'required',
+        ]);
+
+        $contractId = $request->contract_id;
+
+        return view('supplychain.forms.enterbid')->with('contractId', $contractId);
+    }
+
+    /**
+     * Enter a new bid on a supply chain contract
+     */
+    public function storeSupplyChainContractBid(Request $request) {
+        $this->validate($request, [
+            'bid' => 'required',
+            'contract_id' => 'required',
+        ]);
+
+        $count = SupplyChainBid::where([
+            'entity_id' => auth()->user()->getId(),
+            'entity_name' => auth()->user()->getName(),
+            'contract_id' => $request->contract_id,
+        ])->count();
+
+        //If the person already has a bid in, then deny them the option to place another bid on the same contract.
+        //Otherwise, enter the bid into the database
+        if($count > 0) {
+            redirect('/supplychain/dashboard')->with('error', 'Unable to insert bid as one is already present for the supply chain contract.');
+        } else {
+            //Sanitize the bid amount
+
+            //Create the database entry
+            $bid = new SupplyChainBid;
+            $bid->contract_id = $request->contract_id;
+            $bid->bid_amount = $request->bid;
+            $bid->entity_id = auth()->user()->getId();
+            $bid->entity_name = auth()->user()->getName();
+            $bid->entity_type = 'character';
+            if(isset($request->notes)) {
+                $bid->bid_note = $request->notes;
+            }
+            $bid->save();
+
+            redirect('/supplychain/dashboard')->with('success', 'Bid succesfully entered into the contract.');
+        }
+    }
+
+    /**
+     * Delete a bid on a supply chain contract
+     */
+    public function deleteSupplyChainContractBid(Request $request) {
+        $this->validate($request, [
+            'contract_id' => 'required',
+            'bid_id' => 'required',
+        ]);
+
+        //See if the user has put in a bid.  If not, then redirect to failure.
+        $count = SupplyChainBid::where([
+            'contract_id' => $request->contract_id,
+            'entity_id' => auth()->user()->getId(),
+            'bid_id' => $request->bid_id,
+        ])->count();
+
+        if($count > 0) {
+            SupplyChainBid::where([
+                'contract_id' => $request->contract_id,
+                'entity_id' => auth()->user()->getId(),
+                'bid_id' => $request->bid_id,
+            ])->delete();
+
+            return redirect('/suppplychain/dashboard')->with('success', 'Deleted supply chain contract bid.');
+        } else {
+            return redirect('/supplychain/dashboard')->with('error', 'No bid found to delete.');
+        }
+    }
+
+    /**
+     * Display the modify a bid on supply chain contract page
+     */
+    public function displayModifySupplyChainContractBid(Request $request) {
+        $this->validate($request, [
+            'contract_id' => 'required',
+        ]);
+
+        $contractId = $request->contract_id;
+
+        return view('supplychain.forms.modifybid')->with('contractId', $contractId);
+    }
+
+    /**
+     * Modify a bid on a supply chain contract
+     */
+    public function modifySupplyChainContractBid(Request $request) {
+        $this->validate($request, [
+            'bid_id' => 'required',
+            'contract_id' => 'required',
+            'bid_amount' => 'required',
+        ]);
+
+        //Check for the owner of the bid
+        $count = SupplyChainBid::where([
+            'bid_id' => $request->bid_id,
+            'contract_id' => $request->contract_id,
+            'entity_id' => auth()->user()->getId(),
+        ])->count();
+
+        if($count > 0) {
+            if(isset($request->bid_note)) {
+                SupplyChainBid::where([
+                    'bid_id' => $request->bid_id,
+                    'contract_id' => $request->contract_id,
+                    'entity_id' => auth()->user()->getId(),
+                ])->update([
+                    'bid_amount' => $request->bid_amount,
+                    'bid_note' => $request->bid_note,
+                ]);
+            } else {
+                SupplyChainBid::where([
+                    'bid_id' => $request->bid_id,
+                    'contract_id' => $request->contract_id,
+                    'entity_id' => auth()->user()->getId(),
+                ])->update([
+                    'bid_amount' => $request->bid_amount,
+                ]);
+            }
+
+            return redirect('/supplychain/dashboard')->with('success', 'Modified supply chain contract bid.');
+        } else {
+            return redirect('/supplychain/dashboard')->with('error', 'Not able to modify supply chain contract bid.');
+        }        
+    }
+
+    /**
+     * Send out a new supply chain contract mail
+     */
+    private function NewSupplyChainContractMail(SupplyChainContract $contract) {
+        //Get the config for the esi
+        $config = config('esi');
+        $todayDate = Carbon::now()->toFormat('d-m-Y');
+
+        $subject = 'New Supply Chain Contract ' . $todayDate;
+        $body = "A supply chain contract is available.<br>";
+        $body .= "Contract: " . $contract->title . "<br>";
+        $body .= "Notes: " . $contract->body . "<br>";
+        $body .= "Delivery Date: " . $contract->delivery_date . "<br>";
+        $body .= "<br>Sincerely on behalf of,<br>" . $contract->issuer_name . "<br>";
+        ProcessSendEveMailJob::dispatch($body, 145223267, 'mailing_list', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds(30));
+    }
+
+    /**
+     * Send out a mail when the supply chain contract has been deleted
+     */
+    private function DeleteSupplyChainContractMail($contract) {
+        //Get the esi config
+        $config = config('esi');
+
+        $subject = 'Production Contract Removal';
+        $body = "A production contract has been deleted.<br>";
+        $body .= "Contract: " . $contract->title . "<br>";
+        $body .= "Notes: " . $contract->note . "<br>";
+        $body .= "<br>Sincerely on behalf of,<br>" . $contract->issuer_name;
+        ProcessSendEveMailJob::dispatch($body, 145223267, 'mailing_list', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds(30));
+    }
+
+    /**
+     * Tidy up datatables from a completed supply chain contract
+     */
+    private function TidySupplyChainContract($contract, $bid) {
+        SupplyChainContract::where([
+            'contract_id' => $contract->contract_id,
+        ])->update([
+            'state' => 'finished',
+        ]);
+    }
+}

app/Http/Controllers/Dashboard/AdminController.php

@@ -5,16 +5,24 @@ namespace App\Http\Controllers\Dashboard;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use DB;
+use Carbon\Carbon;
 
 //Libraries
 use App\Library\Taxes\TaxesHelper;
+use App\Library\Wiki\WikiHelper;
+use App\Library\Lookups\LookupHelper;
+use App\Library\SRP\SRPHelper;
 
 //Models
-use App\User;
+use App\Models\User\User;
 use App\Models\User\UserRole;
 use App\Models\User\UserPermission;
 use App\Models\User\AvailableUserPermission;
+use App\Models\User\AvailableUserRole;
 use App\Models\Admin\AllowedLogin;
+use App\Models\Doku\DokuGroupNames;
+use App\Models\Doku\DokuMember;
+use App\Models\Doku\DokuUser;
 
 class AdminController extends Controller
 {
@@ -23,25 +31,141 @@ class AdminController extends Controller
         $this->middleware('role:Admin');
     }
 
-    public function displayDashboard() {
+    public function displayTestAdminDashboard() {
+        return view('admin.dashboards.testdashboard');
+    }
+
+    public function showJournalEntries() {
+        $dateInit = Carbon::now();
+        $date = $dateInit->subDays(30);
+
+        $journal = DB::select('SELECT amount,reason,description,date FROM `player_donation_journal` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC');
+        
+        return view('admin.dashboards.walletjournal')->with('journal', $journal);
+    }
+
+    public function displayUsersPaginated() {
+        //Declare array variables
+        $user = array();
+        $permission = array();
+        $userArr = array();
+        $permString = null;
+
+        $usersArr = User::orderBy('name', 'asc')->paginate(50);
+
+        foreach($usersArr as $user) {
+            $user->role = $user->getRole();
+
+            $permCount = UserPermission::where([
+                'character_id' => $user->character_id,
+            ])->count();
+            
+            if($permCount > 0) {
+                $perms = UserPermission::where([
+                    'character_id' => $user->character_id,
+                ])->get('permission')->toArray();
+
+                foreach($perms as $perm) {
+                    $permString .= $perm['permission'] . ', ';
+                }
+
+                $user->permission = $permString;
+            } else {
+                $user->permission = 'No Permissions';
+            }
+        }
+
+        return view('admin.dashboards.userspaged')->with('usersArr', $usersArr);
+    }
+
+    public function searchUsers(Request $request) {
+        //Declare array variables
+        $user = array();
+        $permission = array();
+        $userArr = array();
+        $permString = null;
+
+        //Validate the input from the form
+        $this->validate($request, [
+            'parameter' => 'required',
+        ]);
+
+        $usersArr = User::where('name', 'like', $request->parameter . "%")->paginate(50);
+
+        foreach($usersArr as $user) {
+            $user->role = $user->getRole();
+
+            $permCount = UserPermission::where([
+                'character_id' => $user->character_id,
+            ])->count();
+
+            if($permCount > 0) {
+                $perms = UserPermission::where([
+                    'character_id' => $user->character_id,
+                ])->get('permission')->toArray();
+
+                foreach($perms as $perm) {
+                    $permString .= $perm['permission'] . ', ';
+                }
+
+                $user->permission = $permString;
+            } else {
+                $user->permission = 'No Permissions';
+            }
+        }
+
+        return view('admin.dashboards.users.searched')->with('usersArr', $usersArr);
+    }
+
+    public function displayAllowedLogins() {
+        //Declare array variables
+        $entities = array();
+
+        /** Entities for allowed logins */
+        $legacys = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_name')->toArray();
+        $renters = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_name')->toArray();
+        //Compile a list of entities by their entity_id
+        foreach($legacys as $legacy) {
+            $entities[] = $legacy;
+        }
+        foreach($renters as $renter) {
+            $entities[] = $renter;
+        }
+
+        return view('admin.dashboards.allowed_logins')->with('entities', $entities);
+    }
+
+    public function displayTaxes() {
         //Declare variables needed for displaying items on the page
         $months = 3;
         $pi = array();
         $industry = array();
         $reprocessing = array();
         $office = array();
-        $user = array();
-        $permission = array();
-        $entities = array();
         $corpId = 98287666;
+        $srpActual = array();
+        $srpLoss = array();
 
         /** Taxes Pane */
         //Declare classes needed for displaying items on the page
         $tHelper = new TaxesHelper();
+        $srpHelper = new SRPHelper();
         //Get the dates for the tab panes
         $dates = $tHelper->GetTimeFrameInMonths($months);
         //Get the data for the Taxes Pane
         foreach($dates as $date) {
+            //Get the srp actual pay out for the date range
+            $srpActual[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($srpHelper->GetAllianceSRPActual($date['start'], $date['end']), 2, ".", ","),
+            ];
+
+            //Get the srp loss value for the date range
+            $srpLoss[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($srpHelper->GetAllianceSRPLoss($date['start'], $date['end']), 2, ".", ","),
+            ];
+
             //Get the pi taxes for the date range
             $pis[] = [
                 'date' => $date['start']->toFormattedDateString(),
@@ -65,85 +189,79 @@ class AdminController extends Controller
             //Get the market taxes for the date range
             $markets[] = [
                 'date' => $date['start']->toFormattedDateString(),
-                'gross' => number_format($tHelper->GetMarketGross($date['start'], $date['end']), 2, ".", ","),
+                'gross' => number_format($tHelper->GetAllianceMarketGross($date['start'], $date['end']), 2, ".", ","),
             ];
             //Get the jump gate taxes for the date range
             $jumpgates[] = [
                 'date' => $date['start']->toFormattedDateString(),
                 'gross' => number_format($tHelper->GetJumpGateGross($date['start'], $date['end']), 2, ".", ","),
             ];
-
-            $pigross[] = [
-                'date' => $date['start']->toFormattedDateString(),
-                'gross' => number_format($tHelper->GetPiSalesGross($date['start'], $date['end']), 2, ".", ","),
-            ];
         }
 
-        /** Users & Permissions Pane  */
-        //Get the users from the database to allow a selection of users for various parts of the webpage
-        $users = User::pluck('name')->all();
-        //Get the available permissions from the database to allow a selection of permissions
-        $permissions = AvailableUserPermission::pluck('permission')->all();
-        //Create the user key value pairs 
-        foreach($users as $key => $value) {
-            $user[$value] = $value;
-        }
-        //Create the permission key value pairs
-        foreach($permissions as $key => $value) {
-            $permission[$value] = $value;
-        }
-        //Create the data array
-        $data = [
-            'users' => $user,
-            'permissions' => $permission,
-        ];
-
-        /** Entities for allowed logins */
-        $legacys = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_name')->toArray();
-        $renters = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_name')->toArray();
-        //Compile a list of entities by their entity_id
-        foreach($legacys as $legacy) {
-            $entities[] = $legacy;
-        }
-        foreach($renters as $renter) {
-            $entities[] = $renter;
-        }
-
-        return view('admin.dashboard')->with('data', $data)
-                                      ->with('pis', $pis)
+        return view('admin.dashboards.taxes')->with('pis', $pis)
                                             ->with('industrys', $industrys)
                                             ->with('offices', $offices)
                                             ->with('markets', $markets)
                                             ->with('jumpgates', $jumpgates)
                                             ->with('reprocessings', $reprocessings)
-                                      ->with('entities', $entities)
-                                      ->with('pigross', $pigross);
+                                            ->with('srpActual', $srpActual)
+                                            ->with('srpLoss', $srpLoss);
+    }
+
+    public function displayModifyUser(Request $request) {
+        $permissions = array();
+        
+        $name = $request->user;
+
+        //Get the user information from the name
+        $user = User::where(['name' => $name])->first();
+
+        $perms = AvailableUserPermission::all();
+        foreach($perms as $p) {
+            $permissions[$p->permission] = $p->permission;
+        }
+
+        $roles = AvailableUserRole::all();
+
+        $role = $user->getRole();
+
+        //Pass the user information to the page for hidden text entries
+        return view('admin.user.modify')->with('user', $user)
+                                        ->with('permissions', $permissions)
+                                        -with('role', $role)
+                                        ->with('roles', $roles);
     }
 
     public function modifyRole(Request $request) {
-        return redirect('/admin/dashboard')->with('error', 'Not implemented yet.');
+        $this->validate($request, [
+            'user' => 'required',
+            'role' => 'required|role!=None',
+        ]);
+
+        UserRole::where(['character_id' => $user])->update([
+            'role' => $request->role,
+        ]);
+
+        return redirect('/admin/dashboard/users')->with('success', "User: " . $user . " has been modified to a new role: " . $request->role . ".");
     }
 
     public function addPermission(Request $request) {
         //Get the user and permission from the form
-        $user = $request->user;
+        $character = $request->user;
         $permission = $request->permission;
 
-        //Get the character id from the username using the user table
-        $character = User::where(['name' => $user])->get(['character_id']);
-
         //Check to see if the character already has the permission
-        $check = UserPermission::where(['character_id' => $character[0]->character_id, 'permission' => $permission])->get(['permission']);
+        $check = UserPermission::where(['character_id' => $character, 'permission' => $permission])->get(['permission']);
         
         if(!isset($check[0]->permission)) {
             $perm = new UserPermission;
-            $perm->character_id = $character[0]->character_id;
+            $perm->character_id = $character;
             $perm->permission = $permission;
             $perm->save();
 
-            return redirect('/admin/dashboard')->with('success', 'User udpated!');
+            return redirect('/admin/dashboard/users')->with('success', 'User udpated!');
         } else {
-            return redirect('/admin/dashboard')->with('error', 'User not updated or already has the permission.');
+            return redirect('/admin/dashboard/users')->with('error', 'User not updated or already has the permission.');
         }   
     }
 
@@ -166,7 +284,7 @@ class AdminController extends Controller
         //Delete the user from the user table
         DB::table('users')->where(['character_id' => $data[0]->character_id])->delete();
 
-        return redirect('/admin/dashboard')->with('success', 'User deleted from the site.');
+        return redirect('/admin/dashboard/users')->with('success', 'User deleted from the site.');
     }
 
     public function addAllowedLogin(Request $request) {
@@ -182,8 +300,8 @@ class AdminController extends Controller
         $found = AllowedLogin::where([
             'entity_type' => $request->allowedentityType,
             'entity_name' => $request->allowedEntityName,
-        ])->get();
-        if($found != null) {
+        ])->count();
+        if($found != 0) {
             AllowedLogin::where([
                 'entity_type' => $request->allowedEntityType,
                 'entity_name' => $request->allowedEntityName,
@@ -199,6 +317,7 @@ class AdminController extends Controller
             $login->entity_name = $request->allowedEntityName;
             $login->entity_type = $request->allowedEntityType;
             $login->login_type = $request->allowedLoginType;
+            $login->save();
         }
 
         return redirect('/admin/dashboard')->with('success', 'Entity added to allowed login list.');
@@ -216,4 +335,188 @@ class AdminController extends Controller
 
         return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.');
     }
+
+    /**
+     * Display the wiki dashboard for wiki functions
+     */
+    public function displayWikiDashboard() {
+        //Declare some variables
+        $wikiUsers = array();
+        $wikiGroups = array();
+        
+        $tempUsers = DokuUser::all();
+        $tempGroups = DokuGroupNames::all();
+        $wikiMembership = DokuMember::all();
+
+        //Create a list of users based on id and name for the select form
+        foreach($tempUsers as $temp) {
+            $wikiUsers[$temp->id] = $temp->name;
+        }
+
+        asort($wikiUsers);
+
+        foreach($tempGroups as $temp) {
+            $wikiGroups[$temp->id] = $temp->gname;
+        }
+
+        asort($wikiGroups);
+
+        return view('admin.dashboards.wiki')->with('wikiUsers', $wikiUsers)
+                                           ->with('wikiGroups', $wikiGroups)
+                                           ->with('wikiMembership', $wikiMembership);
+    }
+
+    /**
+     * Delete a wiki user
+     */
+    public function deleteWikiUser(Request $request) {
+        $this->validate($request, [
+            'user' => 'required',
+        ]);
+
+        //Declare helper variable
+        $wikiHelper = new WikiHelper;
+
+        $wikiHelper->DeleteWikiUser($request->user);
+
+        redirect('/admin/dashboard/wiki')->with('success', 'User: ' . $request->user . ' has been deleted.');
+    }
+
+    /**
+     * Add a group to a wiki user
+     */
+    public function addWikiUserGroup(Request $request) {
+        $this->validate($request, [
+            'user' => 'required',       //User Id number
+            'groupname' => 'required',  //Group Id number
+        ]);
+
+        //Declare some helper variables
+        $wikiHelper = new WikiHelper;
+
+        //Check to see if the user has the group we are going to add first
+        if($wikiHelper->UserHasGroup($request->user, $request->groupname)) {
+            return redirect('/admin/dashboard/wiki')->with('error', 'User already has the group.');
+        }
+
+        //Add the user to the wiki group
+        $results = $wikiHelper->AddUserToGroup($request->user, $request->groupname);
+
+        //Redirect based on the results of the add user to group function
+        if($results) {
+            return redirect('/admin/dashboard/wiki')->with('success', 'User added to group for the wiki.');
+        } else {
+            return redirect('/admin/dashboard/wiki')->with('error', 'Failed at add user to group, or user was already part of the group.');
+        }
+    }
+
+    /**
+     * Remove a group from a wiki user
+     */
+    public function removeWikiUserGroup(Request $request) {
+        $this->validate($request, [
+            'user' => 'required',
+            'groupname' => 'required',
+        ]);
+
+        //Declare some helper variables
+        $wikiHelper = new WikiHelper;
+
+        //Check to see if the user has the group we are going to remove them from
+        if(!$wikiHelper->UserHasGroup($request->user, $request->groupname)) {
+            return redirect('/admin/dashboard/wiki')->with('error', 'User does not have the group to remove.');
+        }
+
+        //Remove the user from the wiki group
+        $wikiHelper->RemoveUserFromGroup($request->user, $request->groupname);
+
+        return redirect('/admin/dashboard/wiki')->with('success', 'Removed user from group ' . $request->grouopname);
+    }
+
+    /**
+     * Remove a user from all wiki groups
+     */
+    public function removeWikiUserAllGroups(Request $request) {
+        $this->validate($request, [
+            'user' => 'required',
+        ]);
+
+        //Declare variable
+        $wikiHelper = new WikiHelper;
+
+        $wikiHelper->RemoveUserFromAllGroups($request->user);
+
+        return redirect('/admin/dashboard/wiki')->with('success', 'User successfully removed from all groups.');
+    }
+
+    /**
+     * Insert a new group for wiki user's to be added to
+     */
+    public function insertNewWikiUserGroup(Request $request) {
+        $this->validate($request, [
+            'group' => 'required',
+            'description' => 'required',
+        ]);
+
+        //Declare variable
+        $wikiHelper = new WikiHelper;
+
+        $wikiHelper->AddNewUserGroup($request->group, $request->description);
+
+        return redirect('/admin/dashboard/wiki')->with('success', 'Added new user group.');
+    }
+
+    public function purgeWikiUsers(Request $request) {
+        $this->validate($request, [
+            'admin' => 'required',
+        ]);
+
+        //Declare helper classes
+        $lookup = new LookupHelper;
+        $wikiHelper = new WikiHelper;
+
+        //Get all of the users from the database
+        $users = User::all();
+
+        //Search the names and verify against the lookup table
+        //to find the corporation and / or alliance they belong to.
+        foreach($users as $user) {
+            //Let's look up the character in the user table by their name.
+            //If no name is found, then delete the user and have them start over with the wiki permissions
+            $count = DokuUser::where(['name' => $user->name])->count();
+
+            //If the user is found, then check if they are allowed on the wiki.
+            //If the the count == 0, then the user wasn't found on the wiki, so do nothing.
+            if($count > 0) {
+                //If the user is not allowed, then delete the user, otherwise, leave the user untouched
+                if(!$wikiHelper->AllowedUser($user->name)) {
+                    $uid = $wikiHelper->GetUID($user->name);
+                    $wikiHelper->DeleteWikiUser($uid);
+                }
+            }
+        }
+
+        //Get all of the DokuUsers and verify against the Users on the services page
+        $users = DokuUser::all();
+
+        //Search the names and verify against the lookup table to find the corporation / alliance the user belongs to.
+        foreach($users as $user) {
+            //Lookup the character in the user table on the services page
+            $count = User::where(['name' => $user->name])->count();
+
+            //If the user is found, then check if they are allowed on the wiki.
+            //If the count == 0, then delete the user anyways
+            if($count > 0 ) {
+                //If the user is not allowed, then delete the user, otherwise, leave them alone.
+                if(!$wikiHelper->AllowedUser($user->name)) {
+                    $uid = $wikiHelper->GetUID($user->name);
+                    $wikiHelper->DeleteWikiUser($uid);
+                } else {
+                    $wikiHelper->DeleteWikiUser($user->id);
+                }
+            }
+        }
+
+        return redirect('/admin/dashboard/wiki')->with('success', 'Wiki has been purged.');
+    }
 }

app/Http/Controllers/Dashboard/AdminDashboardController.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Http\Controllers\Dashboard;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+use Khill\Lavacharts\Lavacharts;
+use Illuminate\Support\Facades\Auth;
+
+//Libraries
+use App\Library\Taxes\TaxesHelper;
+use App\Library\Wiki\WikiHelper;
+use App\Library\Lookups\LookupHelper;
+use App\Library\SRP\SRPHelper;
+
+//Models
+
+
+class AdminDashboardController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    /**
+     * Show the administration dashboard.
+     */
+    public function displayAdminDashboard() {
+        if(auth()->user()->hasRole('Admin') || auth()->user()->hasPermission('moon.admin') || auth()->user()->hasPermission('srp.admin') || auth()->user()->hasPermission('contract.admin')) {
+            //Do nothing and continue on
+        } else {
+            redirect('/dashboard');
+        }
+
+        //Declare variables we will need
+        $days = 30;
+        $lava = new Lavacharts;
+
+        //Get the data for the sov expenses for a graph
+
+        //Setup the charts
+        //Setup the chart to be able the show the categories for income
+        /*
+        $iChart = $lava->DataTable();
+        $iChart->addStringColumn('Categories')
+               ->addNumberColumn('ISK')
+               ->addRow(['pi', $pi])
+               ->addRow(['industry', $industry])
+               ->addRow(['reprocessing', $reprocessing])
+               ->addRow(['offices', $office])
+               ->addRow(['industry', $industry])
+               ->addRow(['market', $market])
+               ->addRow(['gate', $gate])
+               ->addRow(['iBuyback', $iBuyback])
+               ->addRow(['renters', $renters])
+               ->addRow(['ops', $ops]);
+        */
+
+        //Setup the chart to be able to show the categories for expenses
+        /*
+        $eChart = $lava->DataTable();
+        $eCjart->addStringColumn('Categories')
+               ->addNumberColumn('ISK')
+               ->addRow(['sov', $sovBills])
+               ->addRow(['srp', $srpActual])
+               ->addRow(['maintenance', $maintenance])
+               ->addRow(['wardecs', $wardecs])
+               ->addRow(['fcs', $fcs])
+               ->addRow(['keepstar_fuel', $keepstarFuel])
+               ->addRow(['fortizar_fuel', $fortizarFuel])
+               ->addRow(['astrahus_fuel', $astrahusFuel])
+               ->addRow(['sotiyo_fuel', $sotiyoFuel])
+               ->addRow(['azbel_fuel', $azbelFuel])
+               ->addRow(['raitaru_fuel', $raitaruFuel])
+               ->addRow(['beacon_fuel', $beaconFuel])
+               ->addRow(['bridge_fuel', $bridgeFuel])
+               ->addRow(['jammer_fuel', $jammerFuel]);
+        */
+        return view('admin.dashboards.dashboard');
+    }
+}

app/Http/Controllers/Dashboard/DashboardController.php

@@ -2,15 +2,21 @@
 
 namespace App\Http\Controllers\Dashboard;
 
+//Internal Libraries
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Khill\Lavacharts\Lavacharts;
+use Carbon\Carbon;
 
+//Models
 use App\Models\Esi\EsiScope;
 use App\Models\Esi\EsiToken;
 use App\Models\User\UserPermission;
 use App\Models\User\UserRole;
+use App\Models\SRP\SRPShip;
+use App\Models\User\UserAlt;
 
 class DashboardController extends Controller
 {
@@ -32,7 +38,159 @@ class DashboardController extends Controller
      */
     public function index()
     {
-        return view('dashboard');
+        //Set some variables to be used in if statements
+        $open = array();
+        $approved = array();
+        $denied = array();
+        $altCount = null;
+        $alts = null;
+
+        //Get the number of the user's alt which are registered so we can process the alt's on the main dashboard page
+        $altCount = UserAlt::where([
+            'main_id' => auth()->user()->character_id,
+        ])->count();
+
+        //If the alt count is greater than 0 get all of the alt accounts
+        if($altCount > 0) {
+            $alts = UserAlt::where([
+                'main_id' => auth()->user()->character_id,
+            ])->get();
+        }
+
+        //See if we can get all of the open SRP requests
+        $openCount = SRPShip::where([
+            'character_id' => auth()->user()->character_id,
+            'approved' => 'Under Review',
+        ])->count();
+        if($openCount > 0) {
+            $open = SRPShip::where([
+                'character_id' => auth()->user()->character_id,
+                'approved' => 'Under Review'
+            ])->get()->toArray();
+        }
+
+        //See if we can get all of the closed and approved SRP requests
+        $approvedCount = SRPShip::where([
+            'character_id' => auth()->user()->character_id,
+            'approved' => 'Approved',
+        ])->count();
+        if($approvedCount > 0) {
+            $approved = SRPShip::where([
+                'character_id' => auth()->user()->character_id,
+                'approved' => 'Approved',
+            ])->take(10)->get()->toArray();
+        }
+
+        //See if we can get all of the closed and denied SRP requests
+        $deniedCount = SRPShip::where([
+            'character_id' => auth()->user()->character_id,
+            'approved' => 'Denied',
+        ])->count();
+        if($deniedCount > 0) {
+            $denied = SRPShip::where([
+                'character_id' => auth()->user()->character_id,
+                'approved' => 'Denied',
+            ])->take(10)->get()->toArray();
+        }
+
+        //Process all types of srp requests for the alt of the main and add to the main's page
+        if($altCount > 0) {
+            //For each alt, get the open requests, and increment the open request counter
+            foreach($alts as $alt) {
+                $altOpenCount = SRPShip::where([
+                    'character_id' => $alt->character_id,
+                    'approved' => 'Under Review',
+                ])->count();
+                if($altOpenCount > 0) {
+                    //If the number of open requests is greater than zero, add to the open count
+                    $openCount += $altOpenCount;
+                    
+                    //Get the alt's open srp requests
+                    $altOpen = SRPShip::where([
+                        'character_id' => $alt->character_id,
+                        'approved' => 'Under Review',
+                    ])->get()->toArray();
+
+                    //Add the alt's open requests to the open requests array
+                    foreach($altOpen as $aOpen) {
+                        array_push($open, $aOpen);
+                    }
+                }
+
+                $altApprovedCount = SRPShip::where([
+                    'character_id' => $alt->character_id,
+                    'approved' => 'Approved',
+                ])->count();
+                if($altApprovedCount > 0) {
+                    //If the number of approved requests is greater than zero, add to the approved count
+                    $approvedCount += $altApprovedCount;
+
+                    //Get the alt's approved srp request
+                    $altApproved = SRPShip::where([
+                        'character_id' => $alt->character_id,
+                        'approved' => 'Approved',
+                    ])->take(5)->get()->toArray();
+
+                    //For each alt add it to the array
+                    foreach($altApproved as $aApproved) {
+                        array_push($approved, $aApproved);
+                    }
+                }
+
+                $altDeniedCount = SRPShip::where([
+                    'character_id' => $alt->character_id,
+                    'approved' => 'Denied',
+                ])->count();
+                if($altDeniedCount > 0) {
+                    //If the denied count is greater then zero for the alt, add it to the count
+                    $deniedCount += $altDeniedCount;
+
+                    //Get the denied alt's srp requests
+                    $altDenied = SRPShip::where([
+                        'character_id' => $alt->character_id,
+                        'approved' => 'Denied',
+                    ])->take(5)->get()->toArray();
+
+                    //For each alt's denied request add it to the array
+                    foreach($altDenied as $aDenied) {
+                        array_push($denied, $aDenied);
+                    }
+                }
+            }
+        }
+
+        //Create a chart of number of approved, denied, and open requests via a fuel gauge chart
+        $lava = new Lavacharts;
+
+        $adur = $lava->DataTable();
+
+        $adur->addStringColumn('Type')
+            ->addNumberColumn('Number')
+            ->addRow(['SRP', $openCount]);
+
+        $lava->GaugeChart('SRP', $adur, [
+            'width' => 200,
+            'max' => 15,
+            'greenFrom' => 0,
+            'greenTo' => 5,
+            'yellowFrom' => 5,
+            'yellowTo' => 10,
+            'redFrom' => 10,
+            'redTo' => 15,
+            'majorTicks' => [
+                'Safe',
+                'Warning',
+                'Critical',
+            ],
+        ]);
+
+        return view('dashboard')->with('openCount', $openCount)
+                                ->with('approvedCount', $approvedCount)
+                                ->with('deniedCount', $deniedCount)
+                                ->with('open', $open)
+                                ->with('approved', $approved)
+                                ->with('denied', $denied)
+                                ->with('lava', $lava);
     }
 
     /**
@@ -42,16 +200,57 @@ class DashboardController extends Controller
      * @return \Illuminate\Http\Response
      */
     public function profile() {
+        //Declare some variables
+        $alts = null;
+        $scopes = null;
+        $permissions = null;
+        $roles = null;
+
+        //Get the Esi scopes, user permission set, and roles
+        $scopeCount = EsiScope::where('character_id', Auth()->user()->character_id)->count();
+        if($scopeCount > 0) {
             $scopes = EsiScope::where('character_id', Auth()->user()->character_id)->get();
-        $permissions = UserPermission::where('character_id', Auth()->user()->characer_id)->get();
+        }
+
+        //Get the permission count and permission of the user
+        $permissionCount = UserPermission::where('character_id', auth()->user()->character_id)->count();
+        if($permissionCount > 0) {
+            $permissions = UserPermission::where('character_id', auth()->user()->character_id)->get();
+        }
+
+        //Get the roles and role count of the user
+        $roleCount = UserRole::where('character_id', Auth()->user()->character_id)->count();
+        if($roleCount > 0) {
             $roles = UserRole::where('character_id', Auth()->user()->character_id)->get();
+        }
 
-        $data = [
-            'scopes' => $scopes,
-            'permissions' => $permissions,
-            'roles' => $roles,
-        ];
+        //Get the alt count and alts of the user
+        $altCount = UserAlt::where('main_id', Auth()->user()->character_id)->count();
+        if($altCount > 0) {
+            $alts = UserAlt::where(['main_id' => Auth()->user()->character_id])->get();
+        }
         
-        return view('dashboard.profile')->with('data', $data);
+        //Return the view with that data
+        return view('dashboard.profile')->with('scopeCount', $scopeCount)
+                                        ->with('scopes', $scopes)
+                                        ->with('permissionCount', $permissionCount)
+                                        ->with('permissions', $permissions)
+                                        ->with('roleCount', $roleCount)
+                                        ->with('roles', $roles)
+                                        ->with('altCount', $altCount)
+                                        ->with('alts', $alts);
+    }
+
+    public function removeAlt(Request $request) {
+        $this->validate($request, [
+            'character' => 'required',
+        ]);
+
+        UserAlt::where([
+            'main_id' => auth()->user()->character_id,
+            'character_id' => $request->character,
+        ])->delete();
+
+        return redirect('/dashboard');
     }
 }

app/Http/Controllers/Dashboard/StatisticsController.php

@@ -0,0 +1,400 @@
+<?php
+
+namespace App\Http\Controllers\Dashboard;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+use Khill\Lavacharts\Lavacharts;
+
+//Libraries
+use App\Library\Taxes\TaxesHelper;
+use App\Library\Lookups\LookupHelper;
+use App\Library\SRP\SRPHelper;
+
+//Models
+use App\Models\User\User;
+use App\Models\Doku\DokuGroupNames;
+use App\Models\Doku\DokuMember;
+use App\Models\Doku\DokuUser;
+use App\Models\SRP\SrpFleetType;
+use App\Models\SRP\SRPShip;
+use App\Models\SRP\SrpShipType;
+use App\Models\SRP\SrpPayout;
+
+
+class StatisticsController extends Controller
+{
+    /**
+     * Create a new controller instance
+     * 
+     * @return void
+     */
+    public function __construct() {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display Jump Bridge Statistics
+     */
+    public function displayJumpBridgeStatistics() {
+        $this->middleware('role:Admin');
+
+        $lava = new Lavacharts;
+        
+    }
+
+    /**
+     * Display Taxes Statistics
+     */
+    public function displayTaxes() {
+        $this->middleware('role:Admin');
+
+        //Declare variables needed for displaying items on the page
+        $months = 3;
+        $pi = array();
+        $industry = array();
+        $reprocessing = array();
+        $office = array();
+        $corpId = 98287666;
+        $srpActual = array();
+        $srpLoss = array();
+
+        /** Taxes Pane */
+        //Declare classes needed for displaying items on the page
+        $tHelper = new TaxesHelper;
+        $srpHelper = new SRPHelper;
+        //Get the dates for the tab panes
+        $dates = $tHelper->GetTimeFrameInMonths($months);
+        //Get the data for the Taxes Pane
+        foreach($dates as $date) {
+            //Get the srp actual pay out for the date range
+            $srpActual[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($srpHelper->GetAllianceSRPActual($date['start'], $date['end']), 2, ".", ","),
+            ];
+
+            //Get the srp loss value for the date range
+            $srpLoss[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($srpHelper->GetAllianceSRPLoss($date['start'], $date['end']), 2, ".", ","),
+            ];
+
+            //Get the pi taxes for the date range
+            $pis[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($tHelper->GetPIGross($date['start'], $date['end']), 2, ".", ","),
+            ];
+            //Get the industry taxes for the date range
+            $industrys[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($tHelper->GetIndustryGross($date['start'], $date['end']), 2, ".", ","),
+            ];
+            //Get the reprocessing taxes for the date range
+            $reprocessings[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($tHelper->GetReprocessingGross($date['start'], $date['end']), 2, ".", ","),
+            ];
+            //Get the office taxes for the date range
+            $offices[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($tHelper->GetOfficeGross($date['start'], $date['end']), 2, ".", ","),
+            ];
+            //Get the market taxes for the date range
+            $markets[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($tHelper->GetAllianceMarketGross($date['start'], $date['end']), 2, ".", ","),
+            ];
+            //Get the jump gate taxes for the date range
+            $jumpgates[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'gross' => number_format($tHelper->GetJumpGateGross($date['start'], $date['end']), 2, ".", ","),
+            ];
+        }
+
+        return view('admin.dashboards.taxes')->with('pis', $pis)
+                                            ->with('industrys', $industrys)
+                                            ->with('offices', $offices)
+                                            ->with('markets', $markets)
+                                            ->with('jumpgates', $jumpgates)
+                                            ->with('reprocessings', $reprocessings)
+                                            ->with('srpActual', $srpActual)
+                                            ->with('srpLoss', $srpLoss);
+    }
+
+    /**
+     * Display wiki statistics
+     */
+    public function displayWikiStatistics() {
+        $this->middleware('role:Admin');
+
+
+    }
+
+    /**
+     * Display SRP Statistics
+     */
+    public function displaySRPStatistics() {
+        $months = 3;
+        $barChartData = array();
+        $start = Carbon::now()->toDateTimeString();
+        $end = Carbon::now()->subMonths(1)->toDateTimeString();
+
+        //Declare the Lavacharts variable
+        $lava = new Lavacharts;
+
+        //We need a function from this library rather than recreating a new library
+        $srpHelper = new SRPHelper();
+
+        /**
+         * Pie chart for the number of approved, denied, and under review payouts currently in the system.
+         */
+        //Get the count of open srp requests
+        $pieOpen = SRPShip::where([
+            'approved' => 'Under Review',
+            ['created_at', '>=', $end],
+            ])->count();
+        //Get the count of approved srp requests
+        $pieApproved = SRPShip::where([
+            'approved' => 'Approved',
+            ['created_at', '>=', $end],
+            ])->count();
+        //Get the count of denied srp requests
+        $pieDenied = SRPShip::where([
+            'approved' => 'Denied',
+            ['created_at', '>=', $end],
+            ])->count();
+
+        //Create a new datatable for the lavachart.
+        $srp = $lava->DataTable();
+        //Add string columns, number columns, and data rows for the chart
+        $srp->addStringColumn('ISK Value')
+                ->addNumberColumn('ISK')
+                ->addRow(['Approved', $pieApproved])
+                ->addRow(['Denied', $pieDenied])
+                ->addRow(['Under Review', $pieOpen]);
+        //Create the pie chart in memory with any options needed to render the chart
+        $lava->PieChart('SRP Stats', $srp, [
+            'title'  => 'SRP Stats',
+            'is3D'   => true,
+        ]);
+        
+        /**
+         * Gauage chart for showing number of open srp requests
+         */
+        //Create a new datatable in the 
+        $adur = $lava->DataTable();
+        //Add string columns, number columns, and data row for the chart
+        $adur->addStringColumn('Type')
+            ->addNumberColumn('Value')
+            ->addRow(['Under Review', $pieOpen]);
+        //Create the gauge chart with any options needed to render the chart
+        $lava->GaugeChart('SRP', $adur, [
+            'width'      => 400,
+            'greenFrom'  => 0,
+            'greenTo'    => 20,
+            'yellowFrom' => 20,
+            'yellowTo'   => 40,
+            'redFrom'    => 40,
+            'redTo'      => 100,
+            'majorTicks' => [
+                'Safe',
+                'Critical',
+            ],
+        ]);
+
+        /**
+         * Create a vertical chart of all of the cost codes for the ships being SRP'ed.
+         * The chart will be by cost code of ships being replaced
+         */
+        //Declare the data table
+        $costCodeChart = $lava->DataTable();
+
+        //Get the approved, under review, and denied cost codes and amounts
+        $t1fdcApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1FDC', 
+        ])->sum('paid_value');
+        $t1fdcUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1FDC',
+        ])->sum('loss_value');
+        $t1fdcDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1FDC',
+        ])->sum('loss_value');
+
+        $t1bcApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1BC',
+        ])->sum('paid_value');
+        $t1bcUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1BC',
+        ])->sum('loss_value');
+        $t1bcDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1BC',
+        ])->sum('loss_value');
+        
+        $t2fdApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T2FD',
+        ])->sum('paid_value');
+        $t2fdUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T2FD',
+        ])->sum('loss_value');
+        $t2fdDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T2FD',
+        ])->sum('loss_value');
+
+        $t3dApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T3D',
+        ])->sum('paid_value');
+        $t3dUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T3D',
+        ])->sum('loss_value');
+        $t3dDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T3D',
+        ])->sum('loss_value');
+
+        $t1t2logiApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1T2Logi',
+        ])->sum('paid_value');
+        $t1t2logiUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1T2Logi',
+        ])->sum('loss_value');
+        $t1t2logiDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1T2Logi',
+        ])->sum('loss_value');
+
+        $reconsApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'REC',
+        ])->sum('paid_value');
+        $reconsUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'REC',
+        ])->sum('loss_value');
+        $reconsDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'REC',
+        ])->sum('loss_value');
+
+        $t2cApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T2C',
+        ])->sum('paid_value');
+        $t2cUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T2C',
+        ])->sum('loss_value');
+        $t2cDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T2C',
+        ])->sum('loss_value');
+
+        $t3cApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T3C',
+        ])->sum('paid_value');
+        $t3cUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T3C',
+        ])->sum('loss_value');
+        $t3cDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T3C',
+        ])->sum('loss_value');
+
+        $commandApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'COM',
+        ])->sum('paid_value');
+        $commandUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'COM',
+        ])->sum('loss_value');
+        $commandDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'COM',
+        ])->sum('loss_value');
+
+        $interdictorApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'INTD',
+        ])->sum('paid_value');
+        $interdictorUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'INTD',
+        ])->sum('loss_value');
+        $interdictorDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'INTD',
+        ])->sum('loss_value');
+
+        $t1bsApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1BS',
+        ])->sum('paid_value');
+        $t1bsUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1BS',
+        ])->sum('loss_value');
+        $t1bsDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1BS',
+        ])->sum('loss_value');
+
+        $dksApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'DKS',
+        ])->sum('paid_value');
+        $dksUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'DKS',
+        ])->sum('loss_value');
+        $dksDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'DKS',
+        ])->sum('loss_value');
+
+
+        //Add string column, number columns.
+        $costCodeChart->addStringColumn('SRP Costs')
+                      ->addNumberColumn('Approved')
+                      ->addNumberColumn('Under Review')
+                      ->addNumberColumn('Denied')
+                      ->addRow(['T1FDC', $t1fdcApproved, $t1fdcUnderReview, $t1fdcDenied])
+                      ->addRow(['T1BC', $t1bcApproved, $t1bcUnderReview, $t1bcDenied])
+                      ->addRow(['T1BS', $t1bsApproved, $t1bsUnderReview, $t1bsDenied])
+                      ->addRow(['T2FD', $t2fdApproved, $t2fdUnderReview, $t2fdDenied])
+                      ->addRow(['T2C', $t2cApproved, $t2cUnderReview, $t2cDenied])
+                      ->addRow(['T1T2Logi', $t1t2logiApproved, $t1t2logiUnderReview, $t1t2logiDenied])
+                      ->addRow(['T3D', $t3dApproved, $t3dUnderReview, $t3dDenied])
+                      ->addRow(['T3C', $t3cApproved, $t3cUnderReview, $t3cDenied])
+                      ->addRow(['RECON', $reconsApproved, $reconsUnderReview, $reconsDenied])
+                      ->addRow(['COMMAND', $commandApproved, $commandUnderReview, $commandDenied])
+                      ->addRow(['DKS', $dksApproved, $dksUnderReview, $dksDenied]);
+        
+        $lava->ColumnChart('Cost Codes', $costCodeChart, [
+            'columns' => 4,
+            'title' => 'Cost Code SRP Chart',
+            'titleTextStyle' => [
+                'color' => '#eb6b2c',
+                'fontSize' => 14,
+            ],
+        ]);  
+
+        return view('srp.admin.statistics')->with('lava', $lava);
+    }
+}

app/Http/Controllers/Flex/FlexAdminController.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Http\Controllers\Flex;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Auth;
+use DB;
+use Carbon\Carbon;
+
+//Models
+use App\Models\Flex\FlexStructure;
+
+//Library
+use App\Library\Lookups\LookupHelper;
+use App\Library\Esi\Esi;
+
+class FlexAdminController extends Controller
+{
+    //Constructor
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:Admin');
+    }
+
+    /**
+     * Function to display all active flex structures and
+     * the information regarding the flex structure
+     */
+    public function displayFlexStructures() {
+        //Get the structures from the database
+        $structures = FlexStructure::all();
+
+        //Return the view with the data
+        return view('flex.list')->with('structures', $structures);
+    }
+
+    /**
+     * Function to display form for adding new flex structure
+     */
+    public function displayAddFlexStructure() {
+        return view('flex.add');
+    }
+
+    /**
+     * Function to add new flex structure to the database
+     */
+    public function addFlexStructure(Request $request) {
+        $this->validate($request, [
+            'requestor_name' => 'required',
+            'requestor_corp_name' => 'required',
+            'system' => 'required',
+            'structure_type' => 'required',
+            'structure_cost' => 'required',
+        ]);
+
+        //Delcare variables and classes
+        $lookup = new LookupHelper;
+
+        //From the character name find the character id
+        $charId = $lookup->CharacterNameToId($request->requestor_name);
+
+        //From the corporation name find the corporation id
+        $corpId = $lookup->CorporationNameToId($request->requestor_corp_name);
+
+        //From the system name find the system id
+        $systemId = $lookup->SystemNameToId($request->system);
+
+        //Create the database model
+        $flex = new FlexStructure;
+        $flex->requestor_id = $charId;
+        $flex->requestor_name = $request->requestor_name;
+        $flex->requestor_corp_id = $corpId;
+        $flex->requestor_corp_name = $request->requestor_corp_name;
+        $flex->system_id = $systemId;
+        $flex->system = $request->system;
+        $flex->structure_type = $request->structure_type;
+        $flex->structure_cost = $request->structure_cost;
+        if(isset($request->paid_until)) {
+            $flex->paid_until = $request->paid_until;
+        }
+        $flex->save();
+
+        return redirect('/flex/display')->with('success', 'Flex Structure Added.');
+    }
+
+    /**
+     * Function to update paid until section of the flex structure in the database
+     */
+    public function updateFlexStructure(Request $request) {
+        $this->validate($request, [
+            'paid_until' => 'required',
+            'requestor_id' => 'required',
+            'requestor_corp_id' => 'required',
+            'system_id' => 'required',
+            'structure_type' => 'required',
+        ]);
+
+        FlexStructure::where([
+            'requestor_id' => $request->requestor_id,
+            'requestor_corp_id' => $request->requestor_corp_id,
+            'system_id' => $request->system_id,
+            'structure_type' => $request->structure_type,
+        ])->update([
+            'paid_until' => $request->paid_until,
+        ]);
+
+        return redirect('/flex/display')->with('success', 'Flex Structure Updated.');
+    }
+
+    /**
+     * Funciton to remove flex structure from the database
+     */
+    public function removeFlexStructure(Request $request) {
+        $this->validate($request, [
+            'requestor_id' => 'required',
+            'requestor_corp_id' => 'required',
+            'system_id' => 'required',
+            'structure_type' => 'required',
+        ]);
+
+        FlexStructure::where([
+            'requestor_id' => $request->requestor_id,
+            'requestor_corp_id' => $request->requestor_corp_id,
+            'system' => $request->system_id,
+            'structure_type' => $request->structure_type,
+        ])->delete();
+
+        return redirect('/flex/display')->with('success', 'Flex Structure Entry Removed.');
+    }
+
+}

app/Http/Controllers/Logistics/FuelController.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Http\Controllers\Logistics;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use DB;
+use Log;
+use Carbon\Carbon;
+use Khill\Lavacharts\Lavacharts;
+use Auth;
+use Charts;
+
+//Library Helpers
+use App\Library\Assets\AssetHelper;
+use App\Library\Structures\StructureHelper;
+
+//Models
+use App\Models\Structure\Structure;
+
+class FuelController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    public function displayStructures() {
+        //Declare variables
+        $jumpGates = array();
+        $lava = new Lavacharts;
+
+        //Declare the class helpers
+        $sHelper = new StructureHelper(null, null, null);
+        $aHelper = new AssetHelper(null, null, null);
+
+        //Setup the charts
+        $gauge = $lava->DataTable();
+        $gauge->addStringColumn('Fuel')
+              ->addNumberColumn('Units');
+
+        //Get all of the jump gates
+        $gates = $sHelper->GetStructuresByType('Ansiblex Jump Gate');
+
+        foreach($gates as $gate) {
+            $liquidOzone = $aHelper->GetAssetByType(16273, $gate->structure_id);
+            $temp = [
+                'name' => $gate->structure_name,
+                'system' => $gate->solar_system_name,
+                'fuel_expires' => $gate->fuel_expires,
+                'liquid_ozone' => $liquidOzone,
+                'link' => '/logistics/fuel/display/' . $gate->structure_id . '/',
+            ];
+
+            array_push($jumpGates, $temp);
+
+            if($liquidOzone > 1000000) {
+                $liquidOzone = 1000000;
+            }
+
+            $gauge->addRow([$gate->solar_system_name, $liquidOzone]);
+        }
+
+        $lava->GaugeChart('Liquid Ozone', $gauge, [
+            'min' => 0,
+            'max' => 1000000,
+            'greenFrom' => 0,
+            'greenTo' => 150000,
+            'greenColor' => '#DC3912',
+            'yellowFrom' => 150000,
+            'yellowTo' => 300000,
+            'yellowColor' => '#FF9900',
+            'redFrom' => 300000,
+            'redTo' => 1000000,
+            'redColor' => '#109618',
+            'majorTicks' => [
+                'Empty',
+                'Full',
+            ],
+        ]);
+
+        return view('logistics.fuel')->with('jumpGates', $jumpGates)
+                                             ->with('lava', $lava);
+    }
+}

app/Http/Controllers/Logistics/StructureRequestAdminController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\Logistics;
+
+//Internal Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Log;
+
+//Models
+use App\Models\Logistics\AnchorStructure;
+
+class StructureRequestAdminController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('permission:fc.team');
+    }
+
+    public function displayRequests() {
+        $reqs = AnchorStructure::all();
+
+        return view('structurerequest.display.structurerequests')->with('reqs', $reqs);
+    }
+
+    public function deleteRequest(Request $request) {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        AnchorStructure::where([
+            'id' => $request->id,
+        ])->delete();
+
+        return redirect('/structures/display/requests');
+    }
+}

app/Http/Controllers/Logistics/StructureRequestController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Controllers\Logistics;
+
+//Internal Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Log;
+
+//Jobs
+use App\Jobs\ProcessSendEveMailJob;
+
+//Library Helpers
+use App\Library\Lookups\LookupHelper;
+
+//Models
+use App\Models\Logistics\AnchorStructure;
+use App\Models\User\UserPermission;
+
+class StructureRequestController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    public function displayForm() {
+        return view('structurerequest.requeststructure');
+    }
+
+    public function storeForm(Request $request) {
+        $this->validate($request, [
+            'corporation_name' => 'required',
+            'system' => 'required',
+            'structure_size' => 'required',
+            'structure_type' => 'required',
+            'requested_drop_time' => 'required',
+            'requester' => 'required',
+        ]);
+
+        $lookup = new LookupHelper;
+
+        $config = config('esi');
+
+        $requesterId = $lookup->CharacterNameToId($request->requester);
+        $corporationId = $lookup->CorporationNameToId($request->corporation_name);
+        
+        AnchorStructure::insert([
+            'corporation_id' => $corporationId,
+            'corporation_name' => $request->corporation_name,
+            'system' => $request->system,
+            'structure_size' => $request->structure_size,
+            'structure_type' => $request->structure_type,
+            'requested_drop_time' => $request->requested_drop_time,
+            'requester_id' => $requesterId,
+            'requester' => $request->requester,
+        ]);
+
+        //Send a mail out to the FC Team
+        $fcTeam = UserPermission::where([
+            'permission' => 'fc.team',
+        ])->get();
+
+        //Set the mail delay
+        $delay = 5;
+
+        foreach($fcTeam as $fc) {
+            $body = "Structure Anchor Request has been entered.<br>";
+            $body .= "Please check the W4RP Services Site for the structure information.<br>";
+            $body .= "<br>Sincerely,<br>";
+            $body .= "Warped Intentions Leadership<br>";
+            
+            //Dispatch the mail job
+            $subject = "New Structure Anchor Request";
+            ProcessSendEveMailJob::dispatch($body, (int)$fc->character_id, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($delay));
+
+            $delay += 15;
+        }
+
+        return redirect('/structures/display/requests');
+    }
+}

app/Http/Controllers/Moons/MoonLedgerController.php

@@ -0,0 +1,239 @@
+<?php
+
+namespace App\Http\Controllers\Moons;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Log;
+use Carbon\Carbon;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Structures\StructureHelper;
+use App\Library\Lookups\LookupHelper;
+
+//App Models
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+use App\Models\Lookups\ItemLookup;
+use App\Models\MoonRentals\AllianceRentalMoon;
+use App\Models\Moon\RentalMoon;
+use App\Models\Moon\CorpObserversRegistered;
+use App\Models\Moon\CorpMoonObserver;
+
+class MoonLedgerController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    public function displayMoonLedgerNew() {
+        
+    }
+
+    public function displayMoonLedger() {
+        //Declare variables
+        $structures = array();
+        $miningLedgers = array();
+        $tempMiningLedger = array();
+        $tempMining = array();
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $response = null;
+        $structureInfo = null;
+
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope(auth()->user()->getId(), 'esi-industry.read_corporation_mining.v1')) {
+            return redirect('/dashboard')->with('error', 'Need to add scopes for esi-industry.read_corporation_mining.v1');
+        } else {
+            if(!$esiHelper->HaveEsiScope(auth()->user()->getId(), 'esi-universe.read_structures.v1')) {
+                return redirect('/dashboard')->with('error', 'Need to add scope for esi-universe.read_structures.v1');
+            }
+        }
+
+        //Get the refresh token if scope checks have passed
+        $refreshToken = $esiHelper->GetRefreshToken(auth()->user()->getId());
+        
+        //Setup the esi container
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        //Get the character data from the lookup table if possible or esi
+        $character = $lookup->GetCharacterInfo(auth()->user()->getId());
+
+        //Try to get the mining observers for the corporation from esi
+        try {
+            $responses = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+                'corporation_id' => $character->corporation_id,
+            ]);
+        } catch(RequestFailedException $e) {
+            //If an exception has occurred for some reason redirect back to the dashboard with an error message
+            return redirect('/dashboard')->with('error', 'Failed to get mining structures.');
+        }
+
+        //For each mining observer, let's build the array of data to show on the page
+        foreach($responses as $response) {
+            //Try to get the structure information from esi
+            try {
+                $structureInfo = $esi->invoke('get', '/universe/structures/{structure_id}/', [
+                    'structure_id' => $response->observer_id,
+                ]);
+            } catch(RequestFailedException $e) {
+                //If an exception has occurred, then do nothing
+            }
+
+            //We don't really care about the key, but it is better than just 0 through whatever number
+            $structures[$response->observer_id] = $structureInfo->name;
+        }
+
+        //For each of the structures we want to address it by it's key value pair.
+        //This will allow us to do some interesting things in the display.
+        foreach($structures as $key => $value) {
+            try {
+                $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                    'corporation_id' => $character->corporation_id,
+                    'observer_id' => $key,
+                ]);
+            } catch(RequestFailedException $e) {
+                $ledgers = null;
+            }
+
+            if($ledgers != null) {
+                foreach($ledgers as $ledger) {
+                    //Declare a variable that will need to be cleared each time the foreach processes
+                    $tempArray = array();
+
+                    //Get the character information from the character id
+                    $charInfo = $lookup->GetCharacterInfo($ledger->character_id);
+                    //Get the corp ticker
+                    $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
+                    //Get the ore name from the type id
+                    $ore = $lookup->ItemIdToName($ledger->type_id);
+
+                    //We only want to push the mining ledger entry into the array if it matches
+                    //the date within 30 days
+                    $sortTime = Carbon::now()->subDays(30);
+                    $current = Carbon::createFromFormat('Y-m-d', $ledger->last_updated);
+                    if($current->greaterThanOrEqualTo($sortTime)) {
+                        array_push($miningLedgers, [
+                            'structure' => $value,
+                            'character' => $charInfo->name,
+                            'corpTicker' => $corpInfo->ticker,
+                            'ore' => $ore,
+                            'quantity' => $ledger->quantity,
+                            'updated' => $ledger->last_updated,
+                        ]);
+                    }
+                }
+            }
+        }
+        
+        return view('moons.ledger.displayledger')->with('miningLedgers', $miningLedgers)
+                                             ->with('structures', $structures);
+    }
+
+    public function displayRentalMoonLedger() {
+        //Declare variables
+        $structures = array();
+        $miningLedgers = array();
+        $tempMiningLedger = array();
+        $tempMining = array();
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $response = null;
+        $structureInfo = null;
+
+        //Get the configuration for the main site
+        $config = config('esi');
+
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
+            return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the ESI for the holding corp.');
+        } else {
+            if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-universe.read_structures.v1')) {
+                return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the ESI for the holding corp.');
+            }
+        }
+
+        //Get the refresh token if scope checks have passed
+        $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+        
+        //Setup the esi container
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        //Get the character data from the lookup table if possible or esi
+        $character = $lookup->GetCharacterInfo($config['primary']);
+
+        //Try to get the mining observers for the corporation from esi
+        try {
+            $responses = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+                'corporation_id' => $character->corporation_id,
+            ]);
+        } catch(RequestFailedException $e) {
+            //If an exception has occurred for some reason redirect back to the dashboard with an error message
+            return redirect('/dashboard')->with('error', 'Failed to get mining structures.');
+        }
+
+        //For each mining observer, let's build the array of data to show on the page
+        foreach($responses as $response) {
+            //Try to get the structure information from esi
+            try {
+                $structureInfo = $esi->invoke('get', '/universe/structures/{structure_id}/', [
+                    'structure_id' => $response->observer_id,
+                ]);
+            } catch(RequestFailedException $e) {
+                //If an exception has occurred, then do nothing
+            }
+
+            //We don't really care about the key, but it is better than just 0 through whatever number
+            $structures[$response->observer_id] = $structureInfo->name;
+        }
+
+        //For each of the structures we want to address it by it's key value pair.
+        //This will allow us to do some interesting things in the display.
+        foreach($structures as $key => $value) {
+            try {
+                $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                    'corporation_id' => $character->corporation_id,
+                    'observer_id' => $key,
+                ]);
+            } catch(RequestFailedException $e) {
+                $ledgers = null;
+            }
+
+            if($ledgers != null) {
+                foreach($ledgers as $ledger) {
+                    //Declare a variable that will need to be cleared each time the foreach processes
+                    $tempArray = array();
+
+                    //Get the character information from the character id
+                    $charInfo = $lookup->GetCharacterInfo($ledger->character_id);
+                    //Get the corp ticker
+                    $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
+                    //Get the ore name from the type id
+                    $ore = $lookup->ItemIdToName($ledger->type_id);
+
+                    //We only want to push the mining ledger entry into the array if it matches
+                    //the date within 30 days
+                    $sortTime = Carbon::now()->subDays(30);
+                    $current = Carbon::createFromFormat('Y-m-d', $ledger->last_updated);
+                    if($current->greaterThanOrEqualTo($sortTime)) {
+                        array_push($miningLedgers, [
+                            'structure' => $value,
+                            'character' => $charInfo->name,
+                            'corpTicker' => $corpInfo->ticker,
+                            'ore' => $ore,
+                            'quantity' => $ledger->quantity,
+                            'updated' => $ledger->last_updated,
+                        ]);
+                    }
+                }
+            }
+        }
+        
+        return view('moons.ledger.rentalledger')->with('miningLedgers', $miningLedgers)
+                                                ->with('structures', $structures);
+    }
+}

app/Http/Controllers/Moons/MoonsAdminController.php

@@ -6,415 +6,497 @@ namespace App\Http\Controllers\Moons;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Auth;
-use DB;
 use Carbon\Carbon;
+use Log;
 
 //Models
 use App\Models\Moon\Config;
 use App\Models\Moon\ItemComposition;
-use App\Models\Moon\Moon;
+use App\Models\Moon\RentalMoon;
 use App\Models\Moon\OrePrice;
 use App\Models\Moon\Price;
-use App\Models\MoonRent\MoonRental;
+use App\Models\Moon\AllianceMoon;
+use App\Models\MoonRentals\AllianceRentalMoon;
+use App\Models\Moon\AllianceMoonRequest;
 
 //Library
 use App\Library\Moons\MoonCalc;
 use App\Library\Esi\Esi;
 use App\Library\Lookups\LookupHelper;
 
+//Jobs
+use App\Jobs\ProcessSendEveMailJob;
+
 class MoonsAdminController extends Controller
 {
+    /**
+     * Constructor for the class
+     */
     public function __construct() {
         $this->middleware('auth');
         $this->middleware('role:Admin');
     }
 
-    public function showJournalEntries() {
-        $dateInit = Carbon::now();
-        $date = $dateInit->subDays(30);
+    /**
+     * Function to display moon requests
+     */
+    public function displayMoonRequests() {
+        $requests = AllianceMoonRequest::where([
+            'status' => 'Pending',
+        ])->get();
 
-        $journal = DB::select('SELECT amount,reason,description,date FROM `player_donation_journal` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC');
-        
-        return view('moons.admin.moonjournal')->with('journal', $journal);
+        return view('moons.admin.moonrequest')->with('requests', $requests);
     }
 
+    /**
+     * Function to approve a moon request
+     */
+    public function storeApprovedMoonRequest(Request $request) {
+        //Validate the input request
+        $this->validate($request, [
+            'id' => 'required',
+            'status' => 'required',
+            'system' => 'required',
+            'planet' => 'required',
+            'moon' => 'required',
+        ]);
+
+        
+        //Get the request data which holds all of the information for the request user
+        $moon = AllianceMoonRequest::where([
+            'id' => $request->id,
+        ])->first();
+
+        //Get the configuration data to use later in the function
+        $config = config('esi');
+
+        //If the request is approved, then update everything.
+        if($request->status == 'Approved') {
+            //Update the alliance moon request to either approved or denied
+            AllianceMoonRequest::where([
+                'id' => $request->id,
+            ])->update([
+                'status' => $request->status,
+                'approver_name' => auth()->user()->getName(),
+                'approver_id' => auth()->user()->getId(),
+            ]);
+
+            //Update the alliance moon in the table to the correct status
+            AllianceMoon::where([
+                'System' => $request->system,
+                'Planet' => $request->planet,
+                'Moon' => $request->moon,
+            ])->update([
+                'Corporation' => $moon->corporation_ticker,
+                'Availability' => 'Deployed',
+            ]);
+
+            //Send an eve mail to the requestor stating they can set a moon up.
+            //Setup the mail body
+            $body = 'The moon request for ' . $request->system . ' - ' . $request->planet . ' - ' . $request->moon . ' has changed status.<br>';
+            $body .= 'The request has been ' . $request->status . '.<br>';
+            $body .= 'Please contact the FC Team should it be necessary to arrange a fleet to cover the structure drop.<br>';
+            $body .= 'Sincerely,<br>';
+            $body .= 'Warped Intentions Leadership<br>';
+
+            
+        } else {
+            //If the status was Denied, then update the request, and mark the moon available again.
+            AllianceMoonRequest::where([
+                'id' => $request->id,
+            ])->update([
+                'status' => $request->status,
+                'approver_name' => auth()->user()->getName(),
+                'approver_id' => auth()->user()->getId(),
+            ]);
+
+            //Update the alliance moon in the table to the correct status
+            AllianceMoon::where([
+                'System' => (string)$request->system,
+                'Planet' => (string)$request->planet,
+                'Moon' => (string)$request->moon,
+            ])->update([
+                'Availability' => 'Available',
+            ]);
+
+            //Send an eve mail to the requestor stating they can set a moon up.
+            //Setup the mail body
+            $body = 'The moon request for ' . $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon . ' has changed status.<br>';
+            $body .= 'The request has been ' . $request->status . '.<br>';
+            $body .= 'Should you have questions please contact alliance leadership for further clarification.<br>';
+            $body .= 'Sincerely,<br>';
+            $body .= 'Warped Intentions Leadership<br>';
+            
+        }
+
+        //Setup the mail model
+        ProcessSendEveMailJob::dispatch($body, (int)$moon->requestor_id, 'character', 'Warped Intentions Moon Request', $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
+
+        return redirect('/moons/admin/display/request')->with('success', 'Moon has been processed, and mail has been sent out.');
+    }
+
+    /**
+     * Function to display the ability for the admins to update moons with who is renting,
+     * and when it ends
+     */
     public function updateMoon() {
-        //Return the view and the form from the blade display
-        return view('moons.admin.updatemoon');
+        $this->middleware('role:Admin');
+
+        //Declare the variables we need
+        $system = null;
+        $planet = null;
+        $moon = null;
+        $name = null;
+        $spmnTemp = array();
+        $spmn = array();
+
+        //Get the moons and put in order by System, Planet, Moon number
+        $moons = AllianceRentalMoon::orderBy('System', 'ASC')
+                                   ->orderBy('Planet', 'ASC')
+                                   ->orderBy('Moon', 'ASC')
+                                   ->get();
+
+        //Push our default value onto the stack
+        array_push($spmn, 'N/A');
+
+        //Form our array of strings for each system, planet, and moon combination
+        foreach($moons as $m) {
+            $temp = $m->system . " - " . $m->planet . " - " . $m->moon . " - " . $m->structure_name;
+            array_push($spmnTemp, $temp);
         }
 
-    public function storeUpdateMoonRental(Request $request) {
-        $moonCalc = new MoonCalc;
-        $lookup = new LookupHelper;
+        //From the temporary array, build the final array
+        foreach($spmnTemp as $key => $value) {
+            $spmn[$value] = $value;
+        }
 
+        //Pass the data to the blade display
+        return view('moons.admin.updatemoon')->with('spmn', $spmn);
+    }
+
+    /**
+     * Function to remove a renter from a moon
+     * New function based on new table.  Will
+     * update description in a future update.
+     */
+    public function storeMoonRemoval(Request $request) {
+        //Check for the correct role for the user to utilize this function
+        $this->middleware('role:Admin');
+
+        //Validate the request
         $this->validate($request, [
-            'system' => 'required',
-            'planet' => 'required',
-            'moon' => 'required',
-            'renter' => 'required',
-            'date' => 'required',
-            'contact' => 'required',
+            'remove' => 'required',
         ]);
 
-        //Take the  contact name and create a character_id from it
-        if($request->contact == 'None') {
-            $contact = 'None';
-        } else {
-            $contact = $lookup->CharacterNameToId($request->contact);
-        }
+        //Explode the remove request to an array of strings
+        $str_array = explode(" - ", $request->remove);
 
-        if(isset($request->Paid_Until)) {
-            $paidUntil = $request->Paid_Until;
-        } else {
-            $paidUntil = null;
-        }
+        //Decode the value for the SPM into a system, planet, and moon
+        $system = $str_array[0];
+        $planet = $str_array[1];
+        $moon = $str_array[2];
 
-        //Let's find the corporation and alliance information to ascertain whethery they are in Warped Intentions or another Legacy Alliance
-        $allianceId = $lookup->LookupCorporation($lookup->LookupCharacter($contact));
-
-        //Create the date
-        $date = new Carbon($request->date . '00:00:01');
-
-        $found = MoonRental::where([
-            'System' => $request->system,
-            'Planet' => $request->planet,
-            'Moon' => $request->moon,
-            'Contact' => $contact,
-        ])->first();
-
-        //If the entry is found, we are most likely just updating an entry to include new paid until data
-        if($found) {
-            if($allianceId = 99004116) {
-                MoonRental::where([
-                    'System' => $request->system,
-                    'Planet' => $request->planet,
-                    'Moon' => $request->moon,
-                    'Contact' => $contact,
+        //Update the moon rental
+        AllianceRentalMoon::where([
+            'system' => $system,
+            'planet' => $planet,
+            'moon' => $moon,
         ])->update([
-                    'System' => $request->system,
-                    'Planet' => $request->planet,
-                    'Moon' => $request->moon,
-                    'RentalCorp' => $request->renter,
-                    'RentalEnd' => $date,
-                    'Contact' => $contact,
-                    'Price' => $price['alliance'],
-                    'Type' => 'alliance',
-                    'Paid' => $paid,
-                    'Paid_Until' => $request->paid_until,
-                ]);
-            } else {
-                MoonRental::where([
-                    'System' => $request->system,
-                    'Planet' => $request->planet,
-                    'Moon' => $request->moon,
-                    'Contact' => $contact,
-                ])->update([
-                    'System' => $request->system,
-                    'Planet' => $request->planet,
-                    'Moon' => $request->moon,
-                    'RentalCorp' => $request->renter,
-                    'RentalEnd' => $date,
-                    'Contact' => $contact,
-                    'Price' => $price['outofalliance'],
-                    'Type' => 'alliance',
-                    'Paid' => $paid,
-                    'Paid_Until' => $request->paid_until,
-                ]);
-            }
-        } else {
-            //If the entry is not found, then attempt to delete whatever existing data is there, then 
-            //insert the new data
-            MoonRental::where([
-                'System' => $request->system,
-                'Planet' => $request->planet,
-                'Moon' => $request->moon,
-            ])->delete();
-            
-            if($allianceId = 99004116) {
-                MoonRental::insert([
-                    'System' => $request->system,
-                    'Planet' => $request->planet,
-                    'Moon' => $request->moon,
-                    'RentalCorp' => $request->renter,
-                    'RentalEnd' => $date,
-                    'Contact' => $contact,
-                    'Price' => $price['alliance'],
-                    'Type' => 'alliance',
-                    'Paid' => 'No',
-                ]);
-            } else {
-                MoonRental::insert([
-                    'System' =>$request->system,
-                    'Planet' => $request->planet,
-                    'Moon' => $request->moon,
-                    'RentalCorp' => $request->renter,
-                    'RentalEnd' => $date,
-                    'Contact' => $contact,
-                    'Price' => $price['outofalliance'],
-                    'Type' => 'outofalliance',
-                    'Paid' => 'No',
-                ]);
-            }
-        }
-
-        //Redirect to the update moon page
-        return redirect('/moons/admin/updatemoon')->with('success', 'Moon Updated');
-    }
-
-    public function storeUpdateMoon(Request $request) {
-        $moonCalc = new MoonCalc();
-        $lookup = new LookupHelper();
-
-        $this->validate($request, [
-            'system' => 'required',
-            'planet' => 'required',
-            'moon' => 'required',
-            'renter' => 'required',
-            'date' => 'required',
-            'contact' => 'required',
-            'paid' => 'required',
+            'rental_type' => 'Not Rented',
+            'rental_until' => null,
+            'rental_contact_id' => 0,
+            'rental_contact_type' => 'Not Rented',
+            'paid' => 'Not Rented',
+            'paid_until' => null,
+            'alliance_use_until' => null,
         ]);
 
-        //Take the contact name and create a character id from it
-        if($request->contact == 'None') {
-            $contact = 'None';
-        } else {
-            $contact = $lookup->CharacterNameToId($request->contact);
-        }
-        //Let's find the corporation and alliance information to ascertain whether they are in Warped Intentions or another Legacy Alliance
-        $corpId = $lookup->LookupCharacter($contact);
-        $allianceId = $lookup->LookupCorporation($corpId);
-
-        //Create the date
-        $date = new Carbon($request->date . '00:00:01');
-        //Calculate the moon price
-        $moon = Moon::where([
-            'System' => $request->system,
-            'Planet' => $request->planet,
-            'Moon' => $request->moon,
-        ])->first();
-        $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, 
-                                                $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
-        
-        $date = new Carbon($request->date . '00:00:01');
-        //Update the database entry
-        Moon::where([
-            'System' => $request->system,
-            'Planet' => $request->planet,
-            'Moon' => $request->moon,
-        ])->update([
-            'RentalCorp' => $request->renter,
-            'RentalEnd' => $date,
-        ]);
-
-        //Going to store moon price in a table for future reference
-        //We need to insert a price based on whether part of Legacy or part of Warped Intentions
-        //Will need an if then else statement to complete this operation
-        if($allianceId = 99004116) {
-            MoonRental::insert([
-                'System' => $request->system,
-                'Planet' => $request->planet,
-                'Moon' => $request->moon,
-                'RentalCorp' => $request->renter,
-                'RentalEnd' => $date,
-                'Contact' => $contact,
-                'Price' => $price['alliance'],
-                'Type' => 'alliance',
-                'Paid' => $request->paid,
-            ]);
-        } else {
-            MoonRental::insert([
-                'System' =>$request->system,
-                'Planet' => $request->planet,
-                'Moon' => $request->moon,
-                'RentalCorp' => $request->renter,
-                'RentalEnd' => $date,
-                'Contact' => $contact,
-                'Price' => $price['outofalliance'],
-                'Type' => 'outofalliance',
-                'Paid' => $request->paid,
-            ]);
-        }
-        
-        return redirect('/moons/admin/updatemoon')->with('success', 'Moon Updated');
+        //Once the action is completed, redirect to the original page
+        return redirect('/moons/admin/display/rentals')->with('success', 'Renter removed from the moon.');
     }
 
     /**
      * Function to display the moons to admins
+     * New function based on new table.  Will
+     * update description in a future update.
      */
-    public function displayMoonsAdmin() {
-        $lookup = new LookupHelper;
-        $contact = '';
-        $paid = '';
-        $rentalEnd = '';
-        $renter = '';
-        $ticker = '';
-
-        //Setup calls to the MoonCalc class
-        $moonCalc = new MoonCalc();
-        //Update the prices for the moon
-        $moonCalc->FetchNewPrices();
-        //get all of the moons from the database
-        $moons = Moon::orderBy('System', 'asc')->get();
-        //declare the html variable and set it to null
+    public function displayRentalMoonsAdmin() {
+        //Declare variables for the function
+        $lookupHelper = new LookupHelper;
+        $moonCalc = new MoonCalc;
+        $contactId = null;
+        $contactType = null;
+        $paid = null;
+        $paidUntil = null;
+        $corpTicker = null;
         $table = array();
-        foreach($moons as $moon) {
-            //Get the rental data for the moon
-            $rental = MoonRental::where([
-                'System' => $moon->System,
-                'Planet' => $moon->Planet,
-                'Moon' => $moon->Moon,
-            ])->first();
+        //Setup the carbon date using Carbon\Carbon
+        $lastMonth = Carbon::now()->subMonth();
+        $today = Carbon::now();
 
-            //Check if their is a current rental for a moon going on
-            if($rental == false) {
-                //If we don't find a rental record, mark the moon as not paid
-                $paid = 'No';
+        //Get the moon rentals from the database
+        $rentalMoons = AllianceRentalMoon::orderBy('system', 'asc')->get();
 
-                //If we don't find a rental record, set the rental date as last month
-                $rentalTemp = Carbon::now()->subMonth();
-                $rentalEnd = $rentalTemp->format('m-d');
+        //For each of the moons compile different data for the view for formatting
+        foreach($rentalMoons as $moon) {
 
-                //Set the contact info
-                $contact = 'None';
-
-                //Set the renter info
-                $renter = 'None';
-
-                $ticker = 'N/A';
-            } else {
-                //If we find a rental record, mark the moon as whether it's paid or not
-                $paid = $rental->Paid;
+            //Check if a current rental for the moon is on going
+            if(($moon->rental_type == 'In Alliance' || $moon->rental_type == 'Out of Alliance')) {
+                $paid = $moon->paid;
+                $paidUntil = new Carbon($moon->paid_until);
+                $paidUntil = $paidUntil->format('m-d');
 
                 //Set the rental date up
-                $rentalTemp = new Carbon($rental->RentalEnd);
+                $rentalTemp = new Carbon($moon->rental_until);
                 $rentalEnd = $rentalTemp->format('m-d');
 
-                //Set the contact name
-                $contact = $lookup->CharacterName($rental->Contact);
-                
-                //Set up the renter whether it's W4RP or another corporation
-                $corpId = $lookup->LookupCorporationId($rental->Contact);
-                $allianceId = $lookup->LookupCorporation($corpId);
-                $ticker = $lookup->LookupAllianceTicker($allianceId);
-            }
-
-            //Set the color for the table
-            $today = Carbon::now();
-            if($rentalTemp->diffInDays($today) < 3 ) {
+                //Set the correct color for the table
+                if($rentalTemp->diffInDays(Carbon::now()) < 3 && $today->lessThan($rentalTemp)) {
                     $color = 'table-warning';
-            } else if( $today > $rentalTemp) {
-                $color = 'table-primary';
-            } else {
+                } else if($today->lessThan($rentalTemp)) {
                     $color = 'table-danger';
+                } else {
+                    $color = 'table-primary';
                 }
 
-            //Calculate hte price of the moon based on what is in the moon
-            $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
+                //Set the contact name based on the contact type
+                if($moon->rental_contact_type == 'Alliance') {
+                    $allianceInfo = $lookupHelper->GetAllianceInfo($moon->rental_contact_id);
+                    //Set the contact name and ticker
+                    $contact = $allianceInfo->name;
+                    $ticker = $allianceInfo->ticker;
+
+                } else if($moon->rental_contact_type == 'Corporation') {
+                    $corporationInfo = $lookupHelper->GetCorporationInfo($moon->rental_contact_id);
+                    //Set the contact name and ticker
+                    $contact = $corporationInfo->name;
+                    $ticker = $corporationInfo->ticker;
+
+                } else if($moon->rental_contact_type == 'Character') {
+                    $characterInfo = $lookupHelper->GetCharacterInfo($moon->rental_contact_id);
+                    //Set the contact name
+                    $contact = $characterInfo->name;
+                    //Get the ticker for the character from the corporation he belongs to
+                    $corpInfo = $lookupHelper->GetCorporationInfo($characterInfo->corporation_id);
+                    $ticker = $corpInfo->ticker;
+
+                } else {
+                    $contact = 'N/A';
+                    $ticker = 'N/A';
+                    $type = 'N/A';
+                    $color = 'table-primary';
+                }
+                
+            //Check if the moon is currently being utilized by the alliance
+            } else if($moon->rental_type == 'Alliance') {
+                //If the moon is in use by the alliance then the moon isn't paid for
+                $paid = 'No';
+
+                //Setup the rental end time as the end of the month
+                $rentalTemp = Carbon::now()->endOfMonth();
+                $rentalEnd = $rentalTemp->format('m-d');
+                //Set the color of the table
+                $color = 'table-info';
+
+                //Setup the paid time as the same as the rental end
+                $paidUntiltemp = $rentalTemp;
+                $paidUntil = $rentalEnd;
+
+                //Set the other information for the spreadsheet
+                $contact = 'Spatial Forces';
+                $renter = 'SP3C';
+                $ticker = 'SP3C';
+                $type = 'Alliance';
+
+            //The last case is the moon is not utilized by the Alliance or is not being rented
+            } else {
+                //If the moon is not being rented, or being utilized by the alliance then set paid to No
+                $paid = 'No';
+
+                //Setup the rental time to end as last month to show it's free
+                $rentalTemp = $lastMonth;
+                $rentalEnd = $rentalTemp->format('m-d');
+
+                //Setup the paid until as last month to show it's free
+                $paidUntilTemp = $lastMonth;
+                $paidUntil = $lastMonth->format('m-d');
+
+                //Setup the other variables with the correct information
+                $contact = 'None';
+                $renter = 'None';
+                $ticker = 'N/A';
+                $type = 'N/A';
+
+                //Set the color of the table
+                $color = 'table-primary';
+            }
+
+            //Set up the moon rental type
+            if($moon->rental_type == 'In Alliance') {
+                $type = 'IA';
+                //Setup the row color
+                if($rentalTemp->diffInDays(Carbon::now()) < 3 && $today->lessThan($rentalTemp)) {
+                    $color = 'table-warning';
+                } else if($today->lessThan($rentalTemp)) {
+                    $color = 'table-danger';
+                } else {
+                    $color = 'table-primary';
+                }
+            } else if($moon->rental_type == 'Out of Alliance') {
+                $type = 'OOA';
+                //Setup the row color
+                if($rentalTemp->diffInDays(Carbon::now()) < 3 && $today->lessThan($rentalTemp)) {
+                    $color = 'table-warning';
+                } else if($today->lessThan($rentalTemp)) {
+                    $color = 'table-danger';
+                } else {
+                    $color = 'table-primary';
+                }
+            } else if($moon->rental_type == 'Alliance') {
+                $type = 'W4RP';
+                //Set the row color
+                $color = 'table-info';
+            } else {
+                $type = 'N/A';
+                //Set the row color
+                $color = 'table-primary';
+            }
 
             //Add the data to the html string to be passed to the view
             array_push($table, [
-                'SPM' => $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon,
-                'StructureName' => $moon->StructureName,
-                'AlliancePrice' => $price['alliance'],
-                'OutOfAlliancePrice' => $price['outofalliance'],
+                'SPM' => $moon->system . " - " . $moon->planet . " - " . $moon->moon,
+                'StructureName' => $moon->structure_name,
+                'AlliancePrice' => $moon->alliance_rental_price,
+                'OutOfAlliancePrice' => $moon->out_of_alliance_rental_price,
                 'RentalEnd' => $rentalEnd,
                 'RowColor' => $color,
-                'Paid' => $paid,
+                'Paid' => $moon->paid,
+                'PaidUntil' => $paidUntil,
                 'Contact' => $contact,
-                'Renter' => $ticker,
+                'Type' => $moon->rental_type,
+                'Renter' => $type,
             ]);
         }
 
         return view('moons.admin.adminmoon')->with('table', $table);
     }
 
-    public function UpdateMoonPaid(Request $request) {
+    /**
+     * Function to store the updates from the moons.
+     * New function based on new table.  Will update
+     * the description in a future update
+     */
+    public function storeUpdateMoon(Request $request) {
+        //Require the site administration role
+        $this->middleware('role:Admin');
+
+        //Declare some variables we will need
+        $moonCalc = new MoonCalc;
+        $lookup = new LookupHelper;
+        $paid = false;
+        $system = null;
+        $planet = null;
+        $mn = null;
+
+        //Validate our request from the html form
         $this->validate($request, [
-            'paid' => 'required',
+            'spmn' => 'required',
+            'contact' => 'required',
+            'contact_type' => 'required',
+            'paid_until' => 'required',
+            'rental_end' => 'required',
         ]);
 
-        $str_array = explode(" - ", $request->paid);
-
-        //Decode the value for the SPM into a system, planet, and moon for the database to update
+        //Decode the spmn
+        $str_array = explode(" - ", $request->spmn);
         $system = $str_array[0];
         $planet = $str_array[1];
-        $moon = $str_array[2];
+        $mn = $str_array[2];
+        $name = $str_array[3];
 
-        //Update the paid status of the moon
-        MoonRental::where([
-            'System' => $system,
-            'Planet' => $planet,
-            'Moon' => $moon,
+        //Update the paid value from the request value
+        if($request->paid == 'Yes') {
+            $paid = 'Yes';
+        } else {
+            $paid = 'No';
+        }
+
+        //Setup the rental end and paid until variables
+        $rentalEnd = $request->rental_end . " 23:59:59";
+        $paidUntil = $request->paid_until . " 23:59:59";
+
+        //Check if the alliance is renting the moon for itself
+        if($request->contact_type == 'Corporation' && $request->contact == 'Spatial Forces') {
+            AllianceRentalMoon::where([
+                'system' => $str_array[0],
+                'planet' => $str_array[1],
+                'moon' => $str_array[2],
             ])->update([
-            'Paid' => 'Yes',
+                'rental_type' => 'Alliance',
+                'rental_until' => $request->rental_end . " 23:59:59",
+                'rental_contact_id' => 98287666,
+                'rental_contact_type' => 'Alliance',
+                'paid' => 'No',
+                'paid_until' => null,
+                'alliance_use_until' => $request->rental_end . " 23:59:59",
+            ]);
+        } else if($request->contact_type == 'Character') {
+            //Get the character id from the lookup helper
+            $charId = $lookup->CharacterNameToId($request->contact);
+            //Get the character information including the corporation from the lookup tables
+            $char = $lookup->GetCharacterInfo($charId);
+            //Get the corporation id from the lookup helper, followed by the alliance id
+            //so we can determine if it's in alliance or out of alliance
+            $corp = $lookup->GetCorporationInfo($char->corporation_id);
+
+            if($corp->alliance_id == 99004116) {
+                $type = 'In Alliance';
+            } else {
+                $type = 'Out of Alliance';
+            }
+
+            AllianceRentalMoon::where([
+                'system' => $str_array[0],
+                'planet' => $str_array[1],
+                'moon' => $str_array[2],
+            ])->update([
+                'rental_type' => $type,
+                'rental_until' => $request->rental_end . " 23:59:59",
+                'rental_contact_id' => $charId,
+                'rental_contact_type' => 'Character',
+                'paid' => $paid,
+                'paid_until' => $request->paid_until . " 23:59:59",
+                'alliance_use_until' => null,                
             ]);
 
-        //Redirect back to the moon page, which should call the page to be displayed correctly
-        return redirect('/moons/admin/display');
+        } else if($request->contact_type == 'Corporation') {
+            //Get the corporation id from the lookup helper
+            $corpId = $lookup->CorporationNameToId($request->contact);
+            //Get the corporation information to determine if they are in Warped Intentions or not.
+            $corporation = $lookup->GetCorporationInfo($request->contact);
+
+            if($corp->alliance_id == 99004116) {
+                $type = 'In Alliance';
+            } else {
+                $type = 'Out of Alliance';
             }
 
-    /**
-     * Display function for adding a new rental moon to the pool
-     * 
-     */
-    public function addMoon() {
-        return view('moons.admin.addmoon');
-    }
-
-    /**
-     * Add a new moon into the database
-     * 
-     * @return \Illuminate\Http\Reponse
-     */
-    public function storeMoon(Request $request) {
-        $this->validate($request, [
-            'region' => 'required',
-            'system' => 'required',
-            'structure' => 'required',
+            AllianceMoonRental::where([
+                'system' => $str_array[0],
+                'planet' => $str_array[1],
+                'moon' => $str_array[2],
+            ])->update([
+                'rental_type' => $type,
+                'rental_until' => $request->rental_end . " 23:59:59",
+                'rental_contact_id' => $corpId,
+                'rental_contact_type' => 'Corporation',
+                'paid' => $paid,
+                'paid_until' => $request->paid_until . " 23:59:59",
+                'alliance_use_until' => null,
             ]);
-
-        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');
-        $moon->System = $request->input('system');
-        $moon->Planet = $request->input('planet');
-        $moon->Moon = $request->input('moon');
-        $moon->StructureName = $request->input('structure');
-        $moon->FirstOre = $request->input('firstore');
-        $moon->FirstQuantity = $request->input('firstquan');
-        $moon->SecondOre = $request->input('secondore');
-        $moon->SecondQuantity = $request->input('secondquan');
-        $moon->ThirdOre = $request->input('thirdore');
-        $moon->ThirdQuantity = $request->input('thirdquan');
-        $moon->FourthOre = $request->input('fourthore');
-        $moon->FourthQuantity = $request->input('fourthquan');
-        $moon->save();
-
-        return redirect('/dashboard')->with('success', 'Moon Added');
+        //Redirect to the previous screen.
+        return redirect('/moons/admin/updatemoon')->with('success', 'Moon Rental updated.');
     }
 }

app/Http/Controllers/Moons/MoonsController.php

@@ -12,13 +12,15 @@ use Carbon\Carbon;
 //Models
 use App\Models\Moon\Config;
 use App\Models\Moon\ItemComposition;
-use App\Models\Moon\Moon;
 use App\Models\Moon\OrePrice;
 use App\Models\Moon\Price;
-use App\Models\MoonRent\MoonRental;
+use App\Models\Moon\AllianceMoon;
+use App\Models\MoonRentals\AllianceRentalMoon;
+use App\Models\Moon\AllianceMoonRequest;
 
 //Library
 use App\Library\Moons\MoonCalc;
+use App\Library\Lookups\LookupHelper;
 
 class MoonsController extends Controller
 {
@@ -27,84 +29,272 @@ class MoonsController extends Controller
         $this->middleware('role:Renter');
     }
 
+    public function displayRentalMoonPage() {
+        return view('moons.user.requestrental');
+    }
+
     /**
-     * Function to display the moons and pass data to the blade template
+     * Function to display all alliance moons and pass data to the blade template
      */
     public function displayMoons() {
-        $rentalEnd = '';
+        //Setup variables for moons
+        $moons = array();
+        $systems = array();
 
-        //Get the user type from the user Auth class
-        $type = Auth::user()->user_type;
-        //Setup calls to the MoonCalc class
-        $moonCalc = new MoonCalc();
-        //Update the prices for the moon
-        $moonCalc->FetchNewPrices();
-        //get all of the moons from the database
-        $moons = DB::table('Moons')->orderBy('System', 'asc')->get();
-        //declare the html variable and set it to null
+        //Get all of the alliance moon systems from the database
+        $systems = AllianceMoon::groupBy('System')->pluck('System');
 
+        //Get all of the alliance moons from the database
+        $moons = AllianceMoon::all();
+
+        $gasGoo = [
+            'Zeolites',
+            'Sylvite',
+            'Bitumens',
+            'Coesite',
+        ];
+
+        $r8Goo = [
+            'Cobaltite',
+            'Euxenite',
+            'Titanite',
+            'Scheelite',
+        ];
+
+        $r16Goo = [
+            'Otavite',
+            'Sperrylite',
+            'Vanadinite',
+            'Chromite',
+        ];
+
+        $r32Goo = [
+            'Carnotite',
+            'Zircon',
+            'Pollucite',
+            'Cinnabar',
+        ];
+
+        $r64Goo = [
+            'Xenotime',
+            'Monazite',
+            'Loparite',
+            'Ytterbite',
+        ];
+
+        return view('moons.user.allmoons')->with('systems', $systems)
+                                          ->with('moons', $moons)
+                                          ->with('gasGoo', $gasGoo)
+                                          ->with('r8Goo', $r8Goo)
+                                          ->with('r16Goo', $r16Goo)
+                                          ->with('r32Goo', $r32Goo)
+                                          ->with('r64Goo', $r64Goo);
+    }
+
+    /**
+     * Function to display moon request form
+     */
+    public function displayRequestAllianceMoon() {
+        return view('moons.user.requestmoon');
+    }
+
+    /**
+     * Function to store the moon request
+     */
+    public function storeRequestAllianceMoon(Request $request) {
+        $this->validate($request, [
+            'system' => 'required',
+            'planet' => 'required',
+            'moon' => 'required',
+        ]);
+
+        //Declare some necessary arrays for figuring out what region a moon resides in
+        $catch = [
+            '6X7-JO',
+            'A803-L',
+            'I8-D0G',
+            'WQH-4K',
+            'GJ0-JO',
+            'Q-S7ZD',
+            'JWZ2-V',
+            'J-ODE7',
+            'OGL8-Q',
+            'R-K4QY',
+        ];
+
+        $immensea = [
+            'ZBP-TP',
+            'XVV-21',
+            'B9E-H6',
+            'JDAS-0',
+            'Y19P-1',
+            'LN-56V',
+            'O7-7UX',
+            'Y2-QUV',
+            'SPBS-6',
+            'A4B-V5',
+            'GXK-7F',
+            '78TS-Q',
+            'CJNF-J',
+            'EA-HSA',
+            'FYI-49',
+            'WYF8-8',
+            'NS2L-4',
+            'B-S347',
+            'AF0-V5',
+            'QI-S9W',
+            'B-A587',
+            'PPFB-U',
+            'L-5JCJ',
+            '4-GB14',
+            'REB-KR',
+            'QE-E1D',
+            'LK1K-5',
+            'Z-H2MA',
+            'B-KDOZ',
+            'E8-YS9',
+        ];
+
+        //Declare lookup variables
+        $lookup = new LookupHelper;
+
+        //Get all of the information needed to create the database entry
+        $charId = auth()->user()->getId();
+        $charInfo = $lookup->GetCharacterInfo($charId);
+        $charName = $charInfo->name;
+        $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
+        $corpId = $corpInfo->corporation_id;
+        $corpName = $corpInfo->name;
+        $corpTicker = $corpInfo->ticker;
+        //Declare the region variable as null for the lookup if statement
+        $region = null;
+
+        //Get the region the moon resides in from the system
+        if(in_array($request->system, $catch, true)) {
+            $region = 'Catch';
+        } else if(in_array($request->system, $immensea, true)) {
+            $region = 'Immensea';
+        } else {
+            //False value. Redirect back to page
+            return redirct('/moons/display/request')->with('error', 'Region was not found.');
+        }
+
+        //Check to see if the moon has been previously inputted for
+        $allMoons = AllianceMoon::all();
+        foreach($allMoons as $moon) {
+            if($moon->Region == $region && $moon->System == $request->system && $moon->Planet == $request->planet && $moon->Moon == $request->moon) {
+                if($moon->Availability != 'Available') {
+                    return redirect('moons/display/request')->with('error', 'The moon has already been reserved by another party.');
+                }
+
+                break;
+            }
+        }
+
+        //Create the new object to save into the database
+        $moonRequest = new AllianceMoonRequest;
+        $moonRequest->region = $region;
+        $moonRequest->system = $request->system;
+        $moonRequest->planet = $request->planet;
+        $moonRequest->moon = $request->moon;
+        $moonRequest->corporation_id = $corpId;
+        $moonRequest->corporation_name = $corpName;
+        $moonRequest->corporation_ticker = $corpTicker;
+        $moonRequest->requestor_name = $charName;
+        $moonRequest->requestor_id = $charId;
+        $moonRequest->status = 'Pending';
+        $moonRequest->save();
+
+        //Update the current moon's status in the model AllianceMoon
+        AllianceMoon::where([
+            'Region' => $region,
+            'System' => $request->system,
+            'Planet' => $request->planet,
+            'Moon' => $request->moon,
+        ])->update([
+            'Availability' => 'Request Pending',
+        ]);
+
+        return redirect('/moons/display/request')->with('success', 'Moon request submitted.');
+    }
+
+    /**
+     * Function to display the moons and pass to the blade template
+     * Function description will be updated in a future release.
+     */
+    public function displayRentalMoons() {
+        //Declare variables
+        $lastMonth = Carbon::now()->subMonth();
+        $today = Carbon::now();
         $table = array();
         $moonprice = null;
+
+        //Get the user type from the user Auth class
+        $type = auth()->user()->getUserType();
+        //Get all of the rental moons from the database
+        $moons = AllianceRentalMoon::orderBy('system', 'ASC')
+                                   ->orderBy('planet', 'ASC')
+                                   ->orderBy('moon', 'ASC')
+                                   ->get();
+        
+        //For each of the moons let's format the data for the display table
         foreach($moons as $moon) {
-            //get the rental data for the moon
-            $rental = MoonRental::where([
-                'System' => $moon->System,
-                'Planet' => $moon->Planet,
-                'Moon' => $moon->Moon,
-            ])->first();
+            $color = null;
+            $rentalTemp = null;
+            $rentalEnd = null;
 
-            if($rental == false) {
-                //If we don't find a rental record, set the rental date as last month
-                $rentalTemp = Carbon::now()->subMonth();
+            //Check if someone is currently renting the moon
+            if($moon->rental_type == 'In Alliance' || $moon->rental_type == 'Out of Alliance') {
+                $rentalTemp = new Carbon($moon->rental_until);
                 $rentalEnd = $rentalTemp->format('m-d');
-            } else {
-                //Set the rental date up
-                $rentalTemp = new Carbon($rental->RentalEnd);
-                $rentalEnd = $rentalTemp->format('m-d');
-            }
 
-            //mark today's date in carbon format
-            $today = Carbon::now();
-
-            $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, 
-                                                    $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
-
-            $worth = $moonCalc->SpatialMoonsTotalWorth($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, 
-                                                       $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
-
-            if($type == 'W4RP') {
-                $moonprice = $price['alliance'];
-            } else {
-                $moonprice = $price['outofalliance'];
-            }
-
-            if($rentalTemp->diffInDays($today) < 3 ) {
+                //Setup the correct color for the table
+                if($rentalTemp->diffInDays(Carbon::now()) < 3 && $today->lessThan($rentalTemp)) {
                     $color = 'table-warning';
-            } else if( $today > $rentalTemp) {
-                $color = 'table-primary';
-            } else {
+                } else if($today->lessThan($rentalTemp)) {
                     $color = 'table-danger';
+                } else {
+                    $color = 'table-primary';
+                }
+            } else if($moon->rental_type == 'Alliance') {
+                $rentalTemp = Carbon::now()->endOfMonth();
+                $rentalEnd = $rentalTemp->format('m-d');
+                $color = 'table-info';
+            } else {
+                //Set the rental date for if someone is not renting the moon
+                $rentalTemp = $lastMonth;
+                $rentalEnd = $rentalTemp->format('m-d');
+                $color = 'table-primary';
             }
 
-            //Add the data to the html string to be passed to the view
+            //Get the price of the moon from the database based on if the person is in Warped Intentions
+            $userType = auth()->user()->getUserType();
+            if($userType == 'W4RP') {
+                $moonprice = $moon->alliance_rental_price;
+            } else {
+                $moonprice = $moon->out_of_alliance_rental_price;
+            }
+
+            //Add the data to the html array to be passed to the view
             array_push($table, [
-                'SPM' => $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon,
-                'StructureName' => $moon->StructureName,
-                'FirstOre' => $moon->FirstOre,
-                'FirstQuantity' => $moon->FirstQuantity,
-                'SecondOre' => $moon->SecondOre,
-                'SecondQuantity' => $moon->SecondQuantity,
-                'ThirdOre' => $moon->ThirdOre,
-                'ThirdQuantity' => $moon->ThirdQuantity,
-                'FourthOre' => $moon->FourthOre,
-                'FourthQuantity' => $moon->FourthQuantity,
-                'Price' => $moonprice,
-                'Worth' => number_format($worth, "2", ".", ","),
+                'SPM' => $moon->system . " - " . $moon->planet . " - " . $moon->moon,
+                'StructureName' => $moon->structure_name,
+                'FirstOre' => $moon->first_ore,
+                'FirstQuantity' => number_format($moon->first_quantity, 0, ".", ","),
+                'SecondOre' => $moon->second_ore,
+                'SecondQuantity' => number_format($moon->second_quantity, 0, ".", ","),
+                'ThirdOre' => $moon->third_ore,
+                'ThirdQuantity' => number_format($moon->third_quantity, 0, ".", ","),
+                'FourthOre' => $moon->fourth_ore,
+                'FourthQuantity' => number_format($moon->fourth_quantity, 0, ".", ","),
+                'Price' => number_format($moonprice, 0, ".", ","),
+                'Worth' => number_format($moon->moon_worth, 0, ".", ","),
                 'RentalEnd' => $rentalEnd,
                 'RowColor' => $color,
             ]);
         }
 
+        //Pass the data to the view
         return view('moons.user.moon')->with('table', $table);
     }
 
@@ -113,28 +303,252 @@ class MoonsController extends Controller
     }
 
     public function displayTotalWorth(Request $request) {
-        $firstOre = $request->firstOre;
-        $firstQuantity = $request->firstQuantity;
-        $secondOre = $request->secondOre;
-        $secondQuantity = $request->secondQuantity;
-        $thirdOre = $request->thirdOre;
-        $thirdQuantity = $request->thirdQuantity;
-        $fourthOre = $request->fourthOre;
-        $fourthQuantity = $request->fourthQuantity;
-
         //Setup calls to the MoonCalc class
         $moonCalc = new MoonCalc();
-        //Update the prices for the moon
-        $moonCalc->FetchNewPrices();
+        $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);
+        $composition = [
+            'Tritanium' => 0,
+            'Pyerite' => 0,
+            'Mexallon' => 0,
+            'Isogen' => 0,
+            'Nocxium' => 0,
+            'Zydrine' => 0,
+            'Megacyte' => 0,
+            'Atmospheric_Gases' => 0,
+            'Evaporite_Deposits' => 0,
+            'Hydrocarbons' => 0,
+            'Silicates' => 0,
+            'Cobalt' => 0,
+            'Scandium' => 0,
+            'Titanium' => 0,
+            'Tungsten' => 0,
+            'Cadmium' => 0,
+            'Platinum' => 0,
+            'Vanadium'=> 0,
+            'Chromium' => 0,
+            'Technetium' => 0,
+            'Hafnium' => 0,
+            'Caesium' => 0,
+            'Mercury' => 0,
+            'Dysprosium' => 0,
+            'Neodymium' => 0,
+            'Promethium' => 0,
+            'Thulium' => 0,
+        ];
 
-        $totalGoo = $moonCalc->SpatialMoonsOnlyGooTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity,
-                                                             $thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity);
-        $totalGoo = number_format($totalGoo, 2, ".", ",");
+        $firstOre = $request->firstOre;
+        if($request->firstQuantity >= 1.00) {
+            $firstQuantity = $request->firstQuantity / 100.00;
+        } else {
+            $firstQuantity = $request->firstQuantity;
+        }
         
+        $secondOre = $request->secondOre;
+        if($request->secondQuantity >= 1.00) {
+            $secondQuantity = $request->secondQuantity / 100.00;
+        } else {
+            $secondQuantity = $request->secondQuantity;
+        }
+
+        $thirdOre = $request->thirdOre;
+        if($request->thirdQuantity >= 1.00) {
+            $thirdQuantity = $request->thirdQuantity / 100.00;
+        } else {
+            $thirdQuantity = $request->thirdQuantity;
+        }
+
+        $fourthOre = $request->fourthOre;
+        if($request->fourthQuantity >= 1.00) {
+            $fourthQuantity = $request->fourthQuantity / 100.00;
+        } else {
+            $fourthQuantity = $request->fourthQuantity;
+        }
+
+        if($request->reprocessing >= 1.00) {
+            $reprocessing = $request->reprocessing / 100.00;
+        } else {
+            $reprocessing = $request->reprocessing;
+        }
+
+        //Set the reprocessing level for 84% if the value is null
+        if($request->reprocessing == null) {
+            $reprocessing = 0.84;
+        }
+
+        //Get the total percentage of the ores, and normalize it to 1.00.
+        $totalPercent = $firstQuantity + $secondQuantity + $thirdQuantity + $fourthQuantity;
+        if($totalPercent < 1.00) {
+            $firstQuantity = $firstQuantity / $totalPercent;
+            $secondQuantity = $secondQuantity / $totalPercent;
+            $thirdQuantity = $thirdQuantity / $totalPercent;
+            $fourthQuantity = $fourthQuantity / $totalPercent;
+        }
+
+        //Calculate the total worth of the moon
         $totalWorth = $moonCalc->SpatialMoonsTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity,
                                                         $thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity);
+        //Format the number to send to the blade.
         $totalWorth = number_format($totalWorth, 2, ".", ",");
 
-        return view('moons.user.displayTotalWorth')->with(['totalWorth' => $totalWorth, 'totalGoo' => $totalGoo]);
+        //Get the composition for the first ore if it is not None.
+        //Add the first ore composition to the final composition
+        if($firstOre != 'None') {
+            //Get the ore's composition
+            $firstComp = $moonCalc->GetOreComposition($firstOre);
+            //Get the amount of units mine-able from the moon
+            $mUnits = $moonCalc->CalcOreUnits($firstOre, $firstQuantity);
+            //Calculate the number of reprocessing units to happen from moon units
+            $rUnits = floor($mUnits / 100.0);
+
+            //Compile the composition of the ore
+            $composition['Tritanium'] += floor(($firstComp->Tritanium * $rUnits) * $reprocessing);
+            $composition['Pyerite'] += floor(($firstComp->Pyerite * $rUnits) * $reprocessing);
+            $composition['Mexallon'] += floor(($firstComp->Mexallon * $rUnits) * $reprocessing);
+            $composition['Isogen'] += floor(($firstComp->Isogen * $rUnits) * $reprocessing);
+            $composition['Nocxium'] += floor(($firstComp->Nocxium * $rUnits) * $reprocessing);
+            $composition['Zydrine'] += floor(($firstComp->Zydrine * $rUnits) * $reprocessing);
+            $composition['Megacyte'] += floor(($firstComp->Megacyte * $rUnits) * $reprocessing);
+            $composition['Atmospheric_Gases'] += floor(($firstComp->AtmosphericGases * $rUnits) * $reprocessing);
+            $composition['Evaporite_Deposits'] += floor(($firstComp->EvaporiteDeposits * $rUnits) * $reprocessing);
+            $composition['Hydrocarbons'] += floor(($firstComp->Hydrocarbons * $rUnits) * $reprocessing);
+            $composition['Silicates'] += floor(($firstComp->Silicates * $rUnits) * $reprocessing);
+            $composition['Cobalt'] += floor(($firstComp->Cobalt * $rUnits) * $reprocessing);
+            $composition['Scandium'] += floor(($firstComp->Scandium * $rUnits) * $reprocessing);
+            $composition['Titanium'] += floor(($firstComp->Titanium * $rUnits) * $reprocessing);
+            $composition['Tungsten'] += floor(($firstComp->Tungsten * $rUnits) * $reprocessing);
+            $composition['Cadmium'] += floor(($firstComp->Cadmium * $rUnits) * $reprocessing);
+            $composition['Platinum'] += floor(($firstComp->Platinium * $rUnits) * $reprocessing);
+            $composition['Vanadium'] += floor(($firstComp->Vanadium * $rUnits) * $reprocessing);
+            $composition['Chromium'] += floor(($firstComp->Chromium * $rUnits) * $reprocessing);
+            $composition['Technetium'] += floor(($firstComp->Technetium * $rUnits) * $reprocessing);
+            $composition['Hafnium'] += floor(($firstComp->Hafnium * $rUnits) * $reprocessing);
+            $composition['Caesium'] += floor(($firstComp->Caesium * $rUnits) * $reprocessing);
+            $composition['Mercury'] += floor(($firstComp->Mercury * $rUnits) * $reprocessing);
+            $composition['Dysprosium'] += floor(($firstComp->Dysprosium * $rUnits) * $reprocessing);
+            $composition['Neodymium'] += floor(($firstComp->Neodymium * $rUnits) * $reprocessing);
+            $composition['Promethium'] += floor(($firstComp->Promethium * $rUnits) * $reprocessing);
+            $composition['Thulium'] += floor(($firstComp->Thulium * $rUnits) * $reprocessing);
+        }
+
+        //Get the composition for the second ore if it is not None.
+        //Add the second ore composition to the final composition
+        if($secondOre != 'None') {
+            //Get the ore's composition
+            $secondComp = $moonCalc->GetOreComposition($secondOre);
+            //Get the amount of units mine-able from the moon
+            $mUnits = $moonCalc->CalcOreUnits($secondOre, $secondQuantity);
+            //Calculate the number of reprocessing units to happen from moon units
+            $rUnits = floor($mUnits / 100.0);            
+
+            $composition['Tritanium'] += floor(($secondComp->Tritanium * $rUnits) * $reprocessing);
+            $composition['Pyerite'] += floor(($secondComp->Pyerite * $rUnits) * $reprocessing);
+            $composition['Mexallon'] += floor(($secondComp->Mexallon * $rUnits) * $reprocessing);
+            $composition['Isogen'] += floor(($secondComp->Isogen * $rUnits) * $reprocessing);
+            $composition['Nocxium'] += floor(($secondComp->Nocxium * $rUnits) * $reprocessing);
+            $composition['Zydrine'] += floor(($secondComp->Zydrine * $rUnits) * $reprocessing);
+            $composition['Megacyte'] += floor(($secondComp->Megacyte * $rUnits) * $reprocessing);
+            $composition['Atmospheric_Gases'] += floor(($secondComp->AtmosphericGases * $rUnits) * $reprocessing);
+            $composition['Evaporite_Deposits'] += floor(($secondComp->EvaporiteDeposits * $rUnits) * $reprocessing);
+            $composition['Hydrocarbons'] += floor(($secondComp->Hydrocarbons * $rUnits) * $reprocessing);
+            $composition['Silicates'] += floor(($secondComp->Silicates * $rUnits) * $reprocessing);
+            $composition['Cobalt'] += floor(($secondComp->Cobalt * $rUnits) * $reprocessing);
+            $composition['Scandium'] += floor(($secondComp->Scandium * $rUnits) * $reprocessing);
+            $composition['Titanium'] += floor(($secondComp->Titanium * $rUnits) * $reprocessing);
+            $composition['Tungsten'] += floor(($secondComp->Tungsten * $rUnits) * $reprocessing);
+            $composition['Cadmium'] += floor(($secondComp->Cadmium * $rUnits) * $reprocessing);
+            $composition['Platinum'] += floor(($secondComp->Platinium * $rUnits) * $reprocessing);
+            $composition['Vanadium'] += floor(($secondComp->Vanadium * $rUnits) * $reprocessing);
+            $composition['Chromium'] += floor(($secondComp->Chromium * $rUnits) * $reprocessing);
+            $composition['Technetium'] += floor(($secondComp->Technetium * $rUnits) * $reprocessing);
+            $composition['Hafnium'] += floor(($secondComp->Hafnium * $rUnits) * $reprocessing);
+            $composition['Caesium'] += floor(($secondComp->Caesium * $rUnits) * $reprocessing);
+            $composition['Mercury'] += floor(($secondComp->Mercury * $rUnits) * $reprocessing);
+            $composition['Dysprosium'] += floor(($secondComp->Dysprosium * $rUnits) * $reprocessing);
+            $composition['Neodymium'] += floor(($secondComp->Neodymium * $rUnits) * $reprocessing);
+            $composition['Promethium'] += floor(($secondComp->Promethium * $rUnits) * $reprocessing);
+            $composition['Thulium'] += floor(($secondComp->Thulium * $rUnits) * $reprocessing);
+        }
+        
+        //Get the composition for the third ore if it is not None.
+        //Add the third ore composition to the final composition
+        if($thirdOre != 'None') {
+            //Get the ore's composition
+            $thirdComp = $moonCalc->GetOreComposition($thirdOre);
+            //Get the amount of units mine-able from the moon
+            $mUnits = $moonCalc->CalcOreUnits($thirdOre, $thirdQuantity);
+            //Calculate the number of reprocessing units to happen from moon units
+            $rUnits = floor($mUnits / 100.0);            
+
+            $composition['Tritanium'] += floor(($thirdComp->Tritanium * $rUnits) * $reprocessing);
+            $composition['Pyerite'] += floor(($thirdComp->Pyerite * $rUnits) * $reprocessing);
+            $composition['Mexallon'] += floor(($thirdComp->Mexallon * $rUnits) * $reprocessing);
+            $composition['Isogen'] += floor(($thirdComp->Isogen * $rUnits) * $reprocessing);
+            $composition['Nocxium'] += floor(($thirdComp->Nocxium * $rUnits) * $reprocessing);
+            $composition['Zydrine'] += floor(($thirdComp->Zydrine * $rUnits) * $reprocessing);
+            $composition['Megacyte'] += floor(($thirdComp->Megacyte * $rUnits) * $reprocessing);
+            $composition['Atmospheric_Gases'] += floor(($thirdComp->AtmosphericGases * $rUnits) * $reprocessing);
+            $composition['Evaporite_Deposits'] += floor(($thirdComp->EvaporiteDeposits * $rUnits) * $reprocessing);
+            $composition['Hydrocarbons'] += floor(($thirdComp->Hydrocarbons * $rUnits) * $reprocessing);
+            $composition['Silicates'] += floor(($thirdComp->Silicates * $rUnits) * $reprocessing);
+            $composition['Cobalt'] += floor(($thirdComp->Cobalt * $rUnits) * $reprocessing);
+            $composition['Scandium'] += floor(($thirdComp->Scandium * $rUnits) * $reprocessing);
+            $composition['Titanium'] += floor(($thirdComp->Titanium * $rUnits) * $reprocessing);
+            $composition['Tungsten'] += floor(($thirdComp->Tungsten * $rUnits) * $reprocessing);
+            $composition['Cadmium'] += floor(($thirdComp->Cadmium * $rUnits) * $reprocessing);
+            $composition['Platinum'] += floor(($thirdComp->Platinium * $rUnits) * $reprocessing);
+            $composition['Vanadium'] += floor(($thirdComp->Vanadium * $rUnits) * $reprocessing);
+            $composition['Chromium'] += floor(($thirdComp->Chromium * $rUnits) * $reprocessing);
+            $composition['Technetium'] += floor(($thirdComp->Technetium * $rUnits) * $reprocessing);
+            $composition['Hafnium'] += floor(($thirdComp->Hafnium * $rUnits) * $reprocessing);
+            $composition['Caesium'] += floor(($thirdComp->Caesium * $rUnits) * $reprocessing);
+            $composition['Mercury'] += floor(($thirdComp->Mercury * $rUnits) * $reprocessing);
+            $composition['Dysprosium'] += floor(($thirdComp->Dysprosium * $rUnits) * $reprocessing);
+            $composition['Neodymium'] += floor(($thirdComp->Neodymium * $rUnits) * $reprocessing);
+            $composition['Promethium'] += floor(($thirdComp->Promethium * $rUnits) * $reprocessing);
+            $composition['Thulium'] += floor(($thirdComp->Thulium * $rUnits) * $reprocessing);
+        }
+
+        //Get the composition for the fourth ore if it is not None.
+        //Add the fourth ore composition to the final composition
+        if($fourthOre != 'None') {
+            //Get the ore's composition
+            $fourthComp = $moonCalc->GetOreComposition($fourthOre);
+            //Get the amount of units mine-able from the moon
+            $mUnits = $moonCalc->CalcOreUnits($fourthOre, $fourthQuantity);
+            //Calculate the number of reprocessing units to happen from moon units
+            $rUnits = floor($mUnits / 100.0);            
+
+            $composition['Tritanium'] += floor(($fourthComp->Tritanium * $rUnits) * $reprocessing);
+            $composition['Pyerite'] += floor(($fourthComp->Pyerite * $rUnits) * $reprocessing);
+            $composition['Mexallon'] += floor(($fourthComp->Mexallon * $rUnits) * $reprocessing);
+            $composition['Isogen'] += floor(($fourthComp->Isogen * $rUnits) * $reprocessing);
+            $composition['Nocxium'] += floor(($fourthComp->Nocxium * $rUnits) * $reprocessing);
+            $composition['Zydrine'] += floor(($fourthComp->Zydrine * $rUnits) * $reprocessing);
+            $composition['Megacyte'] += floor(($fourthComp->Megacyte * $rUnits) * $reprocessing);
+            $composition['Atmospheric_Gases'] += floor(($fourthComp->AtmosphericGases * $rUnits) * $reprocessing);
+            $composition['Evaporite_Deposits'] += floor(($fourthComp->EvaporiteDeposits * $rUnits) * $reprocessing);
+            $composition['Hydrocarbons'] += floor(($fourthComp->Hydrocarbons * $rUnits) * $reprocessing);
+            $composition['Silicates'] += floor(($fourthComp->Silicates * $rUnits) * $reprocessing);
+            $composition['Cobalt'] += floor(($fourthComp->Cobalt * $rUnits) * $reprocessing);
+            $composition['Scandium'] += floor(($fourthComp->Scandium * $rUnits) * $reprocessing);
+            $composition['Titanium'] += floor(($fourthComp->Titanium * $rUnits) * $reprocessing);
+            $composition['Tungsten'] += floor(($fourthComp->Tungsten * $rUnits) * $reprocessing);
+            $composition['Cadmium'] += floor(($fourthComp->Cadmium * $rUnits) * $reprocessing);
+            $composition['Platinum'] += floor(($fourthComp->Platinium * $rUnits) * $reprocessing);
+            $composition['Vanadium'] += floor(($fourthComp->Vanadium * $rUnits) * $reprocessing);
+            $composition['Chromium'] += floor(($fourthComp->Chromium * $rUnits) * $reprocessing);
+            $composition['Technetium'] += floor(($fourthComp->Technetium * $rUnits) * $reprocessing);
+            $composition['Hafnium'] += floor(($fourthComp->Hafnium * $rUnits) * $reprocessing);
+            $composition['Caesium'] += floor(($fourthComp->Caesium * $rUnits) * $reprocessing);
+            $composition['Mercury'] += floor(($fourthComp->Mercury * $rUnits) * $reprocessing);
+            $composition['Dysprosium'] += floor(($fourthComp->Dysprosium * $rUnits) * $reprocessing);
+            $composition['Neodymium'] += floor(($fourthComp->Neodymium * $rUnits) * $reprocessing);
+            $composition['Promethium'] += floor(($fourthComp->Promethium * $rUnits) * $reprocessing);
+            $composition['Thulium'] += floor(($fourthComp->Thulium * $rUnits) * $reprocessing);
+        }
+
+        return view('moons.user.displayTotalWorth')->with('totalWorth', $totalWorth)
+                                                   ->with('composition', $composition)
+                                                   ->with('reprocessing', $reprocessing);
     }
 }

app/Http/Controllers/Moons/RentalMoonsAdminController.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Controllers\Moons;
+
+//Internal Library
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Auth;
+use Log;
+use Carbon\Carbon;
+
+//Models
+use App\Models\Moon\AllianceRentalMoon;
+
+class RentalMoonsAdminController extends Controller
+{
+    /**
+     * Construct
+     */
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middelware('role:user');
+        $this->middleware('permission:mining.director');
+    }
+
+    /**
+     * Function to display rental moons being used for the alliance
+     */
+    public function displayAllianceUsageRentalMoons() {
+        
+    }
+
+
+    /**
+     * Display the form for requesting new rental moon for the alliance
+     */
+    public function displayRentalMoonForAllianceForm() {
+
+    }
+    
+
+    /**
+     * Function to store when a new rental moon is requested
+     */
+    public function storeRentalMoonForAlliance(Request $request) {
+
+    }
+
+    /**
+     * Function to display the form for figuring out item composition
+     */
+    public function displayItemCompositionForm() {
+
+    }
+
+    /**
+     * Function to display the results of the form for figuring out item composition
+     */
+    public function displayItemCompositionResults(Request $request) {
+
+    }
+}

app/Http/Controllers/SRP/SRPAdminController.php

@@ -0,0 +1,526 @@
+<?php
+
+namespace App\Http\Controllers\SRP;
+
+//Laravel Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Auth;
+use Khill\Lavacharts\Lavacharts;
+use Carbon\Carbon;
+
+//User Libraries
+use App\Library\SRP\SRPHelper;
+
+//Models
+use App\Models\SRP\SRPShip;
+use App\Models\User\User;
+use App\Models\SRP\SrpFleetType;
+use App\Models\SRP\SrpShipType;
+use App\Models\SRP\SrpPayout;
+
+class SRPAdminController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+        $this->middleware('permission:srp.admin');
+    }
+
+    public function displaySRPRequests() {
+        //Middleware needed for permissions
+        $this->middleware('permission:srp.admin');
+
+        //Create the array
+        $requests = array();
+        $viewShipTypes = array();
+
+        //Declare variables for use later.
+        $sum_actual = 0.00;
+        $sum_loss = 0.00;
+
+        //Get the ship types from the database
+        $shipTypes = SrpShipType::all();
+
+        //Setup the viewShipTypes variable
+        $tempShipTypes = SrpShipType::groupBy('code')->pluck('code');
+        foreach($tempShipTypes as $key => $value) {
+            $viewShipTypes[$value] = $value;
+        }
+
+        //Get the fleet types from the database
+        $fleetTypes = SrpFleetType::all();
+
+        //Get the payouts from the database
+        $payouts = SrpPayout::all();
+        
+        //Get the SRP ship count to see how many requests are avaiable "Under Review" in the database
+        $count = SRPShip::where(['approved' => 'Under Review'])->count();
+        //If the count is 0 then there are no requests
+        if($count === 0) {
+            $requests = null;
+        } else {    //Process each request
+            $reqs = SRPShip::where(['approved' => 'Under Review'])->get()->toArray();
+            foreach($reqs as $r) {
+                $temp['id'] = $r['id'];
+                $temp['created_at'] = $r['created_at'];
+                $temp['character_name'] = $r['character_name'];
+                $temp['fleet_commander_name'] = $r['fleet_commander_name'];
+                $temp['zkillboard'] = $r['zkillboard'];
+                $temp['loss_value'] = $r['loss_value'];
+                $sum_loss += $temp['loss_value'];
+                //Get the ship type
+                foreach($shipTypes as $s) {
+                    if($r['ship_type'] == $s->code) {
+                        $temp['ship_type'] = $s->description;
+                        $temp['cost_code'] = $s->code;
+                    }
+                }
+                //Get the fleet type
+                foreach($fleetTypes as $f) {
+                    if($r['fleet_type'] == $f->code) {
+                        $temp['fleet_type'] = $f->description;
+                    }
+                }
+                //Calculate the recommended srp amount
+                foreach($payouts as $p) {
+                    if($r['ship_type'] == $p->code) {
+                        $temp['actual_srp'] = $r['loss_value'] * ($p->payout / 100.00 );
+                        $temp['payout_percentage'] = $p->payout;
+                        $sum_actual += $temp['actual_srp'];
+                    }
+                }
+                
+                //Push the calculations into the array
+                array_push($requests, $temp);
+            }
+        }
+
+        $sum_actual = number_format($sum_actual, 2, '.', ',');
+        $sum_loss = number_format($sum_loss, 2, '.', ',');
+
+        //Return the view with the variables
+        return view('srp.admin.process')->with('requests', $requests)
+                                        ->with('sum_actual', $sum_actual)
+                                        ->with('sum_loss', $sum_loss)
+                                        ->with('viewShipTypes', $viewShipTypes);
+    }
+
+    public function updateLossValue($id, $value) {
+        //Convert the string into a decimal style number to be stored correctly
+        $lossValue = str_replace(',', '', $value);
+        $lossValue = floatval($lossValue);
+        
+        SRPShip::where(['id' => $id])->update([
+            'loss_value' => $lossValue,
+        ]);
+
+        return redirect('/srp/admin/display');
+    }
+
+    public function updateShipType($id, $value) {
+        SRPShip::where(['id' => $id])->update([
+            'ship_type' => $value,
+        ]);
+
+        return redirect('/srp/admin/display');
+    }
+
+    public function processSRPRequest(Request $request) {
+        //Validate the request
+        $this->validate($request, [
+            'id' => 'required',
+            'approved' => 'required',
+            'paid_value' => 'required',
+        ]);
+
+        //Get the total loss value from the form and convert it to the right format
+        $paidLoss = str_replace(',', '', $request->paid_value);
+        $paidLoss = floatval($paidLoss);
+
+        //If the notes are not null update like this.
+        if($request->notes != null) {
+            $srp = SRPShip::where(['id' => $request->id])->update([
+                'approved' => $request->approved,
+                'paid_by_id' => auth()->user()->character_id,
+                'paid_by_name' => auth()->user()->name,
+                'notes' => $request->notes,
+                'paid_value' => $paidLoss,
+            ]);
+        } else {
+            $srp = SRPShip::where(['id' => $request->id])->update([
+                'approved' => $request->approved,
+                'paid_by_id' => auth()->user()->character_id,
+                'paid_by_name' => auth()->user()->name,
+                'paid_value' => $paidLoss,
+            ]);
+        }
+
+        if($request->approved == 'Approved') {
+            return redirect('/srp/admin/display')->with('success', 'SRP Marked as Paid');
+        } else {
+            return redirect('/srp/admin/display')->with('error', 'SRP Request Denied.');
+        }
+    }
+
+    public function displayHistory() {
+
+        $srpApproved = SRPShip::where([
+            'approved' => 'Approved',
+        ])->orderBy('created_at', 'desc')->paginate(25);
+
+        $srpDenied = SRPShip::where([
+            'approved' => 'Denied',
+        ])->orderBy('created_at', 'desc')->paginate(25);
+        
+        return view('srp.admin.history')->with('srpApproved', $srpApproved)
+                                        ->with('srpDenied', $srpDenied);
+    }
+
+    public function displayStatistics() {
+        $months = 3;
+        $barChartData = array();
+        $start = Carbon::now()->toDateTimeString();
+        $end = Carbon::now()->subMonths(1)->toDateTimeString();
+
+        //Declare the Lavacharts variable
+        $lava = new Lavacharts;
+
+        //We need a function from this library rather than recreating a new library
+        $srpHelper = new SRPHelper();
+
+        /**
+         * Pie chart for the number of approved, denied, and under review payouts currently in the system.
+         */
+        //Get the count of open srp requests
+        $pieOpen = SRPShip::where([
+            'approved' => 'Under Review',
+            ['created_at', '>=', $end],
+            ])->count();
+        //Get the count of approved srp requests
+        $pieApproved = SRPShip::where([
+            'approved' => 'Approved',
+            ['created_at', '>=', $end],
+            ])->count();
+        //Get the count of denied srp requests
+        $pieDenied = SRPShip::where([
+            'approved' => 'Denied',
+            ['created_at', '>=', $end],
+            ])->count();
+
+        //Create a new datatable for the lavachart.
+        $srp = $lava->DataTable();
+        //Add string columns, number columns, and data rows for the chart
+        $srp->addStringColumn('ISK Value')
+                ->addNumberColumn('ISK')
+                ->addRow(['Approved', $pieApproved])
+                ->addRow(['Denied', $pieDenied])
+                ->addRow(['Under Review', $pieOpen]);
+        //Create the pie chart in memory with any options needed to render the chart
+        $lava->PieChart('SRP Stats', $srp, [
+            'title'  => 'SRP Stats',
+            'is3D'   => true,
+        ]);
+        
+        /**
+         * Gauage chart for showing number of open srp requests
+         */
+        //Create a new datatable in the 
+        $adur = $lava->DataTable();
+        //Add string columns, number columns, and data row for the chart
+        $adur->addStringColumn('Type')
+            ->addNumberColumn('Value')
+            ->addRow(['Under Review', $pieOpen]);
+        //Create the gauge chart with any options needed to render the chart
+        $lava->GaugeChart('SRP', $adur, [
+            'width'      => 400,
+            'greenFrom'  => 0,
+            'greenTo'    => 20,
+            'yellowFrom' => 20,
+            'yellowTo'   => 40,
+            'redFrom'    => 40,
+            'redTo'      => 100,
+            'majorTicks' => [
+                'Safe',
+                'Critical',
+            ],
+        ]);
+
+        /**
+         * Create a vertical chart of all of the cost codes for the ships being SRP'ed.
+         * The chart will be by cost code of ships being replaced
+         */
+        //Declare the data table
+        $costCodeChart = $lava->DataTable();
+
+        //Get the approved, under review, and denied cost codes and amounts
+        $t1fdcApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1FDC', 
+        ])->sum('paid_value');
+        $t1fdcUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1FDC',
+        ])->sum('loss_value');
+        $t1fdcDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1FDC',
+        ])->sum('loss_value');
+
+        $t1bcApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1BC',
+        ])->sum('paid_value');
+        $t1bcUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1BC',
+        ])->sum('loss_value');
+        $t1bcDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1BC',
+        ])->sum('loss_value');
+        
+        $t2fdApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T2FD',
+        ])->sum('paid_value');
+        $t2fdUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T2FD',
+        ])->sum('loss_value');
+        $t2fdDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T2FD',
+        ])->sum('loss_value');
+
+        $t3dApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T3D',
+        ])->sum('paid_value');
+        $t3dUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T3D',
+        ])->sum('loss_value');
+        $t3dDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T3D',
+        ])->sum('loss_value');
+
+        $t1t2logiApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1T2Logi',
+        ])->sum('paid_value');
+        $t1t2logiUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1T2Logi',
+        ])->sum('loss_value');
+        $t1t2logiDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1T2Logi',
+        ])->sum('loss_value');
+
+        $reconsApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'REC',
+        ])->sum('paid_value');
+        $reconsUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'REC',
+        ])->sum('loss_value');
+        $reconsDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'REC',
+        ])->sum('loss_value');
+
+        $t2cApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T2C',
+        ])->sum('paid_value');
+        $t2cUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T2C',
+        ])->sum('loss_value');
+        $t2cDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T2C',
+        ])->sum('loss_value');
+
+        $t3cApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T3C',
+        ])->sum('paid_value');
+        $t3cUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T3C',
+        ])->sum('loss_value');
+        $t3cDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T3C',
+        ])->sum('loss_value');
+
+        $commandApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'COM',
+        ])->sum('paid_value');
+        $commandUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'COM',
+        ])->sum('loss_value');
+        $commandDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'COM',
+        ])->sum('loss_value');
+
+        $interdictorApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'INTD',
+        ])->sum('paid_value');
+        $interdictorUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'INTD',
+        ])->sum('loss_value');
+        $interdictorDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'INTD',
+        ])->sum('loss_value');
+
+        $t1bsApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'T1BS',
+        ])->sum('paid_value');
+        $t1bsUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'T1BS',
+        ])->sum('loss_value');
+        $t1bsDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'T1BS',
+        ])->sum('loss_value');
+
+        $dksApproved = SRPShip::where([
+            'approved' => 'Approved',
+            'ship_type' => 'DKS',
+        ])->sum('paid_value');
+        $dksUnderReview = SRPShip::where([
+            'approved' => 'Under Review',
+            'ship_type' => 'DKS',
+        ])->sum('loss_value');
+        $dksDenied = SRPShip::where([
+            'approved' => 'Denied',
+            'ship_type' => 'DKS',
+        ])->sum('loss_value');
+
+
+        //Add string column, number columns.
+        $costCodeChart->addStringColumn('SRP Costs')
+                      ->addNumberColumn('Approved')
+                      ->addNumberColumn('Under Review')
+                      ->addNumberColumn('Denied')
+                      ->addRow(['T1FDC', $t1fdcApproved, $t1fdcUnderReview, $t1fdcDenied])
+                      ->addRow(['T1BC', $t1bcApproved, $t1bcUnderReview, $t1bcDenied])
+                      ->addRow(['T1BS', $t1bsApproved, $t1bsUnderReview, $t1bsDenied])
+                      ->addRow(['T2FD', $t2fdApproved, $t2fdUnderReview, $t2fdDenied])
+                      ->addRow(['T2C', $t2cApproved, $t2cUnderReview, $t2cDenied])
+                      ->addRow(['T1T2Logi', $t1t2logiApproved, $t1t2logiUnderReview, $t1t2logiDenied])
+                      ->addRow(['T3D', $t3dApproved, $t3dUnderReview, $t3dDenied])
+                      ->addRow(['T3C', $t3cApproved, $t3cUnderReview, $t3cDenied])
+                      ->addRow(['RECON', $reconsApproved, $reconsUnderReview, $reconsDenied])
+                      ->addRow(['COMMAND', $commandApproved, $commandUnderReview, $commandDenied])
+                      ->addRow(['DKS', $dksApproved, $dksUnderReview, $dksDenied]);
+        
+        $lava->ColumnChart('Cost Codes', $costCodeChart, [
+            'columns' => 4,
+            'title' => 'Cost Code SRP Chart',
+            'titleTextStyle' => [
+                'color' => '#eb6b2c',
+                'fontSize' => 14,
+            ],
+        ]);  
+
+        return view('srp.admin.statistics')->with('lava', $lava);
+    }
+
+    public function displayCostCodes() {
+        //Declare some variables
+        $costcodes = array();
+        $count = 0;
+        $shipType = SrpShipType::all();
+        $srpPayout = SrpPayout::all();
+       
+        foreach($shipType as $ship) {
+            //Don't process if the code is None
+            if($ship->code != 'None') {
+                $tempCode = $ship->code;
+                $tempDescription = $ship->description;
+                $temp = SrpPayout::where(['code' => $ship->code])->first();
+                $tempPayout = $temp->payout;
+                //Store the data in a temporary variable
+                $block = [
+                    'code' => $tempCode,
+                    'description' => $tempDescription,
+                    'payout' => $tempPayout,
+                ];
+
+                //Push the data into the array
+                array_push($costcodes, $block);
+            }            
+        }
+
+        return view('srp.admin.costcodes.display')->with('costcodes', $costcodes);
+    }
+
+    public function displayAddCostCode() {
+        return view('srp.admin.costcodes.add');
+    }
+
+    public function addCostCode(Request $request) {
+        $this->validate($request, [
+            'code' => 'required',
+            'description' => 'required',
+            'payout' => 'required',
+        ]);
+
+        $code = $request->code;
+        $description = $request->description;
+        $payout = $request->payout;
+
+        $payoutCount = SrpPayout::where(['code' => $code])->count();
+        $shipTypeCount = SrpShipType::where(['code' => $code])->count();
+
+        //If we don't find the cost code, let's add it.  otherwise send an error.
+        if($payoutCount == 0 && $shipTypeCount == 0) {
+            $payoutTable = new SrpPayout;
+            $payoutTable->code = $code;
+            $payoutTable->payout = $payout;
+            $payoutTable->save();
+
+            $shipType = new SrpShipType;
+            $shipType->code = $code;
+            $shipType->description = $description;
+            $shipType->save();
+
+            return redirect('/srp/admin/display')->with('success', 'Cost code added.');
+        } else {
+            return redirect('/srp/admin/display')->with('error', 'Cost code already exists in the database.');
+        }
+    }
+
+    public function modifyCostCodes(Request $request) {
+        $this->validate($request, [
+            'description' => 'required',
+            'payout' => 'required',
+        ]);
+
+        //Update the SrpShipType
+        SrpShipType::where(['code' => $request->code])->update([
+            'description' => $request->description,
+        ]);
+
+        //Update the payout
+        SrpPayout::where(['code' => $request->code])->update([
+            'payout' => $request->payout,
+        ]);
+
+        return redirect('/srp/admin/display')->with('success', 'Payout and Description updated.');
+    }
+}

app/Http/Controllers/SRP/SRPController.php

@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Http\Controllers\SRP;
+
+//Laravel Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Auth;
+
+//User Libraries
+
+//Models
+use App\Models\SRP\SRPShip;
+use App\Models\User\User;
+use App\Models\SRP\SrpFleetType;
+use App\Models\SRP\SrpShipType;
+use App\Models\User\UserAlt;
+use App\Models\SRP\SrpPayout;
+
+class SRPController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    public function displaySrpHistory() {
+        
+    }
+
+    public function displayPayoutAmounts() {
+        $payouts = array();
+        $count = 0;
+        $shipType = SrpShipType::all();
+        $srpPayout = SrpPayout::all();
+       
+        foreach($shipType as $ship) {
+            //Don't process if the code is None
+            if($ship->code != 'None') {
+                $tempCode = $ship->code;
+                $tempDescription = $ship->description;
+                $temp = SrpPayout::where(['code' => $ship->code])->first();
+                
+                $tempPayout = $temp->payout;
+
+                $block = [
+                    'code' => $tempCode,
+                    'description' => $tempDescription,
+                    'payout' => $tempPayout,
+                ];
+
+                array_push($payouts, $block);
+            }            
+        }
+
+        return view('srp.payouts')->with('payouts', $payouts);
+    }
+
+    public function displaySrpForm() {
+        $shipTypes = array();
+        $fleetTypes = array();
+        $characters = array();
+        $temp = array();
+        $alts = null;
+
+        //Get all the ship types
+        $shipTypesTemp = SrpShipType::all();
+
+        //Get all of the fleet types
+        $fleetTypesTemp = SrpFleetType::all();
+
+        //Process the ship types and store in the array
+        foreach($shipTypesTemp as $type) {
+            $shipTypes[$type->code] = $type->description;
+        }
+
+        //Process the fleet types and store in the array
+        foreach($fleetTypesTemp as $type) {
+            $fleetTypes[$type->code] = $type->description;
+        }
+
+        //Get the user id and name, and store in the array
+        $characters[auth()->user()->character_id] = auth()->user()->getName(); 
+
+        //Get the alts and store in the array
+        $altCount = UserAlt::where(['main_id' => auth()->user()->character_id])->count();
+        if($altCount > 0) {
+            $alts = UserAlt::where([
+                'main_id' => auth()->user()->character_id,
+            ])->get();
+
+            foreach($alts as $alt) {
+                $characters[$alt->character_id] = $alt->name;
+            }
+        }
+        
+        return view('srp.srpform')->with('fleetTypes', $fleetTypes)
+                                  ->with('shipTypes', $shipTypes)
+                                  ->with('characters', $characters);
+    }    
+
+    public function storeSRPFile(Request $request) {
+        $name = null;
+
+        $this->validate($request, [
+            'character' => 'required',
+            'FC' => 'required',
+            'FleetType' => 'required',
+            'zKillboard' => 'required',
+            'LossValue' => 'required',
+            'ShipType' => 'required',
+        ]);
+            
+        //See if the FC Name ties to a user on the services site
+        $fcId = User::where(['name' => $request->FC])->get(['character_id']);
+        
+        //Take the loss value and remove ' ISK' from it.  Convert the string to a number
+        //May need to work on some locale stuff here but will think about it first.
+        $lossValue = str_replace(' ISK', '', $request->LossValue);
+        $lossValue = str_replace(',', '', $lossValue);
+        $lossValue = floatval($lossValue);
+
+        //Convert the FC name to a regular case of characters
+        $tempFcName = strtolower($request->FC);
+        $tempFcName = ucwords($tempFcName);
+
+        $userCount = User::where(['character_id' => $request->character])->count();
+        $altCount = UserAlt::where(['character_id' => $request->character])->count();
+
+        if($userCount > 0) {
+            $tempUser = User::where(['character_id' => $request->character])->first();
+            $name = $tempUser->name;
+        } else if($altCount > 0) {
+            $tempAlt = UserAlt::where(['character_id' => $request->character])->first();
+            $name = $tempAlt->name;
+        } else {
+            $name = 'None';
+        }
+
+        $ship = new SRPShip;
+        $ship->character_id = $request->character;
+        $ship->character_name = $name;
+        $ship->fleet_commander_name = $tempFcName;
+        if(isset($fcId[0])) {
+            $ship->fleet_commander_id = $fcId[0]->character_id;
+        }
+        $ship->zkillboard = $request->zKillboard;
+        $ship->fleet_type = $request->FleetType;
+        $ship->ship_type = $request->ShipType;
+        $ship->loss_value = $lossValue;
+        $ship->save();
+
+        return redirect('/dashboard')->with('success', 'SRP Form Submitted.');
+    }
+
+}

app/Http/Controllers/Structures/RegisterStructureController.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Structures;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Auth;
-use DB;
-
-use App\Models\Corporation\CorpStructure;
-use App\Models\Corporation\CorpTaxRatio;
-use App\Library\Esi\Esi;
-
-class RegisterStructureController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $this->middleware('role:User');
-        $this->middleware('permission:structure.operator');
-    }
-
-    public function displayRegisterStructure() {
-        //Check to see if the user has the read corp journal esi scope before allowing to register a structure
-        if(Auth()->user()->hasEsiScope('esi-wallet.read_corporation_wallets.v1')) {
-            return view('structures.register.register');
-        } else {
-            return view('dashboard')->with('error', 'You need to setup your esi scope for read corporation wallets');
-        }
-    }
-
-    public function storeStructure(Request $request) {
-        $this->validate($request, [
-            'system' => 'required',
-            'structure_name' => 'required',
-            'tax' => 'required',
-            'structure_type' => 'required',
-        ]);
-
-        $eHelper = new Esi;
-
-        $tax = floatval($request->tax);
-
-        $structure = new CorpStructure();
-        $structure->character_id = Auth::user()->character_id;
-        $structure->corporation_id = $eHelper->FindCorporationId(Auth::user()->character_id);
-        $structure->corporation_name = $eHelper->FindCorporationName(Auth::user()->character_id);
-        $structure->region = $request->region;
-        $structure->system = $request->system;
-        $structure->structure_name = $request->structure_name;
-        $structure->structure_type = $request->structure_type;
-        $structure->save();
-
-        //Return the view and the message of user updated
-        return redirect('/dashboard')->with('success', 'Structure Added to Database');
-    }
-}

app/Http/Controllers/Structures/StructureAdminController.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Structures;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class StructureAdminController extends Controller
-{
-    public function __construct() {
-        $this->middleware('role:Admin');
-    }
-
-    public function displayDashboard() {
-        return view('structures.admin.dashboard');
-    }
-
-    public function storeTaxRatio(Request $request) {
-        $this->validate($request, [
-            'corpId',
-            'corporation',
-            'type',
-            'ratio',
-        ]);
-
-        $ratio = new CorpTaxRatio;
-        $ratio->corporation_id = $request->corpId;
-        $ratio->corporation_name = $request->corporation;
-        $ratio->structure_type = $request->type;
-        $ratio->ratio = $request->ratio;
-        $ratio->save();
-
-        return redirect('structure.admin.dashboard');
-    }
-
-    public function updateTaxRatio(Request $request) {
-        $this->validate($request, [
-            'corporation',
-            'type',
-            'ratio',
-        ]);
-
-        CorpTaxRatio::where([
-            'corporation_name' => $request->corporation,
-            'structure_type' => $request->type,
-        ])->update([
-            'ratio' => $request->ratio,
-        ]);
-
-        return redirect('/structure/admin/dashboard')->with('success', 'Tax Ratio updated for structure type: ' . $request->type . ' and corporation: ' . $request->corporation);
-    }
-
-    public function displayTaxRatios() {
-        $taxRatios = CorpTaxRation::all();
-
-        return view('structure.admin.taxratios')->with('structures', $structures);
-    }
-}

app/Http/Controllers/Structures/StructureController.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Structures;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-use Auth;
-use DB;
-use Carbon\Carbon;
-
-use App\Library\Structures\StructureTaxHelper;
-use App\Library\Esi\Esi;
-use App\Library\Lookups\LookupHelper;
-
-use App\User;
-use App\Models\User\UserRole;
-use App\Models\User\UserPermission;
-use App\Models\Corporation\CorpStructure;
-use App\Models\Finances\StructureIndustryTaxJournal;
-use App\Models\Esi\EsiToken;
-
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-use Seat\Eseye\Exceptions\RequestFailedException;
-
-class StructureController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $this->middleware('role:User');
-        $this->middleware('permission:structure.operator');
-    }
-
-    public function chooseCorpTaxes() {
-        $this->middleware('role:Admin');
-
-        $corps = CorpStructure::pluck('corporation_name', 'corporation_id');
-        return view('structures.admin.choosecorporation')->with('corps', $corps);
-    }
-
-    public function displayCorpTaxes(Request $request) {
-        $this->middleware('role:Admin');
-
-        $corpId = $request->corpId;
-        $months = 3;
-        
-        //Declare the structure tax helper class
-        $sHelper = new StructureTaxHelper();
-        
-        //Get the dates we are working with
-        $dates = $sHelper->GetTimeFrameInMonths($months);
-
-        foreach($dates as $date) {
-            $totalTaxes[] = [
-                'date' => $date['start']->toFormattedDateString(),
-                'tax' => number_format($sHelper->GetTaxes($corpId, 'Market', $date['start'], $date['end']), 2, '.', ','),
-                'revenue' => number_format($sHelper->GetRevenue($corpId, 'Market', $date['start'], $date['end']), 2, '.', ',')
-            ];
-        }
-
-        //Return the view with the data passed to it
-        return view('structures.admin.choosecorptaxes')->with('totalTaxes', $totalTaxes);
-    }
-
-    public function displayTaxes() {
-        //Declare new Lookup helper
-        $helper = new LookupHelper();
-
-        //Declare the structure tax helper class
-        $sHelper = new StructureTaxHelper();
-
-        $months = 3;
-        $totalTaxes = array();
-        
-        //Get the character's corporation from the lookup table or esi
-        $corpId = $helper->LookupCharacter(Auth::user()->character_id);
-        
-        
-        //Get the dates we are working with
-        $dates = $sHelper->GetTimeFrameInMonths($months);
-        
-        //Get the market taxes for this month from the database
-        foreach($dates as $date) {
-            $totalTaxes[] = [
-                'date' => $date['start']->toFormattedDateString(),
-                'tax' => number_format($sHelper->GetTaxes($corpId, 'Market', $date['start'], $date['end']), 2, '.', ','),
-                'revenue' => number_format($sHelper->GetRevenue($corpId, 'Market', $date['start'], $date['end']), 2, '.', ',')
-            ];
-        }
-
-        return view('structures.user.taxes')->with('totalTaxes', $totalTaxes);
-    }
-
-    public function displayTaxHistory(Request $request) {
-        //Declare new Lookup helper
-        $helper = new LookupHelper();
-
-        //Get the months from the request
-        $months = $request->months;
-
-        //Get the character's corporation from the lookup table or esi
-        $corpId = $helper->LookupCharacter(Auth::user()->character_id);
-
-        //Declare the structure tax helper class
-        $sHelper = new StructureTaxHelper();
-
-        //Get the dates we are working with
-        $dates = $sHelper->GetTimeFrameInMonths($months);
-
-        //Build the array for displaying the data on the view
-        $totalTaxes = array();
-        
-        foreach($dates as $date) {
-            $totalTaxes[] = [
-                'date' => $date['start']->toFormattedDateString(),
-                'tax' => number_format($sHelper->GetTaxes($corpId, 'Market', $date['start'], $date['end']), 2, '.', ','),
-                'revenue' => number_format($sHelper->GetRevenue($corpId, 'Market', $date['start'], $date['end']), 2, '.', ',')
-            ];
-        }
-
-        return view('structures.user.taxhistory')->with(compact('totalTaxes', 'months'));
-    }
-}

app/Http/Controllers/Test/TestController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\Test;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+use App\Library\Lookups\LookupHelper;
+
+class TestController extends Controller
+{
+    public function displayCharTest() {
+        $lookup = new LookupHelper;
+
+        $config = config('esi');
+
+        $char = $lookup->GetCharacterInfo($config['primary']);
+
+        return view('test.char.display')->with('char', $char);
+    }
+
+    public function CharacterLookupTest(Request $request) {
+        
+    }
+}

app/Http/Controllers/Wiki/WikiController.php

@@ -5,17 +5,18 @@ namespace App\Http\Controllers\Wiki;
 //Laravel libraries
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use DB;
 use Auth;
 
 //User Libraries
 use App\Library\Lookups\LookupHelper;
+use App\Library\Wiki\WikiHelper;
 
 //Models
 use App\Models\Doku\DokuGroupNames;
 use App\Models\Doku\DokuMember;
 use App\Models\Doku\DokuUser;
 use App\Models\Admin\AllowedLogin;
+use App\Models\User\User;
 
 class WikiController extends Controller
 {
@@ -24,32 +25,6 @@ class WikiController extends Controller
         $this->middleware('role:Renter');
     }
     
-    public function purgeUsers() {
-        //Declare helper classes
-        $helper = new LookupHelper;
-
-        //Get all the users from the database
-        $users = DokuUser::pluck('name')->all();
-
-        $legacy = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_id')->toArray();
-        $renter = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_id')->toArray();
-
-        //Search the names and verify against the lookup table
-        //to find the corporation and / or alliance they belong to.
-        foreach($users as $user) {
-            $charId = $helper->CharacterNameToId($user);
-            $corpId = $helper->LookupCharacter($charId);
-            $allianceId = $helper->LookupCorporation($corpId);
-            if(in_array($allianceId, $legacy) || in_array($allianceId, $renter) || $allianceId == 99004116) {
-                //Do nothing
-            } else {
-                DokuUser::where(['name' => $user])->delete();
-            }
-        }
-
-        return view('admin.dashboard')->with('success', 'Wiki has been purged.');
-    }
-    
     public function displayRegister() {
         //make user name syntax like we want it.
         $name = Auth::user()->name;
@@ -57,10 +32,20 @@ class WikiController extends Controller
         $name = str_replace(' ', '_', $name);
 
         //Check to see if the user is already registered in the database
-        $check = DB::select('SELECT login FROM wiki_user WHERE login = ?', [$name]);
-        if(isset($check[0]) && ($check[0]->login === $name)) {
+        $count = DokuUser::where([
+            'login' => $name,
+        ])->count();
+
+        //If the count is greater than zero, also check the login name as a reference
+        if($count > 0) {
+            $check = DokuUser::where([
+                'login' => $name,
+            ])->first();
+
+            if($check->login === $name) {
                 return redirect('/dashboard')->with('error', 'Already registered for the wiki!');
             }
+        }
 
         return view('wiki.user.register')->with('name', $name);
     }
@@ -82,8 +67,10 @@ class WikiController extends Controller
 
         if(Auth::user()->hasRole('User')) {
             $role = 1; //User role id from wiki_groupname table
+            $roleDescription = 'user';
         } else if(Auth::user()->hasRole('Renter')) {
             $role = 8; //Renter role id from wiki_groupname table
+            $roleDescription = 'renter';
         }
 
         //Load the model
@@ -102,10 +89,16 @@ class WikiController extends Controller
         $user->save();
 
         //Get the user from the table to get the uid
-        $uid = DB::select('SELECT id FROM wiki_user WHERE login = ?', [$name]);
-        $member->uid = $uid[0]->id;
+        $uid = DokuUser::where([
+            'login' => $name,
+        ])->first();
+
+        //Save information in the model
+        $member->uid = $uid->id;
         $member->gid = $role;
+        $member->groupname = $roleDescription;
         $member->save();
+
         //Return to the dashboard view
         return redirect('/dashboard')->with('success', 'Registration successful.  Your username is: ' . $name);
     }
@@ -114,9 +107,14 @@ class WikiController extends Controller
         $name = Auth::user()->name;
         $name = strtolower($name);
         $name = str_replace(' ', '_', $name);
-        $check = DB::select('SELECT login FROM wiki_user WHERE login = ?', [$name]);
-        if(!isset($check[0])) {
-            return redirect('/dashboard')->with('error', 'Login Not Found!');
+
+        //Get the password
+        $check = DokuUser::where([
+            'login' => $name
+        ])->count();
+
+        if($check == 0) {
+            return redirect('/dashboard')->with('error', 'Login Not Found');
         }
 
         return view('wiki.user.changepassword')->with('name', $name);
@@ -141,30 +139,14 @@ class WikiController extends Controller
         $name = Auth::user()->name;
         $name = strtolower($name);
         $name = str_replace(' ', '_', $name);
+
         //Update the password for the login name
-        DB::table('wiki_user')
-            ->where('login', $name)
-            ->update(['pass' => $password]);
+        DokuUser::where([
+            'login' => $name,
+        ])->update([
+            'pass' => $password,
+        ]);
 
         return redirect('/dashboard')->with('success', 'Password changed successfully.  Your username is: ' . $name);
     }
-
-    /**
-     * Displays the page to add a user to a certain group
-     */
-    public function displayAddUserToGroup() {
-        return view('wiki.displayaddug');
-    }
-
-    /**
-     * Stores the modifications to the user to add to a group to give permissions
-     * 
-     * @param uid
-     * @param gid
-     * @param gname
-     */
-    public function storeAddUserToGroup($uid, $gid, $gname) {
-
-        return redirect('/dashboard')->with('success', 'User added to the group: ' . $gid . ' with name of ' . $gname);
-    }
 }

app/Http/Controllers/Wormholes/WormholeController.php

@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Http\Controllers\Wormholes;
+
+//Laravel Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Auth;
+use Carbon\Carbon;
+
+//User Libraries
+
+//Models
+use App\Models\Wormholes\AllianceWormhole;
+use App\Models\Wormholes\WormholeType;
+
+class WormholeController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    public function displayWormholeForm() {
+        //Declare a few array variables
+        $duration = array();
+        $class = array();
+        $stability = array();
+        $size = array();
+
+        //Get the duration from the table
+        $duration = [
+            'This wormhole has not yet begun its natural cycle of decay and should last at least another day.',
+            'This wormhole is beginning to decay, but will not last another day.',
+            'This wormhole is reaching the end of its natural lifetime',
+        ];
+
+        //Get the wh classes from the table
+        $class = [
+            'C1',
+            'C2',
+            'C3',
+            'C4',
+            'C5',
+            'C6',
+            'C7',
+            'C8',
+            'C9',
+            'C13',
+            'Drifter',
+            'Thera',
+            'Exit WH',
+        ];
+
+        //Get the wh types from the table
+        $type = WormholeType::groupBy('type')->pluck('type');
+
+        //Get the wh sizes from the table
+        $size = [
+            'XS',
+            'S',
+            'M',
+            'L',
+            'XL',
+        ];
+
+        //Get the wh stabilities from the table
+        $stability = [
+            'Stable',
+            'Non-Critical',
+            'Critical',
+        ];
+
+        //Return all the variables to the view
+        return view('wormholes.form')->with('class', $class)
+                                     ->with('type', $type)
+                                     ->with('size', $size)
+                                     ->with('stability', $stability)
+                                     ->with('duration', $duration);
+    }
+
+    public function storeWormhole() {
+        $this->validate($request, [
+            'sig' => 'required',
+            'duration' => 'required',
+            'dateTiume' => 'required',
+            'class' => 'required',
+            'size' => 'required',
+            'stability' => 'required',
+            'system' => 'required',
+        ]);
+
+        //Declare some variables
+        $duration = null;
+
+        //Create the stable time for the database
+        if($request->duration == 'This wormhole has not yet begun its natural cycle of decay and should last at least another day.') {
+            $duration = '>24 hours';
+        } else if ($request->duration == 'This wormhole is beginning to decay, but will not last another day.') {
+            $duration = '>4 hours <24 hours';
+        } else if($request->duration == 'This wormhole is reaching the end of its natural lifetime') {
+            '<4 hours';
+        }
+
+        //Get the wormhole type from the database so we can enter other details
+        $wormholeType = WormholeType::where([
+            'type' => $request->type,
+        ])->first();
+
+        $found = AllianceWormhole::where([
+            'system' => $request->system,
+            'sig_ig' => $request->sig,
+        ])->count();
+
+        if($found == 0) {
+            AllianceWormhole::insert([
+                'system' => $request->system,
+                'sig_id' => $request->sig_id,
+                'duration_left' => $duration,
+                'dateTime' => $request->dateTime,
+                'class' => $request->class,
+                'type' => $request->class,
+                'hole_size' => $request->size,
+                'stability' => $request->stability,
+                'details' => $request->details,
+                'link' => $request->link,
+                'mass_allowed' => $wormholeType->mass_allowed,
+                'individual_mass' => $wormholeType->individual_mass,
+                'regeneration' => $wormholeType->regeneration,
+                'max_stable_time' => $wormholeType->max_stable_time,
+            ]);
+
+            return redirect('/wormholes/display')->with('success', 'Wormhole Info Added.');
+        } else {
+            return redirect('/wormholes/display')->with('error', 'Wormhole already in database.');
+        }
+    }
+
+    public function displayWormholes() {
+        //Create the date and time
+        $dateTime = Carbon::now()->subDays(2);
+
+        //Get all of the wormholes from the last 48 hours from the database to display
+        $wormholes = AllianceWormhole::where('created_at', '>=', $dateTime)->get();
+
+        return view('wormholes.display')->with('wormholes', $wormholes);
+    }
+}

app/Http/Kernel.php

@@ -60,7 +60,7 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'callback' => \App\Http\Middleware\Callback::class,
+        //'callback' => \App\Http\Middleware\Callback::class,
         'role' => \App\Http\Middleware\RequireRole::class,
         'permission' => \App\Http\Middleware\RequirePermission::class,
     ];

app/Http/Middleware/Callback.php

@@ -2,29 +2,120 @@
 
 namespace App\Http\Middleware;
 
+//Internal Library
 use Closure;
 use Illuminate\Support\Facades\Auth;
-
 use Socialite;
 use DB;
-use App\User;
 
+//Libraries
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;
 use Seat\Eseye\Containers\EsiAuthentication;
 use Seat\Eseye\Eseye;
 
+//Models
+use App\Models\User\User;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
 class Callback
 {
     /**
-     * Handle an incoming request.
+     * Handle an incoming request for callback.  Set to handle the request after the 
+     * login controller does what it needs to do.
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, Closure $next, $ssoUser)
     {
-        return $next($request);
+        $response = $next($request);
+
+        if(isset($ssoUser->refreshToken)) {
+            //See if an access token is present for the user
+            $tokenCount = EsiToken::where(['character_id' => $ssoUser->id])->count();
+            if($tokenCount > 0) {
+                //Update the esi token
+                $this->UpdateEsiToken($ssoUser);
+            } else {
+                //Save the esi token
+                $this->SaveEsiToken($ssoUser);
+            }
+
+            //After creating or updating the token, update the table for the scopes.
+            $this->SetScopes($ssoUser->user['Scopes'], $ssoUser->id);
+        } else {
+            $created = $this->createAlt($ssoUser);
+
+        }
+
+        return $response;
+    }
+
+    /**
+     * Update the ESI Token
+     */
+    private function UpdateEsiToken($eve_user) {
+        EsiToken::where('character_id', $eve_user->id)->update([
+            'character_id' => $eve_user->getId(),
+            'access_token' => $eve_user->token,
+            'refresh_token' => $eve_user->refreshToken,
+            'inserted_at' => time(),
+            'expires_in' => $eve_user->expiresIn,
+        ]);
+    }
+
+    /**
+     * Create a new ESI Token in the database
+     */
+    private function SaveEsiToken($eve_user) {
+        $token = new EsiToken;
+        $token->character_id  = $eve_user->id;
+        $token->access_token = $eve_user->token;
+        $token->refresh_token = $eve_user->refreshToken;
+        $token->inserted_at = time();
+        $token->expires_in = $eve_user->expiresIn;
+        $token->save();
+    }
+
+    private function SetScopes($scopes, $charId) {
+        //Delete the current scopes, so we can add new scopes into the database
+        EsiScope::where('character_id', $charId)->delete();
+        $scopes = explode(' ', $scopes);
+        foreach($scopes as $scope) {
+            $data = new EsiScope;
+            $data->character_id = $charId;
+            $data->scope = $scope;
+            $data->save();
         }
     }
+
+    /**
+     * Check if an alt exists in the database, else, create and 
+     * return the user object.
+     * 
+     * @param \Laravel\Socialite\Two\User $user
+     */
+    private function createAlt($user) {
+        $altCount = UserAlt::where('character_id', $user->id)->count();
+        if($altCount == 0) {
+            $newAlt = new UserAlt;
+            $newAlt->name = $user->getName();
+            $newAlt->main_id = auth()->user()->getId();
+            $newAlt->character_id = $user->id;
+            $newAlt->avatar = $user->avatar;
+            $newAlt->access_token = $user->token;
+            $newAlt->owner_hash = $user->owner_hash;
+            $newAlt->inserted_at = time();
+            $newAlt->expires_in = $user->expiresIn;
+            $newAlt->save();
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+}
+
+

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Auth;
 
 use Socialite;
 use DB;
-use App\User;
+use App\Models\User\User;
 
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;

app/Http/Middleware/RequireRole.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 use Closure;
 
 use App\Models\User\UserRole;
+use App\Models\User\AvailableUserRole;
 
 class RequireRole
 {
@@ -17,21 +18,17 @@ class RequireRole
      */
     public function handle($request, Closure $next, $role)
     {
-        $confirmed = false;
+        $ranking = array();
+        $roles = AvailableUserRole::all();
 
-        $ranking = [
-            'None' => 0,
-            'Guest' => 1,
-            'Renter' => 2,
-            'User' => 3,
-            'Admin' => 4,
-            'SuperUser' => 5,
-        ];
+        foreach($roles as $r) {
+            $ranking[$r->role] = $r->rank;
+        }
 
         $check = UserRole::where('character_id', auth()->user()->character_id)->get(['role']);
 
         if(!isset($check[0]->role)) {
-            abort(403, "You don't any roles.  You don't belong here.");
+            abort(403, "You don't have any roles.  You don't belong here.");
         }
 
         if($ranking[$check[0]->role] < $ranking[$role]) {

app/Http/Middleware/TrimStrings.php

@@ -12,7 +12,6 @@ class TrimStrings extends Middleware
      * @var array
      */
     protected $except = [
-        'password',
-        'password_confirmation',
+        //
     ];
 }

app/Jobs/Commands/Eve/GetEveRegionsJob.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Jobs\Commands\Eve;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\Eve\EveRegion;
+
+class GetEveRegionsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $esi = new Esi();
+
+        $regions = $esi->invoke('get', '/universe/regions/');
+        $responses = $esi->setBody($regions)->invoke('post', '/universe/names/');
+
+        foreach($responses as $resp) {
+            if($resp->category == 'region') {
+                EveRegion::insertOrIgnore([
+                    'region_id' => $resp->id,
+                    'region_name' => $resp->name,
+                ]);
+            }
+        }
+
+    }
+}

app/Jobs/Commands/Market/GetMarketRegionOrderJob.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Jobs\Commands\Market;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Carbon\Carbon;
+use Log;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+
+class GetMarketRegionOrderJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Private variables
+     */
+    private $esi;
+    private $region;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($region, $esi = null)
+    {
+        //Setup the region variable
+        $this->region = $region;
+        //Setup the esi variable
+        if($esi == null) {
+            $this->esi = new Esi();
+        } else {
+            $this->esi = $esi;
+        }
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Get the market orders for a region
+        $orders = $this->esi->invoke('get', '/markets/{region_id}/orders/', [
+            'region_id' => $this->region,
+        ]);
+
+        foreach($orders as $order) {
+            $count = MarketRegionOrder::where([
+                'order_id',
+            ])->count();
+
+            if($count == 0) {
+                $newOrder = new MarketRegionOrder;
+                $newOrder->region_id = $this->region;
+                $newOrder->duration = $order->duration;
+                $newOrder->is_buy_order = $order->is_buy_order;
+                $newOrder->issued = $order->issued;
+                $newOrder->location_id = $order->location_id;
+                $newOrder->min_volume = $order->min_volume;
+                $newOrder->order_id = $order->order_id;
+                $newOrder->price = $order->price;
+                $newOrder->range = $order->range;
+                $newOrder->system_id = $order->system_id;
+                $newOrder->type_id = $order->type_id;
+                $newOrder->volume_remain = $order->volume_remain;
+                $newOrder->volume_total = $order->volume_total;
+                $newOrder->save();
+            } else if ($order->volume_remain == 0) {
+                MarketRegionOrder::where([
+                    'order_id' => $order->order_id,
+                ])->delete();
+            } else {
+                MarketRegionOrder::where([
+                    'order_id' => $order->order_id,
+                ])->update([
+                    'region_id' => $this->region,
+                    'duration' => $order->duration,
+                    'is_buy_order' => $order->is_buy_order,
+                    'issued' => $order->issued,
+                    'location_id' => $order->location_id,
+                    'min_volume' => $order->min_volume,
+                    'order_id' => $order->order_id,
+                    'price' => $order->price,
+                    'range' => $order->range,
+                    'system_id' => $order->system_id,
+                    'type_id' => $order->type_id,
+                    'volume_remain' => $order->volume_remain,
+                    'volume_total' => $order->volume_total,
+                ]);
+            }
+        }
+    }
+}

app/Jobs/Commands/Market/PurgeMarketRegionOrderJob.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class PurgeMarketRegionOrderJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //
+    }
+}

app/Jobs/Commands/Moons/FetchMoonLedgerJob.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Jobs\Commands\Moons;
+
+//Internal Libraries
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+use App\Library\Structures\StructureHelper;
+
+//App Models
+use App\Models\Moon\CorpMoonLedger;
+use App\Models\Moon\CorpMoonObserver;
+
+
+class FetchMoonLedgerJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Private Variables
+     */
+    private $charId;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($charId)
+    {
+        //Set the character id
+        $this->charId = $charId;
+
+        //Set the connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare Variables
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $response = null;
+        $structureInfo = null;
+
+        //Get the configuration for the main site
+        $config = config('esi');
+
+        //Check for esi scope for the character
+        if(!$esiHelper->HaveEsiScope($this->charId, 'esi-industry.read_corporation_mining.v1') || !$esiHelper->HaveEsiScope($this->charId, 'esi-universe.read_structures.v1')) {
+            Log::critical('The primary character does not have the necessary scopes for FetchRentalMoonLedgerCommand.');
+            return;
+        }
+
+        //Get the refresh token if the scope checks have passed
+        $refreshToken = $esiHelper->GetRefreshToken($this->charId);
+
+        //Setup the esi information
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        //Get the character data from the lookup table
+        $character = $lookup->GetCharacterInfo($this->charId);
+
+        //Get the corporation data from the lookup table
+        $corporation = $lookup->GetCorporationInfo($character->corporation_id);
+
+        //Setup the structure helper
+        $structure = new StructureHelper($this->charId, $character->corporation_id, $esi);
+
+        //Get the moon observers from the database
+        $observers = CorpMoonObserver::where([
+            'corporation_id' => $character->corporation_id,
+        ])->get();
+
+        foreach($observers as $observer) {
+            //Try to get the ledger data from the esi
+            try {
+                $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                    'corporation_id' => $character->corporation_id,
+                    'observer_id' => $observer->observer_id,
+                ]);
+            } catch(RequestFailedException $e) {
+                //Log the exception
+                Log::critical('FetchMoonLedger job failed to get the mining ledgers.');
+            }
+
+            if($ledgers != null) {
+                foreach($ledgers as $ledger) {
+                    //Get the ore name from the lookup table
+                    $ore = $lookup->ItemIdToName($ledger->type_id);
+
+                    //Get the character name from the lookup helper
+                    $charInfo = $lookup->GetCharacterInfo($ledger->character_id);
+                    //Get the corporation info from the lookup helper
+                    $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
+                    //Get the recorded corporation information
+                    $recordedCorpInfo = $lookup->GetCorporationInfo($ledger->recorded_corporation_id);
+
+                    $entries[] = [
+                        'corporation_id' => $corpInfo->corporation_id,
+                        'corporation_name' => $corpInfo->name,
+                        'character_id' => $ledger->character_id,
+                        'character_name' => $charInfo->name,
+                        'observer_id' => $observer->observer_id,
+                        'observer_name' => $observer->observer_name,
+                        'type_id' => $ledger->type_id,
+                        'ore' => $ore,
+                        'quantity' => $ledger->quantity,
+                        'recorded_corporation_id' => $ledger->recorded_corporation_id,
+                        'recorded_corporation_name' => $recordedCorpInfo->name,
+                        'last_updated' => $ledger->last_updated,
+                        'created_at' => $ledger->last_updated . ' 23:59:59',
+                        'updated_at' => $ledger->last_updated . ' 23:59:59',
+                    ];
+                }
+
+                //Insert or ignore each entry into the database
+                CorpMoonLedger::insertOrIgnore($entries);
+
+                Log::info('FetchMoonLedgerJob inserted up to ' . count($entries) . 'into the database.');
+            }
+        }
+    }
+}

app/Jobs/Commands/Moons/FetchMoonObserverJob.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Jobs\Commands\Moons;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+use App\Library\Structures\StructureHelper;
+
+//App Models
+use App\Models\Moon\CorpMoonObserver;
+
+class FetchMoonObserverJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Private variables
+     */
+    private $charId;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($charId)
+    {
+        //Set the character id
+        $this->charId = $charId;
+
+        //Set the connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare some variables
+        $lookup = new LookupHelper;
+        $esiHelper = new Esi;
+
+        //Get the configuration from the main site
+        $config = config('esi');
+
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope($this->charId, 'esi-industry.read_corporation_mining.v1') || !$esiHelper->HaveEsiScope($this->charId, 'esi-universe.read_structures.v1')) {
+            Log::warning('Esi scopes were not found for Fetch Moon Observers job.');
+            return;
+        }
+
+        //Get the refresh token for the character
+        $refreshToken = $esiHelper->GetRefreshToken($this->charId);
+        //Get the esi variable
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);       
+
+        //With the lookup helper, get the character information
+        $character = $lookup->GetCharacterInfo($this->charId);
+        //With the lookup helper, get the corporation information
+        $corporation = $lookup->GetCorporationInfo($character->corporation_id);
+
+        //Delcare the structure helper since we have the necessary data
+        $structureHelper = new StructureHelper($this->charId, $character->corporation_id, $esi);
+
+        //Get the mining observers for the corporation's from esi
+        try {
+            $response = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+                'corporation_id' => $character->corporation_id,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::critical('FetchMoonObservers failed to get the moon observers for the corporation');
+            return null;
+        }
+
+        //Run through the mining observers, and add them to the database as needed
+        foreach($response as $observer) {
+            $count = CorpMoonObserver::where(['observer_id' => $observer->observer_id])->count();
+            //If the observer is not found, then add it to the database
+            if($count == 0) {
+                //Get the structure information from the universe structure esi endpoint
+                $structureInfo = $structureHelper->GetStructureInfo($observer->observer_id);
+                //Create a new corp moon observer in the database
+                $obs = new CorpMoonObserver;
+                $obs->corporation_id = $character->corporation_id;
+                $obs->corporation_name = $corporation->name;
+                $obs->observer_id = $observer->observer_id;
+                $obs->observer_name = $structureInfo->name;
+                $obs->observer_owner_id = $structureInfo->owner_id;
+                $obs->solar_system_id = $structureInfo->solar_system_id;
+                $obs->observer_type = $observer->observer_type;
+                $obs->observer_type_id = $structureInfo->type_id;
+                $obs->last_updated = $observer->last_updated;
+                $obs->save();
+            } else {
+                CorpMoonObserver::where([
+                    'observer_id' => $observer->observer_id,
+                ])->update([
+                    'last_updated' => $observer->last_updated,
+                ]);
+            }
+        }
+    }
+}

app/Jobs/Commands/Moons/PurgeMoonLedgerJob.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Jobs\Commands\Moons;
+
+//Internal Libraries
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+use Carbon\Carbon;
+
+//App Models
+use App\Models\Moon\CorpMoonLedger;
+
+class PurgeMoonLedgerJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //Set the connection for the job
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $previous = Carbon::now()->subDays(60);
+
+        //Remove old ledger entries
+        CorpMoonLedger::where('created_at', '<', $previous)->delete();
+    }
+}

app/Jobs/Commands/Not Used/FetchRentalMoonLedgerJob.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Jobs\Commands;
+
+//Internal Libraries
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+
+//App Models
+use App\Models\RentalMoonLedger;
+use App\Models\RentalMoonObserver;
+
+class FetchRentalMoonLedgerJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare variables
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $response = null;
+        $structureInfo = null;
+        $entries = array();
+
+        //Get the configuration for the main site
+        $config = config('esi');
+
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1') || !$esiHelper->HaveEsiScope($config['primary'], 'esi-universe.read_structures.v1')) {
+            Log::critical('The primary character does not have the necessary scopes for FetchRentalMoonLedgerCommand.');
+            return;
+        }
+
+        //Get the refresh token if scope checks have passed
+        $refreshToken = $esiHelper->GetRefreshtoken($config['primary']);
+
+        //Get the character data from the lookup table if possible or esi
+        $character = $lookup->GetCharacterInfo($config['primary']);
+
+        //Get all of the rental moon observers from the database
+        $observers = RentalMoonObserver::all();
+
+        //Dump the mining ledger table for rental moons
+        RentalMoonLedger::truncate();
+
+        //Foreach observer get the ledger
+        foreach($observers as $observer) {
+            //Get the observer name.
+            $observerInfo = Structure::where([
+                'structure_id' => $observer->observer_id,
+            ])->first();
+
+            try {
+                $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                    'corporation_id' => $character->corporation_id,
+                    'observer_id' => $observer->observer_id,
+                ]);
+            } catch(RequestFailedException $e) {
+                //If an exception has occurred, then log it
+                Log::critical('FetchRentalMoonLedger command failed to get the mining ledger for observer id: ' . $observer->observer_id);
+            }
+            
+            if($ledgers != null) {
+                foreach($ledgers as $ledger) {
+                    //Get the ore name from the lookup table
+                    $ore = $lookup->ItemIdToName($ledger->type_id);
+
+                    //Get the character name from the lookup helper using the characterId
+                    $charInfo = $lookup->GetCharacterInfo($ledger->character_id);
+                    //Get the corporation information
+                    $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
+
+                    //Get the recorded corporation information
+                    $recordedCorpInfo = $lookup->GetCorporationInfo($ledger->recorded_corporation_id);
+
+                    $entries[] = [
+                        'corporation_id' => $corpInfo->corporation_id,
+                        'corporation_name' => $corpInfo->name,
+                        'character_id' => $ledger->character_id,
+                        'character_name' => $charInfo->name,
+                        'observer_id' => $observer->observer_id,
+                        'observer_name' => $observerInfo->name,
+                        'type_id' => $ledger->type_id,
+                        'ore' => $ore,
+                        'quantity' => $ledger->quantity,
+                        'recorded_corporation_id' => $ledger->recorded_corporation_id,
+                        'recorded_corporation_name' => $recordedCorpInfo->name,
+                        'last_updated' => $ledger->last_updated,
+                        'created_at' => $ledger->last_updated . ' 23:59:59',
+                        'updated_at' => $ledger->last_updated . ' 23:59:59',
+                    ];
+                }
+
+                //Insert or ignore each of the records saved into the array through the foreach loop
+                RentalMoonLedger::insertOrIgnore($entries);
+
+                Log::info(
+                    'FetchRentalMoonLedgerJob inserted up to ' .count($entires) . ' new ledger entries.'
+                );
+
+            }
+        } 
+    }
+}

app/Jobs/Commands/Not Used/FetchRentalMoonObserversJob.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Jobs\Commands;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+
+
+//App Models
+use App\Models\Moon\RentalMoonObserver;
+
+class FetchRentalMoonObserversJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare some variables
+        $lookup = new LookupHelper;
+        $esi = new Esi;
+        $obss = array();
+
+        //Get the configuration for the main site
+        $config = config('esi');
+
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1') || !$esiHelper->HaveEsiScope($config['primary'], 'esi-universe.read_structures.v1')) {
+            Log::critical('The primary character does not have the necessary scopes for FetchRentalMoonObservers.');
+            return;
+        }
+
+        //Get the refresh token for spatial forces
+        $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+
+        //Get the character data from the lookup table if possible or esi
+        $character = $lookup->GetCharacterInfo($config['primary']);
+
+        //Get the mining observers for spatial forces from esi
+        try {
+            $responses = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+                'corporation_id' => $character->corporation_id,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::critical('RentalMoonObservers failed to get the moon observers for Spatial Forces.');
+        }
+
+        //Run through the mining observers, and add them to the database as needed
+        foreach($responses as $observer) {
+            //Populate the array with the data, so we can do an insert or ignore after the foreach loop is completed.
+            $obss[] = [
+                'observer_id' => $observer->observer_id,
+                'observer_type' => $observer->observer_type,
+                'last_updated' => $esi->DecodeDate($observer->last_updated)
+            ];
+        }
+
+        RentalMoonObserver::insertOrIgnore($obss);
+    }
+}

app/Jobs/Commands/PublicContracts/GetPublicContractItemsJob.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Jobs\Commands\PublicContracts;
+
+//Internal Libraries
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+use Carbon\Carbon;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+
+//Jobs
+use App\Jobs\Commands\PublicContracts\GetPublicContractItemsJob;
+
+//Models
+use App\Models\PublicContracts\PublicContract;
+use App\Models\PublicContracts\PUblicContractItem;
+
+class GetPublicContractItemsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Private Variables
+     */
+    private $esi;
+    private $contractId;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($esi, $contract)
+    {
+        //Setup the variables
+        $this->esi = $esi;
+        $this->contractId = $contract;
+
+        //Set the connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Get the items from esi
+        $responses = $this->esi->invoke('get', '/contracts/public/items/{contract_id}/', [
+            'contract_id' => $this->contract,
+        ]);
+
+        foreach($response as $resp) {
+            //See if the item exists
+            $count = PublicContractItems::where([
+                'record_id' => $resp->record_id,
+            ])->count();
+            
+            //If the item doesn't exist in the database, save it to the database
+            if($count == 0) {
+                $contractItem = new PublicContractItems;
+                if(isset($resp->is_blueprint_copy)) {
+                    $contractItem->is_blueprint_copy = $resp->is_blueprint_copy;
+                }
+                $contractItem->is_included = $resp->is_included;
+                if(isset($resp->item_id)) {
+                    $contractItem->item_id = $resp->item_id;
+                }
+                if(isset($resp->material_efficiency)) {
+                    $contractItem->material_efficiency = $resp->material_efficiency;
+                }
+                $contractItem->quantity = $resp->quantity;
+                $contractItem->recorded_id = $resp->recorded_id;
+                if(isset($resp->runs)) {
+                    $contractItem->runs = $resp->runs;
+                }
+                if(isset($resp->time_efficiency)) {
+                    $contractItem->time_efficiency = $resp->time_efficiency;
+                }
+                $contractItem->type_id = $resp->type_id;
+                $contractItem->save();
+            }
+        }
+    }
+}

app/Jobs/Commands/PublicContracts/GetPublicContractsJob.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Jobs\Commands\PublicContracts;
+
+//Internal Libraries
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+use Carbon\Carbon;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHellper;
+
+//Models
+use App\Models\PublicContracts\PublicContract;
+
+class GetPublicContractsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Job Variables
+     */
+    private $esi;
+    private $region;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($regionId, $esi = null)
+    {
+        //Setup the esi authentication container
+        if($esi == null) {
+            $this->esi = new Esi();
+        } else {
+            $this->esi = $esi;
+        }
+        //Set the region code
+        $this->region = $regionId;
+
+        //Set the connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     * The job gets all of the contracts in a region
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $responses = $this->esi->invoke('get', '/contracts/public/{region_id}/', [
+            'region_id' => $this->region,
+        ]);
+
+        foreach($response as $resp) {
+            $count = PublicContract::where([
+                'contract_id' => $resp->contract_id,
+            ])->count();
+            if($count == 0) {
+                $pub = new PublicContract;
+                $pub->region_id = $this->region;
+                if(isset($resp->buyout)) {
+                    $pub->buyout = $resp->buyout;
+                }
+                if(isset($resp->collateral)) {
+                    $pub->collateral = $resp->collateral;
+                }
+                $pub->contract_id = $resp->contract_id;
+                $pub->date_expired = $resp->date_expired;
+                $pub->date_issed = $resp->date_issed;
+                if(isset($resp->days_to_complete)) {
+                    $pub->days_to_complete = $resp->days_to_complete;
+                }
+                if(isset($resp->end_location_id)) {
+                    $pub->end_location_id = $resp->end_location_id;
+                }
+                if(isset($resp->for_corporation)) {
+                    $pub->for_corporation = $resp->for_corporation;
+                }
+                $pub->issuer_corporation_id = $resp->issuer_corporation_id;
+                $pub->issuer_id = $resp->issuer_id;
+                if(isset($resp->price)) {
+                    $pub->price = $resp->price;
+                }
+                if(isset($resp->reward)) {
+                    $pub->reward = $resp->reward;
+                }
+                if(isset($resp->start_location_id)) {
+                    $pub->start_location_id = $resp->start_location_id;
+                }
+                if(isset($resp->title)) {
+                    $pub->title = $resp->title;
+                }
+                $pub->type = $resp->type;
+                if(isset($resp->volume)) {
+                    $pub->volume = $resp->volume;
+                }
+                //Save the new contract
+                $pub->save();
+
+                //Dispatch a job to collect the contract items
+                GetPublicContractItemsJob::dispatch($this->esi, $resp->contract_id);
+            }
+        }
+    }
+}

app/Jobs/Commands/PublicContracts/PurgePublicContracts.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Jobs\Commands\PublicContracts;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Carbon\Carbon;
+use Log;
+
+//Library
+
+//Models
+use App\Models\PublicContracts\PublicContract;
+use App\Models\PublicContracts\PublicContractItem;
+
+
+/**
+ * Job to purge some old data from the public contracts
+ */
+class PurgePublicContracts implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //Set the connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Get today's date
+        $today = Carbon::now();
+
+        //If the date for a contract has expired, then purge it from the system
+        $contracts = PublicContract::all();
+        
+        //Check each contract to see if it has expired
+        foreach($contracts as $contract) {
+            //If the contract has expired, then delete the contract and all of it's items
+            if($today->greaterThan($contract->date_expired)) {
+                //Delete the contract
+                PublicContract::where([
+                    'id' => $contract->id,
+                ])->delete();
+
+                //Delete the items from the contract from the other table
+                PublicContract::where([
+                    'contract_id' => $contract->id,
+                ])->delete();
+            }
+        }
+    }
+}

app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php

@@ -0,0 +1,195 @@
+<?php
+
+namespace App\Jobs\Commands\RentalMoons;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+use Carbon\Carbon;
+
+//Library
+use App\Library\Lookups\LookupHelper;
+
+//Jobs
+use App\Jobs\ProcessSendEvveMailJob;
+
+//Models
+use App\Models\MoonRentals\AllianceRentalMoon;
+use App\Models\Mail\SentMail;
+
+
+/**
+ * This job will send out a reminder about the moon rental payment being due
+ * when it's due based on the rental paid date versus rental date.  If the paid
+ * date is in the future from today, then we don't need to send out a reminder.
+ * If the paid date is today or less, then we need to send out a reminder about
+ * paying for the moon rental.
+ */
+class SendMoonRentalPaymentReminderJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 1600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //Set the queue connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Get today's date
+        $today = Carbon::now();
+        $today->second = 1;
+        $today->minute = 0;
+        $today->hour = 0;
+        //Declare some other variables
+        $totalCost = 0.00;
+        $moonList = array();
+        $delay = 30;
+        $lookup = new LookupHelper;
+        $config = config('esi');
+
+        //Get all of the contacts from the rentals group
+        $contacts = AllianceMoonRental::select('rental_contact_id')->groupBy('rental_contact_id')->get();
+
+        //For each of the contacts, totalize the moon rentals, and create a reminder mail
+        foreach($contacts as $contact) {
+            //Get the moons the renter is renting, but only get the ones whose paid date is not after today.
+            $dues = $this->GetMoonDueList($contact->rental_contact_id);
+
+            //Get the list of moons for the mail body.
+            $alls = $this->GetMoonRentalList($contact->rental_contact_id);
+
+            //Totalize the cost for the moons whose rent is due
+            $cost = $this->TotalizeMoonCost($contact->rental_contact_id);
+
+            //For each of the rentals, build the mail body, and totalize the cost of the moon
+            $body = "Moon Rent is due for the following moons:<br>";
+            foreach($rentalsDue as $due) {
+                $body .= $due . "<br>";
+            }
+            //Put the price for the moons 
+            $body .= "The price for next month's rent is " . number_format($cost, 0, ".", ",") . "<br>";
+            $body .= "Rental Payment is due on the 1st of the month should you continue to want to rent the moons.<br>";
+            $body .= "Rental Payment should be transferred to Spatial Forces.<br>";
+            $body .= "In the description of the payment please put the following transaction identification: " . $transId . "<br>";
+            $body .= "<br>";
+            $body .= $contact->contact_name . " is responsible for payment of the moons.<br>";
+            $body .= "The following moons are being rented:<br>";
+            foreach($alls as $all) {
+                $body .= $all . "<br>";
+            }
+            $body .= "<br>";
+            $body .= "Sincerely,<br>";
+            $body .= "Warped Intentions Leadership<br>";
+
+            //Create the subject line
+            $subject = "Warped Intentions Moon Rental Payment Due for " . $today->englishMonth;
+            //Dispatch the mail job if the contact type is a character, otherwise
+            //dispatch the job to the ceo of the corporation instead.  If the contact is an alliance
+            //dispatch the job to the ceo of the holding corporation.
+            if($contact->contact_type == 'Character') {
+                ProcessSendEveMailJob::dispatch($body, (int)$contact->rental_contact_id, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($delay));
+                //Increment the delay to get ready for the next mail job
+                $delay += 30;
+            } else if($contact->contact_type == 'Corporation') {
+                //Get the CEO of the corporation from the lookup helper
+                $corporation = $lookup->GetCorporationInfo($contact->rental_contact_id);
+                $charId = $corporation->ceo_id;
+                //Send out the mail
+                ProcessSendEveMailJob::dispatch($body, (int)$charId, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($delay));
+                //Increment the delay to get ready for the next mail job
+                $delay += 30;
+            } else if($contact->contact_type == 'Alliance') {
+                //Get the holding corporation from the lookup helper
+                $alliance = $lookup->GetAllianceInfo($contact->rental_contact_id);
+                //Get the CEO of the corporation of the holding corp from the lookup helper
+                $corporation = $lookup->GetCorporationInfo($alliance->executor_corporation_id);
+                $charId = $corporation->ceo_id;
+                //Send out the mail
+                ProcessSendEveMailJob::dispatch($body, (int)$charId, 'character', $subject, $config['primaryh'])->onQueue('mail')->delay(Carbon::now()->addSeconds($delay));
+                //Increment the detaly to get ready for the next mail job
+                $delay += 30;
+            }
+        }
+    }
+
+    private function GetMoonRentalsList($contact) {
+        //Declare the variables
+        $list = array();
+
+        $moons = AllianceMoonRental::where([
+            'rental_contact_id' => $contact,
+        ])->get();
+
+        foreach($moons as $moon) {
+            $temp = 'Rental: ' . $moon->region . ' - ' . $moon->system . ' - ' . $moon->planet . ' - ' . $moon->moon;
+            array_push($list, $temp);
+        }
+
+        //Return the list
+        return $list;
+    }
+
+    private function GetMoonDueList($contact) {
+        //Declare the variables
+        $list = array();
+
+        $moons = AllianceMoonRental::where([
+            'rental_contact_id' => $contact,
+        ])->where('paid_until', '<=', $today)->get();
+
+        //Create the list
+        foreach($moons as $moon) {
+            $temp = 'Rental: ' . $moon->region . ' - ' . $moon->system . ' - ' . $moon->planet . ' - ' . $moon->moon;
+            array_push($list, $temp);
+        }
+
+        //Return the list
+        return $list;
+    }
+
+    private function TotalizeCost($rentals, $rentalType) {
+        //Declare the stuff we need
+        $totalCost = 0.00;
+
+        //Totalize the cost
+        foreach($rentals as $rental) {
+            if($rentalType = 'In Alliance') {
+                $totalCost += $rental->alliance_rental_price;
+            } else {
+                $totalCost += $rental->out_of_alliance_rental_price;
+            }
+        }
+
+        return $totalCost;
+    }
+}

app/Jobs/Commands/RentalMoons/UpdateMoonRentalPaidState.php

@@ -0,0 +1,153 @@
+<?php
+
+namespace App\Jobs\Commands\RentalMoons;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Carbon\Carbon;
+use Log;
+
+//Library
+use App\Library\Lookups\LookupHelper;
+
+//Models
+use App\Models\MoonRentals\AllianceRentalMoon;
+
+//Jobs
+use App\Jobs\ProcessSendEveMailJob;
+
+class UpdateMoonRentalPaidState implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 1600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //Set the queue connection up
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare variables
+        $mailDelay = 5;
+
+        //Get all of the moons from the rental database
+        $moons = AllianceRentalMoons::all();
+
+        //Set today's date
+        $today = Carbon::now();
+
+        //Get the esi configuration
+        $esiConfig = config('esi');
+
+        /**
+         * For each of the moons check the rental until date, the paid until date,
+         * and compare them to today's current date.
+         * 
+         * If the paid date is later than the rental until date, then update the rental until
+         * date to match the paid date.  If the paid until date is today or less, then update the
+         * paid column of the moon to not paid.  If the moon hasn't been paid 2 weeks after the first
+         * of the month, then remove the renter, and send an eve mail to alliance leadership, and the renter
+         * denoting failure of payment has resulted in the moon rental for the current month being
+         * revoked.
+         */
+        foreach($moon as $rental) {          
+            //Setup the rental date, paid until date, and today's date as functions of Carbon library
+            $rentedUntil = new Carbon($rental->rental_until);
+            $paidUntil = new Carbon($rental->paid_until);
+
+            //If the paid date is larger than the rental date, then update the rental date
+            if($paidUntil->greaterThan($rentedUntil)) {
+                AllianceMoonRental::where([
+                    'region' => $rental->region,
+                    'system' => $rental->system,
+                    'planet' => $rental->planet,
+                    'moon' => $rental->moon,
+                ])->update([
+                    'rental_until' => $rental->paid_until,
+                ]);
+            }
+
+            //If the paid date is today or less, then update the paid column of the moon as not paid
+            if($paidUntil->greaterThanOrEqualTo($today)) {
+                AllianceMoonRental::where([
+                    'region' => $rental->region,
+                    'system' => $rental->system,
+                    'planet' => $rental->planet,
+                    'moon' => $rental->moon,
+                ])->update([
+                    'paid' => 'No',
+                ]);
+            }
+
+            //If the moon hasn't been paid for in two weeks, then remove the renter,
+            //then send the renter and w4rp leadership a mail.
+            if($paidUntil->greaterThanOrEqualTo($today->subWeeks(2))) {
+                //Declare the lookup helper as it will be needed
+                $lookupHelper = new LookupHelper;
+
+                //Get the character id for Minerva Arbosa and Rock Onzo
+                $minerva = $lookupHelper->CharacterNameToId('Minerva Arbosa');
+                $rock = $lookupHelper->CharacterNameToId('Rock Onzo');
+
+                //Remove the renter
+                AllianceMoonRental::where([
+                    'region' => $rental->region,
+                    'system' => $rental->system,
+                    'planet' => $rental->planet,
+                    'moon' => $rental->moon,
+                ])->update([
+                    'rental_type' => 'Not Rented',
+                    'rental_until' => null,
+                    'rental_contact_id' => 0,
+                    'rental_contact_type' => null,
+                    'paid' => 'Not Rented',
+                    'paid_until' => null,
+                ]);
+
+                //Send a mail over to the alliance leadership, and the former renter with
+                //why the moon was removed.
+                $subject = "W4RP Moon Rental Cancelled";
+
+                //Dispatch the mail job
+                ProcessSendEveMailJob::dispatch($body, (int)$rental->rental_contact_id, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($mailDelay));
+                $mailDelay += 30;
+                if($minerva != null) {
+                    ProcessSendEveMailJob::dispatch($body, (int)$minerva, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($mailDelay));
+                    $mailDelay += 30;
+                }
+                if($rock != null) {
+                    ProcessSendEveMailJob::dispatch($body, (int)$rock, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds($mailDelay));
+                }
+            }
+        }
+    }
+}

app/Jobs/Commands/RentalMoons/UpdateMoonRentalPrice.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Jobs\Commands\RentalMoons;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//Library
+use App\Library\Moons\MoonCalc;
+
+//Models
+use App\Models\MoonRentals\AllianceRentalMoon;
+
+/**
+ * This job performs the action of updating the moon rental price once per day.
+ */
+class UpdateMoonRentalPrice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3200;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 1;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //Set the connection for the job
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare the helper for moon calculations
+        $moonHelper = new MoonCalc;
+        //Get all the moons from the rental database
+        $moons = AllianceRentalMoon::all();
+
+        /**
+         * Calculate the worth of each moon along with the rental prices.
+         * For all of the moon calculations, the price of the mineral is averaged,
+         * thereby, the price of the moon worth is also averaged based on the averaging
+         * of the mineral price.
+         */
+        foreach($moons as $rental) {
+            //Calculate the total worth of the moon
+            $totalWorth = $moonHelper->SpatialMoonsTotalWorth(
+                $rental->first_ore, $rental->first_quantity,
+                $rental->second_ore, $rental->second_quantity,
+                $rental->third_ore, $rental->third_quantity,
+                $rental->fourth_ore, $rental->fourth_quantity,
+            );
+
+            //Calculate the rental prices of the moon
+            $rentalPrice = $moonHelper->SpatialMoons(
+                $rental->first_ore, $rental->first_quantity,
+                $rental->second_ore, $rental->second_quantity,
+                $rental->third_ore, $rental->third_quantity,
+                $rental->fourth_ore, $rental->fourth_quantity,
+            );
+
+            //Update the moon in the database
+            AllianceRentalMoon::where([
+                'region' => $rental->region,
+                'system' => $rental->system,
+                'planet' => $rental->planet,
+                'moon' => $rental->moon,
+            ])->update([
+                'moon_worth' => $totalWorth,
+                'alliance_rental_price' => $rentalPrice['alliance'],
+                'out_of_alliance_rental_price' => $rentalPrice['outofalliance'],
+            ]);
+        }
+    }
+}

app/Jobs/Commands/RentalMoons/UpdateRentalMoonPullJob.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Jobs\Commands\RentalMoons;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+use Carbon\Carbon;
+
+//Library
+use App\Library\Esi\Esi;
+use Seat\Eseye\Exceptions\RequestFailedException;
+
+//Models
+use App\Models\MoonRentals\AllianceRentalMoon;
+use App\Models\Esi\EsiScope;
+use App\Models\Esi\EsiToken;
+
+class UpdateRentalMoonPullJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //Set the queue connection
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Setup the configuration variable for ESI
+        $config = config('esi');
+        //Setup the esi helper variable
+        $esiHelper = new Esi;
+        
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
+            //Send a mail to the holding toon to update the esi scopes
+            return null;
+        }
+
+        //Is this valid?
+        AllianceRentalMoon::update([
+            'next_moon_pull' => null,
+        ]);
+
+        //Reset all table entries to clear out the next moon pull entry
+        $allMoons = AllianceRentalMoon::all();
+        //Cycle through all of the moons, and make the next moon pull null
+        foreach($allMoons as $moon) {
+            AllianceRentalMoon::where([
+                'system' => $moon->system,
+                'planet' => $moon->planet,
+                'moon' => $moon->moon,
+            ])->update([
+                'next_moon_pull' => null,
+            ]);
+        }
+
+        //Get the refresh token
+        $token = $esiHelper->GetRefreshToken($config['primary']);
+        //Setup the esi authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+
+        try {
+            $responses = $esi->invoke('get', '/corporation/{corporation_id}/mining/extractions/', [
+                'corporation_id' => 98287666,
+            ]);
+        } catch(RequestExceptionFailed $e) {
+            return null;
+        }
+
+        foreach($response as $response) {
+            //Get whether the structure is being used by the alliance or not.
+            $usage = AllianceRentalMoon::where([
+                'structure_id' => $response->structure_id,
+                'rental_type' => 'Alliance',
+            ])->count();
+
+            if($usage > 0) {
+                AllianceRentalMoon::where([
+                    'structure_id' => $response->structure_id,
+                ])->update([
+                    'next_moon_pull' => $response->chunk_arrival_time,
+                ]);
+            }
+        }
+    }
+}

app/Jobs/ProcessAssetsJob.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+
+//App Library
+use App\Library\Structures\StructureHelper;
+use App\Jobs\Library\JobHelper;
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use Seat\Eseye\Containers\EsiAuthentication;
+use Seat\Eseye\Eseye;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Assets\AssetHelper;
+
+//App Models
+use App\Models\Jobs\JobStatus;
+use App\Models\Stock\Asset;
+
+class ProcessAssetsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Number of job retries
+     */
+    public $tries = 3;
+
+    /**
+     * Job Variables
+     */
+    private $charId;
+    private $corpId;
+    private $page;
+    private $esi;
+
+    protected $location_array = [
+        'StructureFuel',
+        'FighterBay',
+    ];
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($charId, $corpId, $page)
+    {
+        $this->charId = $charId;
+        $this->corpId = $corpId;
+        $this->page = $page;
+
+        //Set the connection for the job
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     * The job's task is to get all fo the information for all of the assets in
+     * a structure and store them in the database.  This task can take a few seconds
+     * therefore we want the Horizon job queue to take care of the request rather
+     * than the cronjob.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare the asset helper
+        $aHelper = new AssetHelper($this->charId, $this->corpId, $this->page);
+
+        //Get a page of assets
+        $assets = $aHelper->GetAssetsByPage();
+
+        //Cycle through the assets, and attmept to store them.
+        foreach($assets as $asset) {
+            //If the asset is in one of the locations we want, then store
+            //or update the asset
+            if(in_array($asset->location_flag, $this->location_array)) {
+                //Attempt to store the asset
+                $aHelper->StoreNewAsset($asset);
+            }
+        }
+
+        //Purge Stale Data
+        $aHelper->PurgeStaleData();
+    }
+}

app/Jobs/ProcessSendEveMailJob.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Jobs;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
+use Carbon\Carbon;
+
+//Library
+use App\Library\Esi\Esi;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+
+//Models
+use App\Models\Esi\EsiScope;
+use App\Models\Esi\EsiToken;
+use App\Models\Jobs\JobStatus;
+use App\Models\Mail\SentMail;
+
+class ProcessSendEveMailJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    private $sender;
+    private $body;
+    private $recipient;
+    private $recipient_type;
+    private $subject;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($body, $recipient, $recipient_type, $subject, $sender) {
+        $this->body = $body;
+        $this->recipient = $recipient;
+        $this->recipient_type = $recipient_type;
+        $this->subject = $subject;
+        $this->sender = $sender;
+
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     * Utilized by using ProcessSendEveMailJob::dispatch($mail);
+     * The model is passed into the dispatch function, then added to the queue
+     * for processing.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare some variables
+        $esiHelper = new Esi;
+
+        //Get the esi configuration
+        $config = config('esi');
+
+        //Retrieve the token for main character to send mails from
+        $token = $esiHelper->GetRefreshToken($config['primary']);
+
+        //Create the ESI authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+
+        //Attemp to send the mail
+        try {
+            $esi->setBody([
+                'approved_cost' => 100,
+                'body' => $this->body,
+                'recipients' => [[
+                    'recipient_id' => $this->recipient,
+                    'recipient_type' => $this->recipient_type,
+                ]],
+                'subject' => $this->subject,
+            ])->invoke('post', '/characters/{character_id}/mail/', [
+                'character_id'=> $this->sender,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::warning($e);
+            return null;
+        }
+
+        $this->SaveSentRecord($this->sender, $this->subject, $this->body, $this->recipient, $this->recipient_type);
+        
+        $this->delete();
+    }
+
+    /**
+     * The job failed to process.
+     *
+     * @param  Exception  $exception
+     * @return void
+     */
+    public function failed($exception)
+    {
+        Log::critical($exception);
+    }
+
+    private function SaveSentRecord($sender, $subject, $body, $recipient, $recipientType) {
+        $sentmail = new SentMail;
+        $sentmail->sender = $sender;
+        $sentmail->subject = $subject;
+        $sentmail->body = $body;
+        $sentmail->recipient = $recipient;
+        $sentmail->recipient_type = $recipientType;
+        $sentmail->save();
+    }
+}

app/Jobs/ProcessStructureJob.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+
+//App Library
+use App\Library\Structures\StructureHelper;
+
+//App Models
+use App\Models\Jobs\JobStatus;
+
+class ProcessStructureJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Number of job retries
+     */
+    public $tries = 3;
+
+    /**
+     * Job Variables
+     */
+    private $charId;
+    private $corpId;
+    private $page;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($charId, $corpId, $page)
+    {
+        $this->charId = $charId;
+        $this->corpId = $corpId;
+        $this->page = $page;
+
+        //Set the connection for the job
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     * The job's task is to get all of the information for a particular structure
+     * and store it in the database.  This task can take a few seconds because of the ESI
+     * calls required to store the information.  We leave this type of job up to the queue
+     * in order to take the load off of the cron job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $sHelper = new StructureHelper($this->charId, $this->corpId);
+
+        $structures = $sHelper->GetStructuresByPage($this->page);
+
+        foreach($structures as $structure) {
+            $sHelper->ProcessStructure($structure);
+        }
+
+        //After the job is completed, delete the job
+        $this->delete();
+    }
+}

app/Jobs/ProcessWalletJournalJob.php

@@ -8,6 +8,7 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Log;
 
 //App Library
 use App\Library\Finances\Helper\FinanceHelper;
@@ -26,7 +27,7 @@ class ProcessWalletJournalJob implements ShouldQueue
      * 
      * @var int
      */
-    public $timeout = 300;
+    public $timeout = 3600;
 
     public $tries = 3;
 
@@ -39,13 +40,12 @@ class ProcessWalletJournalJob implements ShouldQueue
      *
      * @return void
      */
-    public function __construct(JobProcessWalletJournal $pwj) {
-        $this->division = $pwj->division;
-        $this->charId = $pwj->charId;
-        $this->page = $pwj->page;
+    public function __construct($division, $charId, $page) {
+        $this->division = $division;
+        $this->charId = $charId;
+        $this->page = $page;
 
-        $this->delay = 15;
-        $this->connection = 'database';
+        $this->connection = 'redis';
     }
 
     /**
@@ -75,6 +75,6 @@ class ProcessWalletJournalJob implements ShouldQueue
      */
     public function failed($exception)
     {
-        dd($exception);
+        Log::critical($exception);
     }
 }

app/Jobs/ProcessWallettransactionJob.php

@@ -1,75 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-//Internal Libraries
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-//App Library
-use App\Library\Finances\Helper\FinanceHelper;
-use App\Jobs\Library\JobHelper;
-
-//App Models
-use App\Models\Jobs\JobProcessWalletTransaction;
-use App\Models\Jobs\JobError;
-use App\Models\Jobs\JobStatus;
-
-class ProcessWalletTransactionJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Timeout in seconds
-     * 
-     * @var int
-     */
-    public $timeout = 300;
-
-    public $tries = 3;
-
-    private $division;
-    private $charId;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(JobProcessWalletTransaction $pwt)
-    {
-        $this->division = $pwt->division;
-        $this->charId = $pwt->charId;
-        
-        $this->connection = 'database';
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        //Declare the class variables
-        $finance = new FinanceHelper();
-
-        $finance->GetWalletTransaction($this->division, $this->charId);
-
-        //After the job is completed, delete the job
-        $this->delete();
-    }
-
-    /**
-     * The job failed to process
-     * 
-     * @param Exception $exception
-     * @return void
-     */
-    public function failed($exception) {
-        dd($exception);
-    }
-}

app/Jobs/SendEveMailJob.php

@@ -1,116 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-//Internal Library
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-//Seat stuff
-use Seat\Eseye\Configuration;
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-use Seat\Eseye\Exceptions\RequestFailedException;
-
-//Models
-use App\Models\Esi\EsiScope;
-use App\Models\Esi\EsiToken;
-use App\Models\Mail\EveMail;
-use App\Models\Jobs\JobError;
-use App\Models\Jobs\JobStatus;
-
-class SendEveMailJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Timeout in seconds
-     * 
-     * @var int
-     */
-    public $timeout = 120;
-
-    /**
-     * Retries
-     * 
-     * @var int
-     */
-    public $retries = 3;
-
-    private $body;
-    private $recipient;
-    private $recipient_type;
-    private $subject;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(EveMail $mail) {
-        $this->body = $mail->body;
-        $this->recipient = $mail->recipient;
-        $this->recipient_type = $mail->recipient_type;
-        $this->subject = $mail->subject;
-        
-        $this->connection = 'database';
-    }
-
-    /**
-     * Execute the job.
-     * Utilized by using SendEveMailJob::dispatch($mail);
-     * The model is passed into the dispatch function, then added to the queue
-     * for processing.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        //Retrieve the token for main character to send mails from
-        $token = EsiToken::where(['character_id'=> 93738489])->get();
-
-        //Create the ESI authentication container
-        $config = config('esi');
-        $authentication = new EsiAuthentication([
-            'client_id' => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-        ]);
-
-        //Setup the Eseye class
-        $esi = new Eseye($authentication);
-
-        //Attemp to send the mail
-        try {
-            $esi->setBody([
-                'approved_cost' => 0,
-                'body' => $this->body,
-                'recipients' => [[
-                    'recipient_id' => (int)$this->recipient,
-                    'recipient_type' => $this->recipient_type,
-                ]],
-                'subject' => $this->subject,
-            ])->invoke('post', '/characters/{character_id}/mail/', [
-                'character_id'=> 93738489,
-            ]);
-        } catch(RequestFailedException $e) {
-            return null;
-        }
-        
-        $this->delete();
-    }
-
-    /**
-     * The job failed to process.
-     *
-     * @param  Exception  $exception
-     * @return void
-     */
-    public function failed($exception)
-    {
-        dd($exception);
-    }
-}

app/Library/Assets/AssetHelper.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Library\Assets;
+
+//Internal Library
+use Log;
+use Carbon\Carbon;
+
+//App Library
+use App\Jobs\Library\JobHelper;
+use App\Library\Esi\Esi;
+use Seat\Eseye\Exceptions\RequestFailedException;
+
+//Models
+use App\Models\Jobs\JobStatus;
+use App\Models\Stock\Asset;
+
+class AssetHelper {
+
+    private $charId;
+    private $corpId;
+    private $page;
+
+    public function __construct($char, $corp, $pg = null) {
+        $this->charId = $char;
+        $this->corpId = $corp;
+        $this->page = $pg;
+    }
+
+    /**
+     * Get Assets By Page in order to store in the database
+     */
+    public function GetAssetsByPage() {
+        //Declare the variable for the esi helper
+        $esiHelper = new Esi;
+
+        //Setup the esi authentication container
+        $config = config('esi');
+
+        //Check for the scope needed
+        $hasScope = $esiHelper->HaveEsiScope($this->charId, 'esi-assets.read_corporation_assets.v1');
+        if($hasScope == false) {
+            Log::critical('ESI Scope check has failed for esi-assets.read_corporation_assets.v1 for character id: ' . $this->charId);
+            return null;
+        }
+        
+        //Get the refresh token from the database
+        $token = $esiHelper->GetRefreshToken($this->charId);
+        //Setup the esi authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+        
+        try {
+            $assets = $esi->page($this->page)
+                          ->invoke('get', '/corporations/{corporation_id}/assets/', [
+                              'corporation_id' => $this->corpId,
+                          ]);
+        } catch(RequestFailedException $e) {
+            Log::critical("Failed to get page of assets from ESI.");
+            $assets = null;
+        }
+
+        return $assets;
+    }
+
+    /**
+     * Store a new asset record in the database
+     */
+    public function StoreNewAsset($asset) {
+        //See if we find any assets which already exist
+        $found = Asset::where([
+            'item_id' => $asset->item_id,
+        ])->count();
+
+        //If nothing is found 
+        if($found == 0) {
+            $item = new Asset;
+            if(isset($asset->is_blueprint_copy)) {
+                $item->is_blueprint_copy = $asset->is_blueprint_copy;
+            }
+            $item->is_singleton = $asset->is_singleton;
+            $item->item_id = $asset->item_id;
+            $item->location_flag = $asset->location_flag;
+            $item->location_id = $asset->location_id;
+            $item->location_type = $asset->location_type;
+            $item->quantity = $asset->quantity;
+            $item->type_id = $asset->type_id;
+            $item->save();
+        }  else {
+            $this->UpdateAsset($asset);
+        }      
+    }
+
+    /**
+     * Purge old data, so we don't run into data issues
+     */
+    public function PurgeStaleData() {
+        $date = Carbon::now()->subDay(1);
+
+        Asset::where('updated_at', '<', $date)->delete();
+    }
+
+    /**
+     * Get the liquid ozone asset
+     */
+    public function GetAssetByType($type, $structureId) {
+        //See if the row is in the database table
+        $count = Asset::where([
+            'location_id' => $structureId,
+            'type_id' => $type,
+            'location_flag' => 'StructureFuel',
+        ])->count();
+        //Get the row if it is in the table
+        $asset = Asset::where([
+            'location_id' => $structureId,
+            'type_id' => $type,
+            'location_flag' => 'StructureFuel',
+        ])->first();
+
+        if($count == 0) {
+            return 0;
+        } else {
+            return $asset['quantity'];
+        }
+    }
+
+    /**
+     * Update an existing asset based off the esi pull
+     */
+    private function UpdateAsset($asset) {
+
+        Asset::where([
+            'item_id' => $asset->item_id,
+        ])->update([
+            'is_singleton' => $asset->is_singleton,
+            'location_flag' => $asset->location_flag,
+            'location_id' => $asset->location_id,
+            'location_type' => $asset->location_type,
+            'quantity' => $asset->quantity,
+            'type_id' => $asset->type_id,
+            'updated_at' => Carbon::now(),
+        ]);
+    }
+}
+
+?>

app/Library/Esi/Esi.php

@@ -3,14 +3,14 @@
 namespace App\Library\Esi;
 
 //Internal Libraries
-use DB;
+use Carbon\Carbon;
 
 //Models
+use App\Models\Esi\EsiToken;
 use App\Models\Esi\EsiScope;
-use App\Models\Jobs\JobSendEveMail;
 
 //Jobs
-use App\Jobs\SendEveMailJob;
+use App\Jobs\ProcessSendEveMailJob;
 
 //Seat Stuff
 use Seat\Eseye\Cache\NullCache;
@@ -33,29 +33,26 @@ class Esi {
      * @return true,false
      */
     public function HaveEsiScope($charId, $scope) {
+        //Get the esi config
+        $config = config('esi');
+
         //Check for an esi scope
-        $checks = DB::table('EsiScopes')->where('character_id', $charId)->get();
-        foreach($checks as $check) {
-            if($check->scope === $scope) {
-                return true;
-            }
-        }
-
-        $mail  = new EveMail;
-        $mail->sender = 93738489;
-        $mail->subject = 'W4RP Services - Incorrect ESI Scope';
-        $mail->body = "Please register on https://services.w4rp.space with the scope: " . $scope;
-        $mail->recipient = (int)$charId;
-        $mail->recipient_type = 'character';
-        $mail->save();
-
-        SendEveMailJob::dispatch($mail)->delay(Carbon::now()->addSeconds(5));
+        $check = EsiScope::where(['character_id' => $charId, 'scope' => $scope])->count();
+        if($check == 0) {
+            //Compose a mail to send to the user if the scope is not found
+            $subject = 'W4RP Services - Incorrect ESI Scope';
+            $body = "Please register on https://services.w4rp.space with the scope: " . $scope;
 
+            ProcessSendEveMailJob::dispatch($body, (int)$charId, 'character', $subject, $config['primary'])->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
             return false;
         }
 
+        return true;
+    }
+
     public function GetCharacterData($charId) {
-        $esi = new Eseye();
+        $esi = $this->SetupEsiAuthentication();
+
         try {
             $character = $esi->invoke('get', '/characters/{character_id}/', [
                 'character_id' => $charId,
@@ -67,8 +64,23 @@ class Esi {
         return $character;
     }
 
+    public function GetCorporationData($corpId) {
+        $esi = $this->SetupEsiAuthentication();
+
+        try {
+            $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
+                'corporation_id' => $corpId,
+            ]);
+        } catch(RequestFailedException $e) {
+            return null;
+        }
+
+        return $corporation;
+    }
+
     public function GetCharacterName($charId) {
-        $esi = new Eseye();
+        $esi = $this->SetupEsiAuthentication;
+        
         try {
             $character = $esi->invoke('get', '/characters/{character_id}/', [
                 'character_id' => $charId,
@@ -82,32 +94,27 @@ class Esi {
 
     public function FindCharacterId($name) {
         $config = config('esi');
-        //Create the esi authentication container
-        $authentication = new EsiAuthentication([
-            'client_id' => $config['client_id'],
-            'secret' => $config['secret'],
-        ]);
-        //Create the esi container
-        $esi = new Eseye($authentication);
+
+        $esi = $this->SetupEsiAuthentication();
+
         try {
-            $character = $esi->setQueryString([
-                'categories' => 'character',
-                'language' => 'en-us',
-                'search' => $name,
-                'strict' => 'true',
-            ])->invoke('get', '/search/');
+            $character = $esi->setBody(array(
+                $name,
+            ))->invoke('post', '/universe/ids/');
         } catch(RequestFailedException $e) {
             return null;
         }
 
-
-        $character = json_decode($character, true);
-
-        return $character['character'];
+        if(isset($character->characters[0]->id)) {
+            return $character->characters[0]->id;
+        } else {
+            return null;
+        }
     }
 
     public function FindCorporationId($charId) {
-        $esi = new Eseye();
+        $esi = $this->SetupEsiAuthentication();
+        
         try {
             $character = $esi->invoke('get', '/characters/{character_id}/', [
                 'character_id' => $charId,
@@ -120,7 +127,8 @@ class Esi {
     }
 
     public function FindCorporationName($charId) {
-        $esi = new Eseye();
+        $esi = $this->SetupEsiAuthentication();
+        
         try {
             $character = $esi->invoke('get', '/characters/{character_id}/', [
                 'character_id' => $charId,
@@ -151,6 +159,49 @@ class Esi {
         //Return the combined date in the correct format
         return $realDate;
     }
+
+    public function GetRefreshToken($charId) {
+        //Get the refresh token from the database
+        $tokenCount = EsiToken::where([
+            'character_id' => $charId,
+        ])->count();
+
+        //If the token is not found, then don't return it.
+        if($tokenCount == 0) {
+            return null;
+        }
+
+        $token = EsiToken::where([
+            'character_id' => $charId,
+        ])->first();
+
+        return $token->refresh_token;
+    }
+
+    public function SetupEsiAuthentication($token = null) {
+        //Get the platform configuration
+        $config = config('esi');
+
+        //Declare some variables
+        $authentication = null;
+        $esi = null;
+
+        if($token == null) {
+            $esi = new Eseye();
+        } else {
+            $authentication = new EsiAuthentication([
+                'client_id' => $config['client_id'],
+                'secret' => $config['secret'],
+                'refresh_token' => $token,
+            ]);
+
+            //Setup the esi variable
+            $esi = new Eseye($authentication);
+        }
+
+        //Return the created variable
+        return $esi;
+    }
 }
 
 ?>

app/Library/Esi/Mail.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Library\Esi;
-
-use DB;
-
-use App\Models\Esi\EsiScope;
-use App\Models\Esi\EsiToken;
-
-use Seat\Eseye\Cache\NullCache;
-use Seat\Eseye\Configuration;
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-use Seat\Eseye\Exceptions\RequestFailedException;
-
-class Mail {
-
-    public function SendMail($recipient, $rType, $subject, $body) {
-        //Retrieve the token for main character to send mails from
-        $token = EsiToken::where(['character_id' => 93738489])->first();
-        //Create the ESI authentication container
-        $config = config('esi');
-        $authentication = new EsiAuthentication([
-            'client_id'  => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token->refresh_token,
-        ]);
-        $esi = new Eseye($authentication);
-        try {
-            $esi->setBody([
-                'approved_cost' => 0,
-                'body' => $body,
-                'recipients' => [[
-                    'recipient_id' => (int)$recipient,
-                    'recipient_type' => $rType,
-                ]],
-                'subject' => $subject,
-            ])->invoke('post', '/characters/{character_id}/mail/', [
-                'character_id'=> 93738489,
-            ]);
-        } catch(RequestFailedException $e) {
-            return 1;
-        }
-
-        return 0;
-    }
-}
-
-?>

app/Library/Finances/AllianceMarketTax.php

@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Finances;
+
+//Library
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\Finances\AllianceMarketJournal;
+
+class AllianceMarketTax {
+    public function EntryExists($journal) {
+        if(AllianceMarketJournal::where(['id' => $journal['id']])->exists()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function InsertMarketTax($journal, $corpId, $division) {
+        //Create the ESI Helper class
+        $esiHelper = new Esi;
+
+        //Check to see if we can find the entry in the database already.
+        //If we don't then add it to the database
+        if(!AllianceMarketJournal::where(['id' => $journal['id']])->exists()) {
+            $entry = new AllianceMarketJournal;
+            $entry->id = $journal['id'];
+            $entry->corporation_id = $corpId;
+            $entry->division = $division;
+            if(isset($journal['amount'])) {
+                $entry->amount = $journal['amount'];
+            }
+            if(isset($journal['balance'])) {
+                $entry->balance = $journal['balance'];
+            }
+            if(isset($journal['context_id'])) {
+                $entry->context_id = $journal['context_id'];
+            }
+            if(isset($journal['context_id_type'])) {
+                $entry->context_id_type = $journal['context_id_type'];
+            }
+            $entry->date = $esiHelper->DecodeDate($journal['date']);
+            $entry->description = $journal['description'];
+            if(isset($journal['first_party_id'])) {
+                $entry->first_party_id = $journal['first_party_id'];
+            }
+            if(isset($journal['reason'])) {
+                $entry->reason = $journal['reason'];
+            }
+            $entry->ref_type = $journal['ref_type'];
+            if(isset($journal['second_party_id'])) {
+                $entry->second_party_id = $journal['second_party_id'];
+            }
+            if(isset($journal['tax'])) {
+                $entry->tax = $journal['tax'];
+            }
+            if(isset($journal['tax_receiver_id'])) {
+                $entry->tax_receiver_id = $journal['tax_receiver_id'];
+            }
+            $entry->save();
+        }
+    }
+}
+
+?>

app/Library/Finances/Helper/FinanceHelper.php

@@ -8,18 +8,17 @@
 namespace App\Library\Finances\Helper;
 
 //Internal Library
-use DB;
-
-//Job
-use App\Jobs\SendEveMailJob;
+use Log;
+use Carbon\Carbon;
 
 //Models
 use App\Models\Esi\EsiToken;
 use App\Models\Esi\EsiScope;
-use App\Models\Mail\EveMail;
 
 //Library
 use App\Library\Esi\Esi;
+use App\Library\Finances\AllianceMarketTax;
+use App\Library\Finances\CorpMarketTax;
 use App\Library\Finances\MarketTax;
 use App\Library\Finances\PlayerDonation;
 use App\Library\Finances\ReprocessingTax;
@@ -29,71 +28,15 @@ use App\Library\Finances\OfficeFee;
 use App\Library\Finances\PlanetProductionTax;
 use App\Library\Finances\PISale;
 use App\Library\Lookups\LookupHelper;
+use App\Library\Finances\SovBillExpenses;
 
 //Seat Stuff
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
 use Seat\Eseye\Exceptions\RequestFailedException;
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
 
 class FinanceHelper {
 
-    public function GetWalletTransaction($division, $charId) {
-        //Declare the lookup class helper
-        $lookups = new LookupHelper;
-
-        //Setup array for PI items
-        $pi_items = $this->GetPIMaterialsArray();
-
-        //Get the ESI refresh token for the corporation to add new wallet journals into the database
-        $tokenData = $this->TokenInfo($charId);
-        $token = $tokenData['token'];
-        $scope = $tokenData['scope'];
-
-        //If the token is not found, send the user an eve mail, and just exit out of the function
-        if($this->TokenNotFound($token, $scope, $charId)) {
-            printr("Token not found\n");
-            return null;
-        }
-
-        //Reference to see if the character is in our look up table for corporations and characters
-        $corpId = $lookups->LookupCharacter($charId);
-
-        //Create an ESI authentication container
-        $config = config('esi');
-        $authentication = new EsiAuthentication([
-            'client_id'  => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-        ]);
-
-        //Create the esi class varialble
-        $esi = new Eseye($authentication);
-
-        //Get the entries of the journal for transactions
-        try {
-            $journals = $esi->invoke('get', '/corporations/{corporation_id}/wallets/{division}/transactions/', [
-                'corporation_id' => 98251577,
-                'division'  => 3,
-            ]);
-        } catch(RequestFailedException $e) {
-            return $e->getEsiResponse();
-        }
-
-        //Decode the wallet from json into an array
-        $wallet = json_decode($journals->raw, true);
-
-        //For each transactional entry, attempt to store it in the database.
-            //The PutWalletJournal function checks to see if it's already in the database.
-            foreach($wallet as $entry) {
-                if($division == 3 && $charId == 94415555) {
-                    if(in_array($entry['type_id'], $pi_items, false)) {
-                        $pi = new PISale();
-                        $pi->InsertPISale($entry, 98287666);
-                    }
-                }                
-            }
-    }
-
     public function GetWalletJournal($division, $charId) {
         //Declare new class variables
         $market = new MarketTax();
@@ -102,35 +45,34 @@ class FinanceHelper {
         $other = new PlayerDonation();
         $industry = new StructureIndustryTax();
         $office = new OfficeFee();
+        $esiHelper = new Esi();
+        $sovBillHelper = new SovBillExpenses();
+        $lookup = new LookupHelper;
 
         //Get the ESI refresh token for the corporation to add new wallet journals into the database
-        $tokenData = $this->TokenInfo($charId);
-        $token = $tokenData['token'];
-        $scope = $tokenData['scope'];
-
-        //Declare the lookup class helper
-        $lookups = new LookupHelper;
-
-        //If the token is not found, send the user an eve mail, and just exit out of the function
-        if($this->TokenNotFound($token, $scope, $charId)) {
+        $hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1');
+        if($hasScope == false) {
+            Log::critical('Scope check failed for esi-wallet.read_corporation_wallets.v1 for character id: ' . $charId);
+            return null;
+        }
+        $token = $esiHelper->GetRefreshToken($charId);
+        if($token == null) {
             return null;
         }        
         
         //Reference to see if the character is in our look up table for corporations and characters
-        $corpId = $lookups->LookupCharacter($charId);
+        $char = $lookup->GetCharacterInfo($charId);
+        $corpId = $char->corporation_id;
 
         //Create an ESI authentication container
-        $config = config('esi');
-        $authentication = new EsiAuthentication([
-            'client_id'  => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-        ]);
-
-        //Create the esi class varialble
-        $esi = new Eseye($authentication);
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+        //Set the version
         $esi->setVersion('v4');
 
+        //Set caching to null
+        $configuration = Configuration::getInstance();
+        $configuration->cache = NullCache::class;
+        
         //Set our current page to 1 which is the one we are starting on.
         $currentPage = 1;
         //Set our default total pages to 1 in case our try section fails out.
@@ -147,17 +89,19 @@ class FinanceHelper {
                     'division'  => $division,
                 ]);
             } catch(RequestFailedException $e) {
-                return $e->getEsiResponse();
+                return null;
             }
 
+            if($currentPage == 1) {
                 //Set the total pages we need to cycle through.
                 $totalPages = $journals->pages;
+            }
+            
             //Decode the wallet from json into an array
             $wallet = json_decode($journals->raw, true);
             //For each journal entry, attempt to store it in the database.
             //The PutWalletJournal function checks to see if it's already in the database.
             foreach($wallet as $entry) {
-                if($entry['amount'] > 0) {
                 if($entry['ref_type'] == 'brokers_fee') {
                     $market->InsertMarketTax($entry, $corpId, $division);
                 } else if($entry['ref_type'] == 'reprocessing_tax') {
@@ -171,7 +115,8 @@ class FinanceHelper {
                     $industry->InsertStructureIndustryTax($entry, $corpId, $division);
                 } else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) {
                     $office->InsertOfficeFee($entry, $corpId, $division);
-                    }
+                } else if($entry['ref_type'] == 'infrastructure_hub_maintenance' && $entry['first_party_id'] == 98287666) {
+                    $sovBillHelper->InsertSovBillExpense($entry, $corpId, $division);
                 }
             }
             
@@ -183,32 +128,34 @@ class FinanceHelper {
 
     public function GetJournalPageCount($division, $charId) {
         //Declare class variables
-        $lookups = new LookupHelper;
+        $lookup = new LookupHelper;
+        $esiHelper = new Esi;
         
-        //Get the ESI refresh token for the corporation
-        $tokenData = $this->TokenInfo($charId);
-        $token = $tokenData['token'];
-        $scope = $tokenData['scope'];
-
-        if($this->TokenNotFound($token, $scope, $charId)) {
+        //Get the ESI refresh token for the corporation to add new wallet journals into the database
+        $hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1');
+        if($hasScope == false) {
+            Log::critical('Esi Scope check failed for esi-wallet.read_corporation_wallets.v1 for character id: ' . $charId);
+            return null;
+        }
+        $token = $esiHelper->GetRefreshToken($charId);
+        if($token == null) {
             return null;
         }
 
         //Refrence to see if the character is in our look up table for corporation and characters
-        $corpId = $lookups->LookupCharacter($charId);
+        $char = $lookup->GetCharacterInfo($charId);
+        $corpId = $char->corporation_id;
 
         //Create the ESI authentication container
-        $config = config('esi');
-        $authentication = new EsiAuthentication([
-            'client_id'  => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-        ]);
+        $esi = $esiHelper->SetupEsiAuthentication($token);
 
-        //Create the esi class variable
-        $esi = new Eseye($authentication);
+        //Set the esi version to v4
         $esi->setVersion('v4');
 
+        //Set caching to null
+        $configuration = Configuration::getInstance();
+        $configuration->cache = NullCache::class;
+
         //Call the first page so we can get the header data for the number of pages
         try {
             $journals = $esi->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [
@@ -216,7 +163,8 @@ class FinanceHelper {
                 'division'  => $division,
             ]);
         } catch(RequestFailedException $e) {
-            return $e->getEsiResponse();
+            Log::warning($e->getEsiResponse());
+            return null;
         }
 
         $pages = $journals->pages;
@@ -224,38 +172,83 @@ class FinanceHelper {
         return $pages;
     }
 
-    public function GetWalletJournalPage($division, $charId, $page = 1) {
+    public function GetCorpWalletJournalPage($division, $charId, $corpId, $page = 1) {
         //Declare new class variables
-        $market = new MarketTax();
-        $reprocessing = new ReprocessingTax();
-        $jb = new JumpBridgeTax();
-        $other = new PlayerDonation();
-        $industry = new StructureIndustryTax();
-        $office = new OfficeFee();
+        $corpMarket = new MarketTax();
+        $esiHelper = new Esi;
 
         //Get the ESI refresh token for the corporation to add new wallet journals into the database
-        $tokenData = $this->TokenInfo($charId);
-        $token = $tokenData['token'];
-        $scope = $tokenData['scope'];
+        $token = $esiHelper->GetRefreshToken($charId);
 
-        //Declare the lookup class helper
-        $lookups = new LookupHelper;
+        //Setup the esi authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+        $esi->setVersion('v4');
+
+        //Set caching to null
+        $configuration = Configuration::getInstance();
+        $configuration->cache = NullCache::class;
+
+        //Call the page of the wallet journal
+        try {
+            $journals = $esi->page($page)
+                            ->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [
+                                'corporation_id' => $corpId,
+                                'division' => $division,
+                            ]);
+        } catch(RequestFailedException $e) {
+            Log::warning($e->getEsiResponse());
+            return null;
+        }
+
+        //Decode the wallet from json into an array
+        $wallets = json_decode($journals->raw, true);
+
+        //For each journal entry, attempt to store the information into the database
+        foreach($wallets as $wallet) {
+            if($wallet['amount'] > 0) {
+                if($wallet['ref_type'] == 'brokers_fee') {
+                    $corpMarket->InsertCorpMarketTax($wallet, $corpId, $division);
+                }
+            }
+        }
+    }
+
+    public function GetWalletJournalPage($division, $charId, $page = 1) {
+        //Declare new class variables
+        $market = new AllianceMarketTax;
+        $reprocessing = new ReprocessingTax;
+        $jb = new JumpBridgeTax;
+        $other = new PlayerDonation;
+        $industry = new StructureIndustryTax;
+        $office = new OfficeFee;
+        $pi = new PlanetProductionTax;
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $sovBill = new SovBillExpenses;
+
+        //Get the ESI refresh token for the corporation to add new wallet journals into the database
+        $hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1');
+        if($hasScope == false) {
+            Log::critical('Esi Scope check failed for esi-wallet.read_corporation_wallets.v1 for character id: ' . $charId);
+            return null;
+        }
+        $token = $esiHelper->GetRefreshToken($charId);
+        if($token == null) {
+            return null;
+        }       
         
         //Reference to see if the character is in our look up table for corporations and characters
-        $corpId = $lookups->LookupCorporationId($charId);
+        $char = $lookup->GetCharacterInfo($charId);
+        $corpId = $char->corporation_id;
 
         //Create an ESI authentication container
-        $config = config('esi');
-        $authentication = new EsiAuthentication([
-            'client_id'  => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-        ]);
-
-        //Create the esi class varialble
-        $esi = new Eseye($authentication);
+        $esi = $esiHelper->SetupEsiAuthentication($token);
         $esi->setVersion('v4');
 
+        //Set caching to null
+        $configuration = Configuration::getInstance();
+        $configuration->cache = NullCache::class;
+
         //Call the first page of the wallet journal, as we are always going to get at least one page.
         //If we have more pages, then we will continue through the while loop.
         try {
@@ -265,7 +258,7 @@ class FinanceHelper {
                 'division'  => $division,
             ]);
         } catch(RequestFailedException $e) {
-            return $e->getEsiResponse();
+            return null;
         }
 
         //Decode the wallet from json into an array
@@ -273,7 +266,6 @@ class FinanceHelper {
         //For each journal entry, attempt to store it in the database.
         //The PutWalletJournal function checks to see if it's already in the database.
         foreach($wallet as $entry) {
-            if($entry['amount'] > 0) {
             if($entry['ref_type'] == 'brokers_fee') {
                 $market->InsertMarketTax($entry, $corpId, $division);
             } else if($entry['ref_type'] == 'reprocessing_tax') {
@@ -287,43 +279,13 @@ class FinanceHelper {
                 $industry->InsertStructureIndustryTax($entry, $corpId, $division);
             } else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) {
                 $office->InsertOfficeFee($entry, $corpId, $division);
+            } else if($entry['ref_type'] == 'planetary_export_tax' || $entry['ref_type'] == 'planetary_import_tax') {
+                $pi->InsertPlanetProductionTax($entry, $corpId, $division);
+            } else if($entry['ref_type'] == 'infrastructure_hub_maintenance' && $entry['first_party_id'] == 98287666) {
+                $sovBill->InsertSovBillExpense($entry, $corpId, $division);
             }
         }
     }
-    }
-
-    private function TokenInfo($charId) {
-        //Get the ESI refresh token for the corporation to add a new wallet jouranls into the database
-        //send the token and scope back to the calling function
-        $token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
-        $scope = EsiScope::where(['character_id' => $charId, 'scope' => 'esi-wallet.read_corporation_wallets.v1'])->get(['scope']);
-
-        $data = [
-            'token' => $token,
-            'scope' => $scope,
-        ];
-
-        return $data;
-    }
-
-    private function TokenNotFound($token, $scope, $charId) {
-        if(!isset($token[0]->refresh_token) || !isset($scope[0]->scope)) {
-            //Register a mail to be dispatched as a job
-            $mail = new EveMail;
-            $mail->sender = 93738489;
-            $mail->subject = 'W4RP Services ESI API';
-            $mail->body = 'You need to register an ESI API on the services site for esi-wallet.read_corporation_wallet.v1<br>This is also labeled Corporation Wallets';
-            $mail->recipient = (int)$charId;
-            $mail->recipient_type = 'character';
-            $mail->save();
-
-            SendEveMailJob::dispatch($mail);
-
-            return true;
-        } 
-
-        return false;
-    }
 
     private function GetPIMaterialsArray() {
         //Setup array for PI items

app/Library/Finances/JumpBridgeTax.php

@@ -6,13 +6,15 @@
 
 namespace App\Library\Finances;
 
+//Internal Library
 use DB;
 use Carbon\Carbon;
 
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\JumpBridgeJournal;
-use App\Models\User\UserToCorporation;
 
 class JumpBridgeTax {
     private $date;
@@ -76,55 +78,6 @@ class JumpBridgeTax {
         }
     }
 
-    /**
-     * Function to get the corporations using the jump bridge over a given time period
-     */
-    public function CorporationUsage() {
-        //Make an array for corporations, and amounts
-        $amounts = array();
-        $characters = array();
-        $data = array();
-        $esi = new Esi();
-
-        //Get all of the parties which have utilized the jump bridge
-        $parties = DB::table('jump_bridge_journal')
-                    ->select('first_party_id')
-                    ->groupBy('first_party_id')
-                    ->whereTime('date', '>', $this->date)
-                    ->get();
-
-        //Run through each party and assign them into a corporation, then add the corporation to the corporation array if they don't 
-        //exist in the array.
-        foreach($parties as $party) {
-            //If the entry in the database lookup table isn't found, add it.
-            if(!CharacterToCorporation::where(['character_id' => $party->first_party_id])->exists()) {
-                $character = $esi->GetCharacterData($party->first_party_id);
-                $corporation = $esi->GetCorporationData($character->corporation_id);
-                $char = new CharacterToCorporation;
-                $char->character_id = $party->first_party_id;
-                $char->character_name = $character->name;
-                $char->corporation_id = $character->corporation_id;
-                $char->corporation_name = $corporation->name;
-                $char->save();
-            }
-
-            //Perform the lookup and add the user into the corps array, and the ammount to the amount array
-            $char = CharacterToCorporation::where(['character_id' => $party->first_party_id])->get();
-            
-            //Find the amount utilized from the jump bridge by the character
-            $isk = JumpBridgeJournal::where(['first_party_id' => $char->character_id])
-                                    ->whereBetween('date', [$this->date, $this->date->addDays(30)])
-                                    ->sum('amount');
-            
-            //We have the character and isk amount, so we need to build an array with these two values as key value pairs.
-            $data[$char->corporation_name] = $data[$char->corporation_name] + $isk;
-        }
-
-        //Return the data
-        return $data;
-
-    }
-
     /**
      * Returns the overall usage for statistics
      */
@@ -143,6 +96,7 @@ class JumpBridgeTax {
      * Returns a specific briddge usage statistics for overall usage
      */
     public function JBOverallUsage($structure) {
+        
         $usage = DB::table('jump_bridge_journal')
                     ->select('amount')
                     ->where('context_id', $structure)

app/Library/Finances/MarketTax.php

@@ -1,63 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Finances;
-
-use DB;
-
-use App\Library\Esi\Esi;
-
-use App\Models\Finances\CorpMarketJournal;
-
-class MarketTax {
-    public function InsertMarketTax($journal, $corpId, $division) {
-        //Create the ESI Helper class
-        $esiHelper = new Esi;
-
-        //Check to see if we can find the entry in the database already.
-        //If we don't then add it to the database
-        if(!CorpMarketJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new CorpMarketJournal;
-            $entry->id = $journal['id'];
-            $entry->corporation_id = $corpId;
-            $entry->division = $division;
-            if(isset($journal['amount'])) {
-                $entry->amount = $journal['amount'];
-            }
-            if(isset($journal['balance'])) {
-                $entry->balance = $journal['balance'];
-            }
-            if(isset($journal['context_id'])) {
-                $entry->context_id = $journal['context_id'];
-            }
-            if(isset($journal['context_id_type'])) {
-                $entry->context_id_type = $journal['context_id_type'];
-            }
-            $entry->date = $esiHelper->DecodeDate($journal['date']);
-            $entry->description = $journal['description'];
-            if(isset($journal['first_party_id'])) {
-                $entry->first_party_id = $journal['first_party_id'];
-            }
-            if(isset($journal['reason'])) {
-                $entry->reason = $journal['reason'];
-            }
-            $entry->ref_type = $journal['ref_type'];
-            if(isset($journal['second_party_id'])) {
-                $entry->second_party_id = $journal['second_party_id'];
-            }
-            if(isset($journal['tax'])) {
-                $entry->tax = $journal['tax'];
-            }
-            if(isset($journal['tax_receiver_id'])) {
-                $entry->tax_receiver_id = $journal['tax_receiver_id'];
-            }
-            $entry->save();
-        }
-    }
-}
-
-?>

app/Library/Finances/OfficeFee.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
-
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\OfficeFeesJournal;
 
 class OfficeFee {

app/Library/Finances/PISale.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
- use DB;
-
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\PISaleJournal;
 
 class PISale {
@@ -19,8 +19,6 @@
         //Create the ESI Helper class
         $esiHelper = new Esi;
 
-        //dd($journal);
-
         //Insert the PI Sale into the database
         if(!PISaleJournal::where(['journal_ref_id' => $journal['journal_ref_id']])->exists()) {
             $entry = new PISaleJournal;

app/Library/Finances/PlanetProductionTax.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
-
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\PlanetProductionTaxJournal;
 
 class PlanetProductionTax {

app/Library/Finances/PlayerDonation.php

@@ -7,10 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
-
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\PlayerDonationJournal;
 
 class PlayerDonation {

app/Library/Finances/ReprocessingTax.php

@@ -7,9 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\ReprocessingTaxJournal;
 
 class ReprocessingTax {

app/Library/Finances/SovBillExpenses.php

@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Finances;
+
+//Library
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\Finances\SovBillJournal;
+
+class SovBillExpenses {
+    public function InsertSovBillExpense($journal, $corpId, $division) {
+        //Create the ESI Helper class
+        $esiHelper = new Esi;
+
+        //Check to see if we can find the entry in the database already.
+        //If we don't then add it to the database
+        if(!SovBillJournal::where(['id' => $journal['id']])->exists()) {
+            $entry = new SovBillJournal;
+            $entry->id = $journal['id'];
+            $entry->corporation_id = $corpId;
+            $entry->division = $division;
+            if(isset($journal['amount'])) {
+                $entry->amount = $journal['amount'];
+            }
+            if(isset($journal['balance'])) {
+                $entry->balance = $journal['balance'];
+            }
+            if(isset($journal['context_id'])) {
+                $entry->context_id = $journal['context_id'];
+            }
+            if(isset($journal['context_id_type'])) {
+                $entry->context_id_type = $journal['context_id_type'];
+            }
+            $entry->date = $esiHelper->DecodeDate($journal['date']);
+            $entry->description = $journal['description'];
+            if(isset($journal['first_party_id'])) {
+                $entry->first_party_id = $journal['first_party_id'];
+            }
+            if(isset($journal['reason'])) {
+                $entry->reason = $journal['reason'];
+            }
+            $entry->ref_type = $journal['ref_type'];
+            if(isset($journal['second_party_id'])) {
+                $entry->second_party_id = $journal['second_party_id'];
+            }
+            if(isset($journal['tax'])) {
+                $entry->tax = $journal['tax'];
+            }
+            if(isset($journal['tax_receiver_id'])) {
+                $entry->tax_receiver_id = $journal['tax_receiver_id'];
+            }
+            $entry->save();
+        }
+    }
+}
+
+?>

app/Library/Finances/StructureIndustryTax.php

@@ -7,9 +7,10 @@
 
 namespace App\Library\Finances;
 
-use DB;
+//Library
 use App\Library\Esi\Esi;
 
+//Models
 use App\Models\Finances\StructureIndustryTaxJournal;
 
 class StructureIndustryTax {

app/Library/Fleets/FleetHelper.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Library\Fleets;
+
+//Internal Libraries
+use Log;
+
+//Seat Stuff
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use Seat\Eseye\Containers\EsiAuthentication;
+use Seat\Eseye\Eseye;
+use Seat\Eseye\Exceptions\RequestFailedException;
+
+//Libraries
+use App\library\Esi\Esi;
+
+//Models
+use App\Models\Fleets\AllianceFleet;
+use App\Models\Fleets\AllianceFleetMember;
+
+class FleetHelper {
+    //Variables
+    private $esi;
+
+    //Constructi
+    public function __construct($charId) {
+        //Declare a variable for use by the constructor
+        $esiHelper = new Esi;
+
+        //Check for the ESI scope
+        $check = $esiHelper->HaveEsiScope($charId, 'esi-fleets.read_fleet.v1');
+        if($check) {
+            //Setup the ESI authentication container
+            $this->esi = $esiHelper->SetupEsiAuthentication();
+        } else {
+            $this->esi = null;
+        }
+    }
+
+    //Get fleet information
+    public function GetFleetInfo($fleetId) {
+
+    }
+
+    //Get fleet members
+    public function GetFleetMembers($fleetId) {
+
+    }
+
+    //Get fleet wings
+    public function GetFleetWings($fleetId) {
+
+    }
+
+    //Update fleet time
+    public function UpdateFleetTime($fleetId) {
+
+    }
+
+    //Update fleet character names
+    public function UpdateFleetCharacters($fleetId) {
+        
+    }
+}
+
+?>

app/Library/JumpBridges/JumpBridgeHelper.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Library\JumpBridges;
+
+//Internal Libraries
+use Carbon\Carbon;
+
+//Library
+use App\Library\Taxes\TaxesHelper;
+
+//Models
+use App\Models\JumpBridgeJournal;
+
+class JumpBridgeHelper {
+    
+    public function __construct() {
+        //
+    }
+
+    
+}
+
+?>