diff --git a/app/Http/Controllers/Moons/MoonsController.php b/app/Http/Controllers/Moons/MoonsController.php index b4830c4a1..15b4239bc 100644 --- a/app/Http/Controllers/Moons/MoonsController.php +++ b/app/Http/Controllers/Moons/MoonsController.php @@ -259,6 +259,20 @@ class MoonsController extends Controller } //Get the color correct for the table + if($moon->rental_type == 'In Alliance' || $moon->rental_type == 'Out of Alliance') { + if($rentalTemp->diffInDays($today) < 3 && $today < $rentalTemp ) { + $color = 'table-danger'; + } else if($today > $rentalTemp) { + $color = 'table-primary'; + } else if($today < $rentalTemp) { + $color = 'table-danger'; + } + } else if($moon->rental_type == 'Alliance') { + $color = 'table-info'; + } else { + $color = 'table-primary'; + } + /* if($moon->rental_type != 'Alliance') { if($rentalTemp->diffInDays($today) < 3) { $color = 'table-warning'; @@ -270,6 +284,7 @@ class MoonsController extends Controller } else { $color = 'table-info'; } + */ //Add the data to the html array to be passed to the view diff --git a/resources/views/moons/admin/adminmoon.blade.php b/resources/views/moons/admin/adminmoon.blade.php index 374724e5a..aecb3d8b2 100644 --- a/resources/views/moons/admin/adminmoon.blade.php +++ b/resources/views/moons/admin/adminmoon.blade.php @@ -61,6 +61,9 @@ Moon Rent Due + + Alliance Use + diff --git a/resources/views/moons/user/moon.blade.php b/resources/views/moons/user/moon.blade.php index d6ff4f9fe..37935a1bd 100644 --- a/resources/views/moons/user/moon.blade.php +++ b/resources/views/moons/user/moon.blade.php @@ -59,6 +59,9 @@ Moon Rent Due + + Alliance Use +