From c201578191417851cb673ad01c735a4ae7926656 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Wed, 11 Dec 2019 21:57:38 -0600 Subject: [PATCH] lookup helper --- app/Http/Controllers/Blacklist/BlacklistController.php | 4 ++-- app/Http/Controllers/Contracts/ContractController.php | 4 ++-- app/Http/Controllers/Flex/FlexAdminController.php | 4 ++-- .../Controllers/Logistics/StructureRequestController.php | 4 ++-- app/Http/Controllers/Moons/MoonLedgerController.php | 6 +++--- app/Http/Controllers/Moons/MoonsAdminController.php | 6 +++--- app/Http/Controllers/Wiki/WikiController.php | 4 ++-- app/Library/Finances/Helper/FinanceHelper.php | 8 ++++---- .../Lookups/{NewLookupHelper.php => LookupHelper.php} | 4 ++-- app/Library/Moons/MiningLedgerHelper.php | 4 ++-- vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_static.php | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) rename app/Library/Lookups/{NewLookupHelper.php => LookupHelper.php} (99%) diff --git a/app/Http/Controllers/Blacklist/BlacklistController.php b/app/Http/Controllers/Blacklist/BlacklistController.php index ebd41c9ca..77a9db88c 100644 --- a/app/Http/Controllers/Blacklist/BlacklistController.php +++ b/app/Http/Controllers/Blacklist/BlacklistController.php @@ -9,7 +9,7 @@ use Log; use DB; //Library -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //Models use App\Models\Blacklist\BlacklistUser; @@ -47,7 +47,7 @@ class BlacklistController extends Controller ]); //Create the library variable - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; //See if the character is already on the list $count = BlacklistUser::where([ diff --git a/app/Http/Controllers/Contracts/ContractController.php b/app/Http/Controllers/Contracts/ContractController.php index 9cf8d1176..0b8ee34d3 100644 --- a/app/Http/Controllers/Contracts/ContractController.php +++ b/app/Http/Controllers/Contracts/ContractController.php @@ -8,7 +8,7 @@ use DB; use Carbon\Carbon; //Libraries -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //use App\Library\Contracts\ContractHelper; //Models @@ -207,7 +207,7 @@ class ContractController extends Controller ]); //Delcare some class variables we will need - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; $amount = 0.00; diff --git a/app/Http/Controllers/Flex/FlexAdminController.php b/app/Http/Controllers/Flex/FlexAdminController.php index 902a648fb..e1e802220 100644 --- a/app/Http/Controllers/Flex/FlexAdminController.php +++ b/app/Http/Controllers/Flex/FlexAdminController.php @@ -13,7 +13,7 @@ use Carbon\Carbon; use App\Models\Flex\FlexStructure; //Library -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; use App\Library\Esi\Esi; class FlexAdminController extends Controller @@ -56,7 +56,7 @@ class FlexAdminController extends Controller ]); //Delcare variables and classes - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; //From the character name find the character id $charId = $lookup->CharacterNameToId($request->requestor_name); diff --git a/app/Http/Controllers/Logistics/StructureRequestController.php b/app/Http/Controllers/Logistics/StructureRequestController.php index 7227bdccb..86fb6bf11 100644 --- a/app/Http/Controllers/Logistics/StructureRequestController.php +++ b/app/Http/Controllers/Logistics/StructureRequestController.php @@ -9,7 +9,7 @@ use DB; use Log; //Library Helpers -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //Models @@ -35,7 +35,7 @@ class StructureRequestController extends Controller 'requester' => 'required', ]); - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; $requesterId = $lookup->CharacterNameToId($request->requester); $corporationId = $lookup->CorporationNameToId($request->corporation_name); diff --git a/app/Http/Controllers/Moons/MoonLedgerController.php b/app/Http/Controllers/Moons/MoonLedgerController.php index bb614dfa0..deaed9c7f 100644 --- a/app/Http/Controllers/Moons/MoonLedgerController.php +++ b/app/Http/Controllers/Moons/MoonLedgerController.php @@ -12,7 +12,7 @@ use DB; use Seat\Eseye\Exceptions\RequestFailedException; use App\Library\Esi\Esi; use App\Library\Structures\StructureHelper; -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //App Models use App\Models\Esi\EsiToken; @@ -33,7 +33,7 @@ class MoonLedgerController extends Controller //Declare variables $structures = array(); $esiHelper = new Esi; - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; $response = null; $structureInfo = null; @@ -84,7 +84,7 @@ class MoonLedgerController extends Controller public function displayLedger(Request $request) { //Declare variables $esiHelper = new Esi; - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; $mining = array(); $temp = array(); diff --git a/app/Http/Controllers/Moons/MoonsAdminController.php b/app/Http/Controllers/Moons/MoonsAdminController.php index 1625bb307..cda19f821 100644 --- a/app/Http/Controllers/Moons/MoonsAdminController.php +++ b/app/Http/Controllers/Moons/MoonsAdminController.php @@ -20,7 +20,7 @@ use App\Models\MoonRent\MoonRental; //Library use App\Library\Moons\MoonCalc; use App\Library\Esi\Esi; -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; class MoonsAdminController extends Controller { @@ -34,7 +34,7 @@ class MoonsAdminController extends Controller public function displayMoonsAdmin() { $this->middleware('role:Admin'); - $lookupHelper = new NewLookupHelper; + $lookupHelper = new LookupHelper; $contact = ''; $paid = ''; $rentalEnd = ''; @@ -213,7 +213,7 @@ class MoonsAdminController extends Controller //Declare some static variables as needed $moonCalc = new MoonCalc; - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; $paid = false; $system = null; $planet = null; diff --git a/app/Http/Controllers/Wiki/WikiController.php b/app/Http/Controllers/Wiki/WikiController.php index b4f4ba73a..f0ec0d2ec 100644 --- a/app/Http/Controllers/Wiki/WikiController.php +++ b/app/Http/Controllers/Wiki/WikiController.php @@ -9,7 +9,7 @@ use DB; use Auth; //User Libraries -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //Models use App\Models\Doku\DokuGroupNames; @@ -27,7 +27,7 @@ class WikiController extends Controller public function purgeUsers() { //Declare helper classes - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; //Get all the users from the database $users = DokuUser::pluck('name')->all(); diff --git a/app/Library/Finances/Helper/FinanceHelper.php b/app/Library/Finances/Helper/FinanceHelper.php index e565b554c..480832f98 100644 --- a/app/Library/Finances/Helper/FinanceHelper.php +++ b/app/Library/Finances/Helper/FinanceHelper.php @@ -31,7 +31,7 @@ use App\Library\Finances\StructureIndustryTax; use App\Library\Finances\OfficeFee; use App\Library\Finances\PlanetProductionTax; use App\Library\Finances\PISale; -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //Seat Stuff use Seat\Eseye\Exceptions\RequestFailedException; @@ -48,7 +48,7 @@ class FinanceHelper { $industry = new StructureIndustryTax(); $office = new OfficeFee(); $esiHelper = new Esi(); - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; //Get the ESI refresh token for the corporation to add new wallet journals into the database $hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1'); @@ -121,7 +121,7 @@ class FinanceHelper { public function GetJournalPageCount($division, $charId) { //Declare class variables - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; $esiHelper = new Esi; //Get the ESI refresh token for the corporation to add new wallet journals into the database @@ -207,7 +207,7 @@ class FinanceHelper { $office = new OfficeFee; $pi = new PlanetProductionTax; $esiHelper = new Esi; - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; //Get the ESI refresh token for the corporation to add new wallet journals into the database $hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1'); diff --git a/app/Library/Lookups/NewLookupHelper.php b/app/Library/Lookups/LookupHelper.php similarity index 99% rename from app/Library/Lookups/NewLookupHelper.php rename to app/Library/Lookups/LookupHelper.php index 4d75f0ef0..3cb3b48c5 100644 --- a/app/Library/Lookups/NewLookupHelper.php +++ b/app/Library/Lookups/LookupHelper.php @@ -19,7 +19,7 @@ use App\Models\Lookups\AllianceLookup; use App\Models\Lookups\SolarSystem; use App\Models\Lookups\ItemLookup; -class NewLookupHelper { +class LookupHelper { //Variables private $esi; @@ -45,7 +45,7 @@ class NewLookupHelper { 'type_id' => $itemId, ]); } catch(RequestFailedException $e) { - Log::warning('Failed to get item information from /universe/types/{type_id}/ in NewLookupHelper.'); + Log::warning('Failed to get item information from /universe/types/{type_id}/ in LookupHelper.'); return null; } diff --git a/app/Library/Moons/MiningLedgerHelper.php b/app/Library/Moons/MiningLedgerHelper.php index eee9ae2c7..95334e80d 100644 --- a/app/Library/Moons/MiningLedgerHelper.php +++ b/app/Library/Moons/MiningLedgerHelper.php @@ -15,7 +15,7 @@ use DB; //App Library use Seat\Eseye\Exceptions\RequestFailedException; use App\Library\Esi\Esi; -use App\Library\Lookups\NewLookupHelper; +use App\Library\Lookups\LookupHelper; //App Models use App\Models\Structure\Structure; @@ -149,7 +149,7 @@ class MiningLedgerHelper { $items = array(); $notSorted = array(); $final = array(); - $lookup = new NewLookupHelper; + $lookup = new LookupHelper; //In the first iteration of the array get rid of the extra items we don't want diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 7854e3a91..0f511f9b9 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -74,7 +74,7 @@ return array( 'App\\Library\\Finances\\ReprocessingTax' => $baseDir . '/app/Library/Finances/ReprocessingTax.php', 'App\\Library\\Finances\\StructureIndustryTax' => $baseDir . '/app/Library/Finances/StructureIndustryTax.php', 'App\\Library\\Lookups\\LookupHelper' => $baseDir . '/app/Library/Lookups/LookupHelper.php', - 'App\\Library\\Lookups\\NewLookupHelper' => $baseDir . '/app/Library/Lookups/NewLookupHelper.php', + 'App\\Library\\Lookups\\LookupHelper' => $baseDir . '/app/Library/Lookups/LookupHelper.php', 'App\\Library\\Moons\\MiningLedgerHelper' => $baseDir . '/app/Library/Moons/MiningLedgerHelper.php', 'App\\Library\\Moons\\MoonCalc' => $baseDir . '/app/Library/Moons/MoonCalc.php', 'App\\Library\\SRP\\SRPHelper' => $baseDir . '/app/Library/SRP/SRPHelper.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 387d37f9e..38b71e097 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -538,7 +538,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Library\\Finances\\ReprocessingTax' => __DIR__ . '/../..' . '/app/Library/Finances/ReprocessingTax.php', 'App\\Library\\Finances\\StructureIndustryTax' => __DIR__ . '/../..' . '/app/Library/Finances/StructureIndustryTax.php', 'App\\Library\\Lookups\\LookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/LookupHelper.php', - 'App\\Library\\Lookups\\NewLookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/NewLookupHelper.php', + 'App\\Library\\Lookups\\LookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/LookupHelper.php', 'App\\Library\\Moons\\MiningLedgerHelper' => __DIR__ . '/../..' . '/app/Library/Moons/MiningLedgerHelper.php', 'App\\Library\\Moons\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/Moons/MoonCalc.php', 'App\\Library\\SRP\\SRPHelper' => __DIR__ . '/../..' . '/app/Library/SRP/SRPHelper.php',