diff --git a/app/Http/Controllers/Test/TestController.php b/app/Http/Controllers/Test/TestController.php
index 1bb04623b..f89f5c559 100644
--- a/app/Http/Controllers/Test/TestController.php
+++ b/app/Http/Controllers/Test/TestController.php
@@ -12,10 +12,12 @@ use Illuminate\Support\Str;
//Application Library
use App\Library\Helpers\LookupHelper;
+use App\Library\Esi\Esi;
//Models
use App\Models\MiningTax\Invoice;
use App\Models\MiningTax\Ledger;
+use App\Models\MiningTax\Observer;
use App\Models\User\UserAlt;
use App\Models\User\User;
@@ -31,10 +33,6 @@ class TestController extends Controller
return view('test.char.display')->with('char', $char);
}
- public function CharacterLookupTest(Request $request) {
-
- }
-
public function DebugMiningTaxesInvoices() {
$lookup = new LookupHelper;
$ledgers = new Collection;
@@ -69,7 +67,7 @@ class TestController extends Controller
'amount' => $row->amount,
'invoiced' => $row->invoiced,
'invoice_id' => $row->invoice_id,
- ])
+ ]);
}
}
@@ -92,7 +90,7 @@ class TestController extends Controller
'amount' => $row->amount,
'invoiced' => $row->invoiced,
'invoice_id' => $row->invoice_id,
- ])
+ ]);
}
}
}
@@ -101,6 +99,58 @@ class TestController extends Controller
return view('test.miningtax.invoice')->with('ledgers', $ledgers);
}
+ public function DebugMiningObservers() {
+ $ledgers = new Collection;
+ $lookup = new LookupHelper;
+ $config = config('esi');
+ $esiHelper = new Esi;
+
+ $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+ $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+
+ $response = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
+ 'corporation' => $config['corporation'],
+ ]);
+
+ $resp = json_decode($response->raw, true);
+
+ $currentPage = 1;
+ $totalPages = 1;
+
+ foreach($observers as $observer) {
+ do {
+ if($esiHelper->TokenExpired($refreshToken)) {
+ $refreshToken = $esiHelper->GetRefreshToken($config['primary']);
+ $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
+ }
+
+ $response = $esi->page($currentPage)
+ ->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}', [
+ 'corporation_id' => $config['corporation'],
+ 'observer_id' => $observer['observer_id'],
+ ]);
+
+ if($currentPage == 1) {
+ $totalPages = $response->pages;
+ }
+
+ $tempLedgers = json_decode($response->raw, true);
+
+ foreach($tempLedgers as $ledg) {
+ $ledgers->push([
+ 'observer_id' => $observer['observer_id'],
+ 'character_id' => $ledg['character_id'],
+ 'last_updated' => $ledg['last_updated'],
+ 'type_id' => $ledg['type_id'],
+ 'quantity' => $ledg['quantity'],
+ ]);
+ }
+ } while($currentPage <= $totalPages);
+ }
+
+ return view('test.miningtax.observers')->with('ledgers', $ledgers);
+ }
+
public function DebugMiningTaxes($invoiceId) {
$invoice = array();
$ores = array();
diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php
index 6a2f2b4c0..6a9eddeb3 100644
--- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php
+++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgers.php
@@ -105,7 +105,7 @@ class FetchMiningTaxesLedgers implements ShouldQueue
* library functionality.
*/
if($esiHelper->TokenExpired($refreshToken)) {
- $refreshToken = $esiHelper->GetRefreshToken($charId);
+ $refreshToken = $esiHelper->GetRefreshToken($this->charId);
$esi = $esiHelper->SetupEsiAuthentication($refreshToken);
}
diff --git a/resources/views/test/miningtax/observers.blade.php b/resources/views/test/miningtax/observers.blade.php
new file mode 100644
index 000000000..9bc0dab3e
--- /dev/null
+++ b/resources/views/test/miningtax/observers.blade.php
@@ -0,0 +1,26 @@
+@extends('layouts.user.dashb4')
+@section('content')
+
+
| Observer Id | +Character Id | +Last Updated | +Type Id | +Quantity | + + + @foreach($ledgers as $ledger) +
|---|---|---|---|---|
| {{ $ledger['observer_id'] }} | +{{ $ledger['character_id'] }} | +{{ $ledger['last_updated'] }} | +{{ $ledger['type_id'] }} | +{{ $ledger['quantity'] }} | +