diff --git a/app/Conductors/Conductor.php b/app/Conductors/Conductor.php index f2f3c50..8bcc715 100644 --- a/app/Conductors/Conductor.php +++ b/app/Conductors/Conductor.php @@ -215,9 +215,6 @@ class Conductor throw new \Exception('Failed to create query builder instance for ' . $conductor->class . '.', 0, $e); } - // Scope query - $conductor->scope($conductor->query); - // Filter request $fields = $conductor->fields(new $conductor->class()); if (is_array($fields) === false) { @@ -231,6 +228,11 @@ class Conductor $conductor->filterRaw($request->input('filter', ''), $fields); } + // After Scope query + $conductor->query->where(function ($query) use ($conductor) { + $conductor->scope($query); + }); + // Sort request $conductor->sort($request->input('sort', $conductor->sort)); @@ -251,6 +253,7 @@ class Conductor $conductor->collection = $conductor->query->get(); + // Transform and Includes $includes = $conductor->includes; if ($request->has('includes') === true) {