Merge pull request #66 from iFreshDevelopment/2.x

Improve compatibility with general eloquent usage and Laravel Nova

Author: Smef

src/Database/Query/FMBaseBuilder.php

@@ -340,6 +340,12 @@ public function recordId($recordId)
 
     public function orderBy($column, $direction = self::ASCEND): FMBaseBuilder
     {
+        $direction = match($direction) {
+            self::ASCEND, 'asc' => self::ASCEND,
+            self::DESCEND, 'desc' => self::DESCEND,
+            default => $direction
+        };
+
         $this->appendSortOrder($column, $direction);
 
         return $this;
@@ -1065,4 +1071,9 @@ protected function invalidOperatorAndValue($operator, $value)
         return is_null($value) && in_array($operator, $this->operators) &&
             ! in_array($operator, ['=', '==', '!=', '≠']);
     }
+
+    public function getCountForPagination($columns = ['*'])
+    {
+        return $this->count($columns);
+    }
 }