Merge pull request #2906 from Arkhas/fix_custom_order_on_eager_load_relationship

fix: Custom Order on eager loaded relationships was not working

Author: yajra

src/QueryDataTable.php

@@ -631,7 +631,9 @@ protected function defaultOrdering(): void
             ->each(function ($orderable) {
                 $column = $this->resolveRelationColumn($orderable['name']);
 
-                if ($this->hasOrderColumn($column)) {
+                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']);

tests/Integration/CustomOrderTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Yajra\DataTables\Tests\Integration;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\DataTables;
+use Yajra\DataTables\Tests\Models\Post;
+use Yajra\DataTables\Tests\TestCase;
+
+class CustomOrderTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_can_order_with_custom_order()
+    {
+        $response = $this->getJsonResponse([
+            'order' => [
+                [
+                    'column' => 0,
+                    'dir'    => 'asc',
+                ],
+            ],
+        ]);
+
+        $this->assertEquals(
+            $response->json()['data'][0]['user']['id'],
+            collect($response->json()['data'])->pluck('user.id')->max()
+        );
+    }
+
+    protected function getJsonResponse(array $params = [])
+    {
+        $data = [
+            'columns' => [
+                ['data' => 'user.id', 'name' => 'user.id', 'searchable' => 'true', 'orderable' => 'true'],
+                ['data' => 'title', 'name' => 'posts.title', 'searchable' => 'true', 'orderable' => 'true'],
+            ],
+            'length'  => 10,
+            'start'   => 0,
+            'draw'    => 1,
+        ];
+
+        return $this->call(
+            'GET',
+            '/relations/belongsTo',
+            array_merge($data, $params)
+        );
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->app['router']->get('/relations/belongsTo', function (DataTables $datatables) {
+            return $datatables->eloquent(Post::with('user')->select('posts.*'))
+                              ->orderColumn('user.id', function ($query, $order) {
+                                  $query->orderBy('users.id', $order == 'desc' ? 'asc' : 'desc');
+                              })
+                              ->toJson();
+        });
+    }
+}