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

fixed some issues on moon total worth

Browse Source
This commit is contained in:
drkthunder02
2020-05-08 01:04:26 -05:00
parent 59c29e3a40
commit b00fd7d177
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,12 +382,6 @@ class MoonsController extends Controller
$fourthQuantity = $fourthQuantity / $totalPercent; $fourthQuantity = $fourthQuantity / $totalPercent;
} }
//Calculate the total moon goo value
$totalGoo = $moonCalc->SpatialMoonsOnlyGooTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity,
$thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity);
//Format the number to send to the blade
$totalGoo = number_format($totalGoo, 2, ".", ",");
//Calculate the total worth of the moon //Calculate the total worth of the moon
$totalWorth = $moonCalc->SpatialMoonsTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity, $totalWorth = $moonCalc->SpatialMoonsTotalWorth($firstOre, $firstQuantity, $secondOre, $secondQuantity,
$thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity); $thirdOre, $thirdQuantity, $fourthOre, $fourthQuantity);
@@ -552,7 +546,6 @@ class MoonsController extends Controller
} }
return view('moons.user.displayTotalWorth')->with('totalWorth', $totalWorth) return view('moons.user.displayTotalWorth')->with('totalWorth', $totalWorth)
->with('totalGoo', $totalGoo)
->with('composition', $composition) ->with('composition', $composition)
->with('reprocessing', $reprocessing); ->with('reprocessing', $reprocessing);
} }

3
resources/views/moons/user/displayTotalWorth.blade.php
View File

@@ -3,8 +3,7 @@
<div class="container"> <div class="container">
<h2>Total Worth of the Moon / Month</h2> <h2>Total Worth of the Moon / Month</h2>
<div class="jumbotron"> <div class="jumbotron">
Total Moon Goo + Ore Worth: {{ $totalWorth }} ISK<br> Total Moon Worth: {{ $totalWorth }} ISK<br>
Total Moon Goo Worth: {{ $totalGoo }} ISK<br>
</div> </div>
</div> </div>
<br> <br>