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

updating moon rentals to utilize carbon library

Browse Source
This commit is contained in:
drkthunder02
2019-02-13 05:48:37 -06:00
parent fde28d0d99
commit a04471ce5a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/MoonsAdminController.php
View File

@@ -48,7 +48,6 @@ class MoonsAdminController extends Controller
]); ]);
$date = new Carbon($request->date . '00:00:01'); $date = new Carbon($request->date . '00:00:01');
//$date = strtotime($request->date . '00:00:01');
//Update the database entry //Update the database entry
Moon::where([ Moon::where([
'System' => $request->system, 'System' => $request->system,
@@ -132,7 +131,6 @@ class MoonsAdminController extends Controller
$moonCalc->FetchNewPrices(); $moonCalc->FetchNewPrices();
//get all of the moons from the database //get all of the moons from the database
$moons = Moon::orderBy('System', 'asc')->get(); $moons = Moon::orderBy('System', 'asc')->get();
//$moons = DB::table('Moons')->orderBy('System', 'asc')->get();
//declare the html variable and set it to null //declare the html variable and set it to null
$html = ''; $html = '';
foreach($moons as $moon) { foreach($moons as $moon) {
@@ -140,7 +138,7 @@ class MoonsAdminController extends Controller
$spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon; $spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon;
$rentalEnd = new Carbon($moon->RentalEnd); $rentalEnd = new Carbon($moon->RentalEnd);
$rentalEnd = $rentalEnd->format('m-d'); $rentalEnd = $rentalEnd->format('m-d');
//$rentalEnd = date('Y-m-d', $moon->RentalEnd);
$price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity,
$moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
//Add the data to the html string to be passed to the view //Add the data to the html string to be passed to the view

3
app/Http/Controllers/MoonsController.php
View File

@@ -38,7 +38,8 @@ class MoonsController extends Controller
foreach($moons as $moon) { foreach($moons as $moon) {
//Setup formats as needed //Setup formats as needed
$spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon; $spm = $moon->System . ' - ' . $moon->Planet . ' - ' . $moon->Moon;
$rentalEnd = date('m/d/Y', $moon->RentalEnd); $rentalEnd = new Carbon($moon->RentalEnd);
$rentalEnd = $rentalEnd->format('m-d');
$price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity,
$moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
//Add the data to the html string to be passed to the view //Add the data to the html string to be passed to the view