Bump elliptic from 6.4.1 to 6.5.4

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.4)

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

.env

@@ -4,20 +4,20 @@ 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
 DB_PORT=3306
 DB_DATABASE=w4rpservices2
-DB_USERNAME=minerva
-DB_PASSWORD=strtmage
+DB_USERNAME=
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 
-QUEUE_CONNECTION=redis
 QUEUE_DRIVER=redis
+QUEUE_CONNECTION=sync
 
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
@@ -33,19 +33,9 @@ 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'
-
-EVEONLINE_CLIENT_ID=e5848fea3618427a8ee0dccb6a04fc62
-EVEONLINE_CLIENT_SECRET=TdnNGRM8RTNSifZdaIc9yHTTkYPgYEEXHRIbT6oY
-EVEONLINE_REDIRECT='https://services.w4rp.space/callback'
+ESI_CLIENT_ID=
+ESI_SECRET_KEY=
+ESI_USERAGENT=
+ESI_CALLBACK_URI=
+ESI_PRIMARY_CHAR=93738489
+ESI_ALLIANCE=99004116

.gitignore

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

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 = 'data: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,50 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+
+//Models
+use App\Models\Structure\Structure;
+use App\Models\Structure\Service;
+use App\Models\Structure\Asset;
+
+class EmptyJumpBridges extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'data: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()
+    {
+        Structure::truncate();
+        Service::truncate();
+        Asset::truncate();
+    }
+}

app/Console/Commands/Data/GetCorpsCommand.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+
+//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 = 'data: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()
+    {
+        //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();
+        }
+    }
+}

app/Console/Commands/Data/PurgeCorpMoonLedgers.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+
+//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()
+    {
+        PurgeMoonLedgerJob::dispatch();
+    }
+}

app/Console/Commands/Data/PurgeUsers.php

@@ -0,0 +1,192 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+
+//Libraries
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+
+//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;
+
+/**
+ * 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 = 'data: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();                        
+                        }
+                    }
+                }
+            }
+        }   
+    }
+}

app/Console/Commands/Data/Test.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands\Data;
+
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Models
+use App\Models\ScheduledTask\ScheduleJob;
+
+//Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use App\Library\Helpers\FinanceHelper;
+
+class Test extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'data:test';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Test ESI stuff.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $helper = new FinanceHelper;
+        $config = config('esi');
+        $startTime = time();
+        $receipt = $helper->GetApiWalletJournal(1, $config['primary']);
+        $endTime = time();
+        var_dump($endTime - $startTime);
+    }
+}

app/Console/Commands/Eve/ItemPricesUpdateCommand.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Console\Commands\Eve;
+
+use Illuminate\Console\Command;
+
+//Library
+use App\Library\Moons\MoonCalc;
+use Comamnds\Library\CommandHelper;
+
+//Job
+use App\Jobs\Commands\Eve\ItemPricesUpdateJob;
+
+class ItemPricesUpdateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:ItemPriceUpdate';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update mineral and ore prices';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Declare variables
+        $moonHelper = new MoonCalc;
+        $task = new CommandHelper('ItemPricesUpdateCommand');
+
+        //Set the task as started
+        $task->SetStartStatus();
+
+        //Fetch new prices from fuzzwork.co.uk for the item pricing schemes
+        $moonHelper->FetchNewPrices();
+
+        //Set the task as completed
+        $task->SetStopStatus();
+
+        return 0;
+    }
+}

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/Files/UpdateItemCompositionFromSDECommand.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Console\Commands\Files;
+
+//Internal Stuff
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
+
+class UpdateItemCompositionFromSDECommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'sde:update:ItemCompositions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Updates item compositions from sql file.';
+
+    /**
+     * The SDE storage path
+     * 
+     * @var
+     */
+    protected $storage_path;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Query the sql file for the related database information
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //Start by warning the user about the command which will be run
+        $this->comment('Warning! This Laravel command uses exec() to execute a ');
+        $this->comment('mysql shell command to import an extracted dump. Due');
+        $this->comment('to the way the command is constructed, should someone ');
+        $this->comment('view the current running processes of your server, they ');
+        $this->comment('will be able to see your SeAT database users password.');
+        $this->line('');
+        $this->line('Ensure that you understand this before continuing.');
+
+        //Test we have valid database parameters
+        DB::connection()->getDatabaseName();
+
+        //Warn the user about the operation to begin
+        if (! $this->confirm('Are you sure you want to update to the latest EVE SDE?', true)) {
+            $this->warn('Exiting');
+
+            return;
+        }
+
+        $fileName = $this->getSde();
+        $this->importSde($fileName);
+
+    }
+
+    /**
+     * Download the EVE Sde from Fuzzwork and save it
+     * in the storage_path/sde folder
+     */
+    public function getSde() {
+
+
+        return $fileName;
+    }
+
+    /**
+     * Extract the SDE file downloaded and run the MySQL command to import the table into the database
+     */
+    public function importSde($fileName) {
+        $import_command = 'mysql -u username -p password database < ' . $file;
+
+        //run the command
+        exec($import_command, $output, $exit_code);
+
+        if($exit_code !== 0) {
+            $this->error('Warning: Import failed with exit code ' .
+                    $exit_code . ' and command outut: ' . implode('\n', $output));
+        }
+    }
+}

app/Console/Commands/Finances/UpdateAllianceWalletJournal.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Console\Commands\Finances;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Application Library
+use App\Library\Helpers\FinanceHelper;
+use Commands\Library\CommandHelper;
+
+//Models
+use App\Models\Finances\AllianceWalletJournal;
+
+class UpdateAllianceWalletJournal extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'finances:UpdateJournals';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Update the holding corporation's finance journal.";
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        //Declare variables
+        $fHelper = new FinanceHelper;
+        $config = config('esi');
+        $task = new CommandHelper('UpdateAllianceWalletJournal');
+        //Set the task as started
+        $task->SetStartStatus();
+
+        $fHelper->GetApiWalletJournal(1, $config['primary']);
+
+        //Set the task as stopped
+        $task->SetStopStatus();
+
+        return 0;
+    }
+}

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/MiningTaxes/MiningTaxesInvoices.php

@@ -0,0 +1,155 @@
+<?php
+
+namespace App\Console\Commands\MiningTaxes;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Application Library
+use Commands\Library\CommandHelper;
+use App\Library\Helpers\LookupHelper;
+
+//Models
+use App\Models\MiningTax\Invoice;
+use App\Models\MiningTax\Ledger;
+
+//Jobs
+use App\Jobs\Commands\Eve\ProcessSendEveMailJob;
+
+class MiningTaxesInvoices extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'MiningTax:Invoice';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Mining Taxes Invoice Command';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        //Declare variables
+        $lookup = new LookupHelper;
+        $config = config('esi');
+        $body = null;
+        $task = new CommandHelper('MiningTaxesInvoices');
+        //Set the task as started
+        $task->SetStartStatus();
+
+        //Get the characters for each non-invoiced ledger entry
+        $charIds = Ledger::distinct('character_id')->pluck('character_id');
+
+        //Foreach character tally up the mining ledger.
+        foreach($charIds as $charId) {
+            //Declare some variables we need for each iteration of the loop
+            $invoice = array();
+            $ores = array();
+            $totalPrice = 0.00;
+
+            //Get the rows from the database for each character and the requirement of not been invoiced yet
+            $rows = Ledger::where([
+                'character_id' => $charId,
+                'invoiced' => 'No',
+            ])->get()->toArray();        
+
+            var_dump($rows);
+
+            //Taly up the item composition from each row and multiply by the quantity
+            foreach($rows as $row) {
+                if(!isset($ores[$row['type_id']])) {
+                    $ores[$row['type_id']] = 0;
+                }
+                $ores[$row['type_id']] = $ores[$row['type_id']] + $row['quantity'];
+
+                //Add up the total price from the ledger rows for the report later
+                $totalPrice = $totalPrice + $row['amount'];
+            }
+
+            //Reduce the total price by the take percentage
+            $invoiceAmount = $totalPrice * 0.10;
+            $invoiceAmount = round($invoiceAmount, 2);
+            
+            //Get the character name from the character id
+            $charName = $lookup->CharacterIdToName($charId);
+
+            //Generate a unique invoice id
+            $invoiceId = uniqid();
+            
+            //Save the invoice model
+            $invoice = new Invoice;
+            $invoice->character_id = $charId;
+            $invoice->character_name = $charName;
+            $invoice->invoice_id = $invoiceId;
+            $invoice->invoice_amount = $invoiceAmount;
+            $invoice->date_issued = Carbon::now();
+            $invoice->date_due = Carbon::now()->addDays(7);
+            $invoice->status = 'Pending';
+            $invoice->save();
+
+            //Update the ledger entries
+            Ledger::where([
+                'character_id' => $charId,
+                'invoiced' => 'No',
+            ])->update([
+                'invoiced' => 'Yes',
+                'invoice_id' => $invoiceId,
+            ]);
+
+            //Create the mail body
+            $body .= "Dear Miner,<br><br>";
+            $body .= "Mining Taxes are due for the following ores mined from alliance moons: <br>";
+            foreach($ores as $ore => $quantity) {
+                $oreName = $lookup->ItemIdToName($ore);
+                $body .= $oreName . ": " . number_format(round($quantity * $config['mining_tax']), 0, ".", ",") . "<br>";
+            }
+            $body .= "Please remit " . number_format($totalPrice, 2, ".", ",") . " ISK to Spatial Forces by " . $invoice->date_due . "<br>";
+            $body .= "Set the reason for transfer as MMT: " . $invoice->invoice_id . "<br>";
+            $body .= "<br><br>";
+            $body .= "You can also send a contract with the following ores in the contract with the reason set as MMT: " . $invoice->invoice_id . "<br>";
+            foreach($ores as $ore => $quantity) {
+                $oreName = $lookup->ItemIdToName($ore);
+                $body .= $oreName . ": " . number_format(round($quantity * $config['mining_tax']), ".", ",") . "<br>";
+            }
+            $body .= "<br>";
+            $body .= "<br>Sincerely,<br>Warped Intentions Leadership<br>";
+
+            //Mail the invoice to the character if the character is in
+            //Warped Intentions or Legacy
+            $subject = 'Warped Intentions Mining Taxes';
+            $sender = $config['primary'];
+            $recipientType = 'character';
+            $recipient = $charId;
+
+            //Send the Eve Mail Job to the queue to be dispatched
+            ProcessSendEveMailJob::dispatch($body, $recipient, $recipientType, $subject, $sender)->onQueue('mail');
+        }
+
+        //Set the task as stopped
+        $task->SetStopStatus();
+
+        return 0;
+    }
+}

app/Console/Commands/MiningTaxes/MiningTaxesLedgers.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Console\Commands\MiningTaxes;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Application Library
+use Commands\Library\CommandHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Helpers\LookupHelper;
+use App\Library\Moons\MoonCalc;
+
+//Models
+use App\Models\MiningTax\Observer;
+use App\Models\MiningTax\Ledger;
+use App\Models\Moon\MineralPrice;
+use App\Models\Moon\ItemComposition;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
+//Jobs
+//use App\Jobs\Commands\MiningTaxes\FetchMiningTaxesLedgersJob;
+
+class MiningTaxesLedgers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'MiningTax:Ledgers';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Start getting the mining ledgers.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        //Create the command helper container
+        $task = new CommandHelper('MiningTaxesLedger');
+        //Set the task as started
+        $task->SetStartStatus();
+
+        //Get the site configuration which holds some data we need
+        $config = config('esi');
+        //Get the observers from the database
+        $observers = Observer::all();
+        //Job Variables to be moved later
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $mHelper = new MoonCalc;
+        $esiHelper = new Esi;
+        /*
+        //For each of the observers, send a job to fetch the mining ledger
+        foreach($observers as $obs) {
+            //Dispatch the mining taxes ledger jobs
+            FetchMiningTaxesLedgersJob::dispatch($config['primary'], $config['corporation'], $obs->observer_id)->onQueue('miningtaxes');
+        }
+        */
+
+        $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        foreach($observers as $obs) {
+            try {
+                $response = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                    'corporation_id' => $config['corporation'],
+                    'observer_id' => $obs->observer_id,
+                ]);
+            } catch(RequestFailedException $e) {
+                Log::warning('Failed to get the mining ledger in FetchMiningTaxesLedgersCommand for observer id: ' . $this->observerId);
+                return null;
+            }
+
+            $ledgers = json_decode($response->raw);
+
+            foreach($ledgers as $ledger) {
+                //Get some basic information we need to work with
+                $charName = $lookup->CharacterIdToName($ledger->character_id);
+                //Get the type name from the ledger ore stuff
+                $typeName = $lookup->ItemIdToName($ledger->type_id);
+                //Get the price from the helper function
+                $price = $mHelper->CalculateOrePrice($ledger->type_id);
+                //Calculate the total price based on the amount
+                $amount = $price * $ledger->quantity;
+
+                //Insert or update the entry in the database
+                $item = Ledger::updateOrCreate([
+                        'character_id' => $ledger->character_id,
+                        'character_name' => $charName,
+                        'observer_id' => $obs->observer_id,
+                        'last_updated' => $ledger->last_updated,
+                        'type_id' => $ledger->type_id,
+                        'ore_name' => $typeName,
+                        'quantity' => $ledger->quantity,
+                        'amount' => $amount,
+                    ], [
+                        'character_id' => $ledger->character_id,
+                        'character_name' => $charName,
+                        'observer_id' => $obs->observer_id,
+                        'last_updated' => $ledger->last_updated,
+                        'type_id' => $ledger->type_id,
+                        'ore_name' => $typeName,
+                        'quantity' => $ledger->quantity,
+                        'amount' => $amount,
+                    ]);
+            }
+        }
+
+        //Clean up old data
+        //Ledger::where(['updated_at', '<', Carbon::now()->subDays(120)])->delete();
+
+        //Return 0
+        return 0;
+    }
+}

app/Console/Commands/MiningTaxes/MiningTaxesObservers.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Console\Commands\MiningTaxes;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Commands\Library\CommandHelper;
+use Carbon\Carbon;
+
+//Application Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Helpers\LookupHelper;
+
+//App Models
+use App\Models\MiningTax\Observer;
+
+//Jobs
+use App\Jobs\Commands\MiningTaxes\FetchMiningTaxesObserversJob;
+
+class MiningTaxesObservers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'MiningTax:Observer';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get mining tax observers.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        //Create the command helper container
+        $task = new CommandHelper('MiningTaxesObservers');
+        //Set the task as started
+        $task->SetStartStatus();
+        $startTime = time();
+
+        //Declare variables
+        $config = config('esi');
+        $lookup = new LookupHelper;
+        $esiHelper = new Esi;
+
+        //Check for the esi scope
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
+            Log::critical('Esi scopes were not found for FetchMiningTaxesObserversJob.');
+            print("Esi scopes not found.");
+            return;
+        }
+
+        $char = $lookup->GetCharacterInfo($config['primary']);
+
+        //Get the refresh token for the character
+        $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+        //Get the esi variable
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        try {
+            $response = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+                'corporation_id' => $char->corporation_id,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::critical("Failed to get moon observers in FetchMiningTaxesObservers");
+            Log::critical($e);
+            dd($e);
+        }
+        
+        $resp = json_decode($response->raw, false);
+
+        //Run through the mining observers, and add them to the database
+        foreach($resp as $observer) {
+
+            Observer::updateOrInsert([
+                'observer_id' => $observer->observer_id,
+            ], [
+                'observer_id' => $observer->observer_id,
+                'observer_type' => $observer->observer_type,
+                'last_updated' => $observer->last_updated,
+            ]);
+        }
+
+        /**
+         * Cleanup stale data that hasn't been updated in at least 1 week.
+         */
+        $date = Carbon::now()->subDays(60);
+        Observer::where('last_updated', '<', $date)->delete();
+
+
+
+        $task->SetStopStatus();
+        $endTime = time();
+        printf("Time to complete: " . ($endTime - $startTime) . "\n\r");
+
+        //Return 0 saying everything is fine
+        return 0;
+    }
+}

app/Console/Commands/MiningTaxes/MiningTaxesPayments.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Console\Commands\MiningTaxes;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Application Library
+use Commands\Library\CommandHelper;
+use App\Library\Lookup\LookupHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\MiningTaxes\Invoice;
+use App\Models\MiningTaxes\Payment;
+use App\Models\Finances\PlayerDonationJournal;
+
+//Jobs
+use App\Jobs\Commands\MiningTaxes\ProcessMiningTaxesPaymentsJob;
+
+class MiningTaxesPayments extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'MiningTax:Payments';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Process mining tax payments';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        //Create the command helper container
+        $task = new CommandHelper('MiningTaxesPayments');
+        //Set the task as started
+        $task->SetStartStatus();
+
+       //Declare variables for the function
+       $lookup = new LookupHelper;
+       $currentTime = Carbon::now();
+       $config = config('esi');
+       $esiHelper = new Esi;
+
+       //Check for the esi scope
+       if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-contracts.read_corporation_contracts.v1')) {
+           Log::critical('Esi scopes were not found for MiningTaxesPayments');
+           print("Esi scope not found.");
+           return;
+       }
+
+       //Get the refresh token
+       $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+       //Get the esi variable
+       $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+       //Get all of the contracts from esi
+       try {
+           $response = $esi->invoke('get', '/corporations/{corporation_id}/contracts/', [
+                'corporation_id' => $config['corporation'],
+           ]);
+       } catch(RequestFailedException $e) {
+           Log::critical("Failed to get contrcts in MiningTaxesPayments command.");
+           Log::critical($e);
+           dd($e);
+       }
+
+       //Decode the contracts from the json response
+       $contracts = json_decode($response->raw, false);
+
+       //Get the outstanding invoices
+       $outstanding = Invoice::where([
+           'status' => 'Pending',
+       ])->get();
+
+       //Use the player donation and the journal in order to check over the pending contracts to attempt
+       //to pay the contract
+       foreach($outstanding as $invoice) {
+            //See if we have a reason with the correct uniqid from the player donation journal
+            $found = PlayerDonationJournal::where([
+               'reason' => "MMT: " . $invoice->invoice_id,
+            ])->count();
+            
+            if($found == 1) {
+                //If the bill is paid on time, then update the invoice as such
+                if($currentTime->lessThanOrEqualTo($invoice->due_date)) {
+                    Invoice::where([
+                        'invoice_id' => $invoice->invoice_id,
+                    ])->update([
+                        'status' => 'Paid',
+                    ]);
+                }
+
+                //If the bill is paid late, then update the invoice as such
+                if($currentTime->greaterThan($invoice->due_date)) {
+                    Invoice::where([
+                        'invoice_id' => $invoice->invoice_id,
+                    ])->update([
+                        'status' => 'Paid Late',
+                    ]);
+                }
+            } else {
+                //If we didn't found a journal entry, then we shall check the contracts for a correct entry
+                foreach($contracts as $contract) {
+                    if(($contract->title == ("MMT: " . $invoice->invoice_id)) && ($currentTime->lessThanOrEqualTo($invoice->due_date))) {
+                        Invoice::where([
+                            'invoice_i' => $invoice->invoice_id,
+                        ])->update([
+                            'stauts' => 'Paid'
+                        ]);
+                    }
+
+                    if(($contract->title == ("MMT: " . $invoice_id)) && ($currentTime->greaterThan($invoice->due_date))) {
+                        Invoice::where([
+                            'invoice_id' => $invoice->invoice_id,
+                        ])->update([
+                            'status' => 'Paid Late',
+                        ]);
+                    }
+                }
+            }
+       }
+
+        //Set the task as stopped
+        $task->SetStopStatus();
+
+        return 0;
+    }
+}

app/Console/Commands/Structures/GetStructuresCommand.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Console\Commands\Structures;
+
+use Illuminate\Console\Command;
+
+//Job
+use App\Jobs\Commands\Structures\ProcessStructureJob;
+
+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()
+    {
+        //Get the esi config
+        $config = config('esi');
+
+        //Declare some variables
+        $charId = $config['primary'];
+        $corpId = 98287666;
+
+        //Dispatch the job to be done when the application has time
+        ProcessStructureJob::dispatch($charId, $corpId);
+    }
+}

app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Commands\SupplyChain;
+
+//Internal Library
+use Illuminate\Console\Command;
+use Log;
+use Carbon\Carbon;
+
+//Models
+use App\Models\Contracts\SupplyChainContract;
+
+//Job
+use App\Jobs\Commands\SupplyChain\EndSupplyChainContractJob;
+
+class EndSupplyChainContractCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:supplychain';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Checks and ends any supply chain contracts needs to be closed.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $today = Carbon::now();
+
+        //Get the supply chain contracts which are open, but need to be closed.
+        $contracts = SupplyChainContract::where([
+            'state' => 'open',
+        ])->where('end_date', '>', $today)->get();
+
+        //Create jobs to complete each contract
+        foreach($contracts as $contract) {
+            EndSupplyChainContractJob::dispatch($contract)->onQueue('default');
+        }
+    }
+}

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/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,28 @@ 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,
+        /**
+         * Data Commands
+         */
+        Commands\Data\PurgeUsers::class,
+        Commands\Data\EmptyJumpBridges::class,
+        Commands\Data\CleanStaleDataCommand::class,
+        Commands\Data\Test::class,
+        /**
+         * Eve Commands
+         */
+        Commands\Eve\ItemPricesUpdateCommand::class,
+        /**
+         * Finance Commands
+         */
+        Commands\Finances\UpdateAllianceWalletJournal::class,
+        /**
+         * Mining Tax Commands
+         */
+        Commands\MiningTaxes\MiningTaxesInvoices::class,
+        Commands\MiningTaxes\MiningTaxesLedgers::class,
+        Commands\MiningTaxes\MiningTaxesObservers::class,
+        Commands\MiningTaxes\MiningTaxesPayments::class,
     ];
 
     /**
@@ -30,27 +49,50 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('services:CorpJournal')
-                 ->hourly()
+        //Horizon Graph Schedule
+        $schedule->command('horizon:snapshot')->everyFiveMinutes();
+        /**
+         * Purge Data Schedule
+         */
+        $schedule->command('data:CleanData')
+                 ->weekly(7, '11:00');
+        $schedule->command('data:PurgeCorpLedgers')
+                 ->monthly();
+        $schedule->command('data:PurgeUsers')
+                 ->dailyAt('23:00');
+
+        /**
+         * Finances Update Schedule
+         */
+        $schedule->command('finances:UpdateJournals')
+                 ->hourlyAt('45')
                  ->withoutOverlapping();
-        $schedule->command('services:HoldingJournal')
-                ->hourly()
-                ->withoutOverlapping();
-        $schedule->command('services:UpdateMoonPrice')
-                ->hourly()
-                ->withoutOverlapping();
-        $schedule->command('services:GetCorps')
-                 ->monthlyOn(1, '09:00')
+
+        /**
+         * Item Update Schedule
+         */
+        $schedule->command('services:ItemPriceUpdate')
+                 ->hourlyAt('30')
                  ->withoutOverlapping();
-        $schedule->command('services:CalculateMarketTax')
-                 ->monthlyOn(1, '08:00')
+
+        /**
+         * Mining Tax Schedule
+         */
+        $schedule->command('MiningTaxes:Observers')
+                 ->dailyAt('22:00')
                  ->withoutOverlapping();
-        $schedule->command('services:MoonMailer')
-                ->monthlyOn(1, '00:01')
-                ->withoutOverlapping();
-        $schedule->command('services:PiTransactions')
-                ->hourly()
-                ->withoutOverlapping();
+        $schedule->command('MiningTaxes:Ledgers')
+                 ->dailyAt('20:00')
+                 ->withoutOverlapping();
+        /*
+        $schedule->command('MiningTaxes:Invoices')
+                 ->weeklyOn(1, '8:00')
+                 ->withoutOverlapping();
+        $schedule->command('MiningTaxes:Payments')
+                 ->hourlyAt('15')
+                 ->withoutOverlapping();
+        */
+        
     }
 
     /**

app/Exceptions/Handler.php

@@ -2,7 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
+//use Exception;
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -32,7 +33,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -44,7 +45,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

app/Http/Controllers/AfterActionReports/AfterActionReportsAdminController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\AfterActionReports;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class AfterActionReportsAdminController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('permission:fc.lead');
+    }
+
+    public function DeleteReport() {
+
+    }
+
+    public function DeleteComment() {
+
+    }
+
+    public function PruneReports() {
+
+    }
+
+    public function DisplayStastics() {
+        
+    }
+}

app/Http/Controllers/AfterActionReports/AfterActionReportsController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\AfterActionReports;
+
+//Internal Library
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+//Models
+use App\Models\AfterActionReports\Report;
+use App\Models\AfterActionReports\Comment;
+
+class AfterActionReportsController extends Controller
+{
+    public function __contstruct() {
+        $this->middleware('auth');
+        $this->middleware('permission:fc.team');
+    }
+
+    public function DisplayReportForm() {
+        //
+    }
+
+    public function StoreReport() {
+        
+    }
+
+    public function StoreComment() {
+
+    }
+
+    public function DisplayAllReports() {
+
+    }
+}

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,29 @@
 
 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 Laravel\Socialite\Contracts\Factory as Socialite;
+use Laravel\Socialite\Two\User as SocialiteUser;
 
-use App\User;
+//Library
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use App\Library\Esi\Esi;
+use App\Library\Helpers\LookupHelper;
+
+//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
 {
@@ -69,21 +75,123 @@ class LoginController extends Controller
      * 
      * @return Socialite
      */
-    public function redirectToProvider() {
-        return Socialite::driver('eveonline')->redirect();
+    public function redirectToProvider($profile = null, Socialite $social) {
+        //The default scope is public data for everyone due to OAuth2 Tokens
+        $scopes = ['publicData'];
+
+        //Collect any other scopes we need if we are logged in.
+        //If we are logged in we are linking another character to this one.
+        //Attempt to use the same scopes for this character as the original one
+        if(Auth::check()) {
+            $extraScopes = EsiScope::where([
+                'character_id' => auth()->user()->getId(),
+            ])->get(['scope']);
+            
+            //Pop each scope onto the array of scopes
+            foreach($extraScopes as $extra) {
+                array_push($scopes, $extra->scope);
+            }
+
+            /**
+             * Place the scopes in the session.
+             * Place the original character id in the session.
+             */
+            session()->put('scopes', $scopes);
+            session()->put('orgCharacter', auth()->user()->getId());
+        }
+
+        return $social->driver('eveonline')
+                         ->scopes($scopes)
+                         ->redirect();
     }
 
     /**
      * Get token from callback
      * Redirect to the dashboard if logging in successfully. 
      */
-    public function handleProviderCallback() {
-        $ssoUser = Socialite::driver('eveonline')->user();
-        $user = $this->createOrGetUser($ssoUser);
+    public function handleProviderCallback(Socialite $social) {
+        //Get the sso user from the socialite driver
+        $ssoUser = $social->driver('eveonline')->user();
 
-        auth()->login($user, true);
+        $scpSession = session()->pull('scopes');
 
-        return redirect()->to('/dashboard')->with('success', 'Successfully Logged In or Updated ESI.');
+        //If the user was already logged in, let's do some checks to see if we are adding
+        //additional scopes to the user's account
+        if(Auth::check()) {
+            //If we are logged in already and the session contains the original characters, then we are creating an alt
+            //for the original character
+            if(session()->has('orgCharacter')) {
+                $orgCharacter = session()->pull('orgCharacter');
+
+                if($this->createAlt($ssoUser, $orgCharacter)) {
+                    return redirect()->to('/profile')->with('success', 'Alt registered.');
+                } else {    
+                    return redirect()->to('/profile')->with('error', 'Unable to register alt or it was previously registered.');
+                }
+            } else {
+                if(sizeof($ssoUser->scopes) > 1) {
+                    $tokenCount = EsiToken::where([
+                        'character_id' => $ssoUser->id,
+                    ])->count();
+                    if($tokenCount > 0) {
+                        $this->UpdateEsiToken($ssoUser);
+                    } else {
+                        $this->SaveEsiToken($ssoUser);
+                    }
+                    $this->SetScopes($ssoUser->scopes, $ssoUser->id);
+                    return redirect()->to('/dashboard')->with('success', 'Successfully updated ESI scopes.');
+                }
+            }
+        } else {
+            //If the user wasn't logged in, then create a new user
+            $user = $this->createOrGetUser($ssoUser);
+            //Login in the new user
+            auth()->login($user, true);
+            //Redirect back to the dashboard
+            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, $orgCharacter) {
+
+        $altCount = UserAlt::where('character_id', $user->id)->count();
+        if($altCount == 0) {
+            //Create the new alt in the table
+            $newAlt = new UserAlt;
+            $newAlt->name = $user->getName();
+            $newAlt->main_id = $orgCharacter;
+            $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();
+
+            //Create the entry into the EsiToken table
+            //Create the entry into the EsiToken table
+            if(EsiToken::where(['character_id' => $user->id])->count() == 0) {
+                $this->SaveEsiToken($user);
+            } else {
+                $this->UpdateEsiToken($user);
+            }
+
+            //Create the entry into the EsiScopes table
+            if(sizeof($user->scopes) > 1) {
+                $this->SetScopes($user->scopes, $user->id);
+            }
+            //Return the successfull conclusion of the function
+            return 1;
+        } else {
+            //Return the unsuccessfull conclusion of the function
+            return 0;
+        }
     }
 
      /**
@@ -92,96 +200,153 @@ class LoginController extends Controller
      * 
      * @param \Laravel\Socialite\Two\User $user
      */
-    private function createOrGetUser($eve_user) {
-        //Search for user in the database
-        $authUser = User::where('character_id', $eve_user->id)->first();
+    private function createOrGetUser($eveUser) {
+        $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' => $eveUser->id,
+        ])->count();
+        
         //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
-                if($this->OwnerHasChanged($authUser->owner_hash, $eve_user->owner_hash)) {
-                    //Get the right role for the user
-                    $role = $this->GetRole(null, $eve_user->id);
-                    //Set the role for the user
-                    $this->SetRole($role, $eve_user->id);
+        if($userCount > 0) {
+            //Search for user in the database
+            $authUser = User::where([
+                'character_id' => $eveUser->id,
+            ])->first();
 
-                    //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,
-                    ]);
-                    //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,
-                    ]);
-                }
+            //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, $eveUser->owner_hash)) {
+                //Get the right role for the user
+                $role = $this->GetRole(null, $eveUser->id);
+                //Set the role for the user
+                $this->SetRole($role, $eveUser->id);
 
-                //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();
-                }
+                //Update the user information never the less.
+                $this->UpdateUser($eveUser, $role);
 
-                //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,
-                ]);
+                //Update the user's roles and permission
+                $this->UpdatePermission($eveUser, $role);
             }
+
             //Return the user to the calling auth function
             return $authUser;
         } else {
             //Get the role for the character to be stored in the database
-            $role = $this->GetRole(null, $eve_user->id);
+            $role = $this->GetRole(null, $eveUser->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($eveUser);
 
             //Set the role for the user
-            $this->SetRole($role, $eve_user->id);
+            $this->SetRole($role, $eveUser->id);
 
             //Create a user account
             return $user;
         }
     }
 
+    /**
+     * Update the ESI Token
+     */
+    private function UpdateEsiToken($eveUser) {
+        EsiToken::where('character_id', $eveUser->id)->update([
+            'character_id' => $eveUser->getId(),
+            'access_token' => $eveUser->token,
+            'refresh_token' => $eveUser->refreshToken,
+            'inserted_at' => time(),
+            'expires_in' => $eveUser->expiresIn,
+        ]);
+    }
+
+    /**
+     * Create a new ESI Token in the database
+     */
+    private function SaveEsiToken($eveUser) {
+        $token = new EsiToken;
+        $token->character_id  = $eveUser->id;
+        $token->access_token = $eveUser->token;
+        $token->refresh_token = $eveUser->refreshToken;
+        $token->inserted_at = time();
+        $token->expires_in = $eveUser->expiresIn;
+        $token->save();
+    }
+
+    /**
+     * Update avatar
+     */
+    private function UpdateAvatar($eveUser) {
+        User::where('character_id', $eveUser->id)->update([
+            'avatar' => $eveUser->avatar,
+        ]);
+    }
+
+    /**
+     * Update user permission
+     */
+    private function UpdatePermission($eveUser, $role) {
+        UserPermission::where(['character_id' => $eveUser->id])->delete();
+        $perm = new UserPermission();
+        $perm->character_id = $eveUser->id;
+        $perm->permission = $role;
+        $perm->save();
+    }
+
+    /**
+     * Update the user
+     */
+    private function UpdateUser($eveUser, $role) {
+        User::where('character_id', $eveUser->id)->update([
+            'avatar' => $eveUser->avatar,
+            'owner_hash' => $eveUser->owner_hash,
+            'role' => $role,
+        ]);
+    }
+
+    /**
+     * Create a new user account
+     */
+    private function CreateNewUser($eveUser) {
+        $user = User::create([
+            'name' => $eveUser->getName(),
+            'avatar' => $eveUser->avatar,
+            'owner_hash' => $eveUser->owner_hash,
+            'character_id' => $eveUser->getId(),
+            'inserted_at' => time(),
+            'expires_in' => $eveUser->expiresIn,
+            'user_type' => $this->GetAccountType(null, $eveUser->id),
+        ]);
+        
+        //Look for an existing token for the characters
+        $tokenFound = EsiToken::where([
+            'character_id' => $eveUser->id,
+        ])->count();
+
+        if($tokenFound == 0) {
+            $token = new EsiToken;
+            $token->character_id = $eveUser->id;
+            $token->access_token = $eveUser->token;
+            $token->refresh_token = $eveUser->refreshToken;
+            $token->inserted_at = time();
+            $token->expires_in = $eveUser->expiresIn;
+            $token->save();
+        } else {
+            EsiToken::where([
+                'character_id' => $eveUser->id,
+            ])->update([
+                'character_id' => $eveUser->id,
+                'access_token' => $eveUser->token,
+                'refresh_token' => $eveUser->refreshToken,
+                'inserted_at' => time(),
+                'expires_in' => $eveUser->expiresIn,
+            ]);
+        }
+
+        return $user;
+    }
+
     /**
      * Set the user role in the database
      * 
@@ -204,7 +369,6 @@ class LoginController extends Controller
     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;
@@ -259,22 +423,26 @@ class LoginController extends Controller
      * @return text
      */
     private function GetAccountType($refreshToken, $charId) {
+        //Declare some variables
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+
+        //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 = $lookup->GetCharacterInfo($charId);
 
         //Get the corporation information
-        $corp_info = $esi->invoke('get', '/corporations/{corporation_id}/', [
-            'corporation_id' => $character_info->corporation_id,
-        ]);
+        $corp_info = $lookup->GetCorporationInfo($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,174 @@
+<?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\Helpers\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
+            $blacklist = new BlacklistEntity;
+            $blacklist->entity_id = $entityId;
+            $blacklist->entity_name = $request->name;
+            $blacklist->entity_type = $request->type;
+            $blacklist->reason = $request->reason;
+            $blacklist->alts = $request->alts;
+            $blacklist->lister_id = auth()->user()->getId();
+            $blacklist->lister_name = auth()->user()->getName();
+            $blacklist->validity = 'Valid';
+            $blacklist->save();
+
+            //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',
+        ]);
+
+        //Set the character on the blacklist to removed
+        BlacklistEntity::where([
+            'entity_name' => $request->name,
+        ])->update([
+            'validity' => 'Invalid',
+            'removed_by_id' => auth()->user()->getId(),
+            'removed_by_name' => auth()->user()->getName(),
+            'removed_notes' => $request->notes,
+        ]);
+
+        //Return the view
+        return redirect('/blacklist/display')->with('success', 'Character removed from the blacklist.');
+    }
+
+    public function DisplayBlacklist() {
+
+        //Get the entire blacklist
+        $blacklist = BlacklistEntity::where([
+            'validity' => 'Valid',
+        ])->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/SupplyChainController.php

@@ -0,0 +1,501 @@
+<?php
+
+namespace App\Http\Controllers\Contracts;
+
+//Internal Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+
+//Libraries
+use App\Library\Helpers\LookupHelper;
+
+//Models
+use App\Models\User\User;
+use App\Models\Contracts\SupplyChainBid;
+use App\Models\Contracts\SupplyChainContract;
+
+//Jobs
+use App\Jobs\Commands\Eve\ProcessSendEveMailJob;
+
+class SupplyChainController extends Controller
+{
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:Renter');
+    }
+
+    /**
+     * Display the supply chain dashboard
+     * Should contain a section for open contracts, closed contracts, and expired contracts.
+     */
+    public function displaySupplyChainDashboard() {
+        $openContracts = SupplyChainContract::where([
+            'state' => 'open',
+        ])->get();
+
+        $closedContracts = SupplyChainContract::where([
+            'state' => 'closed',
+        ])->get();
+
+        $completedContracts = SupplyChainContract::where([
+            'state' => 'completed',
+        ])->get();
+
+        return view('supplychain.dashboard.main')->with('openContracts', $openContracts)
+                                                 ->with('closedContracts', $closedContracts)
+                                                 ->with('completedContracts', $completedContracts);
+    }
+
+    /**
+     * Display my supply chain contracts dashboard
+     * Should contain a section for open contracts, closed contracts, and expired contracts
+     */
+    public function displayMySupplyChainDashboard() {
+        $openContracts = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'state' => 'open',
+        ])->get();
+
+        $closedContracts = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'state' => 'closed',
+        ])->get();
+
+        $completedContracts = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'state' => 'completed',
+        ])->get();
+
+        return view('supplychain.dashboard.main')->with('openContracts', $openContracts)
+                                                 ->with('closedContracts', $closedContracts)
+                                                 ->with('completedContracts', $completedContracts);
+    }
+
+    /**
+     * 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() {
+        $contracts = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'state' => 'open',
+        ])->get();
+
+        return view('supplychain.forms.delete')->with('contracts', $contracts);
+    }
+
+    /**
+     * Delete a supply chain contract
+     */
+    public function deleteSupplyChainContract(Request $request) {
+        $this->validate($request, [
+            'contractId' => 'required',
+        ]);
+
+        $contractId = $request->contractId;
+
+        /**
+         * Remove the supply chain contract if it's yours.
+         */
+        $count = SupplyChainContract::where([
+            'issuer_id' => auth()->user()->getId(),
+            'contract_id' => $contractId,
+        ])->count();
+
+        if($count > 0) {
+            //Remove the supply chain contract
+            SupplyChainContract::where([
+                'issuer_id' => auth()->user()->getId(),
+                'contract_id' => $contractId,
+            ])->delete();
+
+            //Remove all bids associated with the supply chain contract
+            SupplyChainBid::where([
+                'contract_id' => $contractId,
+            ])->delete();
+
+            return redirect('/supplychain/dashboard')->with('success', 'Supply Chain Contract deleted successfully.');
+        } else {
+            return redirect('/supplychain/dashboard')->with('error', 'Unable to delete supply chain contract.');
+        }
+    }
+
+    /**
+     * 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) {
+            SupplyChainContract::where([
+
+            ])->update([
+
+            ]);
+
+            SupplyChainBid::where([
+
+            ])->update([
+
+            ]);
+
+            return redirect('/supplychain/dashboard')->with('success', 'Contract ended, and mails sent to the winning bidder.');
+        } else {
+            //If the count is zero, then redirect with error messsage
+            return redirect('/supplychain/dashboard')->with('error', 'Contract was not yours to end.');
+        }
+    }
+
+    /**
+     * Display supply chain contract bids page
+     */
+    public function displaySupplyChainBids() {
+        //Display bids for the user on a page
+        $bids = array();
+
+        $bidsCount = SupplyChainBid::where([
+            'entity_id' => auth()->user()->getId(),
+            'bid_type' => 'pending',
+        ])->count();
+
+        $myBids = SupplyChainBid::where([
+            'entity_id' => auth()->user()->getId(),
+            'bid_type' => 'pending',
+        ])->get();
+
+        foreach($myBids as $bid) {
+            //Declare the temporary array
+            $temp = array();
+
+            //Get the contract information for the bid
+            $contract = SupplyChainContract::where([
+                'contract_id' => $bid->contract_id,
+            ])->first();
+
+            $temp['bid_id'] = $bid->bid_id;
+            $temp['contract_id'] = $bid->contract_id;
+            $temp['issuer_name'] = $contract->issuer_name;
+            $temp['title'] = $contract->title;
+            $temp['end_date'] = $contract->end_date;
+            $temp['body'] = $contract->body;
+            $temp['bid_amount'] = $bid->bid_amount;
+
+            array_push($bids, $temp);
+        }
+
+        return view('supplychain.dashboard.bids')->with('bids', $bids)
+                                                 ->with('bidsCount', $bidsCount);
+    }
+
+    /**
+     * 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($contract) {
+        $contractId = $contract;
+
+        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',
+        ]);
+
+        //Declare some needed variables
+        $bidAmount = 0.00;
+
+        //See if a bid has been placed by the user for this contract
+        $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) {
+            return redirect('/supplychain/dashboard')->with('error', 'Unable to insert bid as one is already present for the supply chain contract.');
+        } else {
+            //Sanitize the bid amount
+            if(preg_match('(m|M|b|B)', $request->bid) === 1) {
+                if(preg_match('(m|M)', $request->bid) === 1) {
+                    $cStringSize = strlen($request->bid);
+                    $tempCol = str_split($request->bid, $cStringSize - 1);
+                    $bidAmount = $tempCol[0];
+                    $bidAmount = $bidAmount * 1000000.00;
+                } else if(preg_match('(b|B)', $request->bid) === 1) {
+                    $cStringSize = strlen($request->bid);
+                    $tempCol = str_split($request->bid, $cStringSize - 1);
+                    $bidAmount = $tempCol[0];
+                    $bidAmount = $bidAmount * 1000000000.00;
+                }
+            } else {
+                $bidAmount = $request->bid;
+            }
+
+            //Create the database entry
+            $bid = new SupplyChainBid;
+            $bid->contract_id = $request->contract_id;
+            $bid->bid_amount = $bidAmount;
+            $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->bid_type = 'pending';
+            $bid->save();
+
+            //Update the database entry for the supply chain contract bid number
+            $num = SupplyChainContract::where([
+                'contract_id' => $request->contract_id,
+            ])->select('bids')->first();
+
+            //Increment the number of bids
+            $numBids = $num->bids + 1;
+
+            //Update the database
+            SupplyChainContract::where([
+                'contract_id' => $request->contract_id,
+            ])->update([
+                'bids' => $numBids,
+            ]);
+
+            return redirect('/supplychain/dashboard')->with('success', 'Bid succesfully entered into the contract.');
+        }
+    }
+
+    /**
+     * Delete a bid on a supply chain contract
+     * 
+     * @var contractId
+     * @var bidId
+     */
+    public function deleteSupplyChainContractBid($contractId, $bidId) {
+
+        //See if the user has put in a bid.  If not, then redirect to failure.
+        $count = SupplyChainBid::where([
+            'contract_id' => $contractId,
+            'entity_id' => auth()->user()->getId(),
+            'bid_id' => $bidId,
+        ])->count();
+
+        if($count > 0) {
+            SupplyChainBid::where([
+                'contract_id' => $contractId,
+                'entity_id' => auth()->user()->getId(),
+                'bid_id' => $bidId,
+            ])->delete();
+
+            //Update the database entry for the supply chain contract bid number
+            $num = SupplyChainContract::where([
+                'contract_id' => $contractId,
+            ])->select('bids')->first();
+
+            //Decrement the number of bids
+            $numBids = $num->bids - 1;
+
+            //Update the database
+            SupplyChainContract::where([
+                'contract_id' => $contractId,
+            ])->update([
+                'bids' => $numBids,
+            ]);
+
+            return redirect('/supplychain/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',
+        ]);
+
+        //Get the contract id
+        $contractId = $request->contract_id;
+        //Get the bid id to be modified later
+        $bid = SupplyChainBid::where([
+            'contract_id' => $contractId,
+            'entity_id' => auth()->user()->getId(),
+        ])->first();
+
+        $bidId = $bid->id;
+
+        return view('supplychain.forms.modifybid')->with('contractId', $contractId)
+                                                  ->with('bidId', $bidId);
+    }
+
+    /**
+     * 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()->toFormattedDateString();
+
+        $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) {
+        //Set the contract as finished
+        SupplyChainContract::where([
+            'contract_id' => $contract->contract_id,
+        ])->update([
+            'state' => 'finished',
+        ]);
+
+        //Set all of the bids as not_accepted as default
+        SupplyChainBid::where([
+            'contract_id' => $contract->contract_id,
+        ])->update([
+            'bid_type' => 'not_accepted',
+        ]);
+
+        //Set the correct bid as accepted
+        SupplyChainBid::where([
+            'contract_id' => $contract->contract_id,
+            'bid_id' => $bid->bid_id,
+        ])->update([
+            'bid_type' => 'accepted',
+        ]);
+    }
+}

app/Http/Controllers/Dashboard/AdminController.php

@@ -5,15 +5,19 @@ 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\Helpers\TaxesHelper;
+use App\Library\Helpers\LookupHelper;
+use App\Library\Helpers\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;
 
 class AdminController extends Controller
@@ -23,25 +27,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 2 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 +185,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,
-        ];
+        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);
+    }
 
-        /** 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;
+    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;
         }
 
-        return view('admin.dashboard')->with('data', $data)
-                                      ->with('pis', $pis)
-                                      ->with('industrys', $industrys)
-                                      ->with('offices', $offices)
-                                      ->with('markets', $markets)
-                                      ->with('jumpgates', $jumpgates)
-                                      ->with('reprocessings', $reprocessings)
-                                      ->with('entities', $entities)
-                                      ->with('pigross', $pigross);
+        $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 +280,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 +296,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 +313,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 +331,5 @@ class AdminController extends Controller
 
         return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.');
     }
+
 }

app/Http/Controllers/Dashboard/AdminDashboardController.php

@@ -0,0 +1,46 @@
+<?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\Helpers\TaxesHelper;
+use App\Library\Helpers\LookupHelper;
+use App\Library\Helpers\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');
+        }
+
+        
+        return view('admin.dashboards.dashboard');
+    }
+}

app/Http/Controllers/Dashboard/DashboardController.php

@@ -2,15 +2,27 @@
 
 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;
 
+//Application Library
+use App\Library\Esi\Esi;
+use App\Library\Helpers\StructureHelper;
+
+//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;
+use App\Models\MiningTax\Invoice;
+use App\Models\MiningTax\Ledger;
 
 class DashboardController extends Controller
 {
@@ -32,7 +44,250 @@ 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();
+        $ores = array();
+        $altCount = null;
+        $alts = null;
+        $structures = array();
+        $esiHelper = new Esi;
+        $config = config('esi');
+        $sHelper = new StructureHelper($config['primary'], $config['corporation']);
+        $lava = new Lavacharts;
+
+
+        /**
+         * Alt Counts
+         */
+        //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();
+        }
+
+        /**
+         * SRP Items
+         */
+        //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
+        $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',
+            ],
+        ]);
+
+        /**
+         * Mining Tax Items
+         */
+        //Check for the correct scopes
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
+            return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the correct scopes for the services site.');
+        }
+
+        $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        //Get the esi data for extractions
+        try {
+            $extractions = $esi->invoke('get', '/corporation/{corporation_id}/mining/extractions', [
+                'corporation_id' => $config['corporation'],
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::critical('Could not retrieve the extractions from ESI in DisplayExtractionCalendar in MiningTaxesController');
+            return redirect('/dashboard')->with('error', 'Failed to get extraction data from ESI');
+        }
+
+        /**
+         * Create a 3 month calendar for the past, current, and future extractions
+         */
+        //Create the data tables
+        $calendar = $lava->DataTable();
+        
+        $calendar->addDateTimeColumn('Date')
+                 ->addNumberColumn('Total');
+
+        foreach($extractions as $extraction) {
+            $sInfo = $sHelper->GetStructureInfo($extraction->structure_id);
+            array_push($structures, [
+                'date' => $esiHelper->DecodeDate($extraction->chunk_arrival_time),
+                'total' => 0,
+            ]);
+        }
+
+        foreach($extractions as $extraction) {
+            for($i = 0; $i < sizeof($structures); $i++) {
+                //Create the dates in a carbon object, then only get the Y-m-d to compare.
+                $tempStructureDate = Carbon::createFromFormat('Y-m-d H:i:s', $structures[$i]['date'])->toDateString();
+                $extractionDate = Carbon::createFromFormat('Y-m-d H:i:s', $esiHelper->DecodeDate($extraction->chunk_arrival_time))->toDateString();
+                //check if the dates are equal then increase the total by 1
+                if($tempStructureDate == $extractionDate) {
+                    $structures[$i]['total'] += 1;
+                }
+            }
+        }
+
+        foreach($structures as $structure) {
+            $calendar->addRow([
+                $structure['date'],
+                $structure['total'],
+            ]);
+        }  
+                
+        $lava->CalendarChart('Extractions', $calendar, [
+            'title' => 'Upcoming Extractions',
+            'unusedMonthOutlineColor' => [
+                'stroke' => '#ECECEC',
+                'strokeOpacity' => 0.75,
+                'strokeWidth' => 1,
+            ],
+            'dayOfWeekLabel' => [
+                'color' => '#4f5b0d',
+                'fontSize' => 16,
+                'italic' => true,
+            ],
+            'noDataPattern' => [
+                'color' => '#DDD',
+                'backgroundColor' => '#11FFFF',
+            ],
+            'colorAxis' => [
+                'values' => [0, 5],
+                'colors' => ['green', 'red'],
+            ],
+        ]);
+
+        return view('dashboard')->with('openCount', $openCount)
+                                ->with('approvedCount', $approvedCount)
+                                ->with('deniedCount', $deniedCount)
+                                ->with('open', $open)
+                                ->with('approved', $approved)
+                                ->with('denied', $denied)
+                                ->with('lava', $lava)
+                                ->with('calendar', $calendar);
     }
 
     /**
@@ -42,16 +297,57 @@ class DashboardController extends Controller
      * @return \Illuminate\Http\Response
      */
     public function profile() {
-        $scopes = EsiScope::where('character_id', Auth()->user()->character_id)->get();
-        $permissions = UserPermission::where('character_id', Auth()->user()->characer_id)->get();
-        $roles = UserRole::where('character_id', Auth()->user()->character_id)->get();
+        //Declare some variables
+        $alts = null;
+        $scopes = null;
+        $permissions = null;
+        $roles = null;
 
-        $data = [
-            'scopes' => $scopes,
-            'permissions' => $permissions,
-            'roles' => $roles,
-        ];
+        //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();
+        }
 
-        return view('dashboard.profile')->with('data', $data);
+        //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();
+        }
+
+        //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 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/Logistics/FuelController.php

@@ -0,0 +1,88 @@
+<?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\Helpers\AssetHelper;
+use App\Library\Helpers\StructureHelper;
+
+//Models
+use App\Models\Structure\Structure;
+use App\Models\Structure\Asset;
+use App\Models\Structure\Service;
+
+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/MiningTaxes/MiningTaxesAdminController.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Controllers\MiningTaxes;
+
+//Internal Library
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Log;
+use Carbon\Carbon;
+use Khill\Lavacharts\Lavacharts;
+use Auth;
+
+//Application Library
+use App\Library\Helpers\LookupHelper;
+use App\Library\Helpers\StructureHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\MiningTax\Invoice;
+use App\Models\MiningTax\Observer;
+use App\Models\MiningTax\Ledger;
+use App\Models\MiningTax\Payment;
+use App\Models\Moon\ItemComposition;
+use App\Models\Moon\MineralPrice;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
+class MiningTaxesAdminController extends Controller
+{
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:Admin');
+    }
+
+    /**
+     * Display current unpaid invoices
+     */
+    public function DisplayUnpaidInvoice() {
+        $invoices = Invoice::where([
+            'status' => 'Pending',
+        ])->orWhere([
+            'status' => 'Late',
+        ])->orWhere([
+            'status' => 'Deferred',
+        ])->paginate(50);
+
+        return view('miningtax.admin.display.unpaid')->with('invoices', $invoices);
+    }
+
+    /**
+     * Mark an invoice paid
+     */
+    public function UpdateInvoice(Request $request) {
+        $this->validate($request, [
+            'invoiceId' => 'required',
+            'status' => 'required',
+        ]);
+
+        Invoice::where([
+            'invoice_id' => $request->invoiceId,
+        ])->update([
+            'status' => $request->status,
+        ]);
+
+        return redirect('/miningtax/admin/display/unpaid')->with('success', 'Invoice successfully updated.');
+    }
+
+    /**
+     * Display past paid invoices
+     */
+    public function DisplayPaidInvoices() {
+        $invoices = Invoice::where([
+            'status' => 'Paid',
+        ])->orWhere([
+            'status' => 'Paid Late',
+        ])->paginate(50);
+
+        return view('miningtax.admin.display.paidinvoices')->with('invoices', $invoices);
+    }    
+}

app/Http/Controllers/MiningTaxes/MiningTaxesController.php

@@ -0,0 +1,278 @@
+<?php
+
+namespace App\Http\Controllers\MiningTaxes;
+
+//Internal Library
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Log;
+use Carbon\Carbon;
+use Khill\Lavacharts\Lavacharts;
+use Auth;
+//Collection Stuff
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+
+//Library Helpers
+use App\Library\Helpers\LookupHelper;
+use App\Library\Helpers\StructureHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+
+//Models
+use App\Models\Moon\ItemComposition;
+use App\Models\Moon\MineralPrice;
+use App\Models\MiningTax\Ledger;
+use App\Models\MiningTax\Observer;
+use App\Models\MiningTax\Invoice;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+use App\Models\User\User;
+
+class MiningTaxesController extends Controller
+{
+    /**
+     * Construct to deal with middleware and other items
+     */
+    public function __construct() {
+        $this->middleware('auth');
+        $this->middleware('role:User');
+    }
+
+    /**
+     * Display the users invoices
+     */
+    public function DisplayInvoices() {
+        //Declare variables
+        $paidAmount = 0.00;
+        $unpaidAmount = 0.00;
+
+        //Get the unpaid invoices
+        $unpaid = Invoice::where([
+            'status' => 'Pending',
+            'character_id' => auth()->user()->getId(),
+        ])->paginate(15);
+
+        //Get the late invoices
+        $late = Invoice::where([
+            'status' => 'Late',
+            'character_id' => auth()->user()->getId(),
+        ])->paginate(10);
+        
+        //Get the deferred invoices
+        $deferred = Invoice::where([
+            'status' => 'Deferred',
+            'character_id' => auth()->user()->getId(),
+        ])->paginate(10);
+
+        //Get the paid invoices
+        $paid = Invoice::where([
+            'status' => 'Paid',
+            'character_id' => auth()->user()->getId(),
+        ])->paginate(15);
+
+        //Total up the unpaid invoices
+        foreach($unpaid as $un) {
+            $unpaidAmount += $un->amount;
+        }
+
+        //Total up the paid invoices
+        foreach($paid as $p) {
+            $paidAmount += $p;
+        }
+
+        return view('miningtax.user.display.invoices')->with('unpaid', $unpaid)
+                                                      ->with('late', $late)
+                                                      ->with('deferred', $deferred)
+                                                      ->with('paid', $paid)
+                                                      ->with('unpaidAmount', $unpaidAmount)
+                                                      ->with('paidAmount', $paidAmount);
+    }
+
+    /**
+     * Display all of the upcoming extractions
+     */
+    public function DisplayUpcomingExtractions() {
+        
+        //Declare variables
+        $structures = array();
+        $esiHelper = new Esi;
+        $config = config('esi');
+        $sHelper = new StructureHelper($config['primary'], $config['corporation']);
+        $structures = array();
+        $structuresCalendar = array();
+        $lava = new Lavacharts;
+
+        if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
+            return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the correct scopes for the services site.');
+        }
+
+        $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+        $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+        //Get the esi data for extractions
+        try {
+            $extractions = $esi->invoke('get', '/corporation/{corporation_id}/mining/extractions/', [
+                'corporation_id' => $config['corporation'],
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::warning('Could not retrieve extractions from ESI in MiningTaxesController.php');
+            return redirect('/dashboard')->with('error', "Could not pull extractions from ESI data.");
+        }
+
+        //Basically get the structure info and attach it to the variable set
+        foreach($extractions as $ex) {
+            $sName = $sHelper->GetStructureInfo($ex->structure_id);
+            array_push($structures, [
+                'structure_name' => $sName->name,
+                'start_time' => $esiHelper->DecodeDate($ex->extraction_start_time),
+                'arrival_time' => $esiHelper->DecodeDate($ex->chunk_arrival_time),
+                'decay_time' => $esiHelper->DecodeDate($ex->natural_decay_time),
+            ]);
+        }
+
+        //Sort extractions by arrival time
+        $structuresCollection = collect($structures);
+        $sorted = $structuresCollection->sortBy('arrival_time');
+        //Store the sorted collection back into the variable before being used again.
+        $structures = $sorted->all();
+
+        /**
+         * Create a 3 month calendar for the past, current, and future extractions
+         */
+        //Create the data tables
+        $calendar = $lava->DataTable();
+        
+        $calendar->addDateTimeColumn('Date')
+                 ->addNumberColumn('Total');
+
+        foreach($extractions as $extraction) {
+            array_push($structuresCalendar, [
+                'date' => $esiHelper->DecodeDate($extraction->chunk_arrival_time),
+                'total' => 0,
+            ]);
+        }
+
+        foreach($extractions as $extraction) {
+            for($i = 0; $i < sizeof($structuresCalendar); $i++) {
+                //Create the dates in a carbon object, then only get the Y-m-d to compare.
+                $tempStructureDate = Carbon::createFromFormat('Y-m-d H:i:s', $structuresCalendar[$i]['date'])->toDateString();
+                $extractionDate = Carbon::createFromFormat('Y-m-d H:i:s', $esiHelper->DecodeDate($extraction->chunk_arrival_time))->toDateString();
+                //check if the dates are equal then increase the total by 1
+                if($tempStructureDate == $extractionDate) {
+                    $structuresCalendar[$i]['total'] += 1;
+                }
+            }
+        }
+
+        foreach($structuresCalendar as $structureC) {
+            $calendar->addRow([
+                $structureC['date'],
+                $structureC['total'],
+            ]);
+        }  
+                
+        $lava->CalendarChart('Extractions', $calendar, [
+            'title' => 'Upcoming Extractions',
+            'unusedMonthOutlineColor' => [
+                'stroke' => '#ECECEC',
+                'strokeOpacity' => 0.75,
+                'strokeWidth' => 1,
+            ],
+            'dayOfWeekLabel' => [
+                'color' => '#4f5b0d',
+                'fontSize' => 16,
+                'italic' => true,
+            ],
+            'noDataPattern' => [
+                'color' => '#DDD',
+                'backgroundColor' => '#11FFFF',
+            ],
+            'colorAxis' => [
+                'values' => [0, 5],
+                'colors' => ['green', 'red'],
+            ],
+        ]);
+
+        //Return the view with the extractions variable for html processing
+        return view('miningtax.user.display.upcoming')->with('structures', $structures)
+                                                      ->with('lava', $lava)
+                                                      ->with('calendar', $calendar);
+    }
+
+    /**
+     * Display the ledger for the moons.
+     */
+    public function DisplayMoonLedgers() {
+        //Declare variables
+        $structures = array();
+        $tempLedgers = array();
+        $miningLedgers = array();
+        $ledgers = array();
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+        $config = config('esi');
+        $sHelper = new StructureHelper($config['primary'], $config['corporation']);
+
+        //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 for corp mining.');
+        } 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 for structures.');
+            }
+        }
+
+        //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']);
+
+        //Get the observers from the database
+        $observers = Observer::all();
+
+        $corpInfo = $lookup->GetCorporationInfo(auth()->user()->getId());
+
+        //Get the ledgers for each structure one at a time
+        foreach($observers as $obs) {
+            /**
+             * Get the ledger from each observer.
+             * We don't care about observer type as it can only be an Athanor or Tatara
+             */
+            $ledgers = Ledger::where([
+                'observer_id' => $obs->structure_id,
+                'character_id' => auth()->user()->getId(),
+            ])->where('last_updated', '>=', Carbon::now()->subDays(30))->get();
+
+            if($ledgers != null) {
+                foreach($ledgers as $ledger) {
+                    //Get the structure name from the database
+                    $structure = $sHelper->GetStructureInfo($obs->observer_id);
+
+                    array_push($miningLedgers, [
+                        'structure' => $structure->name,
+                        'character' => auth()->user()->getName(),
+                        'corpTicker' => $corpInfo->ticker,
+                        'ore' => $ore,
+                        'quantity' => $ledger->quantity,
+                        'updated' => $ledger->last_updated,
+                    ]);
+
+                    array_push($structures, [
+                        'name' => $structure->name,
+                    ]);
+                }
+            } else {
+                redirect('/dashboard')->with('error', 'No available data for the mining ledger to be displayed.');
+            }
+        }
+
+        //Return the view
+        return view('miningtax.user.display.ledger')->with('miningLedgers', $miningLedgers)
+                                                    ->with('structures', $structures);
+    }
+}

app/Http/Controllers/Moons/MoonsAdminController.php

@@ -1,420 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Moons;
-
-//Internal Library
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Auth;
-use DB;
-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;
-
-//Library
-use App\Library\Moons\MoonCalc;
-use App\Library\Esi\Esi;
-use App\Library\Lookups\LookupHelper;
-
-class MoonsAdminController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $this->middleware('role:Admin');
-    }
-
-    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('moons.admin.moonjournal')->with('journal', $journal);
-    }
-
-    public function updateMoon() {
-        //Return the view and the form from the blade display
-        return view('moons.admin.updatemoon');
-    }
-
-    public function storeUpdateMoonRental(Request $request) {
-        $moonCalc = new MoonCalc;
-        $lookup = new LookupHelper;
-
-        $this->validate($request, [
-            'system' => 'required',
-            'planet' => 'required',
-            'moon' => 'required',
-            'renter' => 'required',
-            'date' => 'required',
-            'contact' => 'required',
-        ]);
-
-        //Take the  contact name and create a character_id from it
-        if($request->contact == 'None') {
-            $contact = 'None';
-        } else {
-            $contact = $lookup->CharacterNameToId($request->contact);
-        }
-
-        if(isset($request->Paid_Until)) {
-            $paidUntil = $request->Paid_Until;
-        } else {
-            $paidUntil = null;
-        }
-
-        //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([
-                    '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',
-        ]);
-
-        //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');
-    }
-
-    /**
-     * Function to display the moons to admins
-     */
-    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
-        $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();
-
-            //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';
-
-                //If we don't find a rental record, set the rental date as last month
-                $rentalTemp = Carbon::now()->subMonth();
-                $rentalEnd = $rentalTemp->format('m-d');
-
-                //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;
-
-                //Set the rental date up
-                $rentalTemp = new Carbon($rental->RentalEnd);
-                $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 ) {
-                $color = 'table-warning';
-            } else if( $today > $rentalTemp) {
-                $color = 'table-primary';
-            } else {
-                $color = 'table-danger';
-            }
-
-            //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);
-            
-            //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'],
-                'RentalEnd' => $rentalEnd,
-                'RowColor' => $color,
-                'Paid' => $paid,
-                'Contact' => $contact,
-                'Renter' => $ticker,
-            ]);
-        }
-
-        return view('moons.admin.adminmoon')->with('table', $table);
-    }
-
-    public function UpdateMoonPaid(Request $request) {
-        $this->validate($request, [
-            'paid' => 'required',
-        ]);
-
-        $str_array = explode(" - ", $request->paid);
-
-        //Decode the value for the SPM into a system, planet, and moon for the database to update
-        $system = $str_array[0];
-        $planet = $str_array[1];
-        $moon = $str_array[2];
-
-        //Update the paid status of the moon
-        MoonRental::where([
-            'System' => $system,
-            'Planet' => $planet,
-            'Moon' => $moon,
-        ])->update([
-            'Paid' => 'Yes',
-        ]);
-
-        //Redirect back to the moon page, which should call the page to be displayed correctly
-        return redirect('/moons/admin/display');
-    }
-
-    /**
-     * 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',
-        ]);
-
-        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');
-    }
-}

app/Http/Controllers/Moons/MoonsController.php

@@ -1,140 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Moons;
-
-//Internal Library
-use App\Http\Controllers\Controller;
-use Auth;
-use DB;
-use Illuminate\Http\Request;
-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;
-
-//Library
-use App\Library\Moons\MoonCalc;
-
-class MoonsController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $this->middleware('role:Renter');
-    }
-
-    /**
-     * Function to display the moons and pass data to the blade template
-     */
-    public function displayMoons() {
-        $rentalEnd = '';
-
-        //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
-       
-        $table = array();
-        $moonprice = null;
-        foreach($moons as $moon) {
-            //get the rental data for the moon
-            $rental = MoonRental::where([
-                'System' => $moon->System,
-                'Planet' => $moon->Planet,
-                'Moon' => $moon->Moon,
-            ])->first();
-
-            if($rental == false) {
-                //If we don't find a rental record, set the rental date as last month
-                $rentalTemp = Carbon::now()->subMonth();
-                $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 ) {
-                $color = 'table-warning';
-            } else if( $today > $rentalTemp) {
-                $color = 'table-primary';
-            } else {
-                $color = 'table-danger';
-            }
-            
-            //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,
-                '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", ".", ","),
-                'RentalEnd' => $rentalEnd,
-                'RowColor' => $color,
-            ]);
-        }
-
-        return view('moons.user.moon')->with('table', $table);
-    }
-
-    public function displayTotalWorthForm() {
-        return view('moons.user.formTotalWorth');
-    }
-
-    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();
-
-        $totalGoo = $moonCalc->SpatialMoonsOnlyGooTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity,
-                                                             $thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity);
-        $totalGoo = number_format($totalGoo, 2, ".", ",");
-
-        $totalWorth = $moonCalc->SpatialMoonsTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity,
-                                                        $thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity);
-        $totalWorth = number_format($totalWorth, 2, ".", ",");
-
-        return view('moons.user.displayTotalWorth')->with(['totalWorth' => $totalWorth, 'totalGoo' => $totalGoo]);
-    }
-}

app/Http/Controllers/SRP/SRPAdminController.php

@@ -0,0 +1,531 @@
+<?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\Helpers\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) {
+                        $payout = $p->payout;
+                        if($temp['character_name'] == $temp['fleet_commander_name']) {
+                            $payout = 100.00;
+                        }
+
+                        $temp['actual_srp'] = $r['loss_value'] * ($payout / 100.00 );
+                        $temp['payout_percentage'] = $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,157 @@
+<?php
+
+namespace App\Http\Controllers\SRP;
+
+//Laravel Libraries
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Auth;
+
+//Application Libraries
+use App\Library\Helpers\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\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\Helpers\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

@@ -1,170 +0,0 @@
-<?php
-
-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;
-
-//Models
-use App\Models\Doku\DokuGroupNames;
-use App\Models\Doku\DokuMember;
-use App\Models\Doku\DokuUser;
-use App\Models\Admin\AllowedLogin;
-
-class WikiController extends Controller
-{
-    public function __construct() {
-        $this->middleware('auth');
-        $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;
-        $name = strtolower($name);
-        $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)) {
-            return redirect('/dashboard')->with('error', 'Already registered for the wiki!');            
-        }
-
-        return view('wiki.user.register')->with('name', $name);
-    }
-
-    public function storeRegister(Request $request) {
-        $this->validate($request, [
-            'password' => 'required',
-            'password2' => 'required',
-        ]);
-
-        $password = '';
-
-        //Check to make sure the password matches
-        if($request->password !== $request->password2) {
-            return view('/dashboard')->with('error');
-        } else {
-            $password = md5($request->password);
-        }
-
-        if(Auth::user()->hasRole('User')) {
-            $role = 1; //User role id from wiki_groupname table
-        } else if(Auth::user()->hasRole('Renter')) {
-            $role = 8; //Renter role id from wiki_groupname table
-        }
-
-        //Load the model
-        $user = new DokuUser;
-        $member = new DokuMember;
-
-        //make user name syntax like we want it.
-        $name = Auth::user()->name;
-        $name = strtolower($name);
-        $name = str_replace(' ', '_', $name);
-
-        //Add the new user to the wiki
-        $user->login = $name;
-        $user->pass = $password;
-        $user->name = Auth::user()->name;
-        $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;
-        $member->gid = $role;
-        $member->save();
-        //Return to the dashboard view
-        return redirect('/dashboard')->with('success', 'Registration successful.  Your username is: ' . $name);
-    }
-
-    public function displayChangePassword() {
-        $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!');
-        } 
-
-        return view('wiki.user.changepassword')->with('name', $name);
-    }
-
-    public function changePassword(Request $request) {
-        $this->validate($request, [
-            'password' => 'required',
-            'password2' => 'required',
-        ]);
-
-        //Check for a valid password
-        $password = '';
-        if($request->password !== $request->password2) {
-            return redirect('/wiki/changepassword')->with('error', 'Passwords did not match');
-        } else {
-            $password = md5($request->password);
-        }
-        //Get a model ready for the database
-        $user = new DokuUser;
-        //Find the username for the database through the  character name in auth
-        $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]);
-
-        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/Kernel.php

@@ -60,7 +60,6 @@ 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,
         'role' => \App\Http\Middleware\RequireRole::class,
         'permission' => \App\Http\Middleware\RequirePermission::class,
     ];

app/Http/Middleware/Callback.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Facades\Auth;
-
-use Socialite;
-use DB;
-use App\User;
-
-use Seat\Eseye\Cache\NullCache;
-use Seat\Eseye\Configuration;
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-
-class Callback
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next, $guard = null)
-    {
-        return $next($request);
-    }
-}

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/ItemPricesUpdateJob.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Jobs\Commands\Eve;
+
+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;
+
+class ItemPricesUpdateJob 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()
+    {
+        $moonHelper = new MoonCalc;
+
+        $moonHelper->FetchNewPrices();
+    }
+}

app/Jobs/Commands/Eve/ProcessSendEveMailJob.php

@@ -0,0 +1,157 @@
+<?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 Spatie\RateLimitedMiddleware\RateLimited;
+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
+     * With new rate limiting, we shouldn't use this timeout
+     * @var int
+     */
+    //public $timeout = 3600;
+
+    /**
+     * Retries
+     * With new rate limiting, we shouldn't use this timeout
+     * @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();
+    }
+
+    /**
+     * Middleware to only allow 4 jobs to be run per minute
+     * After a failed job, the job is released back into the queue for at least 1 minute x the number of times attempted
+     * 
+     */
+    public function middleware() {
+        
+        //Allow 4 jobs per minute, and implement a rate limited backoff on failed jobs
+        $rateLimitedMiddleware = (new RateLimited())
+            ->allow(4)
+            ->everySeconds(60)
+            ->releaseAfterOneMinute()
+            ->releaseAfterBackoff($this->attempts());
+
+        return [new RateLimited()];
+    }
+
+    /*
+    * Determine the time at which the job should timeout.
+    *
+    */
+    public function retryUntil() :  \DateTime
+    {
+        return Carbon::now()->addDay();
+    }
+
+    /**
+     * 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/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Jobs\Commands\MiningTaxes;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Carbon\Carbon;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Helpers\LookupHelper;
+use App\Library\Moons\MoonCalc;
+
+//App Models
+use App\Models\MiningTax\Observer;
+use App\Models\MiningTax\Ledger;
+use App\Models\Moon\MineralPrice;
+use App\Models\Moon\ItemComposition;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
+class FetchMiningTaxesLedgersJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 3600;
+
+    /**
+     * Number of job retries
+     * 
+     * @var int
+     */
+    public $tries = 3;
+
+    /**
+     * Job Variables
+     */
+    private $charId;
+    private $corpId;
+    private $observerId;
+    private $esi;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($charId, $corpId, $observerId)
+    {
+        //Set the connection for the job
+        $this->connection = 'redis';
+
+        //Import the variables from the calling function
+        $this->charId = $charId;
+        $this->corpId = $corpId;
+        $this->observerId = $observerId;
+
+        //Setup the ESI stuff
+        $esiHelper = new Esi;
+
+        //Setup the private esi variables
+        if(!$esiHelper->haveEsiScope($this->charId, 'esi-industry.read_corporation_mining.v1')) {
+            Log::critical('Character: ' . $this->charId . ' did not have the correct esi scope in FetchMiningTaxesLedgersJob.');
+            return null;
+        }
+        $refreshToken = $esiHelper->GetRefreshToken($this->charId);
+        $this->esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare variables
+        $lookup = new LookupHelper;
+        $mHelper = new MoonCalc;
+        $esiHelper = new Esi;
+
+        //Get the ledger from ESI
+        try {
+            $response = $this->esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                'corporation_id' => $this->corpId,
+                'observer_id' => $this->observerId,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::warning('Failed to get the mining ledger in FetchMiningTaxesLedgersJob for observer id: ' . $this->observerId);
+            return null;
+        }
+
+        $ledgers = json_decode($response);
+
+        //Sort through the array, and create the variables needed for database entries
+        foreach($ledgers as $ledger) {
+            //Get some basic information we need to work with
+            $charName = $lookup->CharacterIdToName($ledger->character_id);
+            //Get the type name from the ledger ore stuff
+            $typeName = $lookup->ItemIdToName($ledger->type_id);
+            //Decode the date and store it.
+            //$updated = $esiHelper->DecodeDate($ledger->last_updated);
+
+            $price = $mHelper->CalculateOrePrice($ledger->type_id);
+            $amount = $price * $ledger->quantity;
+
+            //Insert or update the entry in the database
+            $item = Ledger::updateOrCreate([
+                'character_id' => $ledger->character_id,
+                'character_name' => $charName,
+                'observer_id' => $this->observerId,
+                'last_updated' => $ledger->last_updated,
+                'type_id' => $ledger->type_id,
+                'ore_name' => $typeName,
+                'quantity' => $ledger->quantity,
+                'price' => $amount,
+            ], [
+                'character_id' => $ledger->character_id,
+                'character_name' => $charName,
+                'observer_id' => $this->observerId,
+                'last_updated' => $ledger->last_updated,
+                'type_id' => $ledger->type_id,
+                'ore_name' => $typeName,
+                'quantity' => $ledger->quantity,
+                'price' => $amount,
+            ]);
+        }
+
+        //Clean up old data
+        Ledger::where(['updated_at', '<', Carbon::now()->subDays(120)])->delete();
+    }
+}

app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Jobs\Commands\MiningTaxes;
+
+//Internal Library
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Carbon\Carbon;
+use Log;
+
+//Library
+use App\Library\Lookups\LookupHelper;
+
+//Models
+use App\Models\MiningTaxes\Invoice;
+use App\Models\MiningTaxes\Payment;
+use App\Models\Finances\PlayerDonationJournal;
+
+class ProcessMiningTaxesPaymentsJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->connection = 'redis';
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare the variables we will need
+        $looup = new LookupHelper;
+        $currentTime = Carbon::now();
+
+        //Get the outstanding invoices
+        $outstanding = Invoice::where([
+            'status' => 'Pending',
+        ])->get();
+
+        //Use the player donation journal from finances to see if the invoice_id is present
+        //as a reason
+        foreach($outstanding as $invoice) {
+            //See if we have a reason with the correct uniqid from the player donation journal
+            $found = PlayerDonationJournal::where([
+                'reason' => "MMT: " . $invoice->invoice_id,
+            ])->count();
+
+            //If we have received the invoice, then mark the invoice as paid
+            if($count > 0) {
+                //If we have the count, then grab the journal entry in order to do some things with it
+                $journal = PlayerDonationJournal::where([
+                    'reason' => "MMT: " . $invoice->invoice_id,
+                ])->first();
+
+                //If the bill is paid on time, then update the invoice as such
+                if($currentTime->lessThanOrEqualTo($journal->inserted_at)) {
+                    Invoice::where([
+                        'invoice_id' => $invoice->invoice_id,
+                    ])->update([
+                        'status' => 'Paid',
+                    ]);
+                }
+
+                if($currentTime->greaterThan($journal->inserted_at)) {
+                    Invoice::where([
+                        'invoice_id' => $invoice->invoice_id,
+                    ])->update([
+                        'status' => 'Paid Late',
+                    ]);
+                }
+            }
+        }
+
+    }
+}

app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Jobs\Commands\SupplyChain;
+
+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\Contracts\SupplyChainBid;
+use App\Models\Contracts\SupplyChainContract;
+
+//Jobs
+use App\Jobs\Commands\Eve\ProcessSendEveMailJob;
+
+class EndSupplyChainContractJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout in seconds
+     * 
+     * @var int
+     */
+    public $timeout = 1200;
+
+    /**
+     * Retries
+     * 
+     * @var int
+     */
+    public $retries = 3;
+
+    /**
+     * Private Variables
+     */
+    private $contractId;
+    private $issuerId;
+    private $issuerName;
+    private $title;
+    private $endDate;
+    private $deliveryBy;
+    private $body;
+    private $state;
+    private $finalCost;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(SupplyChainContract $contract)
+    {
+        //Set the queue connection up
+        $this->connection = 'redis';
+
+        //Set the variables
+        $contractId = $contract->contract_id;
+        $issuerId = $contract->issuer_id;
+        $issuerName = $contract->issuer_name;
+        $title = $contract->title;
+        $endDate = $contract->end_date;
+        $deliveryBy = $contract->delivery_by;
+        $body = $contract->body;
+        $state = $contract->state;
+        $finalCost = $contract->final_cost;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //Declare variables
+        $bidId = null;
+        $bidAmount = null;
+
+        //Get all of the bids from the contract
+        $bids = SupplyChainBids::where([
+            'contract_id' => $contractId,
+        ])->get();
+
+        //Loop through the bids and find the lowest bid
+        foreach($bids as $bid) {
+            if($bidId == null) {
+                $bidId = $bid->id;
+                $bidAmount = $bid->bid_amount;
+            } else {
+                if($bid->bid_amount < $bidAmount) {
+                    $bidId = $bid->id;
+                    $bidAmount = $bid->bid_amount;
+                }
+            }
+        }
+
+        //Clean up the bids and update the contract with the winning bid
+        SupplyChainContract::where([
+            'contract_id' => $this->contractId,
+        ])->update([
+            'final_cost' => $bidAmount,
+            'winning_bid_id' => $bidId,
+        ]);
+    }
+}

app/Jobs/ProcessWalletJournalJob.php

@@ -1,80 +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\JobProcessWalletJournal;
-use App\Models\Jobs\JobStatus;
-
-class ProcessWalletJournalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Timeout in seconds
-     * 
-     * @var int
-     */
-    public $timeout = 300;
-
-    public $tries = 3;
-
-    private $division;
-    private $charId;
-    private $page;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(JobProcessWalletJournal $pwj) {
-        $this->division = $pwj->division;
-        $this->charId = $pwj->charId;
-        $this->page = $pwj->page;
-
-        $this->delay = 15;
-        $this->connection = 'database';
-    }
-
-    /**
-     * Execute the job.
-     * Utilized by using ProcessWalletJournalJob::dispatch()
-     * The model is passed into the dispatch function, then added to the queue
-     * for processing.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        //Declare the class variable we need
-        $finance = new FinanceHelper();
-
-        $finance->GetWalletJournalPage($this->division, $this->charId, $this->page);
-
-        //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/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/Esi/Esi.php

@@ -3,14 +3,17 @@
 namespace App\Library\Esi;
 
 //Internal Libraries
-use DB;
+use Carbon\Carbon;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+use Log;
 
 //Models
+use App\Models\Esi\EsiToken;
 use App\Models\Esi\EsiScope;
-use App\Models\Jobs\JobSendEveMail;
 
 //Jobs
-use App\Jobs\SendEveMailJob;
+use App\Jobs\Commands\Eve\ProcessSendEveMailJob;
 
 //Seat Stuff
 use Seat\Eseye\Cache\NullCache;
@@ -33,108 +36,21 @@ class Esi {
      * @return true,false
      */
     public function HaveEsiScope($charId, $scope) {
-        //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));
-
-        return false;
-    }
-
-    public function GetCharacterData($charId) {
-        $esi = new Eseye();
-        try {
-            $character = $esi->invoke('get', '/characters/{character_id}/', [
-                'character_id' => $charId,
-            ]);
-        } catch(RequestFailedException $e) {
-            return null;
-        }
-        
-        return $character;
-    }
-
-    public function GetCharacterName($charId) {
-        $esi = new Eseye();
-        try {
-            $character = $esi->invoke('get', '/characters/{character_id}/', [
-                'character_id' => $charId,
-            ]);
-        } catch(RequestFailedException $e) {
-            return null;
-        }
-        
-        return $character->name;
-    }
-
-    public function FindCharacterId($name) {
+        //Get the esi config
         $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);
-        try {
-            $character = $esi->setQueryString([
-                'categories' => 'character',
-                'language' => 'en-us',
-                'search' => $name,
-                'strict' => 'true',
-            ])->invoke('get', '/search/');
-        } catch(RequestFailedException $e) {
-            return null;
+
+        //Check for an esi scope
+        $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;
         }
 
-
-        $character = json_decode($character, true);
-
-        return $character['character'];
-    }
-
-    public function FindCorporationId($charId) {
-        $esi = new Eseye();
-        try {
-            $character = $esi->invoke('get', '/characters/{character_id}/', [
-                'character_id' => $charId,
-            ]);
-        } catch(RequestFailedException $e) {
-            return null;
-        }
-        
-        return $character->corporation_id;
-    }
-
-    public function FindCorporationName($charId) {
-        $esi = new Eseye();
-        try {
-            $character = $esi->invoke('get', '/characters/{character_id}/', [
-                'character_id' => $charId,
-            ]);
-    
-            $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                'corporation_id' => $character->corporation_id,
-            ]);
-        } catch(RequestFailedException $e) {
-            return null;
-        }
-        
-
-        return $corporation->name;
+        return true;
     }
 
     public function DecodeDate($date) {
@@ -151,6 +67,125 @@ class Esi {
         //Return the combined date in the correct format
         return $realDate;
     }
+
+    public function TokenExpired($token) {
+        $currentTime = Carbon::now();
+
+        //Create the carbon time for expiration time 
+        $expires = $token->inserted_at + $token->expires_in;
+        $tokenExpiration = Carbon::createFromTimeStamp($expires);
+
+        if($currentTime->greaterThan($tokenExpiration->subSeconds(5))) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function GetRefreshToken($charId) {
+        //Declare variables
+        $currentTime = Carbon::now();
+        $scopes = null;
+        $i = 0;
+        $config = config('esi');
+
+        //If the program doesn't find an ESI Token, there is nothing to return
+        if(EsiToken::where(['character_id' => $charId])->count() == 0) {
+            return null;
+        }
+
+        //Get the ESI Token from the database
+        $token = EsiToken::where([
+            'character_id' => $charId,
+        ])->first();
+
+        //Check the expiration of the token to see if the token has expired and needs to be refreshed using the refresh token
+        $expires = $token->inserted_at + $token->expires_in;
+        $tokenExpiration = Carbon::createFromTimestamp($expires);
+        //If the access token has expired, we need to do a request for a new access token
+        //We give ourselves around 5 seconds leeway in order to deal with an expired token
+        if($currentTime->greaterThan($tokenExpiration->subSeconds(5))) {
+            //Get the current scopes of the token
+            $scopesArr = EsiScope::where([
+                'character_id' => $token->character_id,
+            ])->get(['scope'])->toArray();
+
+            //Cycle through the scopes, and create the string for scopes to send with the token
+            foreach($scopesArr as $scp) {
+                $scopes .= $scp['scope'];
+                $i++;
+                if($i < sizeof($scopesArr)) {
+                    $scopes .= '%20';
+                }
+            }
+
+            //Setup the guzzle client for the request to get a new token
+            $client = new Client(['base_uri' => 'https://login.eveonline.com']);
+            $response = $client->request('POST', '/v2/oauth/token', [
+                'headers' => [
+                    'Content-Type' => 'application/x-www-form-urlencoded',
+                    'Host' => 'login.eveonline.com',
+                    'Authorization' => "Basic " . base64_encode($config['client_id'] . ":" . $config['secret']),
+                ],
+                'form_params' => [
+                    'grant_type' => 'refresh_token',
+                    'refresh_token' => $token->refresh_token,
+                ],
+            ]);
+            //Decode the body of the response which has the token information
+            $body = json_decode($response->getBody(), true);
+            //Update the old token, then send the new token back to the calling function
+            EsiToken::where([
+                'character_id' => $charId,
+            ])->update([
+                'access_token' => $body['access_token'],
+                'refresh_token' => $body['refresh_token'],
+                'expires_in' => $body['expires_in'],
+                'inserted_at' => time(),
+            ]);
+
+            $newToken = new EsiToken;
+            $newToken->character_id = $charId;
+            $newToken->access_token = $body['access_token'];
+            $newToken->refresh_token = $body['refresh_token'];
+            $newToken->inserted_at = time();
+            $newToken->expires_in = $body['expires_in'];
+
+            //Return the new token model
+            return $newToken;
+        } 
+        
+        //If we had a good token which has not expired yet, return the data
+        return $token;
+    }
+
+    public function SetupEsiAuthentication($token = null) {
+        //Declare some variables
+        $authentication = null;
+        $esi = null;
+        $config = config('esi');
+
+        if($token == null) {
+            $esi = new Eseye();
+        } else {
+            $tokenExpires = $token->inserted_at + $token->expires_in;
+
+            //Setup the esi authentication container
+            $authentication = new EsiAuthentication([
+                'client_id' => $config['client_id'],
+                'secret' => $config['secret'],
+                'refresh_token' => $token->refresh_token,
+                'access_token' => $token->access_token,
+                'token_expires' => $tokenExpires,
+            ]);
+
+            //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/Helper/FinanceHelper.php

@@ -1,426 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Finances\Helper;
-
-//Internal Library
-use DB;
-
-//Job
-use App\Jobs\SendEveMailJob;
-
-//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\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;
-
-//Seat Stuff
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-use Seat\Eseye\Exceptions\RequestFailedException;
-
-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();
-        $reprocessing = new ReprocessingTax();
-        $jb = new JumpBridgeTax();
-        $other = new PlayerDonation();
-        $industry = new StructureIndustryTax();
-        $office = new OfficeFee();
-
-        //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)) {
-            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);
-        $esi->setVersion('v4');
-        
-        //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.
-        $totalPages = 1;
-
-        //If more than one page is found, decode the first set of wallet entries, then call for the next pages
-        do {
-            //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 {
-                $journals = $esi->page($currentPage)
-                                ->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [
-                    'corporation_id' => $corpId,
-                    'division'  => $division,
-                ]);
-            } catch(RequestFailedException $e) {
-                return $e->getEsiResponse();
-            }
-
-            //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') {
-                        $reprocessing->InsertReprocessingTax($entry, $corpId, $division);
-                    } else if($entry['ref_type'] == 'structure_gate_jump') {
-                        $jb->InsertJumpBridgeTax($entry, $corpId, $division);
-                    } else if($entry['ref_type'] == 'player_donation' ||
-                             ($entry['ref_type'] == 'corporation_account_withdrawal' && $entry['second_party_id'] == 98287666)) {
-                        $other->InsertPlayerDonation($entry, $corpId, $division);
-                    } else if($entry['ref_type'] == 'industry_job_tax' && $entry['second_party_id'] == 98287666) {
-                        $industry->InsertStructureIndustryTax($entry, $corpId, $division);
-                    } else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) {
-                        $office->InsertOfficeFee($entry, $corpId, $division);
-                    }
-                }
-            }
-            
-            //Increment the current page we are on.
-            $currentPage++;
-        //Continue looping through the do while loop until the current page is greater than or equal to the total pages.
-        } while ($currentPage < $totalPages);
-    }
-
-    public function GetJournalPageCount($division, $charId) {
-        //Declare class variables
-        $lookups = new LookupHelper;
-        
-        //Get the ESI refresh token for the corporation
-        $tokenData = $this->TokenInfo($charId);
-        $token = $tokenData['token'];
-        $scope = $tokenData['scope'];
-
-        if($this->TokenNotFound($token, $scope, $charId)) {
-            return null;
-        }
-
-        //Refrence to see if the character is in our look up table for corporation and characters
-        $corpId = $lookups->LookupCharacter($charId);
-
-        //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,
-        ]);
-
-        //Create the esi class variable
-        $esi = new Eseye($authentication);
-        $esi->setVersion('v4');
-
-        //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/', [
-                'corporation_id' => $corpId,
-                'division'  => $division,
-            ]);
-        } catch(RequestFailedException $e) {
-            return $e->getEsiResponse();
-        }
-
-        $pages = $journals->pages;
-
-        return $pages;
-    }
-
-    public function GetWalletJournalPage($division, $charId, $page = 1) {
-        //Declare new class variables
-        $market = new MarketTax();
-        $reprocessing = new ReprocessingTax();
-        $jb = new JumpBridgeTax();
-        $other = new PlayerDonation();
-        $industry = new StructureIndustryTax();
-        $office = new OfficeFee();
-
-        //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;
-        
-        //Reference to see if the character is in our look up table for corporations and characters
-        $corpId = $lookups->LookupCorporationId($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);
-        $esi->setVersion('v4');
-
-        //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 {
-            $journals = $esi->page($page)
-                            ->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [
-                'corporation_id' => $corpId,
-                'division'  => $division,
-            ]);
-        } catch(RequestFailedException $e) {
-            return $e->getEsiResponse();
-        }
-
-        //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') {
-                    $reprocessing->InsertReprocessingTax($entry, $corpId, $division);
-                } else if($entry['ref_type'] == 'structure_gate_jump') {
-                    $jb->InsertJumpBridgeTax($entry, $corpId, $division);
-                } else if($entry['ref_type'] == 'player_donation' ||
-                         ($entry['ref_type'] == 'corporation_account_withdrawal' && $entry['second_party_id'] == 98287666)) {
-                    $other->InsertPlayerDonation($entry, $corpId, $division);
-                } else if($entry['ref_type'] == 'industry_job_tax' && $entry['second_party_id'] == 98287666) {
-                    $industry->InsertStructureIndustryTax($entry, $corpId, $division);
-                } else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) {
-                    $office->InsertOfficeFee($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
-        $pi_items = [
-            //R0 Materials
-            '2073',
-            '2667',
-            '2268',
-            '2270',
-            '2272',
-            '2286',
-            '2287',
-            '2288',
-            '2305',
-            '2306',
-            '2307',
-            '2308',
-            '2309',
-            '2310',
-            '2311',
-            //P1 Materials
-            '2389',
-            '2390',
-            '2392',
-            '2393',
-            '2395',
-            '2396',
-            '2397',
-            '2398',
-            '2399',
-            '2400',
-            '2401',
-            '3645',
-            '3683',
-            '3779',
-            '9828',
-            //P2 Materials
-            '44',
-            '2312',
-            '2317',
-            '2319',
-            '2321',
-            '2327',
-            '2328',
-            '2329',
-            '2463',
-            '3689',
-            '3691',
-            '3693',
-            '3695',
-            '3697',
-            '3725',
-            '3775',
-            '3828',
-            '9830',
-            '9832',
-            '9836',
-            '9838',
-            '9840',
-            '9842',
-            '15317',
-            //P3 Materials
-            '2344',
-            '2345',
-            '2346',
-            '2348',
-            '2349',
-            '2351',
-            '2352',
-            '2354',
-            '2358',
-            '2360',
-            '2361',
-            '2366',
-            '2367',
-            '9834',
-            '9846',
-            '9848',
-            '12836',
-            '17136',
-            '17392',
-            '17898',
-            '28974',
-            //P4 Materials
-            '2867',
-            '2868',
-            '2869',
-            '2870',
-            '2871',
-            '2872',
-            '2875',
-            '2876',
-        ];
-
-        return $pi_items;
-    }
-
-}
-
-?>

app/Library/Finances/JumpBridgeTax.php

@@ -1,155 +0,0 @@
-<?php
-
-/** W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Finances;
-
-use DB;
-use Carbon\Carbon;
-
-use App\Library\Esi\Esi;
-
-use App\Models\Finances\JumpBridgeJournal;
-use App\Models\User\UserToCorporation;
-
-class JumpBridgeTax {
-    private $date;
-    private $days;
-
-    public function __construct($days = null) {
-        if($days === null) {
-            $this->date = Carbon::now();
-            $this->days = 0;
-        } else {
-            $this->date = Carbon::now()->subDays($days);
-            $this->days = $days;
-        }
-    }
-
-    /**
-     * Function to insert journal entries into the database
-     */
-    public function InsertJumpBridgeTax($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(!JumpBridgeJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new JumpBridgeJournal;
-            $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();
-        }
-    }
-
-    /**
-     * 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
-     */
-    public function OverallTax() {
-
-        //Get the total usage
-        $usage = JumpBridgeJournal::select('amount')
-                                    ->whereTime('date', '>', $this->date)
-                                    ->sum('amount');
-        
-        //Return the usage
-        return $usage;
-    }
-
-    /**
-     * 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)
-                    ->sum('amount');
-        
-        return $usage;
-    }
-
-
-}

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

@@ -1,64 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Finances;
-
-use DB;
-
-use App\Library\Esi\Esi;
-
-use App\Models\Finances\OfficeFeesJournal;
-
-class OfficeFee {
-
-    public function InsertOfficeFee($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(!OfficeFeesJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new OfficeFeesJournal;
-            $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/PISale.php

@@ -1,60 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
- namespace App\Library\Finances;
-
- use DB;
-
- use App\Library\Esi\Esi;
-
- use App\Models\Finances\PISaleJournal;
-
- class PISale {
-    
-    public function InsertPISale($journal, $corpId) {
-        //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;
-            if(isset($journal['client_id'])) {
-                $entry->client_id = $journal['client_id'];
-            }
-            if(isset($journal['date'])) {
-                $entry->date = $esiHelper->DecodeDate($journal['date']);
-            }
-            if(isset($journal['is_buy'])) {
-                $entry->is_buy = $journal['is_buy'];
-            }
-            if(isset($journal['journal_ref_id'])) {
-                $entry->journal_ref_id = $journal['journal_ref_id'];
-            }
-            if(isset($journal['location_id'])) {
-                $entry->location_id = $journal['location_id'];
-            }
-            if(isset($journal['quantity'])) {
-                $entry->quantity = $journal['quantity'];
-            }
-            if(isset($journal['transaction_id'])) {
-                $entry->transaction_id = $journal['transaction_id'];
-            }
-            if(isset($journal['type_id'])) {
-                $entry->type_id = $journal['type_id'];
-            }
-            if(isset($journal['unit_price'])) {
-                $entry->unit_price = $journal['unit_price'];
-            }
-            $entry->save();
-        }
-    }
-
- }
-
-?>

app/Library/Finances/PlanetProductionTax.php

@@ -1,64 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Finances;
-
-use DB;
-
-use App\Library\Esi\Esi;
-
-use App\Models\Finances\PlanetProductionTaxJournal;
-
-class PlanetProductionTax {
-
-    public function InsertPlanetProductionTax($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(!PlanetProductionTaxJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new PlanetProductionTaxJournal;
-            $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/PlayerDonation.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\PlayerDonationJournal;
-
-class PlayerDonation {
-    public function InsertPlayerDonation($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(!PlayerDonationJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new PlayerDonationJournal;
-            $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/ReprocessingTax.php

@@ -1,62 +0,0 @@
-<?php
-
-/**
- * W4RP Services
- * GNU Public License
- */
-
-namespace App\Library\Finances;
-
-use DB;
-use App\Library\Esi\Esi;
-
-use App\Models\Finances\ReprocessingTaxJournal;
-
-class ReprocessingTax {
-    public function InsertReprocessingTax($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(!ReprocessingTaxJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new ReprocessingTaxJournal;
-            $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

@@ -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\StructureIndustryTaxJournal;
-
-class StructureIndustryTax {
-
-    public function InsertStructureIndustryTax($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(!StructureIndustryTaxJournal::where(['id' => $journal['id']])->exists()) {
-            $entry = new StructureIndustryTaxJournal;
-            $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/Helpers/AssetHelper.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Library\Helpers;
+
+//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\Structure\Asset;
+
+class AssetHelper {
+
+    private $charId;
+    private $corpId;
+
+    public function __construct($char, $corp) {
+        $this->charId = $char;
+        $this->corpId = $corp;
+    }    
+
+    /**
+     * Get Assets By Page in order to store in the database
+     */
+    public function GetAssetsByPage($page) {
+        //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) {
+        Asset::updateOrCreate([
+            'item_id' => $asset->item_id,
+        ], [
+            'is_blueprint_copy' => $asset->is_blueprint_copy,
+            'is_singleton' => $asset->is_singleton,
+            'item_id' => $asset->item_id,
+            'location_flag' => $asset->location_flag,
+            'location_id' => $asset->location_id,
+            'location_type' => $asset->location_type,
+            'quantity' => $asset->quantity,
+            'type_id' => $asset->type_id,
+        ]);     
+    }
+
+    /**
+     * Purge old data, so we don't run into data issues
+     */
+    public function PurgeStaleData() {
+        Asset::where('updated_at', '<', Carbon::now()->subDay())->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'];
+        }
+    }
+}
+
+?>

app/Library/Helpers/FinanceHelper.php

@@ -0,0 +1,260 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Helpers;
+
+//Internal Library
+use Log;
+use Carbon\Carbon;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+
+//Application Library
+use App\Library\Esi\Esi;
+use App\Library\Helpers\LookupHelper;
+
+//Models
+use App\Models\Finances\AllianceWalletJournal;
+
+class FinanceHelper {
+
+    public function GetApiWalletJournal($division, $charId) {
+        //Declare class variables
+        $lookup = new LookupHelper;
+        $finance = new FinanceHelper;
+        $esiHelper = new Esi;
+
+        //Setup the esi container.
+        $token = $esiHelper->GetRefreshToken($charId);
+        $esi = $esiHelper->SetupEsiAuthentication($token);
+
+        //Check the scope
+        if(!$esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1')) {
+            Log::critical('Scope check failed for esi-wallet.read_corporation_wallets.v1 for character id: ' . $charId);
+            return null;
+        }
+
+        //Reference the character id to the corporation id
+        $char = $lookup->GetCharacterInfo($charId);
+        $corpId = $char->corporation_id;
+
+        //Set the current page to 1 which is the page we start on
+        $currentPage = 1;
+        //Set the total pages to 1, but in the future we will set it to another number
+        $totalPages = 1;
+        //Setup a page failed variable
+        $pageFailed = false;
+
+        do {
+            /**
+             * During the course of the operation, we want to ensure our token hasn't expired.
+             * If the token has expired, then resetup the authentication container, which will refresh the
+             * access token.
+             */
+            if($esiHelper->TokenExpired($token)) {
+                $token = $esiHelper->GetRefreshToken($charId);
+                $esi = $esiHelper->SetupEsiAuthentication($token);
+            }
+
+            /**
+             * Attempt to get the data from the esi api.  If it fails, we skip the page, and go onto the next page, unless
+             * the failed page is the first page.
+             */
+            try {
+                $journals = $esi->page($currentPage)
+                                ->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [
+                                    'corporation_id' => $corpId,
+                                    'division' => $division,
+                                ]);
+            } catch(RequestFailedException $e) {
+                Log::warning('Failed to get wallet journal page ' . $currentPage . ' for character id: ' . $charId);
+                Log::warning($e);
+                dd($e);
+                $pageFailed = true;
+            }
+
+            /**
+             * If the current page is the first one and the page didn't fail, then update the total pages.
+             * If the first page failed, just return as we aren't going to be able to get the total amount of data needed.
+             */
+            if($currentPage == 1 && $pageFailed == false) {
+                $totalPages = $journals->pages;
+            } else if($currentPage == 1 && $pageFailed == true) {
+                return null;
+            }
+
+            /**
+             * If the page was successfully pulled, we need to decode the data, then cycle through the data, and save it
+             * where we can.
+             */
+            if($pageFailed == false) {
+                //Decode the json data, and return it as an array
+                $wallet = json_decode($journals->raw, true);
+
+                
+                //Foreach journal entry, add the journal entry to the table
+                foreach($wallet as $entry) {                 
+                    //See if we find the entry id in the database already
+                    $found = AllianceWalletJournal::where([
+                        'id' => $entry['id'],
+                    ])->count();
+
+                    if($found == 0) {
+                        $awj = new AllianceWalletJournal;
+                        $awj->id = $entry['id'];
+                        $awj->corporation_id = $corpId;
+                        $awj->division = $division;
+                        if(isset($entry['amount'])) {
+                            $awj->amount = $entry['amount'];
+                        }
+                        if(isset($entry['balance'])) {
+                            $awj->balance = $entry['balance'];
+                        }
+                        if(isset($entry['context_id'])) {
+                            $awj->context_id = $entry['context_id'];
+                        }
+                        if(isset($entry['date'])) {
+                            $awj->date = $esiHelper->DecodeDate($entry['date']);
+                        }
+                        if(isset($entry['description'])) {
+                            $awj->description = $entry['description'];
+                        }
+                        if(isset($entry['first_party_id'])) {
+                            $awj->first_party_id = $entry['first_party_id'];
+                        }
+                        if(isset($entry['reason'])) {
+                            $awj->reason = $entry['reason'];
+                        }
+                        if(isset($entry['ref_type'])) {
+                            $awj->ref_type = $entry['ref_type'];
+                        }
+                        if(isset($entry['tax'])) {
+                            $awj->tax = $entry['tax'];
+                        }
+                        if(isset($entry['tax_receiver_id'])) {
+                            $awj->tax_receiver_id = $entry['tax_receiver_id'];
+                        }
+                        $awj->save();
+
+                    }
+                }
+            } else {
+                /**
+                 * If the current page failed to get data from the esi, then reset the page failed data.
+                 * Continue to try to pull the next page of data.  We might be able to get the current failed page
+                 * later in another pull if it is successful.
+                 */
+                $pageFailed = false;
+            }
+
+            //Increment the current page counter
+            $currentPage++;
+        } while($currentPage <= $totalPages);
+
+        return 0;
+    }
+
+    private function GetPIMaterialsArray() {
+        //Setup array for PI items
+        $pi_items = [
+            //R0 Materials
+            '2073',
+            '2667',
+            '2268',
+            '2270',
+            '2272',
+            '2286',
+            '2287',
+            '2288',
+            '2305',
+            '2306',
+            '2307',
+            '2308',
+            '2309',
+            '2310',
+            '2311',
+            //P1 Materials
+            '2389',
+            '2390',
+            '2392',
+            '2393',
+            '2395',
+            '2396',
+            '2397',
+            '2398',
+            '2399',
+            '2400',
+            '2401',
+            '3645',
+            '3683',
+            '3779',
+            '9828',
+            //P2 Materials
+            '44',
+            '2312',
+            '2317',
+            '2319',
+            '2321',
+            '2327',
+            '2328',
+            '2329',
+            '2463',
+            '3689',
+            '3691',
+            '3693',
+            '3695',
+            '3697',
+            '3725',
+            '3775',
+            '3828',
+            '9830',
+            '9832',
+            '9836',
+            '9838',
+            '9840',
+            '9842',
+            '15317',
+            //P3 Materials
+            '2344',
+            '2345',
+            '2346',
+            '2348',
+            '2349',
+            '2351',
+            '2352',
+            '2354',
+            '2358',
+            '2360',
+            '2361',
+            '2366',
+            '2367',
+            '9834',
+            '9846',
+            '9848',
+            '12836',
+            '17136',
+            '17392',
+            '17898',
+            '28974',
+            //P4 Materials
+            '2867',
+            '2868',
+            '2869',
+            '2870',
+            '2871',
+            '2872',
+            '2875',
+            '2876',
+        ];
+
+        return $pi_items;
+    }
+
+}
+
+?>

app/Library/Helpers/MiningLedgerHelper.php

@@ -0,0 +1,188 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ * 
+ */
+
+namespace App\Library\Helpers;
+
+//Internal Library
+use Log;
+
+//App Library
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+
+//App Models
+use App\Models\Structure\Structure;
+use App\Models\Structure\Service;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
+
+class MiningLedgerHelper {
+
+    private $charId;
+    private $corpId;
+
+    /**
+     * Constructor function
+     * 
+     * @var $charId
+     * @var $corpId
+     */
+    public function __construct($charId, $corpId) {
+        $this->charId = $charId;
+        $this->corpId = $corpID;
+    }
+
+    /**
+     * Get the corporation's mining structures.
+     * These structures consist of Athanors and Tataras
+     * 
+     * @return array
+     */
+    public function GetCorpMiningStructures() {
+        //Declare variables
+        $esiHelper = new Esi;
+
+        //Check if the character has the correct ESI Scope.  If the character doesn't, then return false, but
+        //also send a notice eve mail to the user.  The HaveEsiScope sends a mail for us.
+        if(!$esiHelper->HaveEsiScope($this->charId, 'esi-industry.read_corporation_mining.v1')) {
+            Log::warning('Character: ' . $this->charId . ' did not have the appropriate esi scope for the mining ledger.');
+            return null;
+        }
+
+        //Get the refresh token from the database and setup the esi authenticaiton container
+        $esi = $esiHelper->SetupEsiAuthentication($esiHelper->GetRefreshToken($this->charId));
+
+        //Get a list of the mining observers, which are structures
+        try {
+            $observers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+                'corporation_id' => $this->corpId,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::warning('Could not find any mining observers for corporation: ' . $this->corpId);
+            return null;
+        }
+
+        return $observers;
+    }
+
+    /**
+     * Get the mining struture information
+     * 
+     * @return array
+     */
+    public function GetMiningStructureInfo($observerId) {
+        //Declare variables
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+
+        //Check for ESI scopes
+        if(!$esiHelper->HaveEsiScope($this->charId, 'esi-universe.read_structures.v1')) {
+            return null;
+        }
+
+        //Get the refresh token and setup the esi authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($esiHelper->GetRefreshToken($this->charId));
+
+        //Try to get the structure information
+        try {
+            $info = $esi->invoke('get', '/universe/structures/{struture_id}/', [
+                'structure_id' => $observerId,
+            ]);
+        } catch(RequestFailedExcept $e) {
+            return null;
+        }
+
+        $system = $lookup->SystemIdToName($info->solar_system_id);
+
+        return [
+            'name' => $info->name,
+            'system' => $system,
+        ];
+    }
+
+    /**
+     * Get the mining ledger for a particular structure
+     * 
+     * @var observerId
+     * @return array
+     */
+    public function GetMiningLedger($observerId) {
+        //Declare variables
+        $esiHelper = new Esi;
+        
+        //Check for ESI Scopes
+        if(!$esiHelper->HaveEsiScope($this->charId, 'esi-industry.read_corporation_mining.v1')) {
+            return null;
+        }
+
+        //Get the refresh token and setup the esi authentication container
+        $esi = $esiHelper->SetupEsiAuthentication($esiHelper->GetRefreshToken($charId));
+
+        //Get the mining ledger
+        try {
+            $ledger = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
+                'corporation_id' => $corpId,
+                'observer_id' => $observerId,
+            ]);
+        } catch(RequestFailedException $e) {
+            return null;
+        }
+
+        return $ledger;
+    }
+
+    /**
+     * Process the mining ledger into something more readable for humans
+     * 
+     * @var array
+     * @return array
+     */
+    public function ProcessMiningLedger($ledger, $date) {
+        //Declare some variables
+        $items = array();
+        $notSorted = array();
+        $final = array();
+        $lookup = new LookupHelper;
+
+
+        //In the first iteration of the array get rid of the extra items we don't want
+        foreach($ledger as $ledg) {
+            if($ledg->last_updated == $date) {
+                array_push($items, $ledg);
+            }
+        }
+
+        //Sort through the array and replace character id with name and item id with name
+        foreach($items as $item) {
+            $charName = $lookup->CharacterIdToName($item->character_id);
+            $typeName = $lookup->ItemIdToName($item->type_id);
+            $corpName = $lookup->CorporationIdToName($item->recorded_corporation_id);
+
+            if(isset($final[$charName])) {
+                $final[$charName] = [
+                    'ore' => $typeName,
+                    'quantity' => $item->quantity,
+                    'date' => $item->last_updated,
+                ];
+            } else {
+                $temp = [
+                    'ore' => $typeName,
+                    'quantity' => $item->quantity,
+                    'date' => $item->last_updated,
+                ];
+
+                array_push($final[$charName], $temp);
+            }
+        }
+
+        return $final;
+    }
+}
+?>

app/Library/Helpers/SRPHelper.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Library\Helpers;
+
+//Internal Libraries
+use Carbon\Carbon;
+
+//Models
+use App\Models\SRP\SrpFleetType;
+use App\Models\SRP\SrpPayout;
+use App\Models\SRP\SRPShip;
+use App\Models\SRP\SrpShipType;
+
+class SRPHelper {
+
+    public function GetAllianceSRPActual($start, $end) {
+        $actual = 0.00;
+
+        $actual = SRPShip::where([
+            'approved' => 'Approved',
+        ])->whereBetween('created_at', [$start, $end])
+          ->sum('paid_value');
+
+        return $actual;
+    }
+
+    public function GetAllianceSRPLoss($start, $end) {
+        $loss = 0.00;
+
+        $loss = SRPShip::where([
+            'approved' => 'Approved',
+        ])->whereBetween('created_at', [$start, $end])
+          ->sum('loss_value');
+
+        return $loss;
+    }
+
+    public function GetTimeFrame($months) {
+        $start = Carbon::now()->startOfMonth();
+        $start->hour = 23;
+        $start->minute = 59;
+        $start->second = 59;
+        $end = Carbon::now()->subMonths($months);
+        $end->hour = 23;
+        $end->minute = 59;
+        $end->second = 59;
+
+        $date = [
+            'start' => $start,
+            'end' => $end,
+        ];
+
+        return $date;
+    }
+
+    /**
+     * Returns a set of dates from now until the amount of months has passed
+     * 
+     * @var integer
+     * @returns array
+     */
+    public function GetTimeFrameInMonths($months) {
+        //Declare an array of dates
+        $dates = array();
+        //Setup the start of the array as the basis of our start and end dates
+        $start = Carbon::now()->startOfMonth();
+        $end = Carbon::now()->endOfMonth();
+        $end->hour = 23;
+        $end->minute = 59;
+        $end->second = 59;
+
+        if($months == 1) {
+            $dates = [
+                'start' => $start,
+                'end' => $end,
+            ];
+
+            return $dates;
+        }
+
+        //Create an array of dates
+        for($i = 0; $i < $months; $i++) {
+            if($i == 0) {
+                $dates[$i]['start'] = $start;
+                $dates[$i]['end'] = $end;
+            }
+            
+            $start = Carbon::now()->startOfMonth()->subMonths($i);
+            $end = Carbon::now()->endOfMonth()->subMonths($i);
+            $end->hour = 23;
+            $end->minute = 59;
+            $end->second = 59;
+            $dates[$i]['start'] = $start;
+            $dates[$i]['end'] = $end;
+        }
+
+        //Return the dates back to the calling function
+        return $dates;
+    }
+}
+
+?>

app/Library/Helpers/StructureHelper.php

@@ -0,0 +1,343 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Helpers;
+
+//Internal Library
+use Log;
+
+//App Library
+use App\Jobs\Library\JobHelper;
+use Seat\Eseye\Exceptions\RequestFailedException;
+use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
+
+//App Models
+use App\Models\Jobs\JobStatus;
+use App\Models\Structure\Structure;
+use App\Models\Structure\Service;
+use App\Models\Esi\EsiToken;
+use App\Models\Esi\EsiScope;
+
+
+class StructureHelper {
+
+    private $charId;
+    private $corpId;
+    private $page;
+    private $esi;
+
+    public function __construct($char, $corp, $esi = null) {
+        $this->charId = $char;
+        $this->corpId = $corp;
+        if($esi == null) {
+            $esiHelper = new Esi;
+            $token = $esiHelper->GetRefreshToken($char);
+            $this->esi = $esiHelper->SetupEsiAuthentication($token);
+        } else {
+            $this->esi = $esi;
+        }       
+    }
+
+    public function GetStructuresByPage($page) {
+        
+        //Try to get the ESI data
+        try {
+            $structures = $this->esi->page($page)
+                              ->invoke('get', '/corporations/{corporation_id}/structures/', [
+                                'corporation_id' => $this->corpId,
+                                ]);
+        } catch (RequestFailedException $e) {
+            Log::critical("Failed to get structure list.");
+            return null;
+        }
+
+        return $structures;
+    }
+
+    public function ProcessStructure($structure) {
+        
+        //Get the structure information
+        $info = $this->GetStructureInfo($structure->structure_id);
+
+        //Record the structure information into the database
+        //Find if the structure exists
+        if(Structure::where(['structure_id' => $structure->structure_id])->count() == 0) {
+            $this->SaveNewStructure($structure, $info);            
+        } else {
+            $this->UpdateExistingStructure($structure, $info);
+        }
+    }
+
+    private function GetSolarSystemName($systemId) {
+        //Declare some variables
+        $esiHelper = new Esi;
+        $lookup = new LookupHelper;
+
+        $solar = $lookup->SystemIdToName($systemId);
+
+        if($solar != null) {
+            return $solar;
+        } else {
+            return null;
+        }
+    }
+
+    public function GetStructureInfo($structureId) {
+        //Declare some variables
+        $esiHelper = new Esi;
+
+        try {
+            $info = $this->esi->invoke('get', '/universe/structures/{structure_id}/', [
+                'structure_id' => $structureId,
+            ]);
+        } catch(RequestFailedException $e) {
+            Log::warning("Failed to get structure information for structure with id " . $structureId);
+            Log::warning($e->getCode());
+            Log::warning($e->getMessage());
+            Log::warning($e->getEsiResponse());
+            $info = null;
+        }
+
+        return $info;
+    }
+
+    private function UpdateExistingStructure($structure, $info) {
+        //Update the structure id and name
+        Structure::where(['structure_id' => $structure->structure_id])->update([
+            'structure_id' => $structure->structure_id,
+            'structure_name' => $info->name,
+        ]);
+
+        //Update the services
+        if(isset($structure->services)) {
+            $services = true;
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'services' => $services,
+            ]);
+        } else {
+            $services = false;
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'services' => $services,
+            ]);
+        }
+
+        //Update the structure state
+        if(isset($structure->state)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'state' => $structure->state,
+            ]);
+        } else {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'state' => 'None',
+            ]);
+        }
+
+        //Update the state timer start
+        if(isset($structure->state_timer_start)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'state_timer_start' => $this->DecodeDate($structure->state_timer_start),
+            ]);
+        }
+
+        //Update the state timer end
+        if(isset($structure->state_timer_end)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'state_timer_end' => $this->DecodeDate($structure->state_timer_end),
+            ]);
+        }
+
+        //Update the fuel expires
+        if(isset($structure->fuel_expires)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'fuel_expires' => $this->DecodeDate($structure->fuel_expires),
+            ]);
+        }
+
+        //Update the profile id, and positions
+        Structure::where(['structure_id' => $structure->structure_id])->update([
+            'profile_id' => $structure->profile_id,
+            'position_x' => $info->position->x,
+            'position_y' => $info->position->y,
+            'position_z' => $info->position->z,
+        ]);
+
+        //Update the next reinforce apply
+        if(isset($structure->next_reinforce_apply)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'next_reinforce_apply' => $this->DecodeDate($structure->next_reinforce_apply),
+            ]);
+        }
+
+        //update the next reinforce hour
+        if(isset($structure->next_reinforce_hour)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'next_reinforce_hour' => $structure->next_reinforce_hour,
+            ]);
+        }
+
+        //Update next reinforce weekday
+        if(isset($structure->next_reinforce_weekday)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'next_reinforce_weekday' => $structure->next_reinforce_weekday,
+            ]);
+        }
+
+        //Update reinforce hour
+        if(isset($structure->reinforce_hour)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'reinforce_hour' => $structure->reinforce_hour,
+            ]);
+        }
+
+        //Update reinforce weekday
+        if(isset($structure->reinforce_weekday)) {
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'reinforce_weekday' => $structure->reinforce_weekday,
+            ]);
+        }
+
+        //Update the unanchors at field
+        if(isset($structure->unanchors_at)) {
+            //Decode the date / time
+            $daTi = $this->DecodeDate($structure->unanchors_at);
+
+            Structure::where(['structure_id' => $structure->structure_id])->update([
+                'unanchors_at' => $daTi,
+            ]);
+        }
+
+        //Update the services for the structure as well
+        if($services == true) {
+            //Delete the existing services, then add the new services
+            if(Service::where(['structure_id' => $structure->structure_id])->count() > 0) {
+                Service::where(['structure_id' => $structure->structure_id])->delete();
+            }
+            
+
+            foreach($structure->services as $service) {
+                $serv = new Service;
+                $serv->structure_id = $structure->structure_id;
+                $serv->name = $service->name;
+                $serv->state = $service->state;
+                $serv->save();
+            }
+        }
+    }
+
+    private function SaveNewStructure($structure, $info) {
+
+        if(isset($info->solar_system_id)) {
+            $solarName = $this->GetSolarSystemName($info->solar_system_id);
+        } else {
+            Log::critical("Couldn't get solar system name for structure " . $structure->structure_id);
+            Log::critical("Check access lists.");
+            $solarName = null;
+        }
+
+        $st = new Structure;
+        $st->structure_id = $structure->structure_id;
+        $st->structure_name = $info->name;
+        $st->corporation_id = $info->owner_id;
+        $st->solar_system_id = $info->solar_system_id;
+        $st->solar_system_name = $solarName;
+        if(isset($info->type_id)) {
+            $st->type_id = $info->type_id;
+        }
+        $st->corporation_id = $structure->corporation_id;
+        if(isset($structure->services)) {
+            $st->services = true;
+        } else {
+            $st->services = false;
+        }
+        if(isset($structure->state)) {
+            $st->state = $structure->state;
+        } else {
+            $st->state = 'None';
+        }
+        if(isset($structure->state_timer_start)) {
+            $st->state_timer_start = $this->DecodeDate($structure->state_timer_start);
+        }
+        if(isset($structure->state_timer_end)) {
+            $st->state_timer_end = $this->DecodeDate($structure->state_timer_end);
+        }
+        if(isset($structure->fuel_expires)) {
+            $st->fuel_expires = $this->DecodeDate($structure->fuel_expires);
+        }
+        $st->profile_id = $structure->profile_id;
+        $st->position_x = $info->position->x;
+        $st->position_y = $info->position->y;
+        $st->position_z = $info->position->z;
+        if(isset($structure->next_reinforce_apply)) {
+            $st->next_reinforce_apply = $this->DecodeDate($structure->next_reinforce_apply);
+        }
+        if(isset($structure->next_reinforce_hour)) {
+            $st->next_reinforce_hour = $structure->next_reinforce_hour;
+        }
+        if(isset($structure->next_reinforce_weekday)) {
+            $st->next_reinforce_weekday = $structure->next_reinforce_weekday;
+        }
+        $st->reinforce_hour = $structure->reinforce_hour;
+        if(isset($structure->reinforce_weekday)) {
+            $st->reinforce_weekday = $structure->reinforce_weekday;
+        }
+        if(isset($structure->unanchors_at)) {
+            $daTi = $this->DecodeDate($structure->unanchors_at);
+            $st->unanchors_at = $daTi;
+        }
+
+        //Save the database record
+        $st->save();
+
+        if($st->services == true) {
+            foreach($structure->services as $service) {
+                $serv = new Service;
+                $serv->structure_id = $structure->structure_id;
+                $serv->name = $service->name;
+                $serv->state = $service->state;
+            }
+        }
+    }
+
+    public function GetStructuresByType($type) {
+        $sType = $this->StructureTypeToId($type);
+
+        $structures = Structure::where([
+            'type_id' => $sType,
+        ])->get();
+
+        return $structures;
+    }
+
+    private function StructureTypeToId($name) {
+        $structureTypes = [
+            'Ansiblex Jump Gate' => 35841,
+            'Pharolux Cyno Beacon' => 35840,
+            'Tenebrex Cyno Jammer' => 37534,
+            'Keepstar' => 35834,
+            'Fortizar' => 35833,
+            'Astrahus' => 35832,
+            'Tatara' => 35836,
+            'Athanor' => 35835,
+            'Sotiyo' => 35827,
+            'Azbel' => 35826,
+            'Raitaru' => 35825,
+        ];
+
+        return $structureTypes[$name];
+    }
+
+    private function DecodeDate($date) {
+        $esiHelper = new Esi;
+
+        $dateTime = $esiHelper->DecodeDate($date);
+
+        return $dateTime;
+    }
+}
+
+?>

app/Library/Helpers/TaxesHelper.php

@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Library\Helpers;
+
+//Internal Library
+use Carbon\Carbon;
+
+//Models
+use App\Models\User\User;
+use App\Models\User\UserRole;
+use App\Models\User\UserPermission;
+
+use App\Models\Finances\ReprocessingTaxJournal;
+use App\Models\Finances\StructureIndustryTaxJournal;
+use App\Models\Finances\PlanetProductionTaxJournal;
+use App\Models\Finances\OfficeFeesJournal;
+use App\Models\Finances\JumpBridgeJournal;
+use App\Models\Finances\PISaleJournal;
+use App\Models\Finances\AllianceMarketJournal;
+use App\Models\SRP\SRPShip;
+
+class TaxesHelper {
+
+    private $corpId;
+    private $refType;
+    private $start;
+    private $end;
+
+    public function __construct($corp = null, $ref = null, $st = null, $en = null) {
+        $this->corpId = $corp;
+        $this->refType = $ref;
+        $this->start = $st;
+        $this->end = $en;
+    }
+
+    public function GetAllianceMarketGross($start, $end) {
+        $revenue = 0.00;
+
+        $revenue = AllianceMarketJournal::where([
+            'second_party_id' => '98287666',
+            'ref_type' => 'brokers_fee',
+        ])->whereBetween('date', [$start, $end])
+          ->sum('amount');
+
+        return $revenue;
+    }
+
+    public function GetJumpGateGross($start, $end) {
+        $revenue = 0.00;
+
+        $revenue = JumpBridgeJournal::where([
+            'ref_type' => 'structure_gate_jump', 
+            'second_party_id' => '98287666',
+            ])->whereBetween('date', [$start, $end])
+              ->sum('amount');
+
+        return $revenue;
+    }
+
+    public function GetIndustryGross($start, $end) {
+        $revenue = 0.00;
+
+        $revenue = StructureIndustryTaxJournal::where([
+            'ref_type' => 'industry_job_tax', 
+            'second_party_id'  => '98287666',
+            ])->whereBetween('date', [$start, $end])
+              ->sum('amount');
+
+        return $revenue;
+    }
+
+    public function GetReprocessingGross($start, $end) {
+        $revenue = 0.00;
+
+        $revenue = ReprocessingTaxJournal::where([
+            'ref_type' => 'reprocessing_tax', 
+            'second_party_id' => '98287666',
+            ])->whereBetween('date', [$start, $end])
+              ->sum('amount');
+
+        return $revenue;
+    }
+
+    public function GetPIGross($start, $end) {
+        $revenueImport = 0.00;
+        $revenueExport = 0.00;
+
+        //Get the import revenue from the database
+        $revenueImport = PlanetProductionTaxJournal::where([
+            'ref_type' => 'planetary_import_tax', 
+            'second_party_id' => '98287666',
+            ])->whereBetween('date', [$start, $end])
+              ->sum('amount');
+
+        //Get the export revenue from the database      
+        $revenueExport = PlanetProductionTaxJournal::where([
+            'ref_type' => 'planetary_export_tax', 
+            'second_party_id' => '98287666',
+            ])->whereBetween('date', [$start, $end])
+              ->sum('amount');
+
+        //Total up the two values
+        $finalRevenue = $revenueImport + $revenueExport;
+
+        //Return the values
+        return $finalRevenue;
+    }
+
+    public function GetOfficeGross($start, $end) {
+        $revenue = 0.00;
+
+        $revenue = OfficeFeesJournal::where([
+            'ref_type' => 'office_rental_fee', 
+            'second_party_id' => '98287666',
+            ])->whereBetween('date', [$start, $end])
+              ->sum('amount');
+
+        return $revenue;
+    }
+
+    public function GetPiSalesGross($start, $end) {
+        $revenue = 0.00;
+
+        $grosses = PISaleJournal::whereBetween('date', [$start, $end])->get()->toArray();
+
+        foreach($grosses as $gross) {
+            $revenue += ($gross['quantity'] * $gross['unit_price']);
+        }
+
+        return $revenue;
+    }
+
+    /**
+     * Returns a set of dates from now until the amount of months has passed
+     * 
+     * @var integer
+     * @returns array
+     */
+    public function GetTimeFrameInMonths($months) {
+        //Declare an array of dates
+        $dates = array();
+        //Setup the start of the array as the basis of our start and end dates
+        $start = Carbon::now()->startOfMonth();
+        $end = Carbon::now()->endOfMonth();
+        $end->hour = 23;
+        $end->minute = 59;
+        $end->second = 59;
+
+        if($months == 1) {
+            $dates = [
+                'start' => $start,
+                'end' => $end,
+            ];
+
+            return $dates;
+        }
+
+        //Create an array of dates
+        for($i = 0; $i < $months; $i++) {
+            if($i == 0) {
+                $dates[$i]['start'] = $start;
+                $dates[$i]['end'] = $end;
+            }
+            
+            $start = Carbon::now()->startOfMonth()->subMonths($i);
+            $end = Carbon::now()->endOfMonth()->subMonths($i);
+            $end->hour = 23;
+            $end->minute = 59;
+            $end->second = 59;
+            $dates[$i]['start'] = $start;
+            $dates[$i]['end'] = $end;
+        }
+
+        //Return the dates back to the calling function
+        return $dates;
+    }
+}

app/Library/Lookups/LookupHelper.php

@@ -1,305 +0,0 @@
-<?php
-
-namespace App\Library\Lookups;
-
-use DB;
-
-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\Models\Lookups\CharacterToCorporation;
-use App\Models\Lookups\CorporationToAlliance;
-
-class LookupHelper {
-
-    public function CharacterName($charId) {
-        $esi = new Eseye();
-
-        try {
-            $character = $esi->invoke('get', '/characters/{character_id}/', [
-                'character_id' => $charId,
-            ]);
-        } catch(RequestFailedException $e){
-            return null;
-        }
-
-        return $character->name;
-    }
-
-    //Create a character id from a character name
-    public function CharacterNameToId($character) {
-        //Setup Eseye Configuration
-        $configuration = Configuration::getInstance();
-        $configuration->cache = NullCache::class;
-        //Setup class variables
-        $esi = new Eseye();
-
-        //Attempt to find the character name in the LookupCharacter table to see if we can match it to an id
-        $char = CharacterToCorporation::where(['character_name' => $character])->get(['character_id']);
-        if(!isset($char->character_id)) {
-            //Get the character id from the ESI API.
-            $response = $esi->setQueryString([
-                'categories' => 'character',
-                'search' => $character,
-                'strict' => 'true',
-            ])->invoke('get', '/search/');
-
-            $this->LookupCharacter($response->character[0]);
-
-            return $response->character[0];
-        } else {
-            return $charId[0]->character_id;
-        }
-    }
-
-    //Add characters to the lookup table for quicker lookups without having
-    //to hit the ESI all the time
-    public function LookupCharacter($charId) {
-        //Check for the character in the user_to_corporation table
-        $found = CharacterToCorporation::where('character_id', $charId)->get(['corporation_id']);
-        
-        //If we don't find the character in the table, then we retrieve from ESI
-        //and add the character to the table
-        if(!isset($found[0]->corporation_id)) {
-            //Get the configuration for ESI from the environmental variables
-            $config = config('esi');
-
-            //Setup a new ESI container
-            $esi = new Eseye();
-
-            //Try to get the character information, then the corporation information
-            try {
-                $character = $esi->invoke('get', '/characters/{character_id}/', [
-                    'character_id' => $charId,
-                ]);
-                $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                    'corporation_id' => $character->corporation_id,
-                ]);
-            } catch(RequestFailedException $e){
-                return null;
-            }
-
-            //Save all of the data to the database
-            $char = new CharacterToCorporation;
-            $char->character_id = $charId;
-            $char->character_name = $character->name;
-            $char->corporation_id = $character->corporation_id;
-            $char->corporation_name = $corporation->name;
-            $char->save();
-            //Return the corporation_id which is what the calling function is looking for
-            return $character->corporation_id;
-        } else {
-            //Return the corporation_id if it was found in the database as it is what the calling function is looking for
-            return $found[0]->corporation_id;
-        }
-    }
-
-    public function LookupCorporationId($charId) {
-        //Check for the character in the user_to_corporation table
-        $found = CharacterToCorporation::where('character_id', $charId)->get(['corporation_id']);
-        
-        //If we don't find the character in the table, then we retrieve from ESI
-        //and add the character to the table
-        if(!isset($found[0]->corporation_id)) {
-            //Get the configuration for ESI from the environmental variables
-            $config = config('esi');
-
-            //Setup a new ESI container
-            $esi = new Eseye();
-
-            //Try to get the character information, then the corporation information
-            try {
-                $character = $esi->invoke('get', '/characters/{character_id}/', [
-                    'character_id' => $charId,
-                ]);
-                $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                    'corporation_id' => $character->corporation_id,
-                ]);
-            } catch(RequestFailedException $e){
-                return null;
-            }
-
-            //Save all of the data to the database
-            $char = new CharacterToCorporation;
-            $char->character_id = $charId;
-            $char->character_name = $character->name;
-            $char->corporation_id = $character->corporation_id;
-            $char->corporation_name = $corporation->name;
-            $char->save();
-            //Return the corporation_id which is what the calling function is looking for
-            return $character->corporation_id;
-        } else {
-            //Return the corporation_id if it was found in the database as it is what the calling function is looking for
-            return $found[0]->corporation_id;
-        }
-    }
-
-    /**
-     * Function to retrieve a corporation name from the lookup tables
-     * or add the details of the corporation if it's not found
-     * 
-     */
-    public function LookupCorporationName($corpId) {
-        //check for the character in the user_to_corporation table
-        $found = CorporationToAlliance::where('corporation_id', $corpId)->get(['corporation_name']);
-
-        //If we don't find the corporation in the table, then we need to retrieve it from ESI
-        //and add the corporation to the table
-        if(!isset($found[0]->corporation_name)) {
-            //Get the configuration for ESI from the environmental variables
-            $config = config('esi');
-
-            //Setup a new ESI container
-            $esi = new Eseye();
-
-            try {
-                $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                    'corporation_id' => $corpId,
-                ]);
-            } catch(\Seat\Eseye\Exceptions\RequestFailedException $e){
-                return $e->getEsiResponse();
-            }
-
-            //Return the corporation name
-            return $corporation->name;
-        } else {
-            return $found[0]->corporation_name;
-        }
-    }
-
-    //Add corporations to the lookup table for quicker lookups without having to
-    //hit the ESI API all the time
-    public function LookupCorporation($corpId) {
-        //Check for the character in the user_to_corporation table
-        $found = CorporationToAlliance::where('corporation_id', $corpId)->get(['alliance_id']);
-       
-        //If we don't find the character in the table, then we retrieve from ESI
-        //and add the character to the table
-        if(!isset($found[0]->alliance_id)) {
-            //Get the configuration for ESI from the environmental variables
-            $config = config('esi');
-
-            //Setup a new ESI container
-            $esi = new Eseye();
-
-            //Try to get the character information, then the corporation information
-            try {
-                $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                    'corporation_id' => $corpId,
-                ]);
-                $alliance = $esi->invoke('get', '/alliances/{alliance_id}/', [
-                    'alliance_id' => $corporation->alliance_id,
-                ]);
-            } catch(\Seat\Eseye\Exceptions\RequestFailedException $e){
-                return $e->getEsiResponse();
-            }
-            
-            //Save all of the data to the database
-            $corp = new CorporationToAlliance;
-            $corp->corporation_id = $corpId;
-            $corp->corporation_name = $corporation->name;
-            $corp->alliance_id = $corporation->alliance_id;
-            $corp->alliance_name = $alliance->name;
-            $corp->save();
-
-            //Return the corporation_id which is what the calling function is looking for
-            return $corporation->alliance_id;
-        } else {
-            //Return the corporation_id if it was found in the database as it is what the calling function is looking for
-            return $found[0]->alliance_id;
-        }
-    }
-
-    public function LookupAllianceTicker($allianceId) {
-        //Get the configuration for ESI from the environmental variable
-        $config = config('esi');
-
-        //Setup a new ESI container
-        $esi = new Eseye();
-
-        try {
-            $alliance = $esi->invoke('get', '/alliances/{alliance_id}/', [
-                'alliance_id' => $allianceId,
-            ]);
-        } catch(\Seat\Eseye\Exceptions\RequestFailedException $e){
-            return $e->getEsiResponse();
-        }
-
-        return $alliance->ticker;
-    }
-
-    //Update the character lookup table as often as necessary
-    public function UpdateLookupCharacter() {
-        //Create a new ESI container
-        $esi = new Eseye();
-        
-        //Get all of the data from the database and start performing updates
-        $dbChars = CharacterToCorporation::all();
-        foreach($dbChars as $char) {
-            //Attempt to get the data from the ESI API
-            try{
-                $charcter = $esi->invoke('get', '/characters/{character_id}/', [
-                    'character_id' => $char->character_id,
-                ]);
-            } catch(RequestFailedException $e) {
-                return $e->getEsiResponse();
-            }
-            
-            //Check the response versus the database
-            if($char->corporation_id != $character->corporation_id) {
-                try {
-                    $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                        'corporation_id' => $character->corporation_id,
-                    ]);
-                } catch(RequestFailedException $e) {
-                    return $e->getEsiResponse();
-                }
-                CharacterToCorporation::where(['character_id' => $char->character_id])
-                                    ->update([
-                                        'corporation_id' => $character->corporation_id,
-                                        'corporation_name' => $corporation->name,
-                                    ]);
-            }
-        }
-    }
-
-    //Update the corporation lookup table as often as necessary
-    public function UpdateLookupCorporation() {
-        //Create a new ESI container
-        $esi = new Eseye();
-        
-        //Get all of the data from the database and start performing updates
-        $dbCorps = CorporationToAlliance::all();
-        foreach($dbCorps as $corp) {
-            //Attempt to get the data from the ESI API
-            try{
-                $corporation = $esi->invoke('get', '/corporations/{corporation_id}/', [
-                    'corporation_id' => $corp->corporation_id,
-                ]);
-            } catch(RequestFailedException $e) {
-                return $e->getEsiResponse();
-            }
-            
-            //Check the response versus the database
-            if($corp->corporation_id != $corporation->corporation_id) {
-                try {
-                    $alliance = $esi->invoke('get', '/alliancess/{alliance_id}/', [
-                        'alliance_id' => $corporation->alliance_id,
-                    ]);
-                } catch(RequestFailedException $e) {
-                    return $e->getEsiResponse();
-                }
-                CorporationToAlliance::where(['corporation_id' => $char->character_id])
-                                    ->update([
-                                        'alliance_id' => $corporation->alliance_id,
-                                        'alliance_name' => $alliance->name,
-                                    ]);
-            }
-        }
-    }
-}
-
-?>

app/Library/Moons/MoonCalc.php

@@ -6,280 +6,111 @@
 
 namespace App\Library\Moons;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
+//Internal Library
 use Session;
 use DB;
-
+use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
+use Log;
 
+//Library
+use App\Library\Helpers\LookupHelper;
+
+//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\Moon\MineralPrice;
 
+/**
+ * MoonCalc Library
+ */
 class MoonCalc {
 
+    /** 
+     * Get the ore composition of an ore
+     */
+    public function GetOreComposition($ore) {
+        $composition = ItemComposition::where([
+            'Name' => $ore,
+        ])->first();
+
+        return $composition;
+    }
+
+    /**
+     * Calculate the total worth of a moon
+     */
     public function SpatialMoonsTotalWorth($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) {
-        //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds
-        //Total pull size is 14,385,600 m3
-        $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);
+        //Declare variables
+        $totalPriceMined = 0.00;
+
         //Get the configuration for pricing calculations
         $config = DB::table('Config')->get();
-        if($firstQuan >= 1.00) {
-            $firstPerc = $this->ConvertToPercentage($firstQuan);
-        } else {
-            $firstPerc = $firstQuan;
+
+        //Convert the quantities into numbers we want to utilize
+        $this->ConvertPercentages($firstPerc, $firstQuan, $secondPerc, $secondQuan, $thirdPerc, $thirdQuan, $fourthPerc, $fourthQuan);
+
+        //Calculate the prices from the ores
+        if($firstOre != 'None') {
+            $totalPriceMined += $this->CalcMoonPrice($firstOre, $firstPerc);
         }
-        if($secondQuan >= 1.00) {
-            $secondPerc = $this->ConvertToPercentage($secondQuan);
-        } else {
-            $secondPerc = $secondQuan;
+        if($secondOre != 'None') {
+            $totalPriceMined += $this->CalcMoonPrice($secondOre, $secondPerc);
         }
-        if($thirdQuan >= 1.00) {
-            $thirdPerc = $this->ConvertToPercentage($thirdQuan);
-        } else {
-            $thirdPerc = $thirdQuan;
+        if($thirdOre != 'None') {
+            $totalPriceMined += $this->CalcMoonPrice($thirdOre, $thirdPerc);
         }
-        if($fourthQuan >= 1.00) {
-            $fourthPerc = $this->ConvertToPercentage($fourthQuan);
-        } else {
-            $fourthPerc = $fourthQuan;
+        if($fourthOre != 'None') {
+            $totalPriceMined += $this->CalcMoonPrice($fourthOre, $fourthPerc);
         }  
-        if($firstOre != "None") {
-            $firstTotal = $this->CalcPrice($firstOre, $firstPerc);
-        } else {
-            $firstTotal = 0.00;
-        }
-        if($secondOre != "None") {
-            $secondTotal = $this->CalcPrice($secondOre, $secondPerc);
-        } else {
-            $secondTotal = 0.00;
-        }
-        if($thirdOre != "None") {
-            $thirdTotal = $this->CalcPrice($thirdOre, $thirdPerc);
-        } else {
-            $thirdTotal = 0.00;
-        }
-        if($fourthOre != "None") {
-            $fourthTotal = $this->CalcPrice($fourthOre, $fourthPerc);
-        } else {
-            $fourthTotal = 0.00;
-        }
-        //Calculate the total to price to be mined in one month
-        $totalPriceMined = $firstTotal + $secondTotal + $thirdTotal + $fourthTotal;
 
         //Return the rental price to the caller
         return $totalPriceMined;
     }
 
-    public function SpatialMoonsOnlyGooTotalWorth($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) {
-        //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds
-        //Total pull size is 14,385,600 m3
-        $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);
-        //Get the configuration for pricing calculations
-        $config = DB::table('Config')->get();
-        if($firstQuan >= 1.00) {
-            $firstPerc = $this->ConvertToPercentage($firstQuan);
-        } else {
-            $firstPerc = $firstQuan;
-        }
-        if($secondQuan >= 1.00) {
-            $secondPerc = $this->ConvertToPercentage($secondQuan);
-        } else {
-            $secondPerc = $secondQuan;
-        }
-        if($thirdQuan >= 1.00) {
-            $thirdPerc = $this->ConvertToPercentage($thirdQuan);
-        } else {
-            $thirdPerc = $thirdQuan;
-        }
-        if($fourthQuan >= 1.00) {
-            $fourthPerc = $this->ConvertToPercentage($fourthQuan);
-        } else {
-            $fourthPerc = $fourthQuan;
-        }
-        if($firstOre != "None") {
-            if($this->IsRMoonGoo($firstOre)) {
-                $firstTotal = $this->CalcPrice($firstOre, $firstPerc);
-            } else {
-                $firstTotal = 0.00;
-            }
-        } else {
-            $firstTotal = 0.00;
-        }
-        if($secondOre != "None") {
-            if($this->IsRMoonGoo($secondOre)) {
-                $secondTotal = $this->CalcPrice($secondOre, $secondPerc);
-            } else {
-                $secondTotal = 0.00;
-            }
-        } else {
-            $secondTotal = 0.00;
-        }
-        if($thirdOre != "None") {
-            if($this->IsRMoonGoo($thirdOre)) {
-                $thirdTotal = $this->CalcPrice($thirdOre, $thirdPerc);
-            } else {
-                $thirdTotal = 0.00;
-            }
-        } else {
-            $thirdTotal = 0.00;
-        }
-        if($fourthOre != "None") {
-            if($this->IsRMoonGoo($fourthOre)) {
-                $fourthTotal = $this->CalcPrice($fourthOre, $fourthPerc);
-            } else {
-                $fourthTotal = 0.00;
-            }
-        } else {
-            $fourthTotal = 0.00;
-        }
-        //Calculate the total to price to be mined in one month
-        $totalPriceMined = $firstTotal + $secondTotal + $thirdTotal + $fourthTotal;
-       
-        //Return the rental price to the caller
-        return $totalPriceMined;
-    }
-
-    public function SpatialMoonsOnlyGoo($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) {
-        //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds
-        //Total pull size is 14,385,600 m3
-        $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);
-        //Get the configuration for pricing calculations
-        $config = DB::table('Config')->get();
-        if($firstQuan >= 1.00) {
-            $firstPerc = $this->ConvertToPercentage($firstQuan);
-        } else {
-            $firstPerc = $firstQuan;
-        }
-        if($secondQuan >= 1.00) {
-            $secondPerc = $this->ConvertToPercentage($secondQuan);
-        } else {
-            $secondPerc = $secondQuan;
-        }
-        if($thirdQuan >= 1.00) {
-            $thirdPerc = $this->ConvertToPercentage($thirdQuan);
-        } else {
-            $thirdPerc = $thirdQuan;
-        }
-        if($fourthQuan >= 1.00) {
-            $fourthPerc = $this->ConvertToPercentage($fourthQuan);
-        } else {
-            $fourthPerc = $fourthQuan;
-        }
-        if($firstOre != "None") {
-            if($this->IsRMoon($firstOre)) {
-                $firstTotal = $this->CalcPrice($firstOre, $firstPerc);
-            } else {
-                $firstTotal = 0.00;
-            }
-        } else {
-            $firstTotal = 0.00;
-        }
-        if($secondOre != "None") {
-            if($this->IsRMoon($secondOre)) {
-                $secondTotal = $this->CalcPrice($secondOre, $secondPerc);
-            } else {
-                $secondTotal = 0.00;
-            }
-        } else {
-            $secondTotal = 0.00;
-        }
-        if($thirdOre != "None") {
-            if($this->IsRMoon($thirdOre)) {
-                $thirdTotal = $this->CalcPrice($thirdOre, $thirdPerc);
-            } else {
-                $thirdTotal = 0.00;
-            }
-        } else {
-            $thirdTotal = 0.00;
-        }
-        if($fourthOre != "None") {
-            if($this->IsRMoon($fourthOre)) {
-                $fourthTotal = $this->CalcPrice($fourthOre, $fourthPerc);
-            } else {
-                $fourthTotal = 0.00;
-            }
-        } else {
-            $fourthTotal = 0.00;
-        }
-        //Calculate the total to price to be mined in one month
-        $totalPriceMined = $firstTotal + $secondTotal + $thirdTotal + $fourthTotal;
-        //Calculate the rental price.  Refined rate is already included in the price from rental composition
-        $rentalPrice['alliance'] = $totalPriceMined * ($config[0]->RentalTax / 100.00);
-        $rentalPrice['outofalliance'] = $totalPriceMined * ($config[0]->AllyRentalTax / 100.00);
-        //Format the rental price to the appropriate number
-        $rentalPrice['alliance'] = number_format($rentalPrice['alliance'], 0, ".", ",");
-        $rentalPrice['outofalliance'] = number_format($rentalPrice['outofalliance'], 0, ".", ",");
-       
-        //Return the rental price to the caller
-        return $rentalPrice;
-    }
-
+    /**
+     * Calculate the rental price
+     */
     public function SpatialMoons($firstOre, $firstQuan, $secondOre, $secondQuan, $thirdOre, $thirdQuan, $fourthOre, $fourthQuan) {
-        //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds
-        //Total pull size is 14,385,600 m3
-        $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);
+        //Declare variables
+        $totalPrice = 0.00;
+
         //Get the configuration for pricing calculations
         $config = DB::table('Config')->get();
-        if($firstQuan >= 1.00) {
-            $firstPerc = $this->ConvertToPercentage($firstQuan);
-        } else {
-            $firstPerc = $firstQuan;
+
+        //Convert the quantities into numbers we want to utilize
+        $this->ConvertPercentages($firstPerc, $firstQuan, $secondPerc, $secondQuan, $thirdPerc, $thirdQuan, $fourthPerc, $fourthQuan);
+
+        //Calculate the prices from the ores
+        if($firstOre != 'None') {
+            $totalPrice += $this->CalcRentalPrice($firstOre, $firstPerc);
         }
-        if($secondQuan >= 1.00) {
-            $secondPerc = $this->ConvertToPercentage($secondQuan);
-        } else {
-            $secondPerc = $secondQuan;
+        if($secondOre != 'None') {
+            $totalPrice += $this->CalcRentalPrice($secondOre, $secondPerc);
         }
-        if($thirdQuan >= 1.00) {
-            $thirdPerc = $this->ConvertToPercentage($thirdQuan);
-        } else {
-            $thirdPerc = $thirdQuan;
+        if($thirdOre != 'None') {
+            $totalPrice += $this->CalcRentalPrice($thirdOre, $thirdPerc);
         }
-        if($fourthQuan >= 1.00) {
-            $fourthPerc = $this->ConvertToPercentage($fourthQuan);
-        } else {
-            $fourthPerc = $fourthQuan;
+        if($fourthOre != 'None') {
+            $totalPrice += $this->CalcRentalPrice($fourthOre, $fourthPerc);
         }
-        if($firstOre != "None") {
-            $firstTotal = $this->CalcPrice($firstOre, $firstPerc);
-        } else {
-            $firstTotal = 0.00;
-        }
-        if($secondOre != "None") {
-            $secondTotal = $this->CalcPrice($secondOre, $secondPerc);
-        } else {
-            $secondTotal = 0.00;
-        }
-        if($thirdOre != "None") {
-            $thirdTotal = $this->CalcPrice($thirdOre, $thirdPerc);
-        } else {
-            $thirdTotal = 0.00;
-        }
-        if($fourthOre != "None") {
-            $fourthTotal = $this->CalcPrice($fourthOre, $fourthPerc);
-        } else {
-            $fourthTotal = 0.00;
-        }
-        //Calculate the total to price to be mined in one month
-        $totalPriceMined = $firstTotal + $secondTotal + $thirdTotal + $fourthTotal;
+
         //Calculate the rental price.  Refined rate is already included in the price from rental composition
-        $rentalPrice['alliance'] = $totalPriceMined * ($config[0]->RentalTax / 100.00);
-        $rentalPrice['outofalliance'] = $totalPriceMined * ($config[0]->AllyRentalTax / 100.00);
-        //Format the rental price to the appropriate number
-        $rentalPrice['alliance'] = number_format($rentalPrice['alliance'], 0, ".", ",");
-        $rentalPrice['outofalliance'] = number_format($rentalPrice['outofalliance'], 0, ".", ",");
+        $rentalPrice['alliance'] = $totalPrice * ($config[0]->RentalTax / 100.00);
+        $rentalPrice['outofalliance'] = $totalPrice * ($config[0]->AllyRentalTax / 100.00);
        
         //Return the rental price to the caller
         return $rentalPrice;
     }
 
+    /**
+     * Fetch new prices for items from the market
+     */
     public function FetchNewPrices() {
+        //Create the item id array which we will pull data for from Fuzzwork market api
         $ItemIDs = array(
             "Tritanium" => 34,
             "Pyerite" => 35,
@@ -317,157 +148,395 @@ class MoonCalc {
             "Promethium" => 16652,
             "Thulium" => 16653,
         );
-        $time = time();
-        $item = array();
+
+        //Create the time variable
+        $time = Carbon::now();
+
         //Get the json data for each ItemId from https://market.fuzzwork.co.uk/api/
         //Base url is https://market.fuzzwork.co.uk/aggregates/?region=10000002&types=34
         //Going to use curl for these requests
         foreach($ItemIDs as $key => $value) {
+            //Declare a new array each time we cycle through the for loop for the item
+            $item = array();
+
+            //Setup the guzzle client fetch object
             $client = new Client(['base_uri' => 'https://market.fuzzwork.co.uk/aggregates/']);
+            //Setup the uri for the guzzle client
             $uri = '?region=10000002&types=' . $value;
+            //Get the result from the guzzle client request
             $result = $client->request('GET', $uri);
+            //Decode the request into an array from the json body return
             $item = json_decode($result->getBody(), true);
 
-            DB::table('Prices')->where('Name', $key)->update([
-                'Name' => $key,
-                'ItemId' => $value,
-                'Price' => $item[$value]['sell']['median'],
-                'Time' => $time,
-            ]);
+            //Save the entry into the database
+            $price = new MineralPrice;
+            $price->Name = $key;
+            $price->ItemId = $value;
+            $price->Price = $item[$value]['sell']['median'];
+            $price->Time = $time;
+            $price->save();
         }
         
+        //Run the update for the item pricing
         $this->UpdateItemPricing();
     }
 
-    private function UpdateItemPricing() {
+    /**
+     * Calculate the ore units
+     */
+    public function CalcOreUnits($ore, $percentage) {
+        //Specify the total pull amount
+        $totalPull = 5.55 * (3600.00 * 24.00 *30.00);
 
+        //Find the size of the asteroid from the database
+        $item = ItemComposition::where([
+            'Name' => $ore,
+        ])->first();
+        
+        //Get the m3 size from the item composition
+        $m3Size = $item->m3Size;
+        
+        //Calculate the actual m3 from the total pull amount in m3 using the percentage of the ingredient
+        $actualm3 = floor($totalPull * $percentage);
+        
+        //Calculate the units from the m3 pulled from the moon
+        $units = floor($actualm3 / $m3Size);   
+
+        //Return the calculated data
+        return $units;
+    }
+
+    /**
+     * Calculate the per item price of a unit of ore
+     */
+    public function CalculateOrePrice($oreId) {
+        //Declare variables
+        $lookupHelper = new LookupHelper;
+        $finalName = null;
+
+        $pastTime = Carbon::now()->subDays(30);
+
+        //Get the price of the moongoo
+        $tritaniumPrice = MineralPrice::where(['ItemId' => 34])->where('Time', '>', $pastTime)->avg('Price');
+        $pyeritePrice = MineralPrice::where(['ItemId' => 35])->where('Time', '>', $pastTime)->avg('Price');
+        $mexallonPrice = MineralPrice::where(['ItemId' => 36])->where('Time', '>', $pastTime)->avg('Price');
+        $isogenPrice = MineralPrice::where(['ItemId' => 37])->where('Time', '>', $pastTime)->avg('Price');
+        $nocxiumPrice = MineralPrice::where(['ItemId' => 38])->where('Time', '>', $pastTime)->avg('Price');
+        $zydrinePrice = MineralPrice::where(['ItemId' => 39])->where('Time', '>', $pastTime)->avg('Price');
+        $megacytePrice = MineralPrice::where(['ItemId' => 40])->where('Time', '>', $pastTime)->avg('Price');
+        $atmosphericGasesPrice = MineralPrice::where(['ItemId' => 16634])->where('Time', '>', $pastTime)->avg('Price');
+        $evaporiteDepositsPirce = MineralPrice::where(['ItemId' => 16635])->where('Time', '>', $pastTime)->avg('Price');
+        $hydrocarbonsPrice = MineralPrice::where(['ItemId' => 16633])->where('Time', '>', $pastTime)->avg('Price');
+        $silicatesPrice = MineralPrice::where(['ItemId' => 16636])->where('Time', '>', $pastTime)->avg('Price');
+        $cobaltPrice = MineralPrice::where(['ItemId' => 16640])->where('Time', '>', $pastTime)->avg('Price');
+        $scandiumPrice = MineralPrice::where(['ItemId' => 16639])->where('Time', '>', $pastTime)->avg('Price');
+        $titaniumPrice = MineralPrice::where(['ItemId' => 16638])->where('Time', '>', $pastTime)->avg('Price');
+        $tungstenPrice = MineralPrice::where(['ItemId' => 16637])->where('Time', '>', $pastTime)->avg('Price');
+        $cadmiumPrice = MineralPrice::where(['ItemId' => 16643])->where('Time', '>', $pastTime)->avg('Price');
+        $platinumPrice = MineralPrice::where(['ItemId' => 16644])->where('Time', '>', $pastTime)->avg('Price');
+        $vanadiumPrice = MineralPrice::where(['ItemId' => 16642])->where('Time', '>', $pastTime)->avg('Price');
+        $chromiumPrice = MineralPrice::where(['ItemId' => 16641])->where('Time', '>', $pastTime)->avg('Price');
+        $technetiumPrice = MineralPrice::where(['ItemId' => 16649])->where('Time', '>', $pastTime)->avg('Price');
+        $hafniumPrice = MineralPrice::where(['ItemId' => 16648])->where('Time', '>', $pastTime)->avg('Price');
+        $caesiumPrice = MineralPrice::where(['ItemId' => 16647])->where('Time', '>', $pastTime)->avg('Price');
+        $mercuryPrice = MineralPrice::where(['ItemId' => 16646])->where('Time', '>', $pastTime)->avg('Price');
+        $dysprosiumPrice = MineralPrice::where(['ItemId' => 16650])->where('Time', '>', $pastTime)->avg('Price');
+        $neodymiumPrice = MineralPrice::where(['ItemId' => 16651])->where('Time', '>', $pastTime)->avg('Price');
+        $promethiumPrice = MineralPrice::where(['ItemId' => 16652])->where('Time', '>', $pastTime)->avg('Price');
+        $thuliumPrice = MineralPrice::where(['ItemId' => 16653])->where('Time', '>', $pastTime)->avg('Price');
+
+        //Get the name through the lookup table
+        $oreName = $lookupHelper->ItemIdToName($oreId);
+        
+        //Strip the prefix from the ore name if it has one.
+        //Then change the ore id if necessary
+        $tempName = explode(' ', $oreName);
+        
+        if(sizeof($tempName) == 1) {
+            $finalName = $tempName[0];
+        } else {
+            $finalName = $tempName[sizeof($tempName) - 1];
+            $oreId = $lookupHelper->ItemNameToId($finalName);
+        }
+        
+        //Get the item composition for the ore
+        $composition = ItemComposition::where('ItemId', $oreId)->first();
+
+        //Calculate the Batch Price
+        $batchPrice = ( ($composition->Tritanium * $tritaniumPrice) +
+                        ($composition->Pyerite * $pyeritePrice) +
+                        ($composition->Mexallon * $mexallonPrice) +
+                        ($composition->Isogen * $isogenPrice) +
+                        ($composition->Nocxium * $nocxiumPrice) +
+                        ($composition->Zydrine * $zydrinePrice) +
+                        ($composition->Megacyte * $megacytePrice) +
+                        ($composition->AtmosphericGases * $atmosphericGasesPrice) +
+                        ($composition->EvaporiteDeposits * $evaporiteDepositsPirce) +
+                        ($composition->Hydrocarbons * $hydrocarbonsPrice) +
+                        ($composition->Silicates * $silicatesPrice) +
+                        ($composition->Cobalt * $cobaltPrice) +
+                        ($composition->Scandium * $scandiumPrice) +
+                        ($composition->Titanium * $titaniumPrice) +
+                        ($composition->Tungsten * $tungstenPrice) +
+                        ($composition->Cadmium * $cadmiumPrice) +
+                        ($composition->Platinum * $platinumPrice) +
+                        ($composition->Vanadium * $vanadiumPrice) +
+                        ($composition->Chromium * $chromiumPrice)+
+                        ($composition->Technetium * $technetiumPrice) +
+                        ($composition->Hafnium * $hafniumPrice) +
+                        ($composition->Caesium * $caesiumPrice) +
+                        ($composition->Mercury * $mercuryPrice) +
+                        ($composition->Dysprosium * $dysprosiumPrice) +
+                        ($composition->Neodymium * $neodymiumPrice) + 
+                        ($composition->Promethium * $promethiumPrice) +
+                        ($composition->Thulium * $thuliumPrice));
+
+        //Take the batch price, and divide by batch size to get unit price
+        $price = $batchPrice / $composition->BatchSize;
+
+        //Return the price to the calling function
+        return $price;
+    }
+
+    /**
+     * Update item pricing after new prices were pulled
+     */
+    private function UpdateItemPricing() {
         //Get the configuration from the config table
         $config = DB::table('Config')->first();
+
         //Calculate refine rate
         $refineRate = $config->RefineRate / 100.00;
+        
         //Calculate the current time
-        $time = time();
-        //Get the max time from the database
-        $maxTime = DB::table('Prices')->where('ItemId', 34)->max('Time');
+        $time = Carbon::now();
+        //Calcualate the current time minus 30 days
+        $pastTime = Carbon::now()->subDays(30);
+
         //Get the price of the basic minerals
-        $tritaniumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [34, $maxTime]);
-        $tritanium = DB::select( DB::raw('SELECT Price FROM Prices WHERE ItemId= :id AND Time= :time'), array('id' => 34, 'time' => $maxTime));
-        $pyeritePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [35, $maxTime]);
-        $mexallonPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [36, $maxTime]);
-        $isogenPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [37, $maxTime]);
-        $nocxiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [38, $maxTime]);
-        $zydrinePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [39, $maxTime]);
-        $megacytePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [40, $maxTime]);
-        $morphitePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [11399, $maxTime]);
-        $heliumIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16274, $maxTime]);
-        $nitrogenIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [17888, $maxTime]);
-        $oxygenIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [17887, $maxTime]);
-        $hydrogenIsotopesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [17889, $maxTime]);
-        $liquidOzonePrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16273, $maxTime]);
-        $heavyWaterPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16272, $maxTime]);
-        $strontiumClathratesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16275, $maxTime]);
+        $tritaniumPrice = MineralPrice::where(['ItemId' => 34])->where('Time', '>', $pastTime)->avg('Price');
+        $pyeritePrice = MineralPrice::where(['ItemId' => 35])->where('Time', '>', $pastTime)->avg('Price');
+        $mexallonPrice = MineralPrice::where(['ItemId' => 36])->where('Time', '>', $pastTime)->avg('Price');
+        $isogenPrice = MineralPrice::where(['ItemId' => 37])->where('Time', '>', $pastTime)->avg('Price');
+        $nocxiumPrice = MineralPrice::where(['ItemId' => 38])->where('Time', '>', $pastTime)->avg('Price');
+        $zydrinePrice = MineralPrice::where(['ItemId' => 39])->where('Time', '>', $pastTime)->avg('Price');
+        $megacytePrice = MineralPrice::where(['ItemId' => 40])->where('Time', '>', $pastTime)->avg('Price');
+        $morphitePrice = MineralPrice::where(['ItemId' => 11399])->where('Time', '>', $pastTime)->avg('Price');
+        $heliumIsotopesPrice = MineralPrice::where(['ItemId' => 16274])->where('Time', '>', $pastTime)->avg('Price');
+        $nitrogenIsotopesPrice = MineralPrice::where(['ItemId' => 17888])->where('Time', '>', $pastTime)->avg('Price');
+        $oxygenIsotopesPrice = MineralPrice::where(['ItemId' => 17887])->where('Time', '>', $pastTime)->avg('Price');
+        $hydrogenIsotopesPrice = MineralPrice::where(['ItemId' => 17889])->where('Time', '>', $pastTime)->avg('Price');
+        $liquidOzonePrice = MineralPrice::where(['ItemId' => 16273])->where('Time', '>', $pastTime)->avg('Price');
+        $heavyWaterPrice = MineralPrice::where(['ItemId' => 16272])->where('Time', '>', $pastTime)->avg('Price');
+        $strontiumClathratesPrice = MineralPrice::where(['ItemId' => 16275])->where('Time', '>', $pastTime)->avg('Price');
         //Get the price of the moongoo
-        $atmosphericGasesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16634, $maxTime]);
-        $evaporiteDepositsPirce = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16635, $maxTime]);
-        $hydrocarbonsPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16633, $maxTime]);
-        $silicatesPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16636, $maxTime]);
-        $cobaltPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16640, $maxTime]);
-        $scandiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16639, $maxTime]);
-        $titaniumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16638, $maxTime]);
-        $tungstenPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16637, $maxTime]);
-        $cadmiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16643, $maxTime]);
-        $platinumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16644, $maxTime]);
-        $vanadiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16642, $maxTime]);
-        $chromiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16641, $maxTime]);
-        $technetiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16649, $maxTime]);
-        $hafniumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16648, $maxTime]);
-        $caesiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16647, $maxTime]);
-        $mercuryPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16646, $maxTime]);
-        $dysprosiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16650, $maxTime]);
-        $neodymiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16651, $maxTime]);
-        $promethiumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16652, $maxTime]);
-        $thuliumPrice = DB::select('SELECT Price FROM Prices WHERE ItemId = ? AND Time = ?', [16653, $maxTime]);
+        $atmosphericGasesPrice = MineralPrice::where(['ItemId' => 16634])->where('Time', '>', $pastTime)->avg('Price');
+        $evaporiteDepositsPirce = MineralPrice::where(['ItemId' => 16635])->where('Time', '>', $pastTime)->avg('Price');
+        $hydrocarbonsPrice = MineralPrice::where(['ItemId' => 16633])->where('Time', '>', $pastTime)->avg('Price');
+        $silicatesPrice = MineralPrice::where(['ItemId' => 16636])->where('Time', '>', $pastTime)->avg('Price');
+        $cobaltPrice = MineralPrice::where(['ItemId' => 16640])->where('Time', '>', $pastTime)->avg('Price');
+        $scandiumPrice = MineralPrice::where(['ItemId' => 16639])->where('Time', '>', $pastTime)->avg('Price');
+        $titaniumPrice = MineralPrice::where(['ItemId' => 16638])->where('Time', '>', $pastTime)->avg('Price');
+        $tungstenPrice = MineralPrice::where(['ItemId' => 16637])->where('Time', '>', $pastTime)->avg('Price');
+        $cadmiumPrice = MineralPrice::where(['ItemId' => 16643])->where('Time', '>', $pastTime)->avg('Price');
+        $platinumPrice = MineralPrice::where(['ItemId' => 16644])->where('Time', '>', $pastTime)->avg('Price');
+        $vanadiumPrice = MineralPrice::where(['ItemId' => 16642])->where('Time', '>', $pastTime)->avg('Price');
+        $chromiumPrice = MineralPrice::where(['ItemId' => 16641])->where('Time', '>', $pastTime)->avg('Price');
+        $technetiumPrice = MineralPrice::where(['ItemId' => 16649])->where('Time', '>', $pastTime)->avg('Price');
+        $hafniumPrice = MineralPrice::where(['ItemId' => 16648])->where('Time', '>', $pastTime)->avg('Price');
+        $caesiumPrice = MineralPrice::where(['ItemId' => 16647])->where('Time', '>', $pastTime)->avg('Price');
+        $mercuryPrice = MineralPrice::where(['ItemId' => 16646])->where('Time', '>', $pastTime)->avg('Price');
+        $dysprosiumPrice = MineralPrice::where(['ItemId' => 16650])->where('Time', '>', $pastTime)->avg('Price');
+        $neodymiumPrice = MineralPrice::where(['ItemId' => 16651])->where('Time', '>', $pastTime)->avg('Price');
+        $promethiumPrice = MineralPrice::where(['ItemId' => 16652])->where('Time', '>', $pastTime)->avg('Price');
+        $thuliumPrice = MineralPrice::where(['ItemId' => 16653])->where('Time', '>', $pastTime)->avg('Price');
+        
         //Get the item compositions
         $items = DB::select('SELECT Name,ItemId FROM ItemComposition');
         //Go through each of the items and update the price
         foreach($items as $item) {
             //Get the item composition
-            $composition = DB::select('SELECT * FROM ItemComposition WHERE ItemId = ?', [$item->ItemId]);
+            $composition = ItemComposition::where('ItemId', $item->ItemId)->first();
+
             //Calculate the Batch Price
-            $batchPrice = ( ($composition[0]->Tritanium * $tritaniumPrice[0]->Price) +
-                            ($composition[0]->Pyerite * $pyeritePrice[0]->Price) +
-                            ($composition[0]->Mexallon * $mexallonPrice[0]->Price) +
-                            ($composition[0]->Isogen * $isogenPrice[0]->Price) +
-                            ($composition[0]->Nocxium * $nocxiumPrice[0]->Price) +
-                            ($composition[0]->Zydrine * $zydrinePrice[0]->Price) +
-                            ($composition[0]->Megacyte * $megacytePrice[0]->Price) + 
-                            ($composition[0]->Morphite * $morphitePrice[0]->Price) +
-                            ($composition[0]->HeavyWater * $heavyWaterPrice[0]->Price) +
-                            ($composition[0]->LiquidOzone * $liquidOzonePrice[0]->Price) +
-                            ($composition[0]->NitrogenIsotopes * $nitrogenIsotopesPrice[0]->Price) +
-                            ($composition[0]->HeliumIsotopes * $heliumIsotopesPrice[0]->Price) + 
-                            ($composition[0]->HydrogenIsotopes * $hydrogenIsotopesPrice[0]->Price) +
-                            ($composition[0]->OxygenIsotopes * $oxygenIsotopesPrice[0]->Price) +
-                            ($composition[0]->StrontiumClathrates * $strontiumClathratesPrice[0]->Price) +
-                            ($composition[0]->AtmosphericGases * $atmosphericGasesPrice[0]->Price) +
-                            ($composition[0]->EvaporiteDeposits * $evaporiteDepositsPirce[0]->Price) +
-                            ($composition[0]->Hydrocarbons * $hydrocarbonsPrice[0]->Price) +
-                            ($composition[0]->Silicates * $silicatesPrice[0]->Price) +
-                            ($composition[0]->Cobalt * $cobaltPrice[0]->Price) +
-                            ($composition[0]->Scandium * $scandiumPrice[0]->Price) +
-                            ($composition[0]->Titanium * $titaniumPrice[0]->Price) +
-                            ($composition[0]->Tungsten * $tungstenPrice[0]->Price) +
-                            ($composition[0]->Cadmium * $cadmiumPrice[0]->Price) +
-                            ($composition[0]->Platinum * $platinumPrice[0]->Price) +
-                            ($composition[0]->Vanadium * $vanadiumPrice[0]->Price) +
-                            ($composition[0]->Chromium * $chromiumPrice[0]->Price)+
-                            ($composition[0]->Technetium * $technetiumPrice[0]->Price) +
-                            ($composition[0]->Hafnium * $hafniumPrice[0]->Price) +
-                            ($composition[0]->Caesium * $caesiumPrice[0]->Price) +
-                            ($composition[0]->Mercury * $mercuryPrice[0]->Price) +
-                            ($composition[0]->Dysprosium * $dysprosiumPrice[0]->Price) +
-                            ($composition[0]->Neodymium * $neodymiumPrice[0]->Price) + 
-                            ($composition[0]->Promethium * $promethiumPrice[0]->Price) +
-                            ($composition[0]->Thulium * $thuliumPrice[0]->Price));
+            $batchPrice = ( ($composition->Tritanium * $tritaniumPrice) +
+                            ($composition->Pyerite * $pyeritePrice) +
+                            ($composition->Mexallon * $mexallonPrice) +
+                            ($composition->Isogen * $isogenPrice) +
+                            ($composition->Nocxium * $nocxiumPrice) +
+                            ($composition->Zydrine * $zydrinePrice) +
+                            ($composition->Megacyte * $megacytePrice) + 
+                            ($composition->Morphite * $morphitePrice) +
+                            ($composition->HeavyWater * $heavyWaterPrice) +
+                            ($composition->LiquidOzone * $liquidOzonePrice) +
+                            ($composition->NitrogenIsotopes * $nitrogenIsotopesPrice) +
+                            ($composition->HeliumIsotopes * $heliumIsotopesPrice) + 
+                            ($composition->HydrogenIsotopes * $hydrogenIsotopesPrice) +
+                            ($composition->OxygenIsotopes * $oxygenIsotopesPrice) +
+                            ($composition->StrontiumClathrates * $strontiumClathratesPrice) +
+                            ($composition->AtmosphericGases * $atmosphericGasesPrice) +
+                            ($composition->EvaporiteDeposits * $evaporiteDepositsPirce) +
+                            ($composition->Hydrocarbons * $hydrocarbonsPrice) +
+                            ($composition->Silicates * $silicatesPrice) +
+                            ($composition->Cobalt * $cobaltPrice) +
+                            ($composition->Scandium * $scandiumPrice) +
+                            ($composition->Titanium * $titaniumPrice) +
+                            ($composition->Tungsten * $tungstenPrice) +
+                            ($composition->Cadmium * $cadmiumPrice) +
+                            ($composition->Platinum * $platinumPrice) +
+                            ($composition->Vanadium * $vanadiumPrice) +
+                            ($composition->Chromium * $chromiumPrice)+
+                            ($composition->Technetium * $technetiumPrice) +
+                            ($composition->Hafnium * $hafniumPrice) +
+                            ($composition->Caesium * $caesiumPrice) +
+                            ($composition->Mercury * $mercuryPrice) +
+                            ($composition->Dysprosium * $dysprosiumPrice) +
+                            ($composition->Neodymium * $neodymiumPrice) + 
+                            ($composition->Promethium * $promethiumPrice) +
+                            ($composition->Thulium * $thuliumPrice));
             //Calculate the batch price with the refine rate included
             //Batch Price is base price for everything
             $batchPrice = $batchPrice * $refineRate;
             //Calculate the unit price
-            $price = $batchPrice / $composition[0]->BatchSize;
+            $price = $batchPrice / $composition->BatchSize;
             //Calculate the m3 price
-            $m3Price = $price / $composition[0]->m3Size;
-            //Update the prices in the Prices table
-            DB::table('OrePrices')->where('Name', $composition[0]->Name)->update([
-                'Name' => $composition[0]->Name,
-                'ItemId' => $composition[0]->ItemId,
-                'BatchPrice' => $batchPrice,
-                'UnitPrice' => $price,
-                'm3Price' => $m3Price,
-            ]);
+            $m3Price = $price / $composition->m3Size;
+
+            //Check if an item is in the table
+            $count = OrePrice::where('Name', $composition->Name)->count();
+            if($count == 0) {
+                //If the ore wasn't found, then add a new entry
+                $ore = new OrePrice;
+                $ore->Name = $composition->Name;
+                $ore->ItemId = $composition->ItemId;
+                $ore->BatchPrice = $batchPrice;
+                $ore->UnitPrice = $price;
+                $ore->m3Price = $m3Price;
+                $ore->Time = $time;
+                $ore->save();
+            } else {
+                //Update the prices in the Prices table
+                OrePrice::where('Name', $composition->Name)->update([
+                    'Name' => $composition->Name,
+                    'ItemId' => $composition->ItemId,
+                    'BatchPrice' => $batchPrice,
+                    'UnitPrice' => $price,
+                    'm3Price' => $m3Price,
+                    'Time' => $time,
+                ]);
+            }
         }
     }
 
-    private function CalcPrice($ore, $percentage) {
-        //Specify the total pull amount
-        $totalPull = 5.55 * (3600.00 * 24.00 * 30.00);
-        //Find the size of the asteroid from the database
-        $m3Size = DB::table('ItemComposition')->where('Name', $ore)->value('m3Size');
-        //Calculate the actual m3 from the total pull amount in m3 using the percentage of the ingredient
-        $actualm3 = floor($percentage * $totalPull);
-        //Calculate the units once we have the size and actual m3 value
-        $units = floor($actualm3 / $m3Size);
-        //Look up the unit price from the database
-        $unitPrice = DB::table('OrePrices')->where('Name', $ore)->value('UnitPrice');
-        //Calculate the total amount from the units and unit price
-        $total = $units * $unitPrice;
-        //Return the value
-        return $total;
+    /**
+     * Calculate the total amount pulled from a moon
+     */
+    private function CalculateTotalMoonPull() {
+        //Always assume a 1 month pull which equates to 5.55m3 per second or 2,592,000 seconds
+        //Total pull size is 14,385,600 m3
+        $totalPull = 5.55 * 3600.00 * 24.00 *30.00;
+
+        //Return the total pull
+        return $totalPull;
     }
 
+    /**
+     * Calculate the rental price of a moon ore from the moon
+     */
+    private function CalcRentalPrice($ore, $percentage) {
+        //Specify the total pull amount
+        $totalPull = $this->CalculateTotalMoonPull();
+
+        //Setup the total value at 0.00
+        $totalPrice = 0.00;
+
+        //Check to see what type of moon goo the moon is
+        $gasMoonOre = $this->IsGasMoonGoo($ore);
+
+        //Find the size of the asteroid from the database
+        $m3Size = DB::table('ItemComposition')->where('Name', $ore)->value('m3Size');
+            
+        //Calculate the actual m3 from the total pull amount in m3 using the percentage of the ingredient
+        $actualm3 = floor($percentage * $totalPull);
+        
+        //Calculate the units once we have the size and actual m3 value
+        $units = floor($actualm3 / $m3Size);
+        
+        //Look up the unit price from the database
+        $unitPrice = DB::table('ore_prices')->where('Name', $ore)->value('UnitPrice');
+
+        //If the ore is a gas ore, then take only 50% of the price.
+        if($gasMoonOre == true) {
+            $totalPrice = $units * ($unitPrice / 2.00);
+            Log::warning('Found gas ore: ' . $totalPrice);
+        } else {
+            $totalPrice = $units * $unitPrice;
+        }
+
+        //Return the total
+        return $totalPrice;
+    }
+
+    /**
+     * Calculate the moon's total price
+     */
+    private function CalcMoonPrice($ore, $percentage) {
+        //Specify the total pull amount
+        $totalPull = $this->CalculateTotalMoonPull();
+
+        //Setup the total value at 0.00
+        $totalPrice = 0.00;
+
+        //Find the size of the asteroid from the database
+        $m3Size = DB::table('ItemComposition')->where('Name', $ore)->value('m3Size');
+            
+        //Calculate the actual m3 from the total pull amount in m3 using the percentage of the ingredient
+        $actualm3 = floor($percentage * $totalPull);
+        
+        //Calculate the units once we have the size and actual m3 value
+        $units = floor($actualm3 / $m3Size);
+        
+        //Look up the unit price from the database
+        $unitPrice = DB::table('ore_prices')->where('Name', $ore)->value('UnitPrice');
+
+        //Calculate the total amount from the units and the unit price.
+        $totalPrice = $units * $unitPrice;
+
+        //Return the value
+        return $totalPrice;
+    }
+
+    /**
+     * Convert a number to a percentage
+     */
     private function ConvertToPercentage($quantity) {
+        //Perform the calculation and return the data
         return $quantity / 100.00;
     }
 
+    /**
+     * Return if a type of ore is a gas moon goo
+     */
+    private function IsGasMoonGoo($ore) {
+        $ores = [
+            'Zeolites' => 'Gas',
+            'Sylvite' => 'Gas',
+            'Bitumens' => 'Gas',
+            'Coesite' => 'Gas',
+        ];
+
+        foreach($ores as $key => $value) {
+            if(strtolower($key) == strtolower($ore)) {
+                return $value;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the type of ore a particular moon ore is.
+     */
     private function IsRMoonGoo($ore) {
         $ores = [
             'Zeolites' => 'Gas',
@@ -493,21 +562,21 @@ class MoonCalc {
         ];
 
         foreach($ores as $key => $value) {
-            
             if(strtolower($key) == strtolower($ore)) {
-                return true;
+                return $value;
             }
         }
 
+        //Return false if the ore is not found in an array
         return false;
     }
 
-    private function IsRMoon($ore) {
+    /**
+     * Return true if a moon ore is a moon ore, and false
+     * if the ore is not a moon ore.
+     */
+    private function IsRMoonOre($ore) {
         $ores = [
-            'Prime Arkonor' => 'Null',
-            'Cubic Bistot' => 'Null',
-            'Pellucid Crokite' => 'Null',
-            'Jet Ochre' => 'Null',
             'Zeolites' => 'Gas',
             'Sylvite' => 'Gas',
             'Bitumens' => 'Gas',
@@ -539,4 +608,67 @@ class MoonCalc {
 
         return false;
     }
+
+    /**
+     * Convert percentages from quantities into a normalized percentage
+     */
+    private function ConvertPercentages(&$firstPerc, $firstQuan, &$secondPerc, $secondQuan, &$thirdPerc, $thirdQuan, &$fourthPerc, $fourthQuan) {
+        //Set the base percentages for the if statements
+        $firstPerc = 0.00;
+        $secondPerc = 0.00;
+        $thirdPerc = 0.00;
+        $fourthPerc = 0.00;
+        
+        //Convert the quantities into numbers we want to utilize
+        if($firstQuan >= 1.00) {
+            $firstPerc = $this->ConvertToPercentage($firstQuan);
+        } else {
+            $firstPerc = $firstQuan;
+        }
+        if($secondQuan >= 1.00) {
+            $secondPerc = $this->ConvertToPercentage($secondQuan);
+        } else {
+            $secondPerc = $secondQuan;
+        }
+        if($thirdQuan >= 1.00) {
+            $thirdPerc = $this->ConvertToPercentage($thirdQuan);
+        } else {
+            $thirdPerc = $thirdQuan;
+        }
+        if($fourthQuan >= 1.00) {
+            $fourthPerc = $this->ConvertToPercentage($fourthQuan);
+        } else {
+            $fourthPerc = $fourthQuan;
+        }
+
+        //Add up all the percentages
+        $totalPerc = $firstPerc + $secondPerc + $thirdPerc + $fourthPerc;
+
+        //If it is less than 1.00, then we need to normalize the decimal to be 100.0%.
+        if($totalPerc < 1.00) {
+            if($firstPerc > 0.00) {
+                $firstPerc = $firstPerc / $totalPerc;
+            } else {
+                $firstPerc = 0.00;
+            }
+
+            if($secondPerc > 0.00) {
+                $secondPerc = $secondPerc / $totalPerc;
+            } else {
+                $secondPerc = 0.00;
+            }
+
+            if($thirdPerc > 0.00) {
+                $thirdPerc = $thirdPerc / $totalPerc;
+            } else {
+                $thirdPerc = 0.00;
+            }
+
+            if($fourthPerc > 0.00) {
+                $fourthPerc = $fourthPerc / $totalPerc;
+            } else {
+                $fourthPerc = 0.00;
+            }
+        }
+    }
 }

app/Library/Structures/JumpBridgeFuel.php

@@ -1,154 +0,0 @@
-<?php
-
-namespace App\Library\Structures;
-
-use App\Library\Esi\Esi;
-
-use App\Models\Esi\EsiScope;
-use App\Models\Esi\EsiToken;
-
-use Seat\Eseye\Configuration;
-use Seat\Eseye\Containers\EsiAuthentication;
-use Seat\Eseye\Eseye;
-use Seat\Eseye\Exceptions\RequestFailedException;
-
-class JumpBridgeFuel {
-
-    private $charId;
-    private $corpId;
-    private $hasScopes;
-
-    public function construct($charId, $corpId) {
-        $this->charId = $charId;
-        $this->corpId = $corpId;
-
-        //Set ESI Scopes true or false whether we have the correct ones
-        $esi = new Esi();
-        if($esi->HaveEsiScope($this->charId, 'esi-assets.read_corporation_assets.v1') && 
-           $esi->HaveEsiScope($this->charId, 'esi-corporations.read_structures.v1')) {
-               $this->hasScopes = true;
-           } else {
-               $this->hasScopes = false;
-           }
-    }
-
-    public function GetCorrrectScopes() {
-        return $this->hasScopes;
-    }
-
-    public function GetStructureFuel() {
-        
-    }
-
-    private function GetStructures($charId, $corpId) {
-        //Delcare the data array for returning
-        $data = array();
-
-        //Get a list of structures.
-        $config = config('esi');
-        //Get the token from the database
-        $token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
-        //Setup the ESI authentication container
-        $authentication = new EsiAuthentication([
-            'client_id' => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-
-        ]);
-        //Setup the ESI authentication container
-        $esi = new Eseye($authentication);
-
-        //set the ESI version we need to work with
-        $esi->setVersion('v3');
-
-        //Set our current page
-        $currentPage = 1;
-        //Set our default total pages, and will refresh this later
-        $totalPages = 1;
-
-        //If more than one page is found, decode the first, then the second
-        do {
-            //Try to gather the structures from ESI
-            try {
-                $structures = $esi->page($currentPage)
-                                  ->invoke('get', '/corporations/{corporation_id}/structures/', [
-                    'corporation_id' => $corpId,
-                ]);
-            } catch(RequestFailedException $e) {
-                return null;
-            }
-
-            //Set the actual total pages after we performed the esi call
-            $totalPages = $structures->pages;
-
-            foreach($structures as $structure) {
-                if($structure->type_id == 35841) {
-                    $data = array_push($data, $structure);
-                }
-            }
-        } while ($currentPage < $totalPages);
-
-        //Add structures to a data array for just jump bridge type, and return the data array
-        return $data;
-    }
-
-    private function GetAssets($corpId, $structures) {
-        //Delcare the data array for returning
-        $data = array();
-
-        //Get a list of structures.
-        $config = config('esi');
-        //Get the token from the database
-        $token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
-        //Setup the ESI authentication container
-        $authentication = new EsiAuthentication([
-            'client_id' => $config['client_id'],
-            'secret' => $config['secret'],
-            'refresh_token' => $token[0]->refresh_token,
-        ]);
-        //Setup the ESI authentication container
-        $esi = new Eseye($authentication);
-
-        //set the ESI version we need to work with
-        $esi->setVersion('v3');
-
-        //Set our current page
-        $currentPage = 1;
-        //Set our default total pages, and will refresh this later
-        $totalPages = 1;
-
-        //If more than one page is available we want to get all the pages
-        do {
-            try {
-                //Try to pull the data from ESI
-                $assets = $esi->page($currentPage)
-                              ->invoke('get', '/corporations/{corporation_id}/assets/', [
-                                  'corporation_id' => $corpId,
-                              ]);
-            } catch(RequestFailedException $e) {
-                //If ESI fails, we just return null
-                return null;
-            }
-
-            //Set the total number of pages
-            $totalPages = $assets->pages;
-
-            //For each entry, we only want to save the entries 
-            foreach($assets as $asset) {
-                if($asset->type_id == 16273) {
-                    //If the type id is correct then push the data onto the array
-                    $data = array_push($data, $asset);
-                }
-            }
-
-        } while($currentPage < $totalPages);
-
-        //Return the list of assets, the structure the asset is in, and the division,
-        //to the  calling function
-        return $data;
-    }
-
-
-}
-
-?>

app/Library/Structures/StructureTaxHelper.php

@@ -1,219 +0,0 @@
-<?php
-
-namespace App\Library\Structures;
-
-use DB;
-use Carbon\Carbon;
-
-use App\User;
-
-use App\Models\User\UserRole;
-use App\Models\User\UserPermission;
-
-use App\Models\Corporation\CorpStructure;
-use App\Models\Corporation\CorpTaxRatio;
-
-use App\Models\Finances\CorpMarketJournal;
-use App\Models\Finances\ReprocessingTaxJournal;
-use App\Models\Finances\StructureIndustryTaxJournal;
-
-class StructureTaxHelper {
-    private $corpId;
-    private $refType;
-    private $start;
-    private $end;
-
-    public function __construct($corp = null, $ref = null, $st = null, $en = null) {
-        $this->corpId = $corp;
-        $this->refType = $ref;
-        $this->start = $st;
-        $this->end = $en;
-    }
-
-    public function GetTaxes($corpId, $refType, $start, $end) {
-        $taxOwed = 0.00;
-        //Get the number of structures of a certain type
-        $count = $this->GetStructureCount($corpId, $refType);
-
-        //Calculate the fuel cost for one type of structure
-        $fuelCost = $this->CalculateFuelBlockCost($refType);
-        
-        //Get the ratio from the table to be divided against the tax to find the
-        //acutal tax owed to the alliance.  Revenue will be a separate function
-        $ratio = CorpTaxRatio::where([
-            'corporation_id' => $corpId,
-            'structure_type' => $refType,
-        ])->get(['ratio']);
-        $ratio = $ratio[0]->ratio;
-
-        //Get the total taxes produced by the structure(s) over a given set of dates
-        $revenue = $this->GetRevenue($corpId, $refType, $start, $end);
-
-        //Calculate the total fuel block cost
-        $totalFuelCost = $fuelCost * $count;
-
-        //Calculate the total revenue minus the fuel block cost
-        $totalRevenue = $revenue - $totalFuelCost;
-
-        //Check to see if the revenue is greater than zero to avoid division by zero error.
-        //Then calculate the tax owed which is revenue divided by ratio previously calcualted.
-        if($totalRevenue > 0.00) {
-            $taxOwed = $totalRevenue / $ratio;
-        } else {
-            $taxOwed = 0.00;
-        }
-
-        //Return the amount
-        return $taxOwed;
-    }
-
-    public function GetIndustryRevenue($start, $end) {
-        $revenue = 0.00;
-
-        $revenue = StructureIndustryTaxJournal::where(['ref_type' => 'facility_industry_tax', 'second_party_id'  => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        return $revenue;
-    }
-
-    public function GetRevenue($corpId, $refType, $start, $end) {
-        $revenue = 0.00;
-        if($refType == 'Market') {
-            //Get the revenue from the corp_market_journals table and add it up.
-            $revenue = CorpMarketJournal::where(['ref_type' => 'brokers_fee', 'corporation_id' => $corpId, 'second_party_id' => $corpId])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-        } else if($refType == 'Refinery'){
-            //Get the revenue from the reprocessing_tax_journal table and add it up.
-            $revenue = ReprocessingTaxJournal::where(['ref_type' => 'reprocessing_tax', 'corporation_id' => $corpId, 'second_party_id' => $corpId])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-        } else {
-            //If it's not from one of the above tables, then it doesn't mean anything, so return nothing.
-            $revenue = 0.00;
-        }
-
-        return (float)$revenue;
-    }
-
-    private function CalculateTaxRatio($corpId, $overallTax, $type) {
-        //Get the ratio based on what was decided upon for the ratio of taxes.
-        //Default rate is 2.5 ratio.
-        
-
-        //The alliance will get a ratio of the tax.
-        //We need to calculate the correct ratio based on structure tax, 
-        //Then figure out what is owed to the alliance
-        if($type == 'Market') {
-            $ratioType = 2.5;
-        } else if($type == 'Refinery') {
-            $ratioType = 1.0;
-        } else {
-            $ratioType = 1.0;
-        }
-        //Calculate the ratio since we have the base percentage the alliance takes
-        $taxRatio = $overallTax / $ratioType;
-
-        //Return what is owed to the alliance
-        return $taxRatio;
-    }
-
-    private function CalculateFuelBlockCost($type) {
-        //Calculate how many fuel blocks are used in a month by a structure type
-        if($type === 'Market') {
-            $fuelBlocks = 24*30*32;
-        } else if ($type === 'Refinery') {
-            $fuelBlocks = 24*30*8;
-        } else {
-            $fuelBlocks = 0;
-        }
-
-        //Multiply the amount of fuel blocks used by the structure by 20,000.
-        $cost = $fuelBlocks * 20000;
-
-        //Return to the calling function
-        return $cost;
-    }
-
-    public function GetTimeFrame() {
-        $start = Carbon::now()->startOfMonth();
-        $end = Carbon::now()->endOfMonth();
-        $end->hour = 23;
-        $end->minute = 59;
-        $end->second = 59;
-        $startLast = new Carbon('first day of last month');
-        $endLast = new Carbon('last day of last month');
-        $endLast->hour = 23;
-        $endLast->minute = 59;
-        $endLast->second = 59;
-
-        $dates = [
-            'ThisMonthStart' => $start,
-            'ThisMonthEnd' => $end,
-            'LastMonthStart' => $startLast,
-            'LastMonthEnd' => $endLast,
-        ];
-
-        return $dates;
-    }
-
-    /**
-     * Returns a set of dates from now until the amount of months has passed
-     * 
-     * @var integer
-     * @returns array
-     */
-    public function GetTimeFrameInMonths($months) {
-        //Declare an array of dates
-        $dates = array();
-        //Setup the start of the array as the basis of our start and end dates
-        $start = Carbon::now()->startOfMonth();
-        $end = Carbon::now()->endOfMonth();
-        $end->hour = 23;
-        $end->minute = 59;
-        $end->second = 59;
-
-        if($months == 1) {
-            $dates = [
-                'start' => $start,
-                'end' => $end,
-            ];
-
-            return $dates;
-        }
-
-        //Create an array of dates
-        for($i = 0; $i < $months; $i++) {
-            if($i == 0) {
-                $dates[$i]['start'] = $start;
-                $dates[$i]['end'] = $end;
-            }
-            
-            $start = Carbon::now()->startOfMonth()->subMonths($i);
-            $end = Carbon::now()->endOfMonth()->subMonths($i);
-            $end->hour = 23;
-            $end->minute = 59;
-            $end->second = 59;
-            $dates[$i]['start'] = $start;
-            $dates[$i]['end'] = $end;
-        }
-
-        //Return the dates back to the calling function
-        return $dates;
-    }
-
-    private function GetStructureTax($corpId, $structureType) {
-        $tax = CorpStructure::where(['corporation_id' => $corpId, 'structure_type' => $structureType])->avg('tax');
-
-        return (float) $tax;
-    }
-
-    private function GetStructureCount($corpId, $structureType) {
-        $count = CorpStructure::where(['corporation_id' => $corpId, 'structure_type' => $structureType])->count();
-
-        return (int)$count;
-    }
-}
-
-?>

app/Library/Taxes/TaxesHelper.php

@@ -1,157 +0,0 @@
-<?php
-
-namespace App\Library\Taxes;
-
-use DB;
-use Carbon\Carbon;
-
-use App\User;
-
-use App\Models\User\UserRole;
-use App\Models\User\UserPermission;
-
-use App\Models\Finances\ReprocessingTaxJournal;
-use App\Models\Finances\StructureIndustryTaxJournal;
-use App\Models\Finances\PlanetProductionTaxJournal;
-use App\Models\Finances\OfficeFeesJournal;
-use App\Models\Finances\CorpMarketJournal;
-use App\Models\Finances\JumpBridgeJournal;
-use App\Models\Finances\PISaleJournal;
-
-class TaxesHelper {
-
-    private $corpId;
-    private $refType;
-    private $start;
-    private $end;
-
-    public function __construct($corp = null, $ref = null, $st = null, $en = null) {
-        $this->corpId = $corp;
-        $this->refType = $ref;
-        $this->start = $st;
-        $this->end = $en;
-    }
-
-    public function GetJumpGateGross($start, $end) {
-        $revenue = 0.00;
-
-        $revenue = JumpBridgeJournal::where(['ref_type' => 'structure_gate_jump', 'second_party_id' => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        return $revenue;
-    }
-
-    public function GetMarketGross($start, $end) {
-        $revenue = 0.00;
-
-        $revenue = CorpMarketJournal::where(['ref_type' => 'brokers_fee', 'second_party_id' => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        return $revenue;
-    }
-
-    public function GetIndustryGross($start, $end) {
-        $revenue = 0.00;
-
-        $revenue = StructureIndustryTaxJournal::where(['ref_type' => 'industry_job_tax', 'second_party_id'  => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        return $revenue;
-    }
-
-    public function GetReprocessingGross($start, $end) {
-        $revenue = 0.00;
-
-        $revenue = ReprocessingTaxJournal::where(['ref_type' => 'reprocessing_tax', 'second_party_id' => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        return $revenue;
-    }
-
-    public function GetPIGross($start, $end) {
-        $revenueImport = 0.00;
-        $revenueExport = 0.00;
-
-        $revenueImport = PlanetProductionTaxJournal::where(['ref_type' => 'planetary_import_tax', 'second_party_id' => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-        $revenueExport = PlanetProductionTaxJournal::where(['ref_type' => 'planetary_export_tax', 'second_party_id' => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        $finalRevenue = $revenueImport + $revenueExport;
-
-        return $finalRevenue;
-    }
-
-    public function GetOfficeGross($start, $end) {
-        $revenue = 0.00;
-
-        $revenue = OfficeFeesJournal::where(['ref_type' => 'office_rental_fee', 'second_party_id' => '98287666'])
-                                ->whereBetween('date', [$start, $end])
-                                ->sum('amount');
-
-        return $revenue;
-    }
-
-    public function GetPiSalesGross($start, $end) {
-        $revenue = 0.00;
-
-        $grosses = PISaleJournal::whereBetween('date', [$start, $end])->get()->toArray();
-
-        foreach($grosses as $gross) {
-            $revenue += ($gross['quantity'] * $gross['unit_price']);
-        }
-
-        return $revenue;
-    }
-
-    /**
-     * Returns a set of dates from now until the amount of months has passed
-     * 
-     * @var integer
-     * @returns array
-     */
-    public function GetTimeFrameInMonths($months) {
-        //Declare an array of dates
-        $dates = array();
-        //Setup the start of the array as the basis of our start and end dates
-        $start = Carbon::now()->startOfMonth();
-        $end = Carbon::now()->endOfMonth();
-        $end->hour = 23;
-        $end->minute = 59;
-        $end->second = 59;
-
-        if($months == 1) {
-            $dates = [
-                'start' => $start,
-                'end' => $end,
-            ];
-
-            return $dates;
-        }
-
-        //Create an array of dates
-        for($i = 0; $i < $months; $i++) {
-            if($i == 0) {
-                $dates[$i]['start'] = $start;
-                $dates[$i]['end'] = $end;
-            }
-            
-            $start = Carbon::now()->startOfMonth()->subMonths($i);
-            $end = Carbon::now()->endOfMonth()->subMonths($i);
-            $end->hour = 23;
-            $end->minute = 59;
-            $end->second = 59;
-            $dates[$i]['start'] = $start;
-            $dates[$i]['end'] = $end;
-        }
-
-        //Return the dates back to the calling function
-        return $dates;
-    }
-}

app/Models/Blacklist/BlacklistEntity.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Models\Blacklist;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BlacklistEntity extends Model
+{
+    //Table Name
+    public $table = 'alliance_blacklist';
+
+    //Timestamps
+    public $timestamps = true;
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'entity_id',
+        'entity_name',
+        'entity_type',
+        'reason',
+        'alts',
+        'lister_id',
+        'lister_name',
+    ];
+}

app/Models/Charcter/CharacterClone.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Models\Character;
-
-use Illuminate\Database\Eloquent\Model;
-
-class CharacterClone extends Model
-{
-    // Table Name
-    public $table = 'clones';
-
-    // Timestamps
-    public $timestamps = true;
-
-    /**
-     * The attributes that are mass assignable
-     * 
-     * @var array
-     */
-    protected $fillable = [
-        'character_id',
-        'active',
-    ];
-}

app/Models/Contracts/AcceptedBid.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Models\Contracts;
-
-use Illuminate\Database\Eloquent\Model;
-
-class AcceptedBid extends Model
-{
-    // Table Name
-    public $table = 'accepted_bids';
-
-    //Timestamps
-    public $timestamps = true;
-
-    /**
-     * The attributes that are mass assignable
-     * 
-     * @var array
-     */
-    protected $fillable = [
-        'contract_id',
-        'bid_id',
-        'bid_amount',
-        'notes',
-    ];
-
-    public function Contract() {
-        return $this->belongsTo(Contract::class);
-    }
-}

app/Models/Contracts/Bid.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Models\Contracts;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Bid extends Model
-{
-    // Table Name
-    public $table = 'contract_bids';
-
-    // Timestamps
-    public $timestamps = true;
-
-    /**
-     * The attributes that are mass assignable
-     * 
-     * @var array
-     */
-    protected $fillable = [
-        'contract_id',
-        'bid_amount',
-        'character_name',
-        'character_id',
-        'corporation_name',
-        'corporation_id',
-        'notes',
-    ];
-
-    protected $guarded = [];
-
-    public function ContractId() {
-        return $this->hasOne('App\Models\Contracts\Contract', 'id', 'contract_id');
-    }
-
-    public function Contract() {
-        return $this->belongsTo(Contract::class);
-    }
-}

app/Models/Contracts/Contract.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Models\Contracts;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Contract extends Model
-{
-     // Table Name
-     public $table = 'contracts';
-
-     // Timestamps
-     public $timestamps = true;
- 
-     /**
-      * The attributes that are mass assignable
-      * 
-      * @var array
-      */
-     protected $fillable = [
-         'title',
-         'type',
-         'end_date',
-         'body',
-         'final_cost',
-         'finished',
-     ];
-
-     //One-to-Many relationship for the bids on a contract
-     public function Bids() {
-         return $this->hasMany('App\Models\Contracts\Bid', 'contract_id', 'id');
-     }
-
-     //One-to-One relationship for the accepted bid.
-     public function AcceptedBid() {
-         return $this->hasOne('App\Models\Contracts\AcceptedBid', 'contract_id', 'id');
-     }
-}

app/Models/Contracts/SupplyChainBid.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models\Contracts;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupplyChainBid extends Model
+{
+    //Table Name
+    public $table = 'supply_chain_bids';
+
+    // Timestamps
+    public $timestamps = true;
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'contract_id',
+        'bid_amount',
+        'entity_id',
+        'entity_name',
+        'entity_type',
+        'bid_type',
+        'bid_note',
+    ];
+
+    //Relationships
+    public function ContractId() {
+        return $this->hasOne('App\Models\Contracts\SupplyChainContract', 'contract_id', 'contract_id');
+    }
+
+    public function Contract() {
+        return $this->belongsTo(SupplyChainContract::class);
+    }
+
+    //Model functions
+    public function getContractId() {
+        return $this->contract_id;
+    }
+}

app/Models/Contracts/SupplyChainContract.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Models\Contracts;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupplyChainContract extends Model
+{
+    //Table Name
+    public $table = 'supply_chain_contracts';
+
+    //Timestamps
+    public $timestamps = true;
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'issuer_id',
+        'issuer_name',
+        'title',
+        'end_date',
+        'delivery_by',
+        'body',
+        'state',
+        'final_cost',
+    ];
+
+    //Relationship
+    public function Bids() {
+        return $this->hasMany('App\Models\Contracts\SupplyChainBid', 'contract_id', 'id');
+    }
+
+
+}

app/Models/Corporation/AllianceCorp.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Models\Corporation;
-
-use Illuminate\Database\Eloquent\Model;
-
-class AllianceCorp extends Model
-{
-    /**
-     * Table Name
-     */
-    protected $table = 'AllianceCorps';
-
-    /**
-     * Timestamps
-     */
-    public $timestamps = true;
-
-    /**
-     * The attributes that are mass assignable
-     * 
-     * @var array
-     */
-    protected $fillable = [
-        'corporation_id',
-        'name',
-    ];
-}

app/Models/Corporation/CorpStructure.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Models\Corporation;
-
-use Illuminate\Database\Eloquent\Model;
-
-class CorpStructure extends Model
-{
-    /**
-     * Table Name
-     */
-    protected $table = 'CorpStructures';
-
-    /**
-     * Timestamps
-     */
-    public $timestamps = true;
-
-    /**
-     * The attributes that are mass assignable
-     * 
-     * @var array
-     */
-    protected $fillable = [
-        'character_id',
-        'corporation_id',
-        'corporation_name',
-        'region',
-        'system',
-        'structure_name',
-        'structure_type',
-    ];
-}

app/Models/Corporation/CorpTaxRatio.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Models\Corporation;
-
-use Illuminate\Database\Eloquent\Model;
-
-class CorpTaxRatio extends Model
-{
-    /**
-     * Table Name
-     */
-    protected $table = 'corp_tax_ratios';
-
-    /**
-     * Timestamps
-     */
-    public $timestamps = true;
-
-    /**
-     * The attributes that are mass assignable
-     * 
-     * @var array
-     */
-    protected $fillable = [
-        'corporation_id',
-        'corporation_name',
-        'structure_type',
-        'ratio',
-    ];
-}

app/Models/Corporation/HoldingCorpJournal.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Models\Corporation;
-
-use Illuminate\Database\Eloquent\Model;
-
-class HoldingCorpJournal extends Model
-{
-    // Table Name
-    protected $table = 'HoldingCorpFinancesJournal';
-
-    // Timestamps
-    public $timestamps = false;
-}