lookup helper

This commit is contained in:
2019-12-11 21:57:38 -06:00
parent a1ced2ace6
commit c201578191
12 changed files with 26 additions and 26 deletions

View File

@@ -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([

View File

@@ -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;

View File

@@ -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);

View File

@@ -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);

View File

@@ -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();

View File

@@ -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;

View File

@@ -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();

View File

@@ -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');

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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',

View File

@@ -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',