prevented main users from being registered as alts in a strange oddity.

This commit is contained in:
2021-05-21 03:41:41 +09:00
parent 7d31892c57
commit 63a54c78e2
4 changed files with 163 additions and 31 deletions
@@ -160,9 +160,14 @@ class LoginController extends Controller
* @param \Laravel\Socialite\Two\User $user
*/
private function createAlt($user, $orgCharacter) {
//Check to see if the alt is already in the database
$altCount = UserAlt::where(['character_id' => $user->id])->count();
$altCount = UserAlt::where('character_id', $user->id)->count();
if($altCount == 0) {
//Check to see if the new character being added is already a main character
$mainCount = User::where(['character_id' => $user->id])->count();
//If not already in the database, then add the new character
if($altCount == 0 && $mainCount == 0) {
//Create the new alt in the table
$newAlt = new UserAlt;
$newAlt->name = $user->getName();
@@ -175,7 +180,6 @@ class LoginController extends Controller
$newAlt->expires_in = $user->expiresIn;
$newAlt->save();
//Create the entry into the EsiToken table
//Create the entry into the EsiToken table
if(EsiToken::where(['character_id' => $user->id])->count() == 0) {
$this->SaveEsiToken($user);
@@ -22,4 +22,56 @@ class TestController extends Controller
public function CharacterLookupTest(Request $request) {
}
public function DebugMiningTaxes($invoiceId) {
$invoice = array();
$ores = array();
$totalPrice = 0.00;
$body = null;
$lookup = new LookupHelper;
$config = config('esi');
$rows = Ledger::where([
'invoice_id' => $invoiceId,
])->get()->toArray();
//Taly up the item composition from each row and multiply by the quantity
if(sizeof($rows) > 0) {
foreach($rows as $row) {
if(!isset($ores[$row['type_id']])) {
$ores[$row['type_id']] = 0;
}
$ores[$row['type_id']] = $ores[$row['type_id']] + $row['quantity'];
//Add up the total price from the ledger rows for the report later
$totalPrice = $totalPrice + $row['amount'];
}
//Reduce the total price by the take percentage
$invoiceAmount = $totalPrice * $config['mining_tax'];
$invoiceAmount = round($invoiceAmount, 2);
//Get the character name from the character id
$charName = $lookup->CharacterIdToName($charId);
//Generate a unique invoice id
$invoiceId = "M" . uniqid();
//Set the due date of the invoice
$dateDue = Carbon::now()->addDays(7);
$invoiceDate = Carbon::now();
//Format the mining tax into a human readable number
$numberMiningTax = number_format(($config['mining_tax'] * 100.00), 2, ".", ",");
}
return view('test.miningtax.display')->with('rows', $rows)
->with('ores', $ores)
->with('totalPrice', $totalPrice)
->with('invoiceAmount', $invoiceAmount)
->with('charName', $charName)
->with('invoiceId', $invoiceId)
->with('dateDue' $dateDue)
->with('invoiceDate', $invoiceDate)
->with('numberMiningTax', $numberMiningTax);
}
}