Compare commits
No commits in common. "master" and "gallier" have entirely different histories.
|
|
@ -1,4 +1,4 @@
|
|||
FROM php:8.3.11-fpm AS php
|
||||
FROM php:8.3.11-fpm as php
|
||||
WORKDIR /app
|
||||
RUN ls /app
|
||||
RUN apt-get update
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
FROM composer:2.7.9 AS composer
|
||||
FROM composer:2.7.9 as composer
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN composer install --ignore-platform-reqs --no-dev
|
||||
RUN php artisan telescope:publish
|
||||
RUN php artisan horizon:publish
|
||||
|
||||
FROM node:20.15.0-slim AS node
|
||||
FROM node:20.15.0-slim as node
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN npm install && npm run prod && npm run img && rm -R node_modules
|
||||
|
||||
FROM nginx:1.21.6-alpine AS nginx
|
||||
FROM nginx:1.21.6-alpine as nginx
|
||||
WORKDIR /app
|
||||
COPY --from=node /app /app
|
||||
COPY --from=composer /app/public/vendor /app/public/vendor
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
FROM composer:2.7.9 AS composer
|
||||
FROM composer:2.7.9 as composer
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN composer install --ignore-platform-reqs --no-dev
|
||||
|
||||
FROM node:20.15.0-slim AS node
|
||||
FROM node:20.15.0-slim as node
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN npm install && npm run prod && npm run img && rm -R node_modules
|
||||
|
||||
FROM zoomyboy/adrema-base:latest AS php
|
||||
FROM zoomyboy/adrema-base:latest as php
|
||||
COPY --chown=www-data:www-data . /app
|
||||
COPY --chown=www-data:www-data --from=node /app/public /app/public
|
||||
COPY --chown=www-data:www-data --from=composer /app/vendor /app/vendor
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es2021": true
|
||||
},
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:vue/vue3-recommended",
|
||||
"prettier"
|
||||
],
|
||||
"parserOptions": {
|
||||
"ecmaVersion": "latest",
|
||||
"sourceType": "module"
|
||||
},
|
||||
"plugins": [
|
||||
"vue"
|
||||
],
|
||||
"overrides": [
|
||||
{
|
||||
"files": [
|
||||
"*.vue"
|
||||
],
|
||||
"rules": {
|
||||
"vue/multi-word-component-names": "off"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -40,4 +40,3 @@ Homestead.json
|
|||
/public/sprite.svg
|
||||
/.php-cs-fixer.cache
|
||||
/groups.sql
|
||||
/.phpunit.cache
|
||||
|
|
|
|||
58
CHANGELOG.md
58
CHANGELOG.md
|
|
@ -1,63 +1,5 @@
|
|||
# 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
|
||||
|
||||
### 1.12.14
|
||||
|
||||
- Bilder werden nun mitkopiert beim Kopieren eines Events
|
||||
|
||||
### 1.12.13
|
||||
|
||||
- Kopieren von bestehenden Veranstaltungen
|
||||
- Präventions-Erinnerung automatisch versenden
|
||||
|
||||
### 1.12.11
|
||||
|
||||
- Fix: Bank Account mit abrufen wenn Mitglied editiert wird
|
||||
|
||||
### 1.12.7
|
||||
|
||||
- Fix: Synchronisation von allen Mitgliedern bei Mail-Verteilern - nicht nur den ersten 20
|
||||
|
||||
### 1.12.6
|
||||
|
||||
- Fix: Beiträge von Familienmitgliedern splitten
|
||||
|
||||
### 1.12.5
|
||||
|
||||
- Fix: Synchronisieren von bestehenden Beiträgen aus NaMi
|
||||
|
||||
### 1.12.4
|
||||
|
||||
- Filter Mitglieder nach Verhaltenskodex
|
||||
|
||||
### 1.12.3
|
||||
|
||||
- Volltextsuche für Rechnungen
|
||||
|
||||
### 1.12.2
|
||||
|
||||
- Zuschussliste Gallier
|
||||
|
||||
### 1.12.1
|
||||
|
||||
- In Teilnehmer-Liste von Veranstaltungen kann nun sortiert und gefiltert werden.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
|
||||
@servers(['docker' => ['stammsilva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
|
||||
|
||||
@task('deploy', ['on' => 'docker'])
|
||||
cd $ADREMA_PATH
|
||||
|
|
|
|||
25
README.md
25
README.md
|
|
@ -32,16 +32,16 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
|
|||
|
||||
## Installation des Produktivsystems
|
||||
|
||||
1. Verschieben der Docker-Compose
|
||||
1. Herunterladen der Beispiel Docker-Compose
|
||||
|
||||
```cmd
|
||||
mv docker-compose.prod.yml docker-compose.yml
|
||||
curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/docker-compose.prod.yml -o docker-compose.yml
|
||||
```
|
||||
|
||||
2. Anwenden der Beispiel Environmentvariablen-Datei
|
||||
2. Herunterladen der Beispiel Environmentvariablen-Datei
|
||||
|
||||
```cmd
|
||||
mv .app.env.example .app.env
|
||||
curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/.app.env.example -o .app.env
|
||||
```
|
||||
|
||||
3. In der `.app.env` notwendige Einstellungen vornehmen:
|
||||
|
|
@ -50,8 +50,7 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
|
|||
- Mail-Server Einstellungen `MAIL_PORT`, `MAIL_HOST`, `MAIL_USERNAME`, `MAIL_PASSWORD` und `MAIL_ENCRYPTION` anpassen
|
||||
- `MAIL_FROM_NAME`: Der Name, der als Absender von E-Mails gesetzt wird (z.B. `Stamm Bipi Service`)
|
||||
- `MAIL_FROM_ADDRESS`: Die dazu gehörige E-Mail-Adresse, die natürlich für antworten erreichbar sein sollte (z.B. `vorstand@stamm-bipi.de`)
|
||||
- `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben neu erstellten, sicheren Passwort für die Datenbank versehen
|
||||
- `MEILI_MASTER_KEY` Mit einem neu erstellten, sicheren Passwort versehen
|
||||
- `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben sicheren Passwort für die Datenbank versehen
|
||||
- `USER_EMAIL` und `USER_PASSWORD`: Einstellen des standard Adrema Logins
|
||||
|
||||
4. Container zur Gennerierung des App-Key starten
|
||||
|
|
@ -100,22 +99,28 @@ Bei dem Setup wird im Daten-Verzeichniss ein Ordner `./data/setup` angelegt. Hie
|
|||
git clone https://git.zoomyboy.de/silva/adrema.git
|
||||
```
|
||||
|
||||
2. Kopieren der Beispiel Environmentvariablen-Datei
|
||||
2. Kopieren der Beispiel Docker-Compose für das Entwickeln und nach Wünschen anpassen
|
||||
|
||||
```cmd
|
||||
cp docker-compose.dev.yml docker-compose.yml
|
||||
```
|
||||
|
||||
3. Kopieren der Beispiel Environmentvariablen-Datei
|
||||
|
||||
```cmd
|
||||
cp .app.env.example .app.env
|
||||
```
|
||||
|
||||
3. Submodule aktuallisieren
|
||||
4. Submodule aktuallisieren
|
||||
|
||||
```cmd
|
||||
git submodule update --init
|
||||
```
|
||||
|
||||
4. Container erstellen
|
||||
5. Container erstellen
|
||||
|
||||
```cmd
|
||||
docker compose build
|
||||
```
|
||||
|
||||
5. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren
|
||||
6. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class InsertMemberAction
|
|||
{
|
||||
$region = Region::firstWhere('nami_id', $member->regionId ?: -1);
|
||||
|
||||
$payload = [
|
||||
return Member::updateOrCreate(['nami_id' => $member->id], [
|
||||
'firstname' => $member->firstname,
|
||||
'lastname' => $member->lastname,
|
||||
'joined_at' => $member->joinedAt,
|
||||
|
|
@ -51,26 +51,7 @@ class InsertMemberAction
|
|||
'mitgliedsnr' => $member->memberId,
|
||||
'version' => $member->version,
|
||||
'keepdata' => $member->keepdata,
|
||||
];
|
||||
|
||||
// Dont update subscription if fee id of existing member's subscription is already the same
|
||||
if ($existing = Member::nami($member->id)) {
|
||||
if ($existing->subscription && $existing->subscription->fee->nami_id === $member->feeId) {
|
||||
$payload['subscription_id'] = $existing->subscription->id;
|
||||
}
|
||||
}
|
||||
|
||||
return tap(Member::updateOrCreate(['nami_id' => $member->id], $payload), function ($insertedMember) use ($member) {
|
||||
$insertedMember->bankAccount->update([
|
||||
'iban' => $member->bankAccount->iban,
|
||||
'bic' => $member->bankAccount->bic,
|
||||
'blz' => $member->bankAccount->blz,
|
||||
'account_number' => $member->bankAccount->accountNumber,
|
||||
'person' => $member->bankAccount->person,
|
||||
'bank_name' => $member->bankAccount->bankName,
|
||||
'nami_id' => $member->bankAccount->id,
|
||||
]);
|
||||
});
|
||||
]);
|
||||
}
|
||||
|
||||
public function getSubscription(NamiMember $member): ?Subscription
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class Activity extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsToMany<Subactivity, $this>
|
||||
* @return BelongsToMany<Subactivity>
|
||||
*/
|
||||
public function subactivities(): BelongsToMany
|
||||
{
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ class ActivityResource extends JsonResource
|
|||
'index' => route('activity.index'),
|
||||
'create' => route('activity.create'),
|
||||
'membership_masslist' => route('membership.masslist.index'),
|
||||
'membership_index' => route('membership.index'),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use App\Actions\DbMaintainAction;
|
|||
use App\Form\Actions\PreventionRememberAction;
|
||||
use App\Initialize\InitializeMembers;
|
||||
use App\Invoice\Actions\InvoiceSendAction;
|
||||
use App\Prevention\Actions\YearlyRememberAction;
|
||||
use Illuminate\Console\Scheduling\Schedule;
|
||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||
|
||||
|
|
@ -22,7 +21,6 @@ class Kernel extends ConsoleKernel
|
|||
InitializeMembers::class,
|
||||
DbMaintainAction::class,
|
||||
PreventionRememberAction::class,
|
||||
YearlyRememberAction::class,
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -36,7 +34,6 @@ class Kernel extends ConsoleKernel
|
|||
$schedule->command(InitializeMembers::class)->dailyAt('03:00');
|
||||
$schedule->command(PreventionRememberAction::class)->dailyAt('11:00');
|
||||
$schedule->command(InvoiceSendAction::class)->dailyAt('10:00');
|
||||
$schedule->command(YearlyRememberAction::class)->dailyAt('09:00');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
namespace App\Contribution\Actions;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\ContributionFactory;
|
||||
use App\Contribution\Requests\GenerateRequest;
|
||||
use App\Contribution\Documents\ContributionDocument;
|
||||
use App\Rules\JsonBase64Rule;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
use Zoomyboy\Tex\BaseCompiler;
|
||||
use Zoomyboy\Tex\Tex;
|
||||
|
|
@ -15,19 +15,23 @@ class GenerateAction
|
|||
{
|
||||
use AsAction;
|
||||
|
||||
public function handle(HasContributionData $request): BaseCompiler
|
||||
/**
|
||||
* @param class-string<ContributionDocument> $document
|
||||
* @param array<string, mixed> $payload
|
||||
*/
|
||||
public function handle(string $document, array $payload): BaseCompiler
|
||||
{
|
||||
return Tex::compile($request->type()::fromPayload($request));
|
||||
return Tex::compile($document::fromRequest($payload));
|
||||
}
|
||||
|
||||
public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
|
||||
public function asController(ActionRequest $request): BaseCompiler
|
||||
{
|
||||
app(ContributionFactory::class)->validateType($request);
|
||||
$request->validateContribution();
|
||||
$payload = $this->payload($request);
|
||||
$type = data_get($payload, 'type');
|
||||
ValidateAction::validateType($type);
|
||||
Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
|
||||
|
||||
return $request->input('validate')
|
||||
? response()->json([])
|
||||
: $this->handle($request);
|
||||
return $this->handle($type, $payload);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -39,4 +43,12 @@ class GenerateAction
|
|||
'payload' => [new JsonBase64Rule()],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
private function payload(ActionRequest $request): array
|
||||
{
|
||||
return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
namespace App\Contribution\Actions;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\ContributionFactory;
|
||||
use App\Contribution\Requests\GenerateApiRequest;
|
||||
use App\Contribution\Documents\ContributionDocument;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
use Zoomyboy\Tex\BaseCompiler;
|
||||
use Zoomyboy\Tex\Tex;
|
||||
|
|
@ -14,17 +13,26 @@ class GenerateApiAction
|
|||
use AsAction;
|
||||
|
||||
/**
|
||||
* @todo merge this with GenerateAction
|
||||
* @param class-string<ContributionDocument> $document
|
||||
* @param array<string, mixed> $payload
|
||||
*/
|
||||
public function handle(HasContributionData $request): BaseCompiler
|
||||
public function handle(string $document, array $payload): BaseCompiler
|
||||
{
|
||||
return Tex::compile($request->type()::fromPayload($request));
|
||||
return Tex::compile($document::fromApiRequest($payload));
|
||||
}
|
||||
|
||||
public function asController(GenerateApiRequest $request): BaseCompiler
|
||||
public function asController(ActionRequest $request): BaseCompiler
|
||||
{
|
||||
app(ContributionFactory::class)->validateType($request);
|
||||
ValidateAction::validateType($request->input('type'));
|
||||
|
||||
return $this->handle($request);
|
||||
return $this->handle($request->input('type'), $request->input());
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contribution\Actions;
|
||||
|
||||
use App\Contribution\ContributionFactory;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
||||
class ValidateAction
|
||||
{
|
||||
use AsAction;
|
||||
|
||||
public function asController(): JsonResponse
|
||||
{
|
||||
return response()->json(['valid' => true]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return app(ContributionFactory::class)->rules(request()->type);
|
||||
}
|
||||
|
||||
public function prepareForValidation(ActionRequest $request): void
|
||||
{
|
||||
static::validateType($request->input('type'));
|
||||
}
|
||||
|
||||
public static function validateType(?string $type = null): void
|
||||
{
|
||||
Validator::make(['type' => $type], app(ContributionFactory::class)->typeRule())->validate();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contribution\Contracts;
|
||||
|
||||
use App\Contribution\Data\MemberData;
|
||||
use Carbon\Carbon;
|
||||
use App\Contribution\Documents\ContributionDocument;
|
||||
use App\Country;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
interface HasContributionData {
|
||||
|
||||
public function dateFrom(): Carbon;
|
||||
public function dateUntil(): Carbon;
|
||||
public function zipLocation(): string;
|
||||
public function eventName(): string;
|
||||
/**
|
||||
* @return class-string<ContributionDocument>
|
||||
*/
|
||||
public function type(): string;
|
||||
|
||||
/**
|
||||
* @return Collection<int, MemberData>
|
||||
*/
|
||||
public function members(): Collection;
|
||||
|
||||
public function country(): ?Country;
|
||||
|
||||
public function validateContribution(): void;
|
||||
}
|
||||
|
|
@ -2,16 +2,14 @@
|
|||
|
||||
namespace App\Contribution;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Documents\BdkjHesse;
|
||||
use App\Contribution\Documents\ContributionDocument;
|
||||
use App\Contribution\Documents\RdpNrwDocument;
|
||||
use App\Contribution\Documents\CityRemscheidDocument;
|
||||
use App\Contribution\Documents\CitySolingenDocument;
|
||||
use App\Contribution\Documents\CityFrankfurtMainDocument;
|
||||
use App\Contribution\Documents\WuppertalDocument;
|
||||
use App\Contribution\Documents\GallierDocument;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class ContributionFactory
|
||||
|
|
@ -25,17 +23,17 @@ class ContributionFactory
|
|||
CityRemscheidDocument::class,
|
||||
CityFrankfurtMainDocument::class,
|
||||
BdkjHesse::class,
|
||||
WuppertalDocument::class,
|
||||
GallierDocument::class,
|
||||
];
|
||||
|
||||
/**
|
||||
* @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
|
||||
* @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
|
||||
*/
|
||||
public function compilerSelect(): Collection
|
||||
{
|
||||
return collect($this->documents)->map(fn ($document) => [
|
||||
'name' => $document::getName(),
|
||||
'id' => $document,
|
||||
'title' => $document::buttonName(),
|
||||
'class' => $document,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -61,9 +59,4 @@ class ContributionFactory
|
|||
...$type::rules(),
|
||||
];
|
||||
}
|
||||
|
||||
public function validateType(HasContributionData $request): void {
|
||||
Validator::make(['type' => $request->type()], $this->typeRule())->validate();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class MemberData extends Data
|
|||
return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
|
||||
...$member,
|
||||
'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
|
||||
'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
|
||||
'gender' => Gender::fromString($member['gender']),
|
||||
'isLeader' => $member['is_leader'],
|
||||
]));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@
|
|||
|
||||
namespace App\Contribution\Documents;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Contribution\Traits\HasPdfBackground;
|
||||
use App\Country;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
|
|
@ -19,8 +17,8 @@ class BdkjHesse extends ContributionDocument
|
|||
* @param Collection<int, Collection<int, MemberData>> $members
|
||||
*/
|
||||
public function __construct(
|
||||
public Carbon $dateFrom,
|
||||
public Carbon $dateUntil,
|
||||
public string $dateFrom,
|
||||
public string $dateUntil,
|
||||
public string $zipLocation,
|
||||
public ?Country $country,
|
||||
public Collection $members,
|
||||
|
|
@ -41,15 +39,33 @@ class BdkjHesse extends ContributionDocument
|
|||
return Carbon::parse($this->dateUntil)->format('d.m.Y');
|
||||
}
|
||||
|
||||
public static function fromPayload(HasContributionData $request): self
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request->dateFrom(),
|
||||
dateUntil: $request->dateUntil(),
|
||||
zipLocation: $request->zipLocation(),
|
||||
country: $request->country(),
|
||||
members: $request->members()->chunk(20),
|
||||
eventName: $request->eventName(),
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromModels($request['members'])->chunk(20),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromApiRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromApi($request['member_data'])->chunk(20),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -117,15 +133,4 @@ class BdkjHesse extends ContributionDocument
|
|||
'zipLocation' => 'required|string',
|
||||
];
|
||||
}
|
||||
|
||||
public static function requiredFormSpecialTypes(): array {
|
||||
return [
|
||||
SpecialType::FIRSTNAME,
|
||||
SpecialType::LASTNAME,
|
||||
SpecialType::BIRTHDAY,
|
||||
SpecialType::ZIP,
|
||||
SpecialType::LOCATION,
|
||||
SpecialType::GENDER,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,12 @@
|
|||
|
||||
namespace App\Contribution\Documents;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Contribution\Traits\FormatsDates;
|
||||
use App\Contribution\Traits\HasPdfBackground;
|
||||
use App\Country;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use App\Invoice\InvoiceSettings;
|
||||
use Illuminate\Support\Collection;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class CityFrankfurtMainDocument extends ContributionDocument
|
||||
{
|
||||
|
|
@ -23,8 +20,8 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
|||
* @param Collection<int, Collection<int, MemberData>> $members
|
||||
*/
|
||||
public function __construct(
|
||||
public Carbon $dateFrom,
|
||||
public Carbon $dateUntil,
|
||||
public string $dateFrom,
|
||||
public string $dateUntil,
|
||||
public string $zipLocation,
|
||||
public ?Country $country,
|
||||
public Collection $members,
|
||||
|
|
@ -36,15 +33,33 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
|||
$this->fromName = app(InvoiceSettings::class)->from_long;
|
||||
}
|
||||
|
||||
public static function fromPayload(HasContributionData $request): self
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request->dateFrom(),
|
||||
dateUntil: $request->dateUntil(),
|
||||
zipLocation: $request->zipLocation(),
|
||||
country: $request->country(),
|
||||
members: $request->members()->chunk(15),
|
||||
eventName: $request->eventName(),
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromModels($request['members'])->chunk(15),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromApiRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromApi($request['member_data'])->chunk(15),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -75,15 +90,4 @@ class CityFrankfurtMainDocument extends ContributionDocument
|
|||
'zipLocation' => 'required|string',
|
||||
];
|
||||
}
|
||||
|
||||
public static function requiredFormSpecialTypes(): array {
|
||||
return [
|
||||
SpecialType::FIRSTNAME,
|
||||
SpecialType::LASTNAME,
|
||||
SpecialType::BIRTHDAY,
|
||||
SpecialType::ZIP,
|
||||
SpecialType::LOCATION,
|
||||
SpecialType::ADDRESS,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,12 @@
|
|||
|
||||
namespace App\Contribution\Documents;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Contribution\Traits\FormatsDates;
|
||||
use App\Contribution\Traits\HasPdfBackground;
|
||||
use App\Country;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use App\Member\Member;
|
||||
use Illuminate\Support\Collection;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class CityRemscheidDocument extends ContributionDocument
|
||||
{
|
||||
|
|
@ -21,8 +19,8 @@ class CityRemscheidDocument extends ContributionDocument
|
|||
* @param Collection<int, Collection<int, Member>> $children
|
||||
*/
|
||||
public function __construct(
|
||||
public Carbon $dateFrom,
|
||||
public Carbon $dateUntil,
|
||||
public string $dateFrom,
|
||||
public string $dateUntil,
|
||||
public string $zipLocation,
|
||||
public ?Country $country,
|
||||
public Collection $leaders,
|
||||
|
|
@ -34,18 +32,40 @@ class CityRemscheidDocument extends ContributionDocument
|
|||
$this->setEventName($eventName);
|
||||
}
|
||||
|
||||
public static function fromPayload(HasContributionData $request): self
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromRequest(array $request): self
|
||||
{
|
||||
[$leaders, $children] = $request->members()->partition(fn ($member) => $member->isLeader);
|
||||
[$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
|
||||
|
||||
return new self(
|
||||
dateFrom: $request->dateFrom(),
|
||||
dateUntil: $request->dateUntil(),
|
||||
zipLocation: $request->zipLocation(),
|
||||
country: $request->country(),
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
leaders: $leaders->values()->toBase()->chunk(6),
|
||||
children: $children->values()->toBase()->chunk(20),
|
||||
eventName: $request->eventName(),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromApiRequest(array $request): self
|
||||
{
|
||||
$members = MemberData::fromApi($request['member_data']);
|
||||
[$leaders, $children] = $members->partition(fn ($member) => $member->isLeader);
|
||||
|
||||
return new self(
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
leaders: $leaders->values()->toBase()->chunk(6),
|
||||
children: $children->values()->toBase()->chunk(20),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -66,15 +86,4 @@ class CityRemscheidDocument extends ContributionDocument
|
|||
'country' => 'required|integer|exists:countries,id',
|
||||
];
|
||||
}
|
||||
|
||||
public static function requiredFormSpecialTypes(): array {
|
||||
return [
|
||||
SpecialType::FIRSTNAME,
|
||||
SpecialType::LASTNAME,
|
||||
SpecialType::ADDRESS,
|
||||
SpecialType::BIRTHDAY,
|
||||
SpecialType::ZIP,
|
||||
SpecialType::LOCATION,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
|
||||
namespace App\Contribution\Documents;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use App\Invoice\InvoiceSettings;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
|
|
@ -18,8 +16,8 @@ class CitySolingenDocument extends ContributionDocument
|
|||
* @param Collection<int, MemberData> $members
|
||||
*/
|
||||
final private function __construct(
|
||||
public Carbon $dateFrom,
|
||||
public Carbon $dateUntil,
|
||||
public string $dateFrom,
|
||||
public string $dateUntil,
|
||||
public string $zipLocation,
|
||||
public Collection $members,
|
||||
public string $eventName,
|
||||
|
|
@ -32,14 +30,28 @@ class CitySolingenDocument extends ContributionDocument
|
|||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromPayload(HasContributionData $request): static
|
||||
public static function fromRequest(array $request): static
|
||||
{
|
||||
return new static(
|
||||
dateFrom: $request->dateFrom(),
|
||||
dateUntil: $request->dateUntil(),
|
||||
zipLocation: $request->zipLocation(),
|
||||
members: $request->members(),
|
||||
eventName: $request->eventName(),
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
members: MemberData::fromModels($request['members']),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromApiRequest(array $request): static
|
||||
{
|
||||
return new static(
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
members: MemberData::fromApi($request['member_data']),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -63,6 +75,8 @@ class CitySolingenDocument extends ContributionDocument
|
|||
|
||||
public function checkboxes(): string
|
||||
{
|
||||
$output = '';
|
||||
|
||||
$firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
|
||||
return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
|
||||
})->implode(' & ') . ' \\\\';
|
||||
|
|
@ -95,15 +109,4 @@ class CitySolingenDocument extends ContributionDocument
|
|||
'zipLocation' => 'required|string',
|
||||
];
|
||||
}
|
||||
|
||||
public static function requiredFormSpecialTypes(): array {
|
||||
return [
|
||||
SpecialType::FIRSTNAME,
|
||||
SpecialType::LASTNAME,
|
||||
SpecialType::BIRTHDAY,
|
||||
SpecialType::ZIP,
|
||||
SpecialType::LOCATION,
|
||||
SpecialType::ADDRESS,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace App\Contribution\Documents;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use Zoomyboy\Tex\Document;
|
||||
use Zoomyboy\Tex\Template;
|
||||
|
||||
|
|
@ -13,12 +11,15 @@ abstract class ContributionDocument extends Document
|
|||
|
||||
abstract public static function getName(): string;
|
||||
|
||||
abstract public static function fromPayload(HasContributionData $request): self;
|
||||
/**
|
||||
* @param ContributionRequestArray $request
|
||||
*/
|
||||
abstract public static function fromRequest(array $request): self;
|
||||
|
||||
/**
|
||||
* @return array<int, SpecialType>
|
||||
* @param ContributionApiRequestArray $request
|
||||
*/
|
||||
abstract public static function requiredFormSpecialTypes(): array;
|
||||
abstract public static function fromApiRequest(array $request): self;
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
|
|
@ -37,6 +38,11 @@ abstract class ContributionDocument extends Document
|
|||
];
|
||||
}
|
||||
|
||||
public static function buttonName(): string
|
||||
{
|
||||
return 'Für ' . static::getName() . ' erstellen';;
|
||||
}
|
||||
|
||||
public function setEventName(string $eventName): void
|
||||
{
|
||||
$this->eventName = $eventName;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,13 @@
|
|||
|
||||
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
|
||||
class GallierDocument extends ContributionDocument
|
||||
{
|
||||
|
||||
use HasPdfBackground;
|
||||
|
|
@ -21,8 +18,8 @@ class WuppertalDocument extends ContributionDocument
|
|||
* @param Collection<int, Collection<int, MemberData>> $members
|
||||
*/
|
||||
public function __construct(
|
||||
public Carbon $dateFrom,
|
||||
public Carbon $dateUntil,
|
||||
public string $dateFrom,
|
||||
public string $dateUntil,
|
||||
public string $zipLocation,
|
||||
public ?Country $country,
|
||||
public Collection $members,
|
||||
|
|
@ -33,21 +30,39 @@ class WuppertalDocument extends ContributionDocument
|
|||
$this->setEventName($eventName);
|
||||
}
|
||||
|
||||
public static function fromPayload(HasContributionData $request): self
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request->dateFrom(),
|
||||
dateUntil: $request->dateUntil(),
|
||||
zipLocation: $request->zipLocation(),
|
||||
country: $request->country(),
|
||||
members: $request->members()->chunk(14),
|
||||
eventName: $request->eventName(),
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromModels($request['members'])->chunk(14),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromApiRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromApi($request['member_data'])->chunk(14),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
public static function getName(): string
|
||||
{
|
||||
return 'Wuppertal';
|
||||
return 'Gallier';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -61,16 +76,4 @@ class WuppertalDocument extends ContributionDocument
|
|||
'zipLocation' => 'required|string',
|
||||
];
|
||||
}
|
||||
|
||||
public static function requiredFormSpecialTypes(): array {
|
||||
return [
|
||||
SpecialType::FIRSTNAME,
|
||||
SpecialType::LASTNAME,
|
||||
SpecialType::ADDRESS,
|
||||
SpecialType::BIRTHDAY,
|
||||
SpecialType::ZIP,
|
||||
SpecialType::LOCATION,
|
||||
SpecialType::GENDER,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -2,14 +2,11 @@
|
|||
|
||||
namespace App\Contribution\Documents;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Contribution\Traits\FormatsDates;
|
||||
use App\Contribution\Traits\HasPdfBackground;
|
||||
use App\Country;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use Illuminate\Support\Collection;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class RdpNrwDocument extends ContributionDocument
|
||||
{
|
||||
|
|
@ -20,8 +17,8 @@ class RdpNrwDocument extends ContributionDocument
|
|||
* @param Collection<int, Collection<int, MemberData>> $members
|
||||
*/
|
||||
public function __construct(
|
||||
public Carbon $dateFrom,
|
||||
public Carbon $dateUntil,
|
||||
public string $dateFrom,
|
||||
public string $dateUntil,
|
||||
public string $zipLocation,
|
||||
public ?Country $country,
|
||||
public Collection $members,
|
||||
|
|
@ -32,15 +29,33 @@ class RdpNrwDocument extends ContributionDocument
|
|||
$this->setEventName($eventName);
|
||||
}
|
||||
|
||||
public static function fromPayload(HasContributionData $request): self
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request->dateFrom(),
|
||||
dateUntil: $request->dateUntil(),
|
||||
zipLocation: $request->zipLocation(),
|
||||
country: $request->country(),
|
||||
members: $request->members()->chunk(17),
|
||||
eventName: $request->eventName(),
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromModels($request['members'])->chunk(17),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function fromApiRequest(array $request): self
|
||||
{
|
||||
return new self(
|
||||
dateFrom: $request['dateFrom'],
|
||||
dateUntil: $request['dateUntil'],
|
||||
zipLocation: $request['zipLocation'],
|
||||
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||
members: MemberData::fromApi($request['member_data'])->chunk(17),
|
||||
eventName: $request['eventName'],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -66,15 +81,4 @@ class RdpNrwDocument extends ContributionDocument
|
|||
'zipLocation' => 'required|string',
|
||||
];
|
||||
}
|
||||
|
||||
public static function requiredFormSpecialTypes(): array {
|
||||
return [
|
||||
SpecialType::FIRSTNAME,
|
||||
SpecialType::LASTNAME,
|
||||
SpecialType::BIRTHDAY,
|
||||
SpecialType::ZIP,
|
||||
SpecialType::LOCATION,
|
||||
SpecialType::GENDER,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,256 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contribution\Enums;
|
||||
|
||||
enum Country: string {
|
||||
case AD = 'Andorra';
|
||||
case AE = 'Vereinigte Arabische Emirate';
|
||||
case AF = 'Afghanistan';
|
||||
case AG = 'Antigua und Barbuda';
|
||||
case AI = 'Anguilla';
|
||||
case AL = 'Albanien';
|
||||
case AM = 'Armenien';
|
||||
case AN = 'Niederländische Antillen';
|
||||
case AO = 'Angola';
|
||||
case AQ = 'Antarktis';
|
||||
case AR = 'Argentinien';
|
||||
case AS = 'Amerikanisch-Samoa';
|
||||
case AT = 'Österreich (Austria)';
|
||||
case AU = 'Australien';
|
||||
case AW = 'Aruba';
|
||||
case AZ = 'Azerbaijan';
|
||||
case BA = 'Bosnien-Herzegovina';
|
||||
case BB = 'Barbados';
|
||||
case BD = 'Bangladesh';
|
||||
case BE = 'Belgien';
|
||||
case BF = 'Burkina Faso';
|
||||
case BG = 'Bulgarien';
|
||||
case BH = 'Bahrain';
|
||||
case BI = 'Burundi';
|
||||
case BJ = 'Benin';
|
||||
case BM = 'Bermudas';
|
||||
case BN = 'Brunei Darussalam';
|
||||
case BO = 'Bolivien';
|
||||
case BR = 'Brasilien';
|
||||
case BS = 'Bahamas';
|
||||
case BT = 'Bhutan';
|
||||
case BV = 'Bouvet Island';
|
||||
case BW = 'Botswana';
|
||||
case BY = 'Weißrußland (Belarus)';
|
||||
case BZ = 'Belize';
|
||||
case CA = 'Canada';
|
||||
case CC = 'Cocos (Keeling) Islands';
|
||||
case CD = 'Demokratische Republik Kongo';
|
||||
case CF = 'Zentralafrikanische Republik';
|
||||
case CG = 'Kongo';
|
||||
case CH = 'Schweiz';
|
||||
case CI = 'Elfenbeinküste (Cote D’Ivoire)';
|
||||
case CK = 'Cook Islands';
|
||||
case CL = 'Chile';
|
||||
case CM = 'Kamerun';
|
||||
case CN = 'China';
|
||||
case CO = 'Kolumbien';
|
||||
case CR = 'Costa Rica';
|
||||
case CS = 'Tschechoslowakei (ehemalige)';
|
||||
case CU = 'Kuba';
|
||||
case CV = 'Kap Verde';
|
||||
case CX = 'Christmas Island';
|
||||
case CY = 'Zypern';
|
||||
case CZ = 'Tschechische Republik';
|
||||
case DE = 'Deutschland';
|
||||
case DJ = 'Djibouti';
|
||||
case DK = 'Dänemark';
|
||||
case DM = 'Dominica';
|
||||
case DO = 'Dominikanische Republik';
|
||||
case DZ = 'Algerien';
|
||||
case EC = 'Ecuador';
|
||||
case EE = 'Estland';
|
||||
case EG = 'Ägypten';
|
||||
case EH = 'Westsahara';
|
||||
case ER = 'Eritrea';
|
||||
case ES = 'Spanien';
|
||||
case ET = 'Äthiopien';
|
||||
case FI = 'Finnland';
|
||||
case FJ = 'Fiji';
|
||||
case FK = 'Falkland-Inseln (Malvinas)';
|
||||
case FM = 'Micronesien';
|
||||
case FO = 'Faröer-Inseln';
|
||||
case FR = 'Frankreich';
|
||||
case FX = 'France, Metropolitan';
|
||||
case GA = 'Gabon';
|
||||
case GD = 'Grenada';
|
||||
case GE = 'Georgien';
|
||||
case GF = 'Französisch Guiana';
|
||||
case GH = 'Ghana';
|
||||
case GI = 'Gibraltar';
|
||||
case GL = 'Grönland';
|
||||
case GM = 'Gambia';
|
||||
case GN = 'Guinea';
|
||||
case GP = 'Guadeloupe';
|
||||
case GQ = 'Äquatorialguinea';
|
||||
case GR = 'Griechenland';
|
||||
case GS = 'Südgeorgien und Südliche Sandwich-Inseln';
|
||||
case GT = 'Guatemala';
|
||||
case GU = 'Guam';
|
||||
case GW = 'Guinea-Bissau';
|
||||
case GY = 'Guyana';
|
||||
case HK = 'Kong Hong';
|
||||
case HM = 'Heard und Mc Donald Islands';
|
||||
case HN = 'Honduras';
|
||||
case HT = 'Haiti';
|
||||
case HU = 'Ungarn';
|
||||
case ID = 'Indonesien';
|
||||
case IE = 'Irland';
|
||||
case IL = 'Israel';
|
||||
case IN = 'Indien';
|
||||
case IO = 'British Indian Ocean Territory';
|
||||
case IQ = 'Irak';
|
||||
case IR = 'Iran (Islamische Republik)';
|
||||
case IS = 'Island';
|
||||
case IT = 'Italien';
|
||||
case JM = 'Jamaica';
|
||||
case JO = 'Jordanien';
|
||||
case JP = 'Japan';
|
||||
case KE = 'Kenya';
|
||||
case KG = 'Kirgisien';
|
||||
case KH = 'Königreich Kambodscha';
|
||||
case KI = 'Kiribati';
|
||||
case KM = 'Komoren';
|
||||
case KN = 'Saint Kitts und Nevis';
|
||||
case KP = 'Korea, Volksrepublik';
|
||||
case KR = 'Korea';
|
||||
case KW = 'Kuwait';
|
||||
case KY = 'Kayman Islands';
|
||||
case KZ = 'Kasachstan';
|
||||
case LA = 'Laos';
|
||||
case LB = 'Libanon';
|
||||
case LC = 'Saint Lucia';
|
||||
case LI = 'Liechtenstein';
|
||||
case LK = 'Sri Lanka';
|
||||
case LR = 'Liberia';
|
||||
case LS = 'Lesotho';
|
||||
case LT = 'Littauen';
|
||||
case LU = 'Luxemburg';
|
||||
case LV = 'Lettland';
|
||||
case LY = 'Libyen';
|
||||
case MA = 'Marokko';
|
||||
case MC = 'Monaco';
|
||||
case MD = 'Moldavien';
|
||||
case MG = 'Madagaskar';
|
||||
case MH = 'Marshall-Inseln';
|
||||
case MK = 'Mazedonien, ehem. Jugoslawische Republik';
|
||||
case ML = 'Mali';
|
||||
case MM = 'Myanmar';
|
||||
case MN = 'Mongolei';
|
||||
case MO = 'Macao';
|
||||
case MP = 'Nördliche Marianneninseln';
|
||||
case MQ = 'Martinique';
|
||||
case MR = 'Mauretanien';
|
||||
case MS = 'Montserrat';
|
||||
case MT = 'Malta';
|
||||
case MU = 'Mauritius';
|
||||
case MV = 'Malediven';
|
||||
case MW = 'Malawi';
|
||||
case MX = 'Mexico';
|
||||
case MY = 'Malaysien';
|
||||
case MZ = 'Mozambique';
|
||||
case NA = 'Namibia';
|
||||
case NC = 'Neu Kaledonien';
|
||||
case NE = 'Niger';
|
||||
case NF = 'Norfolk Island';
|
||||
case NG = 'Nigeria';
|
||||
case NI = 'Nicaragua';
|
||||
case NL = 'Niederlande';
|
||||
case NO = 'Norwegen';
|
||||
case NP = 'Nepal';
|
||||
case NR = 'Nauru';
|
||||
case NU = 'Niue';
|
||||
case NZ = 'Neuseeland';
|
||||
case OM = 'Oman';
|
||||
case PA = 'Panama';
|
||||
case PE = 'Peru';
|
||||
case PF = 'Französisch Polynesien';
|
||||
case PG = 'Papua Neuguinea';
|
||||
case PH = 'Philippinen';
|
||||
case PK = 'Pakistan';
|
||||
case PL = 'Polen';
|
||||
case PM = 'St. Pierre und Miquelon';
|
||||
case PN = 'Pitcairn';
|
||||
case PR = 'Puerto Rico';
|
||||
case PT = 'Portugal';
|
||||
case PW = 'Palau';
|
||||
case PY = 'Paraguay';
|
||||
case QA = 'Katar';
|
||||
case RE = 'Reunion';
|
||||
case RO = 'Rumänien';
|
||||
case RU = 'Russische Föderation';
|
||||
case RW = 'Ruanda';
|
||||
case SA = 'Saudi Arabien';
|
||||
case SB = 'Salomonen';
|
||||
case SC = 'Seychellen';
|
||||
case SD = 'Sudan';
|
||||
case SE = 'Schweden';
|
||||
case SG = 'Singapur';
|
||||
case SH = 'St. Helena';
|
||||
case SI = 'Slovenien';
|
||||
case SJ = 'Svalbard und Jan Mayen Islands';
|
||||
case SK = 'Slowakei';
|
||||
case SL = 'Sierra Leone';
|
||||
case SM = 'San Marino';
|
||||
case SN = 'Senegal';
|
||||
case SO = 'Somalia';
|
||||
case SR = 'Surinam';
|
||||
case ST = 'Sao Tome und Principe';
|
||||
case SV = 'El Salvador';
|
||||
case SY = 'Syrien, Arabische Republik';
|
||||
case SZ = 'Swaziland';
|
||||
case TC = 'Turk und Caicos-Inseln';
|
||||
case TD = 'Tschad';
|
||||
case TF = 'Französisches Südl.Territorium';
|
||||
case TG = 'Togo';
|
||||
case TH = 'Thailand';
|
||||
case TJ = 'Tadschikistan';
|
||||
case TK = 'Tokelau';
|
||||
case TM = 'Turkmenistan';
|
||||
case TN = 'Tunesien';
|
||||
case TO = 'Tonga';
|
||||
case TP = 'Ost-Timor';
|
||||
case TR = 'Türkei';
|
||||
case TT = 'Trinidad und Tobago';
|
||||
case TV = 'Tuvalu';
|
||||
case TW = 'Taiwan';
|
||||
case TZ = 'Tansania, United Republic of';
|
||||
case UA = 'Ukraine';
|
||||
case UG = 'Uganda';
|
||||
case GB = 'Großbritannien';
|
||||
case US = 'Vereinigte Staaten';
|
||||
case UM = 'Vereinigte Staaten, Minor Outlying Islands';
|
||||
case UY = 'Uruguay';
|
||||
case UZ = 'Usbekistan';
|
||||
case VA = 'Vatikanstaat';
|
||||
case VC = 'Saint Vincent und Grenadines';
|
||||
case VE = 'Venezuela';
|
||||
case VG = 'Virgin Islands (Britisch)';
|
||||
case VI = 'Virgin Islands (U.S.)';
|
||||
case VN = 'Vietnam';
|
||||
case VU = 'Vanuatu';
|
||||
case WF = 'Wallis und Futuna Islands';
|
||||
case WS = 'Samoa';
|
||||
case YE = 'Jemen';
|
||||
case YT = 'Mayotte';
|
||||
case YU = 'Jugoslawien';
|
||||
case ZA = 'Südafrika';
|
||||
case ZM = 'Sambia';
|
||||
case ZW = 'Zimbabw';
|
||||
|
||||
/**
|
||||
* @return array<int, array{name: string, id: string}>
|
||||
*/
|
||||
public static function forSelect(): array
|
||||
{
|
||||
return collect(static::cases())
|
||||
->map(fn ($case) => ['id' => $case->value, 'name' => $case->value])
|
||||
->toArray();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contribution\Requests;
|
||||
|
||||
use App\Contribution\Data\MemberData;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
class GenerateApiRequest extends GenerateRequest {
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
public function payload(): array
|
||||
{
|
||||
return $this->input();
|
||||
}
|
||||
|
||||
public function validateContribution(): void {
|
||||
}
|
||||
|
||||
public function members(): Collection {
|
||||
return MemberData::fromApi($this->value('members'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Contribution\Requests;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\ContributionFactory;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Contribution\Documents\ContributionDocument;
|
||||
use App\Country;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
class GenerateRequest extends ActionRequest implements HasContributionData {
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
protected function payload(): array
|
||||
{
|
||||
return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
|
||||
}
|
||||
|
||||
public function validateContribution(): void {
|
||||
Validator::make($this->payload(), app(ContributionFactory::class)->rules($this->type()))->validate();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string|array<array-key, mixed>
|
||||
*/
|
||||
public function value(string $key): string|array
|
||||
{
|
||||
return data_get($this->payload(), $key);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return class-string<ContributionDocument>
|
||||
*/
|
||||
public function type(): string
|
||||
{
|
||||
return $this->value('type');
|
||||
}
|
||||
|
||||
public function dateFrom(): Carbon {
|
||||
return Carbon::parse($this->value('dateFrom'));
|
||||
}
|
||||
|
||||
public function dateUntil(): Carbon {
|
||||
return Carbon::parse($this->value('dateUntil'));
|
||||
}
|
||||
|
||||
public function zipLocation(): string {
|
||||
return $this->value('zipLocation');
|
||||
}
|
||||
|
||||
public function eventName(): string {
|
||||
return $this->value('eventName');
|
||||
}
|
||||
|
||||
public function members(): Collection {
|
||||
return MemberData::fromModels($this->value('members'));
|
||||
}
|
||||
|
||||
public function country(): ?Country {
|
||||
return Country::where('id', $this->value('country'))->first();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ class CourseMember extends Model
|
|||
public $guarded = [];
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Course, $this>
|
||||
* @return BelongsTo<Course, self>
|
||||
*/
|
||||
public function course(): BelongsTo
|
||||
{
|
||||
|
|
@ -25,7 +25,7 @@ class CourseMember extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Member, $this>
|
||||
* @return BelongsTo<Member, self>
|
||||
*/
|
||||
public function member(): BelongsTo
|
||||
{
|
||||
|
|
|
|||
|
|
@ -129,7 +129,6 @@ class Principal implements PrincipalBackendInterface
|
|||
*/
|
||||
public function findByUri($uri, $principalPrefix)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@ class Fee extends Model
|
|||
use HasFactory;
|
||||
use HasNamiField;
|
||||
|
||||
/** @var array<int, string> */
|
||||
public $fillable = ['name', 'nami_id'];
|
||||
|
||||
/** @var bool */
|
||||
public $timestamps = false;
|
||||
|
||||
/**
|
||||
* @return HasMany<Subscription, $this>
|
||||
* @return HasMany<Subscription>
|
||||
*/
|
||||
public function subscriptions(): HasMany
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class FormApiListAction
|
|||
|
||||
/**
|
||||
* @param string $filter
|
||||
* @return LengthAwarePaginator<int, Form>
|
||||
* @return LengthAwarePaginator<Form>
|
||||
*/
|
||||
public function handle(string $filter, int $perPage): LengthAwarePaginator
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Form\Actions;
|
||||
|
||||
use App\Form\Models\Form;
|
||||
use App\Lib\Events\Succeeded;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
||||
class FormCopyAction
|
||||
{
|
||||
use AsAction;
|
||||
|
||||
public function handle(Form $form): Form
|
||||
{
|
||||
$newForm = $form->replicate();
|
||||
$newForm->save();
|
||||
$newForm->update(['name' => $form->name.' - Kopie', 'is_active' => false]);
|
||||
|
||||
foreach ($form->getRegisteredMediaCollections() as $collection) {
|
||||
foreach ($form->getMedia($collection->name) as $media) {
|
||||
$media->copy($newForm, $collection->name);
|
||||
}
|
||||
}
|
||||
|
||||
ClearFrontendCacheAction::run();
|
||||
|
||||
return $form;
|
||||
}
|
||||
|
||||
public function asController(Form $form): JsonResponse
|
||||
{
|
||||
$this->handle($form);
|
||||
|
||||
Succeeded::message('Veranstaltung kopiert.')->dispatch();
|
||||
return response()->json([]);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
<?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')
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@ class FormIndexAction
|
|||
use AsAction;
|
||||
|
||||
/**
|
||||
* @return LengthAwarePaginator<int, Form>
|
||||
* @return LengthAwarePaginator<Form>
|
||||
*/
|
||||
public function handle(string $filter): LengthAwarePaginator
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,10 +36,6 @@ class FormStoreAction
|
|||
'needs_prevention' => 'present|boolean',
|
||||
'prevention_text' => 'array',
|
||||
'prevention_conditions' => 'array',
|
||||
'leader_conditions' => 'array',
|
||||
'zip' => 'present|nullable|string',
|
||||
'location' => 'present|nullable|string',
|
||||
'country' => 'nullable|string|max:255',
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Form\Actions;
|
||||
|
||||
use App\Form\Models\Form;
|
||||
use App\Lib\Editor\Condition;
|
||||
use App\Lib\Events\Succeeded;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
|
@ -35,10 +36,6 @@ class FormUpdateAction
|
|||
'needs_prevention' => 'present|boolean',
|
||||
'prevention_text' => 'array',
|
||||
'prevention_conditions' => 'array',
|
||||
'location' => 'present|nullable|string',
|
||||
'zip' => 'present|nullable|string',
|
||||
'country' => 'nullable|string|max:255',
|
||||
'leader_conditions' => 'array',
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class FormtemplateIndexAction
|
|||
use AsAction;
|
||||
|
||||
/**
|
||||
* @return LengthAwarePaginator<int, Formtemplate>
|
||||
* @return LengthAwarePaginator<Formtemplate>
|
||||
*/
|
||||
public function handle(): LengthAwarePaginator
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Form\Actions;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\ContributionFactory;
|
||||
use App\Form\Models\Form;
|
||||
use App\Form\Requests\FormCompileRequest;
|
||||
use App\Rules\JsonBase64Rule;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
use Zoomyboy\Tex\BaseCompiler;
|
||||
use Zoomyboy\Tex\Tex;
|
||||
|
||||
class GenerateContributionAction
|
||||
{
|
||||
use AsAction;
|
||||
|
||||
public function handle(HasContributionData $request): BaseCompiler
|
||||
{
|
||||
return Tex::compile($request->type()::fromPayload($request));
|
||||
}
|
||||
|
||||
public function asController(ActionRequest $request, Form $form): BaseCompiler|JsonResponse
|
||||
{
|
||||
$r = FormCompileRequest::from(['form' => $form]);
|
||||
app(ContributionFactory::class)->validateType($r);
|
||||
$r->validateContribution();
|
||||
|
||||
return $request->input('validate')
|
||||
? response()->json([])
|
||||
: $this->handle($r);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'payload' => [new JsonBase64Rule()],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -13,18 +13,18 @@ class PreventionRememberAction
|
|||
{
|
||||
use AsAction;
|
||||
|
||||
public string $commandSignature = 'prevention:remember-forms';
|
||||
public string $commandSignature = 'prevention:remember';
|
||||
|
||||
public function handle(): void
|
||||
{
|
||||
$query = Participant::whereHas(
|
||||
'form',
|
||||
fn($form) => $form
|
||||
fn ($form) => $form
|
||||
->where('needs_prevention', true)
|
||||
->where('from', '>=', now())
|
||||
)
|
||||
->where(
|
||||
fn($q) => $q
|
||||
fn ($q) => $q
|
||||
->where('last_remembered_at', '<=', now()->subWeeks(2))
|
||||
->orWhereNull('last_remembered_at')
|
||||
);
|
||||
|
|
@ -33,7 +33,7 @@ class PreventionRememberAction
|
|||
continue;
|
||||
}
|
||||
|
||||
if ($participant->getFields()->getMailRecipient() === null || $participant->preventions()->count() === 0) {
|
||||
if ($participant->getFields()->getMailRecipient() === null || count($participant->preventions()) === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ class PreventionRememberAction
|
|||
->placeholder('formname', $participant->form->name)
|
||||
->append($participant->form->prevention_text);
|
||||
|
||||
Mail::send(new PreventionRememberMail($participant, $body, $participant->preventions()));
|
||||
Mail::send(new PreventionRememberMail($participant, $body));
|
||||
|
||||
$participant->update(['last_remembered_at' => now()]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@ use App\Form\Models\Form;
|
|||
use App\Form\Models\Participant;
|
||||
use App\Member\Member;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
|
@ -23,9 +20,13 @@ class RegisterAction
|
|||
*/
|
||||
public function handle(Form $form, array $input): Participant
|
||||
{
|
||||
if (!$form->canRegister()) {
|
||||
throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
|
||||
}
|
||||
|
||||
$memberQuery = FieldCollection::fromRequest($form, $input)
|
||||
->withNamiType()
|
||||
->reduce(fn($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
|
||||
->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
|
||||
$member = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first() : null;
|
||||
|
||||
$participant = $form->participants()->create([
|
||||
|
|
@ -33,7 +34,7 @@ class RegisterAction
|
|||
'member_id' => $member?->id,
|
||||
]);
|
||||
|
||||
$form->getFields()->each(fn($field) => $field->afterRegistration($form, $participant, $input));
|
||||
$form->getFields()->each(fn ($field) => $field->afterRegistration($form, $participant, $input));
|
||||
|
||||
$participant->sendConfirmationMail();
|
||||
ExportSyncAction::dispatch($form->id);
|
||||
|
|
@ -76,34 +77,8 @@ class RegisterAction
|
|||
|
||||
public function asController(ActionRequest $request, Form $form): JsonResponse
|
||||
{
|
||||
if (!$form->canRegister() && !$this->isRegisteringLater($request, $form)) {
|
||||
throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
|
||||
}
|
||||
|
||||
$participant = $this->handle($form, $request->validated());
|
||||
|
||||
if ($this->isRegisteringLater($request, $form)) {
|
||||
Cache::forget('later_'.request('id'));
|
||||
}
|
||||
|
||||
return response()->json($participant);
|
||||
}
|
||||
|
||||
public function isRegisteringLater(ActionRequest $request, Form $form): bool {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class UpdateParticipantSearchIndexAction
|
|||
[
|
||||
'filterableAttributes' => [...$form->getFields()->filterables()->getKeys(), 'parent-id'],
|
||||
'searchableAttributes' => $form->getFields()->searchables()->getKeys(),
|
||||
'sortableAttributes' => [...$form->getFields()->sortables()->getKeys(), 'id', 'created_at'],
|
||||
'sortableAttributes' => [...$form->getFields()->sortables()->getKeys(), 'id'],
|
||||
'displayedAttributes' => [...$form->getFields()->filterables()->getKeys(), ...$form->getFields()->searchables()->getKeys(), 'id'],
|
||||
'pagination' => [
|
||||
'maxTotalHits' => 1000000,
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
namespace App\Form\Data;
|
||||
|
||||
use App\Fileshare\Data\FileshareResourceData;
|
||||
use App\Form\Fields\Field;
|
||||
use Spatie\LaravelData\Attributes\MapInputName;
|
||||
use Spatie\LaravelData\Attributes\MapOutputName;
|
||||
use Spatie\LaravelData\Data;
|
||||
use Spatie\LaravelData\Mappers\SnakeCaseMapper;
|
||||
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
|
||||
|
||||
#[MapInputName(SnakeCaseMapper::class)]
|
||||
#[MapOutputName(SnakeCaseMapper::class)]
|
||||
|
|
@ -16,13 +16,4 @@ class ExportData extends Data
|
|||
public function __construct(public ?FileshareResourceData $root = null, public ?string $groupBy = null, public ?string $toGroupField = null)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int, mixed> $arguments
|
||||
* @return DataEloquentCast<self>
|
||||
*/
|
||||
public static function castUsing(array $arguments): DataEloquentCast
|
||||
{
|
||||
return new DataEloquentCast(static::class, $arguments);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,12 +114,7 @@ class FieldCollection extends Collection
|
|||
return $this->map(fn ($field) => $field->presentRaw())->toArray();
|
||||
}
|
||||
|
||||
public function hasSpecialType(SpecialType $specialType): bool
|
||||
{
|
||||
return $this->findBySpecialType($specialType) !== null;
|
||||
}
|
||||
|
||||
public function findBySpecialType(SpecialType $specialType): ?Field
|
||||
private function findBySpecialType(SpecialType $specialType): ?Field
|
||||
{
|
||||
return $this->first(fn ($field) => $field->specialType === $specialType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ use Illuminate\Support\Collection;
|
|||
use Spatie\LaravelData\Data;
|
||||
use Spatie\LaravelData\Attributes\WithCast;
|
||||
use Spatie\LaravelData\Attributes\WithTransformer;
|
||||
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
|
||||
|
||||
class FormConfigData extends Data
|
||||
{
|
||||
|
|
@ -30,13 +29,4 @@ class FormConfigData extends Data
|
|||
new FieldCollection([])
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int, mixed> $arguments
|
||||
* @return DataEloquentCast<self>
|
||||
*/
|
||||
public static function castUsing(array $arguments): DataEloquentCast
|
||||
{
|
||||
return new DataEloquentCast(static::class, $arguments);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,6 @@ enum SpecialType: string
|
|||
case FIRSTNAME = 'Vorname';
|
||||
case LASTNAME = 'Nachname';
|
||||
case EMAIL = 'E-Mail-Adresse';
|
||||
case BIRTHDAY = 'Geburtsdatum';
|
||||
case ZIP = 'PLZ';
|
||||
case LOCATION = 'Ort';
|
||||
case ADDRESS = 'Adresse';
|
||||
case GENDER = 'Geschlecht';
|
||||
|
||||
/**
|
||||
* @return array<int, array{name: string, id: string}>
|
||||
|
|
|
|||
|
|
@ -69,8 +69,10 @@ class ConfirmRegistrationMail extends Mailable
|
|||
*/
|
||||
public function attachments()
|
||||
{
|
||||
$conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
|
||||
|
||||
return $this->participant->form->getMedia('mailattachments')
|
||||
->filter(fn ($media) => $this->participant->matchesCondition(Condition::fromMedia($media)))
|
||||
->filter(fn ($media) => $conditionResolver->filterCondition(Condition::fromMedia($media)))
|
||||
->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
|
||||
->all();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Form\Models;
|
||||
|
||||
use App\Contribution\Enums\Country;
|
||||
use App\Form\Actions\UpdateParticipantSearchIndexAction;
|
||||
use App\Form\Data\ExportData;
|
||||
use App\Form\Data\FieldCollection;
|
||||
|
|
@ -19,6 +18,7 @@ use Laravel\Scout\Searchable;
|
|||
use Spatie\Image\Enums\Fit;
|
||||
use Spatie\MediaLibrary\HasMedia;
|
||||
use Spatie\MediaLibrary\InteractsWithMedia;
|
||||
use Spatie\MediaLibrary\MediaCollections\Models\Media;
|
||||
use Zoomyboy\MedialibraryHelper\DefersUploads;
|
||||
|
||||
/** @todo replace editor content with EditorData cast */
|
||||
|
|
@ -49,8 +49,6 @@ class Form extends Model implements HasMedia
|
|||
'to' => 'datetime',
|
||||
'registration_from' => 'datetime',
|
||||
'registration_until' => 'datetime',
|
||||
'country' => Country::class,
|
||||
'leader_conditions' => Condition::class,
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -64,31 +62,32 @@ class Form extends Model implements HasMedia
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<Participant, $this>
|
||||
* @return HasMany<Participant>
|
||||
*/
|
||||
public function participants(): HasMany
|
||||
{
|
||||
return $this->hasMany(Participant::class);
|
||||
}
|
||||
|
||||
|
||||
public function registerMediaCollections(): void
|
||||
{
|
||||
$this->addMediaCollection('headerImage')
|
||||
->singleFile()
|
||||
->maxWidth(fn() => 500)
|
||||
->forceFileName(fn(Form $model) => $model->slug)
|
||||
->convert(fn() => 'jpg')
|
||||
->registerMediaConversions(function () {
|
||||
->maxWidth(fn () => 500)
|
||||
->forceFileName(fn (Form $model, string $name) => $model->slug)
|
||||
->convert(fn () => 'jpg')
|
||||
->registerMediaConversions(function (Media $media) {
|
||||
$this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
|
||||
});
|
||||
$this->addMediaCollection('mailattachments')
|
||||
->withDefaultProperties(fn() => [
|
||||
->withDefaultProperties(fn () => [
|
||||
'conditions' => [
|
||||
'mode' => 'all',
|
||||
'ifs' => []
|
||||
],
|
||||
])
|
||||
->withPropertyValidation(fn() => [
|
||||
->withPropertyValidation(fn () => [
|
||||
'conditions.mode' => 'required|string|in:all,any',
|
||||
'conditions.ifs' => 'array',
|
||||
'conditions.ifs.*.field' => 'required',
|
||||
|
|
@ -102,7 +101,7 @@ class Form extends Model implements HasMedia
|
|||
*/
|
||||
public function getRegistrationRules(): array
|
||||
{
|
||||
return $this->getFields()->reduce(fn($carry, $field) => [
|
||||
return $this->getFields()->reduce(fn ($carry, $field) => [
|
||||
...$carry,
|
||||
...$field->getRegistrationRules($this),
|
||||
], []);
|
||||
|
|
@ -113,7 +112,7 @@ class Form extends Model implements HasMedia
|
|||
*/
|
||||
public function getRegistrationMessages(): array
|
||||
{
|
||||
return $this->getFields()->reduce(fn($carry, $field) => [
|
||||
return $this->getFields()->reduce(fn ($carry, $field) => [
|
||||
...$carry,
|
||||
...$field->getRegistrationMessages($this),
|
||||
], []);
|
||||
|
|
@ -124,7 +123,7 @@ class Form extends Model implements HasMedia
|
|||
*/
|
||||
public function getRegistrationAttributes(): array
|
||||
{
|
||||
return $this->getFields()->reduce(fn($carry, $field) => [
|
||||
return $this->getFields()->reduce(fn ($carry, $field) => [
|
||||
...$carry,
|
||||
...$field->getRegistrationAttributes($this),
|
||||
], []);
|
||||
|
|
@ -190,7 +189,8 @@ class Form extends Model implements HasMedia
|
|||
return Sorting::from($this->meta['sorting']);
|
||||
}
|
||||
|
||||
public function isInDates(): bool {
|
||||
public function canRegister(): bool
|
||||
{
|
||||
if ($this->registration_from && $this->registration_from->gt(now())) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -201,9 +201,4 @@ class Form extends Model implements HasMedia
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function canRegister(): bool
|
||||
{
|
||||
return $this->is_active && $this->isInDates();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,17 +4,16 @@ namespace App\Form\Models;
|
|||
|
||||
use App\Form\Data\FieldCollection;
|
||||
use App\Form\Data\FormConfigData;
|
||||
use App\Form\Editor\FormConditionResolver;
|
||||
use App\Form\Mails\ConfirmRegistrationMail;
|
||||
use App\Lib\Editor\Condition;
|
||||
use App\Form\Scopes\ParticipantFilterScope;
|
||||
use App\Member\Member;
|
||||
use App\Prevention\Contracts\Preventable;
|
||||
use Database\Factories\Form\Models\ParticipantFactory;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Laravel\Scout\Searchable;
|
||||
use stdClass;
|
||||
|
|
@ -34,7 +33,7 @@ class Participant extends Model implements Preventable
|
|||
];
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Form, $this>
|
||||
* @return BelongsTo<Form, self>
|
||||
*/
|
||||
public function form(): BelongsTo
|
||||
{
|
||||
|
|
@ -42,7 +41,7 @@ class Participant extends Model implements Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<Participant, $this>
|
||||
* @return HasMany<self>
|
||||
*/
|
||||
public function children(): HasMany
|
||||
{
|
||||
|
|
@ -50,7 +49,7 @@ class Participant extends Model implements Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Member, $this>
|
||||
* @return BelongsTo<Member, self>
|
||||
*/
|
||||
public function member(): BelongsTo
|
||||
{
|
||||
|
|
@ -82,15 +81,20 @@ class Participant extends Model implements Preventable
|
|||
Mail::to($this->getMailRecipient())->queue(new ConfirmRegistrationMail($this));
|
||||
}
|
||||
|
||||
public function preventableLayout(): string
|
||||
{
|
||||
return 'mail.prevention.prevention-remember-participant';
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function preventions(): Collection
|
||||
public function preventions(): array
|
||||
{
|
||||
return $this->member?->preventions($this->form->from) ?: collect([]);
|
||||
return $this->member?->preventions($this->form->from) ?: [];
|
||||
}
|
||||
|
||||
public function getMailRecipient(): ?stdClass
|
||||
public function getMailRecipient(): stdClass
|
||||
{
|
||||
return $this->getFields()->getMailRecipient();
|
||||
}
|
||||
|
|
@ -108,10 +112,6 @@ class Participant extends Model implements Preventable
|
|||
/** @return array<string, mixed> */
|
||||
public function toSearchableArray(): array
|
||||
{
|
||||
return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
|
||||
}
|
||||
|
||||
public function matchesCondition(Condition $condition): bool {
|
||||
return app(FormConditionResolver::class)->forParticipant($this)->filterCondition($condition);
|
||||
return [...$this->data, 'parent-id' => $this->parent_id];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,107 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Form\Requests;
|
||||
|
||||
use App\Contribution\Contracts\HasContributionData;
|
||||
use App\Contribution\Data\MemberData;
|
||||
use App\Contribution\Documents\ContributionDocument;
|
||||
use App\Country;
|
||||
use App\Form\Editor\FormConditionResolver;
|
||||
use App\Form\Enums\SpecialType;
|
||||
use App\Form\Models\Form;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Spatie\LaravelData\Data;
|
||||
|
||||
class FormCompileRequest extends Data implements HasContributionData {
|
||||
|
||||
public function __construct(public Form $form) {}
|
||||
|
||||
/**
|
||||
* @return class-string<ContributionDocument>
|
||||
*/
|
||||
public function type(): string
|
||||
{
|
||||
$payload = json_decode(rawurldecode(base64_decode(request()->input('payload'))), true);
|
||||
|
||||
return $payload['type'];
|
||||
}
|
||||
|
||||
public function dateFrom(): Carbon
|
||||
{
|
||||
return $this->form->from;
|
||||
}
|
||||
|
||||
public function dateUntil(): Carbon
|
||||
{
|
||||
return $this->form->to;
|
||||
}
|
||||
|
||||
public function zipLocation(): string
|
||||
{
|
||||
return $this->form->zip.' '.$this->form->location;
|
||||
}
|
||||
|
||||
public function eventName(): string
|
||||
{
|
||||
return $this->form->name;
|
||||
}
|
||||
|
||||
public function members(): Collection
|
||||
{
|
||||
$members = [];
|
||||
$fields = [
|
||||
[SpecialType::FIRSTNAME, 'firstname'],
|
||||
[SpecialType::LASTNAME, 'lastname'],
|
||||
[SpecialType::BIRTHDAY, 'birthday'],
|
||||
[SpecialType::GENDER, 'gender'],
|
||||
[SpecialType::ADDRESS, 'address'],
|
||||
[SpecialType::ZIP, 'zip'],
|
||||
[SpecialType::LOCATION, 'location'],
|
||||
];
|
||||
|
||||
foreach ($this->form->participants as $participant) {
|
||||
$member = [];
|
||||
foreach ($fields as [$type, $name]) {
|
||||
$f = $this->form->getFields()->findBySpecialType($type);
|
||||
if (!$f) {
|
||||
continue;
|
||||
}
|
||||
$member[$name] = $participant->getFields()->find($f)->value;
|
||||
}
|
||||
|
||||
$members[] = [
|
||||
'is_leader' => $participant->matchesCondition($participant->form->leader_conditions),
|
||||
'gender' => 'weiblich',
|
||||
...$member,
|
||||
];
|
||||
}
|
||||
|
||||
return MemberData::fromApi($members);
|
||||
}
|
||||
|
||||
public function country(): ?Country
|
||||
{
|
||||
return Country::first();
|
||||
}
|
||||
|
||||
public function validateContribution(): void
|
||||
{
|
||||
Validator::make($this->form->toArray(), [
|
||||
'zip' => 'required',
|
||||
'location' => 'required'
|
||||
])
|
||||
->after(function($validator) {
|
||||
foreach ($this->type()::requiredFormSpecialTypes() as $type) {
|
||||
if (!$this->form->getFields()->hasSpecialType($type)) {
|
||||
$validator->errors()->add($type->name, 'Kein Feld für ' . $type->value . ' vorhanden.');
|
||||
}
|
||||
}
|
||||
if ($this->form->participants->count() === 0) {
|
||||
$validator->errors()->add('participants', 'Veranstaltung besitzt noch keine Teilnehmer*innen.');
|
||||
}
|
||||
})
|
||||
->validate();
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Form\Resources;
|
||||
|
||||
use App\Contribution\Enums\Country;
|
||||
use App\Form\Data\ExportData;
|
||||
use App\Form\Enums\NamiType;
|
||||
use App\Form\Enums\SpecialType;
|
||||
|
|
@ -15,7 +14,6 @@ use App\Group;
|
|||
use App\Lib\Editor\EditorData;
|
||||
use App\Lib\HasMeta;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
use App\Contribution\ContributionFactory;
|
||||
|
||||
/**
|
||||
* @mixin Form
|
||||
|
|
@ -46,7 +44,6 @@ class FormResource extends JsonResource
|
|||
'mail_bottom' => $this->mail_bottom,
|
||||
'registration_from' => $this->registration_from?->format('Y-m-d H:i:s'),
|
||||
'registration_until' => $this->registration_until?->format('Y-m-d H:i:s'),
|
||||
'is_in_dates' => $this->isInDates(),
|
||||
'config' => $this->config,
|
||||
'participants_count' => $this->participants_count,
|
||||
'is_active' => $this->is_active,
|
||||
|
|
@ -56,21 +53,14 @@ class FormResource extends JsonResource
|
|||
'needs_prevention' => $this->needs_prevention,
|
||||
'prevention_text' => $this->prevention_text,
|
||||
'prevention_conditions' => $this->prevention_conditions,
|
||||
'leader_conditions' => $this->leader_conditions,
|
||||
'zip' => $this->zip,
|
||||
'location' => $this->location,
|
||||
'country' => $this->country,
|
||||
'links' => [
|
||||
'participant_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => null]),
|
||||
'participant_root_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => -1]),
|
||||
'update' => route('form.update', $this->getModel()),
|
||||
'destroy' => route('form.destroy', $this->getModel()),
|
||||
'is_dirty' => route('form.is-dirty', $this->getModel()),
|
||||
'update' => route('form.update', ['form' => $this->getModel()]),
|
||||
'destroy' => route('form.destroy', ['form' => $this->getModel()]),
|
||||
'is_dirty' => route('form.is-dirty', ['form' => $this->getModel()]),
|
||||
'frontend' => str(app(FormSettings::class)->registerUrl)->replace('{slug}', $this->slug),
|
||||
'export' => route('form.export', $this->getModel()),
|
||||
'copy' => route('form.copy', $this->getModel()),
|
||||
'contribution' => route('form.contribution', $this->getModel()),
|
||||
'laterlink' => route('form.laterlink', $this->getModel()),
|
||||
'export' => route('form.export', ['form' => $this->getModel()]),
|
||||
]
|
||||
];
|
||||
}
|
||||
|
|
@ -92,8 +82,6 @@ class FormResource extends JsonResource
|
|||
'templates' => FormtemplateResource::collection(Formtemplate::get()),
|
||||
'namiTypes' => NamiType::forSelect(),
|
||||
'specialTypes' => SpecialType::forSelect(),
|
||||
'countries' => Country::forSelect(),
|
||||
'contribution_types' => app(ContributionFactory::class)->compilerSelect(),
|
||||
'default' => [
|
||||
'description' => [],
|
||||
'is_active' => true,
|
||||
|
|
@ -113,9 +101,6 @@ class FormResource extends JsonResource
|
|||
'id' => null,
|
||||
'export' => ExportData::from([]),
|
||||
'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
|
||||
'zip' => '',
|
||||
'location' => '',
|
||||
'country' => null,
|
||||
],
|
||||
'section_default' => [
|
||||
'name' => '',
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class Group extends Model
|
|||
];
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Group, $this>
|
||||
* @return BelongsTo<self, self>
|
||||
*/
|
||||
public function parent(): BelongsTo
|
||||
{
|
||||
|
|
@ -34,7 +34,7 @@ class Group extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<Group, $this>
|
||||
* @return HasMany<self>
|
||||
*/
|
||||
public function children(): HasMany
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,5 @@ class Authenticate extends Middleware
|
|||
if (!$request->expectsJson()) {
|
||||
return route('login');
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ class InitializeAction
|
|||
|
||||
public function asController(ActionRequest $request, NamiSettings $settings): RedirectResponse
|
||||
{
|
||||
$settings->mglnr = $request->input('mglnr');
|
||||
$settings->mglnr = (int) $request->input('mglnr');
|
||||
$settings->password = $request->input('password');
|
||||
$settings->default_group_id = (int) $request->input('group_id');
|
||||
$settings->search_params = $request->input('params');
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class NamiGetSearchLayerAction
|
|||
*/
|
||||
public function handle(array $input): Collection
|
||||
{
|
||||
return Nami::login($input['mglnr'], $input['password'])->searchLayerOptions(
|
||||
return Nami::login((int) $input['mglnr'], $input['password'])->searchLayerOptions(
|
||||
SearchLayer::from($input['layer'] ?: 0),
|
||||
$input['parent'] ?: null
|
||||
);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class NamiLoginCheckAction
|
|||
*/
|
||||
public function handle(array $input): void
|
||||
{
|
||||
Nami::freshLogin($input['mglnr'], $input['password']);
|
||||
Nami::freshLogin((int) $input['mglnr'], $input['password']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class NamiSearchAction
|
|||
/**
|
||||
* @param array<string, mixed> $params
|
||||
*
|
||||
* @return LengthAwarePaginator<int, MemberEntry>
|
||||
* @return LengthAwarePaginator<MemberEntry>
|
||||
*/
|
||||
public function handle(Api $api, int $page, array $params, int $perPage = 10): LengthAwarePaginator
|
||||
{
|
||||
|
|
@ -36,7 +36,7 @@ class NamiSearchAction
|
|||
}
|
||||
|
||||
/**
|
||||
* @return LengthAwarePaginator<int, MemberEntry>
|
||||
* @return LengthAwarePaginator<MemberEntry>
|
||||
*/
|
||||
public function asController(ActionRequest $request): LengthAwarePaginator
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ use Lorisleiva\Actions\Concerns\AsAction;
|
|||
use App\Invoice\Models\Invoice;
|
||||
use App\Invoice\Resources\InvoiceResource;
|
||||
use App\Invoice\Scopes\InvoiceFilterScope;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Inertia\Inertia;
|
||||
use Inertia\Response;
|
||||
use Laravel\Scout\Builder;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
|
||||
class InvoiceIndexAction
|
||||
|
|
@ -17,11 +17,11 @@ class InvoiceIndexAction
|
|||
|
||||
|
||||
/**
|
||||
* @return Builder<Invoice>
|
||||
* @return LengthAwarePaginator<Invoice>
|
||||
*/
|
||||
public function handle(InvoiceFilterScope $filter): Builder
|
||||
public function handle(InvoiceFilterScope $filter): LengthAwarePaginator
|
||||
{
|
||||
return $filter->getQuery()->query(fn ($q) => $q->with('positions'));
|
||||
return Invoice::withFilter($filter)->with('positions')->paginate(15);
|
||||
}
|
||||
|
||||
public function asController(ActionRequest $request): Response
|
||||
|
|
@ -32,7 +32,7 @@ class InvoiceIndexAction
|
|||
$filter = InvoiceFilterScope::fromRequest($request->input('filter', ''));
|
||||
|
||||
return Inertia::render('invoice/Index', [
|
||||
'data' => InvoiceResource::collection($this->handle($filter)->paginate(15)),
|
||||
'data' => InvoiceResource::collection($this->handle($filter)),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class MassStoreAction
|
|||
foreach ($memberGroup as $members) {
|
||||
$invoice = Invoice::createForMember($members->first(), $members, $year);
|
||||
$invoice->save();
|
||||
$invoice->positions()->createMany($invoice->positions->toArray());
|
||||
$invoice->positions()->createMany($invoice->positions);
|
||||
$invoices->push($invoice->fresh('positions'));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,17 +8,27 @@ use Lorisleiva\Actions\ActionRequest;
|
|||
|
||||
class InvoiceSettings extends LocalSettings implements Storeable
|
||||
{
|
||||
public ?string $from_long;
|
||||
public ?string $from;
|
||||
public ?string $mobile;
|
||||
public ?string $email;
|
||||
public ?string $website;
|
||||
public ?string $address;
|
||||
public ?string $place;
|
||||
public ?string $zip;
|
||||
public ?string $iban;
|
||||
public ?string $bic;
|
||||
public ?int $rememberWeeks;
|
||||
public string $from_long;
|
||||
|
||||
public string $from;
|
||||
|
||||
public string $mobile;
|
||||
|
||||
public string $email;
|
||||
|
||||
public string $website;
|
||||
|
||||
public string $address;
|
||||
|
||||
public string $place;
|
||||
|
||||
public string $zip;
|
||||
|
||||
public string $iban;
|
||||
|
||||
public string $bic;
|
||||
|
||||
public int $rememberWeeks;
|
||||
|
||||
public static function group(): string
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ use Illuminate\Database\Eloquent\Collection;
|
|||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Laravel\Scout\Searchable;
|
||||
use stdClass;
|
||||
|
||||
class Invoice extends Model
|
||||
{
|
||||
/** @use HasFactory<InvoiceFactory> */
|
||||
use HasFactory;
|
||||
use Searchable;
|
||||
|
||||
public $guarded = [];
|
||||
|
||||
|
|
@ -37,7 +35,7 @@ class Invoice extends Model
|
|||
];
|
||||
|
||||
/**
|
||||
* @return HasMany<InvoicePosition, $this>
|
||||
* @return HasMany<InvoicePosition>
|
||||
*/
|
||||
public function positions(): HasMany
|
||||
{
|
||||
|
|
@ -49,6 +47,7 @@ class Invoice extends Model
|
|||
*/
|
||||
public static function createForMember(Member $member, Collection $members, int $year, Subscription $subscription = null): self
|
||||
{
|
||||
$subscription = $subscription ?: $member->subscription;
|
||||
$invoice = new self([
|
||||
'to' => [
|
||||
'name' => 'Familie ' . $member->lastname,
|
||||
|
|
@ -65,8 +64,7 @@ class Invoice extends Model
|
|||
|
||||
$positions = collect([]);
|
||||
foreach ($members as $member) {
|
||||
$memberSubscription = $subscription ?: $member->subscription;
|
||||
foreach ($memberSubscription->children as $child) {
|
||||
foreach ($subscription->children as $child) {
|
||||
$positions->push([
|
||||
'description' => str($child->name)->replace('{name}', $member->firstname . ' ' . $member->lastname)->replace('{year}', (string) $year),
|
||||
'price' => $child->amount,
|
||||
|
|
@ -122,6 +120,15 @@ class Invoice extends Model
|
|||
->where('last_remembered_at', '<=', now()->subWeeks($weeks));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Builder<self> $query
|
||||
* @return Builder<self>
|
||||
*/
|
||||
public function scopeWithFilter(Builder $query, InvoiceFilterScope $filter): Builder
|
||||
{
|
||||
return $filter->apply($query);
|
||||
}
|
||||
|
||||
public function getMailRecipient(): stdClass
|
||||
{
|
||||
return (object) [
|
||||
|
|
@ -147,20 +154,4 @@ class Invoice extends Model
|
|||
]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the indexable data array for the model.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function toSearchableArray(): array
|
||||
{
|
||||
return [
|
||||
'to' => implode(', ', $this->to),
|
||||
'usage' => $this->usage,
|
||||
'greeting' => $this->greeting,
|
||||
'mail_email' => $this->mail_email,
|
||||
'status' => $this->status->value,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class InvoicePosition extends Model
|
|||
public $guarded = [];
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Member, $this>
|
||||
* @return BelongsTo<Member, self>
|
||||
*/
|
||||
public function member(): BelongsTo
|
||||
{
|
||||
|
|
@ -24,7 +24,7 @@ class InvoicePosition extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Invoice, $this>
|
||||
* @return BelongsTo<Invoice, self>
|
||||
*/
|
||||
public function invoice(): BelongsTo
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,43 +4,43 @@ namespace App\Invoice\Scopes;
|
|||
|
||||
use App\Invoice\Enums\InvoiceStatus;
|
||||
use App\Invoice\Models\Invoice;
|
||||
use App\Lib\ScoutFilter;
|
||||
use Laravel\Scout\Builder;
|
||||
use App\Lib\Filter;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Spatie\LaravelData\Attributes\MapInputName;
|
||||
use Spatie\LaravelData\Attributes\MapOutputName;
|
||||
use Spatie\LaravelData\Mappers\SnakeCaseMapper;
|
||||
|
||||
/**
|
||||
* @extends ScoutFilter<Invoice>
|
||||
* @extends Filter<Invoice>
|
||||
*/
|
||||
#[MapInputName(SnakeCaseMapper::class)]
|
||||
#[MapOutputName(SnakeCaseMapper::class)]
|
||||
class InvoiceFilterScope extends ScoutFilter
|
||||
class InvoiceFilterScope extends Filter
|
||||
{
|
||||
/**
|
||||
* @param array<int, string> $statuses
|
||||
*/
|
||||
public function __construct(
|
||||
public ?array $statuses = null,
|
||||
public ?string $search = null
|
||||
) {
|
||||
$this->statuses = $this->statuses === null ? InvoiceStatus::defaultVisibleValues()->toArray() : $this->statuses;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function getQuery(): Builder
|
||||
public function apply(Builder $query): Builder
|
||||
{
|
||||
$this->search = $this->search ?: '';
|
||||
$query = $query->whereIn('status', $this->statuses);
|
||||
|
||||
return Invoice::search($this->search, function ($engine, string $query, array $options) {
|
||||
if (empty($this->statuses)) {
|
||||
$filter = 'status = "asa6aeruuni4BahC7Wei6ahm1"';
|
||||
} else {
|
||||
$filter = collect($this->statuses)->map(fn (string $status) => "status = \"$status\"")->join(' OR ');
|
||||
}
|
||||
return $engine->search($query, [...$options, 'filter' => $filter]);
|
||||
});
|
||||
return $query;
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function toDefault(): self
|
||||
{
|
||||
$this->statuses = $this->statuses === null ? InvoiceStatus::defaultVisibleValues()->toArray() : $this->statuses;
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Lib\Data;
|
||||
|
||||
use Spatie\LaravelData\Normalizers\Normalizer;
|
||||
use App\Lib\Normalizers\DateNormalizer;
|
||||
use Spatie\LaravelData\Data;
|
||||
use Spatie\LaravelData\Attributes\WithTransformer;
|
||||
use App\Lib\Transformers\DateTransformer;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class DateData extends Data
|
||||
{
|
||||
public function __construct(
|
||||
#[WithTransformer(DateTransformer::class)]
|
||||
public Carbon $raw,
|
||||
public string $human,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @return array<int, class-string<Normalizer>>
|
||||
*/
|
||||
public static function normalizers(): array
|
||||
{
|
||||
return [
|
||||
DateNormalizer::class,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Lib\Data;
|
||||
|
||||
use Spatie\LaravelData\Data;
|
||||
|
||||
class RecordData extends Data {
|
||||
|
||||
public function __construct(
|
||||
public int $id,
|
||||
public string $name,
|
||||
) {}
|
||||
|
||||
}
|
||||
|
|
@ -6,7 +6,6 @@ use Spatie\LaravelData\Data;
|
|||
use Spatie\LaravelData\DataCollection;
|
||||
use Spatie\MediaLibrary\MediaCollections\Models\Media;
|
||||
use Spatie\LaravelData\Attributes\DataCollectionOf;
|
||||
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
|
||||
|
||||
class Condition extends Data
|
||||
{
|
||||
|
|
@ -43,13 +42,4 @@ class Condition extends Data
|
|||
{
|
||||
return $this->mode === ConditionMode::ALL;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int, mixed> $arguments
|
||||
* @return DataEloquentCast<self>
|
||||
*/
|
||||
public static function castUsing(array $arguments): DataEloquentCast
|
||||
{
|
||||
return new DataEloquentCast(static::class, $arguments);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace App\Lib\Editor;
|
||||
|
||||
use Spatie\LaravelData\Data;
|
||||
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
|
||||
|
||||
/** @todo replace blocks with actual block data classes */
|
||||
class EditorData extends Data implements Editorable
|
||||
|
|
@ -14,7 +13,8 @@ class EditorData extends Data implements Editorable
|
|||
public string $version,
|
||||
public array $blocks,
|
||||
public int $time
|
||||
) {}
|
||||
) {
|
||||
}
|
||||
|
||||
public function placeholder(string $search, string $replacement): self
|
||||
{
|
||||
|
|
@ -29,12 +29,7 @@ class EditorData extends Data implements Editorable
|
|||
*/
|
||||
public function hasAll(array $wanted): bool
|
||||
{
|
||||
return collect($wanted)->doesntContain(fn($search) => !str(json_encode($this->blocks))->contains($search));
|
||||
}
|
||||
|
||||
public function hasNot(string $should): bool
|
||||
{
|
||||
return !str(json_encode($this->blocks))->contains($should);
|
||||
return collect($wanted)->first(fn ($search) => !str(json_encode($this->blocks))->contains($search)) === null;
|
||||
}
|
||||
|
||||
public static function default(): self
|
||||
|
|
@ -69,7 +64,7 @@ class EditorData extends Data implements Editorable
|
|||
'type' => 'list',
|
||||
'data' => [
|
||||
'style' => 'unordered',
|
||||
'items' => collect($replacements)->map(fn($replacement) => [
|
||||
'items' => collect($replacements)->map(fn ($replacement) => [
|
||||
'content' => $replacement,
|
||||
'items' => [],
|
||||
]),
|
||||
|
|
@ -88,13 +83,4 @@ class EditorData extends Data implements Editorable
|
|||
{
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int, mixed> $arguments
|
||||
* @return DataEloquentCast<self>
|
||||
*/
|
||||
public static function castUsing(array $arguments): DataEloquentCast
|
||||
{
|
||||
return new DataEloquentCast(static::class, $arguments);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,18 +8,16 @@ use Spatie\LaravelData\Data;
|
|||
|
||||
/**
|
||||
* @template T of Model
|
||||
* @property Builder<T> $query
|
||||
* @property Builder $query
|
||||
*/
|
||||
abstract class Filter extends Data
|
||||
{
|
||||
|
||||
/**
|
||||
* @param Builder<T> $query
|
||||
* @return Builder<T>
|
||||
*/
|
||||
abstract public function getQuery(): Builder;
|
||||
|
||||
/** @var Builder<T> */
|
||||
protected Builder $query;
|
||||
abstract public function apply(Builder $query): Builder;
|
||||
|
||||
/**
|
||||
* @param array<string, mixed>|string|null $request
|
||||
|
|
@ -38,6 +36,14 @@ abstract class Filter extends Data
|
|||
*/
|
||||
public static function fromPost(?array $post = null): static
|
||||
{
|
||||
return static::factory()->withoutMagicalCreation()->from($post ?: []);
|
||||
return static::factory()->withoutMagicalCreation()->from($post ?: [])->toDefault();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return static(self<T>)
|
||||
*/
|
||||
public function toDefault(): self
|
||||
{
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Lib;
|
||||
|
||||
use Spatie\LaravelData\PaginatedDataCollection;
|
||||
|
||||
/**
|
||||
* @mixin Spatie\LaravelData\Data
|
||||
*/
|
||||
trait HasDataMeta
|
||||
{
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public static function collectPages(mixed $items): array {
|
||||
$source = parent::collect($items, PaginatedDataCollection::class)->toArray();
|
||||
return [
|
||||
...parent::collect($items, PaginatedDataCollection::class)->toArray(),
|
||||
'meta' => [...$source['meta'], ...static::meta()]
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -2,9 +2,7 @@
|
|||
|
||||
namespace App\Lib;
|
||||
|
||||
/**
|
||||
* @mixin \Illuminate\Http\Resources\Json\JsonResource
|
||||
*/
|
||||
/** @mixin \Illuminate\Http\Resources\Json\JsonResource */
|
||||
trait HasMeta
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Lib\Normalizers;
|
||||
|
||||
use Spatie\LaravelData\Normalizers\Normalizer;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class DateNormalizer implements Normalizer
|
||||
{
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function normalize(mixed $value): ?array
|
||||
{
|
||||
if (!$value instanceof Carbon) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return [
|
||||
'raw' => $value,
|
||||
'human' => $value->format('d.m.Y'),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ use Spatie\LaravelData\Data;
|
|||
|
||||
/**
|
||||
* @template T of Model
|
||||
* @property Builder<T> $query
|
||||
* @property Builder $query
|
||||
*/
|
||||
abstract class ScoutFilter extends Data
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Lib\Transformers;
|
||||
|
||||
use Spatie\LaravelData\Transformers\Transformer;
|
||||
use Spatie\LaravelData\Support\DataProperty;
|
||||
use Spatie\LaravelData\Support\Transformation\TransformationContext;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class DateTransformer implements Transformer
|
||||
{
|
||||
public function transform(DataProperty $property, mixed $value, TransformationContext $context): string
|
||||
{
|
||||
return Carbon::parse($value)->format('Y-m-d');
|
||||
}
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ class ResyncAction
|
|||
*/
|
||||
public function getResults(Maildispatcher $dispatcher): Collection
|
||||
{
|
||||
return FilterScope::fromPost($dispatcher->filter)->noPageLimit()->getQuery()->get()
|
||||
return FilterScope::fromPost($dispatcher->filter)->getQuery()->get()
|
||||
->filter(fn ($member) => $member->email || $member->email_parents)
|
||||
->map(fn ($member) => MailEntry::from(['email' => $member->email ?: $member->email_parents]))
|
||||
->unique(fn ($member) => $member->email);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class Maildispatcher extends Model
|
|||
];
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Mailgateway, $this>
|
||||
* @return BelongsTo<Mailgateway, self>
|
||||
*/
|
||||
public function gateway(): BelongsTo
|
||||
{
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@ abstract class Type
|
|||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
* @return array<string, array<string, mixed>>
|
||||
*/
|
||||
public function toResource()
|
||||
public function toResource(): array
|
||||
{
|
||||
return [
|
||||
'cls' => get_class($this),
|
||||
|
|
@ -93,8 +93,8 @@ abstract class Type
|
|||
}
|
||||
|
||||
$this->list($name, $domain)
|
||||
->filter(fn ($listEntry) => $results->doesntContain(fn ($r) => $r->is($listEntry)))
|
||||
->each(fn ($listEntry) => $this->remove($name, $domain, $listEntry->email));
|
||||
->filter(fn ($listEntry) => $results->doesntContain(fn ($r) => $r->is($listEntry)))
|
||||
->each(fn ($listEntry) => $this->remove($name, $domain, $listEntry->email));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ use App\Member\Member;
|
|||
use App\Setting\NamiSettings;
|
||||
use App\Subactivity;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
use Zoomyboy\LaravelNami\Data\BankAccount;
|
||||
use Zoomyboy\LaravelNami\Data\Member as NamiMember;
|
||||
|
||||
class NamiPutMemberAction
|
||||
|
|
@ -48,16 +47,6 @@ class NamiPutMemberAction
|
|||
'id' => $member->nami_id,
|
||||
'version' => $member->version,
|
||||
'keepdata' => $member->keepdata,
|
||||
'bankAccount' => BankAccount::from([
|
||||
'bankName' => $member->bankAccount->bank_name,
|
||||
'id' => $member->bankAccount->nami_id,
|
||||
'memberId' => $member->mitgliedsnr,
|
||||
'iban' => $member->bankAccount->iban,
|
||||
'bic' => $member->bankAccount->bic,
|
||||
'blz' => $member->bankAccount->blz,
|
||||
'person' => $member->bankAccount->person,
|
||||
'accountNumber' => $member->bankAccount->account_number,
|
||||
]),
|
||||
]);
|
||||
$response = $api->putMember($namiMember, $activity ? $activity->nami_id : null, $subactivity ? $subactivity->nami_id : null);
|
||||
Member::withoutEvents(function () use ($response, $member) {
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Member;
|
||||
|
||||
use Database\Factories\Member\BankAccountFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class BankAccount extends Model
|
||||
{
|
||||
/** @use HasFactory<BankAccountFactory> */
|
||||
use HasFactory;
|
||||
|
||||
public $guarded = [];
|
||||
|
||||
public $primaryKey = 'member_id';
|
||||
}
|
||||
|
|
@ -9,8 +9,7 @@ use Zoomyboy\LaravelNami\Data\Member as NamiMember;
|
|||
use Zoomyboy\LaravelNami\Data\MembershipEntry as NamiMembershipEntry;
|
||||
use Spatie\LaravelData\Attributes\DataCollectionOf;
|
||||
|
||||
class FullMember extends Data
|
||||
{
|
||||
class FullMember extends Data {
|
||||
/**
|
||||
* @param DataCollection<int, NamiCourse> $courses
|
||||
* @param DataCollection<int, NamiMembershipEntry> $memberships
|
||||
|
|
@ -21,6 +20,6 @@ class FullMember extends Data
|
|||
public DataCollection $courses,
|
||||
#[DataCollectionOf(NamiMembershipEntry::class)]
|
||||
public DataCollection $memberships,
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Member\Data;
|
||||
|
||||
use Spatie\LaravelData\Data;
|
||||
use App\Member\Member;
|
||||
|
||||
class MemberData extends Data
|
||||
{
|
||||
|
||||
public function __construct(
|
||||
public string $fullname,
|
||||
) {}
|
||||
|
||||
public static function fromModel(Member $member): static
|
||||
{
|
||||
return static::factory()->withoutMagicalCreation()->from([
|
||||
'fullname' => $member->fullname
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Member\Data;
|
||||
|
||||
use App\Activity;
|
||||
use App\Group;
|
||||
use Spatie\LaravelData\Data;
|
||||
use App\Lib\Data\DateData;
|
||||
use App\Lib\Data\RecordData;
|
||||
use App\Lib\HasDataMeta;
|
||||
use App\Member\Membership;
|
||||
use App\Membership\FilterScope;
|
||||
use App\Subactivity;
|
||||
|
||||
class MembershipData extends Data
|
||||
{
|
||||
|
||||
use HasDataMeta;
|
||||
|
||||
/**
|
||||
* @param array<string, string> $links
|
||||
*/
|
||||
public function __construct(
|
||||
public int $id,
|
||||
public RecordData $activity,
|
||||
public ?RecordData $subactivity,
|
||||
public RecordData $group,
|
||||
public ?DateData $promisedAt,
|
||||
public DateData $from,
|
||||
public ?DateData $to,
|
||||
public MemberData $member,
|
||||
public bool $isActive,
|
||||
public array $links,
|
||||
) {}
|
||||
|
||||
public static function fromModel(Membership $membership): static
|
||||
{
|
||||
return static::factory()->withoutMagicalCreation()->from([
|
||||
'id' => $membership->id,
|
||||
'activity' => $membership->activity,
|
||||
'subactivity' => $membership->subactivity,
|
||||
'isActive' => $membership->isActive(),
|
||||
'from' => $membership->from,
|
||||
'to' => $membership->to,
|
||||
'group' => $membership->group,
|
||||
'promisedAt' => $membership->promised_at,
|
||||
'member' => $membership->member,
|
||||
'links' => [
|
||||
'update' => route('membership.update', $membership),
|
||||
'destroy' => route('membership.destroy', $membership),
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public static function meta(): array {
|
||||
return [
|
||||
'activities' => RecordData::collect(Activity::get()),
|
||||
'subactivities' => RecordData::collect(Subactivity::get()),
|
||||
'groups' => RecordData::collect(Group::get()),
|
||||
'filter' => FilterScope::fromRequest(request()->input('filter', '')),
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -46,9 +46,8 @@ class FilterScope extends ScoutFilter
|
|||
public array $exclude = [],
|
||||
public ?bool $hasFullAddress = null,
|
||||
public ?bool $hasBirthday = null,
|
||||
public ?bool $hasSvk = null,
|
||||
public ?bool $hasVk = null,
|
||||
) {}
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $options
|
||||
|
|
@ -86,12 +85,6 @@ class FilterScope extends ScoutFilter
|
|||
if ($this->hasBirthday === true) {
|
||||
$filter->push('birthday IS NOT NULL');
|
||||
}
|
||||
if ($this->hasSvk !== null) {
|
||||
$filter->push('has_svk = ' . ($this->hasSvk ? 'true' : 'false'));
|
||||
}
|
||||
if ($this->hasVk !== null) {
|
||||
$filter->push('has_vk = ' . ($this->hasVk ? 'true' : 'false'));
|
||||
}
|
||||
if ($this->ausstand === true) {
|
||||
$filter->push('ausstand > 0');
|
||||
}
|
||||
|
|
@ -109,20 +102,20 @@ class FilterScope extends ScoutFilter
|
|||
}
|
||||
if ($this->subactivityIds && $this->activityIds) {
|
||||
$combinations = $this->combinations($this->activityIds, $this->subactivityIds)
|
||||
->map(fn($combination) => implode('|', $combination))
|
||||
->map(fn($combination) => str($combination)->wrap('"'));
|
||||
->map(fn ($combination) => implode('|', $combination))
|
||||
->map(fn ($combination) => str($combination)->wrap('"'));
|
||||
$filter->push($this->inExpression('memberships.both', $combinations));
|
||||
}
|
||||
|
||||
foreach ($this->memberships as $membership) {
|
||||
$filter->push($this->inExpression('memberships.with_group', $this->possibleValuesForMembership($membership)->map(fn($value) => str($value)->wrap('"'))));
|
||||
$filter->push($this->inExpression('memberships.with_group', $this->possibleValuesForMembership($membership)->map(fn ($value) => str($value)->wrap('"'))));
|
||||
}
|
||||
|
||||
if (count($this->exclude)) {
|
||||
$filter->push($this->notInExpression('id', $this->exclude));
|
||||
}
|
||||
|
||||
$andFilter = $filter->map(fn($expression) => "($expression)")->implode(' AND ');
|
||||
$andFilter = $filter->map(fn ($expression) => "($expression)")->implode(' AND ');
|
||||
|
||||
$options['filter'] = $this->implode(collect([$andFilter])->push($this->inExpression('id', $this->include)), 'OR');
|
||||
$options['sort'] = ['lastname:asc', 'firstname:asc'];
|
||||
|
|
@ -136,7 +129,7 @@ class FilterScope extends ScoutFilter
|
|||
*/
|
||||
protected function implode(Collection $values, string $between): string
|
||||
{
|
||||
return $values->filter(fn($expression) => $expression)->implode(" {$between} ");
|
||||
return $values->filter(fn ($expression) => $expression)->implode(" {$between} ");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -176,7 +169,7 @@ class FilterScope extends ScoutFilter
|
|||
$membership['activity_ids'] = count($membership['activity_ids']) === 0 ? Activity::pluck('id')->toArray() : $membership['activity_ids'];
|
||||
$membership['subactivity_ids'] = count($membership['subactivity_ids']) === 0 ? Subactivity::pluck('id')->toArray() : $membership['subactivity_ids'];
|
||||
return $this->combinations($membership['group_ids'], $membership['activity_ids'], $membership['subactivity_ids'])
|
||||
->map(fn($combination) => collect($combination)->implode('|'));
|
||||
->map(fn ($combination) => collect($combination)->implode('|'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -190,7 +183,7 @@ class FilterScope extends ScoutFilter
|
|||
|
||||
if (!count($otherParts)) {
|
||||
/** @var Collection<int, Collection<int, int>> */
|
||||
return collect($firstPart)->map(fn($p) => [$p]);
|
||||
return collect($firstPart)->map(fn ($p) => [$p]);
|
||||
}
|
||||
|
||||
/** @var Collection<int, mixed> */
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ use App\Nami\HasNamiField;
|
|||
use App\Nationality;
|
||||
use App\Payment\Subscription;
|
||||
use App\Pdf\Sender;
|
||||
use App\Prevention\Contracts\Preventable;
|
||||
use App\Prevention\Data\PreventionData;
|
||||
use App\Region;
|
||||
use App\Setting\NamiSettings;
|
||||
use Carbon\Carbon;
|
||||
|
|
@ -36,15 +34,12 @@ use Zoomyboy\Osm\HasGeolocation;
|
|||
use Zoomyboy\Phone\HasPhoneNumbers;
|
||||
use App\Prevention\Enums\Prevention;
|
||||
use Database\Factories\Member\MemberFactory;
|
||||
use Illuminate\Database\Eloquent\Relations\HasOne;
|
||||
use Illuminate\Support\Collection;
|
||||
use stdClass;
|
||||
|
||||
/**
|
||||
* @property string $subscription_name
|
||||
* @property int $pending_payment
|
||||
*/
|
||||
class Member extends Model implements Geolocatable, Preventable
|
||||
class Member extends Model implements Geolocatable
|
||||
{
|
||||
use Notifiable;
|
||||
use HasNamiField;
|
||||
|
|
@ -195,30 +190,12 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
|
||||
protected function getAusstand(): int
|
||||
{
|
||||
return (int) $this->invoicePositions()->whereHas('invoice', fn($query) => $query->whereNeedsPayment())->sum('price');
|
||||
}
|
||||
|
||||
public function getMailRecipient(): ?stdClass
|
||||
{
|
||||
if (!$this->fullname) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!$this->email) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (object) ['name' => $this->fullname, 'email' => $this->email];
|
||||
}
|
||||
|
||||
public function preventableSubject(): string
|
||||
{
|
||||
return 'Nachweise erforderlich';
|
||||
return (int) $this->invoicePositions()->whereHas('invoice', fn ($query) => $query->whereNeedsPayment())->sum('price');
|
||||
}
|
||||
|
||||
// ---------------------------------- Relations ----------------------------------
|
||||
/**
|
||||
* @return BelongsTo<Country, $this>
|
||||
* @return BelongsTo<Country, self>
|
||||
*/
|
||||
public function country(): BelongsTo
|
||||
{
|
||||
|
|
@ -226,7 +203,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Gender, $this>
|
||||
* @return BelongsTo<Gender, self>
|
||||
*/
|
||||
public function gender(): BelongsTo
|
||||
{
|
||||
|
|
@ -234,7 +211,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Region, $this>
|
||||
* @return BelongsTo<Region, self>
|
||||
*/
|
||||
public function region(): BelongsTo
|
||||
{
|
||||
|
|
@ -245,7 +222,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<InvoicePosition, $this>
|
||||
* @return HasMany<InvoicePosition>
|
||||
*/
|
||||
public function invoicePositions(): HasMany
|
||||
{
|
||||
|
|
@ -253,7 +230,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Confession, $this>
|
||||
* @return BelongsTo<Confession, self>
|
||||
*/
|
||||
public function confession(): BelongsTo
|
||||
{
|
||||
|
|
@ -261,7 +238,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Nationality, $this>
|
||||
* @return BelongsTo<Nationality, self>
|
||||
*/
|
||||
public function nationality(): BelongsTo
|
||||
{
|
||||
|
|
@ -269,7 +246,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Subscription, $this>
|
||||
* @return BelongsTo<Subscription, self>
|
||||
*/
|
||||
public function subscription(): BelongsTo
|
||||
{
|
||||
|
|
@ -277,7 +254,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Group, $this>
|
||||
* @return BelongsTo<Group, self>
|
||||
*/
|
||||
public function group(): BelongsTo
|
||||
{
|
||||
|
|
@ -285,7 +262,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<CourseMember, $this>
|
||||
* @return HasMany<CourseMember>
|
||||
*/
|
||||
public function courses(): HasMany
|
||||
{
|
||||
|
|
@ -293,7 +270,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<Membership, $this>
|
||||
* @return HasMany<Membership>
|
||||
*/
|
||||
public function memberships(): HasMany
|
||||
{
|
||||
|
|
@ -301,7 +278,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<Membership, $this>
|
||||
* @return HasMany<Membership>
|
||||
*/
|
||||
public function leaderMemberships(): HasMany
|
||||
{
|
||||
|
|
@ -309,34 +286,21 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<Membership, $this>
|
||||
* @return HasMany<Membership>
|
||||
*/
|
||||
public function ageGroupMemberships(): HasMany
|
||||
{
|
||||
return $this->memberships()->isAgeGroup()->active();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return HasOne<BankAccount, $this>
|
||||
*/
|
||||
public function bankAccount(): HasOne
|
||||
{
|
||||
return $this->hasOne(BankAccount::class);
|
||||
}
|
||||
|
||||
public static function booted()
|
||||
{
|
||||
static::created(function (self $model): void {
|
||||
$model->bankAccount()->create([]);
|
||||
});
|
||||
|
||||
static::deleting(function (self $model): void {
|
||||
$model->memberships->each->delete();
|
||||
$model->courses->each->delete();
|
||||
$model->invoicePositions->each(function ($position) {
|
||||
$position->delete();
|
||||
});
|
||||
$model->bankAccount()->delete();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -361,7 +325,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
return $query->addSelect([
|
||||
'pending_payment' => InvoicePosition::selectRaw('SUM(price)')
|
||||
->whereColumn('invoice_positions.member_id', 'members.id')
|
||||
->whereHas('invoice', fn($query) => $query->whereNeedsPayment()),
|
||||
->whereHas('invoice', fn ($query) => $query->whereNeedsPayment()),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -372,7 +336,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
*/
|
||||
public function scopeWhereHasPendingPayment(Builder $query): Builder
|
||||
{
|
||||
return $query->whereHas('invoicePositions', fn($q) => $q->whereHas('invoice', fn($q) => $q->whereNeedsPayment()));
|
||||
return $query->whereHas('invoicePositions', fn ($q) => $q->whereHas('invoice', fn ($q) => $q->whereNeedsPayment()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -386,47 +350,32 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
* @return array<int, Prevention>
|
||||
*/
|
||||
public function preventions(?Carbon $date = null): Collection
|
||||
public function preventions(?Carbon $date = null): array
|
||||
{
|
||||
$date = $date ?: now();
|
||||
|
||||
/** @var Collection<int, PreventionData> */
|
||||
$preventions = collect([]);
|
||||
/** @var array<int, Prevention> */
|
||||
$preventions = [];
|
||||
|
||||
if ($this->efz === null || $this->efz->diffInYears($date) >= 5) {
|
||||
$preventions->push(PreventionData::from([
|
||||
'type' => Prevention::EFZ,
|
||||
'expires' => $this->efz === null ? now() : $this->efz->addYears(5)
|
||||
]));
|
||||
$preventions[] = Prevention::EFZ;
|
||||
}
|
||||
|
||||
if (!$this->has_vk) {
|
||||
$preventions->push(PreventionData::from([
|
||||
'type' => Prevention::VK,
|
||||
'expires' => now(),
|
||||
]));
|
||||
$preventions[] = Prevention::VK;
|
||||
}
|
||||
|
||||
if ($this->more_ps_at === null) {
|
||||
if ($this->ps_at === null) {
|
||||
$preventions->push(PreventionData::from([
|
||||
'type' => Prevention::PS,
|
||||
'expires' => now(),
|
||||
]));
|
||||
$preventions[] = Prevention::PS;
|
||||
} else if ($this->ps_at->diffInYears($date) >= 5) {
|
||||
$preventions->push(PreventionData::from([
|
||||
'type' => Prevention::MOREPS,
|
||||
'expires' => $this->ps_at->addYears(5),
|
||||
]));
|
||||
$preventions[] = Prevention::MOREPS;
|
||||
}
|
||||
} else {
|
||||
if ($this->more_ps_at === null || $this->more_ps_at->diffInYears($date) >= 5) {
|
||||
$preventions->push(PreventionData::from([
|
||||
'type' => Prevention::MOREPS,
|
||||
'expires' => $this->more_ps_at->addYears(5),
|
||||
]));
|
||||
$preventions[] = Prevention::MOREPS;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -536,7 +485,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
'name' => $this->fullname,
|
||||
'address' => $this->address,
|
||||
'zipLocation' => $this->zip . ' ' . $this->location,
|
||||
'mglnr' => Lazy::create(fn() => 'Mglnr.: ' . $this->nami_id),
|
||||
'mglnr' => Lazy::create(fn () => 'Mglnr.: ' . $this->nami_id),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -545,7 +494,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
*/
|
||||
public static function forSelect(): array
|
||||
{
|
||||
return static::select(['id', 'firstname', 'lastname'])->get()->map(fn($member) => ['id' => $member->id, 'name' => $member->fullname])->toArray();
|
||||
return static::select(['id', 'firstname', 'lastname'])->get()->map(fn ($member) => ['id' => $member->id, 'name' => $member->fullname])->toArray();
|
||||
}
|
||||
|
||||
// -------------------------------- Geolocation --------------------------------
|
||||
|
|
@ -595,8 +544,6 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
'bill_kind' => $this->bill_kind?->value,
|
||||
'group_id' => $this->group->id,
|
||||
'group_name' => $this->group->inner_name ?: $this->group->name,
|
||||
'has_vk' => $this->has_vk,
|
||||
'has_svk' => $this->has_svk,
|
||||
'links' => [
|
||||
'show' => route('member.show', ['member' => $this], false),
|
||||
'edit' => route('member.edit', ['member' => $this], false),
|
||||
|
|
@ -604,7 +551,7 @@ class Member extends Model implements Geolocatable, Preventable
|
|||
'age_group_icon' => $this->ageGroupMemberships->first()?->subactivity->slug,
|
||||
'is_leader' => $this->leaderMemberships()->count() > 0,
|
||||
'memberships' => $this->memberships()->active()->get()
|
||||
->map(fn($membership) => [...$membership->only('activity_id', 'subactivity_id'), 'both' => $membership->activity_id . '|' . $membership->subactivity_id, 'with_group' => $membership->group_id . '|' . $membership->activity_id . '|' . $membership->subactivity_id]),
|
||||
->map(fn ($membership) => [...$membership->only('activity_id', 'subactivity_id'), 'both' => $membership->activity_id . '|' . $membership->subactivity_id, 'with_group' => $membership->group_id . '|' . $membership->activity_id . '|' . $membership->subactivity_id]),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class MemberController extends Controller
|
|||
session()->put('title', "Mitglied {$member->firstname} {$member->lastname} bearbeiten");
|
||||
|
||||
return Inertia::render('member/VForm', [
|
||||
'data' => new MemberResource($member->load('bankAccount')),
|
||||
'data' => new MemberResource($member),
|
||||
'mode' => 'edit',
|
||||
'conflict' => '1' === $request->query('conflict', '0'),
|
||||
'meta' => MemberResource::meta(),
|
||||
|
|
|
|||
|
|
@ -84,24 +84,16 @@ class MemberRequest extends FormRequest
|
|||
'salutation' => '',
|
||||
'comment' => '',
|
||||
'keepdata' => 'boolean',
|
||||
'bank_account' => 'array',
|
||||
'bank_account.iban' => 'nullable|string|max:255',
|
||||
'bank_account.bic' => 'nullable|string|max:255',
|
||||
'bank_account.blz' => 'nullable|string|max:255',
|
||||
'bank_account.bank_name' => 'nullable|string|max:255',
|
||||
'bank_account.person' => 'nullable|string|max:255',
|
||||
'bank_account.account_number' => 'nullable|string|max:255',
|
||||
];
|
||||
}
|
||||
|
||||
public function persistCreate(NamiSettings $settings): void
|
||||
{
|
||||
$member = new Member([
|
||||
...$this->dataToInsert(),
|
||||
...$this->validated(),
|
||||
'group_id' => Group::where('nami_id', $settings->default_group_id)->firstOrFail()->id,
|
||||
]);
|
||||
$member->updatePhoneNumbers()->save();
|
||||
$member->bankAccount->update($this->validated('bank_account'));
|
||||
|
||||
if ($this->input('has_nami')) {
|
||||
$this->storeFreshMemberInNami($member);
|
||||
|
|
@ -120,12 +112,11 @@ class MemberRequest extends FormRequest
|
|||
|
||||
public function persistUpdate(Member $member): void
|
||||
{
|
||||
$member->fill($this->dataToInsert())->updatePhoneNumbers();
|
||||
$member->fill($this->validated())->updatePhoneNumbers();
|
||||
|
||||
$namiSync = $member->isDirty(Member::$namiFields);
|
||||
|
||||
$member->save();
|
||||
$member->bankAccount->update($this->validated('bank_account'));
|
||||
|
||||
if ($this->input('has_nami') && null === $member->nami_id) {
|
||||
$this->storeFreshMemberInNami($member);
|
||||
|
|
@ -168,12 +159,4 @@ class MemberRequest extends FormRequest
|
|||
$when = fn () => true === $request->input('has_nami') && ($member === null || !$member->has_nami);
|
||||
$validator->sometimes($attribute, $rules, $when);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
protected function dataToInsert(): array
|
||||
{
|
||||
return $this->safe()->except('bank_account');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ use App\Invoice\BillKind;
|
|||
use App\Invoice\Resources\InvoicePositionResource;
|
||||
use App\Lib\HasMeta;
|
||||
use App\Member\Data\NestedGroup;
|
||||
use App\Member\Resources\BankAccountResource;
|
||||
use App\Member\Resources\NationalityResource;
|
||||
use App\Member\Resources\RegionResource;
|
||||
use App\Membership\MembershipResource;
|
||||
|
|
@ -108,7 +107,6 @@ class MemberResource extends JsonResource
|
|||
'lon' => $this->lon,
|
||||
'group_name' => $this->group->name,
|
||||
'keepdata' => $this->keepdata,
|
||||
'bank_account' => new BankAccountResource($this->whenLoaded('bankAccount')),
|
||||
'links' => [
|
||||
'membership_index' => route('member.membership.index', ['member' => $this->getModel()]),
|
||||
'invoiceposition_index' => route('member.invoice-position.index', ['member' => $this->getModel()]),
|
||||
|
|
@ -133,11 +131,11 @@ class MemberResource extends JsonResource
|
|||
}
|
||||
|
||||
$activities = Activity::with('subactivities')->get();
|
||||
$createActivities = Activity::remote()->with(['subactivities' => fn($q) => $q->remote()])->get();
|
||||
$createActivities = Activity::remote()->with(['subactivities' => fn ($q) => $q->remote()])->get();
|
||||
|
||||
return [
|
||||
'filterActivities' => Activity::where('is_filterable', true)->get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
|
||||
'filterSubactivities' => Subactivity::where('is_filterable', true)->get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
|
||||
'filterActivities' => Activity::where('is_filterable', true)->pluck('name', 'id'),
|
||||
'filterSubactivities' => Subactivity::where('is_filterable', true)->pluck('name', 'id'),
|
||||
'formActivities' => $activities->pluck('name', 'id'),
|
||||
'formSubactivities' => $activities->map(function (Activity $activity) {
|
||||
return ['subactivities' => $activity->subactivities->pluck('name', 'id'), 'id' => $activity->id];
|
||||
|
|
@ -155,7 +153,7 @@ class MemberResource extends JsonResource
|
|||
'genders' => Gender::pluck('name', 'id'),
|
||||
'billKinds' => BillKind::forSelect(),
|
||||
'nationalities' => Nationality::pluck('name', 'id'),
|
||||
'members' => Member::ordered()->get()->map(fn($member) => ['id' => $member->id, 'name' => $member->fullname]),
|
||||
'members' => Member::ordered()->get()->map(fn ($member) => ['id' => $member->id, 'name' => $member->fullname]),
|
||||
'links' => [
|
||||
'index' => route('member.index'),
|
||||
'create' => route('member.create'),
|
||||
|
|
@ -165,10 +163,6 @@ class MemberResource extends JsonResource
|
|||
'activity_ids' => [],
|
||||
'subactivity_ids' => []
|
||||
],
|
||||
'boolean_filter' => [
|
||||
['id' => true, 'name' => 'Ja'],
|
||||
['id' => false, 'name' => 'Nein'],
|
||||
],
|
||||
'default' => [
|
||||
'gender_id' => null,
|
||||
'salutation' => '',
|
||||
|
|
@ -210,14 +204,6 @@ class MemberResource extends JsonResource
|
|||
'multiply_pv' => false,
|
||||
'multiply_more_pv' => false,
|
||||
'keepdata' => false,
|
||||
'bank_account' => [
|
||||
'iban' => '',
|
||||
'bic' => '',
|
||||
'blz' => '',
|
||||
'bank_name' => '',
|
||||
'person' => '',
|
||||
'account_number' => '',
|
||||
]
|
||||
]
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class Membership extends Model
|
|||
];
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Activity, $this>
|
||||
* @return BelongsTo<Activity, self>
|
||||
*/
|
||||
public function activity(): BelongsTo
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ class Membership extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Group, $this>
|
||||
* @return BelongsTo<Group, self>
|
||||
*/
|
||||
public function group(): BelongsTo
|
||||
{
|
||||
|
|
@ -48,7 +48,7 @@ class Membership extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Subactivity, $this>
|
||||
* @return BelongsTo<Subactivity, self>
|
||||
*/
|
||||
public function subactivity(): BelongsTo
|
||||
{
|
||||
|
|
@ -56,7 +56,7 @@ class Membership extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Member, $this>
|
||||
* @return BelongsTo<Member, self>
|
||||
*/
|
||||
public function member(): BelongsTo
|
||||
{
|
||||
|
|
@ -79,19 +79,6 @@ class Membership extends Model
|
|||
->where(fn ($query) => $query->whereNull('to')->orWhere('to', '>=', now()));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Builder<Membership> $query
|
||||
*
|
||||
* @return Builder<Membership>
|
||||
*/
|
||||
public function scopeInactive(Builder $query): Builder
|
||||
{
|
||||
return $query->where(fn ($q) => $q
|
||||
->orWhere('from', '>=', now())
|
||||
->orWhere('to', '<=', now())
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Builder<Membership> $query
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Member\Resources;
|
||||
|
||||
use App\Member\BankAccount;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
/**
|
||||
* @mixin BankAccount
|
||||
*/
|
||||
class BankAccountResource extends JsonResource
|
||||
{
|
||||
/**
|
||||
* Transform the resource into an array.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
*
|
||||
* @return array<string, int|string>
|
||||
*/
|
||||
public function toArray($request)
|
||||
{
|
||||
return [
|
||||
'iban' => $this->iban,
|
||||
'bic' => $this->bic,
|
||||
'blz' => $this->blz,
|
||||
'bank_name' => $this->bank_name,
|
||||
'person' => $this->person,
|
||||
'account_number' => $this->account_number,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Collection;
|
|||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
||||
class MemberIndexAction
|
||||
class IndexAction
|
||||
{
|
||||
use AsAction;
|
||||
|
||||
|
|
@ -10,7 +10,6 @@ use App\Maildispatcher\Actions\ResyncAction;
|
|||
use App\Member\Member;
|
||||
use App\Member\Membership;
|
||||
use App\Subactivity;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
|
@ -21,18 +20,13 @@ class MassStoreAction
|
|||
use TracksJob;
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
* @return array<string, string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'group_id' => 'required|numeric|exists:groups,id',
|
||||
'activity_id' => ['required', 'numeric', 'exists:activities,id', function($key, $value, $fail) {
|
||||
$activity = Activity::findOrFail($value);
|
||||
if ($activity->subactivities->pluck('id')->doesntContain(request()->subactivity_id)) {
|
||||
return $fail(':attribute ist nicht vorhanden.');
|
||||
}
|
||||
}],
|
||||
'activity_id' => 'required|numeric|exists:activities,id',
|
||||
'subactivity_id' => 'required|numeric|exists:subactivities,id',
|
||||
'members' => 'array',
|
||||
'members.*' => 'numeric|exists:members,id',
|
||||
|
|
@ -54,7 +48,9 @@ class MassStoreAction
|
|||
Membership::where($attributes)->active()->whereNotIn('member_id', $members)->get()
|
||||
->each(fn ($membership) => MembershipDestroyAction::run($membership->id));
|
||||
|
||||
Member::whereIn('id', $members)->whereDoesntHave('memberships', fn ($q) => $q->where($attributes))->get()
|
||||
collect($members)
|
||||
->except(Membership::where($attributes)->active()->pluck('member_id'))
|
||||
->map(fn ($memberId) => Member::findOrFail($memberId))
|
||||
->each(fn ($member) => MembershipStoreAction::run(
|
||||
$member,
|
||||
$activity,
|
||||
|
|
@ -63,11 +59,12 @@ class MassStoreAction
|
|||
null,
|
||||
));
|
||||
|
||||
|
||||
ResyncAction::dispatch();
|
||||
});
|
||||
}
|
||||
|
||||
public function asController(ActionRequest $request): JsonResponse
|
||||
public function asController(ActionRequest $request): void
|
||||
{
|
||||
/**
|
||||
* @var array{members: array<int, int>, group_id: int, activity_id: int, subactivity_id: int}
|
||||
|
|
@ -80,19 +77,6 @@ class MassStoreAction
|
|||
Subactivity::findOrFail($input['subactivity_id']),
|
||||
$input['members'],
|
||||
);
|
||||
|
||||
return response()->json([], 200);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
public function getValidationAttributes(): array {
|
||||
return [
|
||||
'activity_id' => 'Tätigkeit',
|
||||
'subactivity_id' => 'Untertätigkeit',
|
||||
'group_id' => 'Gruppe',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Membership\Actions;
|
||||
|
||||
use App\Member\Data\MembershipData;
|
||||
use App\Membership\FilterScope;
|
||||
use Inertia\Inertia;
|
||||
use Inertia\Response;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
||||
class MembershipIndexAction
|
||||
{
|
||||
use AsAction;
|
||||
|
||||
public function asController(ActionRequest $request): Response
|
||||
{
|
||||
return Inertia::render(
|
||||
'membership/Index',
|
||||
['data' => MembershipData::collectPages(FilterScope::fromRequest($request->input('filter', ''))->getQuery()->paginate(20))]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Membership;
|
||||
|
||||
use App\Lib\Filter;
|
||||
use App\Member\Membership;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
|
||||
/**
|
||||
* @extends Filter<Membership>
|
||||
*/
|
||||
class FilterScope extends Filter
|
||||
{
|
||||
/**
|
||||
* @param array<int, int> $activities
|
||||
* @param array<int, int> $subactivities
|
||||
* @param array<int, int> $groups
|
||||
*/
|
||||
public function __construct(
|
||||
public array $activities = [],
|
||||
public array $subactivities = [],
|
||||
public array $groups = [],
|
||||
public ?bool $active = true,
|
||||
) {}
|
||||
|
||||
public function getQuery(): Builder
|
||||
{
|
||||
$query = Membership::orderByRaw('member_id, activity_id, subactivity_id');
|
||||
|
||||
if ($this->active === true) {
|
||||
$query = $query->active();
|
||||
}
|
||||
|
||||
if ($this->active === false) {
|
||||
$query = $query->inactive();
|
||||
}
|
||||
|
||||
if (count($this->groups)) {
|
||||
$query = $query->whereIn('group_id', $this->groups);
|
||||
}
|
||||
|
||||
if (count($this->activities)) {
|
||||
$query = $query->whereIn('activity_id', $this->activities);
|
||||
}
|
||||
|
||||
if (count($this->subactivities)) {
|
||||
$query = $query->whereIn('subactivity_id', $this->subactivities);
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
}
|
||||
|
|
@ -14,6 +14,9 @@ class Subscription extends Model
|
|||
/** @use HasFactory<SubscriptionFactory> */
|
||||
use HasFactory;
|
||||
|
||||
/**
|
||||
* @var array<int, string>
|
||||
*/
|
||||
public $fillable = ['name', 'fee_id'];
|
||||
|
||||
public function getAmount(): int
|
||||
|
|
@ -22,7 +25,7 @@ class Subscription extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<Fee, $this>
|
||||
* @return BelongsTo<Fee, self>
|
||||
*/
|
||||
public function fee(): BelongsTo
|
||||
{
|
||||
|
|
@ -30,7 +33,7 @@ class Subscription extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @return HasMany<SubscriptionChild, $this>
|
||||
* @return HasMany<SubscriptionChild>
|
||||
*/
|
||||
public function children(): HasMany
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Prevention\Actions;
|
||||
|
||||
use App\Prevention\Enums\Prevention;
|
||||
use App\Prevention\PreventionSettings;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
|
@ -14,10 +13,7 @@ class SettingApiAction
|
|||
public function handle(): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
'data' => app(PreventionSettings::class)->toFrontend(),
|
||||
'meta' => [
|
||||
'preventAgainsts' => Prevention::values(),
|
||||
]
|
||||
'data' => app(PreventionSettings::class)->toArray(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace App\Prevention\Actions;
|
|||
|
||||
use App\Lib\Editor\EditorData;
|
||||
use App\Lib\Events\Succeeded;
|
||||
use App\Member\FilterScope;
|
||||
use App\Prevention\PreventionSettings;
|
||||
use Lorisleiva\Actions\ActionRequest;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
|
@ -20,10 +19,6 @@ class SettingStoreAction
|
|||
{
|
||||
return [
|
||||
'formmail' => 'array',
|
||||
'yearlymail' => 'array',
|
||||
'weeks' => 'required|numeric|gte:0',
|
||||
'freshRememberInterval' => 'required|numeric|gte:0',
|
||||
'active' => 'boolean',
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -31,12 +26,6 @@ class SettingStoreAction
|
|||
{
|
||||
$settings = app(PreventionSettings::class);
|
||||
$settings->formmail = EditorData::from($request->formmail);
|
||||
$settings->yearlymail = EditorData::from($request->yearlymail);
|
||||
$settings->weeks = $request->weeks;
|
||||
$settings->freshRememberInterval = $request->freshRememberInterval;
|
||||
$settings->active = $request->active;
|
||||
$settings->yearlyMemberFilter = FilterScope::from($request->yearlyMemberFilter);
|
||||
$settings->preventAgainst = $request->preventAgainst;
|
||||
$settings->save();
|
||||
|
||||
Succeeded::message('Einstellungen gespeichert.')->dispatch();
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Prevention\Actions;
|
||||
|
||||
use App\Member\Member;
|
||||
use App\Prevention\Data\PreventionData;
|
||||
use App\Prevention\Mails\YearlyMail;
|
||||
use App\Prevention\PreventionSettings;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Lorisleiva\Actions\Concerns\AsAction;
|
||||
|
||||
class YearlyRememberAction
|
||||
{
|
||||
use AsAction;
|
||||
|
||||
public string $commandSignature = 'prevention:remember-yearly';
|
||||
|
||||
public function handle(): void
|
||||
{
|
||||
$settings = app(PreventionSettings::class);
|
||||
$expireDate = now()->addWeeks($settings->weeks);
|
||||
|
||||
if (!$settings->active) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($settings->yearlyMemberFilter->getQuery()->get() as $member) {
|
||||
// @todo add this check to FilterScope
|
||||
if ($member->getMailRecipient() === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$noticePreventions = $member->preventions($expireDate)
|
||||
->filter(fn($prevention) => $prevention->expiresAt($expireDate))
|
||||
->filter(fn($p) => $p->appliesToSettings($settings));
|
||||
|
||||
if ($noticePreventions->count() === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Mail::send($this->createMail($member, $noticePreventions));
|
||||
}
|
||||
|
||||
foreach ($settings->yearlyMemberFilter->getQuery()->get() as $member) {
|
||||
// @todo add this check to FilterScope
|
||||
if ($member->getMailRecipient() === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$preventions = $member->preventions()
|
||||
->filter(fn($prevention) => $prevention->expiresAt(now()))
|
||||
->filter(fn($p) => $p->appliesToSettings($settings));
|
||||
|
||||
if ($preventions->count() === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Cache::remember(
|
||||
'prevention-' . $member->id,
|
||||
(int) now()->diffInSeconds(now()->addWeeks($settings->freshRememberInterval)),
|
||||
function () use ($member, $preventions) {
|
||||
Mail::send($this->createMail($member, $preventions));
|
||||
return 0;
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Collection<int, PreventionData> $preventions
|
||||
*/
|
||||
protected function createMail(Member $member, Collection $preventions): YearlyMail
|
||||
{
|
||||
$body = app(PreventionSettings::class)->refresh()->yearlymail;
|
||||
return new YearlyMail($member, $body, $preventions);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
namespace App\Prevention\Contracts;
|
||||
|
||||
use App\Prevention\Data\PreventionData;
|
||||
use Illuminate\Support\Collection;
|
||||
use App\Prevention\Enums\Prevention;
|
||||
use stdClass;
|
||||
|
||||
interface Preventable
|
||||
{
|
||||
|
||||
public function preventableLayout(): string;
|
||||
public function preventableSubject(): string;
|
||||
|
||||
/**
|
||||
* @return Collection<int, PreventionData>
|
||||
* @return array<int, Prevention>
|
||||
*/
|
||||
public function preventions(): Collection;
|
||||
public function preventions(): array;
|
||||
|
||||
public function getMailRecipient(): ?stdClass;
|
||||
public function getMailRecipient(): stdClass;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace App\Prevention\Data;
|
||||
|
||||
use App\Prevention\Enums\Prevention;
|
||||
use App\Prevention\PreventionSettings;
|
||||
use Carbon\Carbon;
|
||||
use Spatie\LaravelData\Data;
|
||||
|
||||
class PreventionData extends Data
|
||||
{
|
||||
public function __construct(public Prevention $type, public Carbon $expires) {}
|
||||
|
||||
public function expiresAt(Carbon $date): bool
|
||||
{
|
||||
return $this->expires->isSameDay($date);
|
||||
}
|
||||
|
||||
public function text(): string
|
||||
{
|
||||
return str($this->type->text())->when(
|
||||
!$this->expiresAt(now()),
|
||||
fn($str) => $str->append(' (fällig am ' . $this->expires->format('d.m.Y') . ')')
|
||||
);
|
||||
}
|
||||
|
||||
public function appliesToSettings(PreventionSettings $settings): bool
|
||||
{
|
||||
return in_array($this->type->name, $settings->preventAgainst);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
namespace App\Prevention\Enums;
|
||||
|
||||
use App\Prevention\Data\PreventionData;
|
||||
use App\Member\Member;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
enum Prevention
|
||||
|
|
@ -38,26 +39,15 @@ enum Prevention
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Collection<int, PreventionData> $preventions
|
||||
* @param array<int, self> $preventions
|
||||
* @return Collection<int, array{letter: string, value: bool, tooltip: string}>
|
||||
*/
|
||||
public static function items(Collection $preventions): Collection
|
||||
public static function items(array $preventions): Collection
|
||||
{
|
||||
return collect(static::cases())->map(fn($case) => [
|
||||
return collect(static::cases())->map(fn ($case) => [
|
||||
'letter' => $case->letter(),
|
||||
'value' => $preventions->pluck('type')->doesntContain($case),
|
||||
'tooltip' => $case->tooltip($preventions->pluck('type')->doesntContain($case)),
|
||||
'value' => !in_array($case, $preventions),
|
||||
'tooltip' => $case->tooltip(!in_array($case, $preventions)),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<int, string>
|
||||
*/
|
||||
public static function values(): array
|
||||
{
|
||||
return collect(static::cases())->map(fn($case) => [
|
||||
'id' => $case->name,
|
||||
'name' => $case->text(),
|
||||
])->toArray();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,14 +5,12 @@ namespace App\Prevention\Mails;
|
|||
use App\Invoice\InvoiceSettings;
|
||||
use App\Lib\Editor\EditorData;
|
||||
use App\Prevention\Contracts\Preventable;
|
||||
use App\Prevention\Data\PreventionData;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Attachment;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
class PreventionRememberMail extends Mailable
|
||||
{
|
||||
|
|
@ -22,13 +20,12 @@ class PreventionRememberMail extends Mailable
|
|||
|
||||
/**
|
||||
* Create a new message instance.
|
||||
* @param Collection<int, PreventionData> $preventions
|
||||
*/
|
||||
public function __construct(public Preventable $preventable, public EditorData $bodyText, public Collection $preventions)
|
||||
public function __construct(public Preventable $preventable, public EditorData $bodyText)
|
||||
{
|
||||
$this->settings = app(InvoiceSettings::class);
|
||||
$this->bodyText = $this->bodyText
|
||||
->replaceWithList('wanted', $preventions->map(fn($prevention) => $prevention->text())->toArray());
|
||||
->replaceWithList('wanted', collect($preventable->preventions())->map(fn ($prevention) => $prevention->text())->toArray());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -51,7 +48,7 @@ class PreventionRememberMail extends Mailable
|
|||
public function content()
|
||||
{
|
||||
return new Content(
|
||||
markdown: 'mail.prevention.prevention-remember-participant',
|
||||
markdown: $this->preventable->preventableLayout(),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue