Merge branch 'master' of github.com:akaunting/akaunting

2021-01-19 14:50:01 +03:00
parent 2dbb40ff7c f7bc89806c
commit d304fac4a5
5 changed files with 14 additions and 4 deletions
--- a/app/Abstracts/Model.php
+++ b/app/Abstracts/Model.php
@ -90,7 +90,7 @@ abstract class Model extends Eloquent

        $query->usingSearchString($search)->sortable($sort);

-        if ($request->expectsJson()) {
+        if ($request->expectsJson() && $request->isNotApi()) {
            return $query->get();
        }