";
+ echo "
Orphaned home_id Diagnostics
";
+ echo "
Billing orders that reference a home_id which no longer exists in gsp_server_homes. ";
+ echo "These orders will not show an expiration date on the game monitor. ";
+ echo "Reset home_id to 0 or re-provision these orders to fix them. ";
+ echo "Run normalize_billing_order_status.sql to standardise any legacy status values.
";
+
+ if (empty($orphans)) {
+ echo "
✓ No orphaned billing orders found.
";
+ } else {
+ echo "
";
+ echo "| Order ID | User ID | Server Name | home_id (missing) | Status | End Date |
|---|
";
+ foreach ($orphans as $row) {
+ echo "";
+ echo "| ".intval($row['order_id'])." | ";
+ echo "".intval($row['user_id'])." | ";
+ echo "".htmlspecialchars($row['home_name'] ?? '')." | ";
+ echo "".htmlspecialchars($row['home_id'] ?? '')." | ";
+ echo "".htmlspecialchars($row['status'] ?? '')." | ";
+ echo "".htmlspecialchars($row['end_date'] ?? 'NULL')." | ";
+ echo "
";
+ }
+ echo "
";
+ }
+ echo "
Renew
diff --git a/modules/billing/normalize_billing_order_status.sql b/modules/billing/normalize_billing_order_status.sql
new file mode 100644
index 00000000..b366e58f
--- /dev/null
+++ b/modules/billing/normalize_billing_order_status.sql
@@ -0,0 +1,64 @@
+-- normalize_billing_order_status.sql
+--
+-- One-time migration: standardise gsp_billing_orders.status to the canonical
+-- three-value set used by cron-shop.php, create_servers.php, and the game
+-- monitor expiration lookup:
+--
+-- Active – server provisioned and billing current
+-- Invoiced – renewal invoice open; service still running
+-- Expired – invoice unpaid past grace period; server suspended/awaiting deletion
+--
+-- Legacy → canonical mapping applied by this script:
+-- 'installed' → 'Active' (provisioned via old invoice-first flow)
+-- 'paid' → 'Active' (payment captured but before explicit provisioning step)
+-- 'suspended' → 'Invoiced' (overdue; renewal invoice was open — maps to Invoiced
+-- so cron Step B will expire them on the next run if
+-- still unpaid, rather than silently treating them as Active)
+--
+-- All other statuses ('in-cart', 'cancelled', 'refunded', 'Active', 'Invoiced',
+-- 'Expired') are left unchanged.
+--
+-- Compatible with MySQL 5.7+ and MariaDB 10.2+.
+-- Table prefix is hardcoded to gsp_ (standalone billing module context).
+-- Run ONCE on an existing installation; safe to run again (no-op on clean data).
+
+-- 'installed' → 'Active'
+UPDATE `gsp_billing_orders`
+ SET `status` = 'Active'
+ WHERE `status` = 'installed';
+
+-- 'paid' → 'Active'
+UPDATE `gsp_billing_orders`
+ SET `status` = 'Active'
+ WHERE `status` = 'paid';
+
+-- 'suspended' → 'Invoiced'
+-- These rows had an open renewal invoice; cron-shop Step B will move them to
+-- 'Expired' on the next run if the invoice remains unpaid.
+UPDATE `gsp_billing_orders`
+ SET `status` = 'Invoiced'
+ WHERE `status` = 'suspended';
+
+-- Diagnostic: show any remaining non-canonical status values after migration.
+-- Expected result: only rows with status IN ('Active','Invoiced','Expired',
+-- 'in-cart','cancelled','refunded') should appear.
+SELECT `status`, COUNT(*) AS `count`
+ FROM `gsp_billing_orders`
+ GROUP BY `status`
+ ORDER BY `status`;
+
+-- Diagnostic: billing_orders whose home_id references a non-existent server home.
+-- These orders will show "No expiration date found" on the game monitor until
+-- home_id is corrected (set to the real home_id or to 0 if the server is gone).
+SELECT o.`order_id`,
+ o.`user_id`,
+ o.`home_name`,
+ o.`home_id` AS missing_home_id,
+ o.`status`,
+ o.`end_date`
+ FROM `gsp_billing_orders` o
+ LEFT JOIN `gsp_server_homes` sh ON sh.`home_id` = o.`home_id`
+ WHERE o.`home_id` != '0'
+ AND o.`home_id` != ''
+ AND sh.`home_id` IS NULL
+ ORDER BY o.`order_id`;
diff --git a/modules/gamemanager/home_handling_functions.php b/modules/gamemanager/home_handling_functions.php
index fd58c309..d968971d 100644
--- a/modules/gamemanager/home_handling_functions.php
+++ b/modules/gamemanager/home_handling_functions.php
@@ -514,15 +514,13 @@ function get_server_billing_expiration_html(int $home_id): string
// billing_orders.home_id is VARCHAR(255), so we quote the value in the query.
// We exclude rows where home_id = '0' (not yet provisioned).
//
- // Status whitelist — covers all active/paid states regardless of billing flow:
- // 'Active' – set by payment_processor.php after PayPal capture
- // 'Invoiced' – renewal invoice generated by cron-shop.php
- // 'installed'– used by the invoice-first provisioning flow
- // 'paid' – used by the invoice-first provisioning flow
- // 'suspended'– overdue but not yet fully expired; date still meaningful
+ // Only canonical active statuses are considered:
+ // 'Active' – provisioned and current (set by payment capture or admin creation)
+ // 'Invoiced' – renewal invoice generated; service still running while unpaid
//
- // Terminal statuses ('Expired', 'in-cart', 'cancelled', 'refunded') are excluded
- // because they represent orders with no active service period.
+ // Terminal statuses ('Expired', 'in-cart', 'cancelled', 'refunded') and legacy
+ // statuses ('installed', 'paid', 'suspended') are not matched here.
+ // Run normalize_billing_order_status.sql to migrate any legacy rows first.
//
// OGP_DB_PREFIX is replaced at runtime by the panel DB wrapper (str_replace).
$rows = $db->resultQuery(
@@ -530,7 +528,7 @@ function get_server_billing_expiration_html(int $home_id): string
FROM OGP_DB_PREFIXbilling_orders
WHERE home_id = '" . intval($home_id) . "'
AND home_id != '0'
- AND status IN ('Active','Invoiced','installed','paid','suspended')
+ AND status IN ('Active','Invoiced')
ORDER BY end_date DESC
LIMIT 1"
);
diff --git a/modules/user_games/billing_integration.php b/modules/user_games/billing_integration.php
index 48ba2b8b..bc931b95 100644
--- a/modules/user_games/billing_integration.php
+++ b/modules/user_games/billing_integration.php
@@ -5,7 +5,7 @@
* Shared helper for recording admin-created game servers in the billing tables,
* so they are treated identically to FREE website orders:
* billing_invoices (status='paid', amount=0)
- * billing_orders (status='installed', price=0)
+ * billing_orders (status='Active', price=0)
*
* This does NOT re-provision the server — the caller (add_home.php) already
* created the server via the panel DB layer. We only write the billing ledger
@@ -113,7 +113,7 @@ if (!function_exists('admin_register_server_in_billing')) {
}
// ------------------------------------------------------------------ //
- // 4. Insert billing_order (status='installed', already provisioned). //
+ // 4. Insert billing_order (status='Active', already provisioned). //
// ------------------------------------------------------------------ //
$order_fields = array(
'user_id' => intval($user_id),
@@ -128,7 +128,7 @@ if (!function_exists('admin_register_server_in_billing')) {
'remote_control_password' => '',
'ftp_password' => '',
'home_id' => intval($home_id),
- 'status' => 'installed',
+ 'status' => 'Active',
'order_date' => $now,
'end_date' => $end_date,
'payment_txid' => 'admin-created',