Merge branch '5.x' into feature/laravel-11

Power-Components · Dec 28, 2023 · f7268d4 · f7268d4
2 parents 1b7fda4 + f9f6f9d
commit f7268d4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Commands/Actions/FillableTable.php b/src/Commands/Actions/FillableTable.php
@@ -64,7 +64,7 @@ public static function eloquentBuilder(string $modelQualifiedName, string $model
 
                 $title = Str::of($field)->replace('_', ' ')->ucfirst();
 
-                if (in_array($columnType, ['datetime', 'date'])) {
+                if (in_array($columnType, ['datetime', 'date', 'timestamp'])) {
                     $columns .= '            Column::make(\'' . $title . '\', \'' . $field . '_formatted\', \'' . $field . '\')' . "\n" . '                ->sortable(),' . "\n\n";
                 }
 
@@ -157,7 +157,7 @@ public static function queryBuilder(string $databaseTableName, string $stubFile
 
             $title = Str::of($field)->replace('_', ' ')->ucfirst();
 
-            if (in_array($columnType, ['datetime', 'date'])) {
+            if (in_array($columnType, ['datetime', 'date', 'timestamp'])) {
                 $columns .= '            Column::make(\'' . $title . '\', \'' . $field . '_formatted\', \'' . $field . '\')' . "\n" . '                ->sortable(),' . "\n\n";
             }