diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index a5e7bcbd..61e480f0 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\Classes\Pterodactyl;
use App\Models\Egg;
use App\Models\Location;
use App\Models\Node;
@@ -55,6 +56,10 @@ class ProductController extends Controller
public function getLocationsBasedOnEgg(Request $request, Egg $egg)
{
$nodes = $this->getNodesBasedOnEgg($request, $egg);
+ foreach($nodes as $key => $node){
+ $pteroNode = Pterodactyl::getNode($node->id);
+ if($pteroNode['allocated_resources']['memory']>=($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)||$pteroNode['allocated_resources']['disk']>=($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)) $nodes->forget($key);
+ }
$locations = collect();
//locations
@@ -87,7 +92,7 @@ class ProductController extends Controller
{
if (is_null($egg->id) || is_null($node->id)) return response()->json('node and egg id is required', '400');
- return Product::query()
+ $products = Product::query()
->where('disabled', '=', false)
->whereHas('nodes', function (Builder $builder) use ($node) {
$builder->where('id', '=', $node->id);
@@ -96,5 +101,12 @@ class ProductController extends Controller
$builder->where('id', '=', $egg->id);
})
->get();
+
+ $pteroNode = Pterodactyl::getNode($node->id);
+ foreach($products as $key => $product){
+ if($product->memory>($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)-$pteroNode['allocated_resources']['memory']||$product->disk>($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)-$pteroNode['allocated_resources']['disk']) $product->doesNotFit = true;
+ }
+
+ return $products;
}
}
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 23aa53f8..5ee16dd5 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -241,6 +241,9 @@ class ServerController extends Controller
$serverRelationships = $serverAttributes['relationships'];
$serverLocationAttributes = $serverRelationships['location']['attributes'];
+ //Get current product
+ $currentProduct = Product::where('id', $server->product_id)->first();
+
//Set server infos
$server->location = $serverLocationAttributes['long'] ?
$serverLocationAttributes['long'] :
@@ -249,11 +252,19 @@ class ServerController extends Controller
$server->node = $serverRelationships['node']['attributes']['name'];
$server->name = $serverAttributes['name'];
$server->egg = $serverRelationships['egg']['attributes']['name'];
- $products = Product::orderBy("created_at")->get();
+
+ $pteroNode = Pterodactyl::getNode($serverRelationships['node']['attributes']['id']);
+
+ $products = Product::orderBy("created_at")
+ ->whereHas('nodes', function (Builder $builder) use ($serverRelationships) { //Only show products for that node
+ $builder->where('id', '=', $serverRelationships['node']['attributes']['id']);
+ })
+ ->get();
// Set the each product eggs array to just contain the eggs name
foreach ($products as $product) {
$product->eggs = $product->eggs->pluck('name')->toArray();
+ if($product->memory-$currentProduct->memory>($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)-$pteroNode['allocated_resources']['memory']||$product->disk-$currentProduct->disk>($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)-$pteroNode['allocated_resources']['disk']) $product->doesNotFit = true;
}
return view('servers.settings')->with([
diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php
index 5454a6b6..4ac74f79 100644
--- a/resources/views/servers/create.blade.php
+++ b/resources/views/servers/create.blade.php
@@ -218,10 +218,10 @@
diff --git a/resources/views/servers/settings.blade.php b/resources/views/servers/settings.blade.php
index e320533c..1a1b269b 100644
--- a/resources/views/servers/settings.blade.php
+++ b/resources/views/servers/settings.blade.php
@@ -255,13 +255,13 @@
@foreach($products as $product)
@if(in_array($server->egg, $product->eggs) && $product->id != $server->product->id && $product->disabled == false)
-
+
@endif
@endforeach
{{__("Once the Upgrade button is pressed, we will automatically deduct the amount for the first hour according to the new product from your credits")}}.
-
{{_("Server will be automatically restarted once upgraded")}}
+
{{__("Server will be automatically restarted once upgraded")}}