fix users table sorting and add users to payments

app/Http/Controllers/Admin/PaymentController.php

@@ -658,7 +658,8 @@ class PaymentController extends Controller
 
         return datatables($query)
             ->editColumn('user', function (Payment $payment) {
-                return $payment->user->name;
+                return 
+                ($payment->user)?'<a href="'.route('admin.users.show', $payment->user->id).'">'.$payment->user->name.'</a>':__('Unknown user');
             })
             ->editColumn('price', function (Payment $payment) {
                 return $payment->formatToCurrency($payment->price);
@@ -679,7 +680,7 @@ class PaymentController extends Controller
             ->addColumn('actions', function (Payment $payment) {
                 return '<a data-content="' . __("Download") . '" data-toggle="popover" data-trigger="hover" data-placement="top"  href="' . route('admin.invoices.downloadSingleInvoice', "id=" . $payment->payment_id) . '" class="btn btn-sm text-white btn-info mr-1"><i class="fas fa-file-download"></i></a>';
             })
-            ->rawColumns(['actions'])
+            ->rawColumns(['actions', 'user'])
             ->make(true);
     }
 }

app/Http/Controllers/Admin/UserController.php

@@ -288,7 +288,8 @@ class UserController extends Controller
                 return $user->discordUser ? $user->discordUser->id : '';
             })
             ->addColumn('last_seen', function (User $user) {
-                return $user->last_seen ? $user->last_seen->diffForHumans() : '';
+                return ['display' => $user->last_seen ? $user->last_seen->diffForHumans() : '',
+                        'raw' => $user->last_seen ? strtotime($user->last_seen) : ''];
             })
             ->addColumn('actions', function (User $user) {
                 $suspendColor = $user->isSuspended() ? "btn-success" : "btn-warning";
@@ -331,9 +332,9 @@ class UserController extends Controller
             ->editColumn('name', function (User $user) {
                 return '<a class="text-info" target="_blank" href="' . config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/admin/users/view/' . $user->pterodactyl_id . '">' . strip_tags($user->name) . '</a>';
             })
-            ->orderColumn('last_seen', function ($query) {
+            /*->orderColumn('last_seen', function ($query) {
                 $query->orderBy('last_seen', "desc");
-            })
+            })*/
             ->rawColumns(['avatar', 'name', 'credits', 'role', 'usage', 'referrals', 'actions', 'last_seen'])
             ->make(true);
     }

resources/views/admin/payments/index.blade.php

@@ -39,6 +39,7 @@
                             <tr>
                                 <th>{{ __('ID') }}</th>
                                 <th>{{ __('Type') }}</th>
+                                <th>{{ __('User') }}</th>
                                 <th>{{ __('Amount') }}</th>
                                 <th>{{ __('Product Price') }}</th>
                                 <th>{{ __('Tax Value') }}</th>
@@ -76,6 +77,7 @@
                 columns: [
                     {data: 'id',name: 'payments.id'},
                     {data: 'type'},
+                    {data: 'user', sortable: false},
                     {data: 'amount'},
                     {data: 'price'},
                     {data: 'tax_value'},

resources/views/admin/users/index.blade.php

@@ -90,10 +90,10 @@
                     {data: 'role'},
                     {data: 'email', name: 'users.email'},
                     {data: 'credits' , name : 'users.credits'},
-                    {data: 'servers' , sortable : false},
+                    {data: 'servers'},
                     {data: 'referrals'},
                     {data: 'verified' , sortable : false},
-                    {data: 'last_seen'},
+                    {data: 'last_seen', type: 'num', render: {_: 'display', sort: 'raw'}},
                     {data: 'actions' , sortable : false},
                 ],
                 fnDrawCallback: function( oSettings ) {