mail versand wip

app/Filament/Resources/MailAdressens/MailAdressenResource.php

@@ -17,9 +17,11 @@ class MailAdressenResource extends Resource
 {
     protected static ?string $model = MailAdressen::class;
 
+    protected static ?int $navigationSort = 2;
+
     protected static ?string $cluster = NewsletterCluster::class;
 
-    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedRectangleStack;
+    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedUserCircle;
 
     protected static ?string $navigationLabel = 'Mail Adressen';
 

app/Filament/Resources/MailAdressens/Tables/MailAdressensTable.php

@@ -3,17 +3,19 @@
 namespace App\Filament\Resources\MailAdressens\Tables;
 
 use App\Models\MailAdressen;
+use App\Models\MailGruppen;
 use Filament\Actions\BulkAction;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Toggle;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\ToggleColumn;
 use Filament\Tables\Enums\FiltersLayout;
 use Filament\Tables\Filters\Filter;
-use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -41,15 +43,31 @@ class MailAdressensTable
                 TextColumn::make('last_name')->label('Nachname'),
             ])
             ->filters([
-                TernaryFilter::make('im_newsletter')->label('Im Newsletter'),
-                Filter::make('vereidigung')
+                Filter::make('mail_gruppen_id')
+                    ->columnSpanFull()
+                    ->columns(4)
                     ->schema([
-                        DatePicker::make('vereidigung_von')->native(false),
-                        DatePicker::make('vereidigung_bis')->native(false),
+                        Select::make('mail_gruppen_id')
+                            ->hiddenLabel()
+                            ->preload()
+                            ->default(1)
+                            ->selectablePlaceholder(false)
+                            ->options(function (): array {
+                                return MailGruppen::pluck('name', 'id')->toArray();
+                            }),
+                        Toggle::make('im_newsletter')->label('Im Newsletter'),
+                        DatePicker::make('vereidigung_von')->native(false)->hiddenLabel()->placeholder('Vereidigung von'),
+                        DatePicker::make('vereidigung_bis')->native(false)->hiddenLabel()->placeholder('Vereidigung bis'),
                     ])
                     ->query(function (Builder $query, array $data): Builder {
                         return $query
                             ->when(
+                                $data['mail_gruppen_id'],
+                                fn (Builder $query, $mail_gruppen_id): Builder => $query->where('mail_gruppen_id', $mail_gruppen_id),
+                            )->when(
+                                $data['im_newsletter'],
+                                fn (Builder $query, $im_newsletter): Builder => $query->where('im_newsletter', $im_newsletter),
+                            )->when(
                                 $data['vereidigung_von'],
                                 fn (Builder $query, $date): Builder => $query->whereDate('vereidigung', '>=', $date),
                             )
@@ -58,7 +76,10 @@ class MailAdressensTable
                                 fn (Builder $query, $date): Builder => $query->whereDate('vereidigung', '<=', $date),
                             );
                     }),
-            ], layout: FiltersLayout::Modal)
+            ], layout: FiltersLayout::AboveContent)
+            ->filtersResetActionPosition(null)
+            ->hiddenFilterIndicators()
+            ->deferFilters(false)
             ->recordActions([
                 EditAction::make()->iconButton(),
                 DeleteAction::make()->iconButton(),

app/Filament/Resources/MailGruppens/MailGruppenResource.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Filament\Resources\MailGruppens;
+
+use App\Filament\Clusters\Newsletter\NewsletterCluster;
+use App\Filament\Resources\MailGruppens\Pages\ListMailGruppens;
+use App\Filament\Resources\MailGruppens\Schemas\MailGruppenForm;
+use App\Filament\Resources\MailGruppens\Tables\MailGruppensTable;
+use App\Models\MailGruppen;
+use BackedEnum;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Support\Icons\Heroicon;
+use Filament\Tables\Table;
+
+class MailGruppenResource extends Resource
+{
+    protected static ?string $model = MailGruppen::class;
+
+    protected static ?int $navigationSort = 1;
+
+    protected static ?string $cluster = NewsletterCluster::class;
+
+    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedUserGroup;
+
+    protected static ?string $navigationLabel = 'Mail Gruppen';
+
+    protected static ?string $modelLabel = 'Mail Gruppe';
+
+    protected static ?string $pluralModelLabel = 'Mail Gruppen';
+
+    public static function form(Schema $schema): Schema
+    {
+        return MailGruppenForm::configure($schema);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return MailGruppensTable::configure($table);
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => ListMailGruppens::route('/'),
+        ];
+    }
+}

app/Filament/Resources/MailGruppens/Pages/CreateMailGruppen.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Resources\MailGruppens\Pages;
+
+use App\Filament\Resources\MailGruppens\MailGruppenResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateMailGruppen extends CreateRecord
+{
+    protected static string $resource = MailGruppenResource::class;
+}

app/Filament/Resources/MailGruppens/Pages/EditMailGruppen.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\MailGruppens\Pages;
+
+use App\Filament\Resources\MailGruppens\MailGruppenResource;
+use Filament\Actions\DeleteAction;
+use Filament\Resources\Pages\EditRecord;
+
+class EditMailGruppen extends EditRecord
+{
+    protected static string $resource = MailGruppenResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            DeleteAction::make(),
+        ];
+    }
+}

app/Filament/Resources/MailGruppens/Pages/ListMailGruppens.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\MailGruppens\Pages;
+
+use App\Filament\Resources\MailGruppens\MailGruppenResource;
+use Filament\Actions\CreateAction;
+use Filament\Resources\Pages\ListRecords;
+
+class ListMailGruppens extends ListRecords
+{
+    protected static string $resource = MailGruppenResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            CreateAction::make()->createAnother(false),
+        ];
+    }
+}

app/Filament/Resources/MailGruppens/Schemas/MailGruppenForm.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Resources\MailGruppens\Schemas;
+
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Schema;
+
+class MailGruppenForm
+{
+    public static function configure(Schema $schema): Schema
+    {
+        return $schema
+            ->components([
+                TextInput::make('name'),
+            ])->columns(1);
+    }
+}

app/Filament/Resources/MailGruppens/Tables/MailGruppensTable.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Filament\Resources\MailGruppens\Tables;
+
+use Filament\Actions\DeleteAction;
+use Filament\Actions\EditAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+
+class MailGruppensTable
+{
+    public static function configure(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('id'),
+                TextColumn::make('name'),
+            ])
+            ->recordActions([
+                EditAction::make()->iconButton(),
+                DeleteAction::make()->iconButton()
+                    ->requiresConfirmation()
+                    ->modalHeading('Adressen Gruppe')
+                    ->modalDescription('Alle Mail Adressen die sich in dieser Gruppe befinden werden auch gelöscht. Dies kann nicht mehr rückgängig gemacht werden.')
+                    ->modalSubmitActionLabel('Löschen'),
+            ]);
+    }
+}

app/Filament/Resources/MailVersands/MailVersandResource.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Filament\Resources\MailVersands;
+
+use App\Filament\Clusters\Newsletter\NewsletterCluster;
+use App\Filament\Resources\MailVersands\Pages\ListMailVersands;
+use App\Filament\Resources\MailVersands\Schemas\MailVersandForm;
+use App\Filament\Resources\MailVersands\Tables\MailVersandsTable;
+use App\Models\MailVersand;
+use BackedEnum;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Support\Icons\Heroicon;
+use Filament\Tables\Table;
+
+class MailVersandResource extends Resource
+{
+    protected static ?string $model = MailVersand::class;
+
+    protected static ?int $navigationSort = 4;
+
+    protected static ?string $cluster = NewsletterCluster::class;
+
+    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedPaperAirplane;
+
+    protected static ?string $navigationLabel = 'Mail Versand';
+
+    protected static ?string $modelLabel = 'Mail Versand';
+
+    protected static ?string $pluralModelLabel = 'Mail Versand';
+
+    public static function form(Schema $schema): Schema
+    {
+        return MailVersandForm::configure($schema);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return MailVersandsTable::configure($table);
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => ListMailVersands::route('/'),
+        ];
+    }
+}

app/Filament/Resources/MailVersands/Pages/CreateMailVersand.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Resources\MailVersands\Pages;
+
+use App\Filament\Resources\MailVersands\MailVersandResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateMailVersand extends CreateRecord
+{
+    protected static string $resource = MailVersandResource::class;
+}

app/Filament/Resources/MailVersands/Pages/EditMailVersand.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\MailVersands\Pages;
+
+use App\Filament\Resources\MailVersands\MailVersandResource;
+use Filament\Actions\DeleteAction;
+use Filament\Resources\Pages\EditRecord;
+
+class EditMailVersand extends EditRecord
+{
+    protected static string $resource = MailVersandResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            DeleteAction::make(),
+        ];
+    }
+}

app/Filament/Resources/MailVersands/Pages/ListMailVersands.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\MailVersands\Pages;
+
+use App\Filament\Resources\MailVersands\MailVersandResource;
+use Filament\Actions\CreateAction;
+use Filament\Resources\Pages\ListRecords;
+
+class ListMailVersands extends ListRecords
+{
+    protected static string $resource = MailVersandResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            CreateAction::make()->createAnother(false),
+        ];
+    }
+}

app/Filament/Resources/MailVersands/Schemas/MailVersandForm.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Filament\Resources\MailVersands\Schemas;
+
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Schema;
+
+class MailVersandForm
+{
+    public static function configure(Schema $schema): Schema
+    {
+        return $schema
+            ->components([
+                TextInput::make('name')->label('Benennung')->required(),
+                DateTimePicker::make('sende_zeitpunkt')->native(false)->required(),
+                Select::make('mail_gruppen_id')
+                    ->required()
+                    ->relationship(name: 'mail_gruppen', titleAttribute: 'name'),
+                Select::make('mail_vorlage_id')
+                    ->required()
+                    ->relationship(name: 'mail_vorlage', titleAttribute: 'titel'),
+            ]);
+    }
+}

app/Filament/Resources/MailVersands/Tables/MailVersandsTable.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Filament\Resources\MailVersands\Tables;
+
+use Filament\Actions\EditAction;
+use Filament\Tables\Columns\SelectColumn;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Columns\ToggleColumn;
+use Filament\Tables\Table;
+
+class MailVersandsTable
+{
+    public static function configure(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('name')->label('Benennung'),
+                SelectColumn::make('mail_gruppen_id')
+                    ->optionsRelationship(name: 'mail_gruppen', titleAttribute: 'name')
+                    ->label('Versand an Gruppe'),
+                SelectColumn::make('mail_vorlage_id')
+                    ->optionsRelationship(name: 'mail_vorlage', titleAttribute: 'titel')
+                    ->label('Vorlage'),
+                TextColumn::make('sende_zeitpunkt')->dateTime()->label('Sende Zeitpunkt'),
+                TextColumn::make('versand_am')->dateTime(),
+                SelectColumn::make('status')
+                    ->native(false)
+                    ->disabled(fn ($record): bool => $record->ist_active ? true : false)
+                    ->options([
+                        'wartend' => '<span class="text-blue-500">Wartend</span>',
+                        'versand' => '<span class="text-green-500">Mail Versand</span>',
+                    ])
+                    ->allowOptionsHtml(),
+                ToggleColumn::make('ist_active')->onColor('success'),
+            ])
+            ->filters([
+                //
+            ])
+            ->recordActions([
+                EditAction::make()->iconButton(),
+            ]);
+    }
+}

app/Filament/Resources/MailVorlages/MailVorlageResource.php

@@ -17,9 +17,11 @@ class MailVorlageResource extends Resource
 {
     protected static ?string $model = MailVorlage::class;
 
+    protected static ?int $navigationSort = 3;
+
     protected static ?string $cluster = NewsletterCluster::class;
 
-    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedRectangleStack;
+    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedDocumentText;
 
     protected static ?string $navigationLabel = 'Mail Vorlagen';
 

app/Filament/Resources/MailVorlages/Pages/ListMailVorlages.php

@@ -10,6 +10,11 @@ class ListMailVorlages extends ListRecords
 {
     protected static string $resource = MailVorlageResource::class;
 
+    // protected function getTableRecordsPerPageSelectOptions(): array
+    // {
+    //     return [1];
+    // }
+
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/MailVorlages/Schemas/MailVorlageForm.php

@@ -5,6 +5,7 @@ namespace App\Filament\Resources\MailVorlages\Schemas;
 use Filament\Forms\Components\RichEditor;
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
+use Illuminate\Support\HtmlString;
 
 class MailVorlageForm
 {
@@ -14,9 +15,9 @@ class MailVorlageForm
             ->components([
                 TextInput::make('titel')->suffix('Nur zur Kennung'),
                 RichEditor::make('inhalt')
-                    ->belowContent('Im Text konnen Vornamen und Nachnamen des Empfängers mit den Platzhaltern ###vorname### und ###nachname### ersetzen werden. Für die Anrede ###anrede### wird je nach Geschlecht "Sehr geehrte Frau" oder "Sehr geehrter Herr" verwended. Ansonnsten einfach "Hallo" verwenden.')
+                    ->belowContent(new HtmlString('<div class="text-xs mx-5 py-4">Im Text können <b>Vornamen</b> und <b>Nachnamen</b> des Empfängers mit den Platzhaltern ###vorname### und ###nachname### ersetzen werden. <br>Für die <b>Anrede</b> wird der Platzhalter ###anrede### verwended. Dieser wird je nach Geschlecht durch "Sehr geehrte Frau" oder "Sehr geehrter Herr" ersetzt, oder einfach "Hallo" verwenden.</div>'))
                     ->toolbarButtons([
-                        ['bold', 'italic', 'underline', 'strike'],
+                        ['bold', 'italic', 'underline', 'strike', 'code', 'small', 'highlight'],
                         ['undo', 'redo'],
                     ]),
             ])->columns(1);

app/Filament/Resources/MailVorlages/Tables/MailVorlagesTable.php

@@ -2,11 +2,14 @@
 
 namespace App\Filament\Resources\MailVorlages\Tables;
 
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\DeleteBulkAction;
+use App\Models\MailVorlage;
 use Filament\Actions\EditAction;
+use Filament\Forms\Components\Select;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Enums\FiltersLayout;
+use Filament\Tables\Filters\Filter;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 
 class MailVorlagesTable
 {
@@ -14,19 +17,40 @@ class MailVorlagesTable
     {
         return $table
             ->columns([
-                TextColumn::make('titel'),
-                TextColumn::make('inhalt')->html(),
+                // TextColumn::make('titel'),
+                TextColumn::make('inhalt')
+                    ->label('E-Mail Vorlage')
+                    ->extraAttributes(['class' => 'tiptap'])
+                    ->html()
+                    ->wrap(),
             ])
+            ->paginated(false)
             ->filters([
-                //
+                Filter::make('vorlagen_id')
+                    ->schema([
+                        Select::make('vorlagen_id')
+                            ->hiddenLabel()
+                            ->preload()
+                            ->default(1)
+                            ->selectablePlaceholder(false)
+                            ->options(function (): array {
+                                return MailVorlage::pluck('titel', 'id')->toArray();
+                            }),
                     ])
+                    ->query(function (Builder $query, array $data): Builder {
+                        return $query
+                            ->when(
+                                $data['vorlagen_id'],
+                                fn (Builder $query, $vorlagen_id): Builder => $query->where('id', $vorlagen_id),
+                            );
+                    }),
+
+            ], layout: FiltersLayout::AboveContent)
+            ->filtersResetActionPosition(null)
+            ->hiddenFilterIndicators()
+            ->deferFilters(false)
             ->recordActions([
                 EditAction::make(),
-            ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
-                ]),
             ]);
     }
 }

app/Models/Konto.php

@@ -6,7 +6,8 @@ use Database\Factories\KontoFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasOne;
+
+// use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class Konto extends Model
 {
@@ -37,8 +38,8 @@ class Konto extends Model
         return KontoFactory::new();
     }
 
-    public function plan(): HasOne
-    {
-        return $this->hasOne(Plan::class, 'id', 'plan_id');
-    }
+    // public function plan(): HasOne
+    // {
+    //     return $this->hasOne(Plan::class, 'id', 'plan_id');
+    // }
 }

app/Models/MailAdressen.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class MailAdressen extends Model
 {
     protected $fillable = [
+        'mail_adressen_id',
         'email',
         'company',
         'gender',

app/Models/MailGruppen.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MailGruppen extends Model
+{
+    protected $fillable = [
+        'name',
+    ];
+}

app/Models/MailVersand.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MailVersand extends Model
+{
+    protected $fillable = [
+        'name',
+        'mail_vorlage_id',
+        'mail_gruppen_id',
+        'sende_zeitpunkt',
+        'versand_am',
+        'status',
+        'ist_active',
+    ];
+
+    public function mail_gruppen()
+    {
+        return $this->belongsTo(MailGruppen::class);
+    }
+
+    public function mail_vorlage()
+    {
+        return $this->belongsTo(MailVorlage::class);
+    }
+}

database/migrations/2026_05_04_070425_create_mail_adressens_table.php

@@ -13,6 +13,7 @@ return new class extends Migration
     {
         Schema::create('mail_adressens', function (Blueprint $table) {
             $table->id();
+            $table->foreignId('mail_gruppen_id')->constrained()->cascadeOnDelete();
             $table->string('email')->unique();
             $table->string('company');
             $table->string('gender')->nullable();

database/migrations/2026_05_06_053208_create_mail_versands_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('mail_versands', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->foreignId('mail_gruppen_id');
+            $table->foreignId('mail_vorlage_id');
+            $table->date('sende_zeitpunkt');
+            $table->date('versand_am')->nullable();
+            $table->string('status')->nullable()->default('wartend');
+            $table->boolean('ist_active')->default(0);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('mail_versands');
+    }
+};

database/migrations/2026_05_06_060450_create_mail_gruppens_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('mail_gruppens', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('mail_gruppens');
+    }
+};

public/storage

@@ -1 +1 @@
-/Users/hermanntelser/Sites/nutzwerte_fi4/storage/app/public
+/Users/salam/Sites/nutzwerte_fi4/storage/app/public

resources/css/filament/admin/theme.css

@@ -64,7 +64,7 @@
 }
 
 .tiptap p {
-    margin: 1em 0;
+    margin: 0.5em 0;
     font-family: Verdana, Tahoma, sans-serif;
     font-size: 10pt;
     font-weight: normal;