From 0b0faf26d2e3810e8ea87ca88a6b9fc84a5add78 Mon Sep 17 00:00:00 2001 From: Christopher Mancuso Date: Sat, 10 Jul 2021 22:05:05 -0500 Subject: [PATCH] moon rental form --- .../MiningTaxes/MiningTaxesController.php | 12 ++++++++---- .../user/display/moonrentals/form.blade.php | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php index 5e31cc098..7f19a4a09 100644 --- a/app/Http/Controllers/MiningTaxes/MiningTaxesController.php +++ b/app/Http/Controllers/MiningTaxes/MiningTaxesController.php @@ -72,7 +72,6 @@ class MiningTaxesController extends Controller public function storeMoonRentalForm(Request $request) { $this->validate($request, [ 'moon_id' => 'required', - 'moon_name' => 'required', 'rental_start' => 'required', 'rental_end' => 'required', 'entity_name' => 'required', @@ -99,6 +98,11 @@ class MiningTaxesController extends Controller //Create the uniqid for the billing cycle. $invoiceId = "MR" . uniqid(); + //Get the moon's information from the database so we know how much to make the bill for + $moon = AllianceMoon::where([ + 'moon_id' => $request->moon_id, + ])->first(); + //Update the data on the Alliance Moon AllianceMoon::where([ 'moon_id' => $request->moon_id, @@ -108,9 +112,9 @@ class MiningTaxesController extends Controller //Insert a new moon rental into the database AllianceMoonRental::insert([ - 'moon_id' => $request->moon_id, - 'moon_name' => $request->moon_name, - 'rental_amount' => $rentalAmount, + 'moon_id' => $moon->moon_id, + 'moon_name' => $moon->name, + 'rental_amount' => $moon->rental_amount, 'rental_start' => $request->rental_start, 'rental_end' => $request->rental_end, 'next_billing_date' => $nextBillingDate, diff --git a/resources/views/miningtax/user/display/moonrentals/form.blade.php b/resources/views/miningtax/user/display/moonrentals/form.blade.php index 2597d2d62..cd95b6edf 100644 --- a/resources/views/miningtax/user/display/moonrentals/form.blade.php +++ b/resources/views/miningtax/user/display/moonrentals/form.blade.php @@ -13,7 +13,6 @@
{!! Form::open(['action' => 'MiningTaxes\MiningTaxesController@storeMoonRentalForm', 'method' => 'POST']) !!} {{ Form::hidden('moon_id', $moon->moon_id) }} - {{ Form::hidden('moon_name', $moon->name) }}
{{ Form::label('rental_start', 'Day of Rental Start') }} {{ Form::date('rental_start', Carbon\Carbon::now(), ['class' => 'form-control']) }}