From e5ae179b9d23e3d43e472ae1570c378c22923a15 Mon Sep 17 00:00:00 2001
From: IceToast <>
Date: Tue, 22 Nov 2022 13:42:46 +0100
Subject: [PATCH] Fixed Upgrade/Downgrade Credit withdrawal
---
app/Http/Controllers/ServerController.php | 59 ++++++++++++++++------
resources/views/servers/settings.blade.php | 10 ++--
2 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 00e2aea0..91ef195b 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -9,6 +9,7 @@ use App\Models\Nest;
use App\Models\Node;
use App\Models\Product;
use App\Models\Server;
+use App\Models\User;
use App\Models\Settings;
use App\Notifications\ServerCreationError;
use Carbon\Carbon;
@@ -219,8 +220,6 @@ class ServerController extends Controller
*/
private function serverCreationFailed(Response $response, Server $server)
{
- $server->delete();
-
return redirect()->route('servers.index')->with('error', json_encode($response->json()));
}
@@ -254,7 +253,7 @@ class ServerController extends Controller
{
- if($server->user_id != Auth::user()->id){ return back()->with('error', __('´This is not your Server!'));}
+ if($server->user_id != Auth::user()->id){ return back()->with('error', __('This is not your Server!'));}
$serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id);
$serverRelationships = $serverAttributes['relationships'];
$serverLocationAttributes = $serverRelationships['location']['attributes'];
@@ -293,7 +292,7 @@ class ServerController extends Controller
public function upgrade(Server $server, Request $request)
{
- if($server->user_id != Auth::user()->id) return redirect()->route('servers.index');
+ if($server->user_id != Auth::user()->id || $server->suspended) return redirect()->route('servers.index');
if(!isset($request->product_upgrade))
{
return redirect()->route('servers.show', ['server' => $server->id])->with('error', __('this product is the only one'));
@@ -315,24 +314,54 @@ class ServerController extends Controller
$checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
- $priceupgrade = $newProduct->getHourlyPrice();
+ // calculate the amount of credits that the user overpayed for the old product when canceling the server right now
+ // billing periods are hourly, daily, weekly, monthly, quarterly, half-annually, annually
+ $billingPeriod = $oldProduct->billing_period;
+ // seconds
+ $billingPeriods = [
+ 'hourly' => 3600,
+ 'daily' => 86400,
+ 'weekly' => 604800,
+ 'monthly' => 2592000,
+ 'quarterly' => 7776000,
+ 'half-annually' => 15552000,
+ 'annually' => 31104000
+ ];
+ // Get the amount of hours the user has been using the server
+ $billingPeriodMultiplier = $billingPeriods[$billingPeriod];
+ $timeDifference = now()->diffInSeconds($server->last_billed);
- if ($priceupgrade < $oldProduct->getHourlyPrice()) {
- $priceupgrade = 0;
- }
- if ($user->credits >= $priceupgrade && $user->credits >= $newProduct->minimum_credits)
+ error_log("Time DIFFERENCE!!!! ",$timeDifference);
+ // Calculate the price for the time the user has been using the server
+ $overpayedCredits = $oldProduct->price - $oldProduct->price * ($timeDifference / $billingPeriodMultiplier);
+
+
+ if ($user->credits >= $newProduct->price && $user->credits >= $newProduct->minimum_credits)
{
-
- $server->product_id = $request->product_upgrade;
- $server->update();
$server->allocation = $serverAttributes['allocation'];
+ // Update the server on the panel
$response = Pterodactyl::updateServer($server, $newProduct);
if ($response->failed()) return $this->serverCreationFailed($response, $server);
- //update user balance
- $user->decrement('credits', $priceupgrade);
+
+ // Remove the allocation property from the server object as it is not a column in the database
+ unset($server->allocation);
+ // Update the server on controlpanel
+ $server->update([
+ 'product_id' => $newProduct->id,
+ 'updated_at' => now(),
+ 'last_billed' => now(),
+ 'cancelled' => null,
+ ]);
+
+ // Refund the user the overpayed credits
+ if ($overpayedCredits > 0) $user->increment('credits', $overpayedCredits);
+
+ // Withdraw the credits for the new product
+ $user->decrement('credits', $newProduct->price);
+
//restart the server
$response = Pterodactyl::powerAction($server, "restart");
- if ($response->failed()) return redirect()->route('servers.index')->with('error', $response->json()['errors'][0]['detail']);
+ if ($response->failed()) return redirect()->route('servers.index')->with('error', 'Server upgraded successfully! Could not restart the server: '.$response->json()['errors'][0]['detail']);
return redirect()->route('servers.show', ['server' => $server->id])->with('success', __('Server Successfully Upgraded'));
}
else
diff --git a/resources/views/servers/settings.blade.php b/resources/views/servers/settings.blade.php
index 1a1b269b..edad1f7f 100644
--- a/resources/views/servers/settings.blade.php
+++ b/resources/views/servers/settings.blade.php
@@ -242,10 +242,7 @@
- {{__("FOR DOWNGRADE PLEASE CHOOSE A PLAN BELOW YOUR PLAN")}}
-
-
- {{__("YOUR PRODUCT")}} : {{ $server->product->name }}
+ {{__("Current Product")}}: {{ $server->product->name }}
@@ -255,12 +252,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")}}.
+
+ {{__("Caution") }}: {{__("Upgrading/Downgrading your server will reset your billing cycle to now. Your overpayed Credits will be refunded. The price for the new billing cycle will be withdrawed")}}.
{{__("Server will be automatically restarted once upgraded")}}