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

moon testing

Browse Source
This commit is contained in:
drkthunder02
2020-06-22 23:51:06 -05:00
parent fc5261a645
commit 1f1c001fde
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Moons/MoonsController.php
View File

@@ -257,7 +257,7 @@ class MoonsController extends Controller
$color = 'table-primary'; $color = 'table-primary';
} }
} else if($moon->rental_type == 'Alliance') { } else if($moon->rental_type == 'Alliance') {
$rentalTemp = $today->endOfMonth(); $rentalTemp = Carbon::now()->endOfMonth();
$rentalEnd = $rentalTemp->format('m-d'); $rentalEnd = $rentalTemp->format('m-d');
$color = 'table-info'; $color = 'table-info';
} else { } else {
@@ -291,12 +291,9 @@ class MoonsController extends Controller
'Worth' => number_format($moon->moon_worth, 0, ".", ","), 'Worth' => number_format($moon->moon_worth, 0, ".", ","),
'RentalEnd' => $rentalEnd, 'RentalEnd' => $rentalEnd,
'RowColor' => $color, 'RowColor' => $color,
'Rental_Type' => $moon->rental_type,
]); ]);
} }
dd($table);
//Pass the data to the view //Pass the data to the view
return view('moons.user.moon')->with('table', $table); return view('moons.user.moon')->with('table', $table);
} }