diff --git a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php index 8f5f42c..5d73417 100644 --- a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php +++ b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php @@ -12,6 +12,7 @@ use App\Repos\System\Settings\Location\RegionRepo; use Laravel\Nova\Fields\Badge; use Laravel\Nova\Fields\BelongsTo; use Laravel\Nova\Fields\Date; +use Laravel\Nova\Fields\DateTime; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Image; use Laravel\Nova\Fields\Select; @@ -30,6 +31,9 @@ class CardOrderFieldsForDetail ID::make()->hide(), Text::make(__('ID'), 'unique_id'), + DateTime::make(__('Created at'), 'created_at') + ->turkmenDateTime(), + Badge::make(__('Status'), 'status') ->map(OrderRepo::statusClasses()) ->addTypes([ diff --git a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php index 2e6b8c9..6522aa3 100644 --- a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php +++ b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php @@ -9,6 +9,7 @@ use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Location\RegionRepo; use Laravel\Nova\Fields\Badge; use Laravel\Nova\Fields\BelongsTo; +use Laravel\Nova\Fields\DateTime; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Select; use Laravel\Nova\Fields\Text; @@ -28,6 +29,9 @@ class CardOrderFieldsForIndex BelongsTo::make(__('Reason'), 'cardState', CardState::class) ->sortable(), + DateTime::make(__('Created at'), 'created_at') + ->turkmenDateTime(), + BelongsTo::make(__('Type'), 'cardType', CardType::class) ->sortable(), diff --git a/app/Providers/NovaServiceProvider.php b/app/Providers/NovaServiceProvider.php index 9998472..13e8540 100644 --- a/app/Providers/NovaServiceProvider.php +++ b/app/Providers/NovaServiceProvider.php @@ -11,6 +11,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Events\ServingNova; use Laravel\Nova\Fields\Date; +use Laravel\Nova\Fields\DateTime; +use Laravel\Nova\Fields\Filters\DateTimeFilter; use Laravel\Nova\Menu\Menu; use Laravel\Nova\Menu\MenuItem; use Laravel\Nova\Nova; @@ -138,5 +140,6 @@ class NovaServiceProvider extends NovaApplicationServiceProvider public function setupFieldMacros(): void { Date::macro('toTurkmenFormat', fn () => $this->displayUsing(fn ($value) => $value?->format('d.m.Y'))); + DateTime::macro('turkmenDateTime', fn () => $this->displayUsing(fn ($value) => $value?->format('H:i, d.m.Y'))); } }