cleanup work

This commit is contained in:
2019-05-03 20:10:01 -05:00
parent a9878f243e
commit d0de07031a
3 changed files with 22 additions and 19 deletions
-2
View File
@@ -64,8 +64,6 @@ class CorpJournalCommand extends Command
$finance->GetWalletJournal(1, $charId->character_id);
}
$finance->GetWalletJournal(3, 94415555);
//Mark the job as finished
$task->SetStopStatus();
}
+2 -1
View File
@@ -48,7 +48,8 @@ class HoldingFinancesCommand extends Command
//Setup the Finances container
$finance = new FinanceHelper();
$finance->GetHoldingWalletJournal(1);
//$finance->GetHoldingWalletJournal(1, 93738489);
$finance->GetWalletJournal(1, 93738489);
//Mark the job as finished
$task->SetStopStatus();
+20 -16
View File
@@ -193,6 +193,14 @@ class FinanceHelper {
}
public function GetWalletJournal($division, $charId) {
//Declare new class variables
$market = new MarketTax();
$reprocessing = new ReprocessingTax();
$jb = new JumpBridgeTax();
$other = new PlayerDonation();
$industry = new StructureIndustryTax();
$office = new OfficeFee();
//Get the ESI refresh token for the corporation to add new wallet journals into the database
$tokenData = $this->TokenInfo($charId);
$token = $tokenData['token'];
@@ -249,23 +257,17 @@ class FinanceHelper {
foreach($wallet as $entry) {
if($entry['amount'] > 0) {
if($entry['ref_type'] == 'brokers_fee') {
$market = new MarketTax();
$market->InsertMarketTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'reprocessing_tax') {
$reprocessing = new ReprocessingTax();
$reprocessing->InsertReprocessingTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'structure_gate_jump') {
$jb = new JumpBridgeTax();
$jb->InsertJumpBridgeTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'player_donation' ||
($entry['ref_type'] == 'corporation_account_withdrawal' && $entry['second_party_id'] == 98287666)) {
$other = new PlayerDonation();
($entry['ref_type'] == 'corporation_account_withdrawal' && $entry['second_party_id'] == 98287666)) {
$other->InsertPlayerDonation($entry, $corpId, $division);
} else if($entry['ref_type'] == 'industry_job_tax' && $entry['second_party_id'] == 98287666) {
$industry = new StructureIndustryTax();
$industry->InsertStructureIndustryTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'office_rental_fee' && $entry['second_party_id'] == 98287666) {
$office = new OfficeFee();
$office->InsertOfficeFee($entry, $corpId, $division);
}
}
@@ -278,6 +280,15 @@ class FinanceHelper {
}
public function GetHoldingWalletJournal($division) {
//Declare new class variables
$market = new MarketTax();
$reprocessing = new ReprocessingTax();
$jb = new JumpBridgeTax();
$other = new PlayerDonation();
$industry = new StructureIndustryTax();
$pi = new PlanetProductionTax();
$office = new OfficeFee();
//Get the ESI refresh token for the corporation to add new wallet journals into the database
$token = EsiToken::where(['character_id' => 93738489])->get(['refresh_token']);
@@ -318,31 +329,24 @@ class FinanceHelper {
$totalPages = $journals->pages;
//Decode the wallet from json into an array
$wallet = json_decode($journals->raw, true);
//For each journal entry, attempt to store it in the database.
//The PutWalletJournal function checks to see if it's already in the database.
foreach($wallet as $entry) {
if($entry['amount'] > 0) {
if($entry['ref_type'] == 'brokers_fee') {
$market = new MarketTax();
$market->InsertMarketTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'reprocessing_tax') {
$reprocessing = new ReprocessingTax();
$reprocessing->InsertReprocessingTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'structure_gate_jump') {
$jb = new JumpBridgeTax();
$jb->InsertJumpBridgeTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'player_donation' ||
$entry['ref_type'] == 'corporation_account_withdrawal') {
$other = new PlayerDonation();
} else if($entry['ref_type'] == 'player_donation' || $entry['ref_type'] == 'corporation_account_withdrawal') {
$other->InsertPlayerDonation($entry, $corpId, $division);
} else if($entry['ref_type'] == 'industry_job_tax') {
$industry = new StructureIndustryTax();
$industry->InsertStructureIndustryTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'planetary_import_tax' || $entry['ref_type'] == 'planetary_export_tax') {
$pi = new PlanetProductionTax();
$pi->InsertPlanetProductionTax($entry, $corpId, $division);
} else if($entry['ref_type'] == 'office_rental_fee') {
$office = new OfficeFee();
$office->InsertOfficeFee($entry, $corpId, $division);
}
}