Add frontend for later link

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Letzte Änderungen
 
+### 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

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\Documents\ContributionDocument;
+use App\Contribution\Requests\GenerateRequest;
 use App\Rules\JsonBase64Rule;
-use Illuminate\Support\Facades\Validator;
-use Lorisleiva\Actions\ActionRequest;
+use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -15,23 +15,19 @@ class GenerateAction
 {
     use AsAction;
 
-    /**
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
-     */
-    public function handle(string $document, array $payload): BaseCompiler
+    public function handle(HasContributionData $request): BaseCompiler
     {
-        return Tex::compile($document::fromRequest($payload));
+        return Tex::compile($request->type()::fromPayload($request));
     }
 
-    public function asController(ActionRequest $request): BaseCompiler
+    public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
     {
-        $payload = $this->payload($request);
-        $type = data_get($payload, 'type');
-        ValidateAction::validateType($type);
-        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
+        app(ContributionFactory::class)->validateType($request);
+        $request->validateContribution();
 
-        return $this->handle($type, $payload);
+        return $request->input('validate')
+            ? response()->json([])
+            : $this->handle($request);
     }
 
     /**
@@ -43,12 +39,4 @@ 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);
-    }
 }

app/Contribution/Actions/GenerateApiAction.php

@@ -2,8 +2,9 @@
 
 namespace App\Contribution\Actions;
 
-use App\Contribution\Documents\ContributionDocument;
-use Lorisleiva\Actions\ActionRequest;
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\ContributionFactory;
+use App\Contribution\Requests\GenerateApiRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -13,26 +14,17 @@ class GenerateApiAction
     use AsAction;
 
     /**
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
+     * @todo merge this with GenerateAction
      */
-    public function handle(string $document, array $payload): BaseCompiler
+    public function handle(HasContributionData $request): BaseCompiler
     {
-        return Tex::compile($document::fromApiRequest($payload));
+        return Tex::compile($request->type()::fromPayload($request));
     }
 
-    public function asController(ActionRequest $request): BaseCompiler
+    public function asController(GenerateApiRequest $request): BaseCompiler
     {
-        ValidateAction::validateType($request->input('type'));
+        app(ContributionFactory::class)->validateType($request);
 
-        return $this->handle($request->input('type'), $request->input());
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [];
+        return $this->handle($request);
     }
 }

app/Contribution/Actions/ValidateAction.php

@@ -1,37 +0,0 @@
-<?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();
-    }
-}

app/Contribution/Contracts/HasContributionData.php

@@ -0,0 +1,30 @@
+<?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;
+}

app/Contribution/ContributionFactory.php

@@ -2,6 +2,7 @@
 
 namespace App\Contribution;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Documents\BdkjHesse;
 use App\Contribution\Documents\ContributionDocument;
 use App\Contribution\Documents\RdpNrwDocument;
@@ -10,6 +11,7 @@ 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
@@ -27,13 +29,13 @@ class ContributionFactory
     ];
 
     /**
-     * @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
+     * @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
      */
     public function compilerSelect(): Collection
     {
         return collect($this->documents)->map(fn ($document) => [
-            'title' => $document::buttonName(),
-            'class' => $document,
+            'name' => $document::getName(),
+            'id' => $document,
         ]);
     }
 
@@ -59,4 +61,9 @@ class ContributionFactory
             ...$type::rules(),
         ];
     }
+
+    public function validateType(HasContributionData $request): void {
+        Validator::make(['type' => $request->type()], $this->typeRule())->validate();
+    }
 }
+

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' => Gender::fromString($member['gender']),
+            'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
             'isLeader' => $member['is_leader'],
         ]));
     }

app/Contribution/Documents/BdkjHesse.php

@@ -2,9 +2,11 @@
 
 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;
 
@@ -17,8 +19,8 @@ class BdkjHesse extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -39,33 +41,15 @@ class BdkjHesse extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            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'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(20),
+            eventName: $request->eventName(),
         );
     }
 
@@ -133,4 +117,15 @@ 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,
+        ];
+    }
 }

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -2,12 +2,15 @@
 
 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
 {
@@ -20,8 +23,8 @@ class CityFrankfurtMainDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -33,33 +36,15 @@ class CityFrankfurtMainDocument extends ContributionDocument
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            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'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(15),
+            eventName: $request->eventName(),
         );
     }
 
@@ -90,4 +75,15 @@ 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,
+        ];
+    }
 }

app/Contribution/Documents/CityRemscheidDocument.php

@@ -2,12 +2,14 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Data\MemberData;
+use App\Contribution\Contracts\HasContributionData;
 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
 {
@@ -19,8 +21,8 @@ class CityRemscheidDocument extends ContributionDocument
      * @param Collection<int, Collection<int, Member>> $children
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $leaders,
@@ -32,40 +34,18 @@ class CityRemscheidDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
-        [$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
+        [$leaders, $children] = $request->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(),
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
-            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'],
+            eventName: $request->eventName(),
         );
     }
 
@@ -86,4 +66,15 @@ 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,
+        ];
+    }
 }

app/Contribution/Documents/CitySolingenDocument.php

@@ -2,7 +2,9 @@
 
 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;
@@ -16,8 +18,8 @@ class CitySolingenDocument extends ContributionDocument
      * @param Collection<int, MemberData> $members
      */
     final private function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public Collection $members,
         public string $eventName,
@@ -30,28 +32,14 @@ class CitySolingenDocument extends ContributionDocument
     /**
      * {@inheritdoc}
      */
-    public static function fromRequest(array $request): static
+    public static function fromPayload(HasContributionData $request): static
     {
         return new static(
-            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'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            members: $request->members(),
+            eventName: $request->eventName(),
         );
     }
 
@@ -75,8 +63,6 @@ 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(' & ') . ' \\\\';
@@ -109,4 +95,15 @@ 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,
+        ];
+    }
 }

app/Contribution/Documents/ContributionDocument.php

@@ -2,6 +2,8 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
+use App\Form\Enums\SpecialType;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Template;
 
@@ -11,15 +13,12 @@ abstract class ContributionDocument extends Document
 
     abstract public static function getName(): string;
 
-    /**
-     * @param ContributionRequestArray $request
-     */
-    abstract public static function fromRequest(array $request): self;
+    abstract public static function fromPayload(HasContributionData $request): self;
 
     /**
-     * @param ContributionApiRequestArray $request
+     * @return array<int, SpecialType>
      */
-    abstract public static function fromApiRequest(array $request): self;
+    abstract public static function requiredFormSpecialTypes(): array;
 
     /**
      * @return array<string, mixed>
@@ -38,11 +37,6 @@ 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;

app/Contribution/Documents/RdpNrwDocument.php

@@ -2,11 +2,14 @@
 
 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
 {
@@ -17,8 +20,8 @@ class RdpNrwDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -29,33 +32,15 @@ class RdpNrwDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            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'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(17),
+            eventName: $request->eventName(),
         );
     }
 
@@ -81,4 +66,15 @@ 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,
+        ];
+    }
 }

app/Contribution/Documents/WuppertalDocument.php

@@ -2,11 +2,14 @@
 
 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
 {
@@ -18,8 +21,8 @@ class WuppertalDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -30,33 +33,15 @@ class WuppertalDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $request): self
     {
         return new self(
-            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'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(14),
+            eventName: $request->eventName(),
         );
     }
 
@@ -76,4 +61,16 @@ 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,
+        ];
+    }
 }

app/Contribution/Enums/Country.php

@@ -0,0 +1,256 @@
+<?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();
+    }
+}
+

app/Contribution/Requests/GenerateApiRequest.php

@@ -0,0 +1,24 @@
+<?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'));
+    }
+
+}

app/Contribution/Requests/GenerateRequest.php

@@ -0,0 +1,68 @@
+<?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();
+    }
+
+}

app/Form/Actions/FormGenerateLaterlinkAction.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\FormSettings;
+use App\Form\Models\Form;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\URL;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FormGenerateLaterlinkAction
+{
+    use AsAction;
+
+    public function asController(Form $form)
+    {
+        $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')
+        ]);
+    }
+}

app/Form/Actions/FormStoreAction.php

@@ -36,6 +36,10 @@ 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',
         ];
     }
 

app/Form/Actions/FormUpdateAction.php

@@ -3,7 +3,6 @@
 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;
@@ -36,6 +35,10 @@ 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',
         ];
     }
 

app/Form/Actions/GenerateContributionAction.php

@@ -0,0 +1,45 @@
+<?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()],
+        ];
+    }
+}

app/Form/Actions/RegisterAction.php

@@ -7,6 +7,9 @@ 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;
@@ -20,13 +23,9 @@ 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([
@@ -34,7 +33,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);
@@ -77,8 +76,34 @@ 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 {
+        if (!is_array($request->query())) {
+            return false;
+        }
+
+        $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;
+    }
 }

app/Form/Data/FieldCollection.php

@@ -114,7 +114,12 @@ class FieldCollection extends Collection
         return $this->map(fn ($field) => $field->presentRaw())->toArray();
     }
 
-    private function findBySpecialType(SpecialType $specialType): ?Field
+    public function hasSpecialType(SpecialType $specialType): bool
+    {
+        return $this->findBySpecialType($specialType) !== null;
+    }
+
+    public function findBySpecialType(SpecialType $specialType): ?Field
     {
         return $this->first(fn ($field) => $field->specialType === $specialType);
     }

app/Form/Enums/SpecialType.php

@@ -7,6 +7,11 @@ 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}>

app/Form/Mails/ConfirmRegistrationMail.php

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

app/Form/Models/Form.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Models;
 
+use App\Contribution\Enums\Country;
 use App\Form\Actions\UpdateParticipantSearchIndexAction;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
@@ -18,7 +19,6 @@ 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,6 +49,8 @@ class Form extends Model implements HasMedia
         'to' => 'datetime',
         'registration_from' => 'datetime',
         'registration_until' => 'datetime',
+        'country' => Country::class,
+        'leader_conditions' => Condition::class,
     ];
 
     /**
@@ -69,25 +71,24 @@ 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, string $name) => $model->slug)
-            ->convert(fn () => 'jpg')
-            ->registerMediaConversions(function (Media $media) {
+            ->maxWidth(fn() => 500)
+            ->forceFileName(fn(Form $model) => $model->slug)
+            ->convert(fn() => 'jpg')
+            ->registerMediaConversions(function () {
                 $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',
@@ -101,7 +102,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),
         ], []);
@@ -112,7 +113,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),
         ], []);
@@ -123,7 +124,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),
         ], []);
@@ -189,8 +190,7 @@ class Form extends Model implements HasMedia
         return Sorting::from($this->meta['sorting']);
     }
 
-    public function canRegister(): bool
-    {
+    public function isInDates(): bool {
         if ($this->registration_from && $this->registration_from->gt(now())) {
             return false;
         }
@@ -201,4 +201,9 @@ class Form extends Model implements HasMedia
 
         return true;
     }
+
+    public function canRegister(): bool
+    {
+        return $this->is_active && $this->isInDates();
+    }
 }

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\Form\Scopes\ParticipantFilterScope;
+use App\Lib\Editor\Condition;
 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;
@@ -110,4 +110,8 @@ class Participant extends Model implements Preventable
     {
         return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
     }
+
+    public function matchesCondition(Condition $condition): bool {
+        return app(FormConditionResolver::class)->forParticipant($this)->filterCondition($condition);
+    }
 }

app/Form/Requests/FormCompileRequest.php

@@ -0,0 +1,107 @@
+<?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();
+    }
+}

app/Form/Resources/FormResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Resources;
 
+use App\Contribution\Enums\Country;
 use App\Form\Data\ExportData;
 use App\Form\Enums\NamiType;
 use App\Form\Enums\SpecialType;
@@ -14,6 +15,7 @@ use App\Group;
 use App\Lib\Editor\EditorData;
 use App\Lib\HasMeta;
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Contribution\ContributionFactory;
 
 /**
  * @mixin Form
@@ -44,6 +46,7 @@ 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,
@@ -53,6 +56,10 @@ 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]),
@@ -62,6 +69,8 @@ class FormResource extends JsonResource
                 '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()),
             ]
         ];
     }
@@ -83,6 +92,8 @@ 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,
@@ -102,6 +113,9 @@ class FormResource extends JsonResource
                 'id' => null,
                 'export' => ExportData::from([]),
                 'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
+                'zip' => '',
+                'location' => '',
+                'country' => null,
             ],
             'section_default' => [
                 'name' => '',

app/Initialize/Actions/InitializeAction.php

@@ -71,7 +71,7 @@ class InitializeAction
 
     public function asController(ActionRequest $request, NamiSettings $settings): RedirectResponse
     {
-        $settings->mglnr = (int) $request->input('mglnr');
+        $settings->mglnr = $request->input('mglnr');
         $settings->password = $request->input('password');
         $settings->default_group_id = (int) $request->input('group_id');
         $settings->search_params = $request->input('params');

app/Initialize/Actions/NamiGetSearchLayerAction.php

@@ -21,7 +21,7 @@ class NamiGetSearchLayerAction
      */
     public function handle(array $input): Collection
     {
-        return Nami::login((int) $input['mglnr'], $input['password'])->searchLayerOptions(
+        return Nami::login($input['mglnr'], $input['password'])->searchLayerOptions(
             SearchLayer::from($input['layer'] ?: 0),
             $input['parent'] ?: null
         );

app/Initialize/Actions/NamiLoginCheckAction.php

@@ -16,7 +16,7 @@ class NamiLoginCheckAction
      */
     public function handle(array $input): void
     {
-        Nami::freshLogin((int) $input['mglnr'], $input['password']);
+        Nami::freshLogin($input['mglnr'], $input['password']);
     }
 
     /**

app/Membership/Actions/MassStoreAction.php

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

app/Membership/FilterScope.php

@@ -25,7 +25,7 @@ class FilterScope extends Filter
 
     public function getQuery(): Builder
     {
-        $query = (new Membership())->newQuery();
+        $query = Membership::orderByRaw('member_id, activity_id, subactivity_id');
 
         if ($this->active === true) {
             $query = $query->active();

app/Setting/NamiSettings.php

@@ -4,7 +4,6 @@ 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;
@@ -12,7 +11,7 @@ use Zoomyboy\LaravelNami\Nami;
 
 class NamiSettings extends LocalSettings implements Storeable
 {
-    public int $mglnr;
+    public string $mglnr;
 
     public string $password;
 

database/factories/Form/Models/FormFactory.php

@@ -57,6 +57,8 @@ class FormFactory extends Factory
             'is_private' => false,
             'export' => ExportData::from([]),
             'prevention_conditions' => Condition::defaults(),
+            'zip' => $this->faker->numberBetween(1100, 99999),
+            'location' => $this->faker->city(),
         ];
     }
 

database/migrations/2025_07_04_210136_create_forms_zip_column.php

@@ -0,0 +1,30 @@
+<?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');
+        });
+    }
+};

database/migrations/2025_07_06_022536_create_forms_country_column.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::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');
+        });
+    }
+};

database/migrations/2025_07_09_221048_create_forms_leader_conditions_column.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::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');
+        });
+    }
+};

package-lock.json

@@ -30,6 +30,7 @@
                 "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"
@@ -1872,6 +1873,16 @@
                 "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",
@@ -2140,6 +2151,11 @@
                 "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",
@@ -2848,6 +2864,14 @@
                 "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",
@@ -4075,6 +4099,11 @@
                 "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",
@@ -4545,6 +4574,11 @@
                 "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",
@@ -4952,6 +4986,14 @@
                 "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",

package.json

@@ -47,6 +47,7 @@
         "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"

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit 35bed01848492471d6e4141f303f74ab19d1fc09
+Subproject commit 47f01b3c3c98821603f3612511d713cf51a6a14c

resources/css/tooltip.css

@@ -1,3 +1,7 @@
+.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;
 }

resources/img/svg/externallink.svg

@@ -0,0 +1,4 @@
+<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>

resources/js/components/page/Popups.vue

@@ -1,12 +1,16 @@
 <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">
-            <div class="text-center" v-text="popup.body" />
-            <div class="flex justify-center space-x-4 mt-8">
+            <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>
-        </div>
     </ui-popup>
 </template>
 

resources/js/composables/useDownloads.ts

@@ -0,0 +1,14 @@
+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 };
+}

resources/js/lib/floatingVue.js

@@ -17,4 +17,4 @@ var options = {
     },
 };
 
-export {Plugin, options};
+export { Plugin, options };

resources/js/stores/swalStore.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia';
 import { v4 as uuidv4 } from 'uuid';
 
+type Payload = Record<string, string|null>;
 
 interface Popup {
     id: string;
@@ -11,6 +12,16 @@ interface Popup {
     cancelButton: string;
     resolve: (id: string) => void;
     reject: (id: string) => void;
+    fields: SwalField[];
+    payload: Payload;
+}
+
+interface SwalField {
+    name: string;
+    label: string;
+    required: boolean;
+    type: 'select' | 'text';
+    options: [],
 }
 
 export default defineStore('swal', {
@@ -30,6 +41,8 @@ export default defineStore('swal', {
                         reject,
                         id: uuidv4(),
                         icon: 'warning-triangle-light',
+                        fields: [],
+                        payload: {},
                     });
                 }).then((id) => {
                     this.remove(id);
@@ -41,8 +54,40 @@ export default defineStore('swal', {
             });
         },
 
+        ask(title: string, body: string, fields: SwalField[] = []): Promise<Payload> {
+            return new Promise<Payload>((resolve, reject) =>  {
+                new Promise<string>((resolve, reject) => {
+                    const payload: Payload = {};
+                    fields.forEach(f => payload[f.name] = null);
+                    this.popups.push({
+                        title,
+                        body,
+                        confirmButton: 'Okay',
+                        cancelButton: 'Abbrechen',
+                        resolve,
+                        reject,
+                        id: uuidv4(),
+                        icon: 'warning-triangle-light',
+                        fields: fields,
+                        payload: payload,
+                    });
+                }).then((id) => {
+                    const p = this.find(id)?.payload;
+                    this.remove(id);
+                    resolve(p || {});
+                }).catch((id) => {
+                    this.remove(id);
+                    reject();
+                });
+            });
+        },
+
         remove(id: string) {
             this.popups = this.popups.filter(p => p.id !== id);
+        },
+
+        find(id: string): Popup|undefined {
+            return this.popups.find(p => p.id === id);
         }
     },
 });

resources/js/views/contribution/VIndex.vue

@@ -1,18 +1,17 @@
 <template>
     <page-layout>
         <form target="_BLANK" class="max-w-4xl w-full mx-auto gap-6 grid-cols-2 grid p-6">
-            <f-text id="eventName" v-model="values.eventName" class="col-span-2" label="Veranstaltungs-Name" required></f-text>
-            <f-text id="dateFrom" v-model="values.dateFrom" type="date" label="Datum von" required></f-text>
-            <f-text id="dateUntil" v-model="values.dateUntil" type="date" label="Datum bis" required></f-text>
+            <f-text id="eventName" v-model="values.eventName" class="col-span-2" label="Veranstaltungs-Name" required />
+            <f-text id="dateFrom" v-model="values.dateFrom" type="date" label="Datum von" required />
+            <f-text id="dateUntil" v-model="values.dateUntil" type="date" label="Datum bis" required />
 
-            <f-text id="zipLocation" v-model="values.zipLocation" label="PLZ / Ort" required></f-text>
-            <f-select id="country" v-model="values.country" :options="countries" name="country" label="Land" required></f-select>
+            <f-text id="zipLocation" v-model="values.zipLocation" label="PLZ / Ort" required />
+            <f-select id="country" v-model="values.country" :options="countries" name="country" label="Land" required />
 
             <div class="border-gray-200 shadow shadow-primary-700 p-3 shadow-[0_0_4px_gray] col-span-2">
-                <f-text id="search_text" ref="searchInput" v-model="searchString" class="col-span-2" label="Suchen …" size="sm" @keypress.enter.prevent="onSubmitFirstMemberResult"></f-text>
+                <f-text id="search_text" ref="searchInput" v-model="searchString" class="col-span-2" label="Suchen …" size="sm" @keypress.enter.prevent="onSubmitFirstMemberResult" />
                 <div class="mt-2 grid grid-cols-[repeat(auto-fill,minmax(180px,1fr))] gap-2 col-span-2">
-                    <f-switch
-                        v-for="member in results.hits"
+                    <f-switch v-for="member in results.hits"
                               :id="`members-${member.id}`"
                               :key="member.id"
                               v-model="values.members"
@@ -22,21 +21,22 @@
                               size="sm"
                               inline
                               @keypress.enter.prevent="onSubmitMemberResult(member)"
-                    ></f-switch>
+                    />
                 </div>
             </div>
 
-            <button v-for="(compiler, index) in compilers" :key="index" class="btn btn-primary mt-3 inline-block" @click.prevent="submit(compiler.class)" v-text="compiler.title"></button>
+            <button v-for="(compiler, index) in compilers" :key="index" class="btn btn-primary mt-3 inline-block" @click.prevent="download('/contribution-generate', {...values, type: compiler.id})" v-text="`Für ${compiler.name} erstellen`" />
         </form>
     </page-layout>
 </template>
 
 <script lang="js" setup>
-import { ref, inject } from 'vue';
+import { ref } from 'vue';
 import useSearch from '../../composables/useSearch.js';
-const axios = inject('axios');
+import useDownloads from '@/composables/useDownloads.ts';
 
 const { searchString, results, clearSearch } = useSearch(['birthday IS NOT NULL', 'address IS NOT EMPTY']);
+const {download} = useDownloads();
 
 const props = defineProps({
     data: {},
@@ -56,12 +56,6 @@ const values = ref({
     ...props.data,
 });
 
-async function submit(compiler) {
-    values.value.type = compiler;
-    await axios.post('/contribution-validate', values.value);
-    var payload = btoa(encodeURIComponent(JSON.stringify(values.value)));
-    window.open(`/contribution-generate?payload=${payload}`);
-}
 function onSubmitMemberResult(selected) {
     if (values.value.members.find((m) => m === selected.id) !== undefined) {
         values.value.members = values.value.members.filter((m) => m !== selected.id);

resources/js/views/form/Index.vue

@@ -20,14 +20,15 @@
         <ui-popup v-if="single !== null && single.config !== null" :heading="`Veranstaltung ${single.id ? 'bearbeiten' : 'erstellen'}`" full @close="cancel">
             <div class="flex flex-col mt-3">
                 <ui-tabs v-model="active" :entries="tabs" />
-                <div v-show="active === 0" class="grid grid-cols-2 gap-3">
-                    <div class="flex space-x-3">
+                <div v-show="active === 0" class="grid grid-cols-4 gap-3">
+                    <div class="flex space-x-3 col-span-2">
                         <f-text id="name" v-model="single.name" class="grow" label="Name" required />
-                        <f-switch id="is_active" v-model="single.is_active" name="is_active" label="Aktiv" />
-                        <f-switch id="is_private" v-model="single.is_private" name="is_private" label="Privat" />
+                        <f-switch id="is_active" v-model="single.is_active" name="is_active" label="Aktiv" hint="Inaktive Veranstaltungen werden außerhalb von Adrema wie nicht existierende Veranstaltungen betrachtet. Insbesondere ist eine Anmeldung dann nicht möglich und die Veranstaltung erscheint auch nicht in der Veranstaltungs-Übersicht." />
+                        <f-switch id="is_private" v-model="single.is_private" name="is_private" label="Privat" hint="Ist eine Veranstaltung privat, so wird diese nicht auf der Website angezeigt. Eine Anmeldung ist jedoch trotzdem möglich, wenn man über den Anmelde-Link verfügt." />
                     </div>
                     <f-singlefile id="header_image"
                                   v-model="single.header_image"
+                                  class="col-span-2"
                                   label="Bild"
                                   name="header_image"
                                   parent-name="form"
@@ -37,13 +38,17 @@
                     />
                     <f-text id="from" v-model="single.from" type="date" label="Von" required />
                     <f-text id="to" v-model="single.to" type="date" label="Bis" required />
-                    <f-text id="registration_from" v-model="single.registration_from" type="datetime-local" label="Registrierung von" required />
+                    <f-text id="zip" v-model="single.zip" label="PLZ" />
+                    <f-text id="location" v-model="single.location" label="Ort" />
+                    <f-select id="country" v-model="single.country" class="col-span-2" name="country" label="Land" :options="meta.countries" />
+                    <f-text id="registration_from" v-model="single.registration_from" type="datetime-local" label="Registrierung von" hint="Ist eine Anmeldung laut dieser zwei Datumsangaben möglich, kann man sich anmelden. Andernfalls wird die Veranstaltung (mit Beschreibungstext) auf der Übersichtsseite angezeigt, man kommt allerdings nicht zum Anmeldeformular." required />
                     <f-text id="registration_until" v-model="single.registration_until" type="datetime-local" label="Registrierung bis" required />
                     <f-textarea id="excerpt"
                                 v-model="single.excerpt"
                                 hint="Gebe hier eine kurze Beschreibung für die Veranstaltungs-Übersicht ein (Maximal 130 Zeichen)."
                                 label="Auszug"
                                 :rows="5"
+                                class="col-span-full"
                                 required
                     />
                 </div>
@@ -110,6 +115,11 @@
                         <conditions id="prevention_conditions" v-model="single.prevention_conditions" :single="single" />
                     </ui-box>
                 </div>
+                <div v-if="active === 6">
+                    <ui-box heading="Bedingung für Leiter*in">
+                        <conditions id="leader_conditions" v-model="single.leader_conditions" :single="single" />
+                    </ui-box>
+                </div>
             </div>
             <template #actions>
                 <a href="#" @click.prevent="submit">
@@ -136,6 +146,7 @@
                     <th>Name</th>
                     <th>Von</th>
                     <th>Bis</th>
+                    <th>Tags</th>
                     <th>Anzahl TN</th>
                     <th />
                 </tr>
@@ -152,6 +163,13 @@
                     <td>
                         <div v-text="form.to_human" />
                     </td>
+                    <td>
+                        <div class="bool-row">
+                            <ui-bool true-comment="aktiv" false-comment="inaktiv" :value="form.is_active">A</ui-bool>
+                            <ui-bool true-comment="private Veranstaltung" false-comment="nicht private Veranstaltung" :value="form.is_private">P</ui-bool>
+                            <ui-bool true-comment="Anmeldung möglich (lt. 'Registrierung von / bis')" false-comment="Anmeldeschluss erreicht" :value="form.is_in_dates">D</ui-bool>
+                        </div>
+                    </td>
                     <td>
                         <div v-text="form.participants_count" />
                     </td>
@@ -161,6 +179,8 @@
                             <ui-action-button tooltip="Teilnehmende anzeigen" class="btn-info" icon="user" @click.prevent="showParticipants(form)" />
                             <ui-action-button :href="form.links.frontend" target="_BLANK" tooltip="zur Anmeldeseite" class="btn-info" icon="eye" />
                             <ui-action-button tooltip="Kopieren" class="btn-info" icon="copy" @click="onCopy(form)" />
+                            <ui-action-button tooltip="Nachmelde-Link kopieren" class="btn-info" icon="externallink" @click="copyLaterLink(form)" />
+                            <ui-action-button tooltip="Zuschuss-Liste erstellen" class="btn-info" icon="contribution" @click="onGenerateContribution(form)" />
                             <ui-action-button :href="form.links.export" target="_BLANK" tooltip="als Tabellendokument exportieren" class="btn-info" icon="document" />
                             <ui-action-button tooltip="Löschen" class="btn-danger" icon="trash" @click.prevent="onDelete(form)" />
                         </div>
@@ -183,18 +203,22 @@ import Conditions from './Conditions.vue';
 import ConditionsForm from './ConditionsForm.vue';
 import { useToast } from 'vue-toastification';
 import useSwal from '@/stores/swalStore.ts';
+import useDownloads from '@/composables/useDownloads.ts';
+import useClipboard from 'vue-clipboard3';
 
 const props = defineProps(indexProps);
 const { meta, data, reloadPage, reload, create, single, edit, cancel, submit, remove, getFilter, setFilter } = useIndex(props.data, 'form');
 const axios = inject('axios');
 const toast = useToast();
+const {download} = useDownloads();
+const {toClipboard} = useClipboard();
 
 const showing = ref(null);
 const fileSettingPopup = ref(null);
 
 const active = ref(0);
 const activeMailTab = ref(0);
-const tabs = [{ title: 'Allgemeines' }, { title: 'Beschreibung' }, { title: 'Formular' }, { title: 'Bestätigungs-E-Mail' }, { title: 'Export' }, { title: 'Prävention' }];
+const tabs = [{ title: 'Allgemeines' }, { title: 'Beschreibung' }, { title: 'Formular' }, { title: 'Bestätigungs-E-Mail' }, { title: 'Export' }, { title: 'Prävention' }, {title: 'Zuschüsse'}];
 const mailTabs = [{ title: 'vor Daten' }, { title: 'nach Daten' }];
 const swal = useSwal();
 
@@ -219,6 +243,20 @@ async function onCopy(form) {
     reload(false);
 }
 
+async function onGenerateContribution(form) {
+    const response = await swal.ask('Zuschussliste erstellen', 'Hiermit erstellst du eine Zuschussliste mit allen angemeldeten Mitgliedern. Bite wähle aus, für welche Organisation du eine Liste erstellen willst.', [
+        {
+            name: 'type',
+            label: 'Organisation',
+            required: true,
+            type: 'select',
+            options: meta.value.contribution_types,
+        }
+    ]);
+    await download(form.links.contribution, {type: response.type, validate: '1'});
+    await download(form.links.contribution, {type: response.type});
+}
+
 async function onDelete(form) {
     await swal.confirm('Diese Veranstaltung löschen?', `Die Veranstaltung ${form.name} wird gelöscht werden.`);
     await remove(form);
@@ -231,6 +269,12 @@ function setTemplate(template) {
     single.value.mail_bottom = template.mail_bottom;
 }
 
+async function copyLaterLink(form) {
+    const response = await axios.get(form.links.laterlink);
+    await toClipboard(response.data.url);
+    toast.success('Link in Zwischenablage kopiert');
+}
+
 async function saveFileConditions(conditions) {
     await axios.patch(`/mediaupload/${fileSettingPopup.value.id}`, {
         properties: {

resources/js/views/membership/Index.vue

@@ -43,6 +43,7 @@
                     <th>Beginn</th>
                     <th>Ende</th>
                     <th>Aktiv</th>
+                    <th>Aktion</th>
                 </tr>
             </thead>
             <tbody>
@@ -54,6 +55,9 @@
                     <td v-text="membership.from.human" />
                     <td v-text="membership.to?.human" />
                     <td><ui-bool :value="membership.isActive" /></td>
+                    <td>
+                        <ui-action-button tooltip="Löschen" class="btn-danger" icon="trash" @click.prevent="onDelete(membership)" />
+                    </td>
                 </tr>
             </tbody>
         </table>
@@ -66,9 +70,14 @@
 
 <script lang="js" setup>
 import {useIndex, indexProps} from '@/composables/useIndex.js';
+import useSwal from '@/stores/swalStore.ts';
 
+const swal = useSwal();
 const props = defineProps(indexProps);
+const {data, meta, getFilter, setFilter, axios} = useIndex(props.data, 'membership');
 
-const {data, meta, getFilter, setFilter} = useIndex(props.data, 'memberships');
-
+async function onDelete(membership) {
+    await swal.confirm('Mitgliedschaft löschen', `Mitgliedschaft von ${membership.member.fullname} löschen`);
+    await axios.delete(membership.links.destroy);
+}
 </script>

routes/web.php

@@ -11,7 +11,6 @@ use App\Activity\Api\SubactivityStoreAction;
 use App\Activity\Api\SubactivityUpdateAction;
 use App\Contribution\Actions\FormAction as ContributionFormAction;
 use App\Contribution\Actions\GenerateAction as ContributionGenerateAction;
-use App\Contribution\Actions\ValidateAction as ContributionValidateAction;
 use App\Course\Actions\CourseDestroyAction;
 use App\Course\Actions\CourseIndexAction;
 use App\Course\Actions\CourseStoreAction;
@@ -25,6 +24,7 @@ use App\Fileshare\Actions\ListFilesAction;
 use App\Form\Actions\ExportAction as ActionsExportAction;
 use App\Form\Actions\FormCopyAction;
 use App\Form\Actions\FormDestroyAction;
+use App\Form\Actions\FormGenerateLaterlinkAction;
 use App\Form\Actions\FormIndexAction;
 use App\Group\Actions\GroupBulkstoreAction;
 use App\Group\Actions\GroupIndexAction;
@@ -35,6 +35,7 @@ use App\Form\Actions\FormtemplateStoreAction;
 use App\Form\Actions\FormtemplateUpdateAction;
 use App\Form\Actions\FormUpdateAction;
 use App\Form\Actions\FormUpdateMetaAction;
+use App\Form\Actions\GenerateContributionAction;
 use App\Form\Actions\IsDirtyAction;
 use App\Form\Actions\ParticipantAssignAction;
 use App\Form\Actions\ParticipantDestroyAction;
@@ -70,7 +71,6 @@ use App\Member\Actions\MemberResyncAction;
 use App\Member\Actions\MemberShowAction;
 use App\Member\Actions\SearchAction;
 use App\Member\MemberController;
-use App\Membership\Actions\IndexAction as MembershipIndexAction;
 use App\Membership\Actions\ListForGroupAction;
 use App\Membership\Actions\MassListAction;
 use App\Membership\Actions\MassStoreAction;
@@ -112,7 +112,6 @@ Route::group(['middleware' => 'auth:web'], function (): void {
     // ------------------------------- Contributions -------------------------------
     Route::get('/contribution', ContributionFormAction::class)->name('contribution.form');
     Route::get('/contribution-generate', ContributionGenerateAction::class)->name('contribution.generate');
-    Route::post('/contribution-validate', ContributionValidateAction::class)->name('contribution.validate');
 
     // ----------------------------------- mail ------------------------------------
     Route::post('/api/mailgateway', StoreAction::class)->name('mailgateway.store');
@@ -181,6 +180,8 @@ Route::group(['middleware' => 'auth:web'], function (): void {
     Route::patch('/participant/{participant}', ParticipantUpdateAction::class)->name('participant.update');
     Route::post('/form/{form}/participant', ParticipantStoreAction::class)->name('form.participant.store');
     Route::post('/form/{form}/copy', FormCopyAction::class)->name('form.copy');
+    Route::get('/form/{form}/contribution', GenerateContributionAction::class)->name('form.contribution');
+    Route::get('/form/{form}/laterlink', FormGenerateLaterlinkAction::class)->name('form.laterlink');
 
     // ------------------------------------ fileshare -----------------------------------
     Route::post('/fileshare', FileshareStoreAction::class)->name('fileshare.store');

tests/Datasets/contribution.php

@@ -0,0 +1,112 @@
+<?php
+
+use App\Contribution\Documents\BdkjHesse;
+use App\Contribution\Documents\CityFrankfurtMainDocument;
+use App\Contribution\Documents\CityRemscheidDocument;
+use App\Contribution\Documents\CitySolingenDocument;
+use App\Contribution\Documents\RdpNrwDocument;
+use App\Contribution\Documents\WuppertalDocument;
+
+dataset('contribution-validation', function () {
+    return [
+        [
+            ['type' => 'aaa'],
+            CitySolingenDocument::class,
+            'type',
+        ],
+        [
+            ['type' => ''],
+            CitySolingenDocument::class,
+            'type',
+        ],
+        [
+            ['dateFrom' => ''],
+            CitySolingenDocument::class,
+            'dateFrom',
+        ],
+        [
+            ['dateFrom' => '2022-01'],
+            CitySolingenDocument::class,
+            'dateFrom',
+        ],
+        [
+            ['dateUntil' => ''],
+            CitySolingenDocument::class,
+            'dateUntil',
+        ],
+        [
+            ['dateUntil' => '2022-01'],
+            CitySolingenDocument::class,
+            'dateUntil',
+        ],
+        [
+            ['country' => -1],
+            RdpNrwDocument::class,
+            'country',
+        ],
+        [
+            ['country' => 'AAAA'],
+            RdpNrwDocument::class,
+            'country',
+        ],
+        [
+            ['members' => 'A'],
+            RdpNrwDocument::class,
+            'members',
+        ],
+        [
+            ['members' => [99999]],
+            RdpNrwDocument::class,
+            'members.0',
+        ],
+        [
+            ['members' => ['lalala']],
+            RdpNrwDocument::class,
+            'members.0',
+        ],
+        [
+            ['eventName' => ''],
+            CitySolingenDocument::class,
+            'eventName',
+        ],
+        [
+            ['zipLocation' => ''],
+            CitySolingenDocument::class,
+            'zipLocation',
+        ],
+        [
+            ['zipLocation' => ''],
+            WuppertalDocument::class,
+            'zipLocation',
+        ],
+        [
+            ['dateFrom' => ''],
+            WuppertalDocument::class,
+            'dateFrom',
+        ],
+        [
+            ['dateUntil' => ''],
+            WuppertalDocument::class,
+            'dateUntil',
+        ],
+    ];
+});
+
+dataset('contribution-assertions', fn () => [
+    [CitySolingenDocument::class, ["Super tolles Lager", "Max Muster", "Jane Muster", "15.06.1991"]],
+    [RdpNrwDocument::class, ["Muster, Max", "Muster, Jane", "15.06.1991", "42777 SG"]],
+    [CityRemscheidDocument::class, ["Max", "Muster", "Jane"]],
+    [CityFrankfurtMainDocument::class, ["Max", "Muster", "Jane"]],
+    [BdkjHesse::class, ["Max", "Muster", "Jane"]],
+    [WuppertalDocument::class, ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
+]);
+
+dataset('contribution-documents', fn () => [
+    CitySolingenDocument::class,
+    RdpNrwDocument::class,
+    CityRemscheidDocument::class,
+    CityFrankfurtMainDocument::class,
+    BdkjHesse::class,
+    WuppertalDocument::class,
+]);
+

tests/EndToEnd/Form/FormIndexActionTest.php

@@ -2,6 +2,8 @@
 
 namespace Tests\EndToEnd\Form;
 
+use App\Contribution\Documents\RdpNrwDocument;
+use App\Contribution\Enums\Country;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Form\Data\ExportData;
 use App\Form\FormSettings;
@@ -11,14 +13,19 @@ use App\Form\Models\Participant;
 use Carbon\Carbon;
 use Tests\Feature\Form\FormtemplateSectionRequest;
 use Tests\RequestFactories\EditorRequestFactory;
+use Tests\Lib\CreatesFormFields;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\EndToEndTestCase;
+use Tests\RequestFactories\ConditionRequestFactory;
 
-class FormIndexActionTest extends FormTestCase
-{
+uses(CreatesFormFields::class);
+uses(DatabaseTransactions::class);
+uses(EndToEndTestCase::class);
 
-    public function testItDisplaysForms(): void
-    {
+it('testItDisplaysForms', function () {
     Carbon::setTestNow(Carbon::parse('2023-03-03'));
     $this->login()->loginNami()->withoutExceptionHandling();
+    $leaderConditions = ConditionRequestFactory::new()->whenField('f', 'v');
     $form = Form::factory()
         ->name('lala')
         ->excerpt('fff')
@@ -31,7 +38,10 @@ class FormIndexActionTest extends FormTestCase
         ->registrationUntil('2023-04-01 05:00:00')
         ->sections([FormtemplateSectionRequest::new()->name('sname')->fields([$this->textField()])])
         ->has(Participant::factory()->count(5))
-            ->create();
+        ->zip('12345')
+        ->location('SG')
+        ->country(Country::CH)
+        ->create(['leader_conditions' => $leaderConditions->toData()]);
 
     sleep(1);
     $this->get(route('form.index'))
@@ -46,7 +56,11 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.data.0.from_human', '05.05.2023')
         ->assertInertiaPath('data.data.0.to_human', '07.06.2023')
         ->assertInertiaPath('data.data.0.from', '2023-05-05')
+        ->assertInertiaPath('data.data.0.zip', '12345')
+        ->assertInertiaPath('data.data.0.location', 'SG')
+        ->assertInertiaPath('data.data.0.country', 'Schweiz')
         ->assertInertiaPath('data.data.0.participants_count', 5)
+        ->assertInertiaPath('data.data.0.leader_conditions', $leaderConditions->create())
         ->assertInertiaPath('data.data.0.to', '2023-06-07')
         ->assertInertiaPath('data.data.0.is_active', true)
         ->assertInertiaPath('data.data.0.is_private', false)
@@ -55,6 +69,8 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.data.0.registration_until', '2023-04-01 05:00:00')
         ->assertInertiaPath('data.data.0.links.participant_index', route('form.participant.index', ['form' => $form]))
         ->assertInertiaPath('data.data.0.links.export', route('form.export', ['form' => $form]))
+        ->assertInertiaPath('data.data.0.links.contribution', route('form.contribution', ['form' => $form]))
+        ->assertInertiaPath('data.data.0.links.laterlink', route('form.laterlink', ['form' => $form]))
         ->assertInertiaPath('data.meta.links.store', route('form.store'))
         ->assertInertiaPath('data.meta.links.formtemplate_index', route('formtemplate.index'))
         ->assertInertiaPath('data.meta.default.name', '')
@@ -62,19 +78,27 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.meta.default.prevention_text.version', '1.0')
         ->assertInertiaPath('data.meta.default.description', [])
         ->assertInertiaPath('data.meta.default.excerpt', '')
+        ->assertInertiaPath('data.meta.default.zip', '')
+        ->assertInertiaPath('data.meta.default.location', '')
+        ->assertInertiaPath('data.meta.default.country', null)
         ->assertInertiaPath('data.meta.default.is_active', true)
         ->assertInertiaPath('data.meta.default.is_private', false)
         ->assertInertiaPath('data.meta.default.mailattachments', [])
         ->assertInertiaPath('data.meta.default.export', ['root' => null, 'group_by' => null, 'to_group_field' => null])
         ->assertInertiaPath('data.meta.default.config', null)
+        ->assertInertiaPath('data.meta.countries.0.id', 'Andorra')
+        ->assertInertiaPath('data.meta.countries.0.name', 'Andorra')
         ->assertInertiaPath('data.meta.base_url', url(''))
         ->assertInertiaPath('data.meta.namiTypes.0', ['id' => 'Vorname', 'name' => 'Vorname'])
         ->assertInertiaPath('data.meta.specialTypes.0', ['id' => 'Vorname', 'name' => 'Vorname'])
-            ->assertInertiaPath('data.meta.section_default.name', '');
-    }
+        ->assertInertiaPath('data.meta.section_default.name', '')
+        ->assertInertiaPath('data.meta.contribution_types.0.id', RdpNrwDocument::class)
+        ->assertInertiaPath('data.meta.contribution_types.0.name', 'RdP NRW')
+        ->assertInertiaPath('data.meta.default.zip', '')
+        ->assertInertiaPath('data.meta.default.location', '');
+});
 
-    public function testFormtemplatesHaveData(): void
-    {
+it('testFormtemplatesHaveData', function () {
     $this->login()->loginNami()->withoutExceptionHandling();
     Formtemplate::factory()->name('tname')->sections([FormtemplateSectionRequest::new()->name('sname')->fields([
         $this->textField('vorname')
@@ -92,10 +116,9 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.meta.templates.0.config.sections.0.fields.0.key', 'vorname')
         ->assertInertiaPath('data.meta.templates.0.mail_top.blocks.0.data.text', 'lala')
         ->assertInertiaPath('data.meta.templates.0.mail_bottom.blocks.0.data.text', 'lalb');
-    }
+});
 
-    public function testItDisplaysExport(): void
-    {
+it('testItDisplaysExport', function () {
     $this->login()->loginNami()->withoutExceptionHandling();
     Form::factory()
         ->name('lala')
@@ -108,10 +131,9 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.data.0.export.root.connection_id', 2)
         ->assertInertiaPath('data.data.0.export.root.resource', '/dir')
         ->assertInertiaPath('data.data.0.export.to_group_field', 'abc');
-    }
+});
 
-    public function testItHandlesFullTextSearch(): void
-    {
+it('testItHandlesFullTextSearch', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     Form::factory()->to(now()->addYear())->name('ZEM 2024')->create();
     Form::factory()->to(now()->addYear())->name('Rover-Spek 2025')->create();
@@ -121,10 +143,9 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaCount('data.data', 1);
     $this->callFilter('form.index', [])
         ->assertInertiaCount('data.data', 2);
-    }
+});
 
-    public function testItDisplaysParentLinkForFormWithNamiFields(): void
-    {
+it('testItDisplaysParentLinkForFormWithNamiFields', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     $form = Form::factory()->fields([$this->namiField('mitglieder')])->create();
 
@@ -133,29 +154,26 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.data.0.has_nami_field', true)
         ->assertInertiaPath('data.data.0.links.participant_root_index', route('form.participant.index', ['form' => $form, 'parent' => -1]))
         ->assertInertiaPath('data.data.0.links.participant_index', route('form.participant.index', ['form' => $form, 'parent' => null]));
-    }
+});
 
-    public function testItDisplaysRegisterUrl(): void
-    {
+it('testItDisplaysRegisterUrl', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     FormSettings::fake(['registerUrl' => 'https://example.com/form/{slug}/register']);
     Form::factory()->to(now()->addYear())->name('ZEM 2024')->create();
 
     sleep(1);
     $this->callFilter('form.index', [])->assertInertiaPath('data.data.0.links.frontend', 'https://example.com/form/zem-2024/register');
-    }
+});
 
-    public function testItDisplaysCopyUrl(): void
-    {
+it('testItDisplaysCopyUrl', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     $form = Form::factory()->create();
 
     sleep(1);
     $this->callFilter('form.index', [])->assertInertiaPath('data.data.0.links.copy', route('form.copy', $form));
-    }
+});
 
-    public function testItDoesntReturnInactiveForms(): void
-    {
+it('testItDoesntReturnInactiveForms', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     Form::factory()->isActive(false)->count(1)->create();
     Form::factory()->isActive(true)->count(2)->create();
@@ -164,10 +182,25 @@ class FormIndexActionTest extends FormTestCase
     $this->callFilter('form.index', [])->assertInertiaCount('data.data', 2);
     $this->callFilter('form.index', ['inactive' => true])->assertInertiaCount('data.data', 3);
     $this->callFilter('form.index', ['inactive' => false])->assertInertiaCount('data.data', 2);
-    }
+});
 
-    public function testItOrdersByStartDateDesc(): void
-    {
+it('returns in dates', function () {
+    $this->withoutExceptionHandling()->login()->loginNami();
+    Form::factory()->create();
+
+    sleep(1);
+    $this->callFilter('form.index', [])->assertInertiaPath('data.data.0.is_in_dates', true);
+});
+
+it('returns not in dates', function () {
+    $this->withoutExceptionHandling()->login()->loginNami();
+    Form::factory()->registrationFrom(now()->addDay(2))->create();
+
+    sleep(1);
+    $this->callFilter('form.index', [])->assertInertiaPath('data.data.0.is_in_dates', false);
+});
+
+it('testItOrdersByStartDateDesc', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     $form1 = Form::factory()->from(now()->addDays(4))->to(now()->addYear())->create();
     $form2 = Form::factory()->from(now()->addDays(3))->to(now()->addYear())->create();
@@ -178,10 +211,9 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaPath('data.data.0.id', $form3->id)
         ->assertInertiaPath('data.data.1.id', $form2->id)
         ->assertInertiaPath('data.data.2.id', $form1->id);
-    }
+});
 
-    public function testItShowsPastEvents(): void
-    {
+it('testItShowsPastEvents', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
     Form::factory()->count(5)->to(now()->subDays(2))->create();
     Form::factory()->count(3)->to(now()->subDays(5))->create();
@@ -192,5 +224,4 @@ class FormIndexActionTest extends FormTestCase
         ->assertInertiaCount('data.data', 10);
     $this->callFilter('form.index', [])
         ->assertInertiaCount('data.data', 2);
-    }
-}
+});

tests/EndToEnd/MassstoreActionTest.php

@@ -48,6 +48,16 @@ it('testItCreatesAMembership', function() {
     MassStoreAction::run($group, $activity, $subactivity, [$member->id]);
 });
 
+it('doesnt create a membership that already exists', function() {
+    MembershipDestroyAction::partialMock()->shouldReceive('handle')->never();
+    MembershipStoreAction::partialMock()->shouldReceive('handle')->never();
+    $member = Member::factory()->defaults()
+        ->has(Membership::factory()->in('Leiter*in', 10, 'Rover', 11)->inNami(55))
+        ->create();
+
+    MassStoreAction::run($member->memberships->first()->group, $member->memberships->first()->activity, $member->memberships->first()->subactivity, [$member->id]);
+});
+
 it('cannot create membership when activity and subactivity doesnt belong together', function() {
     $this->login()->loginNami();
     $member = Member::factory()->defaults()->create();

tests/EndToEnd/Member/PreventionTest.php

@@ -415,7 +415,7 @@ it('renders setting of yearly mail', function () {
     app(PreventionSettings::class)->fill([
         'yearlymail' => EditorRequestFactory::new()->paragraphs(["{wanted}", "bbb"])->toData()
     ])->save();
-    $member = createMember((['efz' =>  now()->subYears(5), 'ps_at' => now(), 'has_vk' => true]));
+    createMember((['efz' =>  now()->subYears(5), 'ps_at' => now(), 'has_vk' => true]));
 
     sleep(2);
     YearlyRememberAction::run();

tests/Feature/Contribution/IndexTest.php

@@ -22,8 +22,8 @@ class IndexTest extends TestCase
         $response = $this->get('/contribution');
 
         $this->assertInertiaHas([
-            'class' => RdpNrwDocument::class,
-            'title' => 'Für RdP NRW erstellen',
+            'id' => RdpNrwDocument::class,
+            'name' => 'RdP NRW',
         ], $response, 'compilers.0');
         $this->assertInertiaHas([
             'id' => $country->id,

tests/Feature/Contribution/StoreTest.php

@@ -2,9 +2,7 @@
 
 namespace Tests\Feature\Contribution;
 
-use App\Contribution\Documents\RdpNrwDocument;
 use App\Contribution\Documents\CitySolingenDocument;
-use App\Contribution\Documents\WuppertalDocument;
 use App\Country;
 use App\Gender;
 use App\Invoice\InvoiceSettings;
@@ -18,92 +16,7 @@ use Zoomyboy\Tex\Tex;
 
 uses(DatabaseTransactions::class);
 
-dataset('validation', function () {
-    return [
-        [
-            ['type' => 'aaa'],
-            CitySolingenDocument::class,
-            'type',
-        ],
-        [
-            ['type' => ''],
-            CitySolingenDocument::class,
-            'type',
-        ],
-        [
-            ['dateFrom' => ''],
-            CitySolingenDocument::class,
-            'dateFrom',
-        ],
-        [
-            ['dateFrom' => '2022-01'],
-            CitySolingenDocument::class,
-            'dateFrom',
-        ],
-        [
-            ['dateUntil' => ''],
-            CitySolingenDocument::class,
-            'dateUntil',
-        ],
-        [
-            ['dateUntil' => '2022-01'],
-            CitySolingenDocument::class,
-            'dateUntil',
-        ],
-        [
-            ['country' => -1],
-            RdpNrwDocument::class,
-            'country',
-        ],
-        [
-            ['country' => 'AAAA'],
-            RdpNrwDocument::class,
-            'country',
-        ],
-        [
-            ['members' => 'A'],
-            RdpNrwDocument::class,
-            'members',
-        ],
-        [
-            ['members' => [99999]],
-            RdpNrwDocument::class,
-            'members.0',
-        ],
-        [
-            ['members' => ['lalala']],
-            RdpNrwDocument::class,
-            'members.0',
-        ],
-        [
-            ['eventName' => ''],
-            CitySolingenDocument::class,
-            'eventName',
-        ],
-        [
-            ['zipLocation' => ''],
-            CitySolingenDocument::class,
-            'zipLocation',
-        ],
-        [
-            ['zipLocation' => ''],
-            WuppertalDocument::class,
-            'zipLocation',
-        ],
-        [
-            ['dateFrom' => ''],
-            WuppertalDocument::class,
-            'dateFrom',
-        ],
-        [
-            ['dateUntil' => ''],
-            WuppertalDocument::class,
-            'dateUntil',
-        ],
-    ];
-});
-
-it('compiles documents via api', function (string $type, array $bodyChecks) {
+it('compiles documents via base64 param', function (string $type, array $bodyChecks) {
     $this->withoutExceptionHandling();
     Tex::spy();
     $this->login()->loginNami();
@@ -124,14 +37,31 @@ it('compiles documents via api', function (string $type, array $bodyChecks) {
     $response->assertSessionDoesntHaveErrors();
     $response->assertOk();
     Tex::assertCompiled($type, fn ($document) => $document->hasAllContent($bodyChecks));
-})->with([
-    ["App\\Contribution\\Documents\\CitySolingenDocument", ["Super tolles Lager", "Max Muster", "Jane Muster", "15.06.1991"]],
-    ["App\\Contribution\\Documents\\RdpNrwDocument", ["Muster, Max", "Muster, Jane", "15.06.1991", "42777 SG"]],
-    ["App\\Contribution\\Documents\\CityRemscheidDocument", ["Max", "Muster", "Jane"]],
-    ["App\\Contribution\\Documents\\CityFrankfurtMainDocument", ["Max", "Muster", "Jane"]],
-    ["App\\Contribution\\Documents\\BdkjHesse", ["Max", "Muster", "Jane"]],
-    ["App\\Contribution\\Documents\\WuppertalDocument", ["Max", "Muster", "Jane", "42777 SG", "15.06.1991", "16.06.1991"]],
-]);
+})->with('contribution-assertions');
+
+it('only validates', function (string $type) {
+    $this->withoutExceptionHandling();
+    Tex::spy();
+    $this->login()->loginNami();
+    $member1 = Member::factory()->defaults()->male()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']);
+    $member2 = Member::factory()->defaults()->female()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']);
+
+    $response = $this->call('GET', '/contribution-generate', [
+        'validate' => '1',
+        'payload' => ContributionRequestFactory::new()->type($type)->state([
+            'dateFrom' => '1991-06-15',
+            'dateUntil' => '1991-06-16',
+            'eventName' => 'Super tolles Lager',
+            'members' => [$member1->id, $member2->id],
+            'type' => $type,
+            'zipLocation' => '42777 SG',
+        ])->toBase64(),
+    ]);
+
+    $response->assertSessionDoesntHaveErrors();
+    $response->assertOk();
+    Tex::assertNotCompiled($type);
+})->with('contribution-assertions');
 
 it('testItCompilesGroupNameInSolingenDocument', function () {
     $this->withoutExceptionHandling()->login()->loginNami();
@@ -145,32 +75,51 @@ it('testItCompilesGroupNameInSolingenDocument', function () {
     Tex::assertCompiled(CitySolingenDocument::class, fn ($document) => $document->hasAllContent(['Stamm BiPi']));
 });
 
-it('testItCompilesContributionDocumentsViaApi', function () {
+it('testItCompilesContributionDocumentsViaApi', function (string $type, array $bodyChecks) {
     $this->withoutExceptionHandling();
     Tex::spy();
     Gender::factory()->female()->create();
     Gender::factory()->male()->create();
     Passport::actingAsClient(Client::factory()->create(), ['contribution-generate']);
-    $country = Country::factory()->create();
-    Member::factory()->defaults()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']);
-    Member::factory()->defaults()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']);
 
     $response = $this->postJson('/api/contribution-generate', [
-        'country' => $country->id,
+        'country' => Country::factory()->create()->id,
         'dateFrom' => '1991-06-15',
         'dateUntil' => '1991-06-16',
         'eventName' => 'Super tolles Lager',
-        'type' => CitySolingenDocument::class,
+        'type' => $type,
         'zipLocation' => '42777 SG',
-        'member_data' => [
-            ContributionMemberApiRequestFactory::new()->create(),
-            ContributionMemberApiRequestFactory::new()->create(),
+        'members' => [
+            ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Max', 'lastname' => 'Muster']),
+            ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster']),
         ],
     ]);
 
     $response->assertSessionDoesntHaveErrors();
     $response->assertOk();
-    Tex::assertCompiled(CitySolingenDocument::class, fn ($document) => $document->hasAllContent(['Super']));
+    Tex::assertCompiled($type, fn ($document) => $document->hasAllContent($bodyChecks));
+})->with('contribution-assertions');
+
+it('compiles when gender is null', function () {
+    $this->withoutExceptionHandling();
+    Tex::spy();
+    Passport::actingAsClient(Client::factory()->create(), ['contribution-generate']);
+
+    $response = $this->postJson('/api/contribution-generate', [
+        'country' => Country::factory()->create()->id,
+        'dateFrom' => '1991-06-15',
+        'dateUntil' => '1991-06-16',
+        'eventName' => 'Super tolles Lager',
+        'type' => CitySolingenDocument::class,
+        'zipLocation' => '42777 SG',
+        'members' => [
+            ContributionMemberApiRequestFactory::new()->create(['address' => 'Maxstr 44', 'zip' => '42719', 'firstname' => 'Jane', 'lastname' => 'Muster', 'gender' => null]),
+        ],
+    ]);
+
+    $response->assertSessionDoesntHaveErrors();
+    $response->assertOk();
+    Tex::assertCompiled(CitySolingenDocument::class, fn () => true);
 });
 
 it('testInputShouldBeBase64EncodedJson', function (string $payload) {
@@ -188,9 +137,11 @@ it('testItValidatesInput', function (array $input, string $documentClass, string
     Country::factory()->create();
     Member::factory()->defaults()->create();
 
-    $this->postJson('/contribution-validate', ContributionRequestFactory::new()->type($documentClass)->state($input)->create())
-        ->assertJsonValidationErrors($errorField);
-})->with('validation');
+    $this->json('GET', '/contribution-generate?'.http_build_query([
+        'payload' => ContributionRequestFactory::new()->type($documentClass)->state($input)->toBase64(),
+        'validate' => '1'
+    ]))->assertJsonValidationErrors($errorField);
+})->with('contribution-validation');
 
 it('testItValidatesInputBeforeGeneration', function (array $input, string $documentClass, string $errorField) {
     $this->login()->loginNami();
@@ -200,4 +151,4 @@ it('testItValidatesInputBeforeGeneration', function (array $input, string $docum
     $this->call('GET', '/contribution-generate', [
         'payload' => ContributionRequestFactory::new()->type($documentClass)->state($input)->toBase64(),
     ])->assertSessionHasErrors($errorField);
-})->with('validation');
+})->with('contribution-validation');

tests/Feature/Form/FormGenerateLaterLinkActionTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Feature\Form;
+
+use App\Form\FormSettings;
+use App\Form\Models\Form;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Mail;
+use Tests\Lib\CreatesFormFields;
+
+uses(DatabaseTransactions::class);
+uses(CreatesFormFields::class);
+
+beforeEach(function () {
+    test()->setUpForm();
+    Mail::fake();
+});
+
+it('generates a later link', function () {
+    $this->login()->loginNami()->withoutExceptionHandling();
+    app(FormSettings::class)->fill(['registerUrl' => 'https://example.com/register/{slug}'])->save();
+    $form = Form::factory()->name('fff')->create();
+
+    $url = $this->get(route('form.laterlink', ['form' => $form]))->json('url');
+    test()->assertNotNull($url);
+    $this->assertTrue(str($url)->startsWith('https://example.com/register/fff'));
+
+    $query = data_get(parse_url($url), 'query');
+    parse_str($query, $queryParts);
+    $this->assertEquals('1', $queryParts['later']);
+
+    $this->assertEquals($form->id, Cache::get('later_'.$queryParts['id']));
+});
+

tests/Feature/Form/FormRegisterActionTest.php

@@ -11,6 +11,7 @@ use App\Group\Enums\Level;
 use Carbon\Carbon;
 use Database\Factories\Member\MemberFactory;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Mail;
 use Tests\Lib\CreatesFormFields;
 
@@ -270,6 +271,14 @@ it('testItSavesParticipantAsModel', function () {
     $this->assertEquals('Abraham', $participants->first()->data['spitzname']);
 });
 
+
+it('cannot register when event is inactive', function () {
+    $this->login()->loginNami();
+    $form = Form::factory()->isActive(false)->create();
+
+    $this->register($form, [])->assertJsonValidationErrors(['event' => 'Anmeldung zzt nicht möglich.']);
+});
+
 it('testItCannotRegisterWhenRegistrationFromReached', function () {
     $this->login()->loginNami();
     $form = Form::factory()->registrationFrom(now()->addDay())->create();
@@ -727,3 +736,39 @@ it('testItSetsRegionIfMemberIsDirectRegionMember', function () {
     $this->register($form, ['bezirk' => $bezirk->id, 'members' => [['id' => '5505']]])->assertOk();
     $this->assertEquals($bezirk->id, $form->participants->get(1)->data['bezirk']);
 });
+
+it('registers via later link', function () {
+    $this->login()->loginNami();
+    $laterId = str()->uuid()->toString();
+    $form = Form::factory()->fields([])
+        ->registrationUntil(now()->subDay())
+        ->create();
+    Cache::set('later_'.$laterId, $form->id);
+
+    $this->registerLater($form, [], $laterId)->assertOk();
+    $this->assertDatabaseCount('participants', 1);
+    $this->assertNull(Cache::get('later_'.$laterId));
+});
+
+it('checks signature of later link', function () {
+    $this->login()->loginNami();
+    $form = Form::factory()->fields([])
+        ->registrationUntil(now()->subDay())
+        ->create();
+
+    $this->registerLaterWithWrongSignature($form, [], str()->uuid())->assertStatus(422);
+    $this->assertDatabaseCount('participants', 0);
+});
+
+it('checks if later links is from current form', function () {
+    $this->login()->loginNami();
+    $foreignForm = Form::factory()->create();
+    $form = Form::factory()->fields([])
+        ->registrationUntil(now()->subDay())
+        ->create();
+    $laterId = str()->uuid()->toString();
+    Cache::set('later_'.$laterId, $foreignForm->id);
+
+    $this->registerLater($form, [], $laterId)->assertStatus(422);
+    $this->assertDatabaseCount('participants', 0);
+});

tests/Feature/Form/FormRequest.php

@@ -53,6 +53,8 @@ class FormRequest extends RequestFactory
             'export' => ExportData::from([])->toArray(),
             'needs_prevention' => $this->faker->boolean(),
             'prevention_text' => EditorRequestFactory::new()->create(),
+            'zip' => (string) $this->faker->numberBetween(10, 6666),
+            'location' => (string) $this->faker->city(),
             'prevention_conditions' => Condition::defaults()->toArray(),
         ];
     }

tests/Feature/Form/FormStoreActionTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Form;
 
+use App\Contribution\Enums\Country;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Form\Data\ExportData;
 use App\Form\Enums\NamiType;
@@ -32,6 +33,9 @@ it('testItStoresForm', function () {
         ->mailTop(EditorRequestFactory::new()->text(11, 'lala'))
         ->mailBottom(EditorRequestFactory::new()->text(12, 'lalab'))
         ->headerImage('htzz.jpg')
+        ->zip('12345')
+        ->location('Solingen')
+        ->country('Schweiz')
         ->sections([FormtemplateSectionRequest::new()->name('sname')->fields([$this->textField()->namiType(NamiType::BIRTHDAY)->forMembers(false)->hint('hhh')])])
         ->fake();
 
@@ -55,6 +59,9 @@ it('testItStoresForm', function () {
     $this->assertFalse($form->config->sections->get(0)->fields->get(0)->forMembers);
     $this->assertCount(1, $form->getMedia('headerImage'));
     $this->assertEquals('formname.jpg', $form->getMedia('headerImage')->first()->file_name);
+    $this->assertEquals('Solingen', $form->location);
+    $this->assertEquals('12345', $form->zip);
+    $this->assertEquals(Country::CH, $form->country);
     Event::assertDispatched(Succeeded::class, fn(Succeeded $event) => $event->message === 'Veranstaltung gespeichert.');
     $this->assertFrontendCacheCleared();
 });
@@ -71,14 +78,16 @@ it('testItStoresDefaultSorting', function () {
     $this->assertFalse(false, $form->meta['sorting']['direction']);
 });
 
-it('testRegistrationDatesCanBeNull', function () {
+it('testValuesCanBeNull', function () {
     $this->login()->loginNami()->withoutExceptionHandling();
 
-    $this->postJson(route('form.store'), FormRequest::new()->registrationFrom(null)->registrationUntil(null)->create())->assertOk();
+    $this->postJson(route('form.store'), FormRequest::new()->registrationFrom(null)->registrationUntil(null)->location(null)->zip(null)->create())->assertOk();
 
     $this->assertDatabaseHas('forms', [
         'registration_until' => null,
         'registration_from' => null,
+        'zip' => null,
+        'location' => null,
     ]);
 });
 

tests/Feature/Form/FormUpdateActionTest.php

@@ -8,6 +8,7 @@ use App\Form\Models\Form;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\RequestFactories\EditorRequestFactory;
 use Tests\Lib\CreatesFormFields;
+use Tests\RequestFactories\ConditionRequestFactory;
 
 uses(DatabaseTransactions::class);
 uses(CreatesFormFields::class);
@@ -118,6 +119,20 @@ it('testItUpdatesActiveState', function () {
     $this->assertTrue($form->fresh()->is_active);
 });
 
+it('updates meta info', function () {
+    $this->login()->loginNami()->withoutExceptionHandling();
+    $form = Form::factory()->create();
+    $request = FormRequest::new()->zip('12345')->location('Musterstadt')->country('Schweiz')->create();
+
+    $this->patchJson(route('form.update', ['form' => $form]), $request)->assertOk();
+    test()->assertDatabaseHas('forms', [
+        'id' => $form->id,
+        'zip' => '12345',
+        'location' => 'Musterstadt',
+        'country' => 'Schweiz',
+    ]);
+});
+
 it('testItUpdatesPrivateState', function () {
     $this->login()->loginNami()->withoutExceptionHandling();
     $form = Form::factory()->create();
@@ -156,3 +171,16 @@ it('testItUpdatesPrevention', function () {
     $this->assertEquals('lorem ipsum', $form->fresh()->prevention_text->blocks[0]['data']['text']);
     $this->assertEquals(['mode' => 'all', 'ifs' => [['field' => 'vorname', 'value' => 'Max', 'comparator' => 'isEqual']]], $form->fresh()->prevention_conditions->toArray());
 });
+
+it('updates leader conditions', function () {
+    $this->login()->loginNami()->withoutExceptionHandling();
+    $form = Form::factory()->create();
+    $condition = ConditionRequestFactory::new()->whenField('A', 'TT')->create();
+    $payload = FormRequest::new()
+        ->preventionText(EditorRequestFactory::new()->text(10, 'lorem ipsum'))
+        ->state(['leader_conditions' => ConditionRequestFactory::new()->whenField('A', 'TT')])
+        ->create();
+
+    $this->patchJson(route('form.update', ['form' => $form]), $payload);
+    $this->assertEquals($condition, $form->fresh()->leader_conditions->toArray());
+});

tests/Feature/Form/GenerateContributionTest.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace Tests\Feature\Form;
+
+use App\Contribution\Documents\CitySolingenDocument;
+use App\Contribution\Documents\RdpNrwDocument;
+use App\Country;
+use App\Form\Enums\SpecialType;
+use App\Form\Models\Form;
+use App\Form\Models\Participant;
+use App\Form\Requests\FormCompileRequest;
+use App\Gender;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\Lib\CreatesFormFields;
+use Tests\RequestFactories\ConditionRequestFactory;
+use Zoomyboy\Tex\Tex;
+
+uses(DatabaseTransactions::class);
+uses(CreatesFormFields::class);
+
+mutates(FormCompileRequest::class);
+
+beforeEach(function() {
+    Country::factory()->create();
+    Gender::factory()->male()->create();
+    Gender::factory()->female()->create();
+    Tex::spy();
+    $this->login()->loginNami();
+});
+
+it('doesnt create document when no special fields given', function (array $fields, string $field, string $message, string $type) {
+    $form = Form::factory()
+        ->fields($fields)
+        ->has(Participant::factory())
+        ->create();
+
+    generate($type, $form, true)->assertJsonValidationErrors([$field => $message]);
+})
+    ->with([
+        [fn() => [], 'FIRSTNAME', 'Kein Feld für Vorname vorhanden.'],
+        [fn() => [test()->textField('f')->specialType(SpecialType::FIRSTNAME)], 'LASTNAME', 'Kein Feld für Nachname vorhanden.'],
+        [fn() => [test()->textField('f')->specialType(SpecialType::FIRSTNAME), test()->textField('l')->specialType(SpecialType::LASTNAME)], 'BIRTHDAY', 'Kein Feld für Geburtsdatum vorhanden.'],
+        [fn() => [test()->textField('f')->specialType(SpecialType::FIRSTNAME), test()->textField('l')->specialType(SpecialType::LASTNAME), test()->dateField('b')->specialType(SpecialType::BIRTHDAY)], 'ZIP', 'Kein Feld für PLZ vorhanden.'],
+        [fn() => [test()->textField('f')->specialType(SpecialType::FIRSTNAME), test()->textField('l')->specialType(SpecialType::LASTNAME), test()->dateField('b')->specialType(SpecialType::BIRTHDAY), test()->dateField('p')->specialType(SpecialType::ZIP)], 'LOCATION', 'Kein Feld für Ort vorhanden.'],
+    ])->with('contribution-documents');
+
+it('validates special types of each document', function (string $type, array $fields, string $field,  string $message) {
+    $form = Form::factory()->fields([
+        test()->textField('f')->specialType(SpecialType::FIRSTNAME),
+        test()->textField('l')->specialType(SpecialType::LASTNAME),
+        test()->dateField('b')->specialType(SpecialType::BIRTHDAY),
+        test()->dateField('p')->specialType(SpecialType::ZIP),
+        test()->dateField('l')->specialType(SpecialType::LOCATION),
+        ...$fields,
+    ])
+        ->has(Participant::factory())
+        ->create();
+
+    generate($type, $form, true)->assertJsonValidationErrors([$field => $message]);
+})
+    ->with([
+        [CitySolingenDocument::class, [], 'ADDRESS', 'Kein Feld für Adresse vorhanden.'],
+        [RdpNrwDocument::class, [], 'GENDER', 'Kein Feld für Geschlecht vorhanden.'],
+    ]);
+
+it('throws error when not validating but fields are not present', function () {
+    $form = Form::factory()->fields([])
+        ->has(Participant::factory())
+        ->create();
+
+    generate(CitySolingenDocument::class, $form, false)->assertStatus(422);
+});
+
+it('throws error when form doesnt have meta', function () {
+    $form = Form::factory()->fields([])
+        ->has(Participant::factory())
+        ->zip('')
+        ->location('')
+        ->create();
+
+    generate(CitySolingenDocument::class, $form, false)->assertStatus(422)->assertJsonValidationErrors([
+        'zip' => 'PLZ ist erforderlich.',
+        'location' => 'Ort ist erforderlich.'
+    ]);
+});
+
+it('throws error when form doesnt have participants', function () {
+    $form = Form::factory()->fields([])->create();
+
+    generate(CitySolingenDocument::class, $form, true)->assertJsonValidationErrors(['participants' => 'Veranstaltung besitzt noch keine Teilnehmer*innen.']);
+});
+
+dataset('default-form-contribution', fn () => [
+    [
+        ['fn' => 'Baum', 'ln' => 'Muster', 'bd' => '1991-05-06', 'zip' => '33333', 'loc' => 'Musterstadt', 'add' => 'Laastr 4', 'gen' => 'weiblich'],
+        fn () => [
+            test()->textField('fn')->specialType(SpecialType::FIRSTNAME),
+            test()->textField('ln')->specialType(SpecialType::LASTNAME),
+            test()->dateField('bd')->specialType(SpecialType::BIRTHDAY),
+            test()->dateField('zip')->specialType(SpecialType::ZIP),
+            test()->dateField('loc')->specialType(SpecialType::LOCATION),
+            test()->dateField('add')->specialType(SpecialType::ADDRESS),
+            test()->dateField('gen')->specialType(SpecialType::GENDER),
+        ]
+    ]
+]);
+
+dataset('form-contributions', fn () => [
+    [
+        [],
+        [],
+        CitySolingenDocument::class,
+        ['Baum', 'Muster', '1991', 'Musterstadt', 'Laastr 4', '33333'],
+    ],
+    [
+        ['gen' => 'männlich'],
+        [],
+        RdpNrwDocument::class,
+        ['{m}'],
+    ],
+    [
+        ['gen' => 'weiblich'],
+        [],
+        RdpNrwDocument::class,
+        ['{w}'],
+    ],
+]);
+
+it('creates document with participant data', function (array $defaultData, array $defaultFields, array $newData, array $newFields, string $document, array $expected) {
+    $form = Form::factory()->fields([
+        ...$defaultFields,
+        ...$newFields,
+    ])
+        ->has(Participant::factory()->data([...$defaultData, ...$newData]))
+        ->create();
+
+    generate($document, $form, false)->assertOk();
+    Tex::assertCompiled($document, fn($document) => $document->hasAllContent($expected));
+})->with('default-form-contribution')->with('form-contributions');
+
+it('creates document with is leader', function (array $defaultData, array $fields) {
+    $form = Form::factory()->fields([
+        ...$fields,
+        test()->dropdownField('leader')->options(['L', 'NL']),
+    ])
+        ->has(Participant::factory()->data([...$defaultData, 'leader' => 'L']))
+        ->leaderConditions(ConditionRequestFactory::new()->whenField('leader', 'L')->create())
+        ->create();
+
+    generate(RdpNrwDocument::class, $form, false)->assertOk();
+    Tex::assertCompiled(RdpNrwDocument::class, fn($document) => $document->hasAllContent(['{L}']));
+})->with('default-form-contribution');
+
+it('creates document with form meta', function () {
+    $form = Form::factory()->fields([
+        test()->textField('fn')->specialType(SpecialType::FIRSTNAME),
+        test()->textField('ln')->specialType(SpecialType::LASTNAME),
+        test()->dateField('bd')->specialType(SpecialType::BIRTHDAY),
+        test()->dateField('zip')->specialType(SpecialType::ZIP),
+        test()->dateField('loc')->specialType(SpecialType::LOCATION),
+        test()->dateField('add')->specialType(SpecialType::ADDRESS),
+        test()->dateField('gen')->specialType(SpecialType::GENDER),
+    ])
+        ->has(Participant::factory()->data(['fn' => 'Baum', 'ln' => 'Muster', 'bd' => '1991-05-06', 'zip' => '33333', 'loc' => 'Musterstadt', 'add' => 'Laastr 4', 'gen' => 'weiblich']))
+        ->name('Sommerlager')
+        ->from('2008-06-20')
+        ->to('2008-06-22')
+        ->zip('12345')
+        ->location('Frankfurt')
+        ->create();
+
+    generate(RdpNrwDocument::class, $form, false)->assertOk();
+    Tex::assertCompiled(RdpNrwDocument::class, fn($document) => $document->hasAllContent(['20.06.2008', '22.06.2008', '12345 Frankfurt']));
+});
+
+function generate(string $document, Form $form, bool $validate) {
+    return test()->json('GET', route('form.contribution', [
+        'payload' => test()->filterString(['type' => $document]),
+        'form' => $form,
+        'validate' => $validate ? '1' : '0'
+    ]));
+}

tests/Feature/Member/PsPendingBlockTest.php

@@ -15,7 +15,7 @@ class PsPendingBlockTest extends TestCase
 
     public function testItRendersContent(): void
     {
-        $this->withoutExceptionHandling()->withNamiSettings(12345, 'password', 101);
+        $this->withoutExceptionHandling()->withNamiSettings('12345', 'password', 101);
         $group = Group::factory()->inNami(101)->create();
 
         $noPsAtAll = Member::factory()
@@ -72,7 +72,7 @@ class PsPendingBlockTest extends TestCase
 
     public function testItExcludesForeignGroups(): void
     {
-        $this->withoutExceptionHandling()->withNamiSettings(12345, 'password', 101);
+        $this->withoutExceptionHandling()->withNamiSettings('12345', 'password', 101);
         Group::factory()->inNami(101)->create();
         $otherGroup = Group::factory()->inNami(55)->create();
 

tests/Feature/Nami/SettingTest.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Feature\Nami;
+
+use App\Invoice\InvoiceSettings;
+use App\Setting\NamiSettings;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+use Zoomyboy\LaravelNami\Authentication\Auth;
+use Zoomyboy\LaravelNami\Nami;
+
+uses(DatabaseTransactions::class);
+
+it('testItDisplaysView', function () {
+    $this->withoutExceptionHandling()->login()->loginNami();
+
+    $this->get(route('setting.view', ['settingGroup' => 'nami']))
+        ->assertOk()
+        ->assertComponent('setting/Nami');
+});
+
+it('testDisplaySettings', function () {
+    $this->withoutExceptionHandling()->login()->loginNami();
+    app(NamiSettings::class)->fill([
+        'mglnr' => '0111',
+        'password' => 'secret',
+        'default_group_id' => '12345',
+        'search_params' => [],
+    ])->save();
+
+    $this->get(route('setting.data', ['settingGroup' => 'nami']))
+        ->assertOk()
+        ->assertComponent('setting/Nami')
+        ->assertInertiaPath('data.mglnr', '0111')
+        ->assertInertiaPath('data.password', '')
+        ->assertInertiaPath('data.default_group_id', 12345);
+});
+
+it('testItCanChangeSettings', function () {
+    $this->login()->loginNami();
+    Auth::success(90100, 'secret');
+
+    $response = $this->from('/setting/nami')->post('/setting/nami', [
+        'mglnr' => 90100,
+        'password' => 'secret',
+        'default_group_id' => '12345',
+        'search_params' => [],
+    ]);
+
+    $response->assertRedirect('/setting/nami');
+    $settings = app(NamiSettings::class);
+    $this->assertEquals(90100, $settings->mglnr);
+    $this->assertEquals('secret', $settings->password);
+    $this->assertEquals('12345', $settings->default_group_id);
+});
+
+it('validates settings', function () {
+    $this->login()->loginNami();
+
+    $this->from('/setting/nami')->post('/setting/nami', [
+        'mglnr' => 90100,
+        'password' => 'fdsfsdfdsf',
+        'default_group_id' => '12345',
+        'search_params' => [],
+    ])->assertSessionHasErrors(['nami' => 'NaMi Login fehlgeschlagen.']);
+});
+
+it('can set mglnr to a string', function () {
+    $this->login()->loginNami();
+    Auth::success('090100', 'secret');
+
+    $response = $this->from('/setting/nami')->post('/setting/nami', [
+        'mglnr' => '090100',
+        'password' => 'secret',
+        'default_group_id' => '12345',
+        'search_params' => [],
+    ]);
+
+    $response->assertRedirect('/setting/nami');
+    $settings = app(NamiSettings::class);
+    $this->assertSame('090100', $settings->mglnr);
+    $this->assertEquals('secret', $settings->password);
+    $this->assertEquals('12345', $settings->default_group_id);
+});

tests/Lib/CreatesFormFields.php

@@ -18,6 +18,7 @@ use App\Form\Models\Form;
 use App\Member\Member;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Testing\TestResponse;
 use Tests\Feature\Form\FormtemplateFieldRequest;
 
@@ -42,6 +43,22 @@ trait CreatesFormFields
         return $this->postJson(route('form.register', ['form' => $form]), $payload);
     }
 
+    /**
+     * @param array<string, mixed> $payload
+     */
+    public function registerLater(Form $form, array $payload, string $laterId): TestResponse
+    {
+        return $this->postJson(URL::signedRoute('form.register', ['form' => $form, 'later' => '1', 'id' => $laterId]), $payload);
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     */
+    public function registerLaterWithWrongSignature(Form $form, array $payload, string $laterId): TestResponse
+    {
+        return $this->postJson(route('form.register', ['form' => $form, 'later' => '1', 'id' => $laterId, 'signature' => '-1']), $payload);
+    }
+
     public function setUpForm() {
         app(FormSettings::class)->fill(['clearCacheUrl' => 'http://event.com/clear-cache'])->save();
 

tests/Lib/Queryable.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\Lib;
+
+trait Queryable {
+
+    public function toBase64(): string
+    {
+        return base64_encode(rawurlencode(json_encode($this->create())));
+    }
+}

tests/RequestFactories/ConditionRequestFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\RequestFactories;
+
+use Worksome\RequestFactories\RequestFactory;
+use App\Lib\Editor\Condition;
+
+class ConditionRequestFactory extends RequestFactory
+{
+    public function definition(): array
+    {
+        return [
+            'mode' => 'all',
+            'ifs' => [],
+        ];
+    }
+
+    public function whenField(string $field, string $value): self {
+        return $this->state([
+            'ifs' => [
+                ['field' => $field, 'value' => $value, 'comparator' => 'isEqual']
+            ],
+        ]);
+    }
+
+    public function toData(): Condition {
+        return Condition::from($this->create());
+    }
+}

tests/RequestFactories/ContributionRequestFactory.php

@@ -6,10 +6,14 @@ use App\Contribution\ContributionFactory;
 use App\Contribution\Documents\ContributionDocument;
 use App\Country;
 use App\Member\Member;
+use Tests\Lib\Queryable;
 use Worksome\RequestFactories\RequestFactory;
 
 class ContributionRequestFactory extends RequestFactory
 {
+
+    use Queryable;
+
     public function definition(): array
     {
         $compilers = collect(app(ContributionFactory::class)->compilerSelect())->pluck('class');
@@ -25,11 +29,6 @@ class ContributionRequestFactory extends RequestFactory
         ];
     }
 
-    public function toBase64(): string
-    {
-        return base64_encode(rawurlencode(json_encode($this->create())));
-    }
-
     /**
      * @param class-string<ContributionDocument> $type
      */

tests/TestCase.php

@@ -37,7 +37,7 @@ class TestCase extends BaseTestCase
         $this->initInertiaTestcase();
     }
 
-    public function loginNami(int $mglnr = 12345, string $password = 'password', int|Group $groupId = 55): static
+    public function loginNami(string $mglnr = '12345', string $password = 'password', int|Group $groupId = 55): static
     {
         Auth::success($mglnr, $password);
         $group = is_int($groupId)
@@ -49,7 +49,7 @@ class TestCase extends BaseTestCase
         return $this;
     }
 
-    public function withNamiSettings(int $mglnr = 12345, string $password = 'password', int $groupId = 55): self
+    public function withNamiSettings(string $mglnr = '12345', string $password = 'password', int $groupId = 55): self
     {
         NamiSettings::fake([
             'mglnr' => $mglnr,