Fix logic of where method to work with whereNot

src/Database/Eloquent/FMEloquentBuilder.php

@@ -7,6 +7,7 @@
 use GearboxSolutions\EloquentFileMaker\Exceptions\FileMakerDataApiException;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -73,6 +74,7 @@ public function exists()
                 throw $e;
             }
         }
+
         // It didn't error, so we have something
         return true;
     }
@@ -262,8 +264,8 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
     /**
      * Compares a model's modified portal data and original portal data and returns portal data with only modified fields and recordIds
      *
-     * @param $array1 array The modified portal data
-     * @param $array2 array The model's original portal data
+     * @param  $array1  array The modified portal data
+     * @param  $array2  array The model's original portal data
      */
     protected function getOnlyModifiedPortalFields($array1, $array2): array
     {
@@ -288,4 +290,61 @@ protected function getOnlyModifiedPortalFields($array1, $array2): array
 
         return $result;
     }
+
+    public function applyScopes()
+    {
+        $builder = parent::applyScopes();
+
+        $query = $builder->getQuery();
+
+        foreach ($query->wheres as $index => $find) {
+            if (! empty($find)) {
+                continue;
+            }
+
+            unset($query->wheres[$index]);
+        }
+
+        return $builder;
+    }
+
+    /**
+     * Apply the given scope on the current builder instance.
+     *
+     * @return mixed
+     */
+    protected function callScope(callable $scope, array $parameters = [])
+    {
+        array_unshift($parameters, $this);
+
+        $query = $this->getQuery();
+
+        $result = $this;
+
+        $scopeApplied = false;
+
+        foreach ($query->wheres as $index => $find) {
+            if (($find['omit'] ?? 'false') === 'true') {
+                continue;
+            }
+
+            $query->setFindRequestIndex($index);
+
+            $result = $scope(...$parameters) ?? $this;
+
+            $scopeApplied = true;
+        }
+
+        if (! $scopeApplied) {
+            array_unshift($query->wheres, []);
+
+            $query->setFindRequestIndex(0);
+
+            $result = $scope(...$parameters) ?? $this;
+        }
+
+        $query->resetFindRequestIndex();
+
+        return $result;
+    }
 }

src/Database/Eloquent/FMModel.php

@@ -18,9 +18,9 @@
 
 abstract class FMModel extends Model
 {
+    use FMGuardsAttributes;
     use FMHasAttributes;
     use FMHasRelationships;
-    use FMGuardsAttributes;
 
     /**
      * Indicates if the model should be timestamped.