Compare commits
49
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b668c7e805 | ||
|
|
ddfaab1501 | ||
|
|
70a57d10f5 | ||
|
|
6301c342e4 | ||
|
|
025035190d | ||
|
|
651b6147bf | ||
|
|
ae13841699 | ||
|
|
91dca31c11 | ||
|
|
40d5634764 | ||
|
|
350c8dd0d0 | ||
|
|
d07980dd1f | ||
|
|
b9795f08f0 | ||
|
|
e730d6db63 | ||
|
|
a6bddf9fa5 | ||
|
|
749d8588da | ||
|
|
4bb64b0053 | ||
|
|
d23e6c3914 | ||
|
|
15690b1da9 | ||
|
|
c1c1a4f143 | ||
|
|
5beb2b1d97 | ||
|
|
efee20c16b | ||
|
|
b01288b5e0 | ||
|
|
6a183d6498 | ||
|
|
9c4c28e566 | ||
|
|
a61344395a | ||
|
|
6e4e6b645c | ||
|
|
085299336e | ||
|
|
81912d2433 | ||
|
|
ea57f9400e | ||
|
|
cd51eb3f97 | ||
|
|
1cc84716a1 | ||
|
|
0ee952212b | ||
|
|
e95de52768 | ||
|
|
9581176a0c | ||
|
|
554166803b | ||
|
|
5031d3bde0 | ||
|
|
09f9767eb7 | ||
|
|
b3bbeb5b0b | ||
|
|
c17facf063 | ||
|
|
6b33c1b4dd | ||
|
|
72e0502bb9 | ||
|
|
3b47979265 | ||
|
|
b15573cda6 | ||
|
|
67c4e69f7b | ||
|
|
7f8417e915 | ||
|
|
f8dba18854 | ||
|
|
daff70b4fe | ||
|
|
7919d04dc3 | ||
|
|
cea00f9679 |
@@ -56,6 +56,8 @@ MAIL_PASSWORD=null
|
|||||||
MAIL_FROM_ADDRESS="hello@example.com"
|
MAIL_FROM_ADDRESS="hello@example.com"
|
||||||
MAIL_FROM_NAME="${APP_NAME}"
|
MAIL_FROM_NAME="${APP_NAME}"
|
||||||
|
|
||||||
|
APP_ADMIN_MAIL=
|
||||||
|
|
||||||
AWS_ACCESS_KEY_ID=
|
AWS_ACCESS_KEY_ID=
|
||||||
AWS_SECRET_ACCESS_KEY=
|
AWS_SECRET_ACCESS_KEY=
|
||||||
AWS_DEFAULT_REGION=us-east-1
|
AWS_DEFAULT_REGION=us-east-1
|
||||||
|
|||||||
@@ -23,3 +23,6 @@ Homestead.json
|
|||||||
Homestead.yaml
|
Homestead.yaml
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
/docker-compose.yaml
|
/docker-compose.yaml
|
||||||
|
|
||||||
|
# HTML-Report von composer test:coverage
|
||||||
|
/storage/coverage
|
||||||
|
|||||||
@@ -15,3 +15,60 @@ Routing, Mails) stehen in `.ai/conventions.md` und werden hier eingebunden — *
|
|||||||
|
|
||||||
- [Zahlungsmodule](app/EventPaymentModules/CLAUDE.md) — interface-gesteuerte Zahlungsarten (Optionen, Config,
|
- [Zahlungsmodule](app/EventPaymentModules/CLAUDE.md) — interface-gesteuerte Zahlungsarten (Optionen, Config,
|
||||||
Anmelde-Zusammenfassung, GiroCode/Fähigkeits-Interfaces, neues Modul hinzufügen).
|
Anmelde-Zusammenfassung, GiroCode/Fähigkeits-Interfaces, neues Modul hinzufügen).
|
||||||
|
|
||||||
|
## Umsatzsteuer / Steuerinformationen
|
||||||
|
|
||||||
|
Rechtlich korrekter Begriff ist **Umsatzsteuer (USt)**, nicht MwSt. Ziel: tagesbasierte Anmelde-Rechnungen („Teilnahme
|
||||||
|
Veranstaltung X in Gruppe Y" × Anwesenheitstage × Beitrag/Tag). Grundlage ist gebaut, die Rechnungs-PDF/-berechnung
|
||||||
|
folgt noch.
|
||||||
|
|
||||||
|
### Tenant-Einstellungen (Tab „Steuerinformationen")
|
||||||
|
|
||||||
|
Felder auf `tenants` (Self-Service `TenantData.vue` + verwaltet `TenantEdit.vue`, Partial `TenantTaxInfo.vue`,
|
||||||
|
Controller `TenantTax*` / `ManagedTenantTax*`, Action `UpdateTenantTax`):
|
||||||
|
|
||||||
|
- `tax_liable` (bool) — ob USt-Pflicht besteht.
|
||||||
|
- `vat_rate` (int, %) — USt-Satz, nur relevant wenn `tax_liable` (0–100, geclamped).
|
||||||
|
- `vat_pricing_mode` (Enum `App\Enumerations\VatPricingMode`, natives PHP-Enum: `inclusive` | `add_on`).
|
||||||
|
- `tax_exemption_reason` (FK → `tax_exemption_reasons.slug`, nullable) — Grund wenn **nicht** steuerpflichtig.
|
||||||
|
DB-Default neuer Tenants: `ustg_4_25a` (Jugendhilfe).
|
||||||
|
- `tax_exemption_note` (text, nullable) — Freitext, nur bei Grund `custom` (`requires_note`).
|
||||||
|
|
||||||
|
### Preismodus — **das Kernverhalten**
|
||||||
|
|
||||||
|
Es wird **immer der finale Brutto-Beitrag** pro Anmeldung gespeichert (`EventParticipant.amount`, keine USt-Spalten am
|
||||||
|
Teilnehmer). Der Modus wirkt **nur bei der Preisermittlung im Anmeldeprozess**:
|
||||||
|
|
||||||
|
- **`inclusive`** (Brutto / „zusammenfassen", Supermarkt-Prinzip, Default): der konfigurierte Beitrag **ist** der
|
||||||
|
Endpreis, USt ist bereits enthalten → Preis bleibt gleich; die USt wird erst **auf der Rechnung herausgerechnet**:
|
||||||
|
`USt = brutto × Satz / (100 + Satz)`, `netto = brutto − USt`.
|
||||||
|
- **`add_on`** (Netto / „aufaddieren"): der konfigurierte Beitrag ist netto → Endpreis = `Beitrag × (1 + Satz/100)`. Die
|
||||||
|
USt wird bei der Anmeldung **aufgeschlagen** → Teilnehmer zahlt mehr.
|
||||||
|
|
||||||
|
Umsetzung in `App\Resources\EventResource::calculateAmount()`: nach allen Multiplikatoren (Early-Bird, `pay_per_day`,
|
||||||
|
Geschwister) gilt
|
||||||
|
`if ($event->tax_liable && $event->vat_pricing_mode === VatPricingMode::AddOn->value) $fee->multiply(1 + $event->vat_rate/100);`
|
||||||
|
danach `round(…, 2)`. Bei `inclusive`/nicht steuerpflichtig bleibt der Beitrag unverändert.
|
||||||
|
|
||||||
|
### Event-Snapshot (unveränderlich)
|
||||||
|
|
||||||
|
Bei Event-Anlage (`CreateEventCommand::execute()`) werden `tax_liable`, `vat_rate`, `vat_pricing_mode`,
|
||||||
|
`tax_exemption_reason`, `tax_exemption_note` aus dem Tenant **auf das Event kopiert und dort eingefroren** (Spalten auf
|
||||||
|
`events`). Preisermittlung und spätere Rechnungen lesen vom Event, nicht vom Tenant → spätere Tenant-Änderungen berühren
|
||||||
|
bestehende Events/Rechnungen nicht.
|
||||||
|
|
||||||
|
### Befreiungsgründe (DB-gestützt)
|
||||||
|
|
||||||
|
Tabelle `tax_exemption_reasons`, Model `App\Enumerations\TaxExemptionReason` (Eloquent, `slug` PK; `name`,
|
||||||
|
`invoice_text`, `requires_note`, `sort_order`). `options()` liefert `{value,label,text}` sortiert nach `sort_order`. FK
|
||||||
|
von `tenants` **und** `events`. Seed in Migration `170010`, verfeinert in `170020`. Gründe (in Reihenfolge):
|
||||||
|
`ustg_19` (§ 19 Kleinunternehmer), `ustg_4_24` (§ 4 Nr. 24 Jugendherbergen),
|
||||||
|
`ustg_4_25a` (§ 4 Nr. 25 Buchst. a — Jugendhilfe-Veranstaltungen, Default), `ustg_4_22a` (§ 4 Nr. 22 Buchst. a —
|
||||||
|
Vorträge/Kurse), `custom` (Freitext). Jeder Grund kapselt den Rechnungs-Pflichthinweis nach **§ 14 Abs. 4 Nr. 8 UStG**
|
||||||
|
(`invoice_text`; bei `custom` der Tenant-Freitext via `invoiceText(?note)`). Gemeinnützigkeit allein befreit **nicht** —
|
||||||
|
es braucht immer einen konkreten Rechtsgrund.
|
||||||
|
|
||||||
|
### Noch offen (nächster Schritt)
|
||||||
|
|
||||||
|
Die eigentliche **Rechnung**: tagesbasierte Positionen, USt aus dem gespeicherten Brutto herausrechnen (Satz vom
|
||||||
|
Event-Snapshot); bei Befreiung kein USt-Ausweis, stattdessen der Pflichthinweis des Grundes.
|
||||||
|
|||||||
+29010
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -33,7 +33,7 @@ class CreateTenantAction
|
|||||||
|
|
||||||
$paymentMethodDefaults = PaymentMethod::defaults();
|
$paymentMethodDefaults = PaymentMethod::defaults();
|
||||||
foreach (PaymentMethod::all() as $paymentMethod) {
|
foreach (PaymentMethod::all() as $paymentMethod) {
|
||||||
$defaults = $paymentMethodDefaults[$paymentMethod->slug] ?? ['name' => $paymentMethod->slug, 'description' => null];
|
$defaults = $paymentMethodDefaults[$paymentMethod->slug] ?? ['name' => $paymentMethod->slug, 'description' => null, 'configuration' => []];
|
||||||
|
|
||||||
AvailablePaymentMethod::create([
|
AvailablePaymentMethod::create([
|
||||||
'tenant' => $tenant->slug,
|
'tenant' => $tenant->slug,
|
||||||
@@ -41,6 +41,7 @@ class CreateTenantAction
|
|||||||
'name' => $defaults['name'],
|
'name' => $defaults['name'],
|
||||||
'description' => $defaults['description'],
|
'description' => $defaults['description'],
|
||||||
'active' => true,
|
'active' => true,
|
||||||
|
'configuration' => PaymentMethod::sanitizeConfiguration($paymentMethod->slug, $defaults['configuration'] ?? []),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateDocumentAsset;
|
||||||
|
|
||||||
|
use App\Models\DocumentAsset;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Legt ein Bild für die Dokumentvorlagen an oder ersetzt es.
|
||||||
|
*
|
||||||
|
* Gespeichert wird der base64-Payload in der Datenbank -- so überlebt das Bild ein Release (das als
|
||||||
|
* `git checkout` alles unter `public/` überschreibt) und wandert mit jedem Dump mit.
|
||||||
|
*/
|
||||||
|
class UpdateDocumentAssetAction
|
||||||
|
{
|
||||||
|
/** Über 2 MB wird die Vorlage träge und das PDF unnötig groß. */
|
||||||
|
private const int MAX_BYTES = 2 * 1024 * 1024;
|
||||||
|
|
||||||
|
/** @var array<string, string> */
|
||||||
|
private const array ALLOWED_MIME_TYPES = [
|
||||||
|
'image/png' => 'png',
|
||||||
|
'image/jpeg' => 'jpg',
|
||||||
|
'image/gif' => 'gif',
|
||||||
|
'image/svg+xml' => 'svg',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function __construct(private readonly UpdateDocumentAssetRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): UpdateDocumentAssetResponse
|
||||||
|
{
|
||||||
|
$response = new UpdateDocumentAssetResponse();
|
||||||
|
|
||||||
|
$name = $this->normalizeName($this->request->name);
|
||||||
|
|
||||||
|
if ($name === null) {
|
||||||
|
$response->message = 'Bitte einen Namen aus Kleinbuchstaben, Ziffern, Bindestrich oder Unterstrich angeben.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$asset = DocumentAsset::where('name', $name)->first();
|
||||||
|
$file = $this->request->file;
|
||||||
|
|
||||||
|
if ($file === null && $asset === null) {
|
||||||
|
$response->message = 'Für ein neues Bild wird eine Datei benötigt.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attributes = ['name' => $name, 'label' => $this->request->label];
|
||||||
|
|
||||||
|
if ($file !== null) {
|
||||||
|
if (!array_key_exists($file->getMimeType(), self::ALLOWED_MIME_TYPES)) {
|
||||||
|
$response->message = 'Nur PNG, JPEG, GIF oder SVG sind zulässig.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($file->getSize() > self::MAX_BYTES) {
|
||||||
|
$response->message = 'Das Bild darf höchstens 2 MB groß sein.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attributes['mime'] = $file->getMimeType();
|
||||||
|
$attributes['data'] = base64_encode(file_get_contents($file->getRealPath()));
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->asset = $asset === null
|
||||||
|
? DocumentAsset::create($attributes)
|
||||||
|
: tap($asset)->update($attributes);
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->message = 'Das Bild wurde gespeichert.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Namen sind Slugs, damit `{asset:name}` eindeutig erkennbar bleibt. */
|
||||||
|
private function normalizeName(string $name): ?string
|
||||||
|
{
|
||||||
|
$name = strtolower(trim($name));
|
||||||
|
|
||||||
|
return preg_match('/^[a-z0-9_-]+$/', $name) === 1 ? $name : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateDocumentAsset;
|
||||||
|
|
||||||
|
use Illuminate\Http\UploadedFile;
|
||||||
|
|
||||||
|
class UpdateDocumentAssetRequest
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
/** Slug, unter dem das Bild in der Vorlage als `{asset:name}` referenziert wird. */
|
||||||
|
public readonly string $name,
|
||||||
|
public readonly ?string $label = null,
|
||||||
|
public readonly ?UploadedFile $file = null,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateDocumentAsset;
|
||||||
|
|
||||||
|
use App\Models\DocumentAsset;
|
||||||
|
|
||||||
|
class UpdateDocumentAssetResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
|
||||||
|
public ?string $message = null;
|
||||||
|
|
||||||
|
public ?DocumentAsset $asset = null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateDocumentTemplate;
|
||||||
|
|
||||||
|
use App\Models\DocumentTemplate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Speichert die Blockinhalte einer Dokumentvorlage.
|
||||||
|
*
|
||||||
|
* Es werden nur bereits angelegte, als editierbar markierte Blöcke geschrieben. Neue Blöcke entstehen
|
||||||
|
* nicht über das Formular -- welche Blöcke eine Dokumentart hat, gibt die Vorlage vor (das Layout
|
||||||
|
* verweist mit `{block:...}` auf sie).
|
||||||
|
*/
|
||||||
|
class UpdateDocumentTemplateAction
|
||||||
|
{
|
||||||
|
public function __construct(private readonly UpdateDocumentTemplateRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): UpdateDocumentTemplateResponse
|
||||||
|
{
|
||||||
|
$response = new UpdateDocumentTemplateResponse();
|
||||||
|
|
||||||
|
$existing = DocumentTemplate::forType($this->request->documentType);
|
||||||
|
|
||||||
|
// Erst prüfen, dann schreiben -- sonst bliebe bei einem Fehler ein halb gespeicherter Stand übrig.
|
||||||
|
$rejection = $this->rejectBareAssetInStyle();
|
||||||
|
if ($rejection !== null) {
|
||||||
|
$response->message = $rejection;
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->request->blocks as $block => $content) {
|
||||||
|
$template = $existing->get($block);
|
||||||
|
|
||||||
|
if ($template === null || !$template->editable) {
|
||||||
|
$response->skipped[] = $block;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$template->update(['content' => (string) $content]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->message = $response->skipped === []
|
||||||
|
? 'Die Vorlage wurde gespeichert.'
|
||||||
|
: 'Die Vorlage wurde gespeichert; nicht editierbare Blöcke blieben unverändert.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ein Bild-Platzhalter, der im CSS nicht in `url(...)` steht, expandiert zu einem Data-URI, das
|
||||||
|
* dompdf nicht auslagern kann -- der Parser läuft dann minutenlang und der FPM-Worker stirbt am
|
||||||
|
* Zeitlimit (502). Solches CSS wird gar nicht erst gespeichert.
|
||||||
|
*
|
||||||
|
* @return string|null Fehlermeldung, oder null wenn nichts zu beanstanden ist.
|
||||||
|
*/
|
||||||
|
private function rejectBareAssetInStyle(): ?string
|
||||||
|
{
|
||||||
|
$style = $this->request->blocks[DocumentTemplate::BLOCK_STYLE] ?? null;
|
||||||
|
|
||||||
|
if ($style === null || preg_match('/(?<![("\'])\{asset:([a-z0-9_-]+)}/i', (string) $style, $match) !== 1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sprintf(
|
||||||
|
'Im CSS-Block steht der Bild-Platzhalter {asset:%1$s} direkt im Text. Dort gehört er in url("{asset:%1$s}").',
|
||||||
|
$match[1]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateDocumentTemplate;
|
||||||
|
|
||||||
|
class UpdateDocumentTemplateRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param array<string, string> $blocks Blockinhalte, adressiert über den Block-Slug.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public readonly string $documentType,
|
||||||
|
public readonly array $blocks,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateDocumentTemplate;
|
||||||
|
|
||||||
|
class UpdateDocumentTemplateResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
|
||||||
|
public ?string $message = null;
|
||||||
|
|
||||||
|
/** @var array<int, string> Blöcke, die nicht gespeichert wurden (unbekannt oder nicht editierbar). */
|
||||||
|
public array $skipped = [];
|
||||||
|
}
|
||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Domains\Admin\Actions\UpdateTenantContact;
|
namespace App\Domains\Admin\Actions\UpdateTenantContact;
|
||||||
|
|
||||||
|
use App\Support\Text;
|
||||||
|
|
||||||
class UpdateTenantContactAction
|
class UpdateTenantContactAction
|
||||||
{
|
{
|
||||||
public function __construct(private UpdateTenantContactRequest $request)
|
public function __construct(private UpdateTenantContactRequest $request)
|
||||||
@@ -15,8 +17,14 @@ class UpdateTenantContactAction
|
|||||||
$this->request->tenant->update([
|
$this->request->tenant->update([
|
||||||
'email' => $this->request->email,
|
'email' => $this->request->email,
|
||||||
'email_finance' => $this->request->emailFinance,
|
'email_finance' => $this->request->emailFinance,
|
||||||
|
'invoice_sender_name' => Text::nullIfBlank($this->request->invoiceSenderName),
|
||||||
|
// Leergelassene optionale Felder als NULL, damit sie im Briefkopf sauber wegfallen.
|
||||||
|
'address_1' => Text::nullIfBlank($this->request->address1),
|
||||||
|
'address_2' => Text::nullIfBlank($this->request->address2),
|
||||||
|
'address_3' => Text::nullIfBlank($this->request->address3),
|
||||||
'postcode' => $this->request->postcode,
|
'postcode' => $this->request->postcode,
|
||||||
'city' => $this->request->city,
|
'city' => $this->request->city,
|
||||||
|
'phone' => Text::nullIfBlank($this->request->phone),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$response->success = true;
|
$response->success = true;
|
||||||
|
|||||||
@@ -12,6 +12,14 @@ class UpdateTenantContactRequest
|
|||||||
public string $emailFinance,
|
public string $emailFinance,
|
||||||
public string $postcode,
|
public string $postcode,
|
||||||
public string $city,
|
public string $city,
|
||||||
|
/** Bezeichnung des Rechnungsstellers; leer bedeutet "Name des Mandanten verwenden". */
|
||||||
|
public ?string $invoiceSenderName = null,
|
||||||
|
/** Straße und Hausnummer -- Pflichtangabe auf Rechnungen nach § 14 Abs. 4 UStG. */
|
||||||
|
public ?string $address1 = null,
|
||||||
|
/** Optionale Zusatzzeile, z.B. "c/o ...". */
|
||||||
|
public ?string $address2 = null,
|
||||||
|
public ?string $address3 = null,
|
||||||
|
public ?string $phone = null,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Domains\Admin\Actions\UpdateTenantPayment;
|
namespace App\Domains\Admin\Actions\UpdateTenantPayment;
|
||||||
|
|
||||||
|
use App\Models\AvailablePaymentMethod;
|
||||||
|
use App\Models\PaymentMethod;
|
||||||
|
use App\Scopes\SiteScope;
|
||||||
|
|
||||||
class UpdateTenantPaymentAction
|
class UpdateTenantPaymentAction
|
||||||
{
|
{
|
||||||
public function __construct(private UpdateTenantPaymentRequest $request)
|
public function __construct(private UpdateTenantPaymentRequest $request)
|
||||||
@@ -18,9 +22,41 @@ class UpdateTenantPaymentAction
|
|||||||
'account_name' => $this->request->accountName,
|
'account_name' => $this->request->accountName,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$this->syncTransferPaymentConfiguration();
|
||||||
|
|
||||||
$response->success = true;
|
$response->success = true;
|
||||||
$response->message = 'Bezahldaten wurden gespeichert.';
|
$response->message = 'IBAN-Informationen wurden gespeichert.';
|
||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Übernimmt die eingegebenen IBAN-Daten direkt in die Tenant-Config der Überweisungs-Zahlungsart
|
||||||
|
* (Kontoinhaber/IBAN/BIC), damit sie nicht doppelt gepflegt werden müssen. Bestehende weitere
|
||||||
|
* Config-Werte (z.B. Symbol) bleiben erhalten. Der Ziel-Tenant kann ein verwalteter sein, daher
|
||||||
|
* ohne SiteScope explizit auf den Tenant-Slug gefiltert.
|
||||||
|
*/
|
||||||
|
private function syncTransferPaymentConfiguration(): void
|
||||||
|
{
|
||||||
|
$slug = PaymentMethod::PAYMENT_ACCOUNT_TRANSACTION;
|
||||||
|
|
||||||
|
$method = AvailablePaymentMethod::withoutGlobalScope(SiteScope::class)
|
||||||
|
->where('tenant', $this->request->tenant->slug)
|
||||||
|
->where('slug', $slug)
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if ($method === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$method->configuration = PaymentMethod::sanitizeConfiguration($slug, array_merge(
|
||||||
|
$method->configuration ?? [],
|
||||||
|
[
|
||||||
|
'account_owner' => $this->request->accountName,
|
||||||
|
'iban' => $this->request->accountIban,
|
||||||
|
'bic' => $this->request->accountBic,
|
||||||
|
],
|
||||||
|
));
|
||||||
|
$method->save();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateTenantTax;
|
||||||
|
|
||||||
|
use App\Enumerations\VatPricingMode;
|
||||||
|
use App\Models\Tenant;
|
||||||
|
use App\Support\Text;
|
||||||
|
|
||||||
|
class UpdateTenantTaxAction
|
||||||
|
{
|
||||||
|
public function __construct(private UpdateTenantTaxRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): UpdateTenantTaxResponse
|
||||||
|
{
|
||||||
|
$response = new UpdateTenantTaxResponse();
|
||||||
|
|
||||||
|
// Präfixe sind großgeschrieben; null heißt "nicht mitgeschickt" und damit "unverändert".
|
||||||
|
$prefix = Text::nullIfBlank(strtoupper((string) $this->request->invoicePrefix));
|
||||||
|
|
||||||
|
if ($prefix !== null && $this->prefixTakenByAnotherTenant($prefix)) {
|
||||||
|
$response->message = sprintf('Das Rechnungs-Präfix "%s" wird bereits von einem anderen Mandanten genutzt.', $prefix);
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->request->taxLiable) {
|
||||||
|
$this->request->tenant->update($this->withInvoiceDetails([
|
||||||
|
'tax_liable' => true,
|
||||||
|
'vat_rate' => $this->clampVatRate($this->request->vatRate),
|
||||||
|
'vat_pricing_mode' => $this->request->vatPricingMode->value,
|
||||||
|
'tax_exemption_reason' => null,
|
||||||
|
'tax_exemption_note' => null,
|
||||||
|
], $prefix));
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->message = 'Steuerinformationen wurden gespeichert.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$reason = $this->request->exemptionReason;
|
||||||
|
|
||||||
|
if ($reason === null) {
|
||||||
|
$response->message = 'Bitte einen gültigen Befreiungsgrund auswählen.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$note = trim((string)$this->request->exemptionNote);
|
||||||
|
|
||||||
|
if ($reason->requires_note && $note === '') {
|
||||||
|
$response->message = 'Bitte einen Text für den Befreiungsgrund angeben.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->request->tenant->update($this->withInvoiceDetails([
|
||||||
|
'tax_liable' => false,
|
||||||
|
'vat_rate' => 0,
|
||||||
|
'vat_pricing_mode' => VatPricingMode::Inclusive->value,
|
||||||
|
'tax_exemption_reason' => $reason->slug,
|
||||||
|
'tax_exemption_note' => $reason->requires_note ? $note : null,
|
||||||
|
], $prefix));
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->message = 'Steuerinformationen wurden gespeichert.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function clampVatRate(int $vatRate): int
|
||||||
|
{
|
||||||
|
return max(0, min(100, $vatRate));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ergänzt die Rechnungsstellerangaben. Sie gelten unabhängig davon, ob Steuerpflicht besteht -- eine
|
||||||
|
* Steuernummer gehört auch auf eine steuerfreie Rechnung.
|
||||||
|
*
|
||||||
|
* @param array<string, mixed> $attributes
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
private function withInvoiceDetails(array $attributes, ?string $prefix): array
|
||||||
|
{
|
||||||
|
$attributes['tax_number'] = Text::nullIfBlank($this->request->taxNumber);
|
||||||
|
$attributes['vat_id'] = Text::nullIfBlank($this->request->vatId);
|
||||||
|
|
||||||
|
// Nicht mitgeschickt heißt "unverändert", nicht "leeren".
|
||||||
|
if ($prefix !== null) {
|
||||||
|
$attributes['invoice_prefix'] = $prefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $attributes;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function prefixTakenByAnotherTenant(string $prefix): bool
|
||||||
|
{
|
||||||
|
return Tenant::where('invoice_prefix', $prefix)
|
||||||
|
->where('id', '!=', $this->request->tenant->id)
|
||||||
|
->exists();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateTenantTax;
|
||||||
|
|
||||||
|
use App\Enumerations\TaxExemptionReason;
|
||||||
|
use App\Enumerations\VatPricingMode;
|
||||||
|
use App\Models\Tenant;
|
||||||
|
|
||||||
|
class UpdateTenantTaxRequest
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public Tenant $tenant,
|
||||||
|
public bool $taxLiable,
|
||||||
|
public int $vatRate,
|
||||||
|
public ?TaxExemptionReason $exemptionReason,
|
||||||
|
public ?string $exemptionNote,
|
||||||
|
public VatPricingMode $vatPricingMode,
|
||||||
|
/** Steuernummer bzw. USt-IdNr. -- Pflichtangabe auf Rechnungen (§ 14 Abs. 4 Nr. 2 UStG). */
|
||||||
|
public ?string $taxNumber = null,
|
||||||
|
public ?string $vatId = null,
|
||||||
|
/**
|
||||||
|
* Erster Block der Rechnungsnummer. `null` heißt "unverändert lassen" -- im Self-Service wird das
|
||||||
|
* Feld gar nicht erst mitgeschickt, damit ein bestehender Nummernkreis nicht bricht.
|
||||||
|
*/
|
||||||
|
public ?string $invoicePrefix = null,
|
||||||
|
)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Actions\UpdateTenantTax;
|
||||||
|
|
||||||
|
class UpdateTenantTaxResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
public string $message = '';
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Models\DocumentAsset;
|
||||||
|
use App\Models\DocumentTemplate;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
|
class DocumentAssetDeleteController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(string $name): JsonResponse
|
||||||
|
{
|
||||||
|
$asset = DocumentAsset::where('name', $name)->first();
|
||||||
|
|
||||||
|
// Durchweg 200 mit Status im Body -- wie die übrigen Admin-Endpunkte, damit der Grund im Frontend
|
||||||
|
// ankommt (der Ajax-Helfer verwirft den Body bei Fehler-Statuscodes).
|
||||||
|
if ($asset === null) {
|
||||||
|
return response()->json(['status' => 'error', 'message' => 'Das Bild existiert nicht.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ein noch referenziertes Bild zu löschen würde stillschweigend eine Lücke in jede künftige
|
||||||
|
// Rechnung reißen -- der Platzhalter löst dann zu einem Leerstring auf.
|
||||||
|
if ($this->isReferenced($asset->name)) {
|
||||||
|
return response()->json([
|
||||||
|
'status' => 'error',
|
||||||
|
'message' => sprintf('Das Bild wird noch als {asset:%s} in der Vorlage verwendet.', $asset->name),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$asset->delete();
|
||||||
|
|
||||||
|
return response()->json(['status' => 'success', 'message' => 'Das Bild wurde gelöscht.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function isReferenced(string $name): bool
|
||||||
|
{
|
||||||
|
return DocumentTemplate::query()
|
||||||
|
->where('content', 'like', '%{asset:' . $name . '}%')
|
||||||
|
->exists();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Admin\Actions\UpdateDocumentAsset\UpdateDocumentAssetAction;
|
||||||
|
use App\Domains\Admin\Actions\UpdateDocumentAsset\UpdateDocumentAssetRequest;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class DocumentAssetUpdateController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$action = new UpdateDocumentAssetAction(new UpdateDocumentAssetRequest(
|
||||||
|
name: (string) $request->input('name'),
|
||||||
|
label: $request->input('label'),
|
||||||
|
file: $request->file('file'),
|
||||||
|
));
|
||||||
|
|
||||||
|
$response = $action->execute();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'status' => $response->success ? 'success' : 'error',
|
||||||
|
'message' => $response->message,
|
||||||
|
'token' => $response->asset !== null ? '{asset:' . $response->asset->name . '}' : null,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Models\DocumentAsset;
|
||||||
|
use App\Models\DocumentTemplate;
|
||||||
|
use App\Models\DocumentTypeCatalog;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class DocumentTemplatesGetController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$documentType = (string) $request->input('type', DocumentTypeCatalog::default());
|
||||||
|
|
||||||
|
if (!DocumentTypeCatalog::has($documentType)) {
|
||||||
|
abort(422, 'Unbekannte Dokumentart.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$blocks = DocumentTemplate::forType($documentType)
|
||||||
|
->values()
|
||||||
|
->map(fn(DocumentTemplate $block): array => [
|
||||||
|
'block' => $block->block,
|
||||||
|
'label' => DocumentTypeCatalog::blockLabel($documentType, $block->block),
|
||||||
|
'content' => (string) $block->content,
|
||||||
|
'editable' => $block->editable,
|
||||||
|
'source' => in_array($block->block, DocumentTypeCatalog::SOURCE_BLOCKS, true),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'documentType' => $documentType,
|
||||||
|
'documentTypes' => DocumentTypeCatalog::options(),
|
||||||
|
'blocks' => $blocks,
|
||||||
|
// Die Bilder gelten für alle Dokumentarten -- sie hängen nicht am Typ.
|
||||||
|
'assets' => DocumentAsset::orderBy('name')->get()->map(fn(DocumentAsset $asset): array => [
|
||||||
|
'name' => $asset->name,
|
||||||
|
'label' => $asset->label,
|
||||||
|
'mime' => $asset->mime,
|
||||||
|
'token' => '{asset:' . $asset->name . '}',
|
||||||
|
'preview' => $asset->toDataUri(),
|
||||||
|
]),
|
||||||
|
'tokenGroups' => DocumentTypeCatalog::tokenGroups($documentType),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Providers\InertiaProvider;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Inertia\Response;
|
||||||
|
|
||||||
|
class DocumentTemplatesPageController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(): Response
|
||||||
|
{
|
||||||
|
return new InertiaProvider('Admin/DocumentTemplates', [])->render();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Models\DocumentTypeCatalog;
|
||||||
|
use App\Providers\DocumentTemplateRenderProvider;
|
||||||
|
use App\Providers\PdfGenerateAndDownloadProvider;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rendert die Vorlage mit Beispieldaten, ohne sie zu speichern -- damit niemand blind HTML editiert.
|
||||||
|
*/
|
||||||
|
class DocumentTemplatesPreviewController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request): Response
|
||||||
|
{
|
||||||
|
$documentType = (string) $request->input('type', DocumentTypeCatalog::default());
|
||||||
|
|
||||||
|
if (!DocumentTypeCatalog::has($documentType)) {
|
||||||
|
abort(422, 'Unbekannte Dokumentart.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$html = new DocumentTemplateRenderProvider(
|
||||||
|
$documentType,
|
||||||
|
(array) $request->input('blocks', []),
|
||||||
|
)->render(DocumentTypeCatalog::sampleTokens($documentType));
|
||||||
|
|
||||||
|
return response(PdfGenerateAndDownloadProvider::fromHtml($html, 'portrait'), 200, [
|
||||||
|
'Content-Type' => 'application/pdf',
|
||||||
|
'Content-Disposition' => 'inline; filename="vorschau.pdf"',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Admin\Actions\UpdateDocumentTemplate\UpdateDocumentTemplateAction;
|
||||||
|
use App\Domains\Admin\Actions\UpdateDocumentTemplate\UpdateDocumentTemplateRequest;
|
||||||
|
use App\Models\DocumentTypeCatalog;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class DocumentTemplatesUpdateController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$documentType = (string) $request->input('type', DocumentTypeCatalog::default());
|
||||||
|
|
||||||
|
// Die Dokumentart bestimmt, welche Zeilen geschrieben werden -- ungeprüft weitergereicht wäre
|
||||||
|
// sie ein Weg, in beliebige Vorlagen zu schreiben.
|
||||||
|
if (!DocumentTypeCatalog::has($documentType)) {
|
||||||
|
abort(422, 'Unbekannte Dokumentart.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$action = new UpdateDocumentTemplateAction(new UpdateDocumentTemplateRequest(
|
||||||
|
documentType: $documentType,
|
||||||
|
blocks: (array) $request->input('blocks', []),
|
||||||
|
));
|
||||||
|
|
||||||
|
$response = $action->execute();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'status' => $response->success ? 'success' : 'error',
|
||||||
|
'message' => $response->message,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,6 +15,13 @@ class ManagedTenantContactGetController extends CommonController
|
|||||||
return response()->json([
|
return response()->json([
|
||||||
'email' => $tenant->email,
|
'email' => $tenant->email,
|
||||||
'email_finance' => $tenant->email_finance,
|
'email_finance' => $tenant->email_finance,
|
||||||
|
'invoice_sender_name' => $tenant->invoice_sender_name,
|
||||||
|
// Als Platzhalter im Formular: so heisst der Absender, solange nichts eingetragen ist.
|
||||||
|
'name' => $tenant->name,
|
||||||
|
'phone' => $tenant->phone,
|
||||||
|
'address_1' => $tenant->address_1,
|
||||||
|
'address_2' => $tenant->address_2,
|
||||||
|
'address_3' => $tenant->address_3,
|
||||||
'postcode' => $tenant->postcode,
|
'postcode' => $tenant->postcode,
|
||||||
'city' => $tenant->city,
|
'city' => $tenant->city,
|
||||||
'saveEndpoint' => '/api/v1/admin/tenants/' . $slug . '/contact',
|
'saveEndpoint' => '/api/v1/admin/tenants/' . $slug . '/contact',
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ class ManagedTenantContactUpdateController extends CommonController
|
|||||||
emailFinance: $request->input('email_finance'),
|
emailFinance: $request->input('email_finance'),
|
||||||
postcode: $request->input('postcode'),
|
postcode: $request->input('postcode'),
|
||||||
city: $request->input('city'),
|
city: $request->input('city'),
|
||||||
|
invoiceSenderName: $request->input('invoice_sender_name'),
|
||||||
|
address1: $request->input('address_1'),
|
||||||
|
address2: $request->input('address_2'),
|
||||||
|
address3: $request->input('address_3'),
|
||||||
|
phone: $request->input('phone'),
|
||||||
));
|
));
|
||||||
|
|
||||||
$response = $action->execute();
|
$response = $action->execute();
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Enumerations\TaxExemptionReason;
|
||||||
|
use App\Enumerations\VatPricingMode;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class ManagedTenantTaxGetController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(string $slug, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$tenant = $this->adminTenants->findBySlug($slug);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'tax_liable' => $tenant->tax_liable,
|
||||||
|
'vat_rate' => $tenant->vat_rate,
|
||||||
|
'tax_exemption_reason' => $tenant->tax_exemption_reason,
|
||||||
|
'tax_exemption_note' => $tenant->tax_exemption_note,
|
||||||
|
'vat_pricing_mode' => $tenant->vat_pricing_mode,
|
||||||
|
'tax_number' => $tenant->tax_number,
|
||||||
|
'vat_id' => $tenant->vat_id,
|
||||||
|
'invoice_prefix' => $tenant->invoice_prefix,
|
||||||
|
// In der Mandanten-Verwaltung ist der Nummernkreis änderbar.
|
||||||
|
'can_edit_invoice_prefix' => true,
|
||||||
|
'exemption_reasons' => TaxExemptionReason::options(),
|
||||||
|
'pricing_modes' => VatPricingMode::options(),
|
||||||
|
'saveEndpoint' => '/api/v1/admin/tenants/' . $slug . '/tax',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Admin\Actions\UpdateTenantTax\UpdateTenantTaxAction;
|
||||||
|
use App\Domains\Admin\Actions\UpdateTenantTax\UpdateTenantTaxRequest;
|
||||||
|
use App\Enumerations\TaxExemptionReason;
|
||||||
|
use App\Enumerations\VatPricingMode;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class ManagedTenantTaxUpdateController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(string $slug, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$tenant = $this->adminTenants->findBySlug($slug);
|
||||||
|
|
||||||
|
$action = new UpdateTenantTaxAction(new UpdateTenantTaxRequest(
|
||||||
|
tenant: $tenant,
|
||||||
|
taxLiable: $request->boolean('tax_liable'),
|
||||||
|
vatRate: (int)$request->input('vat_rate', 0),
|
||||||
|
exemptionReason: TaxExemptionReason::where('slug', $request->input('tax_exemption_reason'))->first(),
|
||||||
|
exemptionNote: $request->input('tax_exemption_note'),
|
||||||
|
vatPricingMode: VatPricingMode::tryFrom((string) $request->input('vat_pricing_mode', 'inclusive')) ?? VatPricingMode::Inclusive,
|
||||||
|
taxNumber: $request->input('tax_number'),
|
||||||
|
vatId: $request->input('vat_id'),
|
||||||
|
invoicePrefix: $request->input('invoice_prefix'),
|
||||||
|
));
|
||||||
|
|
||||||
|
$response = $action->execute();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'status' => $response->success ? 'success' : 'error',
|
||||||
|
'message' => $response->message,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,13 @@ class TenantContactGetController extends CommonController
|
|||||||
return response()->json([
|
return response()->json([
|
||||||
'email' => $this->tenant->email,
|
'email' => $this->tenant->email,
|
||||||
'email_finance' => $this->tenant->email_finance,
|
'email_finance' => $this->tenant->email_finance,
|
||||||
|
'invoice_sender_name' => $this->tenant->invoice_sender_name,
|
||||||
|
// Als Platzhalter im Formular: so heisst der Absender, solange nichts eingetragen ist.
|
||||||
|
'name' => $this->tenant->name,
|
||||||
|
'phone' => $this->tenant->phone,
|
||||||
|
'address_1' => $this->tenant->address_1,
|
||||||
|
'address_2' => $this->tenant->address_2,
|
||||||
|
'address_3' => $this->tenant->address_3,
|
||||||
'postcode' => $this->tenant->postcode,
|
'postcode' => $this->tenant->postcode,
|
||||||
'city' => $this->tenant->city,
|
'city' => $this->tenant->city,
|
||||||
'saveEndpoint' => '/api/v1/admin/tenant/contact',
|
'saveEndpoint' => '/api/v1/admin/tenant/contact',
|
||||||
|
|||||||
@@ -18,6 +18,11 @@ class TenantContactUpdateController extends CommonController
|
|||||||
emailFinance: $request->input('email_finance'),
|
emailFinance: $request->input('email_finance'),
|
||||||
postcode: $request->input('postcode'),
|
postcode: $request->input('postcode'),
|
||||||
city: $request->input('city'),
|
city: $request->input('city'),
|
||||||
|
invoiceSenderName: $request->input('invoice_sender_name'),
|
||||||
|
address1: $request->input('address_1'),
|
||||||
|
address2: $request->input('address_2'),
|
||||||
|
address3: $request->input('address_3'),
|
||||||
|
phone: $request->input('phone'),
|
||||||
));
|
));
|
||||||
|
|
||||||
$response = $action->execute();
|
$response = $action->execute();
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Domains\Admin\Controllers;
|
|||||||
use App\Models\AvailablePaymentMethod;
|
use App\Models\AvailablePaymentMethod;
|
||||||
use App\Resources\AvailablePaymentMethodResource;
|
use App\Resources\AvailablePaymentMethodResource;
|
||||||
use App\Scopes\CommonController;
|
use App\Scopes\CommonController;
|
||||||
|
use App\ValueObjects\BankStatementRuleset;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
@@ -16,6 +17,10 @@ class TenantPaymentMethodsGetController extends CommonController
|
|||||||
'paymentMethods' => AvailablePaymentMethod::all()
|
'paymentMethods' => AvailablePaymentMethod::all()
|
||||||
->map(fn (AvailablePaymentMethod $method) => new AvailablePaymentMethodResource($method)->toArray($request)),
|
->map(fn (AvailablePaymentMethod $method) => new AvailablePaymentMethodResource($method)->toArray($request)),
|
||||||
'saveEndpoint' => '/api/v1/admin/tenant/payment-methods',
|
'saveEndpoint' => '/api/v1/admin/tenant/payment-methods',
|
||||||
|
// Der app-weite Standard für das Kontoauszug-Format. Das Formular zeigt ihn als
|
||||||
|
// Vorbelegung an, damit erkennbar ist, wovon ein Override abweicht.
|
||||||
|
'statementRulesetDefault' => BankStatementRuleset::default()->toArray(),
|
||||||
|
'statementRulesetCharsets' => BankStatementRuleset::CHARSETS,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Enumerations\TaxExemptionReason;
|
||||||
|
use App\Enumerations\VatPricingMode;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class TenantTaxGetController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
return response()->json([
|
||||||
|
'tax_liable' => $this->tenant->tax_liable,
|
||||||
|
'vat_rate' => $this->tenant->vat_rate,
|
||||||
|
'tax_exemption_reason' => $this->tenant->tax_exemption_reason,
|
||||||
|
'tax_exemption_note' => $this->tenant->tax_exemption_note,
|
||||||
|
'vat_pricing_mode' => $this->tenant->vat_pricing_mode,
|
||||||
|
'tax_number' => $this->tenant->tax_number,
|
||||||
|
'vat_id' => $this->tenant->vat_id,
|
||||||
|
'invoice_prefix' => $this->tenant->invoice_prefix,
|
||||||
|
// Im Self-Service nicht änderbar: das Präfix bestimmt den Nummernkreis.
|
||||||
|
'can_edit_invoice_prefix' => false,
|
||||||
|
'exemption_reasons' => TaxExemptionReason::options(),
|
||||||
|
'pricing_modes' => VatPricingMode::options(),
|
||||||
|
'saveEndpoint' => '/api/v1/admin/tenant/tax',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Admin\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Admin\Actions\UpdateTenantTax\UpdateTenantTaxAction;
|
||||||
|
use App\Domains\Admin\Actions\UpdateTenantTax\UpdateTenantTaxRequest;
|
||||||
|
use App\Enumerations\TaxExemptionReason;
|
||||||
|
use App\Enumerations\VatPricingMode;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class TenantTaxUpdateController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$action = new UpdateTenantTaxAction(new UpdateTenantTaxRequest(
|
||||||
|
tenant: $this->tenant,
|
||||||
|
taxLiable: $request->boolean('tax_liable'),
|
||||||
|
vatRate: (int)$request->input('vat_rate', 0),
|
||||||
|
exemptionReason: TaxExemptionReason::where('slug', $request->input('tax_exemption_reason'))->first(),
|
||||||
|
exemptionNote: $request->input('tax_exemption_note'),
|
||||||
|
vatPricingMode: VatPricingMode::tryFrom((string) $request->input('vat_pricing_mode', 'inclusive')) ?? VatPricingMode::Inclusive,
|
||||||
|
taxNumber: $request->input('tax_number'),
|
||||||
|
vatId: $request->input('vat_id'),
|
||||||
|
// invoice_prefix wird hier bewusst nicht durchgereicht -- der Nummernkreis ist nur in der
|
||||||
|
// Mandanten-Verwaltung änderbar.
|
||||||
|
));
|
||||||
|
|
||||||
|
$response = $action->execute();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'status' => $response->success ? 'success' : 'error',
|
||||||
|
'message' => $response->message,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,7 +23,7 @@ class UserDetailGetController extends CommonController
|
|||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'user' => $userData,
|
'user' => $userData,
|
||||||
'isOwnUser' => auth()->id() === $user->id,
|
'isOwnUser' => currentUser()?->id === $user->id,
|
||||||
'isLvTenant' => $this->tenant->slug === 'lv',
|
'isLvTenant' => $this->tenant->slug === 'lv',
|
||||||
'userRoles' => UserRole::all()->map(fn($role) => ['slug' => $role->slug, 'name' => $role->name]),
|
'userRoles' => UserRole::all()->map(fn($role) => ['slug' => $role->slug, 'name' => $role->name]),
|
||||||
'localGroups' => $this->adminTenants->getActiveLocalGroups()->map(fn($t) => ['slug' => $t->slug, 'name' => $t->name]),
|
'localGroups' => $this->adminTenants->getActiveLocalGroups()->map(fn($t) => ['slug' => $t->slug, 'name' => $t->name]),
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class UserToggleActiveController extends CommonController
|
|||||||
|
|
||||||
$action = new ToggleUserActiveAction(new ToggleUserActiveRequest(
|
$action = new ToggleUserActiveAction(new ToggleUserActiveRequest(
|
||||||
user: $user,
|
user: $user,
|
||||||
currentUserId: auth()->id(),
|
currentUserId: currentUser()?->id,
|
||||||
));
|
));
|
||||||
|
|
||||||
$response = $action->execute();
|
$response = $action->execute();
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class UserUpdateController extends CommonController
|
|||||||
$action = new UpdateUserAction(new UpdateUserRequest(
|
$action = new UpdateUserAction(new UpdateUserRequest(
|
||||||
user: $user,
|
user: $user,
|
||||||
data: $request->all(),
|
data: $request->all(),
|
||||||
isOwnUser: auth()->id() === $user->id,
|
isOwnUser: currentUser()?->id === $user->id,
|
||||||
isLvTenant: $this->tenant->slug === 'lv',
|
isLvTenant: $this->tenant->slug === 'lv',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Domains\Admin\Controllers\UserDetailGetController;
|
use App\Domains\Admin\Controllers\DocumentAssetDeleteController;
|
||||||
use App\Domains\Admin\Controllers\UserListApiController;
|
use App\Domains\Admin\Controllers\DocumentAssetUpdateController;
|
||||||
use App\Domains\Admin\Controllers\UserResetPasswordController;
|
use App\Domains\Admin\Controllers\DocumentTemplatesGetController;
|
||||||
use App\Domains\Admin\Controllers\UserToggleActiveController;
|
use App\Domains\Admin\Controllers\DocumentTemplatesPreviewController;
|
||||||
use App\Domains\Admin\Controllers\UserUpdateController;
|
use App\Domains\Admin\Controllers\DocumentTemplatesUpdateController;
|
||||||
use App\Domains\Admin\Controllers\ManagedTenantContactGetController;
|
use App\Domains\Admin\Controllers\ManagedTenantContactGetController;
|
||||||
use App\Domains\Admin\Controllers\ManagedTenantContactUpdateController;
|
use App\Domains\Admin\Controllers\ManagedTenantContactUpdateController;
|
||||||
use App\Domains\Admin\Controllers\ManagedTenantGdprGetController;
|
use App\Domains\Admin\Controllers\ManagedTenantGdprGetController;
|
||||||
@@ -13,6 +13,8 @@ use App\Domains\Admin\Controllers\ManagedTenantImpressGetController;
|
|||||||
use App\Domains\Admin\Controllers\ManagedTenantImpressUpdateController;
|
use App\Domains\Admin\Controllers\ManagedTenantImpressUpdateController;
|
||||||
use App\Domains\Admin\Controllers\ManagedTenantPaymentGetController;
|
use App\Domains\Admin\Controllers\ManagedTenantPaymentGetController;
|
||||||
use App\Domains\Admin\Controllers\ManagedTenantPaymentUpdateController;
|
use App\Domains\Admin\Controllers\ManagedTenantPaymentUpdateController;
|
||||||
|
use App\Domains\Admin\Controllers\ManagedTenantTaxGetController;
|
||||||
|
use App\Domains\Admin\Controllers\ManagedTenantTaxUpdateController;
|
||||||
use App\Domains\Admin\Controllers\TenantContactGetController;
|
use App\Domains\Admin\Controllers\TenantContactGetController;
|
||||||
use App\Domains\Admin\Controllers\TenantContactUpdateController;
|
use App\Domains\Admin\Controllers\TenantContactUpdateController;
|
||||||
use App\Domains\Admin\Controllers\TenantCreateController;
|
use App\Domains\Admin\Controllers\TenantCreateController;
|
||||||
@@ -24,12 +26,20 @@ use App\Domains\Admin\Controllers\TenantImpressGetController;
|
|||||||
use App\Domains\Admin\Controllers\TenantImpressUpdateController;
|
use App\Domains\Admin\Controllers\TenantImpressUpdateController;
|
||||||
use App\Domains\Admin\Controllers\TenantListApiController;
|
use App\Domains\Admin\Controllers\TenantListApiController;
|
||||||
use App\Domains\Admin\Controllers\TenantPaymentGetController;
|
use App\Domains\Admin\Controllers\TenantPaymentGetController;
|
||||||
use App\Domains\Admin\Controllers\TenantPaymentUpdateController;
|
|
||||||
use App\Domains\Admin\Controllers\TenantPaymentMethodsGetController;
|
use App\Domains\Admin\Controllers\TenantPaymentMethodsGetController;
|
||||||
use App\Domains\Admin\Controllers\TenantPaymentMethodsUpdateController;
|
use App\Domains\Admin\Controllers\TenantPaymentMethodsUpdateController;
|
||||||
|
use App\Domains\Admin\Controllers\TenantPaymentUpdateController;
|
||||||
|
use App\Domains\Admin\Controllers\TenantTaxGetController;
|
||||||
|
use App\Domains\Admin\Controllers\TenantTaxUpdateController;
|
||||||
|
use App\Domains\Admin\Controllers\UserDetailGetController;
|
||||||
|
use App\Domains\Admin\Controllers\UserListApiController;
|
||||||
|
use App\Domains\Admin\Controllers\UserResetPasswordController;
|
||||||
|
use App\Domains\Admin\Controllers\UserToggleActiveController;
|
||||||
|
use App\Domains\Admin\Controllers\UserUpdateController;
|
||||||
use App\Middleware\AdminRoleMiddleware;
|
use App\Middleware\AdminRoleMiddleware;
|
||||||
use App\Middleware\IdentifyTenant;
|
use App\Middleware\IdentifyTenant;
|
||||||
use App\Middleware\LvOnlyMiddleware;
|
use App\Middleware\LvOnlyMiddleware;
|
||||||
|
use App\Middleware\MainAdminRoleMiddleware;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->group(function () {
|
Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->group(function () {
|
||||||
@@ -44,6 +54,8 @@ Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->
|
|||||||
Route::post('/impress', TenantImpressUpdateController::class);
|
Route::post('/impress', TenantImpressUpdateController::class);
|
||||||
Route::get('/gdpr', TenantGdprGetController::class);
|
Route::get('/gdpr', TenantGdprGetController::class);
|
||||||
Route::post('/gdpr', TenantGdprUpdateController::class);
|
Route::post('/gdpr', TenantGdprUpdateController::class);
|
||||||
|
Route::get('/tax', TenantTaxGetController::class);
|
||||||
|
Route::post('/tax', TenantTaxUpdateController::class);
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::prefix('api/v1/admin/users')->group(function () {
|
Route::prefix('api/v1/admin/users')->group(function () {
|
||||||
@@ -54,6 +66,18 @@ Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->
|
|||||||
Route::post('/{id}/reset-password', UserResetPasswordController::class);
|
Route::post('/{id}/reset-password', UserResetPasswordController::class);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Dokumentvorlagen gelten app-weit für alle Mandanten -- deshalb nur für Hauptadministrator*innen,
|
||||||
|
// AdminRoleMiddleware allein ließe auch Gruppenleitungen durch.
|
||||||
|
Route::middleware(MainAdminRoleMiddleware::class)->group(function () {
|
||||||
|
Route::prefix('api/v1/admin/document-templates')->group(function () {
|
||||||
|
Route::get('/', DocumentTemplatesGetController::class);
|
||||||
|
Route::post('/', DocumentTemplatesUpdateController::class);
|
||||||
|
Route::post('/preview', DocumentTemplatesPreviewController::class);
|
||||||
|
Route::post('/assets', DocumentAssetUpdateController::class);
|
||||||
|
Route::delete('/assets/{name}', DocumentAssetDeleteController::class);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
Route::middleware(LvOnlyMiddleware::class)->group(function () {
|
Route::middleware(LvOnlyMiddleware::class)->group(function () {
|
||||||
Route::prefix('api/v1/admin/tenants')->group(function () {
|
Route::prefix('api/v1/admin/tenants')->group(function () {
|
||||||
Route::get('/list', TenantListApiController::class);
|
Route::get('/list', TenantListApiController::class);
|
||||||
@@ -69,6 +93,8 @@ Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->
|
|||||||
Route::post('/impress', ManagedTenantImpressUpdateController::class);
|
Route::post('/impress', ManagedTenantImpressUpdateController::class);
|
||||||
Route::get('/gdpr', ManagedTenantGdprGetController::class);
|
Route::get('/gdpr', ManagedTenantGdprGetController::class);
|
||||||
Route::post('/gdpr', ManagedTenantGdprUpdateController::class);
|
Route::post('/gdpr', ManagedTenantGdprUpdateController::class);
|
||||||
|
Route::get('/tax', ManagedTenantTaxGetController::class);
|
||||||
|
Route::post('/tax', ManagedTenantTaxUpdateController::class);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Domains\Admin\Controllers\AdminDashboardController;
|
use App\Domains\Admin\Controllers\AdminDashboardController;
|
||||||
|
use App\Domains\Admin\Controllers\DocumentTemplatesPageController;
|
||||||
use App\Domains\Admin\Controllers\TenantEditPageController;
|
use App\Domains\Admin\Controllers\TenantEditPageController;
|
||||||
use App\Domains\Admin\Controllers\TenantListPageController;
|
use App\Domains\Admin\Controllers\TenantListPageController;
|
||||||
use App\Domains\Admin\Controllers\TenantPageController;
|
use App\Domains\Admin\Controllers\TenantPageController;
|
||||||
@@ -8,6 +9,7 @@ use App\Domains\Admin\Controllers\UserListPageController;
|
|||||||
use App\Middleware\AdminRoleMiddleware;
|
use App\Middleware\AdminRoleMiddleware;
|
||||||
use App\Middleware\IdentifyTenant;
|
use App\Middleware\IdentifyTenant;
|
||||||
use App\Middleware\LvOnlyMiddleware;
|
use App\Middleware\LvOnlyMiddleware;
|
||||||
|
use App\Middleware\MainAdminRoleMiddleware;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->group(function () {
|
Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->group(function () {
|
||||||
@@ -16,6 +18,11 @@ Route::middleware([IdentifyTenant::class, 'auth', AdminRoleMiddleware::class])->
|
|||||||
Route::get('/tenant', TenantPageController::class);
|
Route::get('/tenant', TenantPageController::class);
|
||||||
Route::get('/users', UserListPageController::class);
|
Route::get('/users', UserListPageController::class);
|
||||||
|
|
||||||
|
// App-weit gültige Dokumentvorlagen -- nur für Hauptadministrator*innen.
|
||||||
|
Route::middleware(MainAdminRoleMiddleware::class)->group(function () {
|
||||||
|
Route::get('/document-templates', DocumentTemplatesPageController::class);
|
||||||
|
});
|
||||||
|
|
||||||
Route::middleware(LvOnlyMiddleware::class)->group(function () {
|
Route::middleware(LvOnlyMiddleware::class)->group(function () {
|
||||||
Route::get('/tenants', TenantListPageController::class);
|
Route::get('/tenants', TenantListPageController::class);
|
||||||
Route::get('/tenants/{slug}', TenantEditPageController::class);
|
Route::get('/tenants/{slug}', TenantEditPageController::class);
|
||||||
|
|||||||
@@ -0,0 +1,666 @@
|
|||||||
|
<script setup>
|
||||||
|
import {computed, onMounted, ref} from 'vue'
|
||||||
|
import {toast} from 'vue3-toastify'
|
||||||
|
import AdminAppLayout from '../../../../resources/js/layouts/AdminAppLayout.vue'
|
||||||
|
import ShadowedBox from '../../../Views/Components/ShadowedBox.vue'
|
||||||
|
import TextEditor from '../../../Views/Components/TextEditor.vue'
|
||||||
|
import {useAjax} from '../../../../resources/js/components/ajaxHandler.js'
|
||||||
|
|
||||||
|
const {request} = useAjax()
|
||||||
|
|
||||||
|
const blocks = ref([])
|
||||||
|
const assets = ref([])
|
||||||
|
const tokenGroups = ref({})
|
||||||
|
|
||||||
|
// Die Vorlagen sind nach Dokumentart getrennt; der Umschalter lädt jeweils deren Blöcke neu.
|
||||||
|
const documentType = ref(null)
|
||||||
|
const documentTypes = ref([])
|
||||||
|
|
||||||
|
const activeBlock = ref(null)
|
||||||
|
const saving = ref(false)
|
||||||
|
|
||||||
|
// Die Vorschau ist ein PDF, das aus den aktuellen -- auch ungespeicherten -- Blockinhalten entsteht.
|
||||||
|
const previewUrl = ref(null)
|
||||||
|
const previewLoading = ref(false)
|
||||||
|
|
||||||
|
const newAsset = ref({name: '', label: '', file: null})
|
||||||
|
const assetInput = ref(null)
|
||||||
|
|
||||||
|
const current = computed(() => blocks.value.find(b => b.block === activeBlock.value) ?? null)
|
||||||
|
|
||||||
|
/** Beim Blockwechsel die gemerkte Einfügemarke verwerfen -- sie gehört zum vorigen Text. */
|
||||||
|
function selectBlock(block) {
|
||||||
|
activeBlock.value = block
|
||||||
|
caret.value = null
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(load)
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
const query = documentType.value ? '?type=' + encodeURIComponent(documentType.value) : ''
|
||||||
|
const data = await request('/api/v1/admin/document-templates' + query, {method: 'GET'})
|
||||||
|
if (!data) {
|
||||||
|
toast.error('Die Vorlage konnte nicht geladen werden.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
documentType.value = data.documentType
|
||||||
|
documentTypes.value = data.documentTypes ?? []
|
||||||
|
blocks.value = data.blocks ?? []
|
||||||
|
assets.value = data.assets ?? []
|
||||||
|
tokenGroups.value = data.tokenGroups ?? {}
|
||||||
|
activeBlock.value = blocks.value.find(b => b.editable)?.block ?? blocks.value[0]?.block ?? null
|
||||||
|
|
||||||
|
await refreshPreview()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Beim Wechsel der Dokumentart alles neu holen -- Blöcke und Platzhalter sind je Art andere. */
|
||||||
|
async function selectDocumentType(type) {
|
||||||
|
if (type === documentType.value) return
|
||||||
|
|
||||||
|
documentType.value = type
|
||||||
|
caret.value = null
|
||||||
|
await load()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Nur editierbare Blöcke werden gesendet; der generierte Rechnungsinhalt bleibt unverändert. */
|
||||||
|
function editableBlocks() {
|
||||||
|
return Object.fromEntries(
|
||||||
|
blocks.value.filter(b => b.editable).map(b => [b.block, b.content ?? ''])
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
saving.value = true
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await request('/api/v1/admin/document-templates', {
|
||||||
|
method: 'POST',
|
||||||
|
body: {type: documentType.value, blocks: editableBlocks()},
|
||||||
|
})
|
||||||
|
|
||||||
|
if (response?.status === 'success') {
|
||||||
|
toast.success(response.message)
|
||||||
|
} else {
|
||||||
|
toast.error(response?.message ?? 'Fehler beim Speichern')
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
saving.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function refreshPreview() {
|
||||||
|
previewLoading.value = true
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch('/api/v1/admin/document-templates/preview', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]')?.content ?? '',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({type: documentType.value, blocks: editableBlocks()}),
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
toast.error('Die Vorschau konnte nicht erzeugt werden.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (previewUrl.value) {
|
||||||
|
URL.revokeObjectURL(previewUrl.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
previewUrl.value = URL.createObjectURL(await response.blob())
|
||||||
|
} finally {
|
||||||
|
previewLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Platzhalter an der Einfügemarke ergänzen. Im WYSIWYG-Editor übernimmt das TinyMCE selbst, im
|
||||||
|
* Quelltext-Editor wird an der zuletzt bekannten Cursorposition eingesetzt.
|
||||||
|
*/
|
||||||
|
function insertToken(token) {
|
||||||
|
const block = current.value
|
||||||
|
if (!block) return
|
||||||
|
|
||||||
|
const placeholder = wrapForBlock('{' + token + '}', token, block)
|
||||||
|
|
||||||
|
if (block.source) {
|
||||||
|
insertIntoTextarea(placeholder)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const editor = window.tinymce?.activeEditor
|
||||||
|
if (editor) {
|
||||||
|
editor.execCommand('mceInsertContent', false, placeholder)
|
||||||
|
} else {
|
||||||
|
block.content = (block.content ?? '') + placeholder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ein Bild-Platzhalter allein ist nirgends sinnvoll: er expandiert zum nackten Data-URI, das dann als
|
||||||
|
* Zeichenkette im Dokument steht. Er braucht immer eine Hülle — im CSS url("..."), sonst ein <img>.
|
||||||
|
*
|
||||||
|
* Im CSS ist das zusätzlich eine Frage der Funktionsfähigkeit: ein Data-URI ausserhalb von url()
|
||||||
|
* kann dompdf nicht verarbeiten und läuft ins Zeitlimit.
|
||||||
|
*/
|
||||||
|
function wrapForBlock(placeholder, token, block) {
|
||||||
|
if (!token.startsWith('asset:')) {
|
||||||
|
return placeholder
|
||||||
|
}
|
||||||
|
|
||||||
|
return block.block === 'style'
|
||||||
|
? `url("${placeholder}")`
|
||||||
|
: `<img src="${placeholder}" alt="" />`
|
||||||
|
}
|
||||||
|
|
||||||
|
const sourceArea = ref(null)
|
||||||
|
// Zuletzt bekannte Einfügemarke im Quelltext-Feld. Ohne das würde ein Klick in der weit darunter
|
||||||
|
// liegenden Platzhalter- oder Bilder-Liste an unvorhersehbarer Stelle einfügen.
|
||||||
|
const caret = ref(null)
|
||||||
|
|
||||||
|
function rememberCaret() {
|
||||||
|
const area = sourceArea.value
|
||||||
|
if (!area) return
|
||||||
|
|
||||||
|
caret.value = {start: area.selectionStart, end: area.selectionEnd}
|
||||||
|
}
|
||||||
|
|
||||||
|
function insertIntoTextarea(text) {
|
||||||
|
const block = current.value
|
||||||
|
if (!block) return
|
||||||
|
|
||||||
|
const content = block.content ?? ''
|
||||||
|
const position = caret.value
|
||||||
|
|
||||||
|
if (position === null) {
|
||||||
|
block.content = content + text
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
block.content = content.slice(0, position.start) + text + content.slice(position.end)
|
||||||
|
caret.value = {start: position.start + text.length, end: position.start + text.length}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function uploadAsset() {
|
||||||
|
const form = new FormData()
|
||||||
|
form.append('name', newAsset.value.name)
|
||||||
|
form.append('label', newAsset.value.label ?? '')
|
||||||
|
if (newAsset.value.file) {
|
||||||
|
form.append('file', newAsset.value.file)
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await request('/api/v1/admin/document-templates/assets', {
|
||||||
|
method: 'POST',
|
||||||
|
body: form,
|
||||||
|
})
|
||||||
|
|
||||||
|
if (result?.status === 'success') {
|
||||||
|
toast.success(result.message)
|
||||||
|
newAsset.value = {name: '', label: '', file: null}
|
||||||
|
if (assetInput.value) assetInput.value.value = ''
|
||||||
|
await load()
|
||||||
|
} else {
|
||||||
|
toast.error(result?.message ?? 'Fehler beim Hochladen')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deleteAsset(name) {
|
||||||
|
if (!confirm(`Das Bild „${name}" wirklich löschen?`)) return
|
||||||
|
|
||||||
|
const result = await request('/api/v1/admin/document-templates/assets/' + name, {method: 'DELETE'})
|
||||||
|
|
||||||
|
if (result?.status === 'success') {
|
||||||
|
toast.success(result.message)
|
||||||
|
await load()
|
||||||
|
} else {
|
||||||
|
// Ein noch in der Vorlage referenziertes Bild lehnt der Server ab.
|
||||||
|
toast.error(result?.message ?? 'Das Bild konnte nicht gelöscht werden.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function copyToken(token) {
|
||||||
|
navigator.clipboard?.writeText(token)
|
||||||
|
toast.success(`${token} kopiert`)
|
||||||
|
}
|
||||||
|
|
||||||
|
function onFileChosen(event) {
|
||||||
|
newAsset.value.file = event.target.files?.[0] ?? null
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<AdminAppLayout title="Dokumentvorlagen">
|
||||||
|
<shadowed-box style="width: 95%; margin: 20px auto; padding: 20px;">
|
||||||
|
<p class="intro">
|
||||||
|
Die Vorlagen gelten für <strong>alle Mandanten</strong>; die eingesetzten Werte kommen je
|
||||||
|
Dokument aus dem jeweiligen Mandanten. Sie liegen in der Datenbank und werden von einem
|
||||||
|
Update nicht überschrieben.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="type-switch">
|
||||||
|
<label for="document-type">Dokumentart</label>
|
||||||
|
<select
|
||||||
|
id="document-type"
|
||||||
|
class="form-input"
|
||||||
|
:value="documentType"
|
||||||
|
@change="selectDocumentType($event.target.value)"
|
||||||
|
>
|
||||||
|
<option v-for="type in documentTypes" :key="type.value" :value="type.value">
|
||||||
|
{{ type.label }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="layout">
|
||||||
|
<!-- ── Blöcke und Editor ── -->
|
||||||
|
<div class="editor-column">
|
||||||
|
<div class="block-tabs">
|
||||||
|
<button
|
||||||
|
v-for="block in blocks"
|
||||||
|
:key="block.block"
|
||||||
|
class="block-tab"
|
||||||
|
:class="{active: block.block === activeBlock, readonly: !block.editable}"
|
||||||
|
@click="selectBlock(block.block)"
|
||||||
|
>
|
||||||
|
{{ block.label }}
|
||||||
|
<span v-if="!block.editable" class="badge">generiert</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="current" class="editor-panel">
|
||||||
|
<p v-if="!current.editable" class="notice">
|
||||||
|
Dieser Block wird beim Erzeugen des Dokuments aus den Daten der Anmeldung
|
||||||
|
zusammengesetzt und lässt sich nicht bearbeiten.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p v-else-if="current.source" class="notice">
|
||||||
|
Enthält den Seitenaufbau bzw. die Gestaltung und wird deshalb im Quelltext
|
||||||
|
bearbeitet. Für Adresse, Logo oder Fußnote ist das nicht nötig.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<textarea
|
||||||
|
v-if="current.source || !current.editable"
|
||||||
|
ref="sourceArea"
|
||||||
|
v-model="current.content"
|
||||||
|
class="source-editor"
|
||||||
|
:readonly="!current.editable"
|
||||||
|
spellcheck="false"
|
||||||
|
rows="24"
|
||||||
|
@click="rememberCaret"
|
||||||
|
@keyup="rememberCaret"
|
||||||
|
@blur="rememberCaret"
|
||||||
|
></textarea>
|
||||||
|
|
||||||
|
<!-- convert-urls aus: sonst schreibt TinyMCE {asset:...} in einem src um. -->
|
||||||
|
<TextEditor v-else v-model="current.content" :convert-urls="false" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="actions">
|
||||||
|
<button class="btn-save" :disabled="saving" @click="save">
|
||||||
|
{{ saving ? 'Wird gespeichert…' : 'Speichern' }}
|
||||||
|
</button>
|
||||||
|
<button class="btn-secondary" :disabled="previewLoading" @click="refreshPreview">
|
||||||
|
{{ previewLoading ? 'Wird erzeugt…' : 'Vorschau aktualisieren' }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ── Platzhalter ── -->
|
||||||
|
<div class="tokens">
|
||||||
|
<h3>Platzhalter</h3>
|
||||||
|
<p class="tokens-hint">
|
||||||
|
Klicken fügt den Platzhalter an der Einfügemarke ein — in
|
||||||
|
<strong>{{ current?.label ?? '—' }}</strong>. Mit
|
||||||
|
<code>{if:name}…{/if:name}</code> lässt sich ein Abschnitt weglassen, solange
|
||||||
|
der Platzhalter leer ist.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div v-for="(group, key) in tokenGroups" :key="key" class="token-group">
|
||||||
|
<h4>{{ group.label }}</h4>
|
||||||
|
<button
|
||||||
|
v-for="(token, name) in group.tokens"
|
||||||
|
:key="name"
|
||||||
|
class="token"
|
||||||
|
:title="token.description"
|
||||||
|
@click="insertToken(name)"
|
||||||
|
>{{ '{' + name + '}' }}</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ── Bilder ── -->
|
||||||
|
<div class="assets">
|
||||||
|
<h3>Bilder</h3>
|
||||||
|
<p class="tokens-hint">
|
||||||
|
Liegen in der Datenbank, damit ein Update sie nicht überschreibt. „Einfügen"
|
||||||
|
schreibt in <strong>{{ current?.label ?? '—' }}</strong><template
|
||||||
|
v-if="current?.block === 'style'"> — im CSS als
|
||||||
|
<code>url("…")</code>, anders kann dompdf ein Bild dort nicht verarbeiten</template>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<table class="asset-table">
|
||||||
|
<tr v-for="asset in assets" :key="asset.name">
|
||||||
|
<td class="asset-preview"><img :src="asset.preview" :alt="asset.name" /></td>
|
||||||
|
<td>
|
||||||
|
<strong>{{ asset.name }}</strong>
|
||||||
|
<span v-if="asset.label" class="asset-label">{{ asset.label }}</span>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<code class="token-code" @click="copyToken(asset.token)">{{ asset.token }}</code>
|
||||||
|
</td>
|
||||||
|
<td class="asset-actions">
|
||||||
|
<button class="btn-link" @click="insertToken('asset:' + asset.name)">Einfügen</button>
|
||||||
|
<button class="btn-link danger" @click="deleteAsset(asset.name)">Löschen</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<div class="asset-upload">
|
||||||
|
<input v-model="newAsset.name" type="text" placeholder="Name, z. B. logo" class="form-input" />
|
||||||
|
<input v-model="newAsset.label" type="text" placeholder="Beschreibung (optional)" class="form-input" />
|
||||||
|
<input ref="assetInput" type="file" accept="image/*" @change="onFileChosen" />
|
||||||
|
<button class="btn-secondary" :disabled="!newAsset.name" @click="uploadAsset">
|
||||||
|
Hochladen
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- ── Vorschau ── -->
|
||||||
|
<div class="preview-column">
|
||||||
|
<h3>Vorschau</h3>
|
||||||
|
<p class="tokens-hint">Mit Beispieldaten, ohne zu speichern.</p>
|
||||||
|
<iframe v-if="previewUrl" :src="previewUrl" class="preview-frame"></iframe>
|
||||||
|
<p v-else class="notice">Noch keine Vorschau erzeugt.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</shadowed-box>
|
||||||
|
</AdminAppLayout>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.intro {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-left: 3px solid #f5c400;
|
||||||
|
background-color: #fffef5;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: #4b5563;
|
||||||
|
}
|
||||||
|
|
||||||
|
.type-switch {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
margin-bottom: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.type-switch label {
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: #4b5563;
|
||||||
|
}
|
||||||
|
|
||||||
|
.type-switch select {
|
||||||
|
width: auto;
|
||||||
|
min-width: 220px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.layout {
|
||||||
|
display: flex;
|
||||||
|
gap: 24px;
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-column {
|
||||||
|
flex: 1 1 60%;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preview-column {
|
||||||
|
flex: 1 1 40%;
|
||||||
|
min-width: 320px;
|
||||||
|
position: sticky;
|
||||||
|
top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block-tabs {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 6px;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block-tab {
|
||||||
|
padding: 6px 12px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 6px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block-tab.active {
|
||||||
|
background-color: #1d4899;
|
||||||
|
border-color: #1d4899;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block-tab.readonly {
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge {
|
||||||
|
margin-left: 6px;
|
||||||
|
padding: 1px 5px;
|
||||||
|
border-radius: 3px;
|
||||||
|
background-color: #e5e7eb;
|
||||||
|
color: #4b5563;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block-tab.active .badge {
|
||||||
|
background-color: rgba(255, 255, 255, 0.25);
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-panel {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source-editor {
|
||||||
|
width: 100%;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-family: 'DejaVu Sans Mono', Menlo, Consolas, monospace;
|
||||||
|
font-size: 0.82rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
box-sizing: border-box;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source-editor[readonly] {
|
||||||
|
background-color: #f9fafb;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-save, .btn-secondary {
|
||||||
|
padding: 8px 20px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-save {
|
||||||
|
background-color: #16a34a;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-save:hover:not(:disabled) {
|
||||||
|
background-color: #15803d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-secondary {
|
||||||
|
background-color: #e5e7eb;
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-secondary:hover:not(:disabled) {
|
||||||
|
background-color: #d1d5db;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-save:disabled, .btn-secondary:disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tokens, .assets {
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tokens h3, .assets h3, .preview-column h3 {
|
||||||
|
margin-bottom: 6px;
|
||||||
|
font-size: 1rem;
|
||||||
|
color: #111827;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tokens-hint {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tokens-hint code, .token-code {
|
||||||
|
padding: 1px 4px;
|
||||||
|
background-color: #f3f4f6;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 0.95em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.token-group {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.token-group h4 {
|
||||||
|
margin-bottom: 4px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
font-weight: normal;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.token {
|
||||||
|
margin: 0 4px 4px 0;
|
||||||
|
padding: 3px 8px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 4px;
|
||||||
|
background-color: #f9fafb;
|
||||||
|
cursor: pointer;
|
||||||
|
font-family: 'DejaVu Sans Mono', Menlo, Consolas, monospace;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
|
||||||
|
.token:hover {
|
||||||
|
background-color: #eef2ff;
|
||||||
|
border-color: #1d4899;
|
||||||
|
}
|
||||||
|
|
||||||
|
.asset-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.asset-table td {
|
||||||
|
padding: 6px 8px;
|
||||||
|
border-bottom: 1px solid #e5e7eb;
|
||||||
|
vertical-align: middle;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.asset-preview img {
|
||||||
|
max-width: 60px;
|
||||||
|
max-height: 40px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.asset-label {
|
||||||
|
display: block;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.token-code {
|
||||||
|
cursor: pointer;
|
||||||
|
font-family: 'DejaVu Sans Mono', Menlo, Consolas, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
.asset-actions {
|
||||||
|
text-align: right;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-link {
|
||||||
|
padding: 2px 6px;
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: #1d4899;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-link.danger {
|
||||||
|
color: #b91c1c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.asset-upload {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-input {
|
||||||
|
padding: 6px 10px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preview-frame {
|
||||||
|
width: 100%;
|
||||||
|
height: 780px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 6px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1100px) {
|
||||||
|
.layout {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preview-column {
|
||||||
|
position: static;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -13,9 +13,17 @@ const props = defineProps({
|
|||||||
const { request } = useAjax()
|
const { request } = useAjax()
|
||||||
|
|
||||||
const editing = ref(false)
|
const editing = ref(false)
|
||||||
|
// Solange kein eigener Absender eingetragen ist, steht auf der Rechnung der Name des Mandanten.
|
||||||
|
const senderFallback = props.data.name ?? ''
|
||||||
|
|
||||||
const form = ref({
|
const form = ref({
|
||||||
|
invoice_sender_name: props.data.invoice_sender_name ?? '',
|
||||||
email: props.data.email ?? '',
|
email: props.data.email ?? '',
|
||||||
email_finance: props.data.email_finance ?? '',
|
email_finance: props.data.email_finance ?? '',
|
||||||
|
phone: props.data.phone ?? '',
|
||||||
|
address_1: props.data.address_1 ?? '',
|
||||||
|
address_2: props.data.address_2 ?? '',
|
||||||
|
address_3: props.data.address_3 ?? '',
|
||||||
postcode: props.data.postcode ?? '',
|
postcode: props.data.postcode ?? '',
|
||||||
city: props.data.city ?? '',
|
city: props.data.city ?? '',
|
||||||
})
|
})
|
||||||
@@ -39,16 +47,49 @@ async function save() {
|
|||||||
<template>
|
<template>
|
||||||
<div v-if="!editing">
|
<div v-if="!editing">
|
||||||
<table class="data-table">
|
<table class="data-table">
|
||||||
|
<tr>
|
||||||
|
<th>Rechnungs-Absender:</th>
|
||||||
|
<td>
|
||||||
|
{{ form.invoice_sender_name || senderFallback }}
|
||||||
|
<span v-if="!form.invoice_sender_name" class="field-hint">
|
||||||
|
Name des Mandanten, da nichts Eigenes hinterlegt ist
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr><th>Email:</th><td>{{ form.email }}</td></tr>
|
<tr><th>Email:</th><td>{{ form.email }}</td></tr>
|
||||||
<tr><th>Email Schatzmeister*in:</th><td>{{ form.email_finance }}</td></tr>
|
<tr><th>Email Schatzmeister*in:</th><td>{{ form.email_finance }}</td></tr>
|
||||||
|
<tr><th>Telefon:</th><td>{{ form.phone || '—' }}</td></tr>
|
||||||
|
<tr><th>Straße & Hausnummer:</th><td>{{ form.address_1 || '—' }}</td></tr>
|
||||||
|
<tr><th>Adresszusatz:</th><td>{{ form.address_2 || '—' }}</td></tr>
|
||||||
|
<tr><th>Weiterer Zusatz:</th><td>{{ form.address_3 || '—' }}</td></tr>
|
||||||
<tr><th>Postleitzahl:</th><td>{{ form.postcode }}</td></tr>
|
<tr><th>Postleitzahl:</th><td>{{ form.postcode }}</td></tr>
|
||||||
<tr><th>Ort:</th><td>{{ form.city }}</td></tr>
|
<tr><th>Ort:</th><td>{{ form.city }}</td></tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<p v-if="!form.address_1" class="hint">
|
||||||
|
Ohne Straße & Hausnummer ist die Anschrift auf Rechnungen unvollständig
|
||||||
|
(§ 14 Abs. 4 UStG).
|
||||||
|
</p>
|
||||||
<button class="btn-edit" @click="editing = true">Bearbeiten</button>
|
<button class="btn-edit" @click="editing = true">Bearbeiten</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<table class="data-table">
|
<table class="data-table">
|
||||||
|
<tr>
|
||||||
|
<th>Rechnungs-Absender:</th>
|
||||||
|
<td>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
v-model="form.invoice_sender_name"
|
||||||
|
class="form-input"
|
||||||
|
:placeholder="senderFallback"
|
||||||
|
/>
|
||||||
|
<span class="field-hint">
|
||||||
|
Vollständige Bezeichnung mit Rechtsform, wie sie auf der Rechnung stehen soll.
|
||||||
|
Leer lassen, um den Namen des Mandanten zu verwenden.
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Email:</th>
|
<th>Email:</th>
|
||||||
<td><input type="email" v-model="form.email" class="form-input" /></td>
|
<td><input type="email" v-model="form.email" class="form-input" /></td>
|
||||||
@@ -57,6 +98,27 @@ async function save() {
|
|||||||
<th>Email Schatzmeister*in:</th>
|
<th>Email Schatzmeister*in:</th>
|
||||||
<td><input type="email" v-model="form.email_finance" class="form-input" /></td>
|
<td><input type="email" v-model="form.email_finance" class="form-input" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Telefon:</th>
|
||||||
|
<td><input type="text" v-model="form.phone" class="form-input" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Straße & Hausnummer:</th>
|
||||||
|
<td>
|
||||||
|
<input type="text" v-model="form.address_1" class="form-input" />
|
||||||
|
<span class="field-hint">Pflichtangabe für Rechnungen (§ 14 Abs. 4 UStG)</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Adresszusatz:</th>
|
||||||
|
<td>
|
||||||
|
<input type="text" v-model="form.address_2" class="form-input" placeholder="z. B. c/o Mustermensch" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Weiterer Zusatz:</th>
|
||||||
|
<td><input type="text" v-model="form.address_3" class="form-input" /></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Postleitzahl:</th>
|
<th>Postleitzahl:</th>
|
||||||
<td><input type="text" v-model="form.postcode" class="form-input" /></td>
|
<td><input type="text" v-model="form.postcode" class="form-input" /></td>
|
||||||
@@ -101,6 +163,22 @@ async function save() {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.field-hint {
|
||||||
|
display: block;
|
||||||
|
margin-top: 4px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hint {
|
||||||
|
margin-top: 12px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-left: 3px solid #f5c400;
|
||||||
|
background-color: #fffef5;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: #4b5563;
|
||||||
|
}
|
||||||
|
|
||||||
.btn-edit, .btn-save, .btn-cancel {
|
.btn-edit, .btn-save, .btn-cancel {
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
padding: 8px 20px;
|
padding: 8px 20px;
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import {computed, ref} from 'vue';
|
import {computed, ref} from 'vue';
|
||||||
|
import BankRulesetEditor from "../../../../Views/Components/BankRulesetEditor.vue";
|
||||||
import FullScreenModal from "../../../../Views/Components/FullScreenModal.vue";
|
import FullScreenModal from "../../../../Views/Components/FullScreenModal.vue";
|
||||||
import TextEditor from "../../../../Views/Components/TextEditor.vue";
|
import TextEditor from "../../../../Views/Components/TextEditor.vue";
|
||||||
|
import RichSelectBox from "../../../../Views/Components/RichSelectBox.vue";
|
||||||
|
import {PAYMENT_METHOD_ICONS} from "../../../../../resources/js/constants/paymentMethodIcons.js";
|
||||||
import {useAjax} from "../../../../../resources/js/components/ajaxHandler.js";
|
import {useAjax} from "../../../../../resources/js/components/ajaxHandler.js";
|
||||||
import {toast} from "vue3-toastify";
|
import {toast} from "vue3-toastify";
|
||||||
|
|
||||||
@@ -90,15 +93,22 @@ async function save() {
|
|||||||
|
|
||||||
<FullScreenModal :show="editing !== null" @close="close">
|
<FullScreenModal :show="editing !== null" @close="close">
|
||||||
<template v-if="editing">
|
<template v-if="editing">
|
||||||
<h2>Zahlungsweg bearbeiten</h2>
|
<h2>Zahlungsmodul bearbeiten</h2>
|
||||||
<table class="data-table">
|
<table class="data-table">
|
||||||
<tr><th>Name</th><td><input type="text" v-model="form.name" class="form-input" /></td></tr>
|
<tr><th>Name</th><td><input type="text" v-model="form.name" class="form-input" /></td></tr>
|
||||||
<tr><th>Beschreibung</th><td><textarea v-model="form.description" class="form-input"></textarea></td></tr>
|
<tr><th>Beschreibung</th><td><textarea v-model="form.description" class="form-input"></textarea></td></tr>
|
||||||
<tr v-for="option in editing.optionsSchema ?? []" :key="option.name">
|
<tr v-for="option in editing.optionsSchema ?? []" :key="option.name">
|
||||||
<th>{{ option.label }}<span v-if="option.required" class="required-marker">*</span></th>
|
<th>{{ option.label }}<span v-if="option.required" class="required-marker">*</span></th>
|
||||||
<td>
|
<td>
|
||||||
<TextEditor v-if="option.type === 'richtext'" v-model="form.configuration[option.name]"/>
|
<RichSelectBox v-if="option.type === 'icon'" v-model="form.configuration[option.name]"
|
||||||
|
:options="PAYMENT_METHOD_ICONS" placeholder="Symbol wählen…"/>
|
||||||
|
<TextEditor v-else-if="option.type === 'richtext'" v-model="form.configuration[option.name]"/>
|
||||||
|
<BankRulesetEditor v-else-if="option.type === 'bank-ruleset'"
|
||||||
|
v-model="form.configuration[option.name]"
|
||||||
|
:defaults="data.statementRulesetDefault ?? {}"
|
||||||
|
:charsets="data.statementRulesetCharsets ?? undefined"/>
|
||||||
<input v-else type="text" v-model="form.configuration[option.name]" class="form-input"/>
|
<input v-else type="text" v-model="form.configuration[option.name]" class="form-input"/>
|
||||||
|
<span v-if="option.hint" class="option-hint">{{ option.hint }}</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -217,6 +227,13 @@ async function save() {
|
|||||||
color: #b45309;
|
color: #b45309;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.option-hint {
|
||||||
|
display: block;
|
||||||
|
margin-top: 4px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
.btn-group {
|
.btn-group {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
|
|||||||
@@ -0,0 +1,317 @@
|
|||||||
|
<script setup>
|
||||||
|
import {computed, ref} from 'vue';
|
||||||
|
import {useAjax} from "../../../../../resources/js/components/ajaxHandler.js";
|
||||||
|
import RichSelectBox from "../../../../Views/Components/RichSelectBox.vue";
|
||||||
|
import {toast} from "vue3-toastify";
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
data: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({})
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const {request} = useAjax()
|
||||||
|
|
||||||
|
const editing = ref(false)
|
||||||
|
|
||||||
|
const reasons = computed(() => props.data.exemption_reasons ?? [])
|
||||||
|
const pricingModes = computed(() => props.data.pricing_modes ?? [])
|
||||||
|
|
||||||
|
const liableOptions = [
|
||||||
|
{value: '1', label: 'Ja – Umsatzsteuer wird erhoben'},
|
||||||
|
{value: '0', label: 'Nein – umsatzsteuerbefreit'},
|
||||||
|
]
|
||||||
|
|
||||||
|
const form = ref({
|
||||||
|
tax_liable: props.data.tax_liable ? '1' : '0',
|
||||||
|
vat_rate: props.data.vat_rate ?? 0,
|
||||||
|
tax_exemption_reason: props.data.tax_exemption_reason ?? '',
|
||||||
|
tax_exemption_note: props.data.tax_exemption_note ?? '',
|
||||||
|
vat_pricing_mode: props.data.vat_pricing_mode ?? 'inclusive',
|
||||||
|
tax_number: props.data.tax_number ?? '',
|
||||||
|
vat_id: props.data.vat_id ?? '',
|
||||||
|
invoice_prefix: props.data.invoice_prefix ?? '',
|
||||||
|
})
|
||||||
|
|
||||||
|
// Das Präfix bestimmt den Nummernkreis und darf sich nachträglich nicht ändern -- sonst gehörten bereits
|
||||||
|
// herausgegebene Rechnungen plötzlich zu einer anderen Nummer. Nur in der verwalteten Ansicht editierbar.
|
||||||
|
const canEditPrefix = computed(() => props.data.can_edit_invoice_prefix === true)
|
||||||
|
|
||||||
|
const isLiable = computed(() => form.value.tax_liable === '1')
|
||||||
|
const isCustomReason = computed(() => form.value.tax_exemption_reason === 'custom')
|
||||||
|
|
||||||
|
const selectedReason = computed(
|
||||||
|
() => reasons.value.find(r => r.value === form.value.tax_exemption_reason) ?? null
|
||||||
|
)
|
||||||
|
|
||||||
|
const pricingModeLabel = computed(
|
||||||
|
() => pricingModes.value.find(m => m.value === form.value.vat_pricing_mode)?.label ?? '—'
|
||||||
|
)
|
||||||
|
|
||||||
|
// Vorschau des Pflichthinweises nach § 14 Abs. 4 Nr. 8 UStG, der später auf der Rechnung erscheint.
|
||||||
|
const invoiceHint = computed(() => {
|
||||||
|
if (isLiable.value) {
|
||||||
|
return `Umsatzsteuerpflichtig – USt-Satz: ${form.value.vat_rate || 0} %`
|
||||||
|
}
|
||||||
|
if (isCustomReason.value) {
|
||||||
|
return form.value.tax_exemption_note?.trim() || '—'
|
||||||
|
}
|
||||||
|
return selectedReason.value?.text || '—'
|
||||||
|
})
|
||||||
|
|
||||||
|
const reasonLabel = computed(() => selectedReason.value?.label ?? '—')
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
const saveUrl = props.data.saveEndpoint ?? '/api/v1/admin/tenant/tax'
|
||||||
|
const response = await request(saveUrl, {
|
||||||
|
method: 'POST',
|
||||||
|
body: {
|
||||||
|
tax_liable: isLiable.value,
|
||||||
|
vat_rate: Number(form.value.vat_rate) || 0,
|
||||||
|
tax_exemption_reason: isLiable.value ? null : form.value.tax_exemption_reason,
|
||||||
|
tax_exemption_note: form.value.tax_exemption_note,
|
||||||
|
vat_pricing_mode: form.value.vat_pricing_mode,
|
||||||
|
tax_number: form.value.tax_number,
|
||||||
|
vat_id: form.value.vat_id,
|
||||||
|
invoice_prefix: canEditPrefix.value ? form.value.invoice_prefix : undefined,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
if (response && response.status === 'success') {
|
||||||
|
toast.success(response.message)
|
||||||
|
editing.value = false
|
||||||
|
} else {
|
||||||
|
toast.error(response?.message ?? 'Fehler beim Speichern')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div v-if="!editing">
|
||||||
|
<table class="data-table">
|
||||||
|
<tr>
|
||||||
|
<th>Steuerpflicht</th>
|
||||||
|
<td>{{ isLiable ? 'Ja – Umsatzsteuer wird erhoben' : 'Nein – umsatzsteuerbefreit' }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="isLiable">
|
||||||
|
<th>USt-Satz</th>
|
||||||
|
<td>{{ form.vat_rate || 0 }} %</td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="isLiable">
|
||||||
|
<th>Preismodus</th>
|
||||||
|
<td>{{ pricingModeLabel }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr v-else>
|
||||||
|
<th>Befreiungsgrund</th>
|
||||||
|
<td>{{ reasonLabel }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Rechnungshinweis</th>
|
||||||
|
<td>{{ invoiceHint }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Steuernummer</th>
|
||||||
|
<td>{{ form.tax_number || '—' }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>USt-IdNr.</th>
|
||||||
|
<td>{{ form.vat_id || '—' }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Rechnungs-Präfix</th>
|
||||||
|
<td>{{ form.invoice_prefix || '—' }}</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<button class="btn-edit" @click="editing = true">Bearbeiten</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else>
|
||||||
|
<table class="data-table">
|
||||||
|
<tr>
|
||||||
|
<th>Steuerpflicht</th>
|
||||||
|
<td>
|
||||||
|
<RichSelectBox v-model="form.tax_liable" :options="liableOptions"/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr v-if="isLiable">
|
||||||
|
<th>USt-Satz (%)</th>
|
||||||
|
<td><input type="number" min="0" max="100" v-model.number="form.vat_rate" class="form-input"/></td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="isLiable">
|
||||||
|
<th>Preismodus</th>
|
||||||
|
<td>
|
||||||
|
<RichSelectBox v-model="form.vat_pricing_mode" :options="pricingModes"/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<template v-else>
|
||||||
|
<tr>
|
||||||
|
<th>Befreiungsgrund</th>
|
||||||
|
<td>
|
||||||
|
<RichSelectBox
|
||||||
|
v-model="form.tax_exemption_reason"
|
||||||
|
:options="reasons"
|
||||||
|
placeholder="Grund auswählen…"
|
||||||
|
/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="isCustomReason">
|
||||||
|
<th>Freitext</th>
|
||||||
|
<td>
|
||||||
|
<textarea
|
||||||
|
v-model="form.tax_exemption_note"
|
||||||
|
class="form-input"
|
||||||
|
rows="3"
|
||||||
|
placeholder="Hinweistext für die Rechnung…"
|
||||||
|
></textarea>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th>Rechnungshinweis</th>
|
||||||
|
<td class="hint-preview">{{ invoiceHint }}</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th>Steuernummer</th>
|
||||||
|
<td>
|
||||||
|
<input type="text" v-model="form.tax_number" class="form-input" />
|
||||||
|
<span class="field-hint">
|
||||||
|
Pflichtangabe auf Rechnungen — alternativ die USt-IdNr. (§ 14 Abs. 4 Nr. 2 UStG)
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>USt-IdNr.</th>
|
||||||
|
<td><input type="text" v-model="form.vat_id" class="form-input" /></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Rechnungs-Präfix</th>
|
||||||
|
<td>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
v-model="form.invoice_prefix"
|
||||||
|
class="form-input"
|
||||||
|
:disabled="!canEditPrefix"
|
||||||
|
/>
|
||||||
|
<span class="field-hint">
|
||||||
|
Erster Block der Rechnungsnummer, z. B. <code>WM</code> in
|
||||||
|
<code>WM-V-20260701-0005</code>.
|
||||||
|
<template v-if="canEditPrefix">
|
||||||
|
Eine Änderung wirkt nur auf künftige Veranstaltungen; bereits angelegte behalten
|
||||||
|
ihre Nummer.
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
Änderbar nur in der Mandanten-Verwaltung.
|
||||||
|
</template>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<div class="btn-group">
|
||||||
|
<button class="btn-save" @click="save">Speichern</button>
|
||||||
|
<button class="btn-cancel" @click="editing = false">Abbrechen</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.data-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
}
|
||||||
|
|
||||||
|
.data-table th {
|
||||||
|
text-align: left;
|
||||||
|
padding: 8px 12px;
|
||||||
|
width: 200px;
|
||||||
|
color: #374151;
|
||||||
|
border-bottom: 1px solid #e5e7eb;
|
||||||
|
vertical-align: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
.data-table td {
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-bottom: 1px solid #e5e7eb;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 6px 10px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-family: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hint-preview {
|
||||||
|
color: #6b7280;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field-hint {
|
||||||
|
display: block;
|
||||||
|
margin-top: 4px;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field-hint code {
|
||||||
|
padding: 1px 4px;
|
||||||
|
background-color: #f3f4f6;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 0.95em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-input:disabled {
|
||||||
|
background-color: #f3f4f6;
|
||||||
|
color: #6b7280;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-edit, .btn-save, .btn-cancel {
|
||||||
|
margin-top: 15px;
|
||||||
|
padding: 8px 20px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-edit {
|
||||||
|
background-color: #1d4899;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-edit:hover {
|
||||||
|
background-color: #163a7a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-save {
|
||||||
|
background-color: #16a34a;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-save:hover {
|
||||||
|
background-color: #15803d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-cancel {
|
||||||
|
background-color: #e5e7eb;
|
||||||
|
color: #374151;
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-cancel:hover {
|
||||||
|
background-color: #d1d5db;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-group {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -7,6 +7,7 @@ import TenantPayment from "./Partials/TenantPayment.vue";
|
|||||||
import TenantImpress from "./Partials/TenantImpress.vue";
|
import TenantImpress from "./Partials/TenantImpress.vue";
|
||||||
import TenantGdpr from "./Partials/TenantGdpr.vue";
|
import TenantGdpr from "./Partials/TenantGdpr.vue";
|
||||||
import TenantPaymentMethods from "./Partials/TenantPaymentMethods.vue";
|
import TenantPaymentMethods from "./Partials/TenantPaymentMethods.vue";
|
||||||
|
import TenantTaxInfo from "./Partials/TenantTaxInfo.vue";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
tenant: Object,
|
tenant: Object,
|
||||||
@@ -19,15 +20,20 @@ const tabs = [
|
|||||||
endpoint: '/api/v1/admin/tenant/contact',
|
endpoint: '/api/v1/admin/tenant/contact',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Bezahldaten',
|
title: 'IBAN-Informationen',
|
||||||
component: TenantPayment,
|
component: TenantPayment,
|
||||||
endpoint: '/api/v1/admin/tenant/payment',
|
endpoint: '/api/v1/admin/tenant/payment',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Zahlungswege',
|
title: 'Zahlungsmodule',
|
||||||
component: TenantPaymentMethods,
|
component: TenantPaymentMethods,
|
||||||
endpoint: '/api/v1/admin/tenant/payment-methods',
|
endpoint: '/api/v1/admin/tenant/payment-methods',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: 'Steuerinformationen',
|
||||||
|
component: TenantTaxInfo,
|
||||||
|
endpoint: '/api/v1/admin/tenant/tax',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: 'Impressum',
|
title: 'Impressum',
|
||||||
component: TenantImpress,
|
component: TenantImpress,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import TenantContact from "./Partials/TenantContact.vue";
|
|||||||
import TenantPayment from "./Partials/TenantPayment.vue";
|
import TenantPayment from "./Partials/TenantPayment.vue";
|
||||||
import TenantImpress from "./Partials/TenantImpress.vue";
|
import TenantImpress from "./Partials/TenantImpress.vue";
|
||||||
import TenantGdpr from "./Partials/TenantGdpr.vue";
|
import TenantGdpr from "./Partials/TenantGdpr.vue";
|
||||||
|
import TenantTaxInfo from "./Partials/TenantTaxInfo.vue";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
tenant: Object,
|
tenant: Object,
|
||||||
@@ -26,10 +27,15 @@ const tabs = [
|
|||||||
endpoint: '/api/v1/admin/tenants/' + slug + '/contact',
|
endpoint: '/api/v1/admin/tenants/' + slug + '/contact',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Bezahldaten',
|
title: 'IBAN-Informationen',
|
||||||
component: TenantPayment,
|
component: TenantPayment,
|
||||||
endpoint: '/api/v1/admin/tenants/' + slug + '/payment',
|
endpoint: '/api/v1/admin/tenants/' + slug + '/payment',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: 'Steuerinformationen',
|
||||||
|
component: TenantTaxInfo,
|
||||||
|
endpoint: '/api/v1/admin/tenants/' + slug + '/tax',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: 'Impressum',
|
title: 'Impressum',
|
||||||
component: TenantImpress,
|
component: TenantImpress,
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class CreateEstimateAction {
|
|||||||
|
|
||||||
if ($this->request->estimateId === 0) {
|
if ($this->request->estimateId === 0) {
|
||||||
$estimate = CostUnitEstimate::create(array_merge([
|
$estimate = CostUnitEstimate::create(array_merge([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'cost_unit_id' => $this->request->costUnit->id,
|
'cost_unit_id' => $this->request->costUnit->id,
|
||||||
'type' => $this->request->estimateType,
|
'type' => $this->request->estimateType,
|
||||||
'description' => $this->request->description,
|
'description' => $this->request->description,
|
||||||
@@ -33,7 +33,7 @@ class CreateEstimateAction {
|
|||||||
} else {
|
} else {
|
||||||
$estimate = CostUnitEstimate::find($this->request->estimateId);
|
$estimate = CostUnitEstimate::find($this->request->estimateId);
|
||||||
$estimate->update(array_merge([
|
$estimate->update(array_merge([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'cost_unit_id' => $this->request->costUnit->id,
|
'cost_unit_id' => $this->request->costUnit->id,
|
||||||
'type' => $this->request->estimateType,
|
'type' => $this->request->estimateType,
|
||||||
'description' => $this->request->description,
|
'description' => $this->request->description,
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class CreateCostUnitCommand {
|
|||||||
$response = new CreateCostUnitResponse();
|
$response = new CreateCostUnitResponse();
|
||||||
$costUnit = CostUnit::create([
|
$costUnit = CostUnit::create([
|
||||||
'name' => $this->request->name,
|
'name' => $this->request->name,
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'type' => $this->request->type,
|
'type' => $this->request->type,
|
||||||
'billing_deadline' => $this->request->billingDeadline,
|
'billing_deadline' => $this->request->billingDeadline,
|
||||||
'distance_allowance' => $this->request->distanceAllowance->getAmount(),
|
'distance_allowance' => $this->request->distanceAllowance->getAmount(),
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ class ExportController extends CommonController {
|
|||||||
'amount' => $invoice->amount,
|
'amount' => $invoice->amount,
|
||||||
'recipient_name' => $invoice->contact_bank_owner,
|
'recipient_name' => $invoice->contact_bank_owner,
|
||||||
'recipient_iban' => $invoice->contact_bank_iban,
|
'recipient_iban' => $invoice->contact_bank_iban,
|
||||||
'payment_purpose' => $invoice->payment_purpose ?? 'Auslagenerstattung Rechnungsnummer ' . $invoice->invoice_number,
|
'payment_purpose' => $invoice->paymentPurposeText(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,6 @@
|
|||||||
use App\Domains\CostUnit\Controllers\CreateController;
|
use App\Domains\CostUnit\Controllers\CreateController;
|
||||||
use App\Domains\CostUnit\Controllers\ListController;
|
use App\Domains\CostUnit\Controllers\ListController;
|
||||||
use App\Domains\CostUnit\Controllers\OpenController;
|
use App\Domains\CostUnit\Controllers\OpenController;
|
||||||
use App\Domains\UserManagement\Controllers\EmailVerificationController;
|
|
||||||
use App\Domains\UserManagement\Controllers\LoginController;
|
|
||||||
use App\Domains\UserManagement\Controllers\LogOutController;
|
|
||||||
use App\Domains\UserManagement\Controllers\RegistrationController;
|
|
||||||
use App\Domains\UserManagement\Controllers\ResetPasswordController;
|
|
||||||
use App\Middleware\IdentifyTenant;
|
use App\Middleware\IdentifyTenant;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
@@ -23,16 +18,10 @@ Route::middleware(IdentifyTenant::class)->group(function () {
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
Route::get('/register', [RegistrationController::class, 'loginForm']);
|
|
||||||
Route::get('/register/verifyEmail', [EmailVerificationController::class, 'verifyEmailForm']);
|
|
||||||
|
|
||||||
Route::get('/reset-password', [ResetPasswordController::class, 'resetPasswordForm']);
|
|
||||||
|
|
||||||
route::get('/logout', LogOutController::class);
|
|
||||||
route::post('/login', [LoginController::class, 'doLogin']);
|
|
||||||
route::get('/login', [LoginController::class, 'loginForm']);
|
|
||||||
|
|
||||||
|
|
||||||
|
// Anmeldung, Registrierung und Passwort-Reset gehören zur Domain UserManagement und sind dort
|
||||||
|
// definiert. Die Duplikate hier überschrieben die dortigen Routen -- unter anderem die benannte
|
||||||
|
// Route `login`, auf die Laravels `auth`-Middleware Gäste umleitet.
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -89,12 +89,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<table v-if="localData.invoices.length > 0" class="invoice-list-table">
|
<table v-if="localData.invoices.length > 0" class="invoice-list-table">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="6">{{props.data.costUnit.name}}</td>
|
<td colspan="7">{{props.data.costUnit.name}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr v-for="invoice in localData.invoices" :id="'invoice_' + invoice.id">
|
<tr v-for="invoice in localData.invoices" :id="'invoice_' + invoice.id">
|
||||||
<td>{{invoice.invoiceNumber}}</td>
|
<td>{{invoice.invoiceNumber}}</td>
|
||||||
<td>{{invoice.invoiceType}}</td>
|
<td>{{invoice.invoiceTypeShort}}</td>
|
||||||
|
<td style="max-width: 250px;">{{invoice.purpose}}</td>
|
||||||
<td>
|
<td>
|
||||||
{{invoice.amount}}
|
{{invoice.amount}}
|
||||||
</td>
|
</td>
|
||||||
@@ -114,7 +115,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr v-if="props.data.endpoint === 'approved'">
|
<tr v-if="props.data.endpoint === 'approved'">
|
||||||
<td colspan="5"></td>
|
<td colspan="6"></td>
|
||||||
<td>
|
<td>
|
||||||
<a style="font-size: 10pt;" class="link" @click="exportPayouts()">Genehmigte Abrechnungen exportieren</a>
|
<a style="font-size: 10pt;" class="link" @click="exportPayouts()">Genehmigte Abrechnungen exportieren</a>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ class PersonalDataController extends CommonController
|
|||||||
return redirect()->intended('/login');
|
return redirect()->intended('/login');
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = auth()->user();
|
$user = currentUser();
|
||||||
$data = $this->users->getPersonalData($user);
|
$data = $this->users->getPersonalData($user);
|
||||||
|
|
||||||
$inertiaProvider = new InertiaProvider('Dashboard/PersonalData', [
|
$inertiaProvider = new InertiaProvider('Dashboard/PersonalData', [
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class StorePersonalDataController extends CommonController
|
|||||||
{
|
{
|
||||||
public function __invoke(Request $request): JsonResponse
|
public function __invoke(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
$user = auth()->user();
|
$user = currentUser();
|
||||||
|
|
||||||
$actionRequest = new UpdatePersonalDataRequest(
|
$actionRequest = new UpdatePersonalDataRequest(
|
||||||
user: $user,
|
user: $user,
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ function navigateTo(url) {
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
{{participation.event.postal_code}} {{participation.event.location}}<br />
|
{{participation.eventAddress}}<br />
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a class="link" :href="`/api/v1/event/participant/${participation.identifier}/ical`">In Kalender importieren</a>
|
<a class="link" :href="`/api/v1/event/participant/${participation.identifier}/ical`">In Kalender importieren</a>
|
||||||
|
|||||||
+142
@@ -0,0 +1,142 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\BookBankStatementPayments;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\ParticipantPayment\ParticipantPaymentCommand;
|
||||||
|
use App\Domains\Event\Actions\ParticipantPayment\ParticipantPaymentRequest;
|
||||||
|
use App\EventPaymentModules\EventPaymentModuleRegistry;
|
||||||
|
use App\EventPaymentModules\ReadsBankStatements;
|
||||||
|
use App\Models\EventParticipant;
|
||||||
|
use App\Models\PaymentMethod;
|
||||||
|
use App\Repositories\EventParticipantRepository;
|
||||||
|
use App\ValueObjects\Amount;
|
||||||
|
use App\ValueObjects\BankTransaction;
|
||||||
|
use Carbon\CarbonImmutable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bucht die in der Prüfansicht bestätigten Zahlungseingänge -- alle in einem Durchgang.
|
||||||
|
*
|
||||||
|
* Bewusst **ohne** umspannende Transaktion: Gebucht wird über {@see ParticipantPaymentCommand}, und der
|
||||||
|
* verschickt die Zahlungsmail gleich mit. Das Projekt kennt keine Queue, die Mails gehen also synchron
|
||||||
|
* raus; eine offene Transaktion über achtzig Mailversände wäre die schlechtere Wahl. Jede Zeile ist
|
||||||
|
* für sich vollständig, und das Wasserzeichen schützt sie gegen eine Wiederholung.
|
||||||
|
*/
|
||||||
|
class BookBankStatementPaymentsCommand
|
||||||
|
{
|
||||||
|
public function __construct(private readonly BookBankStatementPaymentsRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): BookBankStatementPaymentsResponse
|
||||||
|
{
|
||||||
|
$response = new BookBankStatementPaymentsResponse();
|
||||||
|
|
||||||
|
if ($this->request->bookings === []) {
|
||||||
|
$response->message = 'Es wurden keine Zahlungen zum Buchen ausgewählt.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$module = EventPaymentModuleRegistry::forSlug(PaymentMethod::PAYMENT_ACCOUNT_TRANSACTION);
|
||||||
|
$participants = new EventParticipantRepository();
|
||||||
|
|
||||||
|
foreach ($this->request->bookings as $booking) {
|
||||||
|
$participant = $participants->findInEventByIdentifier(
|
||||||
|
$this->request->event,
|
||||||
|
(string) ($booking['participantIdentifier'] ?? ''),
|
||||||
|
);
|
||||||
|
|
||||||
|
$transaction = $this->toTransaction($booking);
|
||||||
|
|
||||||
|
if ($participant === null || $transaction === null) {
|
||||||
|
$response->failed++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Zweite Prüfung, nicht bloß Gürtel und Hosenträger: In der Prüfansicht lässt sich eine
|
||||||
|
// Zeile von Hand einer anderen Person zuordnen, und deren Wasserzeichen hat der erste
|
||||||
|
// Durchlauf nie gesehen.
|
||||||
|
if ($this->isBeforeWatermark($participant, $transaction)) {
|
||||||
|
$response->skipped++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($module instanceof ReadsBankStatements) {
|
||||||
|
$module->recordTransaction($participant, $transaction);
|
||||||
|
}
|
||||||
|
|
||||||
|
$participant->last_payment_date = $transaction->paymentDate;
|
||||||
|
|
||||||
|
$this->book($participant, $transaction->amount);
|
||||||
|
$response->booked++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->message = $this->summaryMessage($response);
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bucht den Betrag **zusätzlich** zum bereits Gezahlten.
|
||||||
|
*
|
||||||
|
* Die manuelle Erfassung setzt `amount_paid` absolut, weil dort jemand den Gesamtstand eintippt.
|
||||||
|
* Hier kommt eine einzelne Zahlung an -- eine zweite Rate darf die erste nicht überschreiben.
|
||||||
|
* Der {@see ParticipantPaymentCommand} speichert dabei die zuvor gesetzten Felder mit und schickt
|
||||||
|
* die passende Mail (bezahlt / fehlt noch / überzahlt).
|
||||||
|
*/
|
||||||
|
private function book(EventParticipant $participant, Amount $amount): void
|
||||||
|
{
|
||||||
|
$total = new Amount(
|
||||||
|
round(($participant->amount_paid?->getAmount() ?? 0.0) + $amount->getAmount(), 2),
|
||||||
|
'Euro',
|
||||||
|
);
|
||||||
|
|
||||||
|
new ParticipantPaymentCommand(new ParticipantPaymentRequest($participant, $total))->execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $booking */
|
||||||
|
private function toTransaction(array $booking): ?BankTransaction
|
||||||
|
{
|
||||||
|
$date = CarbonImmutable::createFromFormat('!Y-m-d', (string) ($booking['paymentDate'] ?? ''));
|
||||||
|
$amount = $booking['amount'] ?? null;
|
||||||
|
|
||||||
|
if ($date === false || !is_numeric($amount) || (float) $amount <= 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new BankTransaction(
|
||||||
|
paymentDate: $date,
|
||||||
|
amount: new Amount(round((float) $amount, 2), 'Euro'),
|
||||||
|
purpose: (string) ($booking['purpose'] ?? ''),
|
||||||
|
payerName: (string) ($booking['payerName'] ?? ''),
|
||||||
|
payerIban: (string) ($booking['payerIban'] ?? ''),
|
||||||
|
rowNumber: (int) ($booking['rowNumber'] ?? 0),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function isBeforeWatermark(EventParticipant $participant, BankTransaction $transaction): bool
|
||||||
|
{
|
||||||
|
$watermark = $participant->last_payment_date;
|
||||||
|
|
||||||
|
return $watermark !== null && $transaction->paymentDate->startOfDay()->lt($watermark->startOfDay());
|
||||||
|
}
|
||||||
|
|
||||||
|
private function summaryMessage(BookBankStatementPaymentsResponse $response): string
|
||||||
|
{
|
||||||
|
$message = sprintf('%d Zahlungen wurden gebucht.', $response->booked);
|
||||||
|
|
||||||
|
if ($response->skipped > 0) {
|
||||||
|
$message .= sprintf(
|
||||||
|
' %d wurden übersprungen, weil sie älter sind als die zuletzt erfasste Zahlung der Person.',
|
||||||
|
$response->skipped,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($response->failed > 0) {
|
||||||
|
$message .= sprintf(' %d konnten nicht zugeordnet werden.', $response->failed);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $message;
|
||||||
|
}
|
||||||
|
}
|
||||||
+19
@@ -0,0 +1,19 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\BookBankStatementPayments;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
|
||||||
|
class BookBankStatementPaymentsRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param array<int, array<string, mixed>> $bookings Je Eintrag die bestätigte Zeile der Prüfansicht:
|
||||||
|
* participantIdentifier, paymentDate, amount,
|
||||||
|
* payerName, payerIban, purpose.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public readonly Event $event,
|
||||||
|
public readonly array $bookings,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
}
|
||||||
+17
@@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\BookBankStatementPayments;
|
||||||
|
|
||||||
|
class BookBankStatementPaymentsResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
public string $message = '';
|
||||||
|
|
||||||
|
public int $booked = 0;
|
||||||
|
|
||||||
|
/** Übersprungen, weil älter als die zuletzt erfasste Zahlung der Person. */
|
||||||
|
public int $skipped = 0;
|
||||||
|
|
||||||
|
/** Nicht verarbeitbar (unbekannte Anmeldung, unbrauchbarer Betrag). */
|
||||||
|
public int $failed = 0;
|
||||||
|
}
|
||||||
+2
-1
@@ -12,7 +12,8 @@ class CertificateOfConductionCheckCommand {
|
|||||||
public function execute() : CertificateOfConductionCheckResponse {
|
public function execute() : CertificateOfConductionCheckResponse {
|
||||||
$response = new CertificateOfConductionCheckResponse();
|
$response = new CertificateOfConductionCheckResponse();
|
||||||
|
|
||||||
$localGroup = str_replace('Stamm ', '', $this->request->participant->localGroup()->first()->name);
|
// Der Stamm ist optional (die Kurzanmeldung erhebt ihn nicht, in der Verwaltung kann er entfernt werden).
|
||||||
|
$localGroup = str_replace('Stamm ', '', $this->request->participant->localGroup()->first()?->name ?? '');
|
||||||
|
|
||||||
$apiResponse = Http::acceptJson()
|
$apiResponse = Http::acceptJson()
|
||||||
->asJson()
|
->asJson()
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ use App\Models\Tenant;
|
|||||||
use App\RelationModels\EventEatingHabits;
|
use App\RelationModels\EventEatingHabits;
|
||||||
use App\RelationModels\EventLocalGroups;
|
use App\RelationModels\EventLocalGroups;
|
||||||
use App\RelationModels\EventPaymentMethods;
|
use App\RelationModels\EventPaymentMethods;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class CreateEventCommand {
|
class CreateEventCommand {
|
||||||
@@ -27,11 +28,18 @@ class CreateEventCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$tenant = currentTenant();
|
||||||
|
|
||||||
|
// Anlage als Ganzes: der Event-Teil der Rechnungsnummer wird unter der Sperre vergeben und muss
|
||||||
|
// im selben Zug geschrieben werden, sonst könnten zwei gleichzeitige Anlagen denselben erhalten.
|
||||||
|
$event = DB::transaction(function () use ($tenant): Event {
|
||||||
$event = Event::create([
|
$event = Event::create([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => $tenant->slug,
|
||||||
'name' => $this->request->name,
|
'name' => $this->request->name,
|
||||||
'identifier' => Str::random(10),
|
'identifier' => Str::random(10),
|
||||||
'location' => $this->request->location,
|
'location' => $this->request->location,
|
||||||
|
'street' => $this->normalizeOptional($this->request->street),
|
||||||
|
'house_number' => $this->normalizeOptional($this->request->houseNumber),
|
||||||
'postal_code' => $this->request->postalCode,
|
'postal_code' => $this->request->postalCode,
|
||||||
'email' => $this->request->email,
|
'email' => $this->request->email,
|
||||||
'start_date' => $this->request->begin,
|
'start_date' => $this->request->begin,
|
||||||
@@ -47,8 +55,25 @@ class CreateEventCommand {
|
|||||||
'total_max_amount' => 0,
|
'total_max_amount' => 0,
|
||||||
'support_per_person' => 0,
|
'support_per_person' => 0,
|
||||||
'support_flat' => 0,
|
'support_flat' => 0,
|
||||||
|
// Umsatzsteuerliche Grundlage bei Anlage einfrieren (unveränderlich), damit Preisermittlung und
|
||||||
|
// spätere Rechnungen von späteren Tenant-Änderungen unberührt bleiben.
|
||||||
|
'tax_liable' => $tenant->tax_liable,
|
||||||
|
'vat_rate' => $tenant->vat_rate,
|
||||||
|
'vat_pricing_mode' => $tenant->vat_pricing_mode,
|
||||||
|
'tax_exemption_reason' => $tenant->tax_exemption_reason,
|
||||||
|
'tax_exemption_note' => $tenant->tax_exemption_note,
|
||||||
|
// Den Event-Teil der Rechnungsnummer einfrieren: Tenant-Präfix und Startdatum sind später
|
||||||
|
// änderbar, eine herausgegebene Rechnung würde sonst zu einer anderen Nummer gehören.
|
||||||
|
//
|
||||||
|
// Der Rechnungssteller wird bewusst NICHT mitkopiert -- er ist der Mandant und wird beim
|
||||||
|
// Erzeugen der Rechnung von dort gelesen, damit eine Korrektur an Name oder Anschrift auch
|
||||||
|
// auf bestehende Veranstaltungen wirkt.
|
||||||
|
'invoice_key' => $this->nextInvoiceKey($tenant),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
return $event;
|
||||||
|
});
|
||||||
|
|
||||||
if ($event !== null) {
|
if ($event !== null) {
|
||||||
EventEatingHabits::create([
|
EventEatingHabits::create([
|
||||||
'event_id' => $event->id,
|
'event_id' => $event->id,
|
||||||
@@ -68,12 +93,12 @@ class CreateEventCommand {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (app('tenant')->slug === 'lv') {
|
if (currentTenant()->slug === 'lv') {
|
||||||
foreach(Tenant::where(['is_active_local_group' => true])->get() as $tenant) {
|
foreach(Tenant::where(['is_active_local_group' => true])->get() as $tenant) {
|
||||||
EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => $tenant->id]);
|
EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => $tenant->id]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => app('tenant')->id]);
|
EventLocalGroups::create(['event_id' => $event->id, 'local_group_id' => currentTenant()->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -83,4 +108,46 @@ class CreateEventCommand {
|
|||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Straße und Hausnummer sind optional. Ein leer gelassenes Eingabefeld liefert einen leeren String --
|
||||||
|
* gespeichert wird dafür `null`, damit „nicht angegeben" nur eine Darstellung hat.
|
||||||
|
*/
|
||||||
|
private function normalizeOptional(?string $value): ?string
|
||||||
|
{
|
||||||
|
$value = trim((string) $value);
|
||||||
|
|
||||||
|
return '' === $value ? null : $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Event-Teil der Rechnungsnummer, z.B. `WM-V-20260701`: Tenant-Präfix, Dokumentart „V" für
|
||||||
|
* Veranstaltung, dann ohne Trenner Jahr, Monat des Beginns und die laufende Nummer der
|
||||||
|
* Veranstaltungen dieses Tenants in diesem Monat.
|
||||||
|
*
|
||||||
|
* Gezählt wird über die bereits vergebenen Schlüssel desselben Monats. Die Sperre auf der
|
||||||
|
* Tenant-Zeile serialisiert gleichzeitige Anlagen; der Aufruf erfolgt innerhalb der
|
||||||
|
* Anlage-Transaktion, sodass die Sperre bis zum Schreiben des Events steht.
|
||||||
|
*/
|
||||||
|
private function nextInvoiceKey(Tenant $tenant): string
|
||||||
|
{
|
||||||
|
// Jahr und Monat ohne Trenner; die laufende Nummer haengt unmittelbar daran. Alle drei Teile
|
||||||
|
// haben feste Laenge, der Schluessel bleibt dadurch eindeutig zerlegbar.
|
||||||
|
$month = $this->request->begin->format('Ym');
|
||||||
|
$prefix = sprintf('%s-V-%s', $tenant->invoice_prefix ?? strtoupper($tenant->slug), $month);
|
||||||
|
|
||||||
|
DB::table('tenants')->where('id', $tenant->id)->lockForUpdate()->first();
|
||||||
|
|
||||||
|
$used = DB::table('events')
|
||||||
|
->where('tenant', $tenant->slug)
|
||||||
|
->where('invoice_key', 'like', $prefix . '%')
|
||||||
|
->pluck('invoice_key');
|
||||||
|
|
||||||
|
$highest = 0;
|
||||||
|
foreach ($used as $key) {
|
||||||
|
$highest = max($highest, (int) substr((string) $key, strlen($prefix)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $prefix . str_pad((string) ($highest + 1), 2, '0', STR_PAD_LEFT);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,8 +19,10 @@ class CreateEventRequest {
|
|||||||
public string $accountOwner;
|
public string $accountOwner;
|
||||||
public string $accountIban;
|
public string $accountIban;
|
||||||
public bool $payPerDay;
|
public bool $payPerDay;
|
||||||
|
public ?string $street;
|
||||||
|
public ?string $houseNumber;
|
||||||
|
|
||||||
public function __construct(string $name, string $location, string $postalCode, string $email, DateTime $begin, DateTime $end, DateTime $earlyBirdEnd, DateTime $registrationFinalEnd, int $earlyBirdEndAmountIncrease, ParticipationFeeType $participationFeeType, string $accountOwner, string $accountIban, bool $payPerDay) {
|
public function __construct(string $name, string $location, string $postalCode, string $email, DateTime $begin, DateTime $end, DateTime $earlyBirdEnd, DateTime $registrationFinalEnd, int $earlyBirdEndAmountIncrease, ParticipationFeeType $participationFeeType, string $accountOwner, string $accountIban, bool $payPerDay, ?string $street = null, ?string $houseNumber = null) {
|
||||||
$this->name = $name;
|
$this->name = $name;
|
||||||
$this->location = $location;
|
$this->location = $location;
|
||||||
$this->postalCode = $postalCode;
|
$this->postalCode = $postalCode;
|
||||||
@@ -34,5 +36,7 @@ class CreateEventRequest {
|
|||||||
$this->accountOwner = $accountOwner;
|
$this->accountOwner = $accountOwner;
|
||||||
$this->accountIban = $accountIban;
|
$this->accountIban = $accountIban;
|
||||||
$this->payPerDay = $payPerDay;
|
$this->payPerDay = $payPerDay;
|
||||||
|
$this->street = $street;
|
||||||
|
$this->houseNumber = $houseNumber;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+205
@@ -0,0 +1,205 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\CreateIncomeSurplusStatement;
|
||||||
|
|
||||||
|
use App\Enumerations\ParticipationType;
|
||||||
|
use App\Models\CostUnit;
|
||||||
|
use App\Models\Event;
|
||||||
|
use App\Providers\PdfGenerateAndDownloadProvider;
|
||||||
|
use App\Repositories\CostUnitRepository;
|
||||||
|
use App\ValueObjects\Amount;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Erzeugt die Einnahmen-Überschuss-Rechnung einer Veranstaltung als PDF.
|
||||||
|
*
|
||||||
|
* Gezeigt wird ausschließlich Geld, das geflossen ist: gezahlte Beiträge, weitere Einnahmen, was von
|
||||||
|
* Abmeldungen einbehalten wurde, Fördermittel -- und auf der anderen Seite die erfassten Belege. Was nur
|
||||||
|
* erwartet (offene Beiträge) oder geplant (Budgetwerte) ist, gehört in eine Einnahmen-Überschuss-Rechnung
|
||||||
|
* nicht hinein.
|
||||||
|
*
|
||||||
|
* Es wird nichts gespeichert: Alle Zahlen leiten sich aus dem aktuellen Stand ab, ein erneuter Abruf
|
||||||
|
* liefert den dann gültigen Stand.
|
||||||
|
*/
|
||||||
|
class CreateIncomeSurplusStatementCommand
|
||||||
|
{
|
||||||
|
private Event $event;
|
||||||
|
|
||||||
|
private CostUnitRepository $costUnits;
|
||||||
|
|
||||||
|
public function __construct(private readonly CreateIncomeSurplusStatementRequest $request)
|
||||||
|
{
|
||||||
|
$this->event = $request->event;
|
||||||
|
$this->costUnits = new CostUnitRepository();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): CreateIncomeSurplusStatementResponse
|
||||||
|
{
|
||||||
|
$response = new CreateIncomeSurplusStatementResponse();
|
||||||
|
|
||||||
|
$costUnit = $this->event->costUnit()->first();
|
||||||
|
|
||||||
|
if (!$costUnit instanceof CostUnit) {
|
||||||
|
$response->message = 'Der Veranstaltung ist keine Kostenstelle zugeordnet.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Der Pauschalbetrag wird vor dem Resource-Aufruf gelesen: `EventResource::calculateSupportPerPerson()`
|
||||||
|
// multipliziert das Amount-Objekt von `support_per_person` in place. Auf `support_flat` wirkt das
|
||||||
|
// zwar nicht, aber der gesamte Zugriff auf Beträge des Models ist danach nicht mehr vertrauenswürdig.
|
||||||
|
$otherIncome = $this->event->support_flat->getAmount();
|
||||||
|
|
||||||
|
$eventData = $this->event->toResource()->toArray(new Request());
|
||||||
|
|
||||||
|
$income = $this->buildIncome($eventData, $otherIncome);
|
||||||
|
$expenses = $this->buildExpenses($costUnit);
|
||||||
|
|
||||||
|
$result = new Amount($income['total']->getAmount() - $expenses['total']->getAmount(), 'Euro');
|
||||||
|
|
||||||
|
$html = view('pdfs.income-surplus-statement', [
|
||||||
|
'event' => $this->event,
|
||||||
|
'createdAt' => new \DateTime()->format('d.m.Y'),
|
||||||
|
'income' => $income,
|
||||||
|
'expenses' => $expenses,
|
||||||
|
'result' => $result,
|
||||||
|
'money' => self::money(...),
|
||||||
|
])->render();
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->filename = 'EUER-' . $this->event->identifier . '.pdf';
|
||||||
|
$response->income = $income;
|
||||||
|
$response->expenses = $expenses;
|
||||||
|
$response->result = $result;
|
||||||
|
$response->pdfContent = PdfGenerateAndDownloadProvider::fromHtml($html, 'portrait');
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Die Einnahmenseite in zwei Ober-Kategorien.
|
||||||
|
*
|
||||||
|
* Alle Zahlen stammen aus {@see \App\Resources\EventResource} -- derselben Quelle wie die
|
||||||
|
* Veranstaltungsübersicht am Bildschirm. Eine eigene Rechnung daneben würde über kurz oder lang von
|
||||||
|
* der Übersicht abweichen, und dann glaubt niemand mehr einer der beiden Zahlen.
|
||||||
|
*
|
||||||
|
* @param array<string, mixed> $eventData
|
||||||
|
*
|
||||||
|
* @return array{categories: array<int, array{name: string, total: Amount, entries: array<int, array{name: string, amount: Amount}>}>, total: Amount}
|
||||||
|
*/
|
||||||
|
private function buildIncome(array $eventData, float $otherIncome): array
|
||||||
|
{
|
||||||
|
// Beiträge aller Teilnahmearten in einer Zeile: Für die Mittelverwendung zählt, was an Beiträgen
|
||||||
|
// hereingekommen ist, nicht von wem.
|
||||||
|
$participationFees = new Amount(0, 'Euro');
|
||||||
|
foreach ([
|
||||||
|
ParticipationType::PARTICIPATION_TYPE_PARTICIPANT,
|
||||||
|
ParticipationType::PARTICIPATION_TYPE_TEAM,
|
||||||
|
ParticipationType::PARTICIPATION_TYPE_VOLUNTEER,
|
||||||
|
ParticipationType::PARTICIPATION_TYPE_OTHER,
|
||||||
|
] as $participationType) {
|
||||||
|
$participationFees->addAmount(
|
||||||
|
new Amount((float) $eventData['participants'][$participationType]['amount']['paid']['value'], 'Euro')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$ownFunds = [
|
||||||
|
['name' => 'Teilnahmebeiträge', 'amount' => $participationFees],
|
||||||
|
['name' => 'Weitere Einnahmen', 'amount' => new Amount($otherIncome, 'Euro')],
|
||||||
|
[
|
||||||
|
'name' => 'Einbehaltene Einnahmen aus Abmeldungen',
|
||||||
|
'amount' => new Amount((float) $eventData['retainedFromUnregistered']['value'], 'Euro'),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
$supportRate = new Amount((float) $eventData['supportPersonValue'], 'Euro');
|
||||||
|
$funding = [
|
||||||
|
[
|
||||||
|
'name' => 'Fördermittel (' . self::money($supportRate) . ' € p.P./Tag)',
|
||||||
|
'amount' => new Amount($eventData['supportPerson']['amount']->getAmount(), 'Euro'),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
$categories = [
|
||||||
|
['name' => 'Eigenmittel', 'entries' => $ownFunds, 'total' => self::sum($ownFunds)],
|
||||||
|
['name' => 'Förderungen', 'entries' => $funding, 'total' => self::sum($funding)],
|
||||||
|
];
|
||||||
|
|
||||||
|
return [
|
||||||
|
'categories' => $categories,
|
||||||
|
'total' => self::sum($categories),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Die Ausgabenseite: eine Zeile je Ausgabentyp, dazu die Belege für die Anlage.
|
||||||
|
*
|
||||||
|
* @return array{groups: array<int, array{name: string, sum: Amount, rows: array<int, array{number: string, date: string, purpose: string, amount: Amount}>}>, total: Amount}
|
||||||
|
*/
|
||||||
|
private function buildExpenses(CostUnit $costUnit): array
|
||||||
|
{
|
||||||
|
$groups = [];
|
||||||
|
$total = new Amount(0, 'Euro');
|
||||||
|
|
||||||
|
foreach ($this->costUnits->groupExpensesByType($costUnit) as $group) {
|
||||||
|
$rows = [];
|
||||||
|
|
||||||
|
foreach ($group['invoices'] as $invoice) {
|
||||||
|
$rows[] = [
|
||||||
|
'number' => (string) $invoice->invoice_number,
|
||||||
|
'date' => $invoice->created_at?->format('d.m.Y') ?? '',
|
||||||
|
// Ohne die Anmerkung: dort steht, was die Kassenwart*in beim Korrigieren notiert hat,
|
||||||
|
// und das gehört auf den Beleg, nicht in den Zweck.
|
||||||
|
'purpose' => $invoice->purposeText(),
|
||||||
|
'amount' => Amount::fromString($invoice->amount),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$groups[] = [
|
||||||
|
'name' => $group['type']->name,
|
||||||
|
'sum' => $group['sum'],
|
||||||
|
'rows' => $rows,
|
||||||
|
];
|
||||||
|
|
||||||
|
$total->addAmount($group['sum']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['groups' => $groups, 'total' => $total];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ein Betrag in deutscher Schreibweise: Punkt als Tausender-, Komma als Dezimaltrennzeichen.
|
||||||
|
*
|
||||||
|
* Bewusst nicht {@see Amount::getFormattedAmount()}: Die Methode ersetzt nach `number_format` jeden
|
||||||
|
* Punkt durch ein Komma und macht aus 1.487,50 damit "1,487,50". Auf einer Aufstellung, in der
|
||||||
|
* vierstellige Beträge die Regel sind, wäre das nicht lesbar. Der Fehler steckt im Value Object und
|
||||||
|
* wirkt überall, wo Beträge angezeigt werden -- ihn dort zu beheben ist eine eigene Änderung.
|
||||||
|
*
|
||||||
|
* Öffentlich, weil die Vorlage sie als Callable bekommt und weil sie für sich prüfbar sein soll.
|
||||||
|
*/
|
||||||
|
public static function money(Amount $amount): string
|
||||||
|
{
|
||||||
|
return number_format(round($amount->getAmount(), 2), 2, ',', '.');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Summiert Zeilen, die je ein `amount` oder `total` tragen.
|
||||||
|
*
|
||||||
|
* Über ein frisches Amount-Objekt, weil `Amount::addAmount()` den Empfänger verändert -- die
|
||||||
|
* Einzelbeträge sollen unangetastet bleiben, sie werden anschließend gedruckt.
|
||||||
|
*
|
||||||
|
* @param array<int, array<string, mixed>> $rows
|
||||||
|
*/
|
||||||
|
private static function sum(array $rows): Amount
|
||||||
|
{
|
||||||
|
$sum = new Amount(0, 'Euro');
|
||||||
|
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
/** @var Amount $amount */
|
||||||
|
$amount = $row['amount'] ?? $row['total'];
|
||||||
|
$sum->addAmount($amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $sum;
|
||||||
|
}
|
||||||
|
}
|
||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\CreateIncomeSurplusStatement;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
|
||||||
|
class CreateIncomeSurplusStatementRequest
|
||||||
|
{
|
||||||
|
public function __construct(public readonly Event $event)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
+33
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\CreateIncomeSurplusStatement;
|
||||||
|
|
||||||
|
use App\ValueObjects\Amount;
|
||||||
|
|
||||||
|
class CreateIncomeSurplusStatementResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
|
||||||
|
public string $filename = '';
|
||||||
|
|
||||||
|
public string $pdfContent = '';
|
||||||
|
|
||||||
|
public ?string $message = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Die Zahlen, aus denen das PDF entsteht -- Einnahmen-Kategorien, Ausgaben-Gruppen und das Ergebnis.
|
||||||
|
*
|
||||||
|
* Sie stehen hier, weil sie das eigentliche Ergebnis der Action sind; das PDF ist nur ihre Darstellung.
|
||||||
|
* So lässt sich die Rechnung prüfen, ohne ein PDF zerlegen zu müssen.
|
||||||
|
*
|
||||||
|
* @var array{categories: array<int, array{name: string, total: Amount, entries: array<int, array{name: string, amount: Amount}>}>, total: Amount}|array{}
|
||||||
|
*/
|
||||||
|
public array $income = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array{groups: array<int, array{name: string, sum: Amount, rows: array<int, array<string, mixed>>}>, total: Amount}|array{}
|
||||||
|
*/
|
||||||
|
public array $expenses = [];
|
||||||
|
|
||||||
|
public ?Amount $result = null;
|
||||||
|
}
|
||||||
@@ -13,18 +13,18 @@ class GenerateIcalCommand
|
|||||||
$participant = $this->request->participant;
|
$participant = $this->request->participant;
|
||||||
$event = $participant->event;
|
$event = $participant->event;
|
||||||
|
|
||||||
$uid = $participant->identifier . '@' . app('tenant')->slug;
|
$uid = $participant->identifier . '@' . currentTenant()->slug;
|
||||||
$dtStart = $event->start_date->format('Ymd');
|
$dtStart = $event->start_date->format('Ymd');
|
||||||
$dtEnd = $event->end_date->copy()->addDay()->format('Ymd');
|
$dtEnd = $event->end_date->copy()->addDay()->format('Ymd');
|
||||||
$now = now()->format('Ymd\THis\Z');
|
$now = now()->format('Ymd\THis\Z');
|
||||||
$summary = $this->escapeIcal($event->name);
|
$summary = $this->escapeIcal($event->name);
|
||||||
$location = $this->escapeIcal(trim($event->postal_code . ' ' . $event->location));
|
$location = $this->escapeIcal($event->getFullAddress());
|
||||||
$description = $this->escapeIcal('Teilnahme als: ' . $participant->getOfficialName());
|
$description = $this->escapeIcal('Teilnahme als: ' . $participant->getOfficialName());
|
||||||
|
|
||||||
$icalContent = implode("\r\n", [
|
$icalContent = implode("\r\n", [
|
||||||
'BEGIN:VCALENDAR',
|
'BEGIN:VCALENDAR',
|
||||||
'VERSION:2.0',
|
'VERSION:2.0',
|
||||||
'PRODID:-//' . app('tenant')->name . '//Veranstaltungskalender//DE',
|
'PRODID:-//' . currentTenant()->name . '//Veranstaltungskalender//DE',
|
||||||
'CALSCALE:GREGORIAN',
|
'CALSCALE:GREGORIAN',
|
||||||
'METHOD:PUBLISH',
|
'METHOD:PUBLISH',
|
||||||
'BEGIN:VEVENT',
|
'BEGIN:VEVENT',
|
||||||
|
|||||||
+2
-2
@@ -21,11 +21,11 @@ class GenerateIcalForDeadlineCommand {
|
|||||||
$icalContent = implode("\r\n", [
|
$icalContent = implode("\r\n", [
|
||||||
'BEGIN:VCALENDAR',
|
'BEGIN:VCALENDAR',
|
||||||
'VERSION:2.0',
|
'VERSION:2.0',
|
||||||
'PRODID:-//' . app('tenant')->name . '//Veranstaltungskalender//DE',
|
'PRODID:-//' . currentTenant()->name . '//Veranstaltungskalender//DE',
|
||||||
'CALSCALE:GREGORIAN',
|
'CALSCALE:GREGORIAN',
|
||||||
'METHOD:PUBLISH',
|
'METHOD:PUBLISH',
|
||||||
'BEGIN:VEVENT',
|
'BEGIN:VEVENT',
|
||||||
'UID:payment-deadline-' . $event->identifier . '@' . app('tenant')->slug,
|
'UID:payment-deadline-' . $event->identifier . '@' . currentTenant()->slug,
|
||||||
'DTSTAMP:' . $now,
|
'DTSTAMP:' . $now,
|
||||||
'DTSTART;VALUE=DATE:' . $dtDate,
|
'DTSTART;VALUE=DATE:' . $dtDate,
|
||||||
'DTEND;VALUE=DATE:' . $dtDate,
|
'DTEND;VALUE=DATE:' . $dtDate,
|
||||||
|
|||||||
@@ -0,0 +1,183 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\ParseBankStatement;
|
||||||
|
|
||||||
|
use App\EventPaymentModules\EventPaymentModuleRegistry;
|
||||||
|
use App\EventPaymentModules\ProvidesStatementRuleset;
|
||||||
|
use App\EventPaymentModules\ReadsBankStatements;
|
||||||
|
use App\Models\EventParticipant;
|
||||||
|
use App\Models\PaymentMethod;
|
||||||
|
use App\Providers\BankStatementParseProvider;
|
||||||
|
use App\Repositories\EventParticipantRepository;
|
||||||
|
use App\Support\BankStatementParseException;
|
||||||
|
use App\ValueObjects\BankStatementRuleset;
|
||||||
|
use App\ValueObjects\BankTransaction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liest einen hochgeladenen Kontoauszug und schlägt je Zahlungseingang eine Anmeldung vor.
|
||||||
|
*
|
||||||
|
* Hier wird nichts gebucht -- das Ergebnis ist die Prüfansicht, in der die Aktionsleitung die
|
||||||
|
* Vorschläge bestätigt, korrigiert oder verwirft. Erst der zweite Schritt schreibt.
|
||||||
|
*
|
||||||
|
* Der Ablauf ist zahlartneutral: Was ein verwertbarer Umsatz ist und zu wem er gehört, entscheidet
|
||||||
|
* das Zahlungsmodul über {@see ReadsBankStatements}.
|
||||||
|
*/
|
||||||
|
class ParseBankStatementCommand
|
||||||
|
{
|
||||||
|
/** 8 MB -- ein Jahresauszug bleibt weit darunter, alles darüber ist die falsche Datei. */
|
||||||
|
private const int MAX_BYTES = 8 * 1024 * 1024;
|
||||||
|
|
||||||
|
private const array ALLOWED_EXTENSIONS = ['csv', 'txt'];
|
||||||
|
|
||||||
|
public function __construct(private readonly ParseBankStatementRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): ParseBankStatementResponse
|
||||||
|
{
|
||||||
|
$response = new ParseBankStatementResponse();
|
||||||
|
|
||||||
|
$module = EventPaymentModuleRegistry::forSlug(PaymentMethod::PAYMENT_ACCOUNT_TRANSACTION);
|
||||||
|
if (!$module instanceof ReadsBankStatements) {
|
||||||
|
$response->message = 'Für die Überweisung ist kein Kontoauszug-Import eingerichtet.';
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$contents = $this->readFile($response);
|
||||||
|
if ($contents === null) {
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ruleset = $module instanceof ProvidesStatementRuleset
|
||||||
|
? $module->statementRuleset($this->request->configuration)
|
||||||
|
: BankStatementRuleset::default();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$transactions = new BankStatementParseProvider()->parse($contents, $ruleset);
|
||||||
|
} catch (BankStatementParseException $exception) {
|
||||||
|
$response->message = $exception->getMessage();
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$candidates = new EventParticipantRepository()->getForPaymentMatching($this->request->event);
|
||||||
|
|
||||||
|
foreach ($transactions as $transaction) {
|
||||||
|
if (!$module->isRelevantTransaction($transaction)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$match = $module->matchTransaction($transaction, $candidates);
|
||||||
|
|
||||||
|
// Vor der letzten erfassten Zahlung dieser Person: schon gebucht, oder aus einem Auszug,
|
||||||
|
// der bereits verarbeitet wurde. Gar nicht erst anzeigen.
|
||||||
|
if ($match !== null && $this->isBeforeWatermark($match->participant, $transaction)) {
|
||||||
|
$response->skippedOlderThanWatermark++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->rows[] = $transaction->toArray() + [
|
||||||
|
'suggestedIdentifier' => $match?->participant->identifier,
|
||||||
|
'confidence' => $match?->confidence,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->participants = $candidates
|
||||||
|
->map(fn (EventParticipant $participant): array => $this->participantOption($participant))
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
$response->message = $this->summaryMessage($response);
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function readFile(ParseBankStatementResponse $response): ?string
|
||||||
|
{
|
||||||
|
$file = $this->request->file;
|
||||||
|
|
||||||
|
if ($file === null || !$file->isValid()) {
|
||||||
|
$response->message = 'Es wurde keine Datei hochgeladen.';
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($file->getSize() > self::MAX_BYTES) {
|
||||||
|
$response->message = 'Die Datei ist zu groß (maximal 8 MB).';
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!in_array(strtolower($file->getClientOriginalExtension()), self::ALLOWED_EXTENSIONS, true)) {
|
||||||
|
$response->message = 'Bitte den CSV-Export der Bank hochladen (.csv).';
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$contents = file_get_contents($file->getRealPath());
|
||||||
|
|
||||||
|
if ($contents === false || trim($contents) === '') {
|
||||||
|
$response->message = 'Die Datei ließ sich nicht lesen oder ist leer.';
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $contents;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function isBeforeWatermark(EventParticipant $participant, BankTransaction $transaction): bool
|
||||||
|
{
|
||||||
|
$watermark = $participant->last_payment_date;
|
||||||
|
|
||||||
|
// Echt kleiner, nicht kleiner-gleich: Zwei Zahlungen am selben Tag sollen beide ankommen.
|
||||||
|
return $watermark !== null && $transaction->paymentDate->startOfDay()->lt($watermark->startOfDay());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
private function participantOption(EventParticipant $participant): array
|
||||||
|
{
|
||||||
|
$amountLeft = clone $participant->amount;
|
||||||
|
if ($participant->amount_paid !== null) {
|
||||||
|
$amountLeft->subtractAmount($participant->amount_paid);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'identifier' => $participant->identifier,
|
||||||
|
'name' => $participant->lastname . ', ' . $participant->firstname,
|
||||||
|
'amount' => $participant->amount?->toString(),
|
||||||
|
'amountPaid' => $participant->amount_paid?->toString(),
|
||||||
|
'amountOpen' => $amountLeft->toString(),
|
||||||
|
'isSettled' => round($amountLeft->getAmount(), 2) <= 0,
|
||||||
|
'lastPaymentDate' => $participant->last_payment_date?->format('d.m.Y'),
|
||||||
|
// Zahlt jemand, der sich abgemeldet hat, wird die Zahlung trotzdem erfasst -- danach
|
||||||
|
// steht aber eine Erstattung an. Die Prüfansicht weist darauf hin.
|
||||||
|
'isSignedOff' => $participant->unregistered_at !== null,
|
||||||
|
'signedOffAt' => $participant->unregistered_at?->format('d.m.Y'),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function summaryMessage(ParseBankStatementResponse $response): string
|
||||||
|
{
|
||||||
|
if ($response->rows === []) {
|
||||||
|
return $response->skippedOlderThanWatermark > 0
|
||||||
|
? 'Alle Zahlungseingänge dieser Datei wurden bereits erfasst.'
|
||||||
|
: 'In der Datei sind keine Zahlungseingänge zu dieser Aktion enthalten.';
|
||||||
|
}
|
||||||
|
|
||||||
|
$assigned = count(array_filter($response->rows, static fn (array $row): bool => $row['suggestedIdentifier'] !== null));
|
||||||
|
|
||||||
|
$message = sprintf(
|
||||||
|
'%d Zahlungseingänge gelesen, %d davon konnten zugeordnet werden.',
|
||||||
|
count($response->rows),
|
||||||
|
$assigned,
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($response->skippedOlderThanWatermark > 0) {
|
||||||
|
$message .= sprintf(' %d bereits erfasste Zahlungen wurden übersprungen.', $response->skippedOlderThanWatermark);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $message;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\ParseBankStatement;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
use Illuminate\Http\UploadedFile;
|
||||||
|
|
||||||
|
class ParseBankStatementRequest
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param array<string, mixed> $configuration Tenant-Konfiguration der Überweisung. Wird hereingereicht
|
||||||
|
* statt hier geholt -- den DB-Zugriff macht der Controller
|
||||||
|
* über das Repository.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public readonly Event $event,
|
||||||
|
public readonly ?UploadedFile $file,
|
||||||
|
public readonly array $configuration = [],
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\ParseBankStatement;
|
||||||
|
|
||||||
|
class ParseBankStatementResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
public string $message = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Eine Zeile je verwertbarem Umsatz, fertig für die Prüfansicht.
|
||||||
|
*
|
||||||
|
* @var array<int, array<string, mixed>>
|
||||||
|
*/
|
||||||
|
public array $rows = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Alle zuordenbaren Anmeldungen der Aktion für die Auswahlliste.
|
||||||
|
*
|
||||||
|
* @var array<int, array<string, mixed>>
|
||||||
|
*/
|
||||||
|
public array $participants = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Umsätze, die vor der zuletzt erfassten Zahlung der erkannten Person liegen. Sie erscheinen gar
|
||||||
|
* nicht erst in der Prüfansicht -- gezählt werden sie trotzdem, sonst bliebe unerklärt, warum
|
||||||
|
* eine Datei mit 40 Zeilen nur 12 Vorschläge ergibt.
|
||||||
|
*/
|
||||||
|
public int $skippedOlderThanWatermark = 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetEventAddons;
|
||||||
|
|
||||||
|
use App\ValueObjects\Amount;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
class SetEventAddonsCommand
|
||||||
|
{
|
||||||
|
public function __construct(private SetEventAddonsRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): SetEventAddonsResponse
|
||||||
|
{
|
||||||
|
$response = new SetEventAddonsResponse();
|
||||||
|
|
||||||
|
$this->request->event->addons = $this->normalize($this->request->addons);
|
||||||
|
$this->request->event->save();
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Normalisiert die rohe Addon-Definition: trimmt Titel/Beschreibung, parst den Preis (≥ 0), erzwingt den
|
||||||
|
* Titel als Pflichtfeld und generiert stabile Keys (Bestandsschutz für bereits gespeicherte Buchungen).
|
||||||
|
*
|
||||||
|
* @param array<int, array<string, mixed>> $addons
|
||||||
|
* @return array<int, array{key: string, title: string, description: string, price: float, flat: bool}>
|
||||||
|
*/
|
||||||
|
private function normalize(array $addons): array
|
||||||
|
{
|
||||||
|
$normalized = [];
|
||||||
|
$usedKeys = [];
|
||||||
|
|
||||||
|
foreach ($addons as $addon) {
|
||||||
|
$title = trim((string)($addon['title'] ?? ''));
|
||||||
|
if ($title === '') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$price = Amount::fromString((string)($addon['price'] ?? '0'))->getAmount();
|
||||||
|
if ($price < 0) {
|
||||||
|
$price = 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$key = $this->uniqueSlug((string)($addon['key'] ?? ''), $title, $usedKeys);
|
||||||
|
$usedKeys[] = $key;
|
||||||
|
|
||||||
|
$normalized[] = [
|
||||||
|
'key' => $key,
|
||||||
|
'title' => $title,
|
||||||
|
'description' => trim((string)($addon['description'] ?? '')),
|
||||||
|
'price' => round($price, 2),
|
||||||
|
'flat' => (bool)($addon['flat'] ?? false),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liefert einen eindeutigen Slug: bevorzugt den bestehenden Wert, sonst aus dem Titel abgeleitet;
|
||||||
|
* Kollisionen werden durchnummeriert.
|
||||||
|
*
|
||||||
|
* @param array<int, string> $used
|
||||||
|
*/
|
||||||
|
private function uniqueSlug(string $existing, string $title, array $used): string
|
||||||
|
{
|
||||||
|
$base = $existing !== '' ? $existing : Str::slug($title);
|
||||||
|
if ($base === '') {
|
||||||
|
$base = 'addon';
|
||||||
|
}
|
||||||
|
|
||||||
|
$candidate = $base;
|
||||||
|
$suffix = 2;
|
||||||
|
while (in_array($candidate, $used, true)) {
|
||||||
|
$candidate = $base . '-' . $suffix;
|
||||||
|
$suffix++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetEventAddons;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
|
||||||
|
class SetEventAddonsRequest
|
||||||
|
{
|
||||||
|
public Event $event;
|
||||||
|
|
||||||
|
/** @var array<int, array<string, mixed>> Rohe Addon-Definition aus dem Admin-Panel. */
|
||||||
|
public array $addons;
|
||||||
|
|
||||||
|
public function __construct(Event $event, array $addons)
|
||||||
|
{
|
||||||
|
$this->event = $event;
|
||||||
|
$this->addons = $addons;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetEventAddons;
|
||||||
|
|
||||||
|
class SetEventAddonsResponse
|
||||||
|
{
|
||||||
|
public bool $success;
|
||||||
|
public ?string $message;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->success = false;
|
||||||
|
$this->message = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,7 +18,7 @@ class SetParticipationFeesCommand {
|
|||||||
$this->cleanBefore();
|
$this->cleanBefore();
|
||||||
|
|
||||||
$this->request->event->participationFee1()->associate(EventParticipationFee::create([
|
$this->request->event->participationFee1()->associate(EventParticipationFee::create([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'type' => $this->request->participationFeeFirst['type'],
|
'type' => $this->request->participationFeeFirst['type'],
|
||||||
'name' => $this->request->participationFeeFirst['name'],
|
'name' => $this->request->participationFeeFirst['name'],
|
||||||
'description' => $this->request->participationFeeFirst['description'],
|
'description' => $this->request->participationFeeFirst['description'],
|
||||||
@@ -29,7 +29,7 @@ class SetParticipationFeesCommand {
|
|||||||
|
|
||||||
if ($this->request->participationFeeSecond !== null) {
|
if ($this->request->participationFeeSecond !== null) {
|
||||||
$this->request->event->participationFee2()->associate(EventParticipationFee::create([
|
$this->request->event->participationFee2()->associate(EventParticipationFee::create([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'type' => $this->request->participationFeeSecond['type'],
|
'type' => $this->request->participationFeeSecond['type'],
|
||||||
'name' => $this->request->participationFeeSecond['name'],
|
'name' => $this->request->participationFeeSecond['name'],
|
||||||
'description' => $this->request->participationFeeSecond['description'],
|
'description' => $this->request->participationFeeSecond['description'],
|
||||||
@@ -41,7 +41,7 @@ class SetParticipationFeesCommand {
|
|||||||
|
|
||||||
if ($this->request->participationFeeThird !== null) {
|
if ($this->request->participationFeeThird !== null) {
|
||||||
$this->request->event->participationFee3()->associate(EventParticipationFee::create([
|
$this->request->event->participationFee3()->associate(EventParticipationFee::create([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'type' => $this->request->participationFeeThird['type'],
|
'type' => $this->request->participationFeeThird['type'],
|
||||||
'name' => $this->request->participationFeeThird['name'],
|
'name' => $this->request->participationFeeThird['name'],
|
||||||
'description' => $this->request->participationFeeThird['description'],
|
'description' => $this->request->participationFeeThird['description'],
|
||||||
@@ -53,7 +53,7 @@ class SetParticipationFeesCommand {
|
|||||||
|
|
||||||
if ($this->request->participationFeeFourth !== null) {
|
if ($this->request->participationFeeFourth !== null) {
|
||||||
$this->request->event->participationFee4()->associate(EventParticipationFee::create([
|
$this->request->event->participationFee4()->associate(EventParticipationFee::create([
|
||||||
'tenant' => app('tenant')->slug,
|
'tenant' => currentTenant()->slug,
|
||||||
'type' => $this->request->participationFeeFourth['type'],
|
'type' => $this->request->participationFeeFourth['type'],
|
||||||
'name' => $this->request->participationFeeFourth['name'],
|
'name' => $this->request->participationFeeFourth['name'],
|
||||||
'description' => $this->request->participationFeeFourth['description'],
|
'description' => $this->request->participationFeeFourth['description'],
|
||||||
|
|||||||
@@ -0,0 +1,115 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetParticipationOptions;
|
||||||
|
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
class SetParticipationOptionsCommand
|
||||||
|
{
|
||||||
|
public function __construct(private SetParticipationOptionsRequest $request)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): SetParticipationOptionsResponse
|
||||||
|
{
|
||||||
|
$response = new SetParticipationOptionsResponse();
|
||||||
|
|
||||||
|
$this->request->event->participation_options = $this->normalize($this->request->questions);
|
||||||
|
$this->request->event->save();
|
||||||
|
|
||||||
|
$response->success = true;
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Normalisiert die rohe Fragen-Definition: trimmt Labels, generiert stabile Keys/Values und verwirft
|
||||||
|
* unvollständige Fragen (kein Label oder keine gültige Option). Keys/Values sind innerhalb ihres
|
||||||
|
* Geltungsbereichs eindeutig, damit Antworten robust referenzieren können.
|
||||||
|
*
|
||||||
|
* @param array<int, array<string, mixed>> $questions
|
||||||
|
* @return array<int, array{key: string, title: string, label: string, options: array<int, array{value: string, label: string}>}>
|
||||||
|
*/
|
||||||
|
private function normalize(array $questions): array
|
||||||
|
{
|
||||||
|
$normalized = [];
|
||||||
|
$usedKeys = [];
|
||||||
|
|
||||||
|
foreach ($questions as $question) {
|
||||||
|
// Titel ist Pflicht (Überschrift/Feldbeschriftung); die Frage ist optionaler Erklärtext.
|
||||||
|
$title = trim((string)($question['title'] ?? ''));
|
||||||
|
if ($title === '') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$label = trim((string)($question['label'] ?? ''));
|
||||||
|
|
||||||
|
$options = $this->normalizeOptions($question['options'] ?? []);
|
||||||
|
if ($options === []) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$key = $this->uniqueSlug((string)($question['key'] ?? ''), $title, $usedKeys);
|
||||||
|
$usedKeys[] = $key;
|
||||||
|
|
||||||
|
$normalized[] = [
|
||||||
|
'key' => $key,
|
||||||
|
'title' => $title,
|
||||||
|
'label' => $label,
|
||||||
|
'options' => $options,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, array<string, mixed>> $options
|
||||||
|
* @return array<int, array{value: string, label: string}>
|
||||||
|
*/
|
||||||
|
private function normalizeOptions(mixed $options): array
|
||||||
|
{
|
||||||
|
if (!is_array($options)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$normalized = [];
|
||||||
|
$usedValues = [];
|
||||||
|
|
||||||
|
foreach ($options as $option) {
|
||||||
|
$label = trim((string)($option['label'] ?? ''));
|
||||||
|
if ($label === '') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = $this->uniqueSlug((string)($option['value'] ?? ''), $label, $usedValues);
|
||||||
|
$usedValues[] = $value;
|
||||||
|
|
||||||
|
$normalized[] = ['value' => $value, 'label' => $label];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Liefert einen eindeutigen Slug: bevorzugt den bestehenden Wert (Bestandsschutz für schon gespeicherte
|
||||||
|
* Fragen/Antworten), sonst aus dem Label abgeleitet; Kollisionen werden durchnummeriert.
|
||||||
|
*
|
||||||
|
* @param array<int, string> $used
|
||||||
|
*/
|
||||||
|
private function uniqueSlug(string $existing, string $label, array $used): string
|
||||||
|
{
|
||||||
|
$base = $existing !== '' ? $existing : Str::slug($label);
|
||||||
|
if ($base === '') {
|
||||||
|
$base = 'option';
|
||||||
|
}
|
||||||
|
|
||||||
|
$candidate = $base;
|
||||||
|
$suffix = 2;
|
||||||
|
while (in_array($candidate, $used, true)) {
|
||||||
|
$candidate = $base . '-' . $suffix;
|
||||||
|
$suffix++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetParticipationOptions;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
|
||||||
|
class SetParticipationOptionsRequest
|
||||||
|
{
|
||||||
|
public Event $event;
|
||||||
|
|
||||||
|
/** @var array<int, array<string, mixed>> Rohe Fragen-Definition aus dem Admin-Panel. */
|
||||||
|
public array $questions;
|
||||||
|
|
||||||
|
public function __construct(Event $event, array $questions)
|
||||||
|
{
|
||||||
|
$this->event = $event;
|
||||||
|
$this->questions = $questions;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetParticipationOptions;
|
||||||
|
|
||||||
|
class SetParticipationOptionsResponse
|
||||||
|
{
|
||||||
|
public bool $success;
|
||||||
|
public ?string $message;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->success = false;
|
||||||
|
$this->message = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetPaymentMethods;
|
||||||
|
|
||||||
|
use App\Models\AvailablePaymentMethod;
|
||||||
|
use App\Models\PaymentMethod;
|
||||||
|
use App\RelationModels\EventPaymentMethods;
|
||||||
|
|
||||||
|
class SetPaymentMethodsCommand
|
||||||
|
{
|
||||||
|
public SetPaymentMethodsRequest $request;
|
||||||
|
|
||||||
|
public function __construct(SetPaymentMethodsRequest $request)
|
||||||
|
{
|
||||||
|
$this->request = $request;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): SetPaymentMethodsResponse
|
||||||
|
{
|
||||||
|
$response = new SetPaymentMethodsResponse();
|
||||||
|
|
||||||
|
if (count($this->request->paymentMethods) === 0) {
|
||||||
|
$response->success = false;
|
||||||
|
$response->message = 'Mindestens eine Zahlungsmöglichkeit muss ausgewählt sein.';
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->syncPaymentMethods();
|
||||||
|
|
||||||
|
$this->request->event->save();
|
||||||
|
$response->success = true;
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Differenzieller Sync der Zahlungsmethoden mit Snapshot-Copy-Semantik:
|
||||||
|
* - entfernte Methoden werden gelöscht,
|
||||||
|
* - neue Methoden erhalten einen Snapshot der Tenant-Config (oder eines expliziten Overrides),
|
||||||
|
* - bestehende Methoden behalten ihre pro-Event-Config, sofern kein Override übergeben wird.
|
||||||
|
*/
|
||||||
|
private function syncPaymentMethods(): void
|
||||||
|
{
|
||||||
|
$event = $this->request->event;
|
||||||
|
$desiredSlugs = $this->request->paymentMethods;
|
||||||
|
$overrides = $this->request->paymentMethodConfigurations;
|
||||||
|
|
||||||
|
$existing = EventPaymentMethods::where('event_id', $event->id)->get()->keyBy('slug');
|
||||||
|
|
||||||
|
// Nicht mehr gewünschte Methoden entfernen.
|
||||||
|
foreach ($existing as $slug => $row) {
|
||||||
|
if (!in_array($slug, $desiredSlugs, true)) {
|
||||||
|
$row->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tenant-Instanzen (für Snapshot-Kopie neuer Methoden) laden.
|
||||||
|
$tenantMethods = AvailablePaymentMethod::whereIn('slug', $desiredSlugs)->get()->keyBy('slug');
|
||||||
|
|
||||||
|
foreach ($desiredSlugs as $slug) {
|
||||||
|
$override = $overrides[$slug] ?? null;
|
||||||
|
|
||||||
|
if (isset($existing[$slug])) {
|
||||||
|
// Bestehende Zuweisung: Config nur bei explizitem Override anpassen, sonst unverändert lassen.
|
||||||
|
if ($override !== null) {
|
||||||
|
$row = $existing[$slug];
|
||||||
|
$row->configuration = $this->eventConfiguration($slug, $override);
|
||||||
|
$row->save();
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Neue Zuweisung: expliziter Override oder Snapshot der Tenant-Config.
|
||||||
|
$snapshot = $override ?? ($tenantMethods[$slug]->configuration ?? []);
|
||||||
|
EventPaymentMethods::create([
|
||||||
|
'event_id' => $event->id,
|
||||||
|
'slug' => $slug,
|
||||||
|
'configuration' => $this->eventConfiguration($slug, $snapshot ?? []),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Was von einer Konfiguration am Event gespeichert wird.
|
||||||
|
*
|
||||||
|
* Neben dem Zuschnitt aufs Schema fallen hier die tenant-weiten Optionen heraus. Das
|
||||||
|
* Kontoauszug-Format etwa beschreibt die Bank, nicht die Zusage an die Teilnehmenden -- eingefroren
|
||||||
|
* ließe sich nach einem Bankwechsel für laufende Aktionen nichts mehr importieren. IBAN und
|
||||||
|
* Kontoinhaber frieren dagegen weiterhin pro Aktion ein.
|
||||||
|
*
|
||||||
|
* @param array<string, mixed> $configuration
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
private function eventConfiguration(string $slug, array $configuration): array
|
||||||
|
{
|
||||||
|
return PaymentMethod::stripTenantScopedOptions(
|
||||||
|
$slug,
|
||||||
|
PaymentMethod::sanitizeConfiguration($slug, $configuration),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetPaymentMethods;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
|
||||||
|
class SetPaymentMethodsRequest
|
||||||
|
{
|
||||||
|
public Event $event;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gewünschte Zahlungsmethoden-Slugs für das Event.
|
||||||
|
*
|
||||||
|
* @var array<int, string>
|
||||||
|
*/
|
||||||
|
public array $paymentMethods;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optionale pro-Event-Config-Overrides je Zahlungsmethode: [slug => [option => value]].
|
||||||
|
* Fehlt ein Slug, bleibt die bestehende Config erhalten bzw. wird beim ersten Zuweisen
|
||||||
|
* aus der Tenant-Config als Snapshot kopiert.
|
||||||
|
*
|
||||||
|
* @var array<string, array<string, mixed>>
|
||||||
|
*/
|
||||||
|
public array $paymentMethodConfigurations;
|
||||||
|
|
||||||
|
public function __construct(Event $event, array $paymentMethods, array $paymentMethodConfigurations = [])
|
||||||
|
{
|
||||||
|
$this->event = $event;
|
||||||
|
$this->paymentMethods = $paymentMethods;
|
||||||
|
$this->paymentMethodConfigurations = $paymentMethodConfigurations;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\SetPaymentMethods;
|
||||||
|
|
||||||
|
class SetPaymentMethodsResponse
|
||||||
|
{
|
||||||
|
public bool $success = false;
|
||||||
|
public string $message = '';
|
||||||
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\ShortSignUp;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\SignUp\SignUpCommand;
|
||||||
|
use App\Domains\Event\Actions\SignUp\SignUpRequest;
|
||||||
|
use App\ValueObjects\Age;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verkürzte Anmeldung: ergänzt die nicht erhobenen Pflichtangaben um Platzhalter und übergibt an die reguläre
|
||||||
|
* Anmelde-Action. Dadurch gelten für Kurzanmeldungen dieselben Regeln wie für jede andere Anmeldung
|
||||||
|
* (Transaktion, laufende Rechnungsnummer, eFZ-Vorbelegung, Snapshot der Teilnahmeoptionen).
|
||||||
|
*/
|
||||||
|
class ShortSignUpCommand {
|
||||||
|
/** Platzhalter für Angaben, die die Kurzanmeldung nicht erhebt. */
|
||||||
|
private const string PLACEHOLDER = 'Nicht erforderlich';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Die Postleitzahl bekommt bewusst keinen Text-Platzhalter: aus ihr wird in Teilnehmerliste und CSV-Export
|
||||||
|
* das Bundesland abgeleitet.
|
||||||
|
*/
|
||||||
|
private const string PLACEHOLDER_POSTCODE = '00000';
|
||||||
|
|
||||||
|
public function __construct(public ShortSignUpRequest $request) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute() : ShortSignUpResponse {
|
||||||
|
$response = new ShortSignUpResponse();
|
||||||
|
|
||||||
|
// Ohne konfigurierte Teilnahmegruppe gäbe es keinen gültigen `participation_type` -- sauber abbrechen,
|
||||||
|
// statt in einen Fremdschlüssel-Fehler zu laufen.
|
||||||
|
$participationType = $this->request->event->firstParticipationTypeSlug();
|
||||||
|
if ($participationType === null) {
|
||||||
|
$response->message = 'Für diese Veranstaltung ist noch keine Teilnahmegruppe hinterlegt.';
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
$participantAge = new Age($this->request->birthday);
|
||||||
|
|
||||||
|
// Bei Minderjährigen ist die Kontaktperson Pflicht; der Client prüft das ebenfalls, verlassen wird sich
|
||||||
|
// darauf nicht.
|
||||||
|
if (!$participantAge->isfullAged()
|
||||||
|
&& ($this->request->contactPerson === null || $this->request->contactEmail === null)) {
|
||||||
|
$response->message = 'Für Minderjährige werden Name und E-Mail-Adresse einer Kontaktperson benötigt.';
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stamm: bei genau einem teilnehmenden Stamm wird dieser gesetzt, bei mehreren muss gewählt werden,
|
||||||
|
// ohne teilnehmende Stämme bleibt die Zuordnung leer.
|
||||||
|
$localGroups = $this->request->event->localGroups;
|
||||||
|
$localGroup = null;
|
||||||
|
|
||||||
|
if ($localGroups->count() === 1) {
|
||||||
|
$localGroup = $localGroups->first();
|
||||||
|
} elseif ($localGroups->count() > 1) {
|
||||||
|
$localGroup = $localGroups->firstWhere('id', $this->request->localGroupId);
|
||||||
|
|
||||||
|
if ($localGroup === null) {
|
||||||
|
$response->message = 'Bitte einen Stamm auswählen.';
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$eventResource = $this->request->event->toResource();
|
||||||
|
|
||||||
|
// Zeitraum, Gruppe und Beitragsstufe stehen bei der Kurzanmeldung fest -- es gibt nichts zu wählen.
|
||||||
|
$amount = $eventResource->calculateAmount(
|
||||||
|
$participationType,
|
||||||
|
'standard',
|
||||||
|
$this->request->event->start_date,
|
||||||
|
$this->request->event->end_date,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
|
||||||
|
$signUpRequest = new SignUpRequest(
|
||||||
|
event: $this->request->event,
|
||||||
|
user_id: $this->request->user_id,
|
||||||
|
firstname: $this->request->firstname,
|
||||||
|
lastname: $this->request->lastname,
|
||||||
|
nickname: $this->request->nickname,
|
||||||
|
participationType: $participationType,
|
||||||
|
localGroup: $localGroup,
|
||||||
|
birthday: $this->request->birthday,
|
||||||
|
address_1: self::PLACEHOLDER,
|
||||||
|
address_2: null,
|
||||||
|
postcode: self::PLACEHOLDER_POSTCODE,
|
||||||
|
city: self::PLACEHOLDER,
|
||||||
|
email_1: $this->request->email,
|
||||||
|
phone_1: $this->request->phone,
|
||||||
|
email_2: $this->request->contactEmail,
|
||||||
|
phone_2: null,
|
||||||
|
contact_person: $this->request->contactPerson,
|
||||||
|
allergies: $this->request->allergies,
|
||||||
|
intolerances: $this->request->intolerances,
|
||||||
|
medications: null,
|
||||||
|
tetanus_vaccination: null,
|
||||||
|
// Kein Wert der Zuordnung -- der SignUpCommand fällt damit auf "Omnivor" zurück.
|
||||||
|
eating_habit: '',
|
||||||
|
swimming_permission: $this->resolveSwimmingPermission($participantAge),
|
||||||
|
first_aid_permission: $participantAge->isfullAged() ? '-1' : ($this->request->firstAidPermission ?? '-1'),
|
||||||
|
foto_socialmedia: $this->request->foto_socialmedia,
|
||||||
|
foto_print: $this->request->foto_print,
|
||||||
|
foto_webseite: $this->request->foto_webseite,
|
||||||
|
foto_partner: $this->request->foto_partner,
|
||||||
|
foto_intern: $this->request->foto_intern,
|
||||||
|
arrival: $this->request->event->start_date,
|
||||||
|
departure: $this->request->event->end_date,
|
||||||
|
arrival_eating: 1,
|
||||||
|
departure_eating: 2,
|
||||||
|
notes: null,
|
||||||
|
amount: $amount,
|
||||||
|
paymentMethod: $this->request->paymentMethod,
|
||||||
|
paymentOptions: $this->request->paymentOptions,
|
||||||
|
participationOptions: $this->request->participationOptions,
|
||||||
|
addonItems: [],
|
||||||
|
feeType: 'standard',
|
||||||
|
siblingReduction: false,
|
||||||
|
);
|
||||||
|
|
||||||
|
$signUpResponse = new SignUpCommand($signUpRequest)->execute();
|
||||||
|
|
||||||
|
$response->success = $signUpResponse->success;
|
||||||
|
$response->participant = $signUpResponse->participant;
|
||||||
|
$response->message = $signUpResponse->message;
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bei Volljährigen und wenn die Veranstaltung die Badeerlaubnis nicht abfragt, entscheidet der SignUpCommand
|
||||||
|
* (volljährig => erteilt, nicht abgefragt => keine). Nur die getroffene Auswahl Minderjähriger wird
|
||||||
|
* durchgereicht.
|
||||||
|
*/
|
||||||
|
private function resolveSwimmingPermission(Age $participantAge) : ?string
|
||||||
|
{
|
||||||
|
if ($participantAge->isfullAged() || !$this->request->event->swimming_permission_required) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->request->swimmingPermission;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\ShortSignUp;
|
||||||
|
|
||||||
|
use App\Models\Event;
|
||||||
|
use DateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Eingabedaten der verkürzten Anmeldung -- ausschließlich das, was der Kurz-Wizard tatsächlich erhebt.
|
||||||
|
* Alle übrigen Pflichtangaben des Teilnehmers setzt der Command auf Platzhalter.
|
||||||
|
*/
|
||||||
|
class ShortSignUpRequest {
|
||||||
|
function __construct(
|
||||||
|
public Event $event,
|
||||||
|
public ?int $user_id,
|
||||||
|
public string $firstname,
|
||||||
|
public string $lastname,
|
||||||
|
public ?string $nickname,
|
||||||
|
public DateTime $birthday,
|
||||||
|
public string $email,
|
||||||
|
public string $phone,
|
||||||
|
/**
|
||||||
|
* Tenant-ID des Stamms. Nur gefüllt, wenn die Veranstaltung mehrere teilnehmende Stämme hat --
|
||||||
|
* bei genau einem wird dieser gesetzt, ohne zu fragen.
|
||||||
|
*/
|
||||||
|
public ?int $localGroupId,
|
||||||
|
/** Kontaktperson: nur bei Minderjährigen erhoben. */
|
||||||
|
public ?string $contactPerson,
|
||||||
|
public ?string $contactEmail,
|
||||||
|
public ?string $allergies,
|
||||||
|
public ?string $intolerances,
|
||||||
|
/** Slug aus `first_aid_permissions`; nur bei Minderjährigen erhoben. */
|
||||||
|
public ?string $firstAidPermission,
|
||||||
|
/** Slug aus `swimming_permissions`; nur bei Minderjährigen und nur wenn die Veranstaltung sie abfragt. */
|
||||||
|
public ?string $swimmingPermission,
|
||||||
|
public bool $foto_socialmedia,
|
||||||
|
public bool $foto_print,
|
||||||
|
public bool $foto_webseite,
|
||||||
|
public bool $foto_partner,
|
||||||
|
public bool $foto_intern,
|
||||||
|
public ?string $paymentMethod,
|
||||||
|
public array $paymentOptions = [],
|
||||||
|
/** Antworten auf die Teilnahmeoptionen: [ question_key => value ]. */
|
||||||
|
public array $participationOptions = [],
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Actions\ShortSignUp;
|
||||||
|
|
||||||
|
use App\Models\EventParticipant;
|
||||||
|
|
||||||
|
class ShortSignUpResponse {
|
||||||
|
public bool $success;
|
||||||
|
public ?EventParticipant $participant;
|
||||||
|
public ?string $message = null;
|
||||||
|
|
||||||
|
public function __construct() {
|
||||||
|
$this->success = false;
|
||||||
|
$this->participant = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -4,7 +4,10 @@ namespace App\Domains\Event\Actions\SignUp;
|
|||||||
|
|
||||||
use App\Enumerations\EatingHabit;
|
use App\Enumerations\EatingHabit;
|
||||||
use App\Enumerations\EfzStatus;
|
use App\Enumerations\EfzStatus;
|
||||||
|
use App\Enumerations\SwimmingPermission;
|
||||||
|
use App\EventPaymentModules\EventPaymentModuleRegistry;
|
||||||
use App\ValueObjects\Age;
|
use App\ValueObjects\Age;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class SignUpCommand {
|
class SignUpCommand {
|
||||||
@@ -14,6 +17,26 @@ class SignUpCommand {
|
|||||||
public function execute() : SignUpResponse {
|
public function execute() : SignUpResponse {
|
||||||
$response = new SignUpResponse();
|
$response = new SignUpResponse();
|
||||||
|
|
||||||
|
// Teilnehmer-Eingaben der gewählten Zahlungsart gegen das Modul-Schema absichern.
|
||||||
|
$module = $this->request->paymentMethod !== null
|
||||||
|
? EventPaymentModuleRegistry::forSlug($this->request->paymentMethod)
|
||||||
|
: null;
|
||||||
|
$paymentOptions = $module?->sanitizeParticipantOptions($this->request->paymentOptions) ?? [];
|
||||||
|
|
||||||
|
if ($module !== null && !$module->participantOptionsComplete($paymentOptions)) {
|
||||||
|
$response->success = false;
|
||||||
|
$response->message = 'Bitte alle erforderlichen Zahlungsangaben ausfüllen.';
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Teilnahmeoptionen (event-spezifische Pflicht-Auswahl) gegen die Event-Definition absichern.
|
||||||
|
$participationOptionRows = $this->buildParticipationOptionRows();
|
||||||
|
if ($participationOptionRows === null) {
|
||||||
|
$response->success = false;
|
||||||
|
$response->message = 'Bitte alle Auswahlfelder ausfüllen.';
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
$eatingHabit = match ($this->request->eating_habit) {
|
$eatingHabit = match ($this->request->eating_habit) {
|
||||||
'vegan' => EatingHabit::EATING_HABIT_VEGAN,
|
'vegan' => EatingHabit::EATING_HABIT_VEGAN,
|
||||||
'vegetarian' => EatingHabit::EATING_HABIT_VEGETARIAN,
|
'vegetarian' => EatingHabit::EATING_HABIT_VEGETARIAN,
|
||||||
@@ -22,16 +45,22 @@ class SignUpCommand {
|
|||||||
|
|
||||||
$participantAge = new Age($this->request->birthday);
|
$participantAge = new Age($this->request->birthday);
|
||||||
|
|
||||||
$response->participant = $this->request->event->participants()->create(
|
// Anmeldung als Ganzes: die laufende Nummer (invoice_sequence) muss unter der Sperre vergeben und
|
||||||
|
// im selben Zug geschrieben werden, sonst könnten zwei gleichzeitige Anmeldungen dieselbe erhalten.
|
||||||
|
$response->participant = DB::transaction(function () use ($participantAge, $eatingHabit, $paymentOptions, $participationOptionRows) {
|
||||||
|
$participant = $this->request->event->participants()->create(
|
||||||
[
|
[
|
||||||
'tenant' => $this->request->event->tenant,
|
'tenant' => $this->request->event->tenant,
|
||||||
'user_id' => $this->request->user_id,
|
'user_id' => $this->request->user_id,
|
||||||
'identifier' => Str::random(10),
|
'identifier' => Str::random(10),
|
||||||
|
'invoice_sequence' => $this->nextInvoiceSequence(),
|
||||||
'firstname' => $this->request->firstname,
|
'firstname' => $this->request->firstname,
|
||||||
'lastname' => $this->request->lastname,
|
'lastname' => $this->request->lastname,
|
||||||
'nickname' => $this->request->nickname,
|
'nickname' => $this->request->nickname,
|
||||||
'participation_type' => $this->request->participationType,
|
'participation_type' => $this->request->participationType,
|
||||||
'local_group' => $this->request->localGroup->slug,
|
'fee_type' => $this->request->feeType,
|
||||||
|
'sibling_reduction' => $this->request->siblingReduction,
|
||||||
|
'local_group' => $this->request->localGroup?->slug,
|
||||||
'birthday' => $this->request->birthday,
|
'birthday' => $this->request->birthday,
|
||||||
'address_1' => $this->request->address_1,
|
'address_1' => $this->request->address_1,
|
||||||
'address_2' => $this->request->address_2,
|
'address_2' => $this->request->address_2,
|
||||||
@@ -47,8 +76,10 @@ class SignUpCommand {
|
|||||||
'medications' => $this->request->medications,
|
'medications' => $this->request->medications,
|
||||||
'tetanus_vaccination' => $this->request->tetanus_vaccination,
|
'tetanus_vaccination' => $this->request->tetanus_vaccination,
|
||||||
'eating_habit' => $eatingHabit,
|
'eating_habit' => $eatingHabit,
|
||||||
'swimming_permission' => $participantAge->isfullAged() ? 'SWIMMING_PERMISSION_ALLOWED' : $this->request->swimming_permission,
|
'swimming_permission' => $this->resolveSwimmingPermission($participantAge),
|
||||||
'first_aid_permission' => $participantAge->isfullAged() ? 'FIRST_AID_PERMISSION_ALLOWED' : $this->request->first_aid_permission,
|
'first_aid_permission' => ($participantAge->isfullAged() || $this->request->first_aid_permission === '-1')
|
||||||
|
? 'FIRST_AID_PERMISSION_ALLOWED'
|
||||||
|
: $this->request->first_aid_permission,
|
||||||
'foto_socialmedia' => $this->request->foto_socialmedia,
|
'foto_socialmedia' => $this->request->foto_socialmedia,
|
||||||
'foto_print' => $this->request->foto_print,
|
'foto_print' => $this->request->foto_print,
|
||||||
'foto_webseite' => $this->request->foto_webseite,
|
'foto_webseite' => $this->request->foto_webseite,
|
||||||
@@ -62,12 +93,139 @@ class SignUpCommand {
|
|||||||
'amount' => $this->request->amount,
|
'amount' => $this->request->amount,
|
||||||
'payment_purpose' => $this->request->event->name . ' - Beitrag ' . $this->request->firstname . ' ' . $this->request->lastname,
|
'payment_purpose' => $this->request->event->name . ' - Beitrag ' . $this->request->firstname . ' ' . $this->request->lastname,
|
||||||
'payment_method' => $this->request->paymentMethod,
|
'payment_method' => $this->request->paymentMethod,
|
||||||
|
'payment_options' => $paymentOptions,
|
||||||
'efz_status' => $participantAge->isfullAged() ? EfzStatus::EFZ_STATUS_NOT_CHECKED : EfzStatus::EFZ_STATUS_NOT_REQUIRED,
|
'efz_status' => $participantAge->isfullAged() ? EfzStatus::EFZ_STATUS_NOT_CHECKED : EfzStatus::EFZ_STATUS_NOT_REQUIRED,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$this->persistParticipationOptions($participant, $participationOptionRows);
|
||||||
|
$this->persistAddons($participant);
|
||||||
|
|
||||||
|
return $participant;
|
||||||
|
});
|
||||||
|
|
||||||
$response->success = true;
|
$response->success = true;
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Badeerlaubnis auflösen. Volljährige brauchen keine Erlaubnis. Für Minderjährige gilt die getroffene Auswahl;
|
||||||
|
* fehlt sie -- weil die Veranstaltung die Badeerlaubnis gar nicht abfragt oder keine Wahl getroffen wurde --,
|
||||||
|
* wird bewusst "Keine" hinterlegt und nicht etwa stillschweigend eine Erlaubnis angenommen.
|
||||||
|
*/
|
||||||
|
private function resolveSwimmingPermission(Age $participantAge): string
|
||||||
|
{
|
||||||
|
if ($participantAge->isfullAged()) {
|
||||||
|
return SwimmingPermission::SWIMMING_PERMISSION_ALLOWED;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$this->request->event->swimming_permission_required
|
||||||
|
|| $this->request->swimming_permission === null
|
||||||
|
|| $this->request->swimming_permission === '-1') {
|
||||||
|
return SwimmingPermission::SWIMMING_PERMISSION_DENIED;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->request->swimming_permission;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Nächste laufende Nummer des Teilis innerhalb der Veranstaltung -- der letzte Block der
|
||||||
|
* Rechnungsnummer. Die Event-Zeile wird gesperrt, damit gleichzeitige Anmeldungen derselben
|
||||||
|
* Veranstaltung serialisiert werden; der Aufruf erfolgt innerhalb der Anmelde-Transaktion, sodass die
|
||||||
|
* Sperre bis zum Schreiben des Teilis steht.
|
||||||
|
*
|
||||||
|
* Abgemeldete Teilis behalten ihre Nummer, gezählt wird deshalb über MAX und nicht über COUNT.
|
||||||
|
*/
|
||||||
|
private function nextInvoiceSequence(): int
|
||||||
|
{
|
||||||
|
DB::table('events')
|
||||||
|
->where('id', $this->request->event->id)
|
||||||
|
->lockForUpdate()
|
||||||
|
->first();
|
||||||
|
|
||||||
|
$highest = DB::table('event_participants')
|
||||||
|
->where('event_id', $this->request->event->id)
|
||||||
|
->max('invoice_sequence');
|
||||||
|
|
||||||
|
return (int) $highest + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Speichert die gewählten Zusätze (Event-Addons) als Snapshot-Zeilen (Titel/Preis/Betrag) für die spätere
|
||||||
|
* Rechnung. Die Beträge sind bereits in der Controller-Auflösung (`resolveAddons`) berechnet, inkl. USt.
|
||||||
|
*/
|
||||||
|
private function persistAddons(\App\Models\EventParticipant $participant): void
|
||||||
|
{
|
||||||
|
foreach ($this->request->addonItems as $item) {
|
||||||
|
$participant->selectedAddons()->create([
|
||||||
|
'tenant' => $this->request->event->tenant,
|
||||||
|
'event_id' => $this->request->event->id,
|
||||||
|
'addon_key' => $item['key'],
|
||||||
|
'title' => $item['title'],
|
||||||
|
'price' => $item['price'] ?? 0,
|
||||||
|
'flat' => (bool)($item['flat'] ?? false),
|
||||||
|
'days' => $item['days'] ?? 0,
|
||||||
|
'amount' => $item['amount'] ?? 0,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validiert die Antworten gegen die am Event definierten Teilnahmeoptionen und erzeugt die zu speichernden
|
||||||
|
* Zeilen mit Label-Snapshots. Gibt null zurück, wenn eine Pflicht-Frage unbeantwortet oder eine Antwort
|
||||||
|
* ungültig ist (Absicherung gegen manipulierte Payloads).
|
||||||
|
*
|
||||||
|
* @return array<int, array{question_key: string, question_label: string, value: string, value_label: string}>|null
|
||||||
|
*/
|
||||||
|
private function buildParticipationOptionRows(): ?array
|
||||||
|
{
|
||||||
|
$rows = [];
|
||||||
|
|
||||||
|
foreach ($this->request->event->participation_options ?? [] as $question) {
|
||||||
|
$key = $question['key'] ?? null;
|
||||||
|
if ($key === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = $this->request->participationOptions[$key] ?? null;
|
||||||
|
if ($value === null || $value === '') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$option = null;
|
||||||
|
foreach ($question['options'] ?? [] as $candidate) {
|
||||||
|
if (($candidate['value'] ?? null) === $value) {
|
||||||
|
$option = $candidate;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($option === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows[] = [
|
||||||
|
'question_key' => $key,
|
||||||
|
'question_label' => $question['label'] ?? $key,
|
||||||
|
'value' => $value,
|
||||||
|
'value_label' => $option['label'] ?? $value,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, array{question_key: string, question_label: string, value: string, value_label: string}> $rows
|
||||||
|
*/
|
||||||
|
private function persistParticipationOptions(\App\Models\EventParticipant $participant, array $rows): void
|
||||||
|
{
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
$participant->selectedOptions()->create(array_merge($row, [
|
||||||
|
'tenant' => $this->request->event->tenant,
|
||||||
|
'event_id' => $this->request->event->id,
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Event\Actions\SignUp;
|
namespace App\Domains\Event\Actions\SignUp;
|
||||||
|
|
||||||
use App\Enumerations\ParticipationType;
|
|
||||||
use App\Models\Event;
|
use App\Models\Event;
|
||||||
use App\Models\Tenant;
|
use App\Models\Tenant;
|
||||||
use App\ValueObjects\Amount;
|
use App\ValueObjects\Amount;
|
||||||
@@ -16,7 +15,8 @@ class SignUpRequest {
|
|||||||
public string $lastname,
|
public string $lastname,
|
||||||
public ?string $nickname,
|
public ?string $nickname,
|
||||||
public string $participationType,
|
public string $participationType,
|
||||||
public Tenant $localGroup,
|
/** Stamm des Teilnehmers; in der Kurzanmeldung nicht erhoben und deshalb optional. */
|
||||||
|
public ?Tenant $localGroup,
|
||||||
public DateTime $birthday,
|
public DateTime $birthday,
|
||||||
public string $address_1,
|
public string $address_1,
|
||||||
public ?string $address_2,
|
public ?string $address_2,
|
||||||
@@ -46,6 +46,15 @@ class SignUpRequest {
|
|||||||
public ?string $notes,
|
public ?string $notes,
|
||||||
public Amount $amount,
|
public Amount $amount,
|
||||||
public ?string $paymentMethod,
|
public ?string $paymentMethod,
|
||||||
|
public array $paymentOptions = [],
|
||||||
|
/** Antworten auf die Teilnahmeoptionen: [ question_key => value ]. */
|
||||||
|
public array $participationOptions = [],
|
||||||
|
/** Aufgelöste Zusätze (Event-Addons): je Eintrag [ key, title, price, flat, days, amount ]. */
|
||||||
|
public array $addonItems = [],
|
||||||
|
/** Gewählte Preisspalte: standard | reduced | solidarity. Wird für die Rechnung mitgeschrieben. */
|
||||||
|
public ?string $feeType = null,
|
||||||
|
/** Ob die 50-%-Geschwisterermäßigung in `amount` eingerechnet ist. */
|
||||||
|
public bool $siblingReduction = false,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use App\Models\EventParticipant;
|
|||||||
class SignUpResponse {
|
class SignUpResponse {
|
||||||
public bool $success;
|
public bool $success;
|
||||||
public ?EventParticipant $participant;
|
public ?EventParticipant $participant;
|
||||||
|
public ?string $message = null;
|
||||||
|
|
||||||
public function __construct() {
|
public function __construct() {
|
||||||
$this->success = false;
|
$this->success = false;
|
||||||
|
|||||||
@@ -2,10 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Event\Actions\UpdateEvent;
|
namespace App\Domains\Event\Actions\UpdateEvent;
|
||||||
|
|
||||||
use App\Models\AvailablePaymentMethod;
|
|
||||||
use App\Models\PaymentMethod;
|
|
||||||
use App\RelationModels\EventPaymentMethods;
|
|
||||||
|
|
||||||
class UpdateEventCommand {
|
class UpdateEventCommand {
|
||||||
public UpdateEventRequest $request;
|
public UpdateEventRequest $request;
|
||||||
public function __construct(UpdateEventRequest $request) {
|
public function __construct(UpdateEventRequest $request) {
|
||||||
@@ -15,14 +11,10 @@ class UpdateEventCommand {
|
|||||||
public function execute() : UpdateEventResponse {
|
public function execute() : UpdateEventResponse {
|
||||||
$response = new UpdateEventResponse();
|
$response = new UpdateEventResponse();
|
||||||
|
|
||||||
if (count($this->request->paymentMethods) === 0) {
|
|
||||||
$response->success = false;
|
|
||||||
$response->message = 'Mindestens eine Zahlungsmöglichkeit muss ausgewählt sein.';
|
|
||||||
return $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->request->event->name = $this->request->eventName;
|
$this->request->event->name = $this->request->eventName;
|
||||||
$this->request->event->location = $this->request->eventLocation;
|
$this->request->event->location = $this->request->eventLocation;
|
||||||
|
$this->request->event->street = $this->normalizeOptional($this->request->street);
|
||||||
|
$this->request->event->house_number = $this->normalizeOptional($this->request->houseNumber);
|
||||||
$this->request->event->postal_code = $this->request->postalCode;
|
$this->request->event->postal_code = $this->request->postalCode;
|
||||||
$this->request->event->email = $this->request->email;
|
$this->request->event->email = $this->request->email;
|
||||||
$this->request->event->early_bird_end = $this->request->earlyBirdEnd;
|
$this->request->event->early_bird_end = $this->request->earlyBirdEnd;
|
||||||
@@ -32,6 +24,8 @@ class UpdateEventCommand {
|
|||||||
$this->request->event->support_flat = $this->request->flatSupport;
|
$this->request->event->support_flat = $this->request->flatSupport;
|
||||||
$this->request->event->send_weekly_report = $this->request->sendWeeklyReports;
|
$this->request->event->send_weekly_report = $this->request->sendWeeklyReports;
|
||||||
$this->request->event->registration_allowed = $this->request->registrationAllowed;
|
$this->request->event->registration_allowed = $this->request->registrationAllowed;
|
||||||
|
$this->request->event->short_registration = $this->request->shortRegistration;
|
||||||
|
$this->request->event->swimming_permission_required = $this->request->swimmingPermissionRequired;
|
||||||
$this->request->event->save();
|
$this->request->event->save();
|
||||||
|
|
||||||
$this->request->event->resetAllowedEatingHabits();
|
$this->request->event->resetAllowedEatingHabits();
|
||||||
@@ -45,8 +39,6 @@ class UpdateEventCommand {
|
|||||||
$this->request->event->localGroups()->attach($contributingLocalGroup);
|
$this->request->event->localGroups()->attach($contributingLocalGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->syncPaymentMethods();
|
|
||||||
|
|
||||||
$this->request->event->save();
|
$this->request->event->save();
|
||||||
$response->success = true;
|
$response->success = true;
|
||||||
|
|
||||||
@@ -54,49 +46,13 @@ class UpdateEventCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Differenzieller Sync der Zahlungsmethoden mit Snapshot-Copy-Semantik:
|
* Straße und Hausnummer sind optional. Ein geleertes Eingabefeld liefert einen leeren String --
|
||||||
* - entfernte Methoden werden gelöscht,
|
* gespeichert wird dafür `null`, damit „nicht angegeben" nur eine Darstellung hat.
|
||||||
* - neue Methoden erhalten einen Snapshot der Tenant-Config (oder eines expliziten Overrides),
|
|
||||||
* - bestehende Methoden behalten ihre pro-Event-Config, sofern kein Override übergeben wird.
|
|
||||||
*/
|
*/
|
||||||
private function syncPaymentMethods(): void
|
private function normalizeOptional(?string $value): ?string
|
||||||
{
|
{
|
||||||
$event = $this->request->event;
|
$value = trim((string) $value);
|
||||||
$desiredSlugs = $this->request->paymentMethods;
|
|
||||||
$overrides = $this->request->paymentMethodConfigurations;
|
|
||||||
|
|
||||||
$existing = EventPaymentMethods::where('event_id', $event->id)->get()->keyBy('slug');
|
return '' === $value ? null : $value;
|
||||||
|
|
||||||
// Nicht mehr gewünschte Methoden entfernen.
|
|
||||||
foreach ($existing as $slug => $row) {
|
|
||||||
if (!in_array($slug, $desiredSlugs, true)) {
|
|
||||||
$row->delete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Tenant-Instanzen (für Snapshot-Kopie neuer Methoden) laden.
|
|
||||||
$tenantMethods = AvailablePaymentMethod::whereIn('slug', $desiredSlugs)->get()->keyBy('slug');
|
|
||||||
|
|
||||||
foreach ($desiredSlugs as $slug) {
|
|
||||||
$override = $overrides[$slug] ?? null;
|
|
||||||
|
|
||||||
if (isset($existing[$slug])) {
|
|
||||||
// Bestehende Zuweisung: Config nur bei explizitem Override anpassen, sonst unverändert lassen.
|
|
||||||
if ($override !== null) {
|
|
||||||
$row = $existing[$slug];
|
|
||||||
$row->configuration = PaymentMethod::sanitizeConfiguration($slug, $override);
|
|
||||||
$row->save();
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Neue Zuweisung: expliziter Override oder Snapshot der Tenant-Config.
|
|
||||||
$snapshot = $override ?? ($tenantMethods[$slug]->configuration ?? []);
|
|
||||||
EventPaymentMethods::create([
|
|
||||||
'event_id' => $event->id,
|
|
||||||
'slug' => $slug,
|
|
||||||
'configuration' => PaymentMethod::sanitizeConfiguration($slug, $snapshot ?? []),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ class UpdateEventRequest {
|
|||||||
public Event $event;
|
public Event $event;
|
||||||
public string $eventName;
|
public string $eventName;
|
||||||
public string $eventLocation;
|
public string $eventLocation;
|
||||||
|
public ?string $street;
|
||||||
|
public ?string $houseNumber;
|
||||||
public string $postalCode;
|
public string $postalCode;
|
||||||
public string $email;
|
public string $email;
|
||||||
public DateTime $earlyBirdEnd;
|
public DateTime $earlyBirdEnd;
|
||||||
@@ -17,25 +19,20 @@ class UpdateEventRequest {
|
|||||||
public int $alcoholicsAge;
|
public int $alcoholicsAge;
|
||||||
public bool $sendWeeklyReports;
|
public bool $sendWeeklyReports;
|
||||||
public bool $registrationAllowed;
|
public bool $registrationAllowed;
|
||||||
|
public bool $shortRegistration;
|
||||||
|
public bool $swimmingPermissionRequired;
|
||||||
public Amount $flatSupport;
|
public Amount $flatSupport;
|
||||||
public Amount $supportPerPerson;
|
public Amount $supportPerPerson;
|
||||||
public array $contributingLocalGroups;
|
public array $contributingLocalGroups;
|
||||||
public array $eatingHabits;
|
public array $eatingHabits;
|
||||||
public array $paymentMethods;
|
|
||||||
|
|
||||||
/**
|
public function __construct(Event $event, string $eventName, string $eventLocation, string $postalCode, string $email, DateTime $earlyBirdEnd, DateTime $registrationFinalEnd, int $alcoholicsAge, bool $sendWeeklyReports, bool $registrationAllowed, Amount $flatSupport, Amount $supportPerPerson, array $contributingLocalGroups, array $eatingHabits, bool $shortRegistration = false, bool $swimmingPermissionRequired = true, ?string $street = null, ?string $houseNumber = null)
|
||||||
* Optionale pro-Event-Config-Overrides je Zahlungsmethode: [slug => [option => value]].
|
{
|
||||||
* Fehlt ein Slug, bleibt die bestehende Config erhalten bzw. wird beim ersten Zuweisen
|
|
||||||
* aus der Tenant-Config als Snapshot kopiert.
|
|
||||||
*
|
|
||||||
* @var array<string, array<string, mixed>>
|
|
||||||
*/
|
|
||||||
public array $paymentMethodConfigurations;
|
|
||||||
|
|
||||||
public function __construct(Event $event, string $eventName, string $eventLocation, string $postalCode, string $email, DateTime $earlyBirdEnd, DateTime $registrationFinalEnd, int $alcoholicsAge, bool $sendWeeklyReports, bool $registrationAllowed, Amount $flatSupport, Amount $supportPerPerson, array $contributingLocalGroups, array $eatingHabits, array $paymentMethods, array $paymentMethodConfigurations = []) {
|
|
||||||
$this->event = $event;
|
$this->event = $event;
|
||||||
$this->eventName = $eventName;
|
$this->eventName = $eventName;
|
||||||
$this->eventLocation = $eventLocation;
|
$this->eventLocation = $eventLocation;
|
||||||
|
$this->street = $street;
|
||||||
|
$this->houseNumber = $houseNumber;
|
||||||
$this->postalCode = $postalCode;
|
$this->postalCode = $postalCode;
|
||||||
$this->email = $email;
|
$this->email = $email;
|
||||||
$this->earlyBirdEnd = $earlyBirdEnd;
|
$this->earlyBirdEnd = $earlyBirdEnd;
|
||||||
@@ -43,11 +40,11 @@ class UpdateEventRequest {
|
|||||||
$this->alcoholicsAge = $alcoholicsAge;
|
$this->alcoholicsAge = $alcoholicsAge;
|
||||||
$this->sendWeeklyReports = $sendWeeklyReports;
|
$this->sendWeeklyReports = $sendWeeklyReports;
|
||||||
$this->registrationAllowed = $registrationAllowed;
|
$this->registrationAllowed = $registrationAllowed;
|
||||||
|
$this->shortRegistration = $shortRegistration;
|
||||||
|
$this->swimmingPermissionRequired = $swimmingPermissionRequired;
|
||||||
$this->flatSupport = $flatSupport;
|
$this->flatSupport = $flatSupport;
|
||||||
$this->supportPerPerson = $supportPerPerson;
|
$this->supportPerPerson = $supportPerPerson;
|
||||||
$this->contributingLocalGroups = $contributingLocalGroups;
|
$this->contributingLocalGroups = $contributingLocalGroups;
|
||||||
$this->eatingHabits = $eatingHabits;
|
$this->eatingHabits = $eatingHabits;
|
||||||
$this->paymentMethods = $paymentMethods;
|
|
||||||
$this->paymentMethodConfigurations = $paymentMethodConfigurations;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ class UpdateParticipantCommand {
|
|||||||
$p->address_2 = $this->request->address_2;
|
$p->address_2 = $this->request->address_2;
|
||||||
$p->postcode = $this->request->postcode;
|
$p->postcode = $this->request->postcode;
|
||||||
$p->city = $this->request->city;
|
$p->city = $this->request->city;
|
||||||
$p->local_group = $this->request->localgroup;
|
// Leerer String würde als Fremdschlüssel scheitern -- kein Stamm heißt null.
|
||||||
|
$p->local_group = $this->request->localgroup ?: null;
|
||||||
$p->birthday = DateTime::createFromFormat('Y-m-d', $this->request->birthday);
|
$p->birthday = DateTime::createFromFormat('Y-m-d', $this->request->birthday);
|
||||||
$p->email_1 = $this->request->email_1;
|
$p->email_1 = $this->request->email_1;
|
||||||
$p->phone_1 = $this->request->phone_1;
|
$p->phone_1 = $this->request->phone_1;
|
||||||
@@ -72,11 +73,97 @@ class UpdateParticipantCommand {
|
|||||||
|
|
||||||
|
|
||||||
$p->save();
|
$p->save();
|
||||||
|
|
||||||
|
if ($this->request->participationOptions !== null) {
|
||||||
|
$this->syncParticipationOptions($p);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->request->selectedAddons !== null) {
|
||||||
|
$this->syncAddons($p);
|
||||||
|
}
|
||||||
|
|
||||||
$this->response->success = true;
|
$this->response->success = true;
|
||||||
$this->response->participant = $p;
|
$this->response->participant = $p;
|
||||||
return $this->response;
|
return $this->response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ersetzt die zugeordneten Zusätze (Event-Addons) anhand der Auswahl. Bewusst **ohne Preis/Betrag**
|
||||||
|
* (amount 0): der Teilnahmebeitrag wird in den Details ohnehin manuell gesetzt. Es wird nur der Titel als
|
||||||
|
* Snapshot gespeichert, damit die Zuordnung sichtbar bleibt.
|
||||||
|
*/
|
||||||
|
private function syncAddons(EventParticipant $participant): void
|
||||||
|
{
|
||||||
|
$participant->selectedAddons()->delete();
|
||||||
|
|
||||||
|
$selection = $this->request->selectedAddons ?? [];
|
||||||
|
|
||||||
|
foreach ($participant->event?->addons ?? [] as $addon) {
|
||||||
|
$key = $addon['key'] ?? null;
|
||||||
|
if ($key === null || empty($selection[$key])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$participant->selectedAddons()->create([
|
||||||
|
'tenant' => $participant->tenant,
|
||||||
|
'event_id' => $participant->event_id,
|
||||||
|
'addon_key' => $key,
|
||||||
|
'title' => $addon['title'] ?? $key,
|
||||||
|
'price' => 0,
|
||||||
|
'flat' => (bool)($addon['flat'] ?? false),
|
||||||
|
'days' => 0,
|
||||||
|
'amount' => 0,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ersetzt die zugeordneten Teilnahmeoptionen anhand der übergebenen Antworten. Nachträgliche Zuordnung im
|
||||||
|
* Back-Office ist lückenlos möglich: nur gegen die Event-Definition gültige Antworten werden gespeichert,
|
||||||
|
* leere/entfallene Antworten werden abgeräumt. Frage-/Options-Label werden als Snapshot mitgeschrieben.
|
||||||
|
*/
|
||||||
|
private function syncParticipationOptions(EventParticipant $participant): void
|
||||||
|
{
|
||||||
|
$participant->selectedOptions()->delete();
|
||||||
|
|
||||||
|
$answers = $this->request->participationOptions ?? [];
|
||||||
|
|
||||||
|
foreach ($participant->event?->participation_options ?? [] as $question) {
|
||||||
|
$key = $question['key'] ?? null;
|
||||||
|
if ($key === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = $answers[$key] ?? null;
|
||||||
|
if ($value === null || $value === '') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$option = null;
|
||||||
|
foreach ($question['options'] ?? [] as $candidate) {
|
||||||
|
if (($candidate['value'] ?? null) === $value) {
|
||||||
|
$option = $candidate;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($option === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$label = trim((string)($question['label'] ?? ''));
|
||||||
|
|
||||||
|
$participant->selectedOptions()->create([
|
||||||
|
'tenant' => $participant->tenant,
|
||||||
|
'event_id' => $participant->event_id,
|
||||||
|
'question_key' => $key,
|
||||||
|
'question_label' => $label !== '' ? $label : ($question['title'] ?? $key),
|
||||||
|
'value' => $value,
|
||||||
|
'value_label' => $option['label'] ?? $value,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function handleAmountChanges(EventParticipant $participant) {
|
private function handleAmountChanges(EventParticipant $participant) {
|
||||||
$this->response->amountPaid = $participant->amount_paid;
|
$this->response->amountPaid = $participant->amount_paid;
|
||||||
$this->response->amountExpected = $participant->amount;
|
$this->response->amountExpected = $participant->amount;
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ class UpdateParticipantRequest {
|
|||||||
public ?string $address_2,
|
public ?string $address_2,
|
||||||
public string $postcode,
|
public string $postcode,
|
||||||
public string $city,
|
public string $city,
|
||||||
public string $localgroup,
|
/** Stamm-Slug; leer/null bei Anmeldungen, die keinen Stamm erfasst haben (Kurzanmeldung). */
|
||||||
|
public ?string $localgroup,
|
||||||
public string $birthday,
|
public string $birthday,
|
||||||
public string $email_1,
|
public string $email_1,
|
||||||
public string $phone_1,
|
public string $phone_1,
|
||||||
@@ -36,5 +37,9 @@ class UpdateParticipantRequest {
|
|||||||
public string $amountPaid,
|
public string $amountPaid,
|
||||||
public string $amountExpected,
|
public string $amountExpected,
|
||||||
public string $cocStatus,
|
public string $cocStatus,
|
||||||
|
/** Antworten auf die Teilnahmeoptionen: [ question_key => value ]. null = unverändert lassen. */
|
||||||
|
public ?array $participationOptions = null,
|
||||||
|
/** Gewählte Zusätze: [ addon_key => bool ]. null = unverändert lassen. */
|
||||||
|
public ?array $selectedAddons = null,
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ class ArchivedEventsController extends CommonController
|
|||||||
'name' => $event->name,
|
'name' => $event->name,
|
||||||
'location' => $event->location,
|
'location' => $event->location,
|
||||||
'postalCode' => $event->postal_code,
|
'postalCode' => $event->postal_code,
|
||||||
|
'fullAddress' => $event->getFullAddress(),
|
||||||
'eventBegin' => $event->start_date->format('d.m.Y'),
|
'eventBegin' => $event->start_date->format('d.m.Y'),
|
||||||
'eventEnd' => $event->end_date->format('d.m.Y'),
|
'eventEnd' => $event->end_date->format('d.m.Y'),
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\BookBankStatementPayments\BookBankStatementPaymentsCommand;
|
||||||
|
use App\Domains\Event\Actions\BookBankStatementPayments\BookBankStatementPaymentsRequest;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bucht die in der Prüfansicht bestätigten Zahlungseingänge -- ein Aufruf für alle Zeilen.
|
||||||
|
*/
|
||||||
|
class BankStatementBookController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(int $eventId, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$event = $this->events->getById($eventId);
|
||||||
|
|
||||||
|
if ($event === null) {
|
||||||
|
return response()->json(['status' => 'error', 'message' => 'Die Veranstaltung wurde nicht gefunden.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$response = new BookBankStatementPaymentsCommand(new BookBankStatementPaymentsRequest(
|
||||||
|
event: $event,
|
||||||
|
bookings: (array) $request->input('bookings', []),
|
||||||
|
))->execute();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'status' => $response->success ? 'success' : 'error',
|
||||||
|
'message' => $response->message,
|
||||||
|
'booked' => $response->booked,
|
||||||
|
'skipped' => $response->skipped,
|
||||||
|
'failed' => $response->failed,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\ParseBankStatement\ParseBankStatementCommand;
|
||||||
|
use App\Domains\Event\Actions\ParseBankStatement\ParseBankStatementRequest;
|
||||||
|
use App\Models\PaymentMethod;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Nimmt den CSV-Export der Bank entgegen und liefert die Prüfansicht zurück. Gebucht wird hier nichts.
|
||||||
|
*/
|
||||||
|
class BankStatementParseController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(int $eventId, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$event = $this->events->getById($eventId);
|
||||||
|
|
||||||
|
if ($event === null) {
|
||||||
|
return response()->json(['status' => 'error', 'message' => 'Die Veranstaltung wurde nicht gefunden.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Das Kontoauszug-Format kommt vom Mandanten, nicht aus dem Event-Snapshot: Ein Bankwechsel
|
||||||
|
// muss sofort auch für laufende Aktionen gelten.
|
||||||
|
$configuration = $this->paymentMethods->tenantConfiguration(PaymentMethod::PAYMENT_ACCOUNT_TRANSACTION);
|
||||||
|
|
||||||
|
$response = new ParseBankStatementCommand(new ParseBankStatementRequest(
|
||||||
|
event: $event,
|
||||||
|
file: $request->file('statement'),
|
||||||
|
configuration: $configuration,
|
||||||
|
))->execute();
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'status' => $response->success ? 'success' : 'error',
|
||||||
|
'message' => $response->message,
|
||||||
|
'rows' => $response->rows,
|
||||||
|
'participants' => $response->participants,
|
||||||
|
'skipped' => $response->skippedOlderThanWatermark,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@ use Illuminate\Http\Request;
|
|||||||
class CreateController extends CommonController {
|
class CreateController extends CommonController {
|
||||||
public function __invoke() {
|
public function __invoke() {
|
||||||
return new InertiaProvider('Event/Create', [
|
return new InertiaProvider('Event/Create', [
|
||||||
'emailAddress' => auth()->user()->email,
|
'emailAddress' => currentUserOrFail()->email,
|
||||||
'eventAccount' => $this->tenant->account_name,
|
'eventAccount' => $this->tenant->account_name,
|
||||||
'eventIban' => $this->tenant->account_iban,
|
'eventIban' => $this->tenant->account_iban,
|
||||||
'eventPayPerDay' => $this->tenant->slug === 'lv' ? true : false,
|
'eventPayPerDay' => $this->tenant->slug === 'lv' ? true : false,
|
||||||
@@ -56,7 +56,9 @@ class CreateController extends CommonController {
|
|||||||
$participationFeeType,
|
$participationFeeType,
|
||||||
$request->input('eventAccount'),
|
$request->input('eventAccount'),
|
||||||
$request->input('eventIban'),
|
$request->input('eventIban'),
|
||||||
$payPerDay
|
$payPerDay,
|
||||||
|
$request->input('eventStreet'),
|
||||||
|
$request->input('eventHouseNumber')
|
||||||
);
|
);
|
||||||
|
|
||||||
$wasSuccessful = false;
|
$wasSuccessful = false;
|
||||||
|
|||||||
@@ -2,24 +2,27 @@
|
|||||||
|
|
||||||
namespace App\Domains\Event\Controllers;
|
namespace App\Domains\Event\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\SetEventAddons\SetEventAddonsCommand;
|
||||||
|
use App\Domains\Event\Actions\SetEventAddons\SetEventAddonsRequest;
|
||||||
use App\Domains\Event\Actions\SetParticipationFees\SetParticipationFeesCommand;
|
use App\Domains\Event\Actions\SetParticipationFees\SetParticipationFeesCommand;
|
||||||
use App\Domains\Event\Actions\SetParticipationFees\SetParticipationFeesRequest;
|
use App\Domains\Event\Actions\SetParticipationFees\SetParticipationFeesRequest;
|
||||||
|
use App\Domains\Event\Actions\SetParticipationOptions\SetParticipationOptionsCommand;
|
||||||
|
use App\Domains\Event\Actions\SetParticipationOptions\SetParticipationOptionsRequest;
|
||||||
|
use App\Domains\Event\Actions\SetPaymentMethods\SetPaymentMethodsCommand;
|
||||||
|
use App\Domains\Event\Actions\SetPaymentMethods\SetPaymentMethodsRequest;
|
||||||
use App\Domains\Event\Actions\UpdateEvent\UpdateEventCommand;
|
use App\Domains\Event\Actions\UpdateEvent\UpdateEventCommand;
|
||||||
use App\Domains\Event\Actions\UpdateEvent\UpdateEventRequest;
|
use App\Domains\Event\Actions\UpdateEvent\UpdateEventRequest;
|
||||||
use App\Domains\Event\Actions\UpdateManagers\UpdateManagersCommand;
|
use App\Domains\Event\Actions\UpdateManagers\UpdateManagersCommand;
|
||||||
use App\Domains\Event\Actions\UpdateManagers\UpdateManagersRequest;
|
use App\Domains\Event\Actions\UpdateManagers\UpdateManagersRequest;
|
||||||
use App\Enumerations\ParticipationFeeType;
|
use App\Enumerations\ParticipationFeeType;
|
||||||
use App\Enumerations\ParticipationType;
|
use App\Enumerations\ParticipationType;
|
||||||
use App\Models\EventParticipant;
|
|
||||||
use App\Providers\InertiaProvider;
|
use App\Providers\InertiaProvider;
|
||||||
use App\Providers\PdfGenerateAndDownloadProvider;
|
use App\Providers\PdfGenerateAndDownloadProvider;
|
||||||
use App\Resources\EventResource;
|
|
||||||
use App\Scopes\CommonController;
|
use App\Scopes\CommonController;
|
||||||
use App\ValueObjects\Amount;
|
use App\ValueObjects\Amount;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Response;
|
use Illuminate\Http\Response;
|
||||||
use function Symfony\Component\String\b;
|
|
||||||
|
|
||||||
class DetailsController extends CommonController {
|
class DetailsController extends CommonController {
|
||||||
public function __invoke(string $eventId) {
|
public function __invoke(string $eventId) {
|
||||||
@@ -42,8 +45,6 @@ class DetailsController extends CommonController {
|
|||||||
|
|
||||||
$contributinLocalGroups = $request->input('contributingLocalGroups');
|
$contributinLocalGroups = $request->input('contributingLocalGroups');
|
||||||
$eatingHabits = $request->input('eatingHabits');
|
$eatingHabits = $request->input('eatingHabits');
|
||||||
$paymentMethods = $request->input('paymentMethods');
|
|
||||||
$paymentMethodConfigurations = (array) $request->input('paymentMethodConfigurations', []);
|
|
||||||
|
|
||||||
$eventUpdateRequest = new UpdateEventRequest(
|
$eventUpdateRequest = new UpdateEventRequest(
|
||||||
$event,
|
$event,
|
||||||
@@ -60,8 +61,10 @@ class DetailsController extends CommonController {
|
|||||||
$supportPerPerson,
|
$supportPerPerson,
|
||||||
$contributinLocalGroups,
|
$contributinLocalGroups,
|
||||||
$eatingHabits,
|
$eatingHabits,
|
||||||
$paymentMethods,
|
(bool)$request->input('shortRegistration', false),
|
||||||
$paymentMethodConfigurations
|
(bool)$request->input('swimmingPermissionRequired', true),
|
||||||
|
$request->input('street'),
|
||||||
|
$request->input('houseNumber'),
|
||||||
);
|
);
|
||||||
|
|
||||||
$eventUpdateCommand = new UpdateEventCommand($eventUpdateRequest);
|
$eventUpdateCommand = new UpdateEventCommand($eventUpdateRequest);
|
||||||
@@ -70,6 +73,20 @@ class DetailsController extends CommonController {
|
|||||||
return response()->json(['status' => $response->success ? 'success' : 'error', 'message' => $response->message]);
|
return response()->json(['status' => $response->success ? 'success' : 'error', 'message' => $response->message]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function updatePaymentMethods(int $eventId, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$event = $this->events->getById($eventId);
|
||||||
|
|
||||||
|
$paymentMethods = $request->input('paymentMethods', []);
|
||||||
|
$paymentMethodConfigurations = (array)$request->input('paymentMethodConfigurations', []);
|
||||||
|
|
||||||
|
$setPaymentMethodsRequest = new SetPaymentMethodsRequest($event, $paymentMethods, $paymentMethodConfigurations);
|
||||||
|
$setPaymentMethodsCommand = new SetPaymentMethodsCommand($setPaymentMethodsRequest);
|
||||||
|
$response = $setPaymentMethodsCommand->execute();
|
||||||
|
|
||||||
|
return response()->json(['status' => $response->success ? 'success' : 'error', 'message' => $response->message]);
|
||||||
|
}
|
||||||
|
|
||||||
public function updateEventManagers(int $eventId, Request $request) : JsonResponse {
|
public function updateEventManagers(int $eventId, Request $request) : JsonResponse {
|
||||||
$event = $this->events->getById($eventId);
|
$event = $this->events->getById($eventId);
|
||||||
|
|
||||||
@@ -133,6 +150,28 @@ class DetailsController extends CommonController {
|
|||||||
return response()->json(['status' => $response->success ? 'success' : 'error']);
|
return response()->json(['status' => $response->success ? 'success' : 'error']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function updateParticipationOptions(int $eventId, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$event = $this->events->getById($eventId);
|
||||||
|
|
||||||
|
$setRequest = new SetParticipationOptionsRequest($event, (array)$request->input('questions', []));
|
||||||
|
$setCommand = new SetParticipationOptionsCommand($setRequest);
|
||||||
|
$response = $setCommand->execute();
|
||||||
|
|
||||||
|
return response()->json(['status' => $response->success ? 'success' : 'error', 'message' => $response->message]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateEventAddons(int $eventId, Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$event = $this->events->getById($eventId);
|
||||||
|
|
||||||
|
$setRequest = new SetEventAddonsRequest($event, (array)$request->input('addons', []));
|
||||||
|
$setCommand = new SetEventAddonsCommand($setRequest);
|
||||||
|
$response = $setCommand->execute();
|
||||||
|
|
||||||
|
return response()->json(['status' => $response->success ? 'success' : 'error', 'message' => $response->message]);
|
||||||
|
}
|
||||||
|
|
||||||
public function downloadPdfList(string $eventId, string $listType, Request $request): Response
|
public function downloadPdfList(string $eventId, string $listType, Request $request): Response
|
||||||
{
|
{
|
||||||
$event = $this->events->getByIdentifier($eventId);
|
$event = $this->events->getByIdentifier($eventId);
|
||||||
@@ -186,6 +225,12 @@ class DetailsController extends CommonController {
|
|||||||
case 'by-participation-group':
|
case 'by-participation-group':
|
||||||
$participants = $this->eventParticipants->groupByParticipationType($event, $request);
|
$participants = $this->eventParticipants->groupByParticipationType($event, $request);
|
||||||
break;
|
break;
|
||||||
|
case 'by-participation-option':
|
||||||
|
$participants = $this->eventParticipants->groupByParticipationOption($event, $request);
|
||||||
|
break;
|
||||||
|
case 'by-addon':
|
||||||
|
$participants = $this->eventParticipants->groupByAddon($event, $request);
|
||||||
|
break;
|
||||||
case 'signed-off':
|
case 'signed-off':
|
||||||
$participants = $this->eventParticipants->getSignedOffParticipants($event, $request);
|
$participants = $this->eventParticipants->getSignedOffParticipants($event, $request);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\CreateIncomeSurplusStatement\CreateIncomeSurplusStatementCommand;
|
||||||
|
use App\Domains\Event\Actions\CreateIncomeSurplusStatement\CreateIncomeSurplusStatementRequest;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
|
||||||
|
class IncomeSurplusStatementController extends CommonController
|
||||||
|
{
|
||||||
|
public function __invoke(string $eventId): Response
|
||||||
|
{
|
||||||
|
$event = $this->events->getByIdentifier($eventId);
|
||||||
|
|
||||||
|
if ($event === null) {
|
||||||
|
abort(403, 'Zugriff verweigert.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$statementRequest = new CreateIncomeSurplusStatementRequest($event);
|
||||||
|
$statementCommand = new CreateIncomeSurplusStatementCommand($statementRequest);
|
||||||
|
$statementResponse = $statementCommand->execute();
|
||||||
|
|
||||||
|
if (!$statementResponse->success) {
|
||||||
|
abort(422, $statementResponse->message ?? 'Die EÜR konnte nicht erstellt werden.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return response($statementResponse->pdfContent, 200, [
|
||||||
|
'Content-Type' => 'application/pdf',
|
||||||
|
'Content-Disposition' => 'attachment; filename="' . $statementResponse->filename . '"',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,6 +19,10 @@ class ByGroupController extends CommonController
|
|||||||
$participants = $this->eventParticipants->groupByParticipationType($event, $request, $request->input('groupName'));
|
$participants = $this->eventParticipants->groupByParticipationType($event, $request, $request->input('groupName'));
|
||||||
$recipients = $this->eventParticipants->getMailAddresses($participants[$request->input('groupName')]);
|
$recipients = $this->eventParticipants->getMailAddresses($participants[$request->input('groupName')]);
|
||||||
break;
|
break;
|
||||||
|
case 'by-participation-option':
|
||||||
|
$participants = $this->eventParticipants->groupByParticipationOption($event, $request, $request->input('groupName'));
|
||||||
|
$recipients = $this->eventParticipants->getMailAddresses($participants[$request->input('groupName')] ?? []);
|
||||||
|
break;
|
||||||
case 'signed-off':
|
case 'signed-off':
|
||||||
$participants = $this->eventParticipants->getSignedOffParticipants($event, $request, $request->input('groupName'));
|
$participants = $this->eventParticipants->getSignedOffParticipants($event, $request, $request->input('groupName'));
|
||||||
$recipients = $this->eventParticipants->getMailAddresses($participants[$request->input('groupName')]);
|
$recipients = $this->eventParticipants->getMailAddresses($participants[$request->input('groupName')]);
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class SendController extends CommonController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = auth()->user();
|
$user = currentUser();
|
||||||
$reportSubject = sprintf('Sendebericht für Nachricht mit Betreff "%s"', $subject);
|
$reportSubject = sprintf('Sendebericht für Nachricht mit Betreff "%s"', $subject);
|
||||||
|
|
||||||
Mail::to($user->email)->send(new ManualMailsReportMail(
|
Mail::to($user->email)->send(new ManualMailsReportMail(
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ class ParticipantUpdateController extends CommonController {
|
|||||||
amountPaid: $request->input('amountPaid'),
|
amountPaid: $request->input('amountPaid'),
|
||||||
amountExpected: $request->input('amountExpected'),
|
amountExpected: $request->input('amountExpected'),
|
||||||
cocStatus: $request->input('cocStatus'),
|
cocStatus: $request->input('cocStatus'),
|
||||||
|
participationOptions: $request->has('participationOptions') ? (array)$request->input('participationOptions') : null,
|
||||||
|
selectedAddons: $request->has('selectedAddons') ? (array)$request->input('selectedAddons') : null,
|
||||||
);
|
);
|
||||||
|
|
||||||
$command = new UpdateParticipantCommand($updateRequest);
|
$command = new UpdateParticipantCommand($updateRequest);
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Controllers;
|
||||||
|
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use App\ValueObjects\Amount;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Beitrag einer Kurzanmeldung. Teilnahmegruppe, Beitragsstufe und Zeitraum stehen fest, deshalb braucht der
|
||||||
|
* Endpunkt keine Eingaben -- und der Betrag lässt sich vom Client nicht beeinflussen.
|
||||||
|
*
|
||||||
|
* `amountValue` steuert im Frontend, ob der Schritt "Zahlungsart" gezeigt wird.
|
||||||
|
*/
|
||||||
|
class ShortCalculateAmountController extends CommonController {
|
||||||
|
public function __invoke(int $eventId) : JsonResponse {
|
||||||
|
$event = $this->events->getById($eventId, false);
|
||||||
|
|
||||||
|
$participationType = $event->firstParticipationTypeSlug();
|
||||||
|
|
||||||
|
$amount = $participationType === null
|
||||||
|
? new Amount(0, 'Euro')
|
||||||
|
: $event->toResource()->calculateAmount(
|
||||||
|
$participationType,
|
||||||
|
'standard',
|
||||||
|
$event->start_date,
|
||||||
|
$event->end_date,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'amount' => $amount->toString(),
|
||||||
|
'amountValue' => $amount->getAmount(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Event\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Event\Actions\CertificateOfConductionCheck\CertificateOfConductionCheckCommand;
|
||||||
|
use App\Domains\Event\Actions\CertificateOfConductionCheck\CertificateOfConductionCheckRequest;
|
||||||
|
use App\Domains\Event\Actions\ShortSignUp\ShortSignUpCommand;
|
||||||
|
use App\Domains\Event\Actions\ShortSignUp\ShortSignUpRequest;
|
||||||
|
use App\Enumerations\FirstAidPermission;
|
||||||
|
use App\Enumerations\SwimmingPermission;
|
||||||
|
use App\Mail\ParticipantParticipationMails\EventSignUpSuccessfullMail;
|
||||||
|
use App\Providers\DoubleCheckEventRegistrationProvider;
|
||||||
|
use App\Scopes\CommonController;
|
||||||
|
use DateTime;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\Mail;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Nimmt die verkürzte Anmeldung entgegen. Öffentlich erreichbar, deshalb werden die Eingaben hier -- anders als
|
||||||
|
* im langen Prozess -- validiert, bevor sie die Action erreichen.
|
||||||
|
*/
|
||||||
|
class ShortSignupController extends CommonController {
|
||||||
|
public function __invoke(int $eventId, Request $request) : JsonResponse {
|
||||||
|
$event = $this->events->getById($eventId, false);
|
||||||
|
|
||||||
|
if (!$event->registration_allowed || new DateTime() > $event->start_date) {
|
||||||
|
return response()->json(['status' => 'closed'], 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Die Kurzanmeldung darf nicht als Abkürzung um den langen Prozess herum benutzt werden.
|
||||||
|
if (!$event->short_registration) {
|
||||||
|
return response()->json(['status' => 'closed'], 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
$validator = Validator::make($request->all(), [
|
||||||
|
'firstname' => 'required|string|max:255',
|
||||||
|
'lastname' => 'required|string|max:255',
|
||||||
|
'nickname' => 'nullable|string|max:255',
|
||||||
|
'birthday' => 'required|date_format:Y-m-d|before:today',
|
||||||
|
'email' => 'required|email|max:255',
|
||||||
|
'phone' => 'required|string|max:255',
|
||||||
|
// Gegen die teilnehmenden Stämme prüft der Command -- hier reicht die Typprüfung.
|
||||||
|
'localGroup' => 'nullable|integer',
|
||||||
|
'contactPerson' => 'nullable|string|max:255',
|
||||||
|
'contactEmail' => 'nullable|email|max:255',
|
||||||
|
'allergies' => 'nullable|string|max:255',
|
||||||
|
'intolerances' => 'nullable|string|max:255',
|
||||||
|
'firstAidPermission' => ['nullable', 'string', 'in:' . implode(',', FirstAidPermission::query()->pluck('slug')->toArray())],
|
||||||
|
'swimmingPermission' => ['nullable', 'string', 'in:' . implode(',', SwimmingPermission::query()->pluck('slug')->toArray())],
|
||||||
|
'foto' => 'array',
|
||||||
|
'participationOptions' => 'array',
|
||||||
|
'paymentMethod' => 'nullable|string',
|
||||||
|
'paymentOptions' => 'array',
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($validator->fails()) {
|
||||||
|
return response()->json(['status' => 'error', 'message' => $validator->errors()->first()], 422);
|
||||||
|
}
|
||||||
|
|
||||||
|
$birthday = DateTime::createFromFormat('Y-m-d', $request->input('birthday'));
|
||||||
|
|
||||||
|
$doubleCheck = new DoubleCheckEventRegistrationProvider(
|
||||||
|
$event,
|
||||||
|
$request->input('firstname'),
|
||||||
|
$request->input('lastname'),
|
||||||
|
$request->input('email'),
|
||||||
|
$birthday
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($doubleCheck->isRegistered()) {
|
||||||
|
return response()->json(['status' => 'exists']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$foto = (array)$request->input('foto', []);
|
||||||
|
|
||||||
|
$shortSignUpRequest = new ShortSignUpRequest(
|
||||||
|
event: $event,
|
||||||
|
user_id: currentUser()?->id,
|
||||||
|
firstname: $request->input('firstname'),
|
||||||
|
lastname: $request->input('lastname'),
|
||||||
|
nickname: $request->input('nickname'),
|
||||||
|
birthday: $birthday,
|
||||||
|
email: $request->input('email'),
|
||||||
|
phone: $request->input('phone'),
|
||||||
|
localGroupId: $request->input('localGroup') !== null ? (int)$request->input('localGroup') : null,
|
||||||
|
contactPerson: $request->input('contactPerson') ?: null,
|
||||||
|
contactEmail: $request->input('contactEmail') ?: null,
|
||||||
|
allergies: $request->input('allergies') ?: null,
|
||||||
|
intolerances: $request->input('intolerances') ?: null,
|
||||||
|
firstAidPermission: $request->input('firstAidPermission') ?: null,
|
||||||
|
swimmingPermission: $request->input('swimmingPermission') ?: null,
|
||||||
|
foto_socialmedia: (bool)($foto['socialmedia'] ?? false),
|
||||||
|
foto_print: (bool)($foto['print'] ?? false),
|
||||||
|
foto_webseite: (bool)($foto['webseite'] ?? false),
|
||||||
|
foto_partner: (bool)($foto['partner'] ?? false),
|
||||||
|
foto_intern: (bool)($foto['intern'] ?? false),
|
||||||
|
paymentMethod: $request->input('paymentMethod') ?: null,
|
||||||
|
paymentOptions: (array)$request->input('paymentOptions', []),
|
||||||
|
participationOptions: (array)$request->input('participationOptions', []),
|
||||||
|
);
|
||||||
|
|
||||||
|
$shortSignUpResponse = new ShortSignUpCommand($shortSignUpRequest)->execute();
|
||||||
|
|
||||||
|
if (!$shortSignUpResponse->success) {
|
||||||
|
return response()->json(['status' => 'error', 'message' => $shortSignUpResponse->message], 422);
|
||||||
|
}
|
||||||
|
|
||||||
|
$participant = $shortSignUpResponse->participant;
|
||||||
|
|
||||||
|
$cocResponse = new CertificateOfConductionCheckCommand(
|
||||||
|
new CertificateOfConductionCheckRequest($participant)
|
||||||
|
)->execute();
|
||||||
|
|
||||||
|
$participant->efz_status = $cocResponse->status;
|
||||||
|
$participant->save();
|
||||||
|
|
||||||
|
Mail::to($participant->email_1)->send(new EventSignUpSuccessfullMail(participant: $participant));
|
||||||
|
|
||||||
|
if ($participant->email_2 !== null) {
|
||||||
|
Mail::to($participant->email_2)->send(new EventSignUpSuccessfullMail(participant: $participant));
|
||||||
|
}
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'participant' => $participant->toResource()->toArray($request),
|
||||||
|
'status' => 'success',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ use App\Providers\DoubleCheckEventRegistrationProvider;
|
|||||||
use App\Providers\InertiaProvider;
|
use App\Providers\InertiaProvider;
|
||||||
use App\Resources\UserResource;
|
use App\Resources\UserResource;
|
||||||
use App\Scopes\CommonController;
|
use App\Scopes\CommonController;
|
||||||
|
use App\ValueObjects\Amount;
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -26,18 +27,17 @@ class SignupController extends CommonController {
|
|||||||
|
|
||||||
$eventModel = $this->events->getByIdentifier($eventId, false);
|
$eventModel = $this->events->getByIdentifier($eventId, false);
|
||||||
$event = $eventModel?->toResource()->toArray($request);
|
$event = $eventModel?->toResource()->toArray($request);
|
||||||
// Aktuell ist genau eine aktive Zahlungsmethode je Event vorgesehen; wird bereits beim Start
|
// Die (aktiven) Zahlungsmethoden stehen dem Frontend über $event['paymentMethods'] zur Verfügung;
|
||||||
// der Anmeldung ermittelt und ans Frontend durchgereicht, statt erst bei der Erstellung des
|
// die Auswahl trifft der/die Teilnehmer\*in im Anmeldeschritt "Zahlungsart".
|
||||||
// Teilnehmenden (siehe SignUpCommand).
|
|
||||||
$paymentMethod = $eventModel?->paymentMethods()->where('active', true)->first();
|
|
||||||
|
|
||||||
$participantData = [
|
$participantData = [
|
||||||
'firstname' => '',
|
'firstname' => '',
|
||||||
'lastname' => '',
|
'lastname' => '',
|
||||||
];
|
];
|
||||||
|
|
||||||
if (auth()->check()) {
|
$currentUser = currentUser();
|
||||||
$user = new UserResource(auth()->user())->toArray($request);
|
if ($currentUser !== null) {
|
||||||
|
$user = new UserResource($currentUser)->toArray($request);
|
||||||
|
|
||||||
$participantData = [
|
$participantData = [
|
||||||
'id' => $user['id'],
|
'id' => $user['id'],
|
||||||
@@ -67,7 +67,6 @@ class SignupController extends CommonController {
|
|||||||
'availableEvents' => $availableEvents,
|
'availableEvents' => $availableEvents,
|
||||||
'localGroups' => $event['contributingLocalGroups'],
|
'localGroups' => $event['contributingLocalGroups'],
|
||||||
'participantData' => $participantData,
|
'participantData' => $participantData,
|
||||||
'paymentMethod' => $paymentMethod?->slug,
|
|
||||||
]);
|
]);
|
||||||
return $inertiaProvider->render();
|
return $inertiaProvider->render();
|
||||||
}
|
}
|
||||||
@@ -107,6 +106,11 @@ class SignupController extends CommonController {
|
|||||||
$siblingReduction
|
$siblingReduction
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Gewählte Zusätze (Event-Addons) auflösen und auf den Gesamtbetrag aufaddieren.
|
||||||
|
$selectedAddonKeys = array_keys(array_filter((array)$request->input('addons', []), fn($v) => (bool)$v));
|
||||||
|
$addonResolution = $eventResource->resolveAddons($selectedAddonKeys, $arrival, $departure);
|
||||||
|
$amount->addAmount($addonResolution['total']);
|
||||||
|
|
||||||
$signupRequest = new SignUpRequest(
|
$signupRequest = new SignUpRequest(
|
||||||
$event,
|
$event,
|
||||||
$registrationData['userId'] ?? null,
|
$registrationData['userId'] ?? null,
|
||||||
@@ -144,11 +148,20 @@ class SignupController extends CommonController {
|
|||||||
$registrationData['anmerkungen'],
|
$registrationData['anmerkungen'],
|
||||||
$amount,
|
$amount,
|
||||||
$registrationData['paymentMethod'] ?? null,
|
$registrationData['paymentMethod'] ?? null,
|
||||||
|
(array)($registrationData['paymentOptions'] ?? []),
|
||||||
|
(array)($registrationData['participationOptions'] ?? []),
|
||||||
|
$addonResolution['items'],
|
||||||
|
$registrationData['beitrag'],
|
||||||
|
$siblingReduction,
|
||||||
);
|
);
|
||||||
|
|
||||||
$signupCommand = new SignUpCommand($signupRequest);
|
$signupCommand = new SignUpCommand($signupRequest);
|
||||||
$signupResponse = $signupCommand->execute();
|
$signupResponse = $signupCommand->execute();
|
||||||
|
|
||||||
|
if (!$signupResponse->success) {
|
||||||
|
return response()->json(['status' => 'error', 'message' => $signupResponse->message], 422);
|
||||||
|
}
|
||||||
|
|
||||||
// 4. Addons registrieren
|
// 4. Addons registrieren
|
||||||
|
|
||||||
|
|
||||||
@@ -182,14 +195,41 @@ class SignupController extends CommonController {
|
|||||||
|
|
||||||
$siblingReduction = $request->input('sibling') === 'true';
|
$siblingReduction = $request->input('sibling') === 'true';
|
||||||
|
|
||||||
return response()->json(['amount' =>
|
$arrival = \DateTime::createFromFormat('Y-m-d', $request->input('arrival'));
|
||||||
$event->calculateAmount(
|
$departure = \DateTime::createFromFormat('Y-m-d', $request->input('departure'));
|
||||||
|
|
||||||
|
$baseFee = $event->calculateAmount(
|
||||||
$request->input('participationType'),
|
$request->input('participationType'),
|
||||||
$request->input('beitrag'),
|
$request->input('beitrag'),
|
||||||
\DateTime::createFromFormat('Y-m-d', $request->input('arrival')),
|
$arrival,
|
||||||
\DateTime::createFromFormat('Y-m-d', $request->input('departure')),
|
$departure,
|
||||||
$siblingReduction
|
$siblingReduction
|
||||||
)->toString()
|
);
|
||||||
|
|
||||||
|
// Gewählte Zusätze immer einrechnen -- so enthält der finale Anzeigebetrag (und der Bestätigungstext)
|
||||||
|
// stets die Addons und der Zahlungsschritt wird nur bei Gesamt 0 € übersprungen.
|
||||||
|
$selectedAddonKeys = array_keys(array_filter((array)$request->input('addons', []), fn($v) => (bool)$v));
|
||||||
|
$resolution = $event->resolveAddons($selectedAddonKeys, $arrival, $departure);
|
||||||
|
|
||||||
|
// Gesamt = Teilnahmebeitrag + Zusätze; Basisbetrag separat für die Kostenübersicht in der Zusammenfassung.
|
||||||
|
$total = new Amount($baseFee->getAmount(), 'Euro');
|
||||||
|
$total->addAmount($resolution['total']);
|
||||||
|
|
||||||
|
$addonLines = array_map(fn($item) => [
|
||||||
|
'key' => $item['key'],
|
||||||
|
'title' => $item['title'],
|
||||||
|
'amountValue' => $item['amount'],
|
||||||
|
'amount' => new Amount($item['amount'], 'Euro')->toString(),
|
||||||
|
'free' => $item['amount'] <= 0,
|
||||||
|
], $resolution['items']);
|
||||||
|
|
||||||
|
// amountValue (numerisch) steuert im Frontend das Überspringen des Zahlungsart-Schritts bei 0 €.
|
||||||
|
return response()->json([
|
||||||
|
'amount' => $total->toString(),
|
||||||
|
'amountValue' => $total->getAmount(),
|
||||||
|
'baseAmount' => $baseFee->toString(),
|
||||||
|
'baseAmountValue' => $baseFee->getAmount(),
|
||||||
|
'addons' => $addonLines,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Event\Controllers\BankStatementBookController;
|
||||||
|
use App\Domains\Event\Controllers\BankStatementParseController;
|
||||||
use App\Domains\Event\Controllers\CreateController;
|
use App\Domains\Event\Controllers\CreateController;
|
||||||
use App\Domains\Event\Controllers\DetailsController;
|
use App\Domains\Event\Controllers\DetailsController;
|
||||||
use App\Domains\Event\Controllers\EventArchiveController;
|
use App\Domains\Event\Controllers\EventArchiveController;
|
||||||
@@ -14,6 +16,8 @@ use App\Domains\Event\Controllers\ParticipantReSignOnController;
|
|||||||
use App\Domains\Event\Controllers\ParticipantSignOffController;
|
use App\Domains\Event\Controllers\ParticipantSignOffController;
|
||||||
use App\Domains\Event\Controllers\ParticipantUpdateController;
|
use App\Domains\Event\Controllers\ParticipantUpdateController;
|
||||||
use App\Domains\Event\Controllers\PaymentReminderController;
|
use App\Domains\Event\Controllers\PaymentReminderController;
|
||||||
|
use App\Domains\Event\Controllers\ShortCalculateAmountController;
|
||||||
|
use App\Domains\Event\Controllers\ShortSignupController;
|
||||||
use App\Domains\Event\Controllers\SignupController;
|
use App\Domains\Event\Controllers\SignupController;
|
||||||
use App\Middleware\IdentifyTenant;
|
use App\Middleware\IdentifyTenant;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
@@ -25,6 +29,9 @@ Route::prefix('api/v1')
|
|||||||
Route::post('{eventId}/calculate-amount', [SignupController::class, 'calculateAmount']);
|
Route::post('{eventId}/calculate-amount', [SignupController::class, 'calculateAmount']);
|
||||||
Route::post('{eventId}/signup', [SignupController::class, 'signUp']);
|
Route::post('{eventId}/signup', [SignupController::class, 'signUp']);
|
||||||
|
|
||||||
|
Route::post('{eventId}/short-calculate-amount', ShortCalculateAmountController::class);
|
||||||
|
Route::post('{eventId}/short-signup', ShortSignupController::class);
|
||||||
|
|
||||||
Route::middleware(['auth'])->group(function () {
|
Route::middleware(['auth'])->group(function () {
|
||||||
Route::post('/create', [CreateController::class, 'doCreate']);
|
Route::post('/create', [CreateController::class, 'doCreate']);
|
||||||
|
|
||||||
@@ -45,6 +52,12 @@ Route::prefix('api/v1')
|
|||||||
Route::post('/event-managers', [DetailsController::class, 'updateEventManagers']);
|
Route::post('/event-managers', [DetailsController::class, 'updateEventManagers']);
|
||||||
Route::post('/participation-fees', [DetailsController::class, 'updateParticipationFees']);
|
Route::post('/participation-fees', [DetailsController::class, 'updateParticipationFees']);
|
||||||
Route::post('/common-settings', [DetailsController::class, 'updateCommonSettings']);
|
Route::post('/common-settings', [DetailsController::class, 'updateCommonSettings']);
|
||||||
|
Route::post('/payment-methods', [DetailsController::class, 'updatePaymentMethods']);
|
||||||
|
Route::post('/participation-options', [DetailsController::class, 'updateParticipationOptions']);
|
||||||
|
Route::post('/event-addons', [DetailsController::class, 'updateEventAddons']);
|
||||||
|
|
||||||
|
Route::post('/bank-statement/parse', BankStatementParseController::class);
|
||||||
|
Route::post('/bank-statement/book', BankStatementBookController::class);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ use App\Domains\Event\Controllers\ArchivedEventsController;
|
|||||||
use App\Domains\Event\Controllers\AvailableEventsController;
|
use App\Domains\Event\Controllers\AvailableEventsController;
|
||||||
use App\Domains\Event\Controllers\CreateController;
|
use App\Domains\Event\Controllers\CreateController;
|
||||||
use App\Domains\Event\Controllers\DetailsController;
|
use App\Domains\Event\Controllers\DetailsController;
|
||||||
|
use App\Domains\Event\Controllers\IncomeSurplusStatementController;
|
||||||
use App\Domains\Event\Controllers\SignupController;
|
use App\Domains\Event\Controllers\SignupController;
|
||||||
use App\Middleware\IdentifyTenant;
|
use App\Middleware\IdentifyTenant;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
@@ -18,6 +19,10 @@ Route::middleware(IdentifyTenant::class)->group(function () {
|
|||||||
|
|
||||||
Route::middleware(['auth'])->group(function () {
|
Route::middleware(['auth'])->group(function () {
|
||||||
Route::get('/details/{eventId}', DetailsController::class);
|
Route::get('/details/{eventId}', DetailsController::class);
|
||||||
|
|
||||||
|
// Vor der Wildcard darunter: Sonst greift `downloadPdfList()` und sucht ein Blade namens
|
||||||
|
// `income-surplus-statement` mit Teilnehmendendaten, die die EÜR gar nicht braucht.
|
||||||
|
Route::get('/details/{eventId}/pdf/income-surplus-statement', IncomeSurplusStatementController::class);
|
||||||
Route::get('/details/{eventId}/pdf/{listType}', [DetailsController::class, 'downloadPdfList']);
|
Route::get('/details/{eventId}/pdf/{listType}', [DetailsController::class, 'downloadPdfList']);
|
||||||
Route::get('/details/{eventId}/csv/{listType}', [DetailsController::class, 'downloadCsvList']);
|
Route::get('/details/{eventId}/csv/{listType}', [DetailsController::class, 'downloadCsvList']);
|
||||||
});
|
});
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user