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

rental moon testing

Browse Source
This commit is contained in:
drkthunder02
2020-06-06 03:59:39 -05:00
parent 8211de1954
commit 9c53f969e6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Moons/MoonsAdminController.php
View File

@@ -240,7 +240,7 @@ class MoonsAdminController extends Controller
//For each of the moons compile different data for the view for formatting //For each of the moons compile different data for the view for formatting
foreach($rentalMoons as $moon) { foreach($rentalMoons as $moon) {
//Check if a current rental for the moon is on going //Check if a current rental for the moon is on going
if(($moon->rental_type == 'In Alliance' || $moon->rental_type == 'Out of Alliance') && ($moon->paid == 'Yes')) { if(($moon->rental_type == 'In Alliance' || $moon->rental_type == 'Out of Alliance')) {
$paid = $moon->paid; $paid = $moon->paid;
$paidUntil = new Carbon($moon->paid_until); $paidUntil = new Carbon($moon->paid_until);
$paidUntil = $paidUntil->format('m-d'); $paidUntil = $paidUntil->format('m-d');
@@ -252,16 +252,21 @@ class MoonsAdminController extends Controller
//Set the contact name based on the contact type //Set the contact name based on the contact type
if($moon->contact_type == 'Alliance') { if($moon->contact_type == 'Alliance') {
$allianceInfo = $lookupHelper->GetAllianceInfo($moon->contact); $allianceInfo = $lookupHelper->GetAllianceInfo($moon->contact);
//Set the contact name and ticker
$contact = $allianceInfo->name; $contact = $allianceInfo->name;
$ticker = $allianceInfo->ticker; $ticker = $allianceInfo->ticker;
} else if($moon->contact_type == 'Corporation') { } else if($moon->contact_type == 'Corporation') {
$corporationInfo = $lookupHelper->GetCorporationInfo($moon->contact); $corporationInfo = $lookupHelper->GetCorporationInfo($moon->contact);
//Set the contact name and ticker
$contact = $corporationInfo->name; $contact = $corporationInfo->name;
$ticker = $corporationInfo->ticker; $ticker = $corporationInfo->ticker;
} else if($moon->contact_type == 'Character') { } else if($moon->contact_type == 'Character') {
$characterInfo = $lookupHelper->GetCharacterInfo($moon->contact); $characterInfo = $lookupHelper->GetCharacterInfo($moon->contact);
//Set the contact name
$contact = $characterInfo->name; $contact = $characterInfo->name;
$ticker = $characterInfo->ticker; //Get the ticker for the character from the corporation he belongs to
$corpInfo = $lookupHelper->GetCorporationInfo($characterInfo->corporation_id);
$ticker = $corpInfo->ticker;
} else { } else {
$contact = 'N/A'; $contact = 'N/A';
$ticker = 'N/A'; $ticker = 'N/A';
@@ -270,9 +275,11 @@ class MoonsAdminController extends Controller
//Set up the moon rental type //Set up the moon rental type
if($moon->rental_type == 'In Alliance') { if($moon->rental_type == 'In Alliance') {
$type = 'W4RP'; $type = 'IA';
} else if($moon->rental_type == 'Out of Alliance') { } else if($moon->rental_type == 'Out of Alliance') {
$type = 'OOA'; $type = 'OOA';
} else if($moon->rental_type == 'Alliance') {
$type = 'W4RP';
} else { } else {
$type = 'N/A'; $type = 'N/A';
} }
@@ -292,7 +299,7 @@ class MoonsAdminController extends Controller
//Set the other information for the spreadsheet //Set the other information for the spreadsheet
$contact = 'Spatial Forces'; $contact = 'Spatial Forces';
$renter = 'Spatial Forces'; $renter = 'SP3C';
$ticker = 'SP3C'; $ticker = 'SP3C';
$type = 'Alliance'; $type = 'Alliance';