diff --git a/app/Filament/Resources/Auftraggebers/Tables/AuftraggebersTable.php b/app/Filament/Resources/Auftraggebers/Tables/AuftraggebersTable.php index eb65205..9fb48b9 100644 --- a/app/Filament/Resources/Auftraggebers/Tables/AuftraggebersTable.php +++ b/app/Filament/Resources/Auftraggebers/Tables/AuftraggebersTable.php @@ -2,8 +2,6 @@ namespace App\Filament\Resources\Auftraggebers\Tables; -use Filament\Actions\BulkActionGroup; -use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; @@ -21,12 +19,7 @@ class AuftraggebersTable // ]) ->recordActions([ - EditAction::make(), - ]) - ->toolbarActions([ - BulkActionGroup::make([ - DeleteBulkAction::make(), - ]), + EditAction::make()->iconButton()->color('gray'), ]); } } diff --git a/app/Filament/Resources/Gutachters/GutachterResource.php b/app/Filament/Resources/Gutachters/GutachterResource.php index 77a5aa8..9caffe4 100644 --- a/app/Filament/Resources/Gutachters/GutachterResource.php +++ b/app/Filament/Resources/Gutachters/GutachterResource.php @@ -3,8 +3,6 @@ namespace App\Filament\Resources\Gutachters; use App\Filament\Clusters\Verwaltung\VerwaltungCluster; -use App\Filament\Resources\Gutachters\Pages\CreateGutachter; -use App\Filament\Resources\Gutachters\Pages\EditGutachter; use App\Filament\Resources\Gutachters\Pages\ListGutachters; use App\Filament\Resources\Gutachters\Schemas\GutachterForm; use App\Filament\Resources\Gutachters\Tables\GutachtersTable; @@ -14,7 +12,6 @@ use Filament\Resources\Resource; use Filament\Schemas\Schema; use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; class GutachterResource extends Resource { @@ -55,19 +52,9 @@ class GutachterResource extends Resource { return [ 'index' => ListGutachters::route('/'), - 'create' => CreateGutachter::route('/create'), - 'edit' => EditGutachter::route('/{record}/edit'), ]; } - public static function getRecordRouteBindingEloquentQuery(): Builder - { - return parent::getRecordRouteBindingEloquentQuery() - ->withoutGlobalScopes([ - SoftDeletingScope::class, - ]); - } - public static function getEloquentQuery(): Builder { return parent::getEloquentQuery()->where('konto_id', auth()->user()->konto_id); diff --git a/app/Filament/Resources/Gutachters/Tables/GutachtersTable.php b/app/Filament/Resources/Gutachters/Tables/GutachtersTable.php index 5323a33..7858b2f 100644 --- a/app/Filament/Resources/Gutachters/Tables/GutachtersTable.php +++ b/app/Filament/Resources/Gutachters/Tables/GutachtersTable.php @@ -2,13 +2,8 @@ namespace App\Filament\Resources\Gutachters\Tables; -use Filament\Actions\BulkActionGroup; -use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; -use Filament\Actions\ForceDeleteBulkAction; -use Filament\Actions\RestoreBulkAction; use Filament\Tables\Columns\TextColumn; -use Filament\Tables\Filters\TrashedFilter; use Filament\Tables\Table; class GutachtersTable @@ -20,18 +15,8 @@ class GutachtersTable TextColumn::make('name'), TextColumn::make('email')->copyable()->label('E-Mail'), ]) - ->filters([ - TrashedFilter::make(), - ]) ->recordActions([ - EditAction::make(), - ]) - ->toolbarActions([ - BulkActionGroup::make([ - DeleteBulkAction::make(), - ForceDeleteBulkAction::make(), - RestoreBulkAction::make(), - ]), + EditAction::make()->iconButton()->color('gray'), ]); } } diff --git a/app/Filament/Resources/Kontos/Schemas/KontoForm.php b/app/Filament/Resources/Kontos/Schemas/KontoForm.php index 8aa5e05..df996cf 100644 --- a/app/Filament/Resources/Kontos/Schemas/KontoForm.php +++ b/app/Filament/Resources/Kontos/Schemas/KontoForm.php @@ -21,11 +21,11 @@ class KontoForm ->components([ ImageRadioGroup::make('plan_id') ->animation(true) - ->disk('public') + ->disk('promotion') ->label('Plan') ->required() ->columnSpanFull() - ->options(fn () => Plan::pluck('file', 'id')->toArray()), + ->options(fn () => Plan::pluck('promotion', 'id')->toArray()), Section::make('Firma') ->inlineLabel() ->schema([ diff --git a/app/Filament/Resources/Kontos/Tables/KontosTable.php b/app/Filament/Resources/Kontos/Tables/KontosTable.php index efe56e8..7c2b607 100644 --- a/app/Filament/Resources/Kontos/Tables/KontosTable.php +++ b/app/Filament/Resources/Kontos/Tables/KontosTable.php @@ -41,9 +41,9 @@ class KontosTable ]) ->recordActions([ - EditAction::make()->label('')->color('gray'), + EditAction::make()->iconButton()->color('gray'), Action::make('Laden') - ->label('') + ->iconButton() ->color('gray') ->icon('heroicon-o-credit-card') ->schema([ diff --git a/app/Filament/Resources/Permissions/PermissionResource.php b/app/Filament/Resources/Permissions/PermissionResource.php index d91c5f4..ea33423 100644 --- a/app/Filament/Resources/Permissions/PermissionResource.php +++ b/app/Filament/Resources/Permissions/PermissionResource.php @@ -19,6 +19,8 @@ class PermissionResource extends Resource protected static ?string $cluster = AdministrationCluster::class; + protected static ?int $navigationSort = 2; + protected static string|UnitEnum|null $navigationGroup = 'Kunden'; protected static string|BackedEnum|null $navigationIcon = 'lucide-key-square'; diff --git a/app/Filament/Resources/Plans/PlanResource.php b/app/Filament/Resources/Plans/PlanResource.php index d18abf1..05dc006 100644 --- a/app/Filament/Resources/Plans/PlanResource.php +++ b/app/Filament/Resources/Plans/PlanResource.php @@ -23,6 +23,8 @@ class PlanResource extends Resource protected static string|UnitEnum|null $navigationGroup = 'Kunden'; + protected static ?int $navigationSort = 1; + protected static ?string $navigationLabel = 'Zahlungsplan'; protected static ?string $modelLabel = 'Zahlungsplan'; diff --git a/app/Filament/Resources/Plans/Schemas/PlanForm.php b/app/Filament/Resources/Plans/Schemas/PlanForm.php index abf42cb..f609767 100644 --- a/app/Filament/Resources/Plans/Schemas/PlanForm.php +++ b/app/Filament/Resources/Plans/Schemas/PlanForm.php @@ -2,6 +2,7 @@ namespace App\Filament\Resources\Plans\Schemas; +use Filament\Forms\Components\FileUpload; use Filament\Forms\Components\Textarea; use Filament\Forms\Components\TextInput; use Filament\Schemas\Schema; @@ -15,10 +16,12 @@ class PlanForm TextInput::make('name')->required(), TextInput::make('payment')->label('Zahlung')->required(), Textarea::make('description')->label('Beschreibung')->required(), + TextInput::make('preis')->required()->numeric(), TextInput::make('limit_user')->required()->label('Anzahl Benutzer')->numeric(), TextInput::make('limit_auftraggeber')->required()->label('Anzahl Auftraggeber')->numeric(), TextInput::make('limit_gutachter')->required()->label('Anzahl Gutachter')->numeric(), TextInput::make('limit_gutachten')->required()->label('Anzahl Projekte')->numeric(), + FileUpload::make('promotion')->disk('promotion'), ])->inlineLabel()->columns(1); } } diff --git a/app/Filament/Resources/Plans/Tables/PlansTable.php b/app/Filament/Resources/Plans/Tables/PlansTable.php index 1245f8f..257128e 100644 --- a/app/Filament/Resources/Plans/Tables/PlansTable.php +++ b/app/Filament/Resources/Plans/Tables/PlansTable.php @@ -3,6 +3,7 @@ namespace App\Filament\Resources\Plans\Tables; use Filament\Actions\EditAction; +use Filament\Tables\Columns\ImageColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; @@ -12,6 +13,7 @@ class PlansTable { return $table ->columns([ + ImageColumn::make('promotion')->imageHeight(100)->disk('promotion'), TextColumn::make('name') ->description(fn ($record): string => $record->description) ->wrap(), @@ -23,7 +25,7 @@ class PlansTable TextColumn::make('preis')->money('EUR'), ]) ->recordActions([ - EditAction::make(), + EditAction::make()->iconButton()->color('gray'), ]); } } diff --git a/app/Filament/Resources/Users/Tables/UsersTable.php b/app/Filament/Resources/Users/Tables/UsersTable.php index 4b97251..f7d5538 100644 --- a/app/Filament/Resources/Users/Tables/UsersTable.php +++ b/app/Filament/Resources/Users/Tables/UsersTable.php @@ -2,11 +2,7 @@ namespace App\Filament\Resources\Users\Tables; -use Filament\Actions\BulkActionGroup; -use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; -use Filament\Actions\ForceDeleteBulkAction; -use Filament\Actions\RestoreBulkAction; use Filament\Support\Icons\Heroicon; use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; @@ -33,14 +29,7 @@ class UsersTable TrashedFilter::make()->visible(fn () => auth()->user()->hasRole('super_admin')), ]) ->recordActions([ - EditAction::make(), - ]) - ->toolbarActions([ - BulkActionGroup::make([ - DeleteBulkAction::make(), - ForceDeleteBulkAction::make(), - RestoreBulkAction::make(), - ])->visible(fn () => auth()->user()->hasRole('super_admin')), + EditAction::make()->iconButton()->color('gray'), ]); } } diff --git a/app/Models/Plan.php b/app/Models/Plan.php index 2ffe123..d7fccc1 100644 --- a/app/Models/Plan.php +++ b/app/Models/Plan.php @@ -16,7 +16,10 @@ class Plan extends Model 'payment', 'description', 'preis', - 'number_user', - 'number_gutachter', + 'limit_user', + 'limit_auftraggeber', + 'limit_gutachter', + 'limit_gutachten', + 'promotion', ]; } diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index 978b3fd..609c7fc 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -91,7 +91,9 @@ class AdminPanelProvider extends PanelProvider AppUserVerifiedMiddleware::class, Authenticate::class, ])->plugins([ - FilamentShieldPlugin::make(), + FilamentShieldPlugin::make() + ->navigationSort(10) + ->navigationBadge('3'), FilamentBackgroundsPlugin::make() ->imageProvider( MyImages::make() diff --git a/config/filesystems.php b/config/filesystems.php index 3d671bd..79bf7d2 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -47,6 +47,14 @@ return [ 'report' => false, ], + 'promotion' => [ + 'driver' => 'local', + 'root' => storage_path('app/public/promotion'), + 'url' => env('APP_URL').'/storage/promotion', + 'visibility' => 'public', + 'throw' => false, + ], + 's3' => [ 'driver' => 's3', 'key' => env('AWS_ACCESS_KEY_ID'), diff --git a/database/migrations/2025_09_06_143006_create_plan_table.php b/database/migrations/2025_09_06_143006_create_plan_table.php index 8745fa3..0c95e67 100644 --- a/database/migrations/2025_09_06_143006_create_plan_table.php +++ b/database/migrations/2025_09_06_143006_create_plan_table.php @@ -16,7 +16,7 @@ return new class extends Migration $table->string('name')->nullable(); $table->string('payment')->nullable(); $table->string('description')->nullable(); - $table->string('file')->nullable(); + $table->string('promotion')->nullable(); $table->integer('preis')->default(0); $table->integer('limit_user')->default(1); $table->integer('limit_auftraggeber')->default(1); diff --git a/public/images/promotion/basic.jpg b/public/images/promotion/basic.jpg deleted file mode 100644 index 4e8de8a..0000000 Binary files a/public/images/promotion/basic.jpg and /dev/null differ diff --git a/public/images/promotion/premium.jpg b/public/images/promotion/premium.jpg deleted file mode 100644 index 4c82fe5..0000000 Binary files a/public/images/promotion/premium.jpg and /dev/null differ diff --git a/public/images/promotion/promotions.afphoto b/public/images/promotion/promotions.afphoto deleted file mode 100644 index eceef29..0000000 Binary files a/public/images/promotion/promotions.afphoto and /dev/null differ diff --git a/public/images/promotion/smart.jpg b/public/images/promotion/smart.jpg deleted file mode 100644 index 17e0b17..0000000 Binary files a/public/images/promotion/smart.jpg and /dev/null differ