Vishal/major (#1029)

Author: vishalinfyom

src/Commands/Publish/PublishTablesCommand.php

@@ -66,7 +66,7 @@ protected function publishDataTableViews()
         ];
 
         foreach ($files as $stub => $blade) {
-            $sourceFile = get_template_file_path('scaffold/'.$stub, 'laravel-generator');
+            $sourceFile = get_file_path('views/scaffold/'.$stub, 'laravel-generator');
             $destinationFile = $viewsPath.$blade;
             $this->publishFile($sourceFile, $destinationFile, $blade);
         }

src/Commands/Publish/PublishUserCommand.php

@@ -41,7 +41,7 @@ private function copyViews()
         $files = $this->getViews();
 
         foreach ($files as $stub => $blade) {
-            $sourceFile = get_template_file_path('scaffold/'.$stub, $templateType);
+            $sourceFile = get_file_path('views/templates/'.$stub, $templateType);
             $destinationFile = $viewsPath.$blade;
             $this->publishFile($sourceFile, $destinationFile, $blade);
         }

src/helpers.php

@@ -69,6 +69,26 @@ function get_template_file_path(string $templateName, string $templateType): str
     }
 }
 
+if (!function_exists('get_file_path')) {
+    function get_file_path(string $templateName, string $templateType): string
+    {
+        $templateName = str_replace('.', '/', $templateName);
+
+        $templatesPath = config(
+            'laravel_generator.path.templates_dir',
+            resource_path('infyom/infyom-generator-templates/')
+        );
+
+        $path = $templatesPath.$templateName.'.blade.php';
+
+        if (file_exists($path)) {
+            return $path;
+        }
+
+        return get_templates_package_path($templateType).'/'.$templateName.'.blade.php';
+    }
+}
+
 if (!function_exists('get_templates_package_path')) {
     function get_templates_package_path(string $templateType): string
     {