drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mining tax testing

Browse Source
This commit is contained in:
drkthunder02
2021-03-07 21:53:11 +09:00
parent fcf823663f
commit 4855ac34f4
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/MiningTaxes/MiningTaxesController.php
View File

@@ -24,6 +24,7 @@ use App\Models\MiningTax\Observer;
use App\Models\MiningTax\Invoice; use App\Models\MiningTax\Invoice;
use App\Models\Esi\EsiToken; use App\Models\Esi\EsiToken;
use App\Models\Esi\EsiScope; use App\Models\Esi\EsiScope;
use App\Models\User\User;
class MiningTaxesController extends Controller class MiningTaxesController extends Controller
{ {
@@ -230,10 +231,10 @@ class MiningTaxesController extends Controller
//Check for the esi scope //Check for the esi scope
if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) { if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the ESI for the holding corp.'); return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the ESI for the holding corp for corp mining.');
} else { } else {
if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-universe.read_structures.v1')) { if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-universe.read_structures.v1')) {
return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the ESI for the holding corp.'); return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the ESI for the holding corp for structures.');
} }
} }
@@ -249,6 +250,8 @@ class MiningTaxesController extends Controller
//Get the observers from the database //Get the observers from the database
$observers = Observer::all(); $observers = Observer::all();
$corpInfo = $lookup->GetCorporationInfo(auth()->user()->getId());
//Get the ledgers for each structure one at a time //Get the ledgers for each structure one at a time
foreach($observers as $obs) { foreach($observers as $obs) {
/** /**
@@ -262,18 +265,12 @@ class MiningTaxesController extends Controller
if($ledger != null) { if($ledger != null) {
foreach($ledgers as $ledger) { foreach($ledgers as $ledger) {
$tempArray = array();
//Get the character information from the character id
$charInfo = $lookup->GetCharacterInfo($ledger->character_id);
//Get the corp ticker
$corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
//Get the structure name from the database //Get the structure name from the database
$structure = $sHelper->GetStructureInfo($obs->observer_id); $structure = $sHelper->GetStructureInfo($obs->observer_id);
array_push($miningLedgers, [ array_push($miningLedgers, [
'structure' => $structure->name, 'structure' => $structure->name,
'character' => $charInfo->name, 'character' => auth()->user()->getName(),
'corpTicker' => $corpInfo->ticker, 'corpTicker' => $corpInfo->ticker,
'ore' => $ore, 'ore' => $ore,
'quantity' => $ledger->quantity, 'quantity' => $ledger->quantity,