fix: Migration Generator - disabled timestamps fix (#1071)

* fix: Migration Generator - null or null fix * fix to dashedPlural in routes blade scaffold template --------- Co-authored-by: Billy Smithers <Billy.Smithers@skybettingandgaming.com>
InfyOmLabs · Jan 4, 2024 · 39b52bd · 39b52bd
1 parent b13c1c3
commit 39b52bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Generators/MigrationGenerator.php b/src/Generators/MigrationGenerator.php
@@ -60,7 +60,7 @@ protected function generateFields(): string
             }
         }
 
-        if ($createdAtField->name === 'created_at' and $updatedAtField->name === 'updated_at') {
+        if ($createdAtField->name ?? '' === 'created_at' and $updatedAtField->name ?? '' === 'updated_at') {
             $fields[] = '$table->timestamps();';
         } else {
             if ($createdAtField) {

diff --git a/views/scaffold/routes.blade.php b/views/scaffold/routes.blade.php
@@ -1,2 +1,2 @@
 Route::resource('{{ $config->prefixes->getRoutePrefixWith('/') }}{{ $config->modelNames->dashedPlural }}', {{ $config->namespaces->controller }}\{{ $config->modelNames->name }}Controller::class)@if(!$config->prefixes->route);@endif
-@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural, true)).infy_nl_tab().']);' !!}@endif
+@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->dashedPlural, true)).infy_nl_tab().']);' !!}@endif