diff --git a/app/Jobs/Commands/Data/PurgeUsers.php b/app/Jobs/Commands/Data/PurgeUsers.php index c908381f6..d280c5fa2 100644 --- a/app/Jobs/Commands/Data/PurgeUsers.php +++ b/app/Jobs/Commands/Data/PurgeUsers.php @@ -190,4 +190,13 @@ class PurgeUsers implements ShouldQueue } } } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['Data', 'PurgeUsers']; + } } diff --git a/app/Jobs/Commands/Eve/ItemPricesUpdate.php b/app/Jobs/Commands/Eve/ItemPricesUpdate.php index e8531842b..ae771e79f 100644 --- a/app/Jobs/Commands/Eve/ItemPricesUpdate.php +++ b/app/Jobs/Commands/Eve/ItemPricesUpdate.php @@ -37,4 +37,13 @@ class ItemPricesUpdate implements ShouldQueue $moonHelper->FetchNewPrices(); } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['Eve', 'ItemPricesUpdate']; + } } diff --git a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php index 2da405a0e..3d73942d1 100644 --- a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php +++ b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php @@ -62,4 +62,13 @@ class UpdateAllianceWalletJournalJob implements ShouldQueue UpdateAllianceWalletJournalPage::dispatch(1, $config['primary'], $i)->onQueue('journal'); } } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['UpdateAllianceWalletJournal', 'Finances']; + } } diff --git a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalPage.php b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalPage.php index 8312a2554..1f91ab0d6 100644 --- a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalPage.php +++ b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalPage.php @@ -77,7 +77,7 @@ class UpdateAllianceWalletJournalPage implements ShouldQueue * the failed page is the first page. */ try { - $journals = $esi->page($currentPage) + $journals = $esi->page($this->page) ->invoke('get', '/corporations/{corporation_id}/wallets/{division}/journal/', [ 'corporation_id' => $corpId, 'division' => $division, @@ -141,4 +141,13 @@ class UpdateAllianceWalletJournalPage implements ShouldQueue //Return as completed return 0; } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['UpdateAllianceWalletJournalPage', 'Finances']; + } } diff --git a/app/Jobs/Commands/Finances/UpdateItemPrices.php b/app/Jobs/Commands/Finances/UpdateItemPrices.php index 471fe3b49..840573951 100644 --- a/app/Jobs/Commands/Finances/UpdateItemPrices.php +++ b/app/Jobs/Commands/Finances/UpdateItemPrices.php @@ -53,4 +53,13 @@ class UpdateItemPrices implements ShouldQueue //Fetch new prices from fuzzwork.co.uk for the item pricing schemes $moonHelper->FetchNewPrices(); } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['UpdateItemPrices', 'Finances']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php index 0980d48f7..e1894c570 100644 --- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php +++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php @@ -151,4 +151,13 @@ class FetchMiningTaxesLedgers implements ShouldQueue } while($currentPage <= $totalPages); } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['FetchMiningTaxesLedgers', 'MiningTaxes', 'MiningTaxesLedgers']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php index e114efe9a..834f6489a 100644 --- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php +++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php @@ -57,6 +57,7 @@ class FetchMiningTaxesObservers implements ShouldQueue //Declare variables $config = config('esi'); $lookup = new LookupHelper; + $sHelper = new StructureHelper($config['primary'], $config['corporation']); $esiHelper = new Esi; //Check for the esi scope @@ -66,6 +67,12 @@ class FetchMiningTaxesObservers implements ShouldQueue return; } + if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-universe.read_structures.v1')) { + Log::critical('Esi scope esi-universe.read_structures.v1 was not found for FetchMiningTaxesObserversJob.'); + print("Esi scopes not found 2"); + return; + } + $char = $lookup->GetCharacterInfo($config['primary']); //Get the refresh token for the character @@ -82,23 +89,36 @@ class FetchMiningTaxesObservers implements ShouldQueue //Run through the mining observers, and add them to the database foreach($resp as $observer) { if($observer->observer_id > 1030000000000) { + //Get the observer name from esi as well + $structureInfo = $sHelper->GetStructureInfo($observer->observer_id); + + //See if the observer is found in the database $found = Observer::where([ 'observer_id' => $observer->observer_id, ])->count(); + //If found, then update the structure if($found > 0) { + Observer::where([ 'observer_id' => $observer->observer_id, ])->update([ 'observer_id' => $observer->observer_id, 'observer_type' => $observer->observer_type, + 'observer_name' => $observerName, 'last_updated' => $observer->last_updated, + 'solar_system_id' => $structureInfo->solar_system_id, + 'solar_system_name' => $sHelper->GetSolarSystemName($structureInfo->solar_system_id), ]); } else { + //Add a new observer into the observer table $newObs = new Observer; $newObs->observer_id = $observer->observer_id; $newObs->observer_type = $observer->observer_type; + $newObs->observer_name = $observerName; $newObs->last_updated = $observer->last_updated; + $newObs->solar_system_id = $structureInfo->solar_system_id; + $newObs->solar_system_name = $sHelper->GetSolarSystemName($structureInfo->solar_system_id); $newObs->save(); } } @@ -179,6 +199,6 @@ class FetchMiningTaxesObservers implements ShouldQueue * @var array */ public function tags() { - return ['FetchMiningObservers']; + return ['FetchMiningObservers', 'MiningTaxes']; } } diff --git a/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php b/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php index 2a2ff0810..0e34f9320 100644 --- a/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php +++ b/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php @@ -65,4 +65,13 @@ class PreFetchMiningTaxesLedgers implements ShouldQueue FetchMiningTaxesLedgers::dispatch($config['primary'], $config['corporation'], $obs->observer_id)->onQueue('miningtaxes'); } } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['PreFetchMiningTaxesLedgers', 'MiningTaxes', 'MiningTaxesLedgers']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgers.php b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgers.php index 0627bc163..053fa4c18 100644 --- a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgers.php +++ b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgers.php @@ -120,4 +120,13 @@ class ProcessMiningTaxesLedgers implements ShouldQueue return 0; } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['ProcessMiningTaxesLedgers', 'MiningTaxes', 'MiningTaxesLedgers']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPayments.php b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPayments.php index b78905acb..ebee72b33 100644 --- a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPayments.php +++ b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPayments.php @@ -120,4 +120,13 @@ class ProcessMiningTaxesPayments implements ShouldQueue } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['ProcessMiningTaxesPayments', 'MiningTaxes', 'Payments']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoices.php b/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoices.php index cfb2d6971..54a6b02dc 100644 --- a/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoices.php +++ b/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoices.php @@ -200,17 +200,22 @@ class SendMiningTaxesInvoices implements ShouldQueue private function CreateInvoice($charId, $ledgers, &$mailDelay) { $invoice = array(); $ores = array(); + $characters = array(); $totalPrice = 0.00; $body = null; $lookup = new LookupHelper; if(sizeof($ledgers) > 0) { foreach($ledgers as $ledger) { - if(!isset($ores[$row['type_id']])) { - $ores[$row['type_id']] = 0; + if(!isset($ores[$ledger['type_id']])) { + $ores[$ledger['type_id']] = 0; + } + $ores[$ledger['type_id']] = $ores[$ledger['type_id']] + $ledger['quantity']; + $totalPrice = $totalPrice + $ledger['amount']; + + if(!isset($characters[$ledger['character_name']])) { + $characters[$ledger['character_name']] = $ledger['character_name']; } - $ores[$row['type_id']] = $ores[$row['type_id']] + $row['quantity']; - $totalPrice = $totalPrice + $row['amount']; } $invoiceAmount = round(($totalPrice * $config['mining_tax']), 2); @@ -224,7 +229,7 @@ class SendMiningTaxesInvoices implements ShouldQueue $numberMiningTax = number_format(($config['mining_tax'] * 100.00), 2, ".", ","); //Create the mail body - $body .= "Dear Miner,

"; + $body .= "Dear " . $charName . ",

"; $body .= "Mining Taxes are due for the following ores mined from alliance moons:
"; foreach($ores as $ore => $quantity) { $oreName = $lookup->ItemIdToName($ore); @@ -242,11 +247,16 @@ class SendMiningTaxesInvoices implements ShouldQueue $body .= $oreName . ": " . number_format(round($quantity * $config['mining_tax']), 0, ".", ",") . "
"; } $body .= "
"; + $body .= "Characters Processed:
"; + foreach($characters as $character) { + $body .= $character['character_name'] . "
"; + } + $body .= "
"; $body .= "
Sincerely,
Warped Intentions Leadership
"; //Check if the mail body is greater than 2000 characters. If greater than 2,000 characters, then if(strlen($body) > 2000) { - $body = "Dear Miner,

"; + $body = "Dear " . $charName . "

"; $body .= "Total Value of Ore Mined: " . number_format($totalPrice, 2, ".", ",") . " ISK."; $body .= "

"; $body .= "Please remit " . number_format($invoiceAmount, 2, ".", ",") . " ISK to Spatial Forces by " . $dateDue . "
"; @@ -303,12 +313,21 @@ class SendMiningTaxesInvoices implements ShouldQueue 'main_id' => $charId, ])->get(); + $altCount = UserAlt::where([ + 'main_id' => $charId, + ])->count(); + $rows = Ledger::where([ 'character_id' => $charId, 'invoiced' => 'No', ])->get(); - if($rows->count() > 0) { + $mainCount = Ledger::where([ + 'character_id' => $charId, + 'invoiced' => 'No', + ])->count(); + + if($mainCount > 0) { foreach($rows as $row) { array_push($ledgers, [ 'character_id' => $row->character_id, @@ -325,26 +344,33 @@ class SendMiningTaxesInvoices implements ShouldQueue } } - if($alts->count() > 0) { + if($altCount > 0) { foreach($alts as $alt) { $rows = Ledger::where([ 'character_id' => $alt->character_id, 'invoiced' => 'No', ])->get(); - - foreach($rows as $row) { - array_push($ledgers, [ - 'character_id' => $row->character_id, - 'character_name' => $row->character_name, - 'observer_id' => $row->observer_id, - 'last_updated' => $row->last_updated, - 'type_id' => $row->type_id, - 'ore_name' => $row->ore_name, - 'quantity' => $row->quantity, - 'amount' => $row->amount, - 'invoiced' => $row->invoiced, - 'invoice_id' => $row->invoice_id, - ]); + + $rowCount = Ledger::where([ + 'character_id' => $alt->character_id, + 'invoiced' => 'No', + ])->count(); + + if($rowCount > 0) { + foreach($rows as $row) { + array_push($ledgers, [ + 'character_id' => $row->character_id, + 'character_name' => $row->character_name, + 'observer_id' => $row->observer_id, + 'last_updated' => $row->last_updated, + 'type_id' => $row->type_id, + 'ore_name' => $row->ore_name, + 'quantity' => $row->quantity, + 'amount' => $row->amount, + 'invoiced' => $row->invoiced, + 'invoice_id' => $row->invoice_id, + ]); + } } } } @@ -352,4 +378,13 @@ class SendMiningTaxesInvoices implements ShouldQueue //Return the ledgers return $ledgers; } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['MiningTaxes', 'SendMiningTaxesInvoices', 'Invoices']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices15th.php b/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices15th.php index 6888930f5..113db484f 100644 --- a/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices15th.php +++ b/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices15th.php @@ -81,4 +81,13 @@ class UpdateMiningTaxesLateInvoices15th implements ShouldQueue } } } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['UpdateMiningTaxesLateInvoices', 'MiningTaxes', 'Invoices']; + } } diff --git a/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices1st.php b/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices1st.php index 250c891bc..c8df7fa64 100644 --- a/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices1st.php +++ b/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices1st.php @@ -81,4 +81,13 @@ class UpdateMiningTaxesLateInvoices1st implements ShouldQueue } } } + + /** + * Set the tags for Horzion + * + * @var array + */ + public function tags() { + return ['UpdateMiningTaxesLateInvoices', 'MiningTaxes', 'Invoices']; + } } diff --git a/app/Library/Helpers/StructureHelper.php b/app/Library/Helpers/StructureHelper.php index 515fd3fe8..39fcbcd8e 100644 --- a/app/Library/Helpers/StructureHelper.php +++ b/app/Library/Helpers/StructureHelper.php @@ -73,9 +73,8 @@ class StructureHelper { } } - private function GetSolarSystemName($systemId) { + public function GetSolarSystemName($systemId) { //Declare some variables - $esiHelper = new Esi; $lookup = new LookupHelper; $solar = $lookup->SystemIdToName($systemId); diff --git a/app/Models/MiningTax/Observer.php b/app/Models/MiningTax/Observer.php index e9bc5247b..27c134d52 100644 --- a/app/Models/MiningTax/Observer.php +++ b/app/Models/MiningTax/Observer.php @@ -25,5 +25,7 @@ class Observer extends Model 'observer_id', 'observer_type', 'observer_name', + 'solar_system_name', + 'solar_system_id', ]; } diff --git a/app/Models/MiningTax/RentalInvoice.php b/app/Models/MiningTax/RentalInvoice.php new file mode 100644 index 000000000..1e7ea9bf5 --- /dev/null +++ b/app/Models/MiningTax/RentalInvoice.php @@ -0,0 +1,10 @@ +dateTime('last_updated'); $table->unsignedBigInteger('observer_id'); $table->string('observer_type'); - $table->string('observer_name'); $table->timestamps(); }); } diff --git a/database/migrations/2021_04_24_095557_modify_mining_tax_tables.php b/database/migrations/2021_04_24_095557_modify_mining_tax_tables.php new file mode 100644 index 000000000..d65db75a7 --- /dev/null +++ b/database/migrations/2021_04_24_095557_modify_mining_tax_tables.php @@ -0,0 +1,44 @@ +string('observer_name')->nullable(); + $table->unsignedBigInteger('solar_system_id')->nullable(); + $table->string('solar_system_name')->nullable(); + $table->enum('corp_rented', [ + 'No', + 'Yes', + ])->default('No'); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + //Drop the newly created columns + Schema::table('alliance_mining_tax_observers', function(Blueprint $table) { + $table->dropColumn(['observer_name']); + $table->dropColumn(['solar_system_id']); + $table->dropColumn(['solar_system_name']); + $table->dropColumn(['corp_rented']); + }); + } +} diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 247294d66..1a58957d2 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -42,8 +42,6 @@ namespace Composer\Autoload; */ class ClassLoader { - private $vendorDir; - // PSR-4 private $prefixLengthsPsr4 = array(); private $prefixDirsPsr4 = array(); @@ -59,13 +57,6 @@ class ClassLoader private $missingClasses = array(); private $apcuPrefix; - private static $registeredLoaders = array(); - - public function __construct($vendorDir = null) - { - $this->vendorDir = $vendorDir; - } - public function getPrefixes() { if (!empty($this->prefixesPsr0)) { @@ -309,17 +300,6 @@ class ClassLoader public function register($prepend = false) { spl_autoload_register(array($this, 'loadClass'), true, $prepend); - - if (null === $this->vendorDir) { - return; - } - - if ($prepend) { - self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; - } else { - unset(self::$registeredLoaders[$this->vendorDir]); - self::$registeredLoaders[$this->vendorDir] = $this; - } } /** @@ -328,10 +308,6 @@ class ClassLoader public function unregister() { spl_autoload_unregister(array($this, 'loadClass')); - - if (null !== $this->vendorDir) { - unset(self::$registeredLoaders[$this->vendorDir]); - } } /** @@ -391,16 +367,6 @@ class ClassLoader return $file; } - /** - * Returns the currently registered loaders indexed by their corresponding vendor directories. - * - * @return self[] - */ - public static function getRegisteredLoaders() - { - return self::$registeredLoaders; - } - private function findFileWithExtension($class, $ext) { // PSR-4 lookup diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 378d3c8c2..ebdae4c37 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -16,12 +16,10 @@ return array( 'App\\Console\\Commands\\Files\\MoonFormatter' => $baseDir . '/app/Console/Commands/Files/MoonFormatter.php', 'App\\Console\\Commands\\Files\\UpdateItemCompositionFromSDECommand' => $baseDir . '/app/Console/Commands/Files/UpdateItemCompositionFromSDECommand.php', 'App\\Console\\Commands\\Finances\\UpdateAllianceWalletJournal' => $baseDir . '/app/Console/Commands/Finances/UpdateAllianceWalletJournal.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesDataCleanup' => $baseDir . '/app/Console/Commands/MiningTaxes/MiningTaxesDataCleanup.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesInvoices' => $baseDir . '/app/Console/Commands/MiningTaxes/MiningTaxesInvoices.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesInvoicesNew' => $baseDir . '/app/Console/Commands/MiningTaxes/MiningTaxesInvoicesNew.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesLedgers' => $baseDir . '/app/Console/Commands/MiningTaxes/MiningTaxesLedgers.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesObservers' => $baseDir . '/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesPayments' => $baseDir . '/app/Console/Commands/MiningTaxes/MiningTaxesPayments.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteMiningTaxesLedgersCommand' => $baseDir . '/app/Console/Commands/MiningTaxes/ExecuteMiningTaxesLedgersCommand.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteMiningTaxesObserversCommand' => $baseDir . '/app/Console/Commands/MiningTaxes/ExecuteMiningTaxesObserversCommand.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteProcesssMiningTaxesPaymentsCommand' => $baseDir . '/app/Console/Commands/MiningTaxes/ExecuteProcesssMiningTaxesPaymentsCommand.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteSendMiningTaxesInvoiceCommand' => $baseDir . '/app/Console/Commands/MiningTaxes/ExecuteSendMiningTaxesInvoiceCommand.php', 'App\\Console\\Commands\\Structures\\GetStructuresCommand' => $baseDir . '/app/Console/Commands/Structures/GetStructuresCommand.php', 'App\\Console\\Commands\\SupplyChain\\EndSupplyChainContractCommand' => $baseDir . '/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php', 'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php', @@ -38,6 +36,8 @@ return array( 'App\\Http\\Controllers\\Logistics\\FuelController' => $baseDir . '/app/Http/Controllers/Logistics/FuelController.php', 'App\\Http\\Controllers\\MiningTaxes\\MiningTaxesAdminController' => $baseDir . '/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php', 'App\\Http\\Controllers\\MiningTaxes\\MiningTaxesController' => $baseDir . '/app/Http/Controllers/MiningTaxes/MiningTaxesController.php', + 'App\\Http\\Controllers\\MoonRental\\MoonRentalAdminController' => $baseDir . '/app/Http/Controllers/MoonRental/MoonRentalAdminController.php', + 'App\\Http\\Controllers\\MoonRental\\MoonRentalController' => $baseDir . '/app/Http/Controllers/MoonRental/MoonRentalController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => $baseDir . '/app/Http/Controllers/SRP/SRPAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPController' => $baseDir . '/app/Http/Controllers/SRP/SRPController.php', 'App\\Http\\Controllers\\Test\\TestController' => $baseDir . '/app/Http/Controllers/Test/TestController.php', @@ -51,16 +51,23 @@ return array( 'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php', 'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', - 'App\\Jobs\\Commands\\Data\\PurgeUsersJob' => $baseDir . '/app/Jobs/Commands/Data/PurgeUsersJob.php', - 'App\\Jobs\\Commands\\Eve\\ItemPricesUpdateJob' => $baseDir . '/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php', - 'App\\Jobs\\Commands\\Eve\\ProcessSendEveMailJob' => $baseDir . '/app/Jobs/Commands/Eve/ProcessSendEveMailJob.php', - 'App\\Jobs\\Commands\\Eve\\ProcessSendEveMailJobRL' => $baseDir . '/app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php', - 'App\\Jobs\\Commands\\Finances\\UpdateItemPricesJob' => $baseDir . '/app/Jobs/Commands/Finances/UpdateItemPricesJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesLedgersJob' => $baseDir . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesObserversJob' => $baseDir . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesLedgersJob' => $baseDir . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesPaymentsJob' => $baseDir . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\SendMiningTaxesInvoicesJob' => $baseDir . '/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php', + 'App\\Http\\Requests\\Request' => $baseDir . '/app/Http/Requests/Request.php', + 'App\\Jobs\\Commands\\Data\\PurgeUsers' => $baseDir . '/app/Jobs/Commands/Data/PurgeUsers.php', + 'App\\Jobs\\Commands\\Eve\\ItemPricesUpdate' => $baseDir . '/app/Jobs/Commands/Eve/ItemPricesUpdate.php', + 'App\\Jobs\\Commands\\Eve\\SendEveMail' => $baseDir . '/app/Jobs/Commands/Eve/SendEveMail.php', + 'App\\Jobs\\Commands\\Eve\\SendEveMailRL' => $baseDir . '/app/Jobs/Commands/Eve/SendEveMailRL.php', + 'App\\Jobs\\Commands\\Finances\\UpdateAllianceWalletJournalJob' => $baseDir . '/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php', + 'App\\Jobs\\Commands\\Finances\\UpdateAllianceWalletJournalPage' => $baseDir . '/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalPage.php', + 'App\\Jobs\\Commands\\Finances\\UpdateItemPrices' => $baseDir . '/app/Jobs/Commands/Finances/UpdateItemPrices.php', + 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesLedgers' => $baseDir . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesObservers' => $baseDir . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\PreFetchMiningTaxesLedgers' => $baseDir . '/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesLedgers' => $baseDir . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesPayments' => $baseDir . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPayments.php', + 'App\\Jobs\\Commands\\MiningTaxes\\SendMiningTaxesInvoices' => $baseDir . '/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoices.php', + 'App\\Jobs\\Commands\\MiningTaxes\\SendMiningTaxesInvoicesOld' => $baseDir . '/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesOld.php', + 'App\\Jobs\\Commands\\MiningTaxes\\UpdateMiningTaxesLateInvoices15th' => $baseDir . '/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices15th.php', + 'App\\Jobs\\Commands\\MiningTaxes\\UpdateMiningTaxesLateInvoices1st' => $baseDir . '/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices1st.php', 'App\\Jobs\\Commands\\SupplyChain\\EndSupplyChainContractJob' => $baseDir . '/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php', 'App\\Library\\Esi\\Esi' => $baseDir . '/app/Library/Esi/Esi.php', 'App\\Library\\Helpers\\AssetHelper' => $baseDir . '/app/Library/Helpers/AssetHelper.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index c5da339b2..788ec4b8c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -25,7 +25,7 @@ class ComposerAutoloaderInitc3f953f8a7291d41a76e1664339777c9 require __DIR__ . '/platform_check.php'; spl_autoload_register(array('ComposerAutoloaderInitc3f953f8a7291d41a76e1664339777c9', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(); spl_autoload_unregister(array('ComposerAutoloaderInitc3f953f8a7291d41a76e1664339777c9', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 8a8bdfcf8..5348fcdeb 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -566,12 +566,10 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Console\\Commands\\Files\\MoonFormatter' => __DIR__ . '/../..' . '/app/Console/Commands/Files/MoonFormatter.php', 'App\\Console\\Commands\\Files\\UpdateItemCompositionFromSDECommand' => __DIR__ . '/../..' . '/app/Console/Commands/Files/UpdateItemCompositionFromSDECommand.php', 'App\\Console\\Commands\\Finances\\UpdateAllianceWalletJournal' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/UpdateAllianceWalletJournal.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesDataCleanup' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/MiningTaxesDataCleanup.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesInvoices' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/MiningTaxesInvoices.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesInvoicesNew' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/MiningTaxesInvoicesNew.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesLedgers' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/MiningTaxesLedgers.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesObservers' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php', - 'App\\Console\\Commands\\MiningTaxes\\MiningTaxesPayments' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/MiningTaxesPayments.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteMiningTaxesLedgersCommand' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/ExecuteMiningTaxesLedgersCommand.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteMiningTaxesObserversCommand' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/ExecuteMiningTaxesObserversCommand.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteProcesssMiningTaxesPaymentsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/ExecuteProcesssMiningTaxesPaymentsCommand.php', + 'App\\Console\\Commands\\MiningTaxes\\ExecuteSendMiningTaxesInvoiceCommand' => __DIR__ . '/../..' . '/app/Console/Commands/MiningTaxes/ExecuteSendMiningTaxesInvoiceCommand.php', 'App\\Console\\Commands\\Structures\\GetStructuresCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Structures/GetStructuresCommand.php', 'App\\Console\\Commands\\SupplyChain\\EndSupplyChainContractCommand' => __DIR__ . '/../..' . '/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php', 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php', @@ -588,6 +586,8 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Controllers\\Logistics\\FuelController' => __DIR__ . '/../..' . '/app/Http/Controllers/Logistics/FuelController.php', 'App\\Http\\Controllers\\MiningTaxes\\MiningTaxesAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/MiningTaxes/MiningTaxesAdminController.php', 'App\\Http\\Controllers\\MiningTaxes\\MiningTaxesController' => __DIR__ . '/../..' . '/app/Http/Controllers/MiningTaxes/MiningTaxesController.php', + 'App\\Http\\Controllers\\MoonRental\\MoonRentalAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonRental/MoonRentalAdminController.php', + 'App\\Http\\Controllers\\MoonRental\\MoonRentalController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonRental/MoonRentalController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPController.php', 'App\\Http\\Controllers\\Test\\TestController' => __DIR__ . '/../..' . '/app/Http/Controllers/Test/TestController.php', @@ -601,16 +601,23 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php', 'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', - 'App\\Jobs\\Commands\\Data\\PurgeUsersJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Data/PurgeUsersJob.php', - 'App\\Jobs\\Commands\\Eve\\ItemPricesUpdateJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php', - 'App\\Jobs\\Commands\\Eve\\ProcessSendEveMailJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/ProcessSendEveMailJob.php', - 'App\\Jobs\\Commands\\Eve\\ProcessSendEveMailJobRL' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php', - 'App\\Jobs\\Commands\\Finances\\UpdateItemPricesJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Finances/UpdateItemPricesJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesLedgersJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesObserversJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesLedgersJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesPaymentsJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php', - 'App\\Jobs\\Commands\\MiningTaxes\\SendMiningTaxesInvoicesJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php', + 'App\\Http\\Requests\\Request' => __DIR__ . '/../..' . '/app/Http/Requests/Request.php', + 'App\\Jobs\\Commands\\Data\\PurgeUsers' => __DIR__ . '/../..' . '/app/Jobs/Commands/Data/PurgeUsers.php', + 'App\\Jobs\\Commands\\Eve\\ItemPricesUpdate' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/ItemPricesUpdate.php', + 'App\\Jobs\\Commands\\Eve\\SendEveMail' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/SendEveMail.php', + 'App\\Jobs\\Commands\\Eve\\SendEveMailRL' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/SendEveMailRL.php', + 'App\\Jobs\\Commands\\Finances\\UpdateAllianceWalletJournalJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php', + 'App\\Jobs\\Commands\\Finances\\UpdateAllianceWalletJournalPage' => __DIR__ . '/../..' . '/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalPage.php', + 'App\\Jobs\\Commands\\Finances\\UpdateItemPrices' => __DIR__ . '/../..' . '/app/Jobs/Commands/Finances/UpdateItemPrices.php', + 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesLedgers' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\FetchMiningTaxesObservers' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\PreFetchMiningTaxesLedgers' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesLedgers' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgers.php', + 'App\\Jobs\\Commands\\MiningTaxes\\ProcessMiningTaxesPayments' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPayments.php', + 'App\\Jobs\\Commands\\MiningTaxes\\SendMiningTaxesInvoices' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoices.php', + 'App\\Jobs\\Commands\\MiningTaxes\\SendMiningTaxesInvoicesOld' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesOld.php', + 'App\\Jobs\\Commands\\MiningTaxes\\UpdateMiningTaxesLateInvoices15th' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices15th.php', + 'App\\Jobs\\Commands\\MiningTaxes\\UpdateMiningTaxesLateInvoices1st' => __DIR__ . '/../..' . '/app/Jobs/Commands/MiningTaxes/UpdateMiningTaxesLateInvoices1st.php', 'App\\Jobs\\Commands\\SupplyChain\\EndSupplyChainContractJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php', 'App\\Library\\Esi\\Esi' => __DIR__ . '/../..' . '/app/Library/Esi/Esi.php', 'App\\Library\\Helpers\\AssetHelper' => __DIR__ . '/../..' . '/app/Library/Helpers/AssetHelper.php',