160 changed files with 2727 additions and 4757 deletions
--- a/.docker/base.Dockerfile
+++ b/.docker/base.Dockerfile
@ -1,4 +1,4 @@
-FROM php:8.3.36-fpm AS php
+FROM php:8.3.11-fpm AS php
 WORKDIR /app
 RUN ls /app
 RUN apt-get update
--- a/.drone.yml
+++ b/.drone.yml
@ -31,15 +31,10 @@ steps:
      commands:
          - while ! curl  --silent 'http://owncloudserver:8080/ocs/v1.php/cloud/capabilities?format=json' -u admin:admin | grep '"status":"ok"'; do sleep 1; done

-    - name: node_submodules
-      image: node:20.15.0-slim
-      commands:
-          - cd packages/adrema-form && npm ci && npm run build-import && rm -R node_modules && cd ../../
-
    - name: node
      image: node:20.15.0-slim
      commands:
-          - npm ci && npm run img && npm run prod && rm -R node_modules
+          - npm ci && cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../ && npm run img && npm run prod && rm -R node_modules

    - name: tests
      image: zoomyboy/adrema-base:latest
@ -146,7 +141,7 @@ steps:
          - composer install --ignore-platform-reqs --no-dev

    - name: compress
-      image: php:8.3.36
+      image: php:8.1.6
      commands:
          - apt-get update -yqq
          - apt-get install -yqq zip tar
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,72 +1,5 @@
 # Letzte Änderungen

-### 1.12.29
-
-   Veranstaltungen können nun "bereinigt", sprich alle TN gelöscht werden
-
-### 1.12.27
-
-   Bei Rechnungs-und Erinnerungsmails wird nun der Stammesname angezeigt. Zudm kann eine ReplyTo gesetzt werden, wenn gewünscht
-
-### 1.12.26
-
-   Felder im Form-Builder können nun verschoben und kopiert werden
-
-### 1.12.25
-
-   Ein Bug wurde behoben, sodass nun wieder Bedingungen für Formular-Mails vergeben werden können
-
-### 1.12.24
-
-   Gruppen werden nun wöchentlich aus NaMi neu abgerufen
-
-### 1.12.23
-
-   Veranstaltungs-Teilnehmer*innen können nun abgemeldet statt vollständig gelöscht werden.
-   Beim Excel-Export wird eine Spalte "ID" angezeigt mit der ID des TNs
-
-### 1.12.22
-
-   Bei Mitgliedern wird nun auch die geschäftliche tel-nr aktualisiert
-
-### 1.12.21
-
-   Reply-To-Header bei Versand von Prävention-und-Veranstaltungs-Mails kann nun eingestellt werden
-
-### 1.12.20
-
-   Nachnelde-Link kann nun erstellt werden für Veranstaltungen
-
-### 1.12.19
-
-   Zuschusslisten können nun aus Veranstaltungs-Daten erstellt werden
-   Veranstaltungs-Übersicht zeigt nun Tags an
-
-### 1.12.18
-
-   Fix: Initialisierung klappt nun auch, wenn Mitgliedsnummer mit einer 0 beginnt
-
-### 1.12.17
-
-   Fix: Mitgliedschaften werden beim Sammel-Speichern nicht mehr doppelt angelegt
-
-### 1.12.16
-
-   Mitgliedschaften können nun bei Mitgliedschaften-Übersicht gelöscht werden
-
-### 1.12.15
-
-   Bestätigung wird eingeblendet beim Kopieren eines Events
-
-### 1.12.14
-
-   Bilder werden nun mitkopiert beim Kopieren eines Events
-
-### 1.12.13
-
-   Kopieren von bestehenden Veranstaltungen
-   Präventions-Erinnerung automatisch versenden
-
 ### 1.12.11

 -   Fix: Bank Account mit abrufen wenn Mitglied editiert wird
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -1,57 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project
-
-AdReMa ("AddressManagement") is a Laravel 11 + Inertia/Vue 3 app for German Scout groups (DPSG) to manage member data, courses, invoicing/contributions, and syncs with the external NaMi member database. Backend is PHP 8.3, frontend is Vue 3 + TypeScript rendered via Inertia (no separate SPA API).
-
-## Commands
-
-### PHP / backend
-
- Run all tests: `php artisan test` (or `vendor/bin/pest`)
- Run a single test file: `php artisan test tests/Feature/Member/SomeTest.php`
- Run a single test by name: `php artisan test --filter=test_name`
- Static analysis: `vendor/bin/phpstan analyse` (larastan, level 6, config in `phpstan.neon`)
- Test suites are split in `phpunit.xml`: `Unit`, `Feature`, `Fileshare`, `Arch` (architecture rules in `tests/Arch.php`), `NamiUnit` (packages/laravel-nami), `EndToEnd`
-
-### JS / frontend
-
- Dev server: `npm run dev` (alias for `vite`)
- Production build: `npm run prod`
- Lint: `npm run lint`, autofix: `npm run fix`
- Rebuild SVG sprite: `npm run img`
- The `packages/adrema-form` package (public event-registration form, embeddable) has its own `npm run build` / `build-import` (import mode is used when embedded in the main app) and is built separately.
-
-### Environment
-
- Local dev runs via Docker Compose (`docker-compose.yml`); `.app.env` holds environment config, copied from `.app.env.example`.
- Submodules must be initialized: `git submodule update --init`.
- CI (`.drone.yml`) runs: composer install → npm build (main app + `adrema-form`) → `php artisan migrate` → `php artisan test` → `vendor/bin/phpstan analyse`.
-
-## Architecture
-
-### Backend structure
-
-Code under `app/` is organized by **domain module**, not by technical layer (no global `app/Http/Controllers` for most features). Each domain (e.g. `Member`, `Activity`, `Form`, `Invoice`, `Course`, `Fileshare`, `Contribution`, `Mailman`, `Mailgateway`, `Efz`, `Prevention`) typically contains its own `Actions/`, models, requests, and resources together. Older/shared code still lives in `app/Actions`.
-
- **Actions pattern**: business logic lives in single-purpose Action classes (`lorisleiva/laravel-actions`, `use AsAction`) with a `handle()` method, invoked directly from routes in `routes/web.php` rather than through traditional controllers.
- **NaMi integration**: `packages/laravel-nami` is a local Composer package (symlinked via `repositories` path in `composer.json`) wrapping the external NaMi API (members, courses, memberships, confessions, fees, regions, etc.). App-level `Pull*Action`/`Insert*Action` classes (`app/Actions/PullMemberAction.php`, `InsertMemberAction.php`, etc.) sync NaMi data into local models. - Please never edit files here, unless explicitly specified.
- **Local packages** (all under `packages/`, wired via Composer path repositories): `laravel-nami` (NaMi API client), `table-document` (PDF/table document generation), `flysystem-webdav` (WebDAV filesystem driver, used for cloud file storage/CardDAV-adjacent features), `tex` (LaTeX rendering, used for invoices/Bescheinigungen), `medialibrary-helper` (Vue components + backend helpers for file uploads, e.g. `FSinglefile`/`FMultiplefiles`), `adrema-form` (standalone Vite/Vue app for public event registration forms, built separately and embedded/imported into the main app). - Please never edit files here, unless explicitly specified
- **Modules feature flag**: `App\Module\Module` enum (`bill`, `course`, `event`) + `ModuleSettings` gate optional features per-installation; checked server-side via `hasModule()` and client-side via the `hasModule` Vue mixin (`resources/js/mixins/hasModule.js`).
- Data transfer uses `spatie/laravel-data` (`Data` classes) in several domains instead of plain arrays/DTOs.
- PHPStan type aliases for complex array shapes (e.g. contribution API payloads) are defined centrally in `phpstan.neon`.
-
-### Frontend structure
-
- Entry point `resources/js/app.js` bootstraps Inertia + Pinia + Vue; pages are Vue SFCs under `resources/js/views/**`, resolved by path via Inertia's `resolve`.
- `resources/js/layouts/AppLayout.vue` is the default page layout, applied automatically unless a page sets its own `layout`.
- Global mixins (`hasModule`, `hasFlash`) are applied app-wide instead of per-component imports.
- State is managed with Pinia stores (`resources/js/stores`).
-
-### Testing conventions
-
- Tests use Pest (`pestphp/pest`), with `tests/TestCase.php` / `tests/EndToEndTestCase.php` / `tests/FileshareTestCase.php` as base cases for different suites.
- `tests/RequestFactories` (worksome/request-factories) and `tests/Datasets` provide reusable test data/request builders.
- `tests/Arch.php` enforces architectural constraints via Pest's arch testing.
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@ -1,4 +1,4 @@
-@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg@adrema.dpsg-koeln.de']])
+@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])

@task('deploy', ['on' => 'docker'])
 cd $ADREMA_PATH
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@ -4,7 +4,6 @@ namespace App\Console;

 use App\Actions\DbMaintainAction;
 use App\Form\Actions\PreventionRememberAction;
-use App\Initialize\Actions\InitializeUpdateAction;
 use App\Initialize\InitializeMembers;
 use App\Invoice\Actions\InvoiceSendAction;
 use App\Prevention\Actions\YearlyRememberAction;
@ -24,7 +23,6 @@ class Kernel extends ConsoleKernel
        DbMaintainAction::class,
        PreventionRememberAction::class,
        YearlyRememberAction::class,
-        InitializeUpdateAction::class,
    ];

    /**
@ -39,7 +37,6 @@ class Kernel extends ConsoleKernel
        $schedule->command(PreventionRememberAction::class)->dailyAt('11:00');
        $schedule->command(InvoiceSendAction::class)->dailyAt('10:00');
        $schedule->command(YearlyRememberAction::class)->dailyAt('09:00');
-        $schedule->command(InitializeUpdateAction::class)->weekly();
    }

    /**
--- a/app/Contribution/Actions/GenerateAction.php
+++ b/app/Contribution/Actions/GenerateAction.php
@ -2,11 +2,11 @@

 namespace App\Contribution\Actions;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\ContributionFactory;
-use App\Contribution\Requests\GenerateRequest;
+use App\Contribution\Documents\ContributionDocument;
 use App\Rules\JsonBase64Rule;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@ -15,19 +15,23 @@ class GenerateAction
 {
    use AsAction;

-    public function handle(HasContributionData $request): BaseCompiler
+    /**
+     * @param class-string<ContributionDocument> $document
+     * @param array<string, mixed>               $payload
+     */
+    public function handle(string $document, array $payload): BaseCompiler
    {
-        return Tex::compile($request->type()::fromPayload($request));
+        return Tex::compile($document::fromRequest($payload));
    }

-    public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
+    public function asController(ActionRequest $request): BaseCompiler
    {
-        app(ContributionFactory::class)->validateType($request);
-        $request->validateContribution();
+        $payload = $this->payload($request);
+        $type = data_get($payload, 'type');
+        ValidateAction::validateType($type);
+        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();

-        return $request->input('validate')
-            ? response()->json([])
-            : $this->handle($request);
+        return $this->handle($type, $payload);
    }

    /**
@ -39,4 +43,12 @@ class GenerateAction
            'payload' => [new JsonBase64Rule()],
        ];
    }
+
+    /**
+     * @return array<string, string>
+     */
+    private function payload(ActionRequest $request): array
+    {
+        return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true);
+    }
 }
--- a/app/Contribution/Actions/GenerateApiAction.php
+++ b/app/Contribution/Actions/GenerateApiAction.php
@ -2,9 +2,8 @@

 namespace App\Contribution\Actions;

-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Contribution\Requests\GenerateApiRequest;
+use App\Contribution\Documents\ContributionDocument;
+use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@ -14,17 +13,26 @@ class GenerateApiAction
    use AsAction;

    /**
-     * @todo merge this with GenerateAction
+     * @param class-string<ContributionDocument> $document
+     * @param array<string, mixed>               $payload
     */
-    public function handle(HasContributionData $request): BaseCompiler
+    public function handle(string $document, array $payload): BaseCompiler
    {
-        return Tex::compile($request->type()::fromPayload($request));
+        return Tex::compile($document::fromApiRequest($payload));
    }

-    public function asController(GenerateApiRequest $request): BaseCompiler
+    public function asController(ActionRequest $request): BaseCompiler
    {
-        app(ContributionFactory::class)->validateType($request);
+        ValidateAction::validateType($request->input('type'));

-        return $this->handle($request);
+        return $this->handle($request->input('type'), $request->input());
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [];
    }
 }
--- a/app/Contribution/Actions/ValidateAction.php
+++ b/app/Contribution/Actions/ValidateAction.php
@ -0,0 +1,37 @@
+<?php
+
+namespace App\Contribution\Actions;
+
+use App\Contribution\ContributionFactory;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ValidateAction
+{
+    use AsAction;
+
+    public function asController(): JsonResponse
+    {
+        return response()->json(['valid' => true]);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return app(ContributionFactory::class)->rules(request()->type);
+    }
+
+    public function prepareForValidation(ActionRequest $request): void
+    {
+        static::validateType($request->input('type'));
+    }
+
+    public static function validateType(?string $type = null): void
+    {
+        Validator::make(['type' => $type], app(ContributionFactory::class)->typeRule())->validate();
+    }
+}
--- a/app/Contribution/Contracts/HasContributionData.php
+++ b/app/Contribution/Contracts/HasContributionData.php
@ -1,30 +0,0 @@
-<?php
-
-namespace App\Contribution\Contracts;
-
-use App\Contribution\Data\MemberData;
-use Carbon\Carbon;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use Illuminate\Support\Collection;
-
-interface HasContributionData {
-
-    public function dateFrom(): Carbon;
-    public function dateUntil(): Carbon;
-    public function zipLocation(): string;
-    public function eventName(): string;
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string;
-
-    /**
-     * @return Collection<int, MemberData>
-     */
-    public function members(): Collection;
-
-    public function country(): ?Country;
-
-    public function validateContribution(): void;
-}
--- a/app/Contribution/ContributionFactory.php
+++ b/app/Contribution/ContributionFactory.php
@ -2,7 +2,6 @@

 namespace App\Contribution;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Documents\BdkjHesse;
 use App\Contribution\Documents\ContributionDocument;
 use App\Contribution\Documents\RdpNrwDocument;
@ -11,7 +10,6 @@ use App\Contribution\Documents\CitySolingenDocument;
 use App\Contribution\Documents\CityFrankfurtMainDocument;
 use App\Contribution\Documents\WuppertalDocument;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;

 class ContributionFactory
@ -29,13 +27,13 @@ class ContributionFactory
    ];

    /**
-     * @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
+     * @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
     */
    public function compilerSelect(): Collection
    {
        return collect($this->documents)->map(fn ($document) => [
-            'name' => $document::getName(),
-            'id' => $document,
+            'title' => $document::buttonName(),
+            'class' => $document,
        ]);
    }

@ -61,9 +59,4 @@ class ContributionFactory
            ...$type::rules(),
        ];
    }
-
-    public function validateType(HasContributionData $request): void {
-        Validator::make(['type' => $request->type()], $this->typeRule())->validate();
-    }
 }
-
--- a/app/Contribution/Data/MemberData.php
+++ b/app/Contribution/Data/MemberData.php
@ -47,7 +47,7 @@ class MemberData extends Data
        return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
            ...$member,
            'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
-            'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
+            'gender' => Gender::fromString($member['gender']),
            'isLeader' => $member['is_leader'],
        ]));
    }
--- a/app/Contribution/Documents/BdkjHesse.php
+++ b/app/Contribution/Documents/BdkjHesse.php
@ -2,11 +2,9 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;

@ -19,8 +17,8 @@ class BdkjHesse extends ContributionDocument
     * @param Collection<int, Collection<int, MemberData>> $members
     */
    public function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateFrom,
+        public string $dateUntil,
        public string $zipLocation,
        public ?Country $country,
        public Collection $members,
@ -41,15 +39,33 @@ class BdkjHesse extends ContributionDocument
        return Carbon::parse($this->dateUntil)->format('d.m.Y');
    }

-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
    {
        return new self(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            country: $request->country(),
-            members: $request->members()->chunk(20),
-            eventName: $request->eventName(),
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromModels($request['members'])->chunk(20),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(20),
+            eventName: $request['eventName'],
        );
    }

@ -117,15 +133,4 @@ class BdkjHesse extends ContributionDocument
            'zipLocation' => 'required|string',
        ];
    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
 }
--- a/app/Contribution/Documents/CityFrankfurtMainDocument.php
+++ b/app/Contribution/Documents/CityFrankfurtMainDocument.php
@ -2,15 +2,12 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;

 class CityFrankfurtMainDocument extends ContributionDocument
 {
@ -23,8 +20,8 @@ class CityFrankfurtMainDocument extends ContributionDocument
     * @param Collection<int, Collection<int, MemberData>> $members
     */
    public function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateFrom,
+        public string $dateUntil,
        public string $zipLocation,
        public ?Country $country,
        public Collection $members,
@ -36,15 +33,33 @@ class CityFrankfurtMainDocument extends ContributionDocument
        $this->fromName = app(InvoiceSettings::class)->from_long;
    }

-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
    {
        return new self(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            country: $request->country(),
-            members: $request->members()->chunk(15),
-            eventName: $request->eventName(),
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromModels($request['members'])->chunk(15),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(15),
+            eventName: $request['eventName'],
        );
    }

@ -75,15 +90,4 @@ class CityFrankfurtMainDocument extends ContributionDocument
            'zipLocation' => 'required|string',
        ];
    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::ADDRESS,
-        ];
-    }
 }
--- a/app/Contribution/Documents/CityRemscheidDocument.php
+++ b/app/Contribution/Documents/CityRemscheidDocument.php
@ -2,14 +2,12 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use App\Member\Member;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;

 class CityRemscheidDocument extends ContributionDocument
 {
@ -21,8 +19,8 @@ class CityRemscheidDocument extends ContributionDocument
     * @param Collection<int, Collection<int, Member>> $children
     */
    public function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateFrom,
+        public string $dateUntil,
        public string $zipLocation,
        public ?Country $country,
        public Collection $leaders,
@ -34,18 +32,40 @@ class CityRemscheidDocument extends ContributionDocument
        $this->setEventName($eventName);
    }

-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
    {
-        [$leaders, $children] = $request->members()->partition(fn ($member) => $member->isLeader);
+        [$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);

        return new self(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            country: $request->country(),
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
            leaders: $leaders->values()->toBase()->chunk(6),
            children: $children->values()->toBase()->chunk(20),
-            eventName: $request->eventName(),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        $members = MemberData::fromApi($request['member_data']);
+        [$leaders, $children] = $members->partition(fn ($member) => $member->isLeader);
+
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            leaders: $leaders->values()->toBase()->chunk(6),
+            children: $children->values()->toBase()->chunk(20),
+            eventName: $request['eventName'],
        );
    }

@ -66,15 +86,4 @@ class CityRemscheidDocument extends ContributionDocument
            'country' => 'required|integer|exists:countries,id',
        ];
    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::ADDRESS,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-        ];
-    }
 }
--- a/app/Contribution/Documents/CitySolingenDocument.php
+++ b/app/Contribution/Documents/CitySolingenDocument.php
@ -2,9 +2,7 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
-use App\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
@ -18,8 +16,8 @@ class CitySolingenDocument extends ContributionDocument
     * @param Collection<int, MemberData> $members
     */
    final private function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateFrom,
+        public string $dateUntil,
        public string $zipLocation,
        public Collection $members,
        public string $eventName,
@ -32,14 +30,28 @@ class CitySolingenDocument extends ContributionDocument
    /**
     * {@inheritdoc}
     */
-    public static function fromPayload(HasContributionData $request): static
+    public static function fromRequest(array $request): static
    {
        return new static(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            members: $request->members(),
-            eventName: $request->eventName(),
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            members: MemberData::fromModels($request['members']),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): static
+    {
+        return new static(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            members: MemberData::fromApi($request['member_data']),
+            eventName: $request['eventName'],
        );
    }

@ -63,6 +75,8 @@ class CitySolingenDocument extends ContributionDocument

    public function checkboxes(): string
    {
+        $output = '';
+
        $firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
            return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
        })->implode(' & ') . ' \\\\';
@ -95,15 +109,4 @@ class CitySolingenDocument extends ContributionDocument
            'zipLocation' => 'required|string',
        ];
    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::ADDRESS,
-        ];
-    }
 }
--- a/app/Contribution/Documents/ContributionDocument.php
+++ b/app/Contribution/Documents/ContributionDocument.php
@ -2,8 +2,6 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
-use App\Form\Enums\SpecialType;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Template;

@ -13,12 +11,15 @@ abstract class ContributionDocument extends Document

    abstract public static function getName(): string;

-    abstract public static function fromPayload(HasContributionData $request): self;
+    /**
+     * @param ContributionRequestArray $request
+     */
+    abstract public static function fromRequest(array $request): self;

    /**
-     * @return array<int, SpecialType>
+     * @param ContributionApiRequestArray $request
     */
-    abstract public static function requiredFormSpecialTypes(): array;
+    abstract public static function fromApiRequest(array $request): self;

    /**
     * @return array<string, mixed>
@ -37,6 +38,11 @@ abstract class ContributionDocument extends Document
        ];
    }

+    public static function buttonName(): string
+    {
+        return 'Für ' . static::getName() . ' erstellen';;
+    }
+
    public function setEventName(string $eventName): void
    {
        $this->eventName = $eventName;
--- a/app/Contribution/Documents/RdpNrwDocument.php
+++ b/app/Contribution/Documents/RdpNrwDocument.php
@ -2,14 +2,11 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;

 class RdpNrwDocument extends ContributionDocument
 {
@ -20,8 +17,8 @@ class RdpNrwDocument extends ContributionDocument
     * @param Collection<int, Collection<int, MemberData>> $members
     */
    public function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateFrom,
+        public string $dateUntil,
        public string $zipLocation,
        public ?Country $country,
        public Collection $members,
@ -32,15 +29,33 @@ class RdpNrwDocument extends ContributionDocument
        $this->setEventName($eventName);
    }

-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
    {
        return new self(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            country: $request->country(),
-            members: $request->members()->chunk(17),
-            eventName: $request->eventName(),
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromModels($request['members'])->chunk(17),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(17),
+            eventName: $request['eventName'],
        );
    }

@ -66,15 +81,4 @@ class RdpNrwDocument extends ContributionDocument
            'zipLocation' => 'required|string',
        ];
    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
 }
--- a/app/Contribution/Documents/WuppertalDocument.php
+++ b/app/Contribution/Documents/WuppertalDocument.php
@ -2,14 +2,11 @@

 namespace App\Contribution\Documents;

-use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
 use App\Contribution\Traits\FormatsDates;
 use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use App\Form\Enums\SpecialType;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;

 class WuppertalDocument extends ContributionDocument
 {
@ -21,8 +18,8 @@ class WuppertalDocument extends ContributionDocument
     * @param Collection<int, Collection<int, MemberData>> $members
     */
    public function __construct(
-        public Carbon $dateFrom,
-        public Carbon $dateUntil,
+        public string $dateFrom,
+        public string $dateUntil,
        public string $zipLocation,
        public ?Country $country,
        public Collection $members,
@ -33,15 +30,33 @@ class WuppertalDocument extends ContributionDocument
        $this->setEventName($eventName);
    }

-    public static function fromPayload(HasContributionData $request): self
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
    {
        return new self(
-            dateFrom: $request->dateFrom(),
-            dateUntil: $request->dateUntil(),
-            zipLocation: $request->zipLocation(),
-            country: $request->country(),
-            members: $request->members()->chunk(14),
-            eventName: $request->eventName(),
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromModels($request['members'])->chunk(14),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(14),
+            eventName: $request['eventName'],
        );
    }

@ -61,16 +76,4 @@ class WuppertalDocument extends ContributionDocument
            'zipLocation' => 'required|string',
        ];
    }
-
-    public static function requiredFormSpecialTypes(): array {
-        return [
-            SpecialType::FIRSTNAME,
-            SpecialType::LASTNAME,
-            SpecialType::ADDRESS,
-            SpecialType::BIRTHDAY,
-            SpecialType::ZIP,
-            SpecialType::LOCATION,
-            SpecialType::GENDER,
-        ];
-    }
 }
--- a/app/Contribution/Enums/Country.php
+++ b/app/Contribution/Enums/Country.php
@ -1,256 +0,0 @@
-<?php
-
-namespace App\Contribution\Enums;
-
-enum Country: string {
-    case AD = 'Andorra';
-    case AE = 'Vereinigte Arabische Emirate';
-    case AF = 'Afghanistan';
-    case AG = 'Antigua und Barbuda';
-    case AI = 'Anguilla';
-    case AL = 'Albanien';
-    case AM = 'Armenien';
-    case AN = 'Niederländische Antillen';
-    case AO = 'Angola';
-    case AQ = 'Antarktis';
-    case AR = 'Argentinien';
-    case AS = 'Amerikanisch-Samoa';
-    case AT = 'Österreich (Austria)';
-    case AU = 'Australien';
-    case AW = 'Aruba';
-    case AZ = 'Azerbaijan';
-    case BA = 'Bosnien-Herzegovina';
-    case BB = 'Barbados';
-    case BD = 'Bangladesh';
-    case BE = 'Belgien';
-    case BF = 'Burkina Faso';
-    case BG = 'Bulgarien';
-    case BH = 'Bahrain';
-    case BI = 'Burundi';
-    case BJ = 'Benin';
-    case BM = 'Bermudas';
-    case BN = 'Brunei Darussalam';
-    case BO = 'Bolivien';
-    case BR = 'Brasilien';
-    case BS = 'Bahamas';
-    case BT = 'Bhutan';
-    case BV = 'Bouvet Island';
-    case BW = 'Botswana';
-    case BY = 'Weißrußland (Belarus)';
-    case BZ = 'Belize';
-    case CA = 'Canada';
-    case CC = 'Cocos (Keeling) Islands';
-    case CD = 'Demokratische Republik Kongo';
-    case CF = 'Zentralafrikanische Republik';
-    case CG = 'Kongo';
-    case CH = 'Schweiz';
-    case CI = 'Elfenbeinküste (Cote D’Ivoire)';
-    case CK = 'Cook Islands';
-    case CL = 'Chile';
-    case CM = 'Kamerun';
-    case CN = 'China';
-    case CO = 'Kolumbien';
-    case CR = 'Costa Rica';
-    case CS = 'Tschechoslowakei (ehemalige)';
-    case CU = 'Kuba';
-    case CV = 'Kap Verde';
-    case CX = 'Christmas Island';
-    case CY = 'Zypern';
-    case CZ = 'Tschechische Republik';
-    case DE = 'Deutschland';
-    case DJ = 'Djibouti';
-    case DK = 'Dänemark';
-    case DM = 'Dominica';
-    case DO = 'Dominikanische Republik';
-    case DZ = 'Algerien';
-    case EC = 'Ecuador';
-    case EE = 'Estland';
-    case EG = 'Ägypten';
-    case EH = 'Westsahara';
-    case ER = 'Eritrea';
-    case ES = 'Spanien';
-    case ET = 'Äthiopien';
-    case FI = 'Finnland';
-    case FJ = 'Fiji';
-    case FK = 'Falkland-Inseln (Malvinas)';
-    case FM = 'Micronesien';
-    case FO = 'Faröer-Inseln';
-    case FR = 'Frankreich';
-    case FX = 'France, Metropolitan';
-    case GA = 'Gabon';
-    case GD = 'Grenada';
-    case GE = 'Georgien';
-    case GF = 'Französisch Guiana';
-    case GH = 'Ghana';
-    case GI = 'Gibraltar';
-    case GL = 'Grönland';
-    case GM = 'Gambia';
-    case GN = 'Guinea';
-    case GP = 'Guadeloupe';
-    case GQ = 'Äquatorialguinea';
-    case GR = 'Griechenland';
-    case GS = 'Südgeorgien und Südliche Sandwich-Inseln';
-    case GT = 'Guatemala';
-    case GU = 'Guam';
-    case GW = 'Guinea-Bissau';
-    case GY = 'Guyana';
-    case HK = 'Kong Hong';
-    case HM = 'Heard und Mc Donald Islands';
-    case HN = 'Honduras';
-    case HT = 'Haiti';
-    case HU = 'Ungarn';
-    case ID = 'Indonesien';
-    case IE = 'Irland';
-    case IL = 'Israel';
-    case IN = 'Indien';
-    case IO = 'British Indian Ocean Territory';
-    case IQ = 'Irak';
-    case IR = 'Iran (Islamische Republik)';
-    case IS = 'Island';
-    case IT = 'Italien';
-    case JM = 'Jamaica';
-    case JO = 'Jordanien';
-    case JP = 'Japan';
-    case KE = 'Kenya';
-    case KG = 'Kirgisien';
-    case KH = 'Königreich Kambodscha';
-    case KI = 'Kiribati';
-    case KM = 'Komoren';
-    case KN = 'Saint Kitts und Nevis';
-    case KP = 'Korea, Volksrepublik';
-    case KR = 'Korea';
-    case KW = 'Kuwait';
-    case KY = 'Kayman Islands';
-    case KZ = 'Kasachstan';
-    case LA = 'Laos';
-    case LB = 'Libanon';
-    case LC = 'Saint Lucia';
-    case LI = 'Liechtenstein';
-    case LK = 'Sri Lanka';
-    case LR = 'Liberia';
-    case LS = 'Lesotho';
-    case LT = 'Littauen';
-    case LU = 'Luxemburg';
-    case LV = 'Lettland';
-    case LY = 'Libyen';
-    case MA = 'Marokko';
-    case MC = 'Monaco';
-    case MD = 'Moldavien';
-    case MG = 'Madagaskar';
-    case MH = 'Marshall-Inseln';
-    case MK = 'Mazedonien, ehem. Jugoslawische Republik';
-    case ML = 'Mali';
-    case MM = 'Myanmar';
-    case MN = 'Mongolei';
-    case MO = 'Macao';
-    case MP = 'Nördliche Marianneninseln';
-    case MQ = 'Martinique';
-    case MR = 'Mauretanien';
-    case MS = 'Montserrat';
-    case MT = 'Malta';
-    case MU = 'Mauritius';
-    case MV = 'Malediven';
-    case MW = 'Malawi';
-    case MX = 'Mexico';
-    case MY = 'Malaysien';
-    case MZ = 'Mozambique';
-    case NA = 'Namibia';
-    case NC = 'Neu Kaledonien';
-    case NE = 'Niger';
-    case NF = 'Norfolk Island';
-    case NG = 'Nigeria';
-    case NI = 'Nicaragua';
-    case NL = 'Niederlande';
-    case NO = 'Norwegen';
-    case NP = 'Nepal';
-    case NR = 'Nauru';
-    case NU = 'Niue';
-    case NZ = 'Neuseeland';
-    case OM = 'Oman';
-    case PA = 'Panama';
-    case PE = 'Peru';
-    case PF = 'Französisch Polynesien';
-    case PG = 'Papua Neuguinea';
-    case PH = 'Philippinen';
-    case PK = 'Pakistan';
-    case PL = 'Polen';
-    case PM = 'St. Pierre und Miquelon';
-    case PN = 'Pitcairn';
-    case PR = 'Puerto Rico';
-    case PT = 'Portugal';
-    case PW = 'Palau';
-    case PY = 'Paraguay';
-    case QA = 'Katar';
-    case RE = 'Reunion';
-    case RO = 'Rumänien';
-    case RU = 'Russische Föderation';
-    case RW = 'Ruanda';
-    case SA = 'Saudi Arabien';
-    case SB = 'Salomonen';
-    case SC = 'Seychellen';
-    case SD = 'Sudan';
-    case SE = 'Schweden';
-    case SG = 'Singapur';
-    case SH = 'St. Helena';
-    case SI = 'Slovenien';
-    case SJ = 'Svalbard und Jan Mayen Islands';
-    case SK = 'Slowakei';
-    case SL = 'Sierra Leone';
-    case SM = 'San Marino';
-    case SN = 'Senegal';
-    case SO = 'Somalia';
-    case SR = 'Surinam';
-    case ST = 'Sao Tome und Principe';
-    case SV = 'El Salvador';
-    case SY = 'Syrien, Arabische Republik';
-    case SZ = 'Swaziland';
-    case TC = 'Turk und Caicos-Inseln';
-    case TD = 'Tschad';
-    case TF = 'Französisches Südl.Territorium';
-    case TG = 'Togo';
-    case TH = 'Thailand';
-    case TJ = 'Tadschikistan';
-    case TK = 'Tokelau';
-    case TM = 'Turkmenistan';
-    case TN = 'Tunesien';
-    case TO = 'Tonga';
-    case TP = 'Ost-Timor';
-    case TR = 'Türkei';
-    case TT = 'Trinidad und Tobago';
-    case TV = 'Tuvalu';
-    case TW = 'Taiwan';
-    case TZ = 'Tansania, United Republic of';
-    case UA = 'Ukraine';
-    case UG = 'Uganda';
-    case GB = 'Großbritannien';
-    case US = 'Vereinigte Staaten';
-    case UM = 'Vereinigte Staaten, Minor Outlying Islands';
-    case UY = 'Uruguay';
-    case UZ = 'Usbekistan';
-    case VA = 'Vatikanstaat';
-    case VC = 'Saint Vincent und Grenadines';
-    case VE = 'Venezuela';
-    case VG = 'Virgin Islands (Britisch)';
-    case VI = 'Virgin Islands (U.S.)';
-    case VN = 'Vietnam';
-    case VU = 'Vanuatu';
-    case WF = 'Wallis und Futuna Islands';
-    case WS = 'Samoa';
-    case YE = 'Jemen';
-    case YT = 'Mayotte';
-    case YU = 'Jugoslawien';
-    case ZA = 'Südafrika';
-    case ZM = 'Sambia';
-    case ZW = 'Zimbabw';
-
-    /**
-     * @return array<int, array{name: string, id: string}>
-     */
-    public static function forSelect(): array
-    {
-        return collect(static::cases())
-            ->map(fn ($case) => ['id' => $case->value, 'name' => $case->value])
-            ->toArray();
-    }
-}
-
--- a/app/Contribution/Requests/GenerateApiRequest.php
+++ b/app/Contribution/Requests/GenerateApiRequest.php
@ -1,24 +0,0 @@
-<?php
-
-namespace App\Contribution\Requests;
-
-use App\Contribution\Data\MemberData;
-use Illuminate\Support\Collection;
-
-class GenerateApiRequest extends GenerateRequest {
-    /**
-     * @return array<string, string>
-     */
-    public function payload(): array
-    {
-        return $this->input();
-    }
-
-    public function validateContribution(): void {
-    }
-
-    public function members(): Collection {
-        return MemberData::fromApi($this->value('members'));
-    }
-
-}
--- a/app/Contribution/Requests/GenerateRequest.php
+++ b/app/Contribution/Requests/GenerateRequest.php
@ -1,68 +0,0 @@
-<?php
-
-namespace App\Contribution\Requests;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Contribution\Data\MemberData;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use Lorisleiva\Actions\ActionRequest;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
-
-class GenerateRequest extends ActionRequest implements HasContributionData {
-    /**
-     * @return array<string, string>
-     */
-    protected function payload(): array
-    {
-        return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
-    }
-
-    public function validateContribution(): void {
-        Validator::make($this->payload(), app(ContributionFactory::class)->rules($this->type()))->validate();
-    }
-
-    /**
-     * @return string|array<array-key, mixed>
-     */
-    public function value(string $key): string|array
-    {
-        return data_get($this->payload(), $key);
-    }
-
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string
-    {
-        return $this->value('type');
-    }
-
-    public function dateFrom(): Carbon {
-        return Carbon::parse($this->value('dateFrom'));
-    }
-
-    public function dateUntil(): Carbon {
-        return Carbon::parse($this->value('dateUntil'));
-    }
-
-    public function zipLocation(): string {
-        return $this->value('zipLocation');
-    }
-
-    public function eventName(): string {
-        return $this->value('eventName');
-    }
-
-    public function members(): Collection {
-        return MemberData::fromModels($this->value('members'));
-    }
-
-    public function country(): ?Country {
-        return Country::where('id', $this->value('country'))->first();
-    }
-
-}
--- a/app/Fileshare/ConnectionTypes/ConnectionType.php
+++ b/app/Fileshare/ConnectionTypes/ConnectionType.php
@ -41,7 +41,7 @@ abstract class ConnectionType extends Data
    {
        $filesystem = $this->getFilesystem();

-        return collect($filesystem->directories($parent ?: '/'))->sort()->values()->toArray();
+        return $filesystem->directories($parent ?: '/');
    }

    /**
--- a/app/Form/Actions/CreateExcelDocumentAction.php
+++ b/app/Form/Actions/CreateExcelDocumentAction.php
@ -31,27 +31,25 @@ class CreateExcelDocumentAction
    private function allSheet(Collection $participants): TableDocumentData
    {
        $document = TableDocumentData::from(['title' => 'Anmeldungen für ' . $this->form->name, 'sheets' => []]);
-        $headers = $this->form->getFields()->names()->push('Abgemeldet am')->prepend('ID')->toArray();
-        [$activeParticipants, $cancelledParticipants] = $participants->partition(fn ($participant) => $participant->cancelled_at === null);
+        $headers = $this->form->getFields()->map(fn ($field) => $field->name)->toArray();

        $document->addSheet(SheetData::from([
            'header' => $headers,
-            'data' => $this->rowsFor($activeParticipants),
+            'data' => $participants
+                ->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
+                ->toArray(),
            'name' => 'Alle',
        ]));
-        $document->addSheet(SheetData::from([
-            'header' => $headers,
-            'data' => $this->rowsFor($cancelledParticipants),
-            'name' => 'Abgemeldet',
-        ]));

        if ($this->form->export->groupBy) {
-            $groups = $activeParticipants->groupBy(fn ($participant) => $participant->getFields()->findByKey($this->form->export->groupBy)->presentRaw());
+            $groups = $participants->groupBy(fn ($participant) => $participant->getFields()->findByKey($this->form->export->groupBy)->presentRaw());

-            foreach ($groups as $name => $groupedParticipants) {
+            foreach ($groups as $name => $participants) {
                $document->addSheet(SheetData::from([
                    'header' => $headers,
-                    'data' => $this->rowsFor($groupedParticipants),
+                    'data' => $participants
+                        ->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
+                        ->toArray(),
                    'name' => $name,
                ]));
            }
@ -66,17 +64,6 @@ class CreateExcelDocumentAction
        return $document;
    }

-    /**
-     * @param Collection<int, Participant> $participants
-     * @return array<int, array<string, mixed>>
-     */
-    public function rowsFor(Collection $participants): array {
-        return $participants->map(fn ($participant) => $participant->getFields()->presentValues()
-            ->put('Abgemeldet am', $participant->cancelled_at?->format('d.m.Y H:i:s') ?: '')
-            ->prepend((string) $participant->id, 'ID')
-        )->toArray();
-    }
-
    private function tempPath(): string
    {
        return sys_get_temp_dir() . '/' . str()->uuid()->toString();
--- a/app/Form/Actions/FormApiListAction.php
+++ b/app/Form/Actions/FormApiListAction.php
@ -16,7 +16,7 @@ class FormApiListAction

    /**
     * @param string $filter
-     * @return LengthAwarePaginator<int, Form>
+     * @return LengthAwarePaginator<Form>
     */
    public function handle(string $filter, int $perPage): LengthAwarePaginator
    {
--- a/app/Form/Actions/FormCleanupAction.php
+++ b/app/Form/Actions/FormCleanupAction.php
@ -1,28 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\Models\Form;
-use App\Lib\Events\Succeeded;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FormCleanupAction
-{
-    use AsAction;
-
-    public function handle(Form $form): void
-    {
-        $form->participants()->get()->each->delete();
-        $form->save();
-        ClearFrontendCacheAction::run();
-    }
-
-    public function asController(Form $form): JsonResponse
-    {
-        $this->handle($form);
-
-        Succeeded::message('Teilnehmende gelöscht.')->dispatch();
-        return response()->json([]);
-    }
-}
--- a/app/Form/Actions/FormCopyAction.php
+++ b/app/Form/Actions/FormCopyAction.php
@ -1,38 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\Models\Form;
-use App\Lib\Events\Succeeded;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FormCopyAction
-{
-    use AsAction;
-
-    public function handle(Form $form): Form
-    {
-        $newForm = $form->replicate();
-        $newForm->save();
-        $newForm->update(['name' => $form->name.' - Kopie', 'is_active' => false]);
-
-        foreach ($form->getRegisteredMediaCollections() as $collection) {
-            foreach ($form->getMedia($collection->name) as $media) {
-                $media->copy($newForm, $collection->name);
-            }
-        }
-
-        ClearFrontendCacheAction::run();
-
-        return $form;
-    }
-
-    public function asController(Form $form): JsonResponse
-    {
-        $this->handle($form);
-
-        Succeeded::message('Veranstaltung kopiert.')->dispatch();
-        return response()->json([]);
-    }
-}
--- a/app/Form/Actions/FormGenerateLaterlinkAction.php
+++ b/app/Form/Actions/FormGenerateLaterlinkAction.php
@ -1,29 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\FormSettings;
-use App\Form\Models\Form;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\URL;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FormGenerateLaterlinkAction
-{
-    use AsAction;
-
-    public function asController(Form $form): JsonResponse
-    {
-        $registerUrl = str(app(FormSettings::class)->registerUrl)->replace('{slug}', $form->slug)->toString();
-        $laterId = str()->uuid()->toString();
-        $laterUrl = URL::signedRoute('form.register', ['form' => $form, 'later' => '1', 'id' => $laterId]);
-        $urlParts = parse_url($laterUrl);
-
-        Cache::remember('later_'.$laterId, 2592000, fn () => $form->id);    // Link ist 40 Tage gültig
-
-        return response()->json([
-            'url' => $registerUrl.'?'.data_get($urlParts, 'query')
-        ]);
-    }
-}
--- a/app/Form/Actions/FormIndexAction.php
+++ b/app/Form/Actions/FormIndexAction.php
@ -16,11 +16,11 @@ class FormIndexAction
    use AsAction;

    /**
-     * @return LengthAwarePaginator<int, Form>
+     * @return LengthAwarePaginator<Form>
     */
    public function handle(string $filter): LengthAwarePaginator
    {
-        return FormFilterScope::fromRequest($filter)->getQuery()->query(fn ($query) => $query->withCount(['participants' => fn ($q) => $q->whereNull('cancelled_at')]))->paginate(15);
+        return FormFilterScope::fromRequest($filter)->getQuery()->query(fn ($query) => $query->withCount('participants'))->paginate(15);
    }

    public function asController(ActionRequest $request): Response
--- a/app/Form/Actions/FormStoreAction.php
+++ b/app/Form/Actions/FormStoreAction.php
@ -36,10 +36,6 @@ class FormStoreAction
            'needs_prevention' => 'present|boolean',
            'prevention_text' => 'array',
            'prevention_conditions' => 'array',
-            'leader_conditions' => 'array',
-            'zip' => 'present|nullable|string',
-            'location' => 'present|nullable|string',
-            'country' => 'nullable|string|max:255',
        ];
    }

--- a/app/Form/Actions/FormUpdateAction.php
+++ b/app/Form/Actions/FormUpdateAction.php
@ -3,6 +3,7 @@
 namespace App\Form\Actions;

 use App\Form\Models\Form;
+use App\Lib\Editor\Condition;
 use App\Lib\Events\Succeeded;
 use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
@ -35,10 +36,6 @@ class FormUpdateAction
            'needs_prevention' => 'present|boolean',
            'prevention_text' => 'array',
            'prevention_conditions' => 'array',
-            'location' => 'present|nullable|string',
-            'zip' => 'present|nullable|string',
-            'country' => 'nullable|string|max:255',
-            'leader_conditions' => 'array',
        ];
    }

--- a/app/Form/Actions/FormtemplateIndexAction.php
+++ b/app/Form/Actions/FormtemplateIndexAction.php
@ -14,7 +14,7 @@ class FormtemplateIndexAction
    use AsAction;

    /**
-     * @return LengthAwarePaginator<int, Formtemplate>
+     * @return LengthAwarePaginator<Formtemplate>
     */
    public function handle(): LengthAwarePaginator
    {
--- a/app/Form/Actions/GenerateContributionAction.php
+++ b/app/Form/Actions/GenerateContributionAction.php
@ -1,45 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\ContributionFactory;
-use App\Form\Models\Form;
-use App\Form\Requests\FormCompileRequest;
-use App\Rules\JsonBase64Rule;
-use Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-use Zoomyboy\Tex\BaseCompiler;
-use Zoomyboy\Tex\Tex;
-
-class GenerateContributionAction
-{
-    use AsAction;
-
-    public function handle(HasContributionData $request): BaseCompiler
-    {
-        return Tex::compile($request->type()::fromPayload($request));
-    }
-
-    public function asController(ActionRequest $request, Form $form): BaseCompiler|JsonResponse
-    {
-        $r = FormCompileRequest::from(['form' => $form]);
-        app(ContributionFactory::class)->validateType($r);
-        $r->validateContribution();
-
-        return $request->input('validate')
-            ? response()->json([])
-            : $this->handle($r);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'payload' => [new JsonBase64Rule()],
-        ];
-    }
-}
--- a/app/Form/Actions/ParticipantDestroyAction.php
+++ b/app/Form/Actions/ParticipantDestroyAction.php
@ -6,7 +6,6 @@ use App\Form\Models\Participant;
 use App\Lib\JobMiddleware\JobChannels;
 use App\Lib\JobMiddleware\WithJobState;
 use App\Lib\Queue\TracksJob;
-use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;

 class ParticipantDestroyAction
@ -14,20 +13,14 @@ class ParticipantDestroyAction
    use AsAction;
    use TracksJob;

-    public function handle(int $participantId, bool $force): void
+    public function handle(int $participantId): void
    {
-        $participant = Participant::findOrFail($participantId);
-
-        if ($force) {
-            $participant->delete();
-        } else {
-            $participant->update(['cancelled_at' => now()]);
-        }
+        Participant::findOrFail($participantId)->delete();
    }

-    public function asController(ActionRequest $request, Participant $participant): void
+    public function asController(Participant $participant): void
    {
-        $this->startJob($participant->id, $request->header('X-Force') === '1');
+        $this->startJob($participant->id);
    }

    /**
--- a/app/Form/Actions/RegisterAction.php
+++ b/app/Form/Actions/RegisterAction.php
@ -7,9 +7,6 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Member\Member;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\URL;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@ -23,9 +20,13 @@ class RegisterAction
     */
    public function handle(Form $form, array $input): Participant
    {
+        if (!$form->canRegister()) {
+            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
+        }
+
        $memberQuery = FieldCollection::fromRequest($form, $input)
            ->withNamiType()
-            ->reduce(fn($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
+            ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
        $member = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first() : null;

        $participant = $form->participants()->create([
@ -33,7 +34,7 @@ class RegisterAction
            'member_id' => $member?->id,
        ]);

-        $form->getFields()->each(fn($field) => $field->afterRegistration($form, $participant, $input));
+        $form->getFields()->each(fn ($field) => $field->afterRegistration($form, $participant, $input));

        $participant->sendConfirmationMail();
        ExportSyncAction::dispatch($form->id);
@ -76,30 +77,8 @@ class RegisterAction

    public function asController(ActionRequest $request, Form $form): JsonResponse
    {
-        if (!$form->canRegister() && !$this->isRegisteringLater($request, $form)) {
-            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
-        }
-
        $participant = $this->handle($form, $request->validated());

-        if ($this->isRegisteringLater($request, $form)) {
-            Cache::forget('later_'.request('id'));
-        }
-
        return response()->json($participant);
    }
-
-    public function isRegisteringLater(ActionRequest $request, Form $form): bool {
-        $validator = Validator::make($request->query(), [
-            'later' => 'required|numeric|in:1',
-            'id' => 'required|string|uuid:4',
-            'signature' => 'required|string',
-        ]);
-
-        if (!URL::hasValidSignature($request) || $validator->fails()) {
-            return false;
-        }
-
-        return Cache::get('later_'.data_get($validator->validated(), 'id')) === $form->id;
-    }
 }
--- a/app/Form/Actions/UpdateParticipantSearchIndexAction.php
+++ b/app/Form/Actions/UpdateParticipantSearchIndexAction.php
@ -18,10 +18,10 @@ class UpdateParticipantSearchIndexAction
        $form->searchableUsing()->updateIndexSettings(
            $form->participantsSearchableAs(),
            [
-                'filterableAttributes' => [...$form->getFields()->filterables()->getKeys(), 'parent-id', 'cancelled_at'],
+                'filterableAttributes' => [...$form->getFields()->filterables()->getKeys(), 'parent-id'],
                'searchableAttributes' => $form->getFields()->searchables()->getKeys(),
                'sortableAttributes' => [...$form->getFields()->sortables()->getKeys(), 'id', 'created_at'],
-                'displayedAttributes' => [...$form->getFields()->filterables()->getKeys(), ...$form->getFields()->searchables()->getKeys(), 'id', 'cancelled_at'],
+                'displayedAttributes' => [...$form->getFields()->filterables()->getKeys(), ...$form->getFields()->searchables()->getKeys(), 'id'],
                'pagination' => [
                    'maxTotalHits' => 1000000,
                ]
--- a/app/Form/Data/FieldCollection.php
+++ b/app/Form/Data/FieldCollection.php
@ -99,27 +99,22 @@ class FieldCollection extends Collection
    }

    /**
-     * @return Collection<int, string>
+     * @return array<int, string>
     */
-    public function names(): Collection
+    public function names(): array
    {
-        return $this->map(fn ($field) => $field->name);
+        return $this->map(fn ($field) => $field->name)->toArray();
    }

    /**
-     * @return Collection<string, string>
+     * @return array<int, string>
     */
-    public function presentValues(): Collection
+    public function presentValues(): array
    {
-        return $this->mapWithKeys(fn ($field) => [$field->name => $field->presentRaw()]);
+        return $this->map(fn ($field) => $field->presentRaw())->toArray();
    }

-    public function hasSpecialType(SpecialType $specialType): bool
-    {
-        return $this->findBySpecialType($specialType) !== null;
-    }
-
-    public function findBySpecialType(SpecialType $specialType): ?Field
+    private function findBySpecialType(SpecialType $specialType): ?Field
    {
        return $this->first(fn ($field) => $field->specialType === $specialType);
    }
--- a/app/Form/Enums/SpecialType.php
+++ b/app/Form/Enums/SpecialType.php
@ -7,11 +7,6 @@ enum SpecialType: string
    case FIRSTNAME = 'Vorname';
    case LASTNAME = 'Nachname';
    case EMAIL = 'E-Mail-Adresse';
-    case BIRTHDAY = 'Geburtsdatum';
-    case ZIP = 'PLZ';
-    case LOCATION = 'Ort';
-    case ADDRESS = 'Adresse';
-    case GENDER = 'Geschlecht';

    /**
     * @return array<int, array{name: string, id: string}>
--- a/app/Form/FormSettings.php
+++ b/app/Form/FormSettings.php
@ -2,6 +2,7 @@

 namespace App\Form;

+use App\Form\Actions\SettingStoreAction;
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;
 use Lorisleiva\Actions\ActionRequest;
@ -10,7 +11,6 @@ class FormSettings extends LocalSettings implements Storeable
 {
    public string $registerUrl;
    public string $clearCacheUrl;
-    public ?string $replyToMail;

    public static function group(): string
    {
@ -19,7 +19,7 @@ class FormSettings extends LocalSettings implements Storeable

    public static function title(): string
    {
-        return 'Veranstaltungen';
+        return 'Formulare';
    }

    /**
@ -30,7 +30,6 @@ class FormSettings extends LocalSettings implements Storeable
        return [
            'registerUrl' => 'present|string',
            'clearCacheUrl' => 'present|string',
-            'replyToMail' => 'nullable|string|email',
        ];
    }

@ -48,7 +47,6 @@ class FormSettings extends LocalSettings implements Storeable
                'data' => [
                    'registerUrl' => $this->registerUrl,
                    'clearCacheUrl' => $this->clearCacheUrl,
-                    'replyToMail' => $this->replyToMail,
                ]
            ]
        ];
--- a/app/Form/Mails/ConfirmRegistrationMail.php
+++ b/app/Form/Mails/ConfirmRegistrationMail.php
@ -4,7 +4,6 @@ namespace App\Form\Mails;

 use App\Form\Data\FormConfigData;
 use App\Form\Editor\FormConditionResolver;
-use App\Form\FormSettings;
 use App\Form\Models\Participant;
 use App\Lib\Editor\Condition;
 use Illuminate\Bus\Queueable;
@ -25,8 +24,6 @@ class ConfirmRegistrationMail extends Mailable
    /** @var array<int, mixed> */
    public array $bottomText;

-    public FormSettings $formSettings;
-
    /**
     * Create a new message instance.
     *
@ -35,7 +32,6 @@ class ConfirmRegistrationMail extends Mailable
    public function __construct(public Participant $participant)
    {
        $conditionResolver = app(FormConditionResolver::class)->forParticipant($participant);
-        $this->formSettings = app(FormSettings::class);
        $this->fullname = $participant->getFields()->getFullname();
        $this->config = $participant->getConfig();
        $this->topText = $conditionResolver->makeBlocks($participant->form->mail_top);
@ -49,15 +45,9 @@ class ConfirmRegistrationMail extends Mailable
     */
    public function envelope()
    {
-        $envelope = new Envelope(
+        return new Envelope(
            subject: 'Deine Anmeldung zu ' . $this->participant->form->name,
        );
-
-        if ($this->formSettings->replyToMail !== null) {
-            $envelope->replyTo($this->formSettings->replyToMail);
-        }
-
-        return $envelope;
    }

    /**
@ -79,8 +69,10 @@ class ConfirmRegistrationMail extends Mailable
     */
    public function attachments()
    {
+        $conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
+
        return $this->participant->form->getMedia('mailattachments')
-            ->filter(fn ($media) => $this->participant->matchesCondition(Condition::fromMedia($media)))
+            ->filter(fn ($media) => $conditionResolver->filterCondition(Condition::fromMedia($media)))
            ->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
            ->all();
    }
--- a/app/Form/Models/Form.php
+++ b/app/Form/Models/Form.php
@ -2,7 +2,6 @@

 namespace App\Form\Models;

-use App\Contribution\Enums\Country;
 use App\Form\Actions\UpdateParticipantSearchIndexAction;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
@ -19,6 +18,7 @@ use Laravel\Scout\Searchable;
 use Spatie\Image\Enums\Fit;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Zoomyboy\MedialibraryHelper\DefersUploads;

 /** @todo replace editor content with EditorData cast */
@ -49,8 +49,6 @@ class Form extends Model implements HasMedia
        'to' => 'datetime',
        'registration_from' => 'datetime',
        'registration_until' => 'datetime',
-        'country' => Country::class,
-        'leader_conditions' => Condition::class,
    ];

    /**
@ -71,24 +69,25 @@ class Form extends Model implements HasMedia
        return $this->hasMany(Participant::class);
    }

+
    public function registerMediaCollections(): void
    {
        $this->addMediaCollection('headerImage')
            ->singleFile()
-            ->maxWidth(fn() => 500)
-            ->forceFileName(fn(Form $model) => $model->slug)
-            ->convert(fn() => 'jpg')
-            ->registerMediaConversions(function () {
+            ->maxWidth(fn () => 500)
+            ->forceFileName(fn (Form $model, string $name) => $model->slug)
+            ->convert(fn () => 'jpg')
+            ->registerMediaConversions(function (Media $media) {
                $this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
            });
        $this->addMediaCollection('mailattachments')
-            ->withDefaultProperties(fn() => [
+            ->withDefaultProperties(fn () => [
                'conditions' => [
                    'mode' => 'all',
                    'ifs' => []
                ],
            ])
-            ->withPropertyValidation(fn() => [
+            ->withPropertyValidation(fn () => [
                'conditions.mode' => 'required|string|in:all,any',
                'conditions.ifs' => 'array',
                'conditions.ifs.*.field' => 'required',
@ -102,7 +101,7 @@ class Form extends Model implements HasMedia
     */
    public function getRegistrationRules(): array
    {
-        return $this->getFields()->reduce(fn($carry, $field) => [
+        return $this->getFields()->reduce(fn ($carry, $field) => [
            ...$carry,
            ...$field->getRegistrationRules($this),
        ], []);
@ -113,7 +112,7 @@ class Form extends Model implements HasMedia
     */
    public function getRegistrationMessages(): array
    {
-        return $this->getFields()->reduce(fn($carry, $field) => [
+        return $this->getFields()->reduce(fn ($carry, $field) => [
            ...$carry,
            ...$field->getRegistrationMessages($this),
        ], []);
@ -124,7 +123,7 @@ class Form extends Model implements HasMedia
     */
    public function getRegistrationAttributes(): array
    {
-        return $this->getFields()->reduce(fn($carry, $field) => [
+        return $this->getFields()->reduce(fn ($carry, $field) => [
            ...$carry,
            ...$field->getRegistrationAttributes($this),
        ], []);
@ -190,7 +189,7 @@ class Form extends Model implements HasMedia
        return Sorting::from($this->meta['sorting']);
    }

-    public function isInDates(): bool
+    public function canRegister(): bool
    {
        if ($this->registration_from && $this->registration_from->gt(now())) {
            return false;
@ -202,9 +201,4 @@ class Form extends Model implements HasMedia

        return true;
    }
-
-    public function canRegister(): bool
-    {
-        return $this->is_active && $this->isInDates();
-    }
 }
--- a/app/Form/Models/Participant.php
+++ b/app/Form/Models/Participant.php
@ -4,12 +4,12 @@ namespace App\Form\Models;

 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
-use App\Form\Editor\FormConditionResolver;
 use App\Form\Mails\ConfirmRegistrationMail;
-use App\Lib\Editor\Condition;
+use App\Form\Scopes\ParticipantFilterScope;
 use App\Member\Member;
 use App\Prevention\Contracts\Preventable;
 use Database\Factories\Form\Models\ParticipantFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -31,7 +31,6 @@ class Participant extends Model implements Preventable
    public $casts = [
        'data' => 'json',
        'last_remembered_at' => 'datetime',
-        'cancelled_at' => 'datetime',
    ];

    /**
@ -109,15 +108,6 @@ class Participant extends Model implements Preventable
    /** @return array<string, mixed> */
    public function toSearchableArray(): array
    {
-        return [
-            ...$this->data,
-            'parent-id' => $this->parent_id,
-            'created_at' => $this->created_at->timestamp,
-            'cancelled_at' => $this->cancelled_at
-        ];
-    }
-
-    public function matchesCondition(Condition $condition): bool {
-        return app(FormConditionResolver::class)->forParticipant($this)->filterCondition($condition);
+        return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
    }
 }
--- a/app/Form/Requests/FormCompileRequest.php
+++ b/app/Form/Requests/FormCompileRequest.php
@ -1,107 +0,0 @@
-<?php
-
-namespace App\Form\Requests;
-
-use App\Contribution\Contracts\HasContributionData;
-use App\Contribution\Data\MemberData;
-use App\Contribution\Documents\ContributionDocument;
-use App\Country;
-use App\Form\Editor\FormConditionResolver;
-use App\Form\Enums\SpecialType;
-use App\Form\Models\Form;
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Validator;
-use Spatie\LaravelData\Data;
-
-class FormCompileRequest extends Data implements HasContributionData {
-
-    public function __construct(public Form $form) {}
-
-    /**
-     * @return class-string<ContributionDocument>
-     */
-    public function type(): string
-    {
-        $payload = json_decode(rawurldecode(base64_decode(request()->input('payload'))), true);
-
-        return $payload['type'];
-    }
-
-    public function dateFrom(): Carbon
-    {
-        return $this->form->from;
-    }
-
-    public function dateUntil(): Carbon
-    {
-        return $this->form->to;
-    }
-
-    public function zipLocation(): string
-    {
-        return $this->form->zip.' '.$this->form->location;
-    }
-
-    public function eventName(): string
-    {
-        return $this->form->name;
-    }
-
-    public function members(): Collection
-    {
-        $members = [];
-        $fields = [
-            [SpecialType::FIRSTNAME, 'firstname'],
-            [SpecialType::LASTNAME, 'lastname'],
-            [SpecialType::BIRTHDAY, 'birthday'],
-            [SpecialType::GENDER, 'gender'],
-            [SpecialType::ADDRESS, 'address'],
-            [SpecialType::ZIP, 'zip'],
-            [SpecialType::LOCATION, 'location'],
-        ];
-
-        foreach ($this->form->participants as $participant) {
-            $member = [];
-            foreach ($fields as [$type, $name]) {
-                $f = $this->form->getFields()->findBySpecialType($type);
-                if (!$f) {
-                    continue;
-                }
-                $member[$name] = $participant->getFields()->find($f)->value;
-            }
-
-            $members[] = [
-                'is_leader' => $participant->matchesCondition($participant->form->leader_conditions),
-                'gender' => 'weiblich',
-                ...$member,
-            ];
-        }
-
-        return MemberData::fromApi($members);
-    }
-
-    public function country(): ?Country
-    {
-        return Country::first();
-    }
-
-    public function validateContribution(): void
-    {
-        Validator::make($this->form->toArray(), [
-            'zip' => 'required',
-            'location' => 'required'
-        ])
-            ->after(function($validator) {
-                foreach ($this->type()::requiredFormSpecialTypes() as $type) {
-                    if (!$this->form->getFields()->hasSpecialType($type)) {
-                        $validator->errors()->add($type->name, 'Kein Feld für ' . $type->value . ' vorhanden.');
-                    }
-                }
-                if ($this->form->participants->count() === 0) {
-                    $validator->errors()->add('participants',  'Veranstaltung besitzt noch keine Teilnehmer*innen.');
-                }
-            })
-            ->validate();
-    }
-}
--- a/app/Form/Resources/FormResource.php
+++ b/app/Form/Resources/FormResource.php
@ -2,7 +2,6 @@

 namespace App\Form\Resources;

-use App\Contribution\Enums\Country;
 use App\Form\Data\ExportData;
 use App\Form\Enums\NamiType;
 use App\Form\Enums\SpecialType;
@ -15,7 +14,6 @@ use App\Group;
 use App\Lib\Editor\EditorData;
 use App\Lib\HasMeta;
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contribution\ContributionFactory;

 /**
 * @mixin Form
@ -46,7 +44,6 @@ class FormResource extends JsonResource
            'mail_bottom' => $this->mail_bottom,
            'registration_from' => $this->registration_from?->format('Y-m-d H:i:s'),
            'registration_until' => $this->registration_until?->format('Y-m-d H:i:s'),
-            'is_in_dates' => $this->isInDates(),
            'config' => $this->config,
            'participants_count' => $this->participants_count,
            'is_active' => $this->is_active,
@ -56,22 +53,14 @@ class FormResource extends JsonResource
            'needs_prevention' => $this->needs_prevention,
            'prevention_text' => $this->prevention_text,
            'prevention_conditions' => $this->prevention_conditions,
-            'leader_conditions' => $this->leader_conditions,
-            'zip' => $this->zip,
-            'location' => $this->location,
-            'country' => $this->country,
            'links' => [
                'participant_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => null]),
                'participant_root_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => -1]),
-                'update' => route('form.update', $this->getModel()),
-                'destroy' => route('form.destroy', $this->getModel()),
-                'cleanup' => route('form.cleanup', $this->getModel()),
-                'is_dirty' => route('form.is-dirty', $this->getModel()),
+                'update' => route('form.update', ['form' => $this->getModel()]),
+                'destroy' => route('form.destroy', ['form' => $this->getModel()]),
+                'is_dirty' => route('form.is-dirty', ['form' => $this->getModel()]),
                'frontend' => str(app(FormSettings::class)->registerUrl)->replace('{slug}', $this->slug),
-                'export' => route('form.export', $this->getModel()),
-                'copy' => route('form.copy', $this->getModel()),
-                'contribution' => route('form.contribution', $this->getModel()),
-                'laterlink' => route('form.laterlink', $this->getModel()),
+                'export' => route('form.export', ['form' => $this->getModel()]),
            ]
        ];
    }
@ -93,8 +82,6 @@ class FormResource extends JsonResource
            'templates' => FormtemplateResource::collection(Formtemplate::get()),
            'namiTypes' => NamiType::forSelect(),
            'specialTypes' => SpecialType::forSelect(),
-            'countries' => Country::forSelect(),
-            'contribution_types' => app(ContributionFactory::class)->compilerSelect(),
            'default' => [
                'description' => [],
                'is_active' => true,
@ -114,9 +101,6 @@ class FormResource extends JsonResource
                'id' => null,
                'export' => ExportData::from([]),
                'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
-                'zip' => '',
-                'location' => '',
-                'country' => null,
            ],
            'section_default' => [
                'name' => '',
--- a/app/Form/Scopes/ParticipantFilterScope.php
+++ b/app/Form/Scopes/ParticipantFilterScope.php
@ -32,8 +32,7 @@ class ParticipantFilterScope extends ScoutFilter
        public string $search = '',
        public array $options = [],
        public ?int $parent = null,
-        public ?Sorting $sort = null,
-        public bool $showCancelled = false,
+        public ?Sorting $sort = null
    ) {
    }

@ -55,12 +54,6 @@ class ParticipantFilterScope extends ScoutFilter
                $filter->push('parent-id IS NULL');
            }

-            if ($this->showCancelled) {
-                $filter->push('cancelled_at IS NOT NULL');
-            } else {
-                $filter->push('cancelled_at IS NULL');
-            }
-
            if ($this->parent !== null && $this->parent !== -1) {
                $filter->push('parent-id = ' . $this->parent);
            }
--- a/app/Initialize/Actions/InitializeAction.php
+++ b/app/Initialize/Actions/InitializeAction.php
@ -71,7 +71,7 @@ class InitializeAction

    public function asController(ActionRequest $request, NamiSettings $settings): RedirectResponse
    {
-        $settings->mglnr = $request->input('mglnr');
+        $settings->mglnr = (int) $request->input('mglnr');
        $settings->password = $request->input('password');
        $settings->default_group_id = (int) $request->input('group_id');
        $settings->search_params = $request->input('params');
--- a/app/Initialize/Actions/InitializeUpdateAction.php
+++ b/app/Initialize/Actions/InitializeUpdateAction.php
@ -1,30 +0,0 @@
-<?php
-
-namespace App\Initialize\Actions;
-
-use App\Initialize\InitializeGroups;
-use App\Setting\NamiSettings;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class InitializeUpdateAction
-{
-    use AsAction;
-
-    public string $commandSignature = 'initialize:update';
-
-    /**
-     * @var array<int, class-string>
-     */
-    public array $initializers = [
-        InitializeGroups::class,
-    ];
-
-    public function handle(): void
-    {
-        $api = app(NamiSettings::class)->login();
-
-        foreach ($this->initializers as $initializer) {
-            app($initializer)->handle($api);
-        }
-    }
-}
--- a/app/Initialize/Actions/NamiGetSearchLayerAction.php
+++ b/app/Initialize/Actions/NamiGetSearchLayerAction.php
@ -21,7 +21,7 @@ class NamiGetSearchLayerAction
     */
    public function handle(array $input): Collection
    {
-        return Nami::login($input['mglnr'], $input['password'])->searchLayerOptions(
+        return Nami::login((int) $input['mglnr'], $input['password'])->searchLayerOptions(
            SearchLayer::from($input['layer'] ?: 0),
            $input['parent'] ?: null
        );
--- a/app/Initialize/Actions/NamiLoginCheckAction.php
+++ b/app/Initialize/Actions/NamiLoginCheckAction.php
@ -16,7 +16,7 @@ class NamiLoginCheckAction
     */
    public function handle(array $input): void
    {
-        Nami::freshLogin($input['mglnr'], $input['password']);
+        Nami::freshLogin((int) $input['mglnr'], $input['password']);
    }

    /**
--- a/app/Initialize/Actions/NamiSearchAction.php
+++ b/app/Initialize/Actions/NamiSearchAction.php
@ -16,7 +16,7 @@ class NamiSearchAction
    /**
     * @param array<string, mixed> $params
     *
-     * @return LengthAwarePaginator<int, MemberEntry>
+     * @return LengthAwarePaginator<MemberEntry>
     */
    public function handle(Api $api, int $page, array $params, int $perPage = 10): LengthAwarePaginator
    {
@ -36,7 +36,7 @@ class NamiSearchAction
    }

    /**
-     * @return LengthAwarePaginator<int, MemberEntry>
+     * @return LengthAwarePaginator<MemberEntry>
     */
    public function asController(ActionRequest $request): LengthAwarePaginator
    {
--- a/app/Invoice/Actions/MemberNewInvoiceAction.php
+++ b/app/Invoice/Actions/MemberNewInvoiceAction.php
@ -30,7 +30,7 @@ class MemberNewInvoiceAction
     */
    public function handle(Member $member, Subscription $subscription, int $year): array
    {
-        $invoice = Invoice::createForMember($member, collect([$member]), $year, $subscription);
+        $invoice = Invoice::createForMember($member, Member::where('id', $member->id)->get(), $year, $subscription);

        return [
            ...$invoice->getAttributes(),
--- a/app/Invoice/InvoiceDocument.php
+++ b/app/Invoice/InvoiceDocument.php
@ -3,6 +3,8 @@
 namespace App\Invoice;

 use App\Invoice\Models\Invoice;
+use App\Payment\Payment;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Str;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Engine;
--- a/app/Invoice/InvoiceSettings.php
+++ b/app/Invoice/InvoiceSettings.php
@ -18,7 +18,6 @@ class InvoiceSettings extends LocalSettings implements Storeable
    public ?string $zip;
    public ?string $iban;
    public ?string $bic;
-    public ?string $replyTo;
    public ?int $rememberWeeks;

    public static function group(): string
@ -44,7 +43,6 @@ class InvoiceSettings extends LocalSettings implements Storeable
                'iban' => $this->iban,
                'bic' => $this->bic,
                'rememberWeeks' => $this->rememberWeeks,
-                'replyTo' => $this->replyTo,
            ]
        ];
    }
@ -66,7 +64,6 @@ class InvoiceSettings extends LocalSettings implements Storeable
            'iban' => '',
            'bic' => '',
            'rememberWeeks' => '',
-            'replyTo' => '',
        ];
    }

--- a/app/Invoice/Mails/BillMail.php
+++ b/app/Invoice/Mails/BillMail.php
@ -2,7 +2,6 @@

 namespace App\Invoice\Mails;

-use App\Invoice\InvoiceSettings;
 use App\Invoice\Models\Invoice;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@ -13,8 +12,6 @@ class BillMail extends Mailable
    use Queueable;
    use SerializesModels;

-    public InvoiceSettings $settings;
-
    /**
     * Create a new message instance.
     *
@ -22,7 +19,6 @@ class BillMail extends Mailable
     */
    public function __construct(public Invoice $invoice, public string $filename)
    {
-        $this->settings = app(InvoiceSettings::class);
    }

    /**
@ -34,7 +30,7 @@ class BillMail extends Mailable
    {
        return $this->markdown('mail.invoice.bill')
            ->attach($this->filename)
-            ->when($this->settings->replyTo, fn ($mail) => $mail->replyTo($this->settings->replyTo))
-            ->subject('Rechnung | '.$this->settings->from_long);
+            ->replyTo('kasse@stamm-silva.de')
+            ->subject('Rechnung | DPSG Stamm Silva');
    }
 }
--- a/app/Invoice/Mails/RememberMail.php
+++ b/app/Invoice/Mails/RememberMail.php
@ -2,7 +2,6 @@

 namespace App\Invoice\Mails;

-use App\Invoice\InvoiceSettings;
 use App\Invoice\Models\Invoice;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@ -13,8 +12,6 @@ class RememberMail extends Mailable
    use Queueable;
    use SerializesModels;

-    public InvoiceSettings $settings;
-
    /**
     * Create a new message instance.
     *
@ -22,7 +19,6 @@ class RememberMail extends Mailable
     */
    public function __construct(public Invoice $invoice, public string $filename)
    {
-        $this->settings = app(InvoiceSettings::class);
    }

    /**
@ -34,7 +30,7 @@ class RememberMail extends Mailable
    {
        return $this->markdown('mail.invoice.remember')
            ->attach($this->filename)
-            ->when($this->settings->replyTo, fn ($mail) => $mail->replyTo($this->settings->replyTo))
-            ->subject('Zahlungserinnerung | '.$this->settings->from_long);
+            ->replyTo('kasse@stamm-silva.de')
+            ->subject('Zahlungserinnerung | DPSG Stamm Silva');
    }
 }
--- a/app/Invoice/Models/Invoice.php
+++ b/app/Invoice/Models/Invoice.php
@ -8,14 +8,15 @@ use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\InvoiceDocument;
 use App\Invoice\InvoiceSettings;
 use App\Invoice\RememberDocument;
+use App\Invoice\Scopes\InvoiceFilterScope;
 use App\Member\Member;
 use App\Payment\Subscription;
 use Database\Factories\Invoice\Models\InvoiceFactory;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
 use Laravel\Scout\Searchable;
 use stdClass;

@ -46,7 +47,7 @@ class Invoice extends Model
    /**
     * @param Collection<int, Member> $members
     */
-    public static function createForMember(Member $member, Collection $members, int $year, ?Subscription $subscription = null): self
+    public static function createForMember(Member $member, Collection $members, int $year, Subscription $subscription = null): self
    {
        $invoice = new self([
            'to' => [
--- a/app/Lib/HasDataMeta.php
+++ b/app/Lib/HasDataMeta.php
@ -1,22 +0,0 @@
-<?php
-
-namespace App\Lib;
-
-use Spatie\LaravelData\PaginatedDataCollection;
-
-/**
- * @mixin Spatie\LaravelData\Data
- */
-trait HasDataMeta
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public static function collectPages(mixed $items): array {
-        $source = parent::collect($items, PaginatedDataCollection::class)->toArray();
-        return [
-            ...parent::collect($items, PaginatedDataCollection::class)->toArray(),
-            'meta' => [...$source['meta'], ...static::meta()]
-        ];
-    }
-}
--- a/app/Lib/HasMeta.php
+++ b/app/Lib/HasMeta.php
@ -2,9 +2,9 @@

 namespace App\Lib;

-/**
- * @mixin \Illuminate\Http\Resources\Json\JsonResource
- */
+use Spatie\LaravelData\PaginatedDataCollection;
+
+/** @mixin \Illuminate\Http\Resources\Json\JsonResource */
 trait HasMeta
 {
    /**
@ -43,4 +43,12 @@ trait HasMeta
    {
        return [];
    }
+
+    public static function collectPages(mixed $items): array {
+        $source = parent::collect($items, PaginatedDataCollection::class)->toArray();
+        return [
+            ...parent::collect($items, PaginatedDataCollection::class)->toArray(),
+            'meta' => [...$source['meta'], ...static::meta()]
+        ];
+    }
 }
--- a/app/Member/Data/MembershipData.php
+++ b/app/Member/Data/MembershipData.php
@ -7,7 +7,7 @@ use App\Group;
 use Spatie\LaravelData\Data;
 use App\Lib\Data\DateData;
 use App\Lib\Data\RecordData;
-use App\Lib\HasDataMeta;
+use App\Lib\HasMeta;
 use App\Member\Membership;
 use App\Membership\FilterScope;
 use App\Subactivity;
@ -15,11 +15,8 @@ use App\Subactivity;
 class MembershipData extends Data
 {

-    use HasDataMeta;
+    use HasMeta;

-    /**
-     * @param array<string, string> $links
-     */
    public function __construct(
        public int $id,
        public RecordData $activity,
@ -52,9 +49,6 @@ class MembershipData extends Data
        ]);
    }

-    /**
-     * @return array<string, mixed>
-     */
    public static function meta(): array {
        return [
            'activities' => RecordData::collect(Activity::get()),
--- a/app/Member/MemberRequest.php
+++ b/app/Member/MemberRequest.php
@ -75,7 +75,6 @@ class MemberRequest extends FormRequest
            'send_newspaper' => 'boolean',
            'main_phone' => ['nullable', new ValidPhoneRule('Telefon (Eltern)')],
            'mobile_phone' => ['nullable', new ValidPhoneRule('Handy (Eltern)')],
-            'work_phone' => ['nullable', new ValidPhoneRule('Tel geschäftlich')],
            'invoice_address' => '',
            'gender_id' => 'nullable|exists:genders,id',
            'region_id' => 'nullable|exists:regions,id',
--- a/app/Membership/Actions/MassStoreAction.php
+++ b/app/Membership/Actions/MassStoreAction.php
@ -21,7 +21,7 @@ class MassStoreAction
    use TracksJob;

    /**
-     * @return array<string, mixed>
+     * @return array<string, string>
     */
    public function rules(): array
    {
@ -54,7 +54,9 @@ class MassStoreAction
            Membership::where($attributes)->active()->whereNotIn('member_id', $members)->get()
                ->each(fn ($membership) => MembershipDestroyAction::run($membership->id));

-            Member::whereIn('id', $members)->whereDoesntHave('memberships', fn ($q) => $q->where($attributes))->get()
+            collect($members)
+                ->except(Membership::where($attributes)->active()->pluck('member_id'))
+                ->map(fn ($memberId) => Member::findOrFail($memberId))
                ->each(fn ($member) => MembershipStoreAction::run(
                    $member,
                    $activity,
@ -63,6 +65,7 @@ class MassStoreAction
                    null,
                ));

+
            ResyncAction::dispatch();
        });
    }
@ -84,9 +87,6 @@ class MassStoreAction
        return response()->json([], 200);
    }

-    /**
-     * @return array<string, string>
-     */
    public function getValidationAttributes(): array {
        return [
            'activity_id' => 'Tätigkeit',
--- a/app/Membership/FilterScope.php
+++ b/app/Membership/FilterScope.php
@ -25,7 +25,7 @@ class FilterScope extends Filter

    public function getQuery(): Builder
    {
-        $query = Membership::orderByRaw('member_id, activity_id, subactivity_id');
+        $query = (new Membership())->newQuery();

        if ($this->active === true) {
            $query = $query->active();
--- a/app/Prevention/Actions/SettingStoreAction.php
+++ b/app/Prevention/Actions/SettingStoreAction.php
@ -24,7 +24,6 @@ class SettingStoreAction
            'weeks' => 'required|numeric|gte:0',
            'freshRememberInterval' => 'required|numeric|gte:0',
            'active' => 'boolean',
-            'replyToMail' => 'nullable|string|email',
        ];
    }

@ -34,7 +33,6 @@ class SettingStoreAction
        $settings->formmail = EditorData::from($request->formmail);
        $settings->yearlymail = EditorData::from($request->yearlymail);
        $settings->weeks = $request->weeks;
-        $settings->replyToMail = $request->replyToMail;
        $settings->freshRememberInterval = $request->freshRememberInterval;
        $settings->active = $request->active;
        $settings->yearlyMemberFilter = FilterScope::from($request->yearlyMemberFilter);
--- a/app/Prevention/Mails/YearlyMail.php
+++ b/app/Prevention/Mails/YearlyMail.php
@ -6,7 +6,6 @@ use App\Invoice\InvoiceSettings;
 use App\Lib\Editor\EditorData;
 use App\Prevention\Contracts\Preventable;
 use App\Prevention\Data\PreventionData;
-use App\Prevention\PreventionSettings;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
@ -20,7 +19,6 @@ class YearlyMail extends Mailable
    use Queueable, SerializesModels;

    public InvoiceSettings $settings;
-    public PreventionSettings $preventionSettings;

    /**
     * Create a new message instance.
@ -29,7 +27,6 @@ class YearlyMail extends Mailable
    public function __construct(public Preventable $preventable, public EditorData $bodyText, public Collection $preventions)
    {
        $this->settings = app(InvoiceSettings::class);
-        $this->preventionSettings = app(PreventionSettings::class);
        $this->bodyText = $this->bodyText
            ->replaceWithList('wanted', $preventions->map(fn($prevention) => $prevention->text())->toArray());
    }
@ -41,15 +38,9 @@ class YearlyMail extends Mailable
     */
    public function envelope()
    {
-        $envelope = (new Envelope(
+        return (new Envelope(
            subject: $this->preventable->preventableSubject(),
        ))->to($this->preventable->getMailRecipient()->email, $this->preventable->getMailRecipient()->name);
-
-        if ($this->preventionSettings->replyToMail !== null) {
-            $envelope->replyTo($this->preventionSettings->replyToMail);
-        }
-
-        return $envelope;
    }

    /**
--- a/app/Prevention/PreventionSettings.php
+++ b/app/Prevention/PreventionSettings.php
@ -15,7 +15,6 @@ class PreventionSettings extends LocalSettings
    public int $freshRememberInterval;
    public bool $active;
    public FilterScope $yearlyMemberFilter;
-    public ?string $replyToMail;
    /**
     * @var array<int, string>
     * @todo Create collection cast to Collection of enums
@ -50,7 +49,6 @@ class PreventionSettings extends LocalSettings
            ...$this->toArray(),
            'weeks' => (string) $this->weeks,
            'freshRememberInterval' => (string) $this->freshRememberInterval,
-            'replyToMail' => $this->replyToMail,
        ];
    }
 }
--- a/app/Remote/Actions/SearchAction.php
+++ b/app/Remote/Actions/SearchAction.php
@ -14,7 +14,7 @@ class SearchAction
    use AsAction;

    /**
-     * @return LengthAwarePaginator<int, array<string, mixed>>
+     * @return LengthAwarePaginator<array<string, mixed>>
     */
    public function handle(ActionRequest $request): LengthAwarePaginator
    {
--- a/app/Setting/NamiSettings.php
+++ b/app/Setting/NamiSettings.php
@ -4,6 +4,7 @@ namespace App\Setting;

 use App\Group;
 use App\Initialize\Actions\NamiLoginCheckAction;
+use App\Nami\Actions\SettingSaveAction;
 use App\Setting\Contracts\Storeable;
 use Lorisleiva\Actions\ActionRequest;
 use Zoomyboy\LaravelNami\Api;
@ -11,7 +12,7 @@ use Zoomyboy\LaravelNami\Nami;

 class NamiSettings extends LocalSettings implements Storeable
 {
-    public string $mglnr;
+    public int $mglnr;

    public string $password;

--- a/database/factories/Form/Models/FormFactory.php
+++ b/database/factories/Form/Models/FormFactory.php
@ -47,8 +47,8 @@ class FormFactory extends Factory
            'description' => EditorRequestFactory::new()->toData(),
            'excerpt' => $this->faker->words(10, true),
            'config' => ['sections' => []],
-            'from' => $this->faker->dateTimeBetween('+1 week', '+3 weeks')->format('Y-m-d'),
-            'to' => $this->faker->dateTimeBetween('+4 week', '+6 weeks')->format('Y-m-d'),
+            'from' => $this->faker->dateTimeBetween('+1 week', '+4 weeks')->format('Y-m-d H:i:s'),
+            'to' => $this->faker->dateTimeBetween('+1 week', '+4 weeks')->format('Y-m-d H:i:s'),
            'registration_from' => $this->faker->dateTimeBetween(Carbon::parse('-2 weeks'), now())->format('Y-m-d H:i:s'),
            'registration_until' => $this->faker->dateTimeBetween(now(), Carbon::parse('+2 weeks'))->format('Y-m-d H:i:s'),
            'mail_top' => EditorRequestFactory::new()->toData(),
@ -57,8 +57,6 @@ class FormFactory extends Factory
            'is_private' => false,
            'export' => ExportData::from([]),
            'prevention_conditions' => Condition::defaults(),
-            'zip' => $this->faker->numberBetween(1100, 99999),
-            'location' => $this->faker->city(),
        ];
    }

@ -67,7 +65,7 @@ class FormFactory extends Factory
     */
    public function sections(array $sections): self
    {
-        return $this->state(['config' => ['sections' => array_map(fn($section) => $section->create(), $sections)]]);
+        return $this->state(['config' => ['sections' => array_map(fn ($section) => $section->create(), $sections)]]);
    }

    /**
--- a/database/factories/Form/Models/ParticipantFactory.php
+++ b/database/factories/Form/Models/ParticipantFactory.php
@ -39,10 +39,6 @@ class ParticipantFactory extends Factory
        return $this->state(['data' => $data]);
    }

-    public function cancelled(): self {
-        return $this->state(['cancelled_at' => now()->subWeek()]);
-    }
-
    public function nr(int $number): self
    {
        return $this->state(['member_id' => $number]);
--- a/database/migrations/2025_07_04_210136_create_forms_zip_column.php
+++ b/database/migrations/2025_07_04_210136_create_forms_zip_column.php
@ -1,30 +0,0 @@
-<?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::table('forms', function (Blueprint $table) {
-            $table->string('zip')->nullable()->after('name');
-            $table->string('location')->nullable()->after('name');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('zip');
-            $table->dropColumn('location');
-        });
-    }
-};
--- a/database/migrations/2025_07_06_022536_create_forms_country_column.php
+++ b/database/migrations/2025_07_06_022536_create_forms_country_column.php
@ -1,28 +0,0 @@
-<?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::table('forms', function (Blueprint $table) {
-            $table->string('country')->nullable()->after('location');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('country');
-        });
-    }
-};
--- a/database/migrations/2025_07_09_221048_create_forms_leader_conditions_column.php
+++ b/database/migrations/2025_07_09_221048_create_forms_leader_conditions_column.php
@ -1,28 +0,0 @@
-<?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::table('forms', function (Blueprint $table) {
-            $table->json('leader_conditions')->after('name')->default(json_encode(['mode' => 'all', 'ifs' => []]));
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('forms', function (Blueprint $table) {
-            $table->dropColumn('leader_conditions');
-        });
-    }
-};
--- a/database/migrations/2025_11_11_221048_create_participants_cancelled_at_column.php
+++ b/database/migrations/2025_11_11_221048_create_participants_cancelled_at_column.php
@ -1,28 +0,0 @@
-<?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::table('participants', function (Blueprint $table) {
-            $table->datetime('cancelled_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('participants', function (Blueprint $table) {
-            $table->dropColumn('cancelled_at');
-        });
-    }
-};
--- a/database/settings/202511-07_create_replyTo_invoice_mail_settings.php
+++ b/database/settings/202511-07_create_replyTo_invoice_mail_settings.php
@ -1,11 +0,0 @@
-<?php
-
-use Spatie\LaravelSettings\Migrations\SettingsMigration;
-
-return new class extends SettingsMigration
-{
-    public function up(): void
-    {
-        $this->migrator->add('bill.replyTo', '');
-    }
-};
--- a/database/settings/202511-07_create_replyto_mail_settings.php
+++ b/database/settings/202511-07_create_replyto_mail_settings.php
@ -1,12 +0,0 @@
-<?php
-
-use Spatie\LaravelSettings\Migrations\SettingsMigration;
-
-return new class extends SettingsMigration
-{
-    public function up(): void
-    {
-        $this->migrator->add('form.replyToMail', '');
-        $this->migrator->add('prevention.replyToMail', '');
-    }
-};
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -30,7 +30,10 @@ export default typescriptEslint.config(
            'vue/multi-word-component-names': 'off',
            'vue/max-attributes-per-line': 'off',
            'vue/singleline-html-element-content-newline': 'off',
-            'vue/first-attribute-linebreak': 'off',
+            "vue/first-attribute-linebreak": ["error", {
+                "singleline": "beside",
+                "multiline": "beside"
+            }],
            'vue/no-undef-properties': ['error', {
                'ignores': ['/^\\$/']
            }]
--- a/package-lock.json
+++ b/package-lock.json
@ -27,10 +27,8 @@
                "pusher-js": "^8.3.0",
                "svg-sprite": "^2.0.2",
                "typescript-eslint": "^8.34.0",
-                "uuid": "^11.1.0",
                "vite": "^4.5.2",
                "vue": "^3.3.4",
-                "vue-clipboard3": "^2.0.0",
                "vue-toastification": "^2.0.0-rc.5",
                "vuedraggable": "^4.1.0",
                "wnumb": "^1.2.0"
@ -1873,16 +1871,6 @@
                "node": ">= 6"
            }
        },
-        "node_modules/clipboard": {
-            "version": "2.0.11",
-            "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
-            "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-            "dependencies": {
-                "good-listener": "^1.2.2",
-                "select": "^1.1.2",
-                "tiny-emitter": "^2.0.0"
-            }
-        },
        "node_modules/cliui": {
            "version": "8.0.1",
            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@ -2151,11 +2139,6 @@
                "node": ">=0.4.0"
            }
        },
-        "node_modules/delegate": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-        },
        "node_modules/didyoumean": {
            "version": "1.2.2",
            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@ -2864,14 +2847,6 @@
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
-        "node_modules/good-listener": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
-            "dependencies": {
-                "delegate": "^3.1.2"
-            }
-        },
        "node_modules/gopd": {
            "version": "1.2.0",
            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@ -4099,11 +4074,6 @@
                "node": ">=10"
            }
        },
-        "node_modules/select": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
-        },
        "node_modules/semver": {
            "version": "7.7.2",
            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@ -4574,11 +4544,6 @@
                "node": ">=0.8"
            }
        },
-        "node_modules/tiny-emitter": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-        },
        "node_modules/tinyglobby": {
            "version": "0.2.14",
            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
@ -4865,18 +4830,6 @@
            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
        },
-        "node_modules/uuid": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
-            "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
-            "funding": [
-                "https://github.com/sponsors/broofa",
-                "https://github.com/sponsors/ctavan"
-            ],
-            "bin": {
-                "uuid": "dist/esm/bin/uuid"
-            }
-        },
        "node_modules/vinyl": {
            "version": "2.2.1",
            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@ -4986,14 +4939,6 @@
                "vue": "^3.0.0 || ^2.0.0"
            }
        },
-        "node_modules/vue-clipboard3": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz",
-            "integrity": "sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==",
-            "dependencies": {
-                "clipboard": "^2.0.6"
-            }
-        },
        "node_modules/vue-demi": {
            "version": "0.14.10",
            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
--- a/package.json
+++ b/package.json
@ -44,10 +44,8 @@
        "pusher-js": "^8.3.0",
        "svg-sprite": "^2.0.2",
        "typescript-eslint": "^8.34.0",
-        "uuid": "^11.1.0",
        "vite": "^4.5.2",
        "vue": "^3.3.4",
-        "vue-clipboard3": "^2.0.0",
        "vue-toastification": "^2.0.0-rc.5",
        "vuedraggable": "^4.1.0",
        "wnumb": "^1.2.0"
--- a/packages/adrema-form
+++ b/packages/adrema-form
@ -1 +1 @@
-Subproject commit 010825124f7791dfc0dc607e23ec99f49be8aef5
+Subproject commit a4a2a2b3fd7a099cf1e5a9360d5d5450030bf673
--- a/packages/laravel-nami
+++ b/packages/laravel-nami
@ -1 +1 @@
-Subproject commit 47f01b3c3c98821603f3612511d713cf51a6a14c
+Subproject commit c20cf930f2037ddda4400dd7d35bf9ef707356eb
--- a/packages/table-document
+++ b/packages/table-document
@ -1 +1 @@
-Subproject commit f7b04591830ebdeaddf76236e4cbc87a8b3eec8f
+Subproject commit 7304963370ff64fb5accf08da4864981cc424301
--- a/phpstan.neon
+++ b/phpstan.neon
@ -418,6 +418,11 @@ parameters:
            count: 1
            path: app/Mailgateway/Resources/MailgatewayResource.php

+        -
+            message: "#^Generic type Illuminate\\\\Pagination\\\\LengthAwarePaginator\\<int, App\\\\Member\\\\Member\\> in PHPDoc tag @return specifies 2 template types, but class Illuminate\\\\Pagination\\\\LengthAwarePaginator supports only 1\\: TValue$#"
+            count: 1
+            path: app/Member/Actions/SearchAction.php
+
        -
            message: "#^Class Plugins\\\\Test\\\\ServiceProvider not found\\.$#"
            count: 1
--- a/resources/css/buttons.css
+++ b/resources/css/buttons.css
@ -31,12 +31,6 @@
            @apply bg-yellow-500 text-yellow-100;
        }
    }
-    &.btn-default {
-        @apply bg-gray-700 text-gray-300;
-        &:not(.disabled):hover {
-            @apply bg-gray-500 text-gray-100;
-        }
-    }
    &.btn-info {
        @apply bg-blue-700 text-blue-300;
        &:not(.disabled):hover {
--- a/resources/css/editor.css
+++ b/resources/css/editor.css
@ -5,14 +5,14 @@
 .ce-settings__button,
 .ce-toolbar__settings-btn,
 .cdx-button,
-.ce-popover__container,
+.ce-popover,
 .ce-toolbar__plus:hover {
    @apply bg-primary-700;
    color: inherit;
 }

-.cdx-search-field {
-    @apply bg-primary-600;
+.ce-inline-tool-input {
+    @apply bg-primary-700 text-primary-200 placeholder-primary-500;
 }

 .ce-block--selected {
--- a/resources/css/tooltip.css
+++ b/resources/css/tooltip.css
@ -1,7 +1,3 @@
-.v-popper__popper {
-    @apply max-w-lg;
-}
-
 .v-popper--theme-tooltip .v-popper__inner {
    @apply bg-primary-400 text-primary-800 px-3 py-1 text-sm;
 }
--- a/resources/img/svg/broom.svg
+++ b/resources/img/svg/broom.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><g class="" transform="translate(0,0)" style=""><path d="m153.654 18 52.57 134.734c1.698 3.994 4.05 5.83 7.243 6.977 3.2 1.15 7.36 1.2 11.058.17 3.698-1.03 6.71-3.146 7.996-4.915 1.288-1.77 1.634-2.564.505-5.24l-.046-.112L181.57 18h-27.916zm94.168 120.143 1.88 4.81-.09-.223c3.346 7.937 1.828 16.822-2.532 22.82-4.36 5.996-10.773 9.734-17.723 11.67-6.95 1.937-14.653 2.065-21.98-.57-7.327-2.634-14.155-8.447-17.742-16.923l-.05-.118-1.757-4.5c-31.31 19.804-42.47 42.026-35.367 68.89 1.24 4.681 3.422 12.364 5.964 22.13 74.37-5.274 139.945-23.872 199.808-51.6-10.297-13.867-22.5-25.83-38.232-34.53-20.505-11.34-47.652-20.157-72.178-21.857zm120.557 71.52c-61.497 28.81-129.173 48.378-205.575 54.196 2.03 8.683 4.08 18.28 5.95 28.495 89.592-10.084 163.043-26.22 217.755-48.767-5.743-11.72-11.593-23.19-18.13-33.924zm26.04 50.16c-57.093 23.772-131.99 40.087-222.73 50.322C180.697 371.423 179.614 446.752 128 480c16.27 0 31.892-.152 46.926-.45 17.84-25.554 31.27-66.222 32.08-86.146 8.27 16.793 3.297 59.32-5.36 85.434 2.735-.093 5.435-.193 8.127-.297 11.824-12.397 11.724-28.632 14.72-47.284 3.324 14.92 7 32.967 9.505 46.156 11.273-.616 22.152-1.34 32.606-2.183 16.38-20.358 21.65-49.604 18.63-85.48 4.226 29.1 9.116 62.138 11.873 82.55a771.724 771.724 0 0 0 27.807-3.614c5.04-18.787-4.1-48.444-2.072-69.54 11.123 43.113 22.247 55.45 33.37 64.043a456.166 456.166 0 0 0 15.733-3.526c-4.7-13.95 1.573-22.497 1.18-39.986 5.647 18.99 14.625 26.958 24.428 32.816 6.506-2.1 12.66-4.336 18.492-6.697-10.538-6.57-10.113-26.374-12.38-42.926 5.954 21.703 14.413 32.418 24.083 37.816 29.124-13.8 48.69-31.534 60.398-53.657-9.078-3.82-18.674-13.002-28.068-20.092 13.214 7.477 23.684 10.614 32.37 10.93a112.386 112.386 0 0 0 3.552-9.868c-56.326-19.528-80.07-64.018-101.58-108.178z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/resources/img/svg/externallink.svg
+++ b/resources/img/svg/externallink.svg
@ -1,4 +0,0 @@
-<svg x="0px" y="0px" viewBox="0 0 511.626 511.627" xml:space="preserve">
-    <path d="M392.857,292.354h-18.274c-2.669,0-4.859,0.855-6.563,2.573c-1.718,1.708-2.573,3.897-2.573,6.563v91.361    c0,12.563-4.47,23.315-13.415,32.262c-8.945,8.945-19.701,13.414-32.264,13.414H82.224c-12.562,0-23.317-4.469-32.264-13.414    c-8.945-8.946-13.417-19.698-13.417-32.262V155.31c0-12.562,4.471-23.313,13.417-32.259c8.947-8.947,19.702-13.418,32.264-13.418    h200.994c2.669,0,4.859-0.859,6.57-2.57c1.711-1.713,2.566-3.9,2.566-6.567V82.221c0-2.662-0.855-4.853-2.566-6.563    c-1.711-1.713-3.901-2.568-6.57-2.568H82.224c-22.648,0-42.016,8.042-58.102,24.125C8.042,113.297,0,132.665,0,155.313v237.542    c0,22.647,8.042,42.018,24.123,58.095c16.086,16.084,35.454,24.13,58.102,24.13h237.543c22.647,0,42.017-8.046,58.101-24.13    c16.085-16.077,24.127-35.447,24.127-58.095v-91.358c0-2.669-0.856-4.859-2.574-6.57    C397.709,293.209,395.519,292.354,392.857,292.354z"/>
-    <path d="M506.199,41.971c-3.617-3.617-7.905-5.424-12.85-5.424H347.171c-4.948,0-9.233,1.807-12.847,5.424    c-3.617,3.615-5.428,7.898-5.428,12.847s1.811,9.233,5.428,12.85l50.247,50.248L198.424,304.067    c-1.906,1.903-2.856,4.093-2.856,6.563c0,2.479,0.953,4.668,2.856,6.571l32.548,32.544c1.903,1.903,4.093,2.852,6.567,2.852    s4.665-0.948,6.567-2.852l186.148-186.148l50.251,50.248c3.614,3.617,7.898,5.426,12.847,5.426s9.233-1.809,12.851-5.426    c3.617-3.616,5.424-7.898,5.424-12.847V54.818C511.626,49.866,509.813,45.586,506.199,41.971z"/>
-</svg>
--- a/resources/img/svg/warning-triangle-light.svg
+++ b/resources/img/svg/warning-triangle-light.svg
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M1.225 21.225A1.678 1.678 0 0 0 2.707 22H22.28a1.68 1.68 0 0 0 1.484-.775 1.608 1.608 0 0 0 .003-1.656L13.995 1.827a1.745 1.745 0 0 0-2.969 0l-9.8 17.742a1.603 1.603 0 0 0 0 1.656zm.859-1.143l9.82-17.773A.71.71 0 0 1 12.508 2a.73.73 0 0 1 .629.342l9.751 17.708a.626.626 0 0 1 .017.662.725.725 0 0 1-.626.288H2.708a.723.723 0 0 1-.623-.286.605.605 0 0 1-.001-.632zM13 15h-1V8h1zm-1.5 2.5a1 1 0 1 1 1 1 1.002 1.002 0 0 1-1-1z"/><path fill="none" d="M0 0h24v24H0z"/></svg>
--- a/resources/js/components/components.d.ts
+++ b/resources/js/components/components.d.ts
@ -25,7 +25,6 @@ declare module 'vue' {
    PageFullLayout: typeof import('@/components/page/FullLayout.vue')['default']
    PageHeader: typeof import('@/components/page/Header.vue')['default']
    PageLayout: typeof import('@/components/page/Layout.vue')['default']
-    PagePopups: typeof import('@/components/page/Popups.vue')['default']
    PageSearchModal: typeof import('@/components/page/SearchModal.vue')['default']
    PageTitle: typeof import('@/components/page/Title.vue')['default']
    PageToolbarButton: typeof import('@/components/page/ToolbarButton.vue')['default']
--- a/resources/js/components/form/Editor.vue
+++ b/resources/js/components/form/Editor.vue
@ -1,21 +1,22 @@
 <template>
    <div>
        <div class="flex flex-col group" :for="id" :class="sizeClass(size)">
-            <f-label v-if="label" :required="required" :value="label" />
+            <f-label v-if="label" :required="required" :value="label"></f-label>
            <div class="relative w-full h-full">
-                <div :id="id" :class="[fieldAppearance, paddingX, paddingY]" />
-                <f-hint v-if="hint" :value="hint" />
+                <div :id="id" :class="[fieldAppearance, paddingX, paddingY]"></div>
+                <f-hint v-if="hint" :value="hint"></f-hint>
            </div>
        </div>

-        <ui-popup v-if="condition !== null"
-                  heading="Bedingungen"
-                  @close="
-                      condition.resolve(condition.data);
-                      condition = null;
-                  "
+        <ui-popup
+            v-if="condition !== null"
+            heading="Bedingungen"
+            @close="
+                condition.resolve(condition.data);
+                condition = null;
+            "
        >
-            <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject" />
+            <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject"></slot>
        </ui-popup>
    </div>
 </template>
@ -105,10 +106,10 @@ class ConditionTune {
    wrap(blockContent) {
        this.wrapper = document.createElement('div');

-        const tooltip = document.createElement('div');
+        var tooltip = document.createElement('div');
        tooltip.setAttribute('data-tooltip', '');

-        const content = document.createElement('div');
+        var content = document.createElement('div');
        content.setAttribute('data-content', '');

        content.appendChild(blockContent);
@ -143,7 +144,7 @@ class ConditionTune {
            'Bedingung ' +
            this.data.ifs
                .map((i) => {
-                    const parts = [i.field];
+                    var parts = [i.field];

                    if (i.comparator === 'isEqual' || i.comparator === 'isIn') {
                        parts.push('=');
@ -190,7 +191,7 @@ class ConditionTune {
 }

 onMounted(async () => {
-    const tools = {
+    var tools = {
        paragraph: {
            class: Paragraph,
            shortcut: 'CTRL+P',
@ -224,7 +225,7 @@ onMounted(async () => {
        },
    };

-    const tunes = [];
+    var tunes = [];

    if (props.conditions) {
        tools.condition = {
--- a/resources/js/components/page/Popups.vue
+++ b/resources/js/components/page/Popups.vue
@ -1,21 +0,0 @@
-<template>
-    <ui-popup v-for="(popup, index) in swal.popups" :key="index" :icon="popup.icon" :heading="popup.title" @close="popup.reject(popup.id)">
-        <div class="text-center mt-4" v-text="popup.body" />
-        <div class="mt-4">
-            <template v-for="field in popup.fields">
-                <f-text v-if="field.type === 'text'" :id="field.name" :key="field.name" v-model="popup.payload[field.name]" :name="field.name" :label="field.label" />
-                <f-select v-if="field.type === 'select'" :id="field.name" :key="field.name" v-model="popup.payload[field.name]" :name="field.name" :label="field.label" :options="field.options" />
-            </template>
-        </div>
-        <div class="flex justify-center space-x-4 mt-6">
-            <ui-button type="button" class="btn-primary" @click.prevent="popup.resolve(popup.id)">{{ popup.confirmButton }}</ui-button>
-            <ui-button type="button" class="btn-default" @click.prevent="popup.reject(popup.id)">{{ popup.cancelButton }}</ui-button>
-        </div>
-    </ui-popup>
-</template>
-
-<script lang="ts" setup>
-import useSwal from '@/stores/swalStore.ts';
-const swal = useSwal();
-</script>
-
--- a/resources/js/components/ui/ActionButton.vue
+++ b/resources/js/components/ui/ActionButton.vue
@ -1,14 +1,28 @@
 <template>
    <a v-tooltip="tooltip" :href="href" :target="blank ? '_BLANK' : '_SELF'" class="inline-flex btn btn-sm">
-        <ui-sprite :src="icon" />
+        <ui-sprite :src="icon"></ui-sprite>
    </a>
 </template>

-<script lang="ts" setup>
-withDefaults(defineProps<{
-    tooltip: string;
-    href?: string;
-    blank?: boolean,
-    icon: string,
-}>(), {href: '#', blank: false});
+<script setup>
+defineProps({
+    tooltip: {
+        required: true,
+        type: String,
+    },
+    href: {
+        type: String,
+        default: () => '#',
+        required: false,
+    },
+    blank: {
+        type: Boolean,
+        default: () => false,
+        required: false,
+    },
+    icon: {
+        type: String,
+        required: true,
+    },
+});
 </script>
--- a/resources/js/components/ui/Button.vue
+++ b/resources/js/components/ui/Button.vue
@ -1,22 +1,24 @@
 <template>
    <button v-bind="$attrs" class="btn btn-primary relative group">
        <div :class="{hidden: !isLoading, flex: isLoading}" class="absolute items-center top-0 h-full left-0 ml-2">
-            <ui-spinner class="border-primary-400 w-6 h-6 group-hover:border-primary-200" />
+            <ui-spinner class="border-primary-400 w-6 h-6 group-hover:border-primary-200"></ui-spinner>
        </div>
-        <slot />
+        <slot></slot>
    </button>
 </template>

 <script>
+import {menuStore} from '../../stores/menuStore.js';
+
 export default {
+    data: function () {
+        return {};
+    },
    props: {
        isLoading: {
            type: Boolean,
            default: false,
        },
    },
-    data: function () {
-        return {};
-    },
 };
 </script>
--- a/resources/js/components/ui/Popup.vue
+++ b/resources/js/components/ui/Popup.vue
@ -1,25 +1,23 @@
 <template>
    <div class="fixed z-40 top-0 left-0 w-full h-full flex items-center justify-center p-6 bg-black/60 backdrop-blur-sm">
-        <div class="relative rounded-lg p-8 bg-zinc-800 shadow-2xl shadow-black border border-zinc-700 border-solid w-full max-h-full flex flex-col overflow-auto"
-             :class="full ? 'h-full' : innerWidth"
+        <div
+            class="relative rounded-lg p-8 bg-zinc-800 shadow-2xl shadow-black border border-zinc-700 border-solid w-full max-h-full flex flex-col overflow-auto"
+            :class="full ? 'h-full' : innerWidth"
        >
            <div class="absolute top-0 right-0 mt-6 mr-6 flex space-x-6">
-                <slot name="actions" />
+                <slot name="actions"></slot>
                <a href="#" @click.prevent="$emit('close')">
-                    <ui-sprite src="close" class="text-zinc-400 w-6 h-6" />
+                    <ui-sprite src="close" class="text-zinc-400 w-6 h-6"></ui-sprite>
                </a>
            </div>
-            <div class="flex justify-center">
-                <ui-sprite v-if="icon" class="text-yellow-700 size-28" :src="icon" />
-            </div>
-            <h3 v-if="heading" class="font-semibold text-primary-200 text-xl" :class="{'text-center mt-5': icon !== null}" v-html="heading" />
+            <h3 v-if="heading" class="font-semibold text-primary-200 text-xl" v-html="heading"></h3>
            <div class="text-primary-100 group is-popup grow flex flex-col">
                <suspense>
                    <div>
-                        <slot />
+                        <slot></slot>
                    </div>
                    <template #fallback>
-                        <ui-loading />
+                        <ui-loading></ui-loading>
                    </template>
                </suspense>
            </div>
@ -27,14 +25,21 @@
    </div>
 </template>

-<script lang="ts" setup>
-defineEmits<{
-    close: [],
-}>();
-withDefaults(defineProps<{
-    heading?: string,
-    innerWidth?: string,
-    full?: boolean,
-    icon?: string|null,
-}>(), {innerWidth: 'max-w-xl', full: false, heading: '', icon: null});
+<script>
+export default {
+    props: {
+        heading: {
+            type: String,
+            default: () => '',
+        },
+        innerWidth: {
+            default: () => 'max-w-xl',
+            type: String,
+        },
+        full: {
+            type: Boolean,
+            default: () => false,
+        },
+    },
+};
 </script>
--- a/resources/js/components/ui/RemoteResource.vue
+++ b/resources/js/components/ui/RemoteResource.vue
@ -1,15 +1,15 @@
 <template>
    <ui-popup v-if="selecting !== false" heading="Resource auswählen" @close="selecting = false">
-        <ui-remote-selector :value="selecting" @input="set" />
+        <ui-remote-selector :value="selecting" @input="set"></ui-remote-selector>
    </ui-popup>
    <label class="flex flex-col group" :for="id" :class="sizeClass(size)">
-        <f-label v-if="label" :required="false" :value="label" />
+        <f-label v-if="label" :required="false" :value="label"></f-label>
        <div class="relative flex-none flex">
            <div class="w-full flex flex-col justify-center" :class="[fieldHeight, fieldAppearance, paddingX]" @click.prevent="selecting = modelValue === null ? null : {...modelValue}">
-                <div v-if="modelValue !== null" v-text="modelValue.resource" />
+                <div v-if="modelValue !== null" v-text="modelValue.resource"></div>
                <div v-else>Datei auswählen</div>
            </div>
-            <f-hint v-if="hint" :value="hint" />
+            <f-hint v-if="hint" :value="hint"></f-hint>
        </div>
    </label>
 </template>
--- a/resources/js/composables/useApiIndex.js
+++ b/resources/js/composables/useApiIndex.js
@ -47,10 +47,8 @@ export function useApiIndex(firstUrl, siteName = null) {
        single.value = null;
    }

-    async function remove(model, force = true) {
-        await axios.delete(model.links.destroy, {
-            headers: { 'X-Force': force ? '1' : '0' }
-        });
+    async function remove(model) {
+        await axios.delete(model.links.destroy);
        await reload();
    }

--- a/resources/js/composables/useDownloads.ts
+++ b/resources/js/composables/useDownloads.ts
@ -1,14 +0,0 @@
-import { Axios } from 'axios';
-import { inject } from 'vue';
-
-export default function() {
-    const axios = inject<Axios>('axios');
-
-    async function download(url: string, payload: Record<string, string>) {
-        const payloadString = btoa(encodeURIComponent(JSON.stringify(payload)));
-        await axios.get(`${url}?payload=${payloadString}&validate=1`);
-        window.open(`${url}?payload=${payloadString}`);
-    }
-
-    return { download };
-}
--- a/resources/js/layouts/AppLayout.vue
+++ b/resources/js/layouts/AppLayout.vue
@ -1,12 +1,13 @@
 <template>
-    <v-notification class="fixed z-40 right-0 bottom-0 mb-3 mr-3" />
+    <v-notification class="fixed z-40 right-0 bottom-0 mb-3 mr-3"></v-notification>

    <!-- ******************************** Sidebar ******************************** -->
-    <div class="fixed z-40 bg-gray-800 p-6 w-56 top-0 h-screen border-r border-gray-600 border-solid flex flex-col justify-between transition-all"
-         :class="{
-             '-left-[14rem]': !menuStore.isShifted,
-             'left-0': menuStore.isShifted,
-         }"
+    <div
+        class="fixed z-40 bg-gray-800 p-6 w-56 top-0 h-screen border-r border-gray-600 border-solid flex flex-col justify-between transition-all"
+        :class="{
+            '-left-[14rem]': !menuStore.isShifted,
+            'left-0': menuStore.isShifted,
+        }"
    >
        <div class="grid gap-2">
            <v-link href="/" menu="dashboard" icon="loss">Dashboard</v-link>
@ -28,15 +29,13 @@
            <v-link icon="logout" href="/logout" @click.prevent="$inertia.post('/logout')">Abmelden</v-link>
        </div>
        <a v-if="menuStore.hideable" href="#" class="absolute right-0 top-0 mr-2 mt-2" @click.prevent="menuStore.hide()">
-            <ui-sprite src="close" class="w-5 h-5 text-gray-300" />
+            <ui-sprite src="close" class="w-5 h-5 text-gray-300"></ui-sprite>
        </a>
    </div>

-    <page-popups />
+    <slot></slot>

-    <slot />
-
-    <page-search-modal v-if="searchVisible" @close="searchVisible = false" />
+    <page-search-modal v-if="searchVisible" @close="searchVisible = false"></page-search-modal>
 </template>

 <script>
--- a/resources/js/lib/floatingVue.js
+++ b/resources/js/lib/floatingVue.js
@ -17,4 +17,4 @@ var options = {
    },
 };

-export { Plugin, options };
+export {Plugin, options};
--- a/resources/js/stores/menuStore.js
+++ b/resources/js/stores/menuStore.js
@ -1,5 +1,5 @@
-import { defineStore } from 'pinia';
-import { router } from '@inertiajs/vue3';
+import {defineStore} from 'pinia';
+import {router} from '@inertiajs/vue3';

 export const menuStore = defineStore('menu', {
    state: () => ({
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><g class="" transform="translate(0,0)" style=""><path d="m153.654 18 52.57 134.734c1.698 3.994 4.05 5.83 7.243 6.977 3.2 1.15 7.36 1.2 11.058.17 3.698-1.03 6.71-3.146 7.996-4.915 1.288-1.77 1.634-2.564.505-5.24l-.046-.112L181.57 18h-27.916zm94.168 120.143 1.88 4.81-.09-.223c3.346 7.937 1.828 16.822-2.532 22.82-4.36 5.996-10.773 9.734-17.723 11.67-6.95 1.937-14.653 2.065-21.98-.57-7.327-2.634-14.155-8.447-17.742-16.923l-.05-.118-1.757-4.5c-31.31 19.804-42.47 42.026-35.367 68.89 1.24 4.681 3.422 12.364 5.964 22.13 74.37-5.274 139.945-23.872 199.808-51.6-10.297-13.867-22.5-25.83-38.232-34.53-20.505-11.34-47.652-20.157-72.178-21.857zm120.557 71.52c-61.497 28.81-129.173 48.378-205.575 54.196 2.03 8.683 4.08 18.28 5.95 28.495 89.592-10.084 163.043-26.22 217.755-48.767-5.743-11.72-11.593-23.19-18.13-33.924zm26.04 50.16c-57.093 23.772-131.99 40.087-222.73 50.322C180.697 371.423 179.614 446.752 128 480c16.27 0 31.892-.152 46.926-.45 17.84-25.554 31.27-66.222 32.08-86.146 8.27 16.793 3.297 59.32-5.36 85.434 2.735-.093 5.435-.193 8.127-.297 11.824-12.397 11.724-28.632 14.72-47.284 3.324 14.92 7 32.967 9.505 46.156 11.273-.616 22.152-1.34 32.606-2.183 16.38-20.358 21.65-49.604 18.63-85.48 4.226 29.1 9.116 62.138 11.873 82.55a771.724 771.724 0 0 0 27.807-3.614c5.04-18.787-4.1-48.444-2.072-69.54 11.123 43.113 22.247 55.45 33.37 64.043a456.166 456.166 0 0 0 15.733-3.526c-4.7-13.95 1.573-22.497 1.18-39.986 5.647 18.99 14.625 26.958 24.428 32.816 6.506-2.1 12.66-4.336 18.492-6.697-10.538-6.57-10.113-26.374-12.38-42.926 5.954 21.703 14.413 32.418 24.083 37.816 29.124-13.8 48.69-31.534 60.398-53.657-9.078-3.82-18.674-13.002-28.068-20.092 13.214 7.477 23.684 10.614 32.37 10.93a112.386 112.386 0 0 0 3.552-9.868c-56.326-19.528-80.07-64.018-101.58-108.178z" fill="#fff" fill-opacity="1"></path></g></svg>