app/Filament/Resources/Orders/Schemas/OrderForm.php

@@ -9,7 +9,6 @@ use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
 use Filament\Support\Icons\Heroicon;
-use Illuminate\Database\Eloquent\Model;
 
 class OrderForm
 {
@@ -18,53 +17,20 @@ class OrderForm
         return $schema
             ->components([
                 TextInput::make('name')
-                    ->label('Name')->inlineLabel()
-                    ->required()
-                    ->columnSpan(1),
+                    ->required(),
+                TextInput::make('url')
+                    ->suffixIcon(Heroicon::GlobeAlt)
+                    ->url(),
                 TextInput::make('count')
-                    ->label('Anzahl')->inlineLabel()
                     ->required()
                     ->numeric()
                     ->default(1),
-                TextInput::make('url')
-                    ->label('URL')->inlineLabel()
-                    ->suffixIcon(Heroicon::GlobeAlt)
-                    ->url()
-                    ->columnSpan(1),
+                Select::make("orderstatus_id")->relationship("orderstatus", "name")->visibleOn(["edit"]),
+                DateTimePicker::make('orderdatetime')->visibleOn(["edit", "view"])->disabled(),
                 Select::make('user_id')
-                    ->label('Bestellt von')->inlineLabel()
                     ->relationship("user", "name")
                     ->required()
                     ->default(filament()->auth()->user()->id),
-                Select::make("orderstatus_id")
-                    ->label('Bestellstatus')->inlineLabel()
-                    ->relationship("orderstatus", "name")
-                    ->visibleOn(["edit"])
-                        ->prefixActions([
-                            Action::make('bestellt_single')
-                                ->icon(Heroicon::ShoppingCart)->label("Bestellt")->action(function(Model $record) {
-                                    $orderstatusBestellt = Orderstatus::where("name", "bestellt")->first();
-                                    $record->orderstatus_id = $orderstatusBestellt->id;
-                                    $record->save();
-                                })->visible(function(Model $record) {$orderstatusErfasst = Orderstatus::where("name", "erfasst")->first();return ($orderstatusErfasst->id == $record->orderstatus_id);}),
-                            Action::make('angekommen_single')
-                                ->icon(Heroicon::BuildingOffice)->label("Angekommen")->action(function(Model $record) {
-                                    $orderstatusAngekommen = Orderstatus::where("name", "angekommen")->first();
-                                    $record->orderstatus_id = $orderstatusAngekommen->id;
-                                    $record->save();
-                                })->visible(function(Model $record) {$orderstatusBestellt = Orderstatus::where("name", "bestellt")->first();return ($orderstatusBestellt->id == $record->orderstatus_id);}),
-                            Action::make('genommen_single')
-                                ->icon(Heroicon::Check)->label("Genommen")->action(function(Model $record) {
-                                    $orderstatusGenommen = Orderstatus::where("name", "genommen")->first();
-                                    $record->orderstatus_id = $orderstatusGenommen->id;
-                                    $record->save();
-                                })->visible(function(Model $record) {$orderstatusAngekommen = Orderstatus::where("name", "angekommen")->first();return ($orderstatusAngekommen->id == $record->orderstatus_id);}),
-                            Action::make("url_oeffnen")->icon(Heroicon::Link)->label("URL öffnen")->url(function (Model $record) { return $record->url;}, true),
-                        ]),
-                DateTimePicker::make('orderdatetime')
-                    ->label('Bestellzeitpunkt')->inlineLabel()
-                    ->visibleOn(["edit", "view"])
-                    ->disabled(),
             ])->columns(1);
     }
 }

app/Filament/Resources/Orders/Tables/OrdersTable.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Resources\Orders\Tables;
 
-use App\Models\Order;
 use App\Models\Orderstatus;
 use Filament\Actions\Action;
 use Filament\Actions\BulkActionGroup;
@@ -12,7 +11,6 @@ use Filament\Actions\EditAction;
 use Illuminate\Database\Eloquent\Collection;
 use Filament\Support\Icons\Heroicon;
 use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Enums\RecordActionsPosition;
 use Filament\Tables\Filters\Filter;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
@@ -61,6 +59,7 @@ class OrdersTable
                     ->toggleable(isToggledHiddenByDefault: false),
             ])->striped()
             ->selectable()
+            ->defaultGroup('orderstatus.name')
             ->groups([
                 Group::make('orderstatus.name')->label('Bestellstatus'),
                 Group::make('user.name')->label('Bestellt von'),
@@ -104,7 +103,7 @@ class OrdersTable
                 Action::make("url_oeffnen")->icon(Heroicon::Link)->iconButton()->label("URL öffnen")->url(function (Model $record) { return $record->url;}, true),
                 EditAction::make()->iconButton(),
                 DeleteAction::make()->iconButton(),
-            ], position: RecordActionsPosition::BeforeColumns)
+            ])
             ->toolbarActions([
                 BulkActionGroup::make([
                     DeleteBulkAction::make(),