diff --git a/app/Http/Controllers/MoonsAdminController.php b/app/Http/Controllers/MoonsAdminController.php index c8e7636da..a9dcb7104 100644 --- a/app/Http/Controllers/MoonsAdminController.php +++ b/app/Http/Controllers/MoonsAdminController.php @@ -217,11 +217,6 @@ class MoonsAdminController extends Controller $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); - if($type == 'W4RP') { - $moonprice = $price['alliance']; - } else { - $moonprice = $price['outofalliance']; - } if($today > $rentalTemp) { $color = 'table-success'; diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php index 74a5836e4..908ee5c29 100644 --- a/app/Http/Controllers/MoonsController.php +++ b/app/Http/Controllers/MoonsController.php @@ -52,6 +52,12 @@ class MoonsController extends Controller $worth = $moonCalc->SpatialMoonsTotalWorth($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity); + if($type == 'W4RP') { + $moonprice = $price['alliance']; + } else { + $moonprice = $price['outofalliance']; + } + if($today > $rentalTemp) { $color = 'table-success'; } else {