Merge pull request #4 from DrudgeRajen/PATCH

fixes
DrudgeRajen · Dec 21, 2018 · 5c76ca9 · 5c76ca9
2 parents 15c871e + b7f1845
commit 5c76ca9
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 52 deletions.
diff --git a/src/ContentManager/ContentGenerator.php b/src/ContentManager/ContentGenerator.php
@@ -10,6 +10,52 @@ class ContentGenerator
     /** @var string */
     private $newLineCharacter = PHP_EOL;
 
+    /** @var string Data type Delete Statement */
+    const DELETE_STATMENT = <<<'TXT'
+$dataType = DataType::find(%s);
+
+            if (is_bread_translatable($dataType)) {
+                $dataType->deleteAttributeTranslations($dataType->getTranslatableAttributes());
+            }
+
+            if ($dataType) {
+                $dataType->destroy(%s);
+            }
+TXT;
+
+    /** @var string Menu Insert Statement */
+    const MENU_INSERT_STATEMENT = <<<'TXT'
+$menu = Menu::where('name', config('voyager.bread.default_menu'))->firstOrFail();
+
+            $menuItem = MenuItem::firstOrNew([
+                'menu_id' => $menu->id,
+                'title' => '%s',
+                'url' => '',
+                'route' => 'voyager.%s.index',
+            ]);
+
+            $order = Voyager::model('MenuItem')->highestOrderMenuItem();
+
+            if (!$menuItem->exists) {
+                $menuItem->fill([
+                    'target' => '_self',
+                    'icon_class' => '%s',
+                    'color' => null,
+                    'parent_id' => null,
+                    'order' => $order,
+                ])->save();
+            }
+TXT;
+
+    /** @var string Menu Delete Statement */
+    const MENU_DELETE_STATEMENT = <<<'TXT'
+$menuItem = MenuItem::where('route', 'voyager.%s.index');
+
+        if ($menuItem->exists()) {
+        $menuItem->delete();
+        }
+TXT;
+
     /**
      * Format Content.
      *
@@ -60,25 +106,12 @@ public function formatContent($array, $indexed = true)
     /**
      * Get Delete Statement.
      *
-     * @param $dataArray
-     *
+     * @param $dataType
      * @return string
      */
     public function getDeleteStatement($dataType): string
     {
-        $delete = <<<'TXT'
-$dataType = DataType::find('10');
-
-            if (is_bread_translatable($dataType)) {
-                $dataType->deleteAttributeTranslations($dataType->getTranslatableAttributes());
-            }
-
-            if ($dataType) {
-                $dataType->destroy(10);
-            }
-TXT;
-
-        return $delete;
+        return sprintf(self::DELETE_STATMENT, $dataType->id, $dataType->id);
     }
 
     /**
@@ -89,15 +122,7 @@ public function getDeleteStatement($dataType): string
      */
     public function generateMenuDeleteStatements($dataType) : string
     {
-        $menuDelete = <<<'TXT'
-$menuItem = MenuItem::where('route', 'voyager.$dataType->slug.index');
-
-        if ($menuItem->exists()) {
-        $menuItem->delete();
-        }
-TXT;
-
-        return $menuDelete;
+        return sprintf(self::MENU_DELETE_STATEMENT, $dataType->slug);
     }
 
     /**
@@ -111,16 +136,16 @@ public function generateMenuDeleteStatements($dataType) : string
     public function getPermissionStatement($dataType, $type = null) : string
     {
         $permission = <<<'TXT'
-Voyager::model('Permission')->generateFor($dataType->name);
+Voyager::model('Permission')->generateFor('%s');
 TXT;
 
         if (! is_null($type)) {
             $permission = <<<'TXT'
-Voyager::model('Permission')->removeFrom($dataType->name);
+Voyager::model('Permission')->removeFrom('%s');
 TXT;
         }
 
-        return $permission;
+        return sprintf($permission, $dataType->name);
     }
 
     /**
@@ -131,30 +156,12 @@ public function getPermissionStatement($dataType, $type = null) : string
      */
     public function getMenuInsertStatements($dataType) : string
     {
-        $menu = <<<'TXT'
-$menu = Menu::where('name', config('voyager.bread.default_menu'))->firstOrFail();
-
-            $menuItem = MenuItem::firstOrNew([
-                'menu_id' => $menu->id,
-                'title' => 'Credit Cards',
-                'url' => '',
-                'route' => 'voyager.credit-cards.index',
-            ]);
-
-            $order = Voyager::model('MenuItem')->highestOrderMenuItem();
-
-            if (!$menuItem->exists) {
-                $menuItem->fill([
-                    'target' => '_self',
-                    'icon_class' => '',
-                    'color' => null,
-                    'parent_id' => null,
-                    'order' => $order,
-                ])->save();
-            }
-TXT;
-
-        return $menu;
+        return sprintf(
+            self::MENU_INSERT_STATEMENT,
+            $dataType->display_name_plural,
+            $dataType->slug,
+            $dataType->icon
+        );
     }
 
     /**

diff --git a/src/stubs/data_seed.stub b/src/stubs/data_seed.stub
@@ -23,6 +23,7 @@ class {{class}} extends Seeder
             {{delete_statements}}
 
             {{insert_statements}}
+            {{translation_insert_statements}}
 
             {{permission_insert_statements}}
 
@@ -33,6 +34,6 @@ class {{class}} extends Seeder
            \DB::rollBack();
         }
 
-        DB::commit();
+        \DB::commit();
     }
 }
diff --git a/src/stubs/delete_seed.stub b/src/stubs/delete_seed.stub
@@ -12,6 +12,8 @@ class {{class}} extends Seeder
      * Auto generated seed file
      *
      * @return void
+     *
+     * @throws Exception
      */
     public function run()
     {

diff --git a/src/stubs/row_seed.stub b/src/stubs/row_seed.stub
@@ -26,3 +26,4 @@ class {{class}} extends Seeder
         \DB::commit();
     }
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ class {{class}} extends Seeder
		\DB::commit();
		}
		}