Modified all points Allan sent via email on 04-05-2026

classes/Subscriptions.php

@@ -595,12 +595,18 @@ class Subscriptions extends Base {
 
     public function getUsersActiveSubscriptions($user_serial) {
 
-        $SQL = "select view_usersubscriptions.*
-                  from view_usersubscriptions
-                 where usersubscription_user_serial = {$user_serial}
-                   and view_usersubscriptions.usersubscription_status = 'ACTIVE'
-                   and view_usersubscriptions.usersubscription_stop_date >= now()
-              order by view_usersubscriptions.subscription_title, view_usersubscriptions.usersubscription_status";
+        $SQL = "SELECT view_usersubscriptions.*
+                  FROM view_usersubscriptions
+                 WHERE usersubscription_user_serial = 67
+                   AND view_usersubscriptions.usersubscription_status = 'ACTIVE'
+                   AND view_usersubscriptions.usersubscription_stop_date >= NOW()
+              ORDER BY 
+                  CASE 
+                    WHEN view_usersubscriptions.subscription_area = 'All' THEN 0
+                    ELSE 1
+                   END,
+                      view_usersubscriptions.subscription_title, 
+                      view_usersubscriptions.usersubscription_status";
 
         return $this->getTable("usersubscriptions", $SQL);
     }