GSP/Panel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix server end_date display with color coding and improve cron-shop automation

Browse source 
Co-authored-by: iaretechnician <2749183+iaretechnician@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-10-29 03:25:58 +00:00
parent 0e345ba8ca
commit f11aeb2f7d
2 changed files with 60 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/gamemanager/server_monitor.php
View file

@ -341,33 +341,57 @@ echo "<table id='servermonitor' class='tablesorter' data-sortlist='[[0,0],[3,1]]
//default is it never expires
$expiration_dates = "This Server Will NEVER Expire";
//get all orders thare are active or invoiced
$query = "SELECT * FROM ogp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status IN ('paid', 'invoiced', 'suspended', 'in-cart', 'unknown')" ;
$query = "SELECT * FROM ogp_billing_orders WHERE home_id = " . $server_home['home_id'] . " AND status IN ('installed', 'paid', 'renew', 'invoiced', 'suspended', 'in-cart', 'unknown')" ;
$results = $db->resultQuery($query);
if(!is_null($results[0]['status']))
{
//there is an end date
if($results[0]['status'] == 'paid')
if($results[0]['status'] == 'installed' || $results[0]['status'] == 'paid')
{
$expire_date = $results[0]['finish_date'];
$expiration_dates = "<font color='green'>" . read_expire($expire_date) . "</font>";
$expire_date = strtotime($results[0]['end_date']);
$current_time = time();
$days_until_expiry = floor(($expire_date - $current_time) / 86400);
// Color coding based on time until expiration
if($days_until_expiry <= 3 && $days_until_expiry >= 0) {
// 3 days or less before expiration - RED
$expiration_dates = "<font color='red'>" . read_expire($expire_date) . "</font>";
} elseif($days_until_expiry <= 7 && $days_until_expiry > 3) {
// 7 days or less (but more than 3) before expiration - YELLOW
$expiration_dates = "<font color='yellow'>" . read_expire($expire_date) . "</font>";
} elseif($days_until_expiry < 0) {
// Already expired - RED
$expiration_dates = "<font color='red'>" . read_expire($expire_date) . " (EXPIRED)</font>";
} else {
// More than 7 days - GREEN
$expiration_dates = "<font color='green'>" . read_expire($expire_date) . "</font>";
}
}
// renew status - renewal invoice created, server still running
if($results[0]['status'] == 'renew')
{
$expire_date = strtotime($results[0]['end_date']);
$expiration_dates = "<font color='yellow'>". read_expire($expire_date) . "</font><a href='home.php?m=billing&p=cart'> Renew Invoice</a>";
}
// in-cart its expire, invoice printed
if($results[0]['status'] == 'in-cart' || $results[0]['status'] == 'unknown')
{
$expire_date = $results[0]['finish_date'];
$expire_date = strtotime($results[0]['end_date']);
$expiration_dates = "<font color='yellow'>". read_expire($expire_date) . "</font><a href='home.php?m=billing&p=cart'> Invoice</a>";
}
// invoiced its expire, invoice printed
if($results[0]['status'] == 'invoiced')
{
$expire_date = $results[0]['finish_date'];
$expire_date = strtotime($results[0]['end_date']);
$expiration_dates = "<font color='yellow'>". read_expire($expire_date) . "</font><a href='home.php?m=billing&p=cart'> Invoice</a>";
}
// suspended its suspended, invoice still available
if($results[0]['status'] == 'suspended')
{
$expire_date = $results[0]['finish_date'];
$expire_date = strtotime($results[0]['end_date']);
$expiration_dates = "<font color='red'> SUSPENDED </font><a href='home.php?m=billing&p=cart'> Invoice</a>";
}