Merge branch '4.0'

* 4.0:
  Bump v4.10.1 🚀
  added space after if and before '('
  added support for Laravel 8.x if Models directory exists then use Models directory in namespace for model
  Add Laravel DataTables 9.x on requirements

Author: yajra

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Laravel DataTables Buttons Plugin CHANGELOG.
 
+## v4.10.1 - 10-31-2020
+
+- Fix model namespace for Laravel 8.x [#117], credits to @luckys383.
+
 ## v4.10.0 - 09-09-2020
 
 - Add support for Laravel 8.
@@ -210,6 +214,7 @@ ajax(), dataTable(), query(), csv(), excel(), pdf(), printPreview()
 [#99]: https://github.com/yajra/laravel-datatables-buttons/pull/99
 [#102]: https://github.com/yajra/laravel-datatables-buttons/pull/102
 [#105]: https://github.com/yajra/laravel-datatables-buttons/pull/105
+[#117]: https://github.com/yajra/laravel-datatables-buttons/pull/117
 
 [#19]: https://github.com/yajra/laravel-datatables-buttons/issues/19
 [#1558]: https://github.com/yajra/laravel-datatables/issues/1558

README.md

@@ -12,6 +12,7 @@ This package is a plugin of [Laravel DataTables](https://github.com/yajra/larave
 ## Requirements
 - [PHP >=7.0](http://php.net/)
 - [Laravel 5.x](https://github.com/laravel/framework)
+- [Laravel DataTables 9.x](https://github.com/yajra/laravel-datatables)
 - [jQuery DataTables v1.10.x](http://datatables.net/)
 - [jQuery DataTables Buttons Extension](https://datatables.net/reference/button/)
 

src/Generators/DataTablesMakeCommand.php

@@ -361,6 +361,11 @@ protected function getModel()
             return $this->option('model');
         }
 
+        // check if model namespace is not set in command and Models directory already exists then use that directory in namespace.
+        if ($modelNamespace == '') {
+            $modelNamespace = is_dir(app_path('Models')) ? 'Models' : $rootNamespace;
+        }
+
         return $model
             ? $rootNamespace . '\\' . ($modelNamespace ? $modelNamespace . '\\' : '') . Str::singular($name)
             : $rootNamespace . '\\User';