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

fix: standardize billing order status values and apply full-day expiry grace rule

Browse source 
- home_handling_functions.php: display expiration as Y-m-d only (not Y-m-d H:i);
  apply full-day grace by comparing date-only (midnight) in PHP so a server
  expiring on today's date remains Active the entire day
- cron-shop.php Step B & C: change server_expiration_date comparisons from
  < DATE_SUB(NOW(), ...) to DATE(server_expiration_date) < DATE_SUB(CURDATE(), ...)
  ensuring the full expiration day is honoured
- user_games/check_expire.php: change all three expiration queries from
  <= time() to < strtotime(date('Y-m-d')) (today-midnight) for full-day grace
- billing/test_integration.php: replace status='paid' (old order status) with
  status IN ('Active','paid') for backward compat during migration
- user_games/billing_integration.php: clarify comment that billing_invoices.status
  uses the payment lifecycle ('paid'/'unpaid'/'due'), separate from billing_orders.status
- Add modules/billing/sql/normalize_billing_order_status.sql migration script
  to convert installed->Active, paid->Active, suspended->Expired in existing rows
- Update CHANGELOG.md

Agent-Logs-Url: https://github.com/GameServerPanel/GSP/sessions/439845e0-926e-4b49-9cd0-810457b73c12

Co-authored-by: iaretechnician <2749183+iaretechnician@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-05-05 17:24:41 +00:00 • committed by GitHub
parent 5f3013b4a4
commit 5b2162fb28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 79 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/gamemanager/home_handling_functions.php
View file

@ -496,13 +496,17 @@ function get_monitor_buttons($server_home, $server_xml)
* provisioned).
*
* Color thresholds:
* green – more than 10 days remaining (shows actual date)
* green – more than 10 days remaining (shows actual date, YYYY-MM-DD)
* yellow – 4–10 days remaining (shows "X days remaining")
* red – 1–3 days remaining (shows "X days remaining")
* red – less than 1 day but not yet expired (shows "Less than 1 day remaining")
* red – already expired/suspended (shows "Suspended")
* red – no order or NULL/invalid end_date (shows "No expiration date found")
*
* Expiration grace rule: a server whose end_date falls on today is treated as
* active for the full calendar day. The server only shows "Suspended" once
* today's date is strictly after the expiration date (i.e. tomorrow onwards).
*
* @param int $home_id The server home ID.
* @return string Safe HTML string ready for inline display.
*/
@ -551,17 +555,20 @@ function get_server_billing_expiration_html(int $home_id): string
return "<span style='color:red;'>No expiration date found</span>";
}
$now = new DateTime();
$diff = $now->diff($end_dt);
// Compare dates only (strip time) so a server expiring on today's date is
// still shown as active for the full calendar day (grace rule).
$today_midnight = (new DateTime())->setTime(0, 0, 0);
$end_midnight = (clone $end_dt)->setTime(0, 0, 0);
$diff = $today_midnight->diff($end_midnight);
if ($end_dt <= $now) {
// Server billing period has already passed — treat as suspended.
if ($end_midnight < $today_midnight) {
// Expiration date is before today — treat as suspended.
return "<span style='color:red;'>Suspended</span>";
}
// $diff->days is the total number of whole days between $now and $end_dt.
// $diff->days is the total number of whole days between today and end date.
$days_remaining = (int)$diff->days;
$display_date = htmlentities($end_dt->format('Y-m-d H:i'), ENT_QUOTES, 'UTF-8');
$display_date = htmlentities($end_dt->format('Y-m-d'), ENT_QUOTES, 'UTF-8');
if ($days_remaining > 10) {
// More than 10 days: show the actual expiration date in green.