fix: applyOrderColumn with column alias

Author: Seb33300

src/QueryDataTable.php

@@ -662,8 +662,6 @@ protected function defaultOrdering(): void
                 $column = $this->resolveRelationColumn($orderable['name']);
 
                 if ($this->hasOrderColumn($orderable['name'])) {
-                    $this->applyOrderColumn($orderable['name'], $orderable);
-                } elseif ($this->hasOrderColumn($column)) {
                     $this->applyOrderColumn($column, $orderable);
                 } else {
                     $nullsLastSql = $this->getNullsLastSql($column, $orderable['direction']);
@@ -687,16 +685,16 @@ protected function hasOrderColumn(string $column): bool
      */
     protected function applyOrderColumn(string $column, array $orderable): void
     {
-        $sql = $this->columnDef['order'][$column]['sql'];
+        $sql = $this->columnDef['order'][$orderable['name']]['sql'];
         if ($sql === false) {
             return;
         }
 
         if (is_callable($sql)) {
-            call_user_func($sql, $this->query, $orderable['direction']);
+            call_user_func($sql, $this->query, $orderable['direction'], $column);
         } else {
             $sql = str_replace('$1', $orderable['direction'], (string) $sql);
-            $bindings = $this->columnDef['order'][$column]['bindings'];
+            $bindings = $this->columnDef['order'][$orderable['name']]['bindings'];
             $this->query->orderByRaw($sql, $bindings);
         }
     }

tests/Integration/CustomOrderTest.php

@@ -54,8 +54,8 @@ protected function setUp(): void
         parent::setUp();
 
         $this->app['router']->get('/relations/belongsTo', fn (DataTables $datatables) => $datatables->eloquent(Post::with('user')->select('posts.*'))
-            ->orderColumn('user.id', function ($query, $order) {
-                $query->orderBy('users.id', $order == 'desc' ? 'asc' : 'desc');
+            ->orderColumn('user.id', function ($query, $order, $column) {
+                $query->orderBy($column, $order == 'desc' ? 'asc' : 'desc');
             })
             ->toJson());
     }