Fix plugin make CRUD command

Author: sangnguyenplus

src/Commands/Concerns/HasModuleSelector.php

@@ -59,7 +59,7 @@ public function getModule(): string
 
     public function transformModuleToNamespace(): string
     {
-        return str($this->module)
+        return str($this->getModule())
             ->replace(DIRECTORY_SEPARATOR, '\\')
             ->afterLast('\\')
             ->studly()

src/Commands/PluginCreateCommand.php

@@ -164,8 +164,6 @@ protected function removeUnusedFiles(string $location): void
 
     public function getReplacements(string $replaceText): array
     {
-        $namespace = Str::of($this->replaceNamespace($this->argument('namespace')))->append('\\\\');
-
         return [
             '{type}' => 'plugin',
             '{types}' => 'plugins',
@@ -179,8 +177,8 @@ public function getReplacements(string $replaceText): array
             '{Module}' => Str::of(str_replace('\\\\', '\\', $this->argument('namespace'))),
             '{PluginId}' => $this->argument('id'),
             '{PluginName}' => ucfirst(str_replace('-', ' ', $this->argument('name'))),
-            '{PluginNamespace}' => $namespace,
-            '{PluginServiceProvider}' => $namespace . 'Providers\\\\' . $this->argument('provider'),
+            '{PluginNamespace}' => Str::of($this->replaceNamespace($this->argument('namespace')))->append('\\\\'),
+            '{PluginServiceProvider}' => Str::of($this->replaceNamespace($this->argument('namespace')))->append('\\\\') . 'Providers\\\\' . $this->argument('provider'),
             '{PluginAuthor}' => $this->argument('author'),
             '{PluginAuthorURL}' => $this->argument('author_url'),
             '{PluginVersion}' => $this->argument('version'),

src/Commands/PluginMakeCrudCommand.php

@@ -2,6 +2,7 @@
 
 namespace Botble\DevTool\Commands;
 
+use Botble\Base\Facades\BaseHelper;
 use Botble\DevTool\Commands\Abstracts\BaseMakeCommand;
 use Botble\DevTool\Commands\Concerns\HasSubModule;
 use Botble\DevTool\Helper;
@@ -46,7 +47,6 @@ public function handle(): int
 
         $this->handleReplacements($location, [
             Helper::joinPaths(['config', 'permissions.stub']),
-            Helper::joinPaths(['helpers', 'helpers.stub']),
             Helper::joinPaths(['routes', 'web.stub']),
             Helper::joinPaths(['src', 'Providers', '{Module}ServiceProvider.stub']),
             Helper::joinPaths(['src', 'Plugin.stub']),
@@ -64,20 +64,35 @@ protected function removeUnusedFiles(string $location): void
     {
         $files = [
             Helper::joinPaths(['config', 'permissions.stub']),
-            Helper::joinPaths(['helpers', 'constants.stub']),
             Helper::joinPaths(['routes', 'web.stub']),
+            Helper::joinPaths(['resources', 'views', '.gitkeep']),
+            'composer.json',
             Helper::joinPaths(['src', 'Providers', '{Module}ServiceProvider.stub']),
+            Helper::joinPaths(['src', 'Forms', 'Settings', '{Module}Form.stub']),
+            Helper::joinPaths(['src', 'Http', 'Controllers', 'Settings', '{Module}Controller.stub']),
+            Helper::joinPaths(['src', 'Http', 'Requests', 'Settings', '{Module}Request.stub']),
+            Helper::joinPaths(['src', 'PanelSections', '{Module}PanelSection.stub']),
         ];
 
         foreach ($files as $file) {
             File::delete(Helper::joinPaths([$location, $file]));
         }
+
+        File::deleteDirectory(Helper::joinPaths([$location, 'src', 'PanelSections', '']));
     }
 
     public function getReplacements(string $replaceText): array
     {
         $module = strtolower($this->argument('plugin'));
 
+        $pluginContent = BaseHelper::getFileData(BaseHelper::joinPaths([plugin_path($module), 'plugin.json']));
+
+        $namespace = $module;
+
+        if ($pluginContent) {
+            $namespace = $pluginContent['namespace'];
+        }
+
         return [
             '{type}' => 'plugin',
             '{types}' => 'plugins',
@@ -88,7 +103,7 @@ public function getReplacements(string $replaceText): array
             '{Modules}' => ucfirst(Str::plural(Str::snake(str_replace('-', '_', $module)))),
             '{-modules}' => Str::plural($module),
             '{MODULE}' => strtoupper(Str::snake(str_replace('-', '_', $module))),
-            '{Module}' => ucfirst(Str::camel($module)),
+            '{Module}' => rtrim($namespace, '\\'),
         ];
     }
 

stubs/plugin/src/Providers/{Name}ServiceProvider.stub

@@ -14,7 +14,7 @@ class {Name}ServiceProvider extends ServiceProvider
         $this
             ->setNamespace('{types}/{-name}')
             {PluginBootProvider}
-        {PluginRegisterLanguage}
-        {PluginRegisterDashboardMenu}
+            {PluginRegisterLanguage}
+            {PluginRegisterDashboardMenu}
     }
 }

stubs/sub-module/helpers/helpers.stub

@@ -1,4 +1,4 @@
-// Add below this line: Route::group(['prefix' => BaseHelper::getAdminPrefix(), 'middleware' => 'auth'], function () {
+// Add below this line: AdminHelper::registerRoutes(function () {
 Route::group(['prefix' => '{-names}', 'as' => '{-name}.'], function () {
     Route::resource('', '{Name}Controller')->parameters(['' => '{-name}']);
 });

stubs/sub-module/routes/web.stub

@@ -3,7 +3,7 @@
     'name',
 ]);
 
-// Add after this line: Event::listen(RouteMatched::class, function () {
+// Add after this line: DashboardMenu::default()->beforeRetrieving(function () {
 \Botble\Base\Facades\DashboardMenu::registerItem([
     'id' => 'cms-{types}-{-name}',
     'priority' => 0,