From d8a7ae1748f9a9b047d6ab4aa0e1deafefd05646 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Fri, 3 Jan 2020 18:21:36 -0600 Subject: [PATCH] update moon modification --- app/Http/Controllers/Moons/MoonsAdminController.php | 12 ++++++------ resources/views/moons/admin/updatemoon.blade.php | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Moons/MoonsAdminController.php b/app/Http/Controllers/Moons/MoonsAdminController.php index c8c510be8..3b909c183 100644 --- a/app/Http/Controllers/Moons/MoonsAdminController.php +++ b/app/Http/Controllers/Moons/MoonsAdminController.php @@ -223,7 +223,6 @@ class MoonsAdminController extends Controller //Validate our request from the html form $this->validate($request, [ 'spmn' => 'required', - //'renter' => 'required', 'date' => 'required', 'contact' => 'required', ]); @@ -262,12 +261,13 @@ class MoonsAdminController extends Controller } else { $paidUntil = null; } - - if($request->rental_corp == null) { - $renter = $corp->name; + + //Create the rnetal ticker if the corp is in Warped Intentions, otherwise just display the alliance ticker + if($allianceId == 99004116) { + $renter = $corp->ticker; } else { - $renter = $request->rental_corp; - } + $renter = $alliance->ticker; + } //Create the date $date = new Carbon($request->date . '00:00:01'); diff --git a/resources/views/moons/admin/updatemoon.blade.php b/resources/views/moons/admin/updatemoon.blade.php index caf52d9c8..8c7b14f5e 100644 --- a/resources/views/moons/admin/updatemoon.blade.php +++ b/resources/views/moons/admin/updatemoon.blade.php @@ -7,10 +7,6 @@ {{ Form::label('spmn', 'Moon') }} {{ Form::select('spmn', $spmn, null, ['class' => 'form-control', 'placeholder' => 'Select Moon...']) }} -
- {{ Form::label('rental_corp', 'Corp / Alliance Ticker') }} - {{ Form::text('rental_corp', '', ['class' => 'form-control', 'placeholder' => 'Renter']) }} -
{{ Form::label('contact', 'Contact') }} {{ Form::text('contact', '', ['class' => 'form-control', 'placeholder' => 'Character']) }}