diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 033da1b7e..aeacdf7bd 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -88,6 +88,18 @@ class LoginController extends Controller //Search for user in the database $authUser = User::where('character_id', $eve_user->id)->first(); if($authUser) { + User::update([ + '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, + 'refresh_token' => $eve_user->refreshToken, + 'user_type' => $accountType, + ]); + return $authUser; } else { //Get what type of account the user should have diff --git a/app/Http/Controllers/FinancesController.php b/app/Http/Controllers/FinancesController.php new file mode 100644 index 000000000..af0a567fc --- /dev/null +++ b/app/Http/Controllers/FinancesController.php @@ -0,0 +1,31 @@ +setScopes(['publicData', 'esi-wallet.read_corporation_wallet.v1'])->redirect(); + } + + public function displayWallet() { + $esi = new Finances(); + + //Get the Journal Entries and just return them + $journals = $esi->GetMasterWalletJouranl(); + + return $journals; + } +} diff --git a/app/Http/Controllers/FleetsController.php b/app/Http/Controllers/FleetsController.php new file mode 100644 index 000000000..ad802e0b4 --- /dev/null +++ b/app/Http/Controllers/FleetsController.php @@ -0,0 +1,10 @@ +where('name', 'Minerva Arbosa')->get(); + + $authentication = new \Seat\Eseye\Containers\EsiAuthentication([ + 'client_id' => env(ESI_CLIENT_ID), + 'secret' => env(ESI_SECRET_KEY), + 'refresh_token' => $user->refresh_token, + ]); + + $this->esi = new \Seat\Eseye\Eseye($authentication); + + + } + + public function GetMarketGroups() { + $instance = new \Seat\Eseye\Eseye(); + + $marketGroups = $instance->invoke('get', '/markets/groups/'); + } + + public function GetMasterWalletJournal() { + $journal = $this->esi->invoke('get', '/corporations/98287666/wallets/1/journal/'); + + return $journal; + } +} + +?> \ No newline at end of file diff --git a/app/Models/EsiToken.php b/app/Models/EsiToken.php new file mode 100644 index 000000000..b6033fc61 --- /dev/null +++ b/app/Models/EsiToken.php @@ -0,0 +1,17 @@ +integer('duration'); + $table->boolean('is_buy_order'); + $table->date('issued'); + $table->integer('location_id'); + $table->integer('min_volume'); + $table->integer('order_id')->unique(); + $table->decimal('price', 20, 2); + $table->string('range'); + $table->integer('system_id'); + $table->integer('volume_remain'); + $table->integer('volume_total'); + }); + + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('MarketOrders'); + } +} diff --git a/database/migrations/2018_10_28_204313_create_structures.php b/database/migrations/2018_10_28_204313_create_structures.php new file mode 100644 index 000000000..45df59002 --- /dev/null +++ b/database/migrations/2018_10_28_204313_create_structures.php @@ -0,0 +1,46 @@ +integer('corporation_id'); + $table->date('fuel_expires'); + $table->date('next_reinforce_apply'); + $table->integer('next_reinforce_hour'); + $table->integer('next_reinforce_weekday'); + $table->integer('profile_id'); + $table->integer('reinforce_hour'); + $table->integer('reinforce_weekday'); + $table->data('services'); + $table->string('state'); + $table->date('state_timer_end'); + $table->date('state_timer_start'); + $table->integer('structure_id')->unique(); + $table->integer('system_id'); + $table->integer('type_id'); + $table->date('unanchors_at'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('Structures'); + } +} diff --git a/database/migrations/2018_10_29_001917_create_holding_corp_finances_journal.php b/database/migrations/2018_10_29_001917_create_holding_corp_finances_journal.php new file mode 100644 index 000000000..2632076f0 --- /dev/null +++ b/database/migrations/2018_10_29_001917_create_holding_corp_finances_journal.php @@ -0,0 +1,42 @@ +integer('id')->unique(); + $table->decimal('amount', 20, 2); + $table->decimal('balance', 20, 2); + $table->integer('context_id'); + $table->string('context_id_type'); + $table->date('date'); + $table->string('description'); + $table->integer('first_party_id')->nullable(); + $table->string('reason')->nullabe(); + $table->string('ref_type'); + $table->integer('second_party_id')->nullable(); + $table->decimal('tax', 20, 2)->default(0.00); + $table->integer('tax_receiver_id')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('HoldingcorpFinancesJournal'); + } +} diff --git a/database/migrations/2018_10_29_003021_create_esi_tokens.php b/database/migrations/2018_10_29_003021_create_esi_tokens.php new file mode 100644 index 000000000..1ab372890 --- /dev/null +++ b/database/migrations/2018_10_29_003021_create_esi_tokens.php @@ -0,0 +1,36 @@ +integer('id')->increments(); + $table->integer('character_id'); + $table->string('access_token'); + $table->string('refresh_token'); + $table->integer('expires_in'); + $table->string('scopes'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('EsiTokens'); + } +} diff --git a/routes/web.php b/routes/web.php index 4d9014cfc..4d1596a48 100644 --- a/routes/web.php +++ b/routes/web.php @@ -37,3 +37,7 @@ Route::get('/wiki/changepassword', 'WikiController@displayChangePassword'); //Wiki Controller POST requests Route::post('storeRegister', 'WikiController@storeRegister'); Route::post('changePassword', 'WikiController@changePassword'); + +//Finance Controller display pages +Route::get('/finances/login', 'FinancesController@redirectToProvider'); +Route::get('/finances/display/wallet', 'FinancesController@displayWallet'); \ No newline at end of file diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 13d8ee474..b6c1ea658 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -15,6 +15,7 @@ return array( 'App\\Http\\Controllers\\Auth\\VerificationController' => $baseDir . '/app/Http/Controllers/Auth/VerificationController.php', 'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php', 'App\\Http\\Controllers\\DashboardController' => $baseDir . '/app/Http/Controllers/DashboardController.php', + 'App\\Http\\Controllers\\FinancesController' => $baseDir . '/app/Http/Controllers/FinancesController.php', 'App\\Http\\Controllers\\MoonsController' => $baseDir . '/app/Http/Controllers/MoonsController.php', 'App\\Http\\Controllers\\WikiController' => $baseDir . '/app/Http/Controllers/WikiController.php', 'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php', @@ -25,7 +26,9 @@ 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\\Library\\Finances' => $baseDir . '/app/Library/Finances.php', 'App\\Library\\MoonCalc' => $baseDir . '/app/Library/MoonCalc.php', + 'App\\MarketOrder' => $baseDir . '/app/Models/MarketOrder.php', 'App\\Models\\Config' => $baseDir . '/app/Models/Config.php', 'App\\Models\\DokuGroupNames' => $baseDir . '/app/Models/DokuGroupNames.php', 'App\\Models\\DokuMember' => $baseDir . '/app/Models/DokuMember.php', @@ -39,6 +42,7 @@ return array( 'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php', 'App\\Providers\\EventServiceProvider' => $baseDir . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php', + 'App\\Structure' => $baseDir . '/app/Models/Structure.php', 'App\\User' => $baseDir . '/app/User.php', 'BeyondCode\\DumpServer\\DumpServerCommand' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php', 'BeyondCode\\DumpServer\\DumpServerServiceProvider' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerServiceProvider.php', @@ -2769,7 +2773,6 @@ return array( 'Predis\\Transaction\\AbortedMultiExecException' => $vendorDir . '/predis/predis/src/Transaction/AbortedMultiExecException.php', 'Predis\\Transaction\\MultiExec' => $vendorDir . '/predis/predis/src/Transaction/MultiExec.php', 'Predis\\Transaction\\MultiExecState' => $vendorDir . '/predis/predis/src/Transaction/MultiExecState.php', - 'PricesSeeder' => $baseDir . '/database/seeds/PricesSeeder.php', 'Prophecy\\Argument' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Argument.php', 'Prophecy\\Argument\\ArgumentsWildcard' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php', 'Prophecy\\Argument\\Token\\AnyValueToken' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 64394870e..595c94d5b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -410,6 +410,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Controllers\\Auth\\VerificationController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/VerificationController.php', 'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php', 'App\\Http\\Controllers\\DashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/DashboardController.php', + 'App\\Http\\Controllers\\FinancesController' => __DIR__ . '/../..' . '/app/Http/Controllers/FinancesController.php', 'App\\Http\\Controllers\\MoonsController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonsController.php', 'App\\Http\\Controllers\\WikiController' => __DIR__ . '/../..' . '/app/Http/Controllers/WikiController.php', 'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php', @@ -420,7 +421,9 @@ 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\\Library\\Finances' => __DIR__ . '/../..' . '/app/Library/Finances.php', 'App\\Library\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/MoonCalc.php', + 'App\\MarketOrder' => __DIR__ . '/../..' . '/app/Models/MarketOrder.php', 'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Config.php', 'App\\Models\\DokuGroupNames' => __DIR__ . '/../..' . '/app/Models/DokuGroupNames.php', 'App\\Models\\DokuMember' => __DIR__ . '/../..' . '/app/Models/DokuMember.php', @@ -434,6 +437,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php', 'App\\Providers\\EventServiceProvider' => __DIR__ . '/../..' . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php', + 'App\\Structure' => __DIR__ . '/../..' . '/app/Models/Structure.php', 'App\\User' => __DIR__ . '/../..' . '/app/User.php', 'BeyondCode\\DumpServer\\DumpServerCommand' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php', 'BeyondCode\\DumpServer\\DumpServerServiceProvider' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerServiceProvider.php', @@ -3164,7 +3168,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'Predis\\Transaction\\AbortedMultiExecException' => __DIR__ . '/..' . '/predis/predis/src/Transaction/AbortedMultiExecException.php', 'Predis\\Transaction\\MultiExec' => __DIR__ . '/..' . '/predis/predis/src/Transaction/MultiExec.php', 'Predis\\Transaction\\MultiExecState' => __DIR__ . '/..' . '/predis/predis/src/Transaction/MultiExecState.php', - 'PricesSeeder' => __DIR__ . '/../..' . '/database/seeds/PricesSeeder.php', 'Prophecy\\Argument' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Argument.php', 'Prophecy\\Argument\\ArgumentsWildcard' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php', 'Prophecy\\Argument\\Token\\AnyValueToken' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php',