Add trial end date to admin users list

2026-05-09 05:35:00 +00:00 · 2026-02-16 17:13:30 +01:00
parent 19c2abd622
commit d783a01e95
7 changed files with 44 additions and 1 deletions
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -6,7 +6,10 @@ module Admin

    def index
      authorize User
-      @users = policy_scope(User).order(:email)
+      @users = policy_scope(User)
+        .left_joins(family: :subscription)
+        .includes(family: :subscription)
+        .order(Arel.sql("subscriptions.trial_ends_at IS NULL, subscriptions.trial_ends_at ASC, users.email ASC"))
    end

    def update