diff --git a/app/Http/Controllers/MoonsAdminController.php b/app/Http/Controllers/MoonsAdminController.php index f1984f87b..5a69126c8 100644 --- a/app/Http/Controllers/MoonsAdminController.php +++ b/app/Http/Controllers/MoonsAdminController.php @@ -110,6 +110,7 @@ class MoonsAdminController extends Controller 'renter' => 'required', 'date' => 'required', 'contact' => 'required', + 'paid' => 'required', ]); //Take the contact name and create a character id from it @@ -157,6 +158,7 @@ class MoonsAdminController extends Controller 'Contact' => $contact, 'Price' => $price['alliance'], 'Type' => 'alliance', + 'Paid' => $request->paid, ]); } else { MoonRental::insert([ @@ -168,6 +170,7 @@ class MoonsAdminController extends Controller 'Contact' => $contact, 'Price' => $price['outofalliance'], 'Type' => 'outofalliance', + 'Paid' => $request->paid, ]); } @@ -277,7 +280,7 @@ class MoonsAdminController extends Controller $moon = $str_array[2]; //Update the paid status of the moon - Moon::where([ + MoonRental::where([ 'System' => $system, 'Planet' => $planet, 'Moon' => $moon, diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php index bfd1d678f..325b7bbc2 100644 --- a/app/Http/Controllers/MoonsController.php +++ b/app/Http/Controllers/MoonsController.php @@ -2,12 +2,13 @@ namespace App\Http\Controllers; +//Internal Library use Auth; use DB; use Illuminate\Http\Request; - use Carbon\Carbon; +//Models use App\Models\Moon\Config; use App\Models\Moon\ItemComposition; use App\Models\Moon\Moon; @@ -15,6 +16,7 @@ use App\Models\Moon\OrePrice; use App\Models\Moon\Price; use App\Models\MoonRent\MoonRental; +//Library use App\Library\Moons\MoonCalc; class MoonsController extends Controller diff --git a/resources/views/moons/admin/updatemoon.blade.php b/resources/views/moons/admin/updatemoon.blade.php index 4c85fcffe..d0ab64ffb 100644 --- a/resources/views/moons/admin/updatemoon.blade.php +++ b/resources/views/moons/admin/updatemoon.blade.php @@ -14,13 +14,22 @@
{{ Form::label('renter', 'Renter') }} {{ Form::text('renter', '', ['class' => 'form-control', 'placeholder' => 'Renter']) }} - {{ Form::label('contact', 'Contact') }}
+ {{ Form::label('contact', 'Contact') }} {{ Form::text('contact', '', ['class' => 'form-control', 'placeholder' => 'Character']) }} +
+
{{ Form::label('date', 'Rental End Date') }} {{ Form::date('date', \Carbon\Carbon::now()->addMonth(), ['class' => 'form-control']) }}
+
+ Paid?
+ {{ Form::label('paid', 'No') }} + {{ Form::radio('paid', 'No', true) }} + {{ Form::label('paid', 'Yes') }} + {{ Form::radio('paid', 'Yes') }} +
{{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} {!! Form::close() !!}