Minor fix on BaseRepository

Author: bryanvimigo

src/Commands/CriteriaCommand.php

@@ -48,7 +48,7 @@ public function handle()
         $content = $this->fileManager->get($this->stubs['criteria']);
 
         $replacements = [
-            '%namespace%' => "{$this->appNamespace}Criteria\\{$criteria}",
+            '%namespace%' => "{$this->appNamespace}Criteria",
             '%criteriaName%' => $this->criteriaName
         ];
 

src/Eloquent/BaseRepository.php

@@ -491,7 +491,12 @@ protected function manageDeletes(int $id, string $method)
         if (($method === 'forceDelete' || $method === 'restore') && !in_array(SoftDeletes::class, class_uses($this->model)))
             throw new RepositoryException("Model must implement SoftDeletes Trait to use forceDelete() or restore() method.");
 
-        $model = $this->model->withTrashed()->find($id);
+        if ($method === 'forceDelete' || $method === 'restore')
+            $model = $this->model->withTrashed();
+        else
+            $model = $this->model;
+
+        $model = $model->find($id);
         $originalModel = clone $model;
 
         $this->resetModel();