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

admin dashboard for modifying users

Browse Source
This commit is contained in:
drkthunder02
2020-04-04 02:09:51 -05:00
parent 445f8a7660
commit ee4b67c03c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Finances/HoldingFinances.php
View File

@@ -61,6 +61,7 @@ class HoldingFinancesCommand extends Command
//Get the total pages for the journal for the holding corporation //Get the total pages for the journal for the holding corporation
$pages = $finance->GetJournalPageCount(1, $config['primary']); $pages = $finance->GetJournalPageCount(1, $config['primary']);
dd($pages);
//Dispatch a single job for each page to process //Dispatch a single job for each page to process
for($i = 1; $i <= $pages; $i++) { for($i = 1; $i <= $pages; $i++) {
@@ -73,6 +74,7 @@ class HoldingFinancesCommand extends Command
//Get the total pages for the journal for the sov bills from the holding corporation //Get the total pages for the journal for the sov bills from the holding corporation
$pages = $finance->GetJournalPageCount(6, $config['primary']); $pages = $finance->GetJournalPageCount(6, $config['primary']);
dd($pages);
//Dispatch a job for each page to process //Dispatch a job for each page to process
for($i = 1; $i <= $pages; $i++) { for($i = 1; $i <= $pages; $i++) {

12
app/Library/Finances/Helper/FinanceHelper.php
View File

@@ -94,8 +94,11 @@ class FinanceHelper {
return null; return null;
} }
if($currentPage == 1) {
//Set the total pages we need to cycle through. //Set the total pages we need to cycle through.
$totalPages = $journals->pages; $totalPages = $journals->pages;
}
//Decode the wallet from json into an array //Decode the wallet from json into an array
$wallet = json_decode($journals->raw, true); $wallet = json_decode($journals->raw, true);
//For each journal entry, attempt to store it in the database. //For each journal entry, attempt to store it in the database.
@@ -115,7 +118,7 @@ class FinanceHelper {
$industry->InsertStructureIndustryTax($entry, $corpId, $division); $industry->InsertStructureIndustryTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) { } else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) {
$office->InsertOfficeFee($entry, $corpId, $division); $office->InsertOfficeFee($entry, $corpId, $division);
} else if($entry['ref_type'] == 'infrastructure_hub_maintenance') { } else if($entry['ref_type'] == 'infrastructure_hub_maintenance' && $entry['first_party_id'] == 98287666) {
$sovBillHelper->InsertSovBillExpense($entry, $corpId, $division); $sovBillHelper->InsertSovBillExpense($entry, $corpId, $division);
} }
} }
@@ -225,7 +228,7 @@ class FinanceHelper {
$pi = new PlanetProductionTax; $pi = new PlanetProductionTax;
$esiHelper = new Esi; $esiHelper = new Esi;
$lookup = new LookupHelper; $lookup = new LookupHelper;
$sovBillHelper = new SovBillExpenses; $sovBill = new SovBillExpenses;
//Get the ESI refresh token for the corporation to add new wallet journals into the database //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'); $hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1');
@@ -260,7 +263,6 @@ class FinanceHelper {
'division' => $division, 'division' => $division,
]); ]);
} catch(RequestFailedException $e) { } catch(RequestFailedException $e) {
//Log::warning($e->getEsiResponse());
return null; return null;
} }
@@ -285,8 +287,8 @@ class FinanceHelper {
$office->InsertOfficeFee($entry, $corpId, $division); $office->InsertOfficeFee($entry, $corpId, $division);
} else if($entry['ref_type'] == 'planetary_export_tax' || $entry['ref_type'] == 'planetary_import_tax') { } else if($entry['ref_type'] == 'planetary_export_tax' || $entry['ref_type'] == 'planetary_import_tax') {
$pi->InsertPlanetProductionTax($entry, $corpId, $division); $pi->InsertPlanetProductionTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'infrastructure_hub_maintenance') { } else if($entry['ref_type'] == 'infrastructure_hub_maintenance' && $entry['first_party_id'] == 98287666) {
$sovBillHelper->InsertSovBillExpense($entry, $corpId, $division); $sovBill->InsertSovBillExpense($entry, $corpId, $division);
} }
} }
} }