Merge branch 'develop' into 8.0

Author: mitulgolakiya

README.md

@@ -31,7 +31,7 @@ You can support us by either sponsoring us or buying one of our paid products. O
 
 ### Buy our Paid Products
 
-[![InfyChat](https://assets.infyom.com/open-source/infychat-banner.png)](https://bit.ly/3gYLWny)
+[![InfyChat](https://assets.infyom.com/open-source/infychat-banner.png)](https://1.envato.market/jWeAmM)
 
 You can also check out our other paid products on [CodeCanyon](https://codecanyon.net/user/infyomlabs/portfolio).
 

src/Commands/Publish/LayoutPublishCommand.php

@@ -98,17 +98,17 @@ private function getViews()
     private function getLocaleViews()
     {
         return [
-            'layouts/app_locale'        => 'layouts/app.blade.php',
-            'layouts/sidebar_locale'    => 'layouts/sidebar.blade.php',
-            'layouts/datatables_css'    => 'layouts/datatables_css.blade.php',
-            'layouts/datatables_js'     => 'layouts/datatables_js.blade.php',
-            'layouts/menu'              => 'layouts/menu.blade.php',
-            'layouts/home'              => 'home.blade.php',
-            'auth/login_locale'         => 'auth/login.blade.php',
-            'auth/register_locale'      => 'auth/register.blade.php',
-            'auth/email_locale'         => 'auth/passwords/email.blade.php',
-            'auth/reset_locale'         => 'auth/passwords/reset.blade.php',
-            'emails/password_locale'    => 'auth/emails/password.blade.php',
+            'layouts/app_locale'           => 'layouts/app.blade.php',
+            'layouts/sidebar_locale'       => 'layouts/sidebar.blade.php',
+            'layouts/datatables_css'       => 'layouts/datatables_css.blade.php',
+            'layouts/datatables_js'        => 'layouts/datatables_js.blade.php',
+            'layouts/menu'                 => 'layouts/menu.blade.php',
+            'layouts/home'                 => 'home.blade.php',
+            'auth/login_locale'            => 'auth/login.blade.php',
+            'auth/register_locale'         => 'auth/register.blade.php',
+            'auth/passwords/email_locale'  => 'auth/passwords/email.blade.php',
+            'auth/passwords/reset_locale'  => 'auth/passwords/reset.blade.php',
+            'auth/emails/password_locale'  => 'auth/emails/password.blade.php',
         ];
     }
 

src/Generators/Scaffold/MenuGenerator.php

@@ -51,7 +51,9 @@ public function generate()
     {
         $this->menuContents .= $this->menuTemplate.infy_nl();
         $existingMenuContents = file_get_contents($this->path);
-        if (Str::contains($existingMenuContents, '<span>'.$this->commandData->config->mHumanPlural.'</span>')) {
+        // adminlte uses <p> tab and coreui+stisla uses <span> tag for menu
+        if (Str::contains($existingMenuContents, '<p>'.$this->commandData->config->mHumanPlural.'</p>') or
+            Str::contains($existingMenuContents, '<span>'.$this->commandData->config->mHumanPlural.'</span>')) {
             $this->commandData->commandObj->info('Menu '.$this->commandData->config->mHumanPlural.' is already exists, Skipping Adjustment.');
 
             return;