Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3bcfc09417 | ||
|
|
33f8f899d6 | ||
|
|
0c10880e4f | ||
|
|
ac9d20b812 | ||
|
|
cf11c8a474 | ||
|
|
64248c09fa | ||
|
|
987c67d4d3 | ||
|
|
3a728c3255 | ||
|
|
9005c12164 | ||
|
|
2d458d9116 | ||
|
|
65fe8f5c6c | ||
|
|
0dc0470c60 | ||
|
|
382c1724a3 | ||
|
|
4587912e5b | ||
|
|
d0eb79bb9b | ||
|
|
9f3501e045 | ||
|
|
7d7c5db1fd | ||
|
|
a1fc4f7fef | ||
|
|
545008baab |
No files matched your search
@@ -34,3 +34,6 @@ Thumbs.db
|
||||
/scripts/deploy.*.env
|
||||
!/scripts/deploy.example.env
|
||||
storage/app/private/exports/
|
||||
|
||||
# Obsidian: persönlicher Fensterzustand des Editors
|
||||
docs/Prozessarchitektur/.obsidian/workspace.json
|
||||
@@ -17,7 +17,7 @@ # Ferienwohnung Stommer
|
||||
- Website = theme system (`docs/THEMES.md`): themes live in `resources/themes/<key>` (theme.json, theme.css, theme.js, views); views resolve via the `theme::` namespace (theme → parent → base `ostsee-licht`). Pages are lists of sections (`app/Themes/Sections`, catalogue in `config/themes.php`); seasonal `Appearance`s override tokens/texts/hero photo/photos per section (stable `data.id` per placed section) and sections can be limited to appearances. Theme views use only token colour classes (`bg-accent`, `text-muted`, …). New designs are **additional** themes: `php artisan themes:make <key>`, `themes:check`, `themes:preview` – never edit `ostsee-licht` for a new design; authoring rules in `docs/THEME-ERSTELLUNG.md`. Resolve `Theme` lazily (`app(Theme::class)`), never in constructors – middleware `ResolveTheme` replaces it per request.
|
||||
- Operations (environments, Strato access, server .env, admin accounts, 2FA, known pitfalls): `docs/BETRIEB.md` – read it before touching a server. Admin accounts: `php artisan users:create`; 2FA (Filament app authentication) is mandatory for every account. Admin modes (`App\Enums\AdminMode`: simple/expert per user, user menu switch) only shape the menu via the `FollowsAdminMode` trait on every resource/page (simple menu = `AdminMode::SIMPLE_NAVIGATION`); permissions stay with roles/policies. New admin resources must use `FollowsAdminMode`.
|
||||
- Deployment: `scripts/deploy.sh <env> setup|deploy [ref]|rollback|releases|artisan` (atomic releases on Strato, docs/DEPLOYMENT.md; the server keeps only the active release because of Strato's file quota – history = Git tags `deploy/<env>/<timestamp>`); CI `.gitea/workflows/deploy.yml`. Production has no dev packages (no factories/Faker) – production seeding via `ProductionSeeder`.
|
||||
- Strato specifics: `public/index.php` strips the internal `/releases/<v>/public` prefix from `REQUEST_URI` (signed URLs); `URL::forceRootUrl(APP_URL)` outside local/testing; mail routing: `App\Support\Settings` (admin page System › Betrieb, stored on the tenant) – test mode (default) sends every mail to the test recipient only, live delivers normally; `FEWO_MAIL_REDIRECT_TO` is a hard override. Landlord data, bank, addresses and periods are columns of `tenants`: `App\Tenancy\TenantConfig` lays them over `config('fewo.*')` and `mail.from` whenever the tenant context changes, so views and mails keep reading the config keys. Send notifications to `Settings::notificationRecipients()` (never `config('fewo.notification_email')` directly). Findings detected repeatedly (e.g. by the 5-minute sync) go through `AppSupportInbox` (admin Postfach, fingerprint per tenant, repeated only per the tenant's `reminder_interval_days`), never straight to mail; daily/weekly summaries: `SendDigests` + `DigestReport` (sections `DigestSection`). Retention periods and bot-protection counters can only be tightened against the `.env` baseline. The booking form is protected against bots (`config('fewo.spam')`: honeypot, time trap, rate limits, max open holds per e-mail) – tests that submit it instantly set `fewo.spam.min_seconds` to 0.
|
||||
- Strato specifics: `public/index.php` strips the internal `/releases/<v>/public` prefix from `REQUEST_URI` (signed URLs); `URL::forceRootUrl(APP_URL)` outside local/testing; mail routing: `App\Support\Settings` (admin page System › Betrieb, stored on the tenant) – test mode (default) sends every mail to the test recipient only, live delivers normally; `FEWO_MAIL_REDIRECT_TO` is a hard override. The one gate is `App\Listeners\EnforceMailTestMode` (MessageSending, every mailer; no test address in test mode = nothing is sent) – never send mail around Laravel's mailer (no direct transports, `mail()`, own SMTP; `MailTestModeGateTest` checks this). Landlord data, bank, addresses and periods are columns of `tenants`: `App\Tenancy\TenantConfig` lays them over `config('fewo.*')` and `mail.from` whenever the tenant context changes, so views and mails keep reading the config keys. Send notifications to `Settings::notificationRecipients()` (never `config('fewo.notification_email')` directly). Findings detected repeatedly (e.g. by the 5-minute sync) go through `AppSupportInbox` (admin Postfach, fingerprint per tenant, repeated only per the tenant's `reminder_interval_days`), never straight to mail; daily/weekly summaries: `SendDigests` + `DigestReport` (sections `DigestSection`). Retention periods and bot-protection counters can only be tightened against the `.env` baseline. The booking form is protected against bots (`config('fewo.spam')`: honeypot, time trap, rate limits, max open holds per e-mail) – tests that submit it instantly set `fewo.spam.min_seconds` to 0.
|
||||
- Vite fonts plugin is removed on purpose (corporate proxy breaks remote font downloads, and fonts must be self-hosted for GDPR).
|
||||
- PHP/Composer on this machine: winget package dir `%LOCALAPPDATA%\Microsoft\WinGet\Packages\PHP.PHP.8.4_*` (Composer as `composer\composer.phar` there).
|
||||
- Git remote: Gitea `https://gitea.stommer.de/Lars/fewo-stommer.git`, branch `main`.
|
||||
|
||||
@@ -0,0 +1,236 @@
|
||||
# MVP-COMPLIANCE-ACCEPTANCE – Abnahmebericht
|
||||
|
||||
> **Stand 30.10.2026 (Abstimmung mit dem Betreiber):** Umgesetzt und zu liefern ist nur der rechtlich/sicherheitsrelevante Kern: Datenschutzlink im Buchungsformular, HTTPS-Erzwingung, deutsche Fehlerseiten, Ausnahme in `ResolveTheme` für signierte Links/Feeds. Zurückgestellt (nicht im Code, Patch nur im Scratchpad; erst nach Absprache mit Visual- und Buchungsagent): Rotator-Autoplay-Änderung, Token-Header-Härtung, WordPress-Weiterleitungen, Fokus-/Fehlerhinweis-Logik und noscript-Hinweis im Formular. Aussagen dazu weiter unten sind entsprechend als **zurückgestellt** zu lesen.
|
||||
|
||||
|
||||
Stand: 30.10.2026 · Grundlage: `MVP-TECHNICAL-GATE.md` · Dokumentiert sind nur tatsächlich ausgeführte Arbeiten.
|
||||
|
||||
**Wichtig vorab:**
|
||||
- Alle Codeänderungen liegen **nur lokal** im Arbeitsverzeichnis (Branch `feature/buchung-e2e`, nicht committet, nicht deployt). Dort arbeitet parallel eine zweite Sitzung am Buchungsprozess; deren Dateien wurden nicht angefasst.
|
||||
- Auf `stommer.info` wurde **nichts verändert**: keine Deployments, kein Formular-Absenden, keine Datenbank-, Feed-, Token- oder Konfigurationsänderung. Es gab nur lesende Abrufe und einen Browserlauf, der Seiten öffnet, Kalendertage markiert (Livewire-Berechnung, nichts gespeichert) und nie absendet.
|
||||
- Ergebnisse mit **PASS** sind ausgeführt. Was nur aus dem Code folgt oder nicht ausführbar war, steht als **UNKNOWN** bzw. **BLOCKED**.
|
||||
|
||||
## Zusammenfassung / Empfehlung
|
||||
|
||||
**Technisches Votum: NO-GO für die Umschaltung jetzt, GO-fähig nach den unten genannten Schritten.** Die Codeblocker sind behoben und getestet. Offen sind Dinge, die nur auf dem Server bzw. mit Betreiberfreigabe gehen: Deployment der Änderungen, MariaDB-Restore, Produktions-`.env`, Mailtest über das echte Formular, Ausnahme der Alias-Host-Weiterleitung für signierte Links und Feeds (siehe Risiko R1).
|
||||
|
||||
| ID | Thema | Ergebnis |
|
||||
|---|---|---|
|
||||
| B1 | HTTPS erzwingen | Code PASS (Test), Server UNKNOWN bis Deployment |
|
||||
| B2 | Datenschutzlink im Formular | PASS (Test + Browser lokal) |
|
||||
| B3 | Produktivkonfiguration / Mailtest | UNKNOWN / BLOCKED |
|
||||
| B4 | Backup + Restore | Restore SQLite PASS, MariaDB UNKNOWN |
|
||||
| P1-a | Formularfehler | PASS (Test + Browser lokal) |
|
||||
| P1-b | Rotator | PASS (Code + Test der Struktur), keine Auto-Rotation mehr |
|
||||
| P1-c | `<noscript>`-Hinweis | PASS (Test) |
|
||||
| P1-d | Deutsche Fehlerseiten | PASS (Test + Browser lokal) |
|
||||
| P1-e | Query-Token / interner Pfad | Teilweise: Token-Schalter PASS, Pfad durch B1-Lösung adressiert |
|
||||
| P1-f | Browser-Cookie-Check | PASS (echter Chromium auf stommer.info) |
|
||||
| P1-g | Domainwechsel-Vorbereitung | Code PASS, Umschaltung nicht durchgeführt |
|
||||
|
||||
---
|
||||
|
||||
## Neue Environment-Zuordnung (laut Ergänzung)
|
||||
|
||||
| Umgebung | Rolle künftig | Schutz |
|
||||
|---|---|---|
|
||||
| `stommer.info` (Ordner `test.fewo-stommer.de/`) | **wird Produktion** (In-place-Promotion), enthält operative Daten, Kalenderimporte, n8n-Scheduler | Nur lesender Zugriff in diesem Auftrag |
|
||||
| `prod.fewo-stommer.de/` (leer angelegt) | **soll Testsystem werden** | Noch nicht eingerichtet, siehe „Testsystem-Isolation“ |
|
||||
| `www.fewo-stommer.de` (WordPress) | wird abgelöst | Bis zur Freigabe unverändert |
|
||||
|
||||
### Zu schützende Bestände auf stommer.info (aus Code/Doku, nicht am Server gezählt)
|
||||
- Datenbank `dbs16257975` (Buchungen, Gäste, Angebote, CMS-Seiten, Sites/Domains, Benutzer, Kanäle, Feed-Tokens `channels.export_token`).
|
||||
- Persistente Dateien in `shared/storage/app` (Fotos/Medien öffentlich, Verträge/Backups privat) und `shared/.env`.
|
||||
- Integrationen: n8n-Scheduler-Workflow (Header-Auth, jede Minute), Kalenderimport aus Portal-Feeds (5 Min.), ausgehende iCal-Feeds `/kalender/<token>.ics` für Portale, optional `/automation/portal-mail` (HMAC).
|
||||
- SMTP-Versand mit Testmodus (`App\Support\Settings`) – Testmodus leitet alle Mails an Testadresse.
|
||||
|
||||
## Nachweis der Testsystem-Isolation – Status: **UNKNOWN**
|
||||
|
||||
Nicht umgesetzt, weil Zugriff auf `prod.fewo-stommer.de` und Strato-Panel zum Anlegen einer zweiten Datenbank Betreiberaktion/Freigabe benötigt. Geplante Isolation (alle Punkte sind Konfiguration, kein Code):
|
||||
|
||||
1. **Eigene Datenbank** (zweite Strato-MariaDB), eigener `APP_KEY`, eigene Sessions/Caches (DB-Treiber in eigener DB).
|
||||
2. `APP_ENV=staging` → automatisch `noindex` (bereits implementiert) und `FEWO_MAIL_REDIRECT_TO=<Testadresse>` als **harte** Mailumleitung.
|
||||
3. Keine Kanäle mit Schreibwirkung: Beim Befüllen mit synthetischen Daten **keine** Kanäle anlegen bzw. alle Kanäle auf „Import aus/Export pausiert“ lassen. Eigene Feed-Tokens entstehen automatisch neu.
|
||||
4. `FEWO_AUTOMATION_WEBHOOK_URL`, `FEWO_AUTOMATION_SECRET`, `FEWO_HEALTH_TOKEN`, `FEWO_SCHEDULER_TOKEN` leer oder neu und **nicht** im produktiven n8n eingetragen. `FEWO_MAILBOX_HOST` leer (kein Postfach-Abruf).
|
||||
5. Eigene Medien unter `prod.fewo-stommer.de/shared`, kein Link auf den Speicher von stommer.info.
|
||||
6. Daten: synthetisch per Seeder. Kopie produktiver Daten nur nach gesonderter Freigabe und Pseudonymisierung.
|
||||
7. Hinweis: `pipeline.toml` führt die Produktion derzeit gesperrt. Das Ziel `main → prod.fewo-stommer.de` wird dann praktisch zum Testziel. Umbenennung des Ziels (z. B. in `test`) ist eine Entscheidung am gemeinsam genutzten PipelineManager und wird hier **nicht** vorgenommen.
|
||||
|
||||
---
|
||||
|
||||
## Finding-Details
|
||||
|
||||
### B1 – HTTPS erzwingen
|
||||
- **Ursprünglicher Befund:** `http://stommer.info/` lieferte `200`, keine Weiterleitung.
|
||||
- **Maßnahme:** Neue Middleware `ForceHttps` (GET/HEAD → `301`, andere Methoden → `308`) als erste globale Middleware. Bewusst in der Anwendung statt `.htaccess`: Die `.htaccess` im Deploy-Ordner wird bei jedem Umschalten vom **gemeinsamen PipelineManager** (`manager/remote.sh`) bzw. `scripts/deploy.sh` neu geschrieben, eine Regel dort würde überschrieben bzw. erforderte Eingriff in geteilte Infrastruktur. Außerdem sieht die Anwendung bereits den bereinigten Pfad, daher kein interner `/releases/<id>/public`-Pfad im Ziel. Schalter `FEWO_FORCE_HTTPS` (Standard: an, außer `local`/`testing`).
|
||||
- **Dateien:** `app/Http/Middleware/ForceHttps.php`, `bootstrap/app.php`, `config/fewo.php`, `.env.production.example` nicht nötig (Standard an), `docs/BETRIEB.md`.
|
||||
- **Tests:** `GoLiveComplianceTest::test_plain_http_is_redirected_to_https_without_internal_paths` – **PASS** (301 mit Pfad+Query, 308 für POST, HTTPS unberührt).
|
||||
- **Nicht ausgeführt:** echter `curl -I http://stommer.info/` nach Deployment → **UNKNOWN**. Offen: Redirect-Loop-Test hinter Strato (Erkennung von HTTPS über `isSecure()` funktioniert laut vorhandenem HSTS-Header bereits auf dem Server – dieselbe Erkennung).
|
||||
- **Risiko:** Statische Dateien (`/build/...`, Bilder) werden vom Webserver direkt ausgeliefert und umgehen die Anwendung (kein Sicherheitsproblem, aber keine Umleitung). Strato-Option „SSL erzwingen“ zusätzlich aktivieren.
|
||||
- **Betreiberaktion:** Deployment freigeben; optional Strato „SSL erzwingen“ aktivieren; Zertifikat für `fewo-stommer.de` **und** `www.fewo-stommer.de` im Paket zuordnen.
|
||||
|
||||
### B2 – Datenschutzlink im Formular
|
||||
- **Maßnahme:** „Datenschutzerklärung“ im Einwilligungssatz ist jetzt Link auf die bestehende CMS-Route (`route('page', 'datenschutz')`), `target="_blank" rel="noopener"`, mit für Screenreader sichtbarem Zusatz „(öffnet in neuem Tab)“. Neuer Tab ⇒ Eingaben gehen nicht verloren. Redaktioneller Text unverändert.
|
||||
- **Datei:** `resources/views/livewire/booking-request.blade.php`.
|
||||
- **Tests:** Feature-Test (Link im gerenderten HTML) – **PASS**. Browser lokal: Link im Formular vorhanden (1), per Tab erreichbar – **PASS**.
|
||||
- **Gesonderter Befund (Betreiberentscheidung, nicht geändert):** Die Pflicht-Checkbox „Ich bin einverstanden …“ formuliert technisch eine Einwilligung und erzwingt sie per `accepted`-Regel. Zur Bearbeitung einer Anfrage genügt rechtlich möglicherweise eine **Datenschutzinformation** (Art. 13 DSGVO, Rechtsgrundlage Vertragsanbahnung). Die Einordnung und ein ggf. geänderter Text liegen beim Betreiber; technisch wäre die Umstellung klein (Checkbox → Hinweis).
|
||||
|
||||
### B3 – Produktivkonfiguration
|
||||
- **Ursprünglicher Befund:** Produktion nicht eingerichtet; Mailzustellung nicht nachgewiesen.
|
||||
- **Korrigierter Stand laut Auftrag:** SMTP funktioniert bereits, Testmodus vorhanden. Keine neue Mailfunktion gebaut.
|
||||
- **Maßnahme:** `.env.production.example` um `FEWO_ALLOW_QUERY_TOKEN` ergänzt. Die Soll-Konfiguration für die **In-place-Promotion** von stommer.info ist unten im Promotion-Plan als Differenz zur bestehenden `.env` aufgelistet. Es wurde **keine** `.env` gelesen oder verändert (Geheimnisse).
|
||||
- **Nicht ausgeführt (BLOCKED):** Testanfrage über das Formular auf stommer.info. Sie würde eine echte Reservierung im realen Kalender anlegen und ist laut Ergänzung untersagt. Stattdessen laufen die vorhandenen Feature-Tests mit `Mail::fake()` (Bestätigungs- und Benachrichtigungsmails werden erzeugt: siehe Suite). **Mail-Trennung beachten:** Transport (funktioniert) vs. Auslöser im Workflow – bei „Anfrage → Angebot“ versendet der Betreiber das Angebot manuell; das ist Gegenstand des separaten Buchungsauftrags.
|
||||
- **Empfohlener Abnahmetest nach Freigabe:** Im **Testmodus** (alle Mails an Testadresse) eine Anfrage über das Formular mit Testdaten für ein weit entferntes Datum stellen, Mails prüfen, Reservierung anschließend im Admin stornieren/löschen. Alternativ im isolierten Testsystem.
|
||||
|
||||
### B4 – Backup und Restore
|
||||
- **Maßnahme/Test (lokal, ausgeführt):** `backup:database` gegen eine frisch migrierte und gesäte SQLite-Datenbank (42 Tabellen, 98 Zeilen), Dump per PDO in eine leere Datei zurückgespielt. Ergebnis: Tabellenliste identisch, **alle Zeilenzahlen gleich**, `migrate:status` auf der Wiederherstellung: 66 „Ran“, 0 „Pending“. – **PASS (SQLite)**.
|
||||
- **Nicht ausgeführt:** Restore des **MariaDB**-Dumps aus stommer.info in eine zweite leere Datenbank. Das braucht eine zweite Strato-Datenbank (Betreiberaktion). Der MariaDB-Dumpcode (`SHOW CREATE TABLE`, Batch-Inserts, Fremdschlüssel-Schalter) ist damit **nicht durch Ausführung belegt** → **UNKNOWN**.
|
||||
- **Backup-Bestand:** Täglich 02:30 per Scheduler, 14 Dateien unter `shared/storage/app/private/backups` (privat, nicht webzugänglich). Externe Kopie: `scripts/backup-pull.sh` (manuell) und Sicherung vor jedem Pipeline-Deploy auf dem Pi. **Ein Zeitplan für `backup-pull.sh` ist nicht nachgewiesen.**
|
||||
- **Lücke:** `backup:database` sichert **nur die Datenbank**. Medien (`storage/app/public`) und Verträge (`storage/app/private`) werden nur über `backup-pull.sh` bzw. die Pipeline-Sicherung erfasst.
|
||||
- **Betreiberaktionen:** zweite Datenbank anlegen und MariaDB-Restore ausführen (Anleitung in `docs/BETRIEB.md` §7a); Zeitplan für `backup-pull.sh` festlegen.
|
||||
|
||||
### P1-a – Formularfehler
|
||||
- **Maßnahme:** Fehlermeldungen mit `role="alert"`, alle Felder inkl. Datenschutz-Checkbox und Datumsfelder mit `aria-invalid` + `aria-describedby`, Zusammenfassung „Bitte prüfen Sie Ihre Angaben: n Eingaben …“ als `role="alert"`; nach fehlgeschlagenem Absenden springt der Fokus in das erste fehlerhafte Feld (Livewire-Event `form-invalid`).
|
||||
- **Dateien:** `resources/views/livewire/booking-request.blade.php`, `app/Livewire/BookingRequest.php`.
|
||||
- **Tests:** Feature-Test – **PASS**. Browser (Chromium, lokal): nach leerem Absenden Fokus auf „Vorname“, 5 Alerts, 4 `aria-invalid` – **PASS**. Auf stommer.info (alter Stand) zuvor 0/0, also behoben durch die Änderung, **sobald deployt**.
|
||||
|
||||
### P1-b – Rotator
|
||||
- **Maßnahme:** Einfachere Lösung gewählt: Automatischer Wechsel entfernt; Wechsel nur durch Pfeile/Punkte. Damit kein Pausenschalter nötig (WCAG 2.2.2). Reduced-Motion-Logik entfällt für den Rotator, weil keine Bewegung mehr automatisch erfolgt.
|
||||
- **Datei:** `resources/themes/ostsee-licht/theme.js` (auch vom Theme `seebad` geerbt).
|
||||
- **Test:** Code-Änderung; ein Browsertest war nicht möglich, weil in den Testdaten (lokal und stommer.info) **kein Rotator-Abschnitt** ausgespielt wird (`rotator_present = 0`) → **UNKNOWN (Verhalten), Code-Review PASS**.
|
||||
|
||||
### P1-c – Betrieb ohne JavaScript
|
||||
- `<noscript>`-Hinweis mit E-Mail/Telefon aus `config('fewo.owner.*')` im Formular. Feature-Test **PASS**. Ohne-JS-Browserlauf nicht ausgeführt.
|
||||
|
||||
### P1-d – Fehlerseiten
|
||||
- **Maßnahme:** `resources/views/errors/{403,404,419,429,500,503}.blade.php` plus gemeinsame `message.blade.php`; eigenständig (ohne Vite/Theme/Datenbank), deutsch, `lang="de"`, `noindex`, Link zur Startseite, Kontaktdaten aus Konfiguration.
|
||||
- **Tests:** Feature-Test (alle sechs rendern, 404 deutsch) **PASS**; Browser lokal: Titel „Seite nicht gefunden“ **PASS**. Live-Stand (alt): englisches „Not Found“.
|
||||
- **Hinweis:** Fehlerseiten gelten auch für das Admin-Panel bei 403/404/419.
|
||||
|
||||
### P1-e – Sicherheitsbefunde (Finding 10)
|
||||
- **Tokens in URLs:** Aufrufer ermittelt: n8n-Scheduler-Workflow nutzt laut `scripts/n8n-fewo-scheduler.json` bereits **Header-Auth**. Ob ein produktiver Gesundheits-Workflow noch `?token=` nutzt, ist **UNKNOWN** (n8n liegt auf dem Pi, nicht eingesehen). Maßnahme: Schalter `FEWO_ALLOW_QUERY_TOKEN` (Standard **an**, um bestehende Automationen nicht zu unterbrechen); jede `?token=`-Nutzung wird ohne Tokenwert als Warnung geloggt. Header-Token gehen immer. Test **PASS** (an/aus/Header). Docs `DEPLOYMENT.md`/`PORTALE.md` nennen noch `?token=` in Beispielen (nicht geändert).
|
||||
- **Interner Release-Pfad:** Der Redirect `/storage/app/private/backups/` → `/releases/<id>/public/…` entsteht in der `.htaccess`-Slash-Regel (`public/.htaccess`, Apache-Ebene) und im Strato-Rewrite. Er liefert `403`, legt aber die Release-ID offen. Eine sichere Korrektur an `public/.htaccess` (Slash-Regel nur für Verzeichnisse innerhalb von `public`) wurde **nicht** ausgeführt, weil sie ohne Serverprobe das Routing der gesamten Seite stören kann → **IMPROVE, offen**. Privater Zugriffsschutz bleibt wirksam (403/404 geprüft).
|
||||
|
||||
### P1-f – Cookie- und Browserprüfung (echter Chromium/Playwright)
|
||||
Gegen `https://stommer.info` (Seiten `/`, `/wohnung`, `/kuehlungsborn`, `/kontakt`, `/impressum`, `/datenschutz`, `/buchen`; auf `/buchen` Kalendertage gewählt und Formularfeld bedient, **nicht abgesendet**). 126 Requests insgesamt.
|
||||
|
||||
| Prüfpunkt | Ergebnis |
|
||||
|---|---|
|
||||
| Cookies | genau zwei: `XSRF-TOKEN` (Secure, Lax, 120 Min.), `ferienwohnung-stommer-session` (Secure, HttpOnly, Lax, 120 Min.) |
|
||||
| Local Storage / Session Storage | leer |
|
||||
| Requests an Fremddomains | **0** (Schriften, Skripte, Bilder alle von stommer.info) |
|
||||
| Konsolenfehler | keine |
|
||||
| Karten, Tracking, Drittanbieter-Skripte | keine; OpenStreetMap nur als Link |
|
||||
| Tab-Reihenfolge | Sprunglink zuerst; Footer-Link „Datenschutz“ per Tab erreichbar |
|
||||
|
||||
**Befund: ausschließlich unbedingt notwendige Technologien. Kein Cookie-Banner.** Rechtliche Einordnung beim Betreiber.
|
||||
|
||||
### P1-g – Domainwechsel-Vorbereitung
|
||||
- **WordPress-URLs erfasst** (aus `wp-sitemap-posts-page-1.xml` der öffentlichen Seite): `/datenschutzerklaerung/`, `/herzlich-willkommen-im-ostseebad-kuehlungsborn/`, `/ferienwohnung/`, `/about/`, `/contact/`, `/home/`, `/impressum/`, `/intressante-links/`, `/`, `/kuehlungsborn/` sowie sieben Demo-Blogartikel (`/2020/10/18/…`).
|
||||
- **Maßnahme:** 301-Weiterleitungen in `config('fewo.legacy_redirects')` (Zuordnung unten) und Route für datierte Blogartikel → Startseite. Eine eigene veröffentlichte Seite mit gleichem Slug hat Vorrang. Pfade mit Schrägstrich am Ende werden bereits von `public/.htaccess` auf die Form ohne Schrägstrich geleitet.
|
||||
|
||||
| Alt | Neu |
|
||||
|---|---|
|
||||
| `/datenschutzerklaerung` | `/datenschutz` |
|
||||
| `/ferienwohnung` | `/wohnung` |
|
||||
| `/herzlich-willkommen-im-ostseebad-kuehlungsborn` | `/kuehlungsborn` |
|
||||
| `/intressante-links` | `/kuehlungsborn` |
|
||||
| `/about`, `/contact` | `/kontakt` |
|
||||
| `/home` | `/` |
|
||||
| `/impressum`, `/kuehlungsborn`, `/` | unverändert |
|
||||
| `/2020/…/…` (Blog) | `/` |
|
||||
|
||||
Die Zuordnung ist ein Vorschlag; über `/ferienwohnung` → `/wohnung` und die Sammelziele entscheidet der Betreiber. Nicht erfasst: WordPress-Medien unter `/wp-content/uploads/…`, Feeds, Kategorie-/Autorenseiten.
|
||||
- **Test:** `GoLiveComplianceTest::test_former_wordpress_addresses_redirect_permanently` – **PASS**.
|
||||
- **Hauptdomain:** Der Code erwartet **eine** Hauptadresse je Website (`sites.domain`), weitere Adressen leitet die parallel entwickelte Änderung in `ResolveTheme` per 301 dorthin. Empfohlene Hauptdomain: **`https://www.fewo-stommer.de`**, `fewo-stommer.de` (ohne www) als Alias.
|
||||
- **Canonical/Sitemap:** nutzen `url()->current()` bzw. die Hauptadresse der Website – nach Umstellung von `sites.domain` automatisch korrekt (lokal geprüft: Canonical nutzt die erzwungene Wurzel-URL). Echter Abruf nach Umschaltung **UNKNOWN**.
|
||||
- **Noindex:** Auf stommer.info solange `APP_ENV` ≠ `production`. **Achtung:** Beim In-place-Promotion `APP_ENV=production` setzen, sonst bleibt `noindex` auf der Produktivseite; umgekehrt Testsystem **nicht** auf `production`.
|
||||
|
||||
---
|
||||
|
||||
## Mobile Darstellung / Zoom
|
||||
- Chromium, 320 px Breite, Live-Seite stommer.info: Layout-Viewport wird auf 380 px aufgeweitet (Seite erscheint leicht verkleinert), obwohl kein ungeclippter Inhalt breiter als 320 px ist; ein horizontales Scrollen ist nicht möglich (`overflow-x: hidden`). Lokal mit dem **aktuellen** Code (Theme `seebad`): 320 px, kein Überlauf; mit Theme `ostsee-licht`: 329 px. Das Live-Verhalten stammt vermutlich von einem älteren Stand → **nach dem nächsten Deployment erneut prüfen** (UNKNOWN). 200-%-Zoom und echte Geräte nicht geprüft.
|
||||
|
||||
## Tastatur / Screenreader
|
||||
- Per Playwright geprüft: Sprunglink, Menüfolge, Footer-Links, Fokus auf erstes Fehlerfeld. **Nicht** geprüft: vollständige Kalender-Tastaturbedienung, NVDA/VoiceOver (UNKNOWN).
|
||||
|
||||
---
|
||||
|
||||
## Risiken für signierte Links und Kalenderfeeds (Domainwechsel)
|
||||
|
||||
**R1 – behoben am 30.10.2026 (Code, getestet), vor der Umschaltung am Server nachzuprüfen.** Ausnahme `staysOnRequestedAddress` in `ResolveTheme` für `angebot/*`, `bewertung/*`, `angebote/*`, `kalender/*`, `automation/*`, `health/*`; Test `GoLiveComplianceTest::test_signed_links_and_feeds_are_not_redirected_from_a_further_address`. Ursprüngliche Beschreibung:
|
||||
- Laravels `signed`-Prüfung bindet die Signatur an **Schema + Host des Aufrufs** (geprüft in `UrlGenerator::hasCorrectSignature`). Bereits versendete Angebots-, Bewertungs- und Newsletter-Links zeigen auf `https://stommer.info/…`. Solange `stommer.info` die Anwendung **ohne Umleitung** ausliefert, bleiben sie gültig (der Host des Aufrufs bleibt gleich).
|
||||
- Die parallel entwickelte Änderung in `ResolveTheme` (`toMainAddress`) leitet **jeden** Aufruf über eine Nebenadresse per 301 auf die Hauptadresse um. Nach der Umstellung würde `https://stommer.info/angebot/123?signature=…` auf `https://www.fewo-stommer.de/angebot/123?signature=…` geleitet – dort ist die Signatur **ungültig (403)**. Alte Angebotslinks wären tot.
|
||||
- **Erforderliche Gegenmaßnahme (Entscheidung nötig, nicht von mir umgesetzt, weil die Datei in einer parallelen Arbeit steckt):** Die Alias-Weiterleitung muss `angebot/*`, `bewertung/*`, `angebote/*`, `kalender/*` und `automation/*` ausnehmen (diese Pfade weiter unter `stommer.info` ausliefern), **oder** `stommer.info` bleibt dauerhaft als zweite Adresse ohne Weiterleitung für diese Pfade erreichbar. Ablaufdatum der Angebotslinks prüfen: danach kann die Ausnahme entfallen.
|
||||
- Neue Links entstehen nach der Umstellung automatisch mit der neuen Hauptadresse (`sites.domain`/`APP_URL`).
|
||||
|
||||
**R2 – Kalenderfeeds.** Portale rufen `https://stommer.info/kalender/<token>.ics` ab. Die Tokens sind im Pfad und unabhängig vom Host; mit der Ausnahme aus R1 laufen die Feeds weiter. Ohne Ausnahme folgen viele iCal-Clients einer 301, manche nicht → Portal-Kalender würden still veralten. Vorgehen: Feed-URLs bei den Portalen **nicht sofort**, sondern geplant auf die neue Domain umstellen; vorher `/health/sync` und Importzeit (`last_success_at`) im Blick behalten. Ob ein Portal die Kalender-URL manuell umgestellt bekommen muss, ist je Portal **UNKNOWN**; sicher ist die Ausnahme-Variante (alte URL funktioniert weiter).
|
||||
|
||||
**R3 – Sessions/Cookies.** Cookie-Domain wird nicht gesetzt (host-only). Nach dem Wechsel gelten neue Sitzungen; Administratoren müssen sich auf der neuen Domain neu anmelden (2FA bleibt). Offene Reservierungsformulare gehen beim Wechsel verloren.
|
||||
|
||||
**R4 – Automationen.** n8n ruft `https://stommer.info/automation/scheduler` auf. Mit der Ausnahme in R1 weiter gültig; sonst muss die Workflow-URL umgestellt werden (Aufruf kontrolliert, Header-Auth bleibt). Auch `FEWO_AUTOMATION_WEBHOOK_URL` zeigt in die Gegenrichtung (App → n8n) und ist vom Wechsel unberührt.
|
||||
|
||||
**R5 – Konfigurationscache.** `APP_URL` und `sites.domain` ändern; danach `php artisan optimize` (Konfigurations- und Routen-Cache), sonst gilt die alte URL (`docs/BETRIEB.md` §5).
|
||||
|
||||
---
|
||||
|
||||
## In-place-Promotion von stommer.info → www.fewo-stommer.de (Plan, nicht ausgeführt)
|
||||
|
||||
**Vorbedingungen (alle vor der Umschaltung):**
|
||||
1. Betreiberfreigabe; Zeitfenster mit geringem Buchungsgeschehen.
|
||||
2. Entscheidung zu R1 (Ausnahmepfade) umgesetzt, getestet, im Testsystem geprüft.
|
||||
3. Änderungen dieses Auftrags **und** des Buchungsauftrags zusammen getestet; Deployment per Pipeline (develop → Test-Deploy). Vollständige Suite grün.
|
||||
4. MariaDB-Restore-Test erfolgreich (B4), externe Kopie frisch (`backup-pull.sh staging <ziel>`), enthält DB, Fotos, Verträge.
|
||||
5. Kopie von `shared/.env` an geschütztem Ort (Vaultwarden), nicht im Chat.
|
||||
6. Zertifikate für `fewo-stommer.de` und `www.fewo-stommer.de` in Strato verfügbar.
|
||||
7. Liste der Portal-Kalender mit Feed-URLs und Zuständigkeiten (wer stellt um) vorliegend.
|
||||
|
||||
**Ablauf (Schritt für Schritt, jeweils freigeben):**
|
||||
1. Deployment des geprüften Stands auf die bestehende Installation (nur Code; **keine** neuen Migrationen ohne Freigabe – die parallelen Buchungsmigrationen sind **additiv**, aber gesondert zu beurteilen). Danach Smoke-Test auf stommer.info (Startseite, `/buchen`, Admin-Login, `/health/sync` mit Header).
|
||||
2. `shared/.env` anpassen: `APP_ENV=production`, `APP_DEBUG=false`, `APP_URL=https://www.fewo-stommer.de`, `SESSION_SECURE_COOKIE=true`, `LOG_LEVEL=warning`, SMTP unverändert, Testmodus erst nach Freigabe auf „live“.
|
||||
3. In Strato: `www.fewo-stommer.de` und `fewo-stommer.de` dem Deploy-Ordner `test.fewo-stommer.de/` zuordnen (zusätzlich zu `stommer.info`). Altes WordPress-Ziel dabei bewusst ablösen (vorher WordPress-Sicherung durch Betreiber).
|
||||
4. Im Admin die Hauptadresse der Website auf `www.fewo-stommer.de` setzen (Datenänderung an `sites.domain` – freigabepflichtig), `stommer.info` bleibt als weitere Adresse.
|
||||
5. `bash scripts/deploy.sh <env> artisan optimize` (bzw. Pipeline), danach prüfen: Startseite, `curl -I http://www.fewo-stommer.de/` → 301 HTTPS, Canonical, `/sitemap.xml`, `robots.txt` (Produktion: indexierbar), Altadressen-Weiterleitungen, ein alter signierter Angebotslink unter `stommer.info`, ein Feed unter `stommer.info/kalender/…`.
|
||||
6. n8n-Scheduler: Lauf in den nächsten 5 Minuten prüfen (`channels:sync`, `last_success_at`).
|
||||
7. Search Console für die neue Domain einrichten (Betreiber).
|
||||
8. Portal-Kalender-URLs nach Vereinbarung stufenweise umstellen; `stommer.info` als Alias dauerhaft belassen, bis alle Angebotslinks abgelaufen und alle Portale umgestellt sind.
|
||||
|
||||
## Rollback
|
||||
- **Domain:** Zuordnung von `www.fewo-stommer.de` in Strato wieder auf das alte WordPress-Ziel zurücksetzen. Die neue Anwendung bleibt unter `stommer.info` erreichbar; Daten wurden nicht umgezogen, es gibt also **keine Datenrückspielung**.
|
||||
- **Anwendung:** `bash scripts/deploy.sh <env> rollback` bzw. Pipeline-Rückfall (Git-Tag `deploy/<env>/<ts>`); `sites.domain` zurück auf `stommer.info`; `APP_URL` zurück, `optimize`.
|
||||
- **Abhängigkeiten außer der Domain:** (a) nach Wechsel versendete Links zeigen auf die neue Domain und sind nach Rollback tot, daher Mails im Zeitfenster minimieren; (b) bereits umgestellte Portal-Feeds müssen zurückgestellt werden; (c) Suchmaschinen können kurzzeitig neue Adressen kennen. Eine reine Domain-Rückstellung genügt nur, solange kein Portal umgestellt und keine Mail mit neuer Domain versendet wurde.
|
||||
|
||||
---
|
||||
|
||||
## Ausgeführte Tests
|
||||
|
||||
| Test | Ergebnis |
|
||||
|---|---|
|
||||
| `GoLiveComplianceTest` (6 Tests, 38 Assertions): HTTPS-Redirect, Datenschutzlink + `noscript`, Formularfehler/ARIA, Fehlerseiten, WordPress-Weiterleitungen, Query-Token | **PASS** |
|
||||
| Bestehende Tests `BookingRequestPageTest`, `SchedulerEndpointTest` nach Änderung | **PASS** |
|
||||
| Browser-Cookie-/Netzwerkprüfung stommer.info (Playwright/Chromium) | **PASS** |
|
||||
| Browser lokal: Fehlerfokus, ARIA, Datenschutzlink, deutsche 404 | **PASS** |
|
||||
| Restore-Test SQLite (lokal) | **PASS** |
|
||||
| Vollständige Feature-Suite (561 Tests, 556 bestanden) | **FAIL (nicht durch diese Änderungen)**, Details unten |
|
||||
| `vendor/bin/pint --dirty` | **PASS** |
|
||||
| HTTP→HTTPS am echten Server, Mailtest, MariaDB-Restore, Handtest NVDA/Zoom/Geräte, Rotator im Browser | **UNKNOWN / BLOCKED** |
|
||||
|
||||
## Ergebnis der vollständigen Feature-Suite (30.10.2026)
|
||||
561 Tests, 556 bestanden, 3 Fehlschläge, 2 Fehler. Gleichzeitig arbeitet eine zweite Sitzung im selben Arbeitsverzeichnis, daher ist die Suite nicht sauber isolierbar.
|
||||
- `TenantFilesTest` und `WebsiteContentTest` (3 Tests): in einer Wiederholung einzeln **PASS** (13/13). Ursache vermutlich ein zeitgleicher Testlauf der anderen Sitzung auf demselben temporären Testspeicher.
|
||||
- `SeasonManagementTest::test_admin_pages_render`: Klasse `OfferMode` fehlt in `PropertyForm.php` – unfertige Änderung der Buchungsarbeit, **nicht von diesem Auftrag**.
|
||||
- `WebsiteTenancyTest::test_a_website_answers_on_every_address_entered_for_it`: erwartet 200, erhält 301 – direkte Folge der neuen Alias-Host-Weiterleitung in `ResolveTheme` (ebenfalls die parallele Arbeit; Test dort ebenfalls in Bearbeitung). Betrifft das Risiko R1.
|
||||
- Die in diesem Auftrag geänderten Bereiche (Buchungsformular, Planungsseiten, Scheduler-Endpunkt, Weiterleitungen) sind grün. **Eine fehlerfreie Gesamtsuite steht noch aus (Nachtrag: am 30.10.2026 später 561/561 bestanden, mit den Änderungen aller drei Agenten)** und ist nach Abschluss der parallelen Arbeit erneut auszuführen.
|
||||
|
||||
## Noch erforderliche Betreiberaktionen
|
||||
1. Freigabe für Deployment der Änderungen auf die bestehende Installation.
|
||||
2. Entscheidung zur Alias-Weiterleitung (R1) und Hauptdomain `www.fewo-stommer.de`.
|
||||
3. Zweite Strato-Datenbank für Restore-Test und Testsystem anlegen.
|
||||
4. Einwilligung vs. Datenschutzinformation am Formular juristisch klären.
|
||||
5. Bestätigung der Weiterleitungszuordnung (WordPress-Seiten).
|
||||
6. Zeitplan für `backup-pull.sh`; WordPress-Sicherung vor der Ablösung.
|
||||
7. Zuständigkeiten für Portal-Kalender-URLs.
|
||||
8. Strato „SSL erzwingen“ aktivieren (optional, zusätzlich).
|
||||
|
||||
## Abschließende Empfehlung
|
||||
**NO-GO für eine sofortige Umschaltung; GO-fähig**, sobald (1) die Änderungen deployt und auf stommer.info nachgeprüft sind, (2) R1 gelöst ist, (3) der MariaDB-Restore bestanden ist und (4) die Produktions-`.env` laut Plan gesetzt ist. Es sind keine weiteren Architekturänderungen nötig.
|
||||
@@ -0,0 +1,215 @@
|
||||
# MVP-TECHNICAL-GATE – Phase 1 (Read-only-Prüfung) und Umsetzungsstand
|
||||
|
||||
> **Umsetzungsstand 30.10.2026 (Details und Nachweise: [MVP-COMPLIANCE-ACCEPTANCE.md](MVP-COMPLIANCE-ACCEPTANCE.md)).** Die Codeänderungen liegen lokal, nichts ist deployt, auf stommer.info wurde nichts verändert. Die Installation auf stommer.info gilt künftig als Produktion (In-place-Promotion).
|
||||
>
|
||||
> | # | Stufe | Stand |
|
||||
> |---|---|---|
|
||||
> | 1 | BLOCKER HTTPS | Code umgesetzt (`ForceHttps`) und getestet; Wirkung am Server nach Deployment prüfen |
|
||||
> | 2 | BLOCKER Datenschutzlink | umgesetzt, getestet (Test + Browser lokal) |
|
||||
> | 3 | BLOCKER Produktivkonfiguration/Mail | Plan erstellt; Mailtest am echten Formular wegen Produktivdaten **nicht ausgeführt** |
|
||||
> | 4 | BLOCKER Restore | SQLite-Restore bestanden; **MariaDB-Restore offen** (zweite Datenbank nötig) |
|
||||
> | 5 | IMPROVE WordPress-Weiterleitungen | umgesetzt (301-Tabelle), Zuordnung vom Betreiber zu bestätigen |
|
||||
> | 6 | IMPROVE Fehlerseiten | umgesetzt, getestet |
|
||||
> | 7 | IMPROVE Formularfehler | umgesetzt, getestet (Fokus, ARIA) |
|
||||
> | 8 | IMPROVE Rotator | Auto-Wechsel entfernt |
|
||||
> | 9 | IMPROVE ohne JavaScript | `<noscript>`-Hinweis umgesetzt |
|
||||
> | 10 | IMPROVE Token/Release-Pfad | Token-Schalter umgesetzt; Release-Pfad in `.htaccess` offen |
|
||||
>
|
||||
> **Neu entdeckt:** (a) Alias-Host-Weiterleitung der parallelen Arbeit würde nach dem Domainwechsel alte signierte Angebotslinks und ggf. Feeds ungültig machen (R1). (b) Auf stommer.info (aktueller Stand) wird das Layout bei 320 px auf 380 px aufgeweitet (lokal mit aktuellem Code nicht reproduzierbar). (c) Browser-Cookiecheck bestätigt: nur zwei notwendige Cookies, kein Storage, keine Drittanfragen.
|
||||
> **Empfehlung weiterhin NO-GO bis Deployment, MariaDB-Restore, R1 und Produktions-`.env`.**
|
||||
>
|
||||
> *Der folgende Text ist der unveränderte Phase-1-Bericht.*
|
||||
|
||||
Stand: 30.10.2026 · Geprüft: Quellcode (Branch `feature/erinnerungen-zusammenfassung`) und der Testauftritt **https://stommer.info** (Staging, per HTTP-Abruf).
|
||||
Status: **Phase 1 abgeschlossen. Es wurden keine Code-, CMS-, Datenbank- oder Serveränderungen vorgenommen.** Phase 2 beginnt erst nach ausdrücklicher Freigabe des Betreibers.
|
||||
|
||||
**Grenzen der Prüfung (ehrlich vorab):**
|
||||
- Der Testauftritt wurde mit HTTP-Abrufen und Quellcode-Analyse geprüft, **nicht** in einem interaktiven Browser mit DevTools. Cookies, Header und eingebundene Ressourcen sind aus den Antworten belegt. Echte Browser-Laufzeitprüfungen (Local/Session Storage, Tastatur-Durchlauf, Screenreader, Zoom) stehen deshalb als UNKNOWN oder IMPROVE da.
|
||||
- Produktion (`prod.fewo-stommer.de`) ist laut `docs/BETRIEB.md` **noch nicht eingerichtet** (keine `.env`, keine Datenbank). Produktionswerte sind Soll-Werte aus `.env.production.example`, nicht verifiziert.
|
||||
- Rechtstexte und CMS-Inhalte wurden **nicht inhaltlich** geprüft. Nur Erreichbarkeit und sichere Ausgabe.
|
||||
|
||||
## Gesamtbild
|
||||
|
||||
| Bereich | Ergebnis |
|
||||
|---|---|
|
||||
| Cookies / externe Dienste | Nur unbedingt notwendige Cookies, keine Drittanbieter → **kein Banner empfohlen** (Details A) |
|
||||
| Barrierefreiheit | Gute Grundlage, einige kleine Verbesserungen, ein Formular-Link fehlt (B) |
|
||||
| Security | Solide (2FA, Rate-Limits, Tokens, Sperren). Offen: HTTP→HTTPS, Restore-Nachweis, Produktivkonfiguration (C) |
|
||||
| Domainwechsel | Noindex/Canonical technisch richtig; Weiterleitungen und Mailversand noch nicht verifiziert (E) |
|
||||
|
||||
**Vorläufige Empfehlung: NO-GO**, bis die 4 BLOCKER (1–4) behoben und abgenommen sind. Kein BLOCKER erfordert einen Architekturumbau. Zwei sind Konfiguration oder Nachweis ohne Codeänderung.
|
||||
|
||||
---
|
||||
|
||||
## Priorisierte Maßnahmen (max. 10)
|
||||
|
||||
| # | Stufe | Maßnahme | Art |
|
||||
|---|---|---|---|
|
||||
| 1 | BLOCKER | HTTP wird nicht auf HTTPS umgeleitet | Server-Konfiguration |
|
||||
| 2 | BLOCKER | Datenschutzhinweis am Anfrageformular ist kein Link | Code (1 Zeile) |
|
||||
| 3 | BLOCKER | Produktivumgebung nicht eingerichtet und Mailversand nie echt getestet | Konfiguration + Abnahmetest |
|
||||
| 4 | BLOCKER | Backup-Restore nie nachgewiesen | Nachweis, kein Code |
|
||||
| 5 | IMPROVE | Weiterleitung der alten WordPress-URLs beim Domainwechsel | Konfiguration |
|
||||
| 6 | IMPROVE | Fehlerseiten sind englische Laravel-Standardseiten | Code (klein) |
|
||||
| 7 | IMPROVE | Fehlermeldungen im Anfrageformular nicht barrierefrei verknüpft | Code (klein) |
|
||||
| 8 | IMPROVE | Auto-Rotator ohne Pausenschalter (WCAG 2.2.2) | Code (klein) |
|
||||
| 9 | IMPROVE | Formular ohne JavaScript nicht nutzbar, kein Hinweis | Code (klein) |
|
||||
| 10 | IMPROVE | Token auch per URL-Parameter akzeptiert; interner Release-Pfad in Redirect sichtbar | Code (klein) |
|
||||
|
||||
---
|
||||
|
||||
## BLOCKER (Detail)
|
||||
|
||||
### 1. BLOCKER – Keine Weiterleitung von HTTP auf HTTPS
|
||||
- **Problem:** `http://stommer.info/` antwortet mit `200 OK` statt mit einer Weiterleitung. Gäste, die per HTTP einsteigen, erreichen das Formular unverschlüsselt. Session- und XSRF-Cookies sind `secure`, werden über HTTP also nicht angenommen. Das Formular liefe dort in Fehler (419), und Anfragedaten könnten unverschlüsselt übertragen werden. HSTS wird nur über HTTPS ausgeliefert und hilft beim Erstbesuch nicht.
|
||||
- **Komponente:** Server-/Domain-Konfiguration bei Strato, bzw. die vom Deploy-Skript geschriebene `.htaccess` im Deploy-Ordner (`scripts/deploy.sh`, `docs/BETRIEB.md` §2). `public/.htaccess` enthält keine Umleitung.
|
||||
- **Minimale Korrektur:** Bei Strato „HTTPS erzwingen“ für die Domain aktivieren, oder in der Deploy-`.htaccess` `RewriteCond %{HTTPS} !=on` → `RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]` (Strato-Besonderheit: ggf. `%{HTTP:X-Forwarded-Proto}` prüfen).
|
||||
- **Abnahme:** `curl -sI http://<domain>/` und `curl -sI http://<domain>/buchen` liefern `301` mit `Location: https://…`. Gilt für `fewo-stommer.de` **und** `www.fewo-stommer.de`.
|
||||
|
||||
### 2. BLOCKER – Datenschutzhinweis am Anfrageformular ist nicht verlinkt
|
||||
- **Problem:** Im Einwilligungstext steht „(siehe Datenschutzerklärung)“ als reiner Text. Der Link erreicht die Seite nur über den Footer. Die Informationspflicht (Art. 13 DSGVO) verlangt, dass der Hinweis bei der Erhebung leicht auffindbar ist. Das ist technisch ohne Link nicht gegeben, und für Screenreader ist der Footer weit entfernt.
|
||||
- **Komponente:** `resources/views/livewire/booking-request.blade.php` (Checkbox `privacyAccepted`).
|
||||
- **Minimale Korrektur:** „Datenschutzerklärung“ als `<a href="{{ route('page', 'datenschutz') }}" target="_blank" rel="noopener">` setzen (Hinweis „öffnet in neuem Tab“ für Screenreader). Der Text der Einwilligung selbst bleibt unverändert. Das ist reine UI-Technik, keine inhaltliche Änderung.
|
||||
- **Abnahme:** Feature-Test: gerenderte `/buchen`-Seite enthält einen Link auf `/datenschutz` innerhalb des Formulars. Manuell: Tab-Reihenfolge erreicht den Link, Seite lädt, Rückkehr zum Formular behält Eingaben.
|
||||
|
||||
### 3. BLOCKER – Produktivumgebung nicht eingerichtet; Mailzustellung nie echt getestet
|
||||
- **Problem:** Laut `docs/BETRIEB.md` fehlen für Produktion `.env`, Datenbank und Domainzuordnung. Auf Staging gilt `MAIL_MAILER=log`, es wurde also nie eine echte E-Mail zugestellt. Ohne funktionierende Mails (Eingangsbestätigung an Gäste, Benachrichtigung an die Betreiber) ist das Anfrageformular nicht betriebsfähig. Produktions-Härtung (Debug, Logging, Cookies) ist nur als Vorlage belegt.
|
||||
- **Komponente:** `shared/.env` auf dem Server (Vorlage `.env.production.example`), `App\Support\Settings` (Testmodus/Live), `pipeline.toml` (Produktion gesperrt).
|
||||
- **Minimale Korrektur (nur Konfiguration, kein Code):** Produktions-`.env` mit `APP_ENV=production`, `APP_DEBUG=false`, `APP_URL=https://www.fewo-stommer.de`, `LOG_CHANNEL=daily`, `LOG_LEVEL=warning`, `SESSION_SECURE_COOKIE=true`, `MAIL_MAILER=smtp`, eigene Datenbank, lange zufällige `FEWO_HEALTH_TOKEN`, `FEWO_SCHEDULER_TOKEN`, `FEWO_AUTOMATION_SECRET`. Admin-Konten mit `users:create`, 2FA einrichten. Mail zunächst im Testmodus (Empfänger = Betreiber), erst danach „Live“.
|
||||
- **Abnahme:**
|
||||
1. `php artisan config:show app.debug` → `false`, `app.env` → `production`.
|
||||
2. Test-Anfrage über das Formular → Gäste-Bestätigung **und** Betreiber-Benachrichtigung kommen real an (Testadresse), SPF/DKIM-Header unauffällig (nicht als Spam).
|
||||
3. Ein erzeugter Fehler (z. B. `/nichtda`) zeigt keinen Stacktrace.
|
||||
4. `<meta name="robots" content="noindex">` ist auf Produktion **nicht** mehr vorhanden, `robots.txt` enthält die Produktions-Sitemap.
|
||||
5. Scheduler läuft (n8n oder Cron): `channels:sync` und `backup:database` erscheinen im Log.
|
||||
|
||||
### 4. BLOCKER – Backup-Restore nicht nachgewiesen
|
||||
- **Problem:** `backup:database` läuft täglich und behält 14 Dateien. Ein Wiederherstellungstest ist in `docs/BETRIEB.md` und `docs/LOESCHKONZEPT.md` nirgends belegt („❓ nicht belegt“). Die Sicherung liegt auf demselben Webspace; die Kopie außerhalb (`scripts/backup-pull.sh`, Pipeline-Sicherung auf dem Pi) ist manuell bzw. an Deployments gekoppelt. Der Dump überspringt bewusst `sessions`, `cache`, `jobs`.
|
||||
- **Komponente:** `app/Console/Commands/BackupDatabase.php`, `scripts/backup-pull.sh`, `docs/BETRIEB.md` §7a.
|
||||
- **Minimale Korrektur:** Kein Code. Einmaliger Restore-Test: aktuellen Dump auf eine **leere Test-Datenbank** einspielen (nicht in Produktion), Ergebnis mit Datum in `docs/BETRIEB.md` festhalten. Außerdem festlegen, wie oft `backup-pull.sh` läuft (mind. wöchentlich) und wo die Kopie liegt.
|
||||
- **Abnahme:** Nach dem Einspielen `php artisan migrate:status` ohne Fehler, Zeilenzahlen von `bookings`, `guests`, `pages` stimmen mit dem Original überein, Admin-Login mit der wiederhergestellten Datenbank funktioniert. Wichtig: Dump enthält Gästedaten, daher nur verschlüsselt/zugriffsgeschützt ablegen.
|
||||
|
||||
---
|
||||
|
||||
## A. Cookies und externe Dienste
|
||||
|
||||
**Methode:** Antwort-Header und gerenderte HTML-/CSS-Dateien der Startseite, `/buchen`, `/impressum`, `/datenschutz`, `/admin/login`; Suche im Quellcode nach `localStorage`, `sessionStorage`, `document.cookie`, Analytics, Karten-Einbettungen, `iframe`.
|
||||
**Nicht erfolgt:** Beobachtung im Browser-Netzwerk-Tab.
|
||||
|
||||
| Technologie | Zweck | Anbieter | Speicherdauer | Technisch erforderlich? | Einwilligung? |
|
||||
|---|---|---|---|---|---|
|
||||
| `ferienwohnung-stommer-session` (Cookie, HttpOnly, Secure, SameSite=Lax) | Sitzung des Buchungsformulars (Livewire), Spam-Zeitsperre | Eigene Domain | 120 Min. (`Max-Age=7200`) | Ja, Formularbetrieb | Nein, wenn nur dafür genutzt (Einordnung durch Betreiber) |
|
||||
| `XSRF-TOKEN` (Cookie, Secure, SameSite=Lax) | CSRF-Schutz des Formulars | Eigene Domain | 120 Min. | Ja | Nein |
|
||||
| Livewire-Skript, Theme-JS/CSS | Funktion der Seite | Eigene Domain (`/build`, `/livewire-…`) | – | Ja | Nein |
|
||||
| Schriften (Atkinson Hyperlegible, Cormorant Garamond) | Darstellung | **Selbst gehostet** (`/build/assets/*.woff2`) | – | – | Nein, keine Verbindung zu Drittanbietern |
|
||||
| Bilder (`/storage/…`) | Inhalt | Eigene Domain | – | – | Nein |
|
||||
| OpenStreetMap | Nur ein **Link** („Karte öffnen“), keine Einbettung | OSM Foundation | – | – | Nein, Verbindung erst nach Klick des Gastes |
|
||||
| Local/Session Storage | Im Quellcode der Webseite **nicht verwendet** (keine Treffer). Nur Filament-Admin nutzt Browser-Speicher intern. | – | – | – | Nein |
|
||||
| Tracking, Analytics, Werbung, Social-Widgets, Maps-iframes, Captcha | **Keine gefunden** (Bot-Schutz läuft ohne externen Dienst) | – | – | – | – |
|
||||
|
||||
- **PASS – Keine Drittanbieter-Verbindungen** im ausgelieferten HTML/CSS von Start- und Buchungsseite. Das einzige fremde Ziel ist der OSM-Link.
|
||||
- **PASS – Kein STRATO-spezifischer Skript-/Cookie-Zusatz** im HTML (keine Fremdskripte, keine Zusatz-Cookies). Der Server sendet nur die zwei Laravel-Cookies.
|
||||
- **Empfehlung: Kein Cookie-Banner.** Es werden ausschließlich notwendige Technologien eingesetzt. Hinweis für den Betreiber: Die Cookies werden schon beim ersten Seitenaufruf gesetzt (auch ohne Formular), weil Laravel die Sitzung global startet. Die rechtliche Einordnung („unbedingt erforderlich“) und die Erwähnung in der Datenschutzerklärung liegen beim Betreiber. Technisch ließe sich das später auf `/buchen` beschränken (kein MVP-Thema).
|
||||
- **UNKNOWN:** Browser-Gegenprobe (DevTools › Application/Network) auf Staging; zusätzlich das Cookie-Verhalten, sobald Produktions-Domain und Strato-Einstellungen live sind. 5-Minuten-Check vor Go-live.
|
||||
|
||||
---
|
||||
|
||||
## B. Technische Barrierefreiheit (WCAG 2.2 als Qualitätsmaßstab)
|
||||
|
||||
**Rechtliche Einordnung (Betreiber):** Ob die Kleinstunternehmensausnahme nach § 3 Abs. 3 BFSG greift, entscheidet der Betreiber. Unabhängig davon ist die Grundlage technisch gut. Hier nur technische Empfehlungen, keine gesetzliche Anforderung bestätigt.
|
||||
|
||||
**PASS (aus Quellcode und HTML belegt):**
|
||||
- Sprunglink „Zum Inhalt springen“, `lang="de"`, Landmarks (`header`, `nav` mit `aria-label`, `main#inhalt`, `footer`).
|
||||
- Sichtbarer Fokus global: `:focus-visible { outline: 2px solid var(--accent) }` (`theme-base.css`).
|
||||
- Viewport ohne Zoomsperre (`width=device-width, initial-scale=1`), keine `maximum-scale`/`user-scalable`.
|
||||
- Alle Formularfelder haben sichtbare `<label>`, Pflichtfelder `required`, `autocomplete`-Attribute (WCAG 1.3.5).
|
||||
- Kalender: echte Tabelle mit `<th scope="col">`, jeder Tag ein `<button>` mit vollständigem Datum und „(Nacht belegt)“ im `aria-label`, `aria-pressed`. Belegt ist nicht nur Farbe (durchgestrichen + Text).
|
||||
- Vergangene Tage `disabled`; Preisbereich `aria-live="polite"`; Erfolgsmeldung `role="status"`.
|
||||
- Lightbox als natives `<dialog>` (Escape, Fokusrückgabe nativ); Buttons mit `aria-label`.
|
||||
- `prefers-reduced-motion` wird berücksichtigt (CSS und Rotator).
|
||||
- Dekorative Grafiken (Wellen-Trenner) `aria-hidden`. Mobile Menü ohne JavaScript über `<details>`.
|
||||
- Standard-Token-Kontraste rechnerisch ausreichend (z. B. Text `#4E5C66` auf `#F6F2EA` ≈ 6:1, Akzent `#2C5F7C` auf Weiß ≈ 7:1).
|
||||
|
||||
**IMPROVE (nicht Go-live-kritisch, kleine Änderungen):**
|
||||
- **#7 Formularfehler:** Fehlermeldungen der Textfelder sind per `aria-describedby` verknüpft, aber nicht als `role="alert"`; Fehler der Einwilligungs-Checkbox (`privacyAccepted`) haben weder `aria-invalid` noch Verknüpfung; kein Sprung zum ersten Fehler (das Formular nutzt `novalidate`). Folge: Screenreader-Nutzer bemerken ein abgelehntes Absenden nicht (WCAG 3.3.1, 4.1.3). Korrektur: `role="alert"` bzw. Fokus auf erstes Fehlerfeld, Checkbox mit `aria-describedby`.
|
||||
- **#8 Auto-Rotator** (Sonderangebote, wechselt alle 7 s): pausiert bei Hover/Fokus, hat aber keinen sichtbaren Pausenschalter (WCAG 2.2.2, > 5 s). Korrektur: Pause-Button oder Auto-Wechsel nur ohne Interaktion deaktivieren. Alternativ komplett ohne Auto-Wechsel.
|
||||
- **Mehrere `<h1>`** auf den Rechtstexten: Die Seite rendert die Überschrift des Abschnitts als `<h1>` und die im CMS-Text enthaltene Überschrift ebenfalls. Das ist eine Inhaltsfrage (CMS-Text), kein Fehler der Vorlage. Hinweis an Betreiber: Überschriften im Text als H2/H3 anlegen.
|
||||
- **UNKNOWN:** Tastatur-Durchlauf von Menü, Kalender (Pfeiltasten nicht implementiert, Tab durch alle Tage = ca. 60 Stopps), Zoom 200 %/Reflow 320 px, Screenreader-Test (NVDA/VoiceOver), Kontraste der **Saison-Erscheinungsbilder** (z. B. `herbst` überschreibt Farb-Token), `Kalender-Target-Size` (WCAG 2.5.8). Empfohlen: 30-Minuten-Handtest mit Tastatur und NVDA vor Go-live.
|
||||
|
||||
---
|
||||
|
||||
## C. Security und Datenschutztechnik
|
||||
|
||||
| Prüfpunkt | Stufe | Befund |
|
||||
|---|---|---|
|
||||
| HTTPS / HSTS | **BLOCKER** (#1) | HTTPS aktiv, HSTS `max-age=31536000` gesetzt, aber keine HTTP→HTTPS-Weiterleitung |
|
||||
| Sicherheits-Header | PASS | `X-Content-Type-Options`, `X-Frame-Options: SAMEORIGIN`, `Referrer-Policy`, `Permissions-Policy` (`SecurityHeaders`). Kein CSP (bewusst, Livewire/Filament inline; `IMPROVE`, nicht MVP) |
|
||||
| Debug-Modus (Produktion) | **UNKNOWN** (#3) | Vorlage `APP_DEBUG=false`. Staging liefert auf `/nichtda` nur die Standard-404, keine Debug-Seite. Produktion nicht verifizierbar |
|
||||
| Logging | PASS (Vorlage) | `LOG_CHANNEL=daily`, `LOG_LEVEL=warning`, 14 Tage. Nicht live verifiziert |
|
||||
| Session / Cookies | PASS | `HttpOnly`, `Secure`, `SameSite=Lax`, DB-Sessions, 120 Min. |
|
||||
| CSRF | PASS | Laravel `PreventRequestForgery` aktiv. Ausnahmen nur für `/automation/portal-mail` und `/automation/aufgaben/…`, beide mit HMAC-Signatur (`hash_equals`, leeres Secret → 403) |
|
||||
| Admin-Zugang | PASS | `/admin/login` erreichbar (erwartet); 2FA (TOTP) mit Wiederherstellungscodes für jedes Konto verpflichtend; Konten nur über `users:create`; Rollen/Policies |
|
||||
| Vertrauliche Dateien | PASS | `/.env` → 403, `/composer.json` → 404, `/releases/` → 403, `/storage/app/private/…` nicht erreichbar, nur `storage/app/public` ist verlinkt. Backups und Verträge liegen privat |
|
||||
| Technische Tokens | PASS | Health (`/health/sync`), Scheduler und Portal-Mail: ohne Token 404/403; Vergleich mit `hash_equals`; leere Konfig = gesperrt; Rate-Limit 10–60/min. Hinweis: `?token=` wird übergangsweise noch akzeptiert → IMPROVE #10. iCal-Feeds nur mit zufälligem `export_token`, Token-Rotation vorhanden |
|
||||
| Eingabevalidierung / Spam | PASS | Serverseitige Regeln, Honeypot, Zeitsperre 4 s, 5/Std je IP, 3/Tag je E-Mail, 30/Std gesamt, max. 2 offene Anfragen je E-Mail, Link-Limit; signierte URLs (`signed`) + Throttle für Angebot, Bewertung, Newsletter |
|
||||
| Ausgabe von CMS-Inhalten | PASS | Texte werden mit `{{ }}` escaped; Rich-Text läuft über Filament `RichContentRenderer` (bereinigt). Die wenigen `{!! !!}`-Stellen geben Theme-eigene Motive, `json_encode` mit `JSON_HEX_TAG` oder escaped Titel aus |
|
||||
| Datenlöschung bei erfolglosen Anfragen | PASS (technisch) | `guests:anonymize` täglich 03:00: nie bestätigte Anfragen nach 6 Monaten (`FEWO_RETENTION_INQUIRY_MONTHS`) anonymisiert, Portal-Mailauszüge 90 Tage, UTM 24 Monate. Frist **rechtlich** bestätigen lässt der Betreiber (`docs/LOESCHKONZEPT.md`). Offene Lücken laut Löschkonzept (Bewertungen, Vertragsdokumente, `internal_notes`) sind nicht Teil des MVP-Pfads → IMPROVE |
|
||||
| Backup | **BLOCKER** (#4) | Erstellung vorhanden, Restore nicht nachgewiesen |
|
||||
| Gästedaten in Versandwegen | PASS | Testmodus-Schalter leitet alle Mails an Testadresse; `FEWO_MAIL_REDIRECT_TO` als harte Sperre |
|
||||
| Produktivkonfiguration | **BLOCKER** (#3) | Nicht eingerichtet |
|
||||
|
||||
---
|
||||
|
||||
## D. CMS und technische Informationspflichten
|
||||
|
||||
| Prüfpunkt | Stufe | Befund |
|
||||
|---|---|---|
|
||||
| Impressum und Datenschutz erreichbar | PASS | `/impressum` und `/datenschutz` liefern `200`, mit `<h1>` und Titel (Inhalt nicht bewertet) |
|
||||
| Links auf jeder öffentlichen Seite | PASS | Footer-Navigation `aria-label="Rechtliches"` ist Teil des gemeinsamen Layouts; gerendert aus dem Menü „footer“. Hinweis: Wird das Menü im CMS geleert, verschwinden die Links. Betreiber-Hinweis, kein Code-Befund |
|
||||
| Mobil | PASS (Code) / UNKNOWN (Gerät) | Footer-Links sind nicht ausgeblendet; die mobile feste Buchungsleiste (`z-30`) verdeckt keine Footer-Links dank 5-rem-Abstandhalter. Echtgerätetest offen |
|
||||
| Datenschutzhinweis am Formular | **BLOCKER** (#2) | Nur Text, kein Link |
|
||||
| Ohne JavaScript | IMPROVE (#9) | Seiten, Navigation, Legal-Links, Kontaktdaten (`mailto:`/`tel:`) funktionieren ohne JS. Das **Anfrageformular und der Kalender sind vollständig Livewire** und ohne JS nicht nutzbar, es gibt keinen `<noscript>`-Hinweis. Praktikable Korrektur: `<noscript>` mit Telefon/E-Mail der Betreiber. Eine Neuimplementierung als klassisches Formular ist für den MVP nicht angemessen |
|
||||
| Sichere Ausgabe | PASS | siehe C |
|
||||
|
||||
---
|
||||
|
||||
## E. Funktionsfähigkeit und Domainwechsel
|
||||
|
||||
| Prüfpunkt | Stufe | Befund |
|
||||
|---|---|---|
|
||||
| Anfrageformular (Logik) | PASS (Code/Tests) | Validierung, Preisberechnung, Bot-Schutz, Hold-Mechanik vorhanden; Pipeline führt die Feature-Suite vor jedem Deploy aus (laut `docs/STATUS.md` grün) |
|
||||
| E-Mail-Zustellung | **BLOCKER** (#3) | Staging `MAIL_MAILER=log`, nie real zugestellt |
|
||||
| Kalender / iCal-Sync | PASS (Staging) | Automatischer Import alle 5 Min. per n8n laut `docs/STATUS.md` nachgewiesen (zuletzt 28./29.10.2026); Feed-Token-Schutz geprüft; Portal-Verbindung 5 ist bewusst auf „Import aus“. **UNKNOWN:** Live-Schaltung der Kanäle auf Produktion; Fremd-Feeds ohne `DTSTAMP` sind abgedeckt |
|
||||
| Fehlerseiten | IMPROVE (#6) | 404 ist die englische Laravel-Standardseite (`lang="en"`, „Not Found“). Es gibt keine `resources/views/errors/`. Gäste sehen auf einer deutschen Seite englischen Text ohne Navigation. Korrektur: `404`, `419`, `429`, `500`, `503` als schlichte deutsche Seiten mit Link zur Startseite |
|
||||
| Canonical | PASS | `<link rel="canonical">` auf die aktuelle URL, mit `URL::forceRootUrl(APP_URL)` also immer auf der Hauptdomain |
|
||||
| Indexierung des Testauftritts | PASS | `<meta name="robots" content="noindex">` auf Staging (alles außer `APP_ENV=production`); `robots.txt` sperrt Admin, Livewire, Automation, Angebote |
|
||||
| Doppelte Hosts auf Staging | IMPROVE | `www.stommer.info` und `stommer.info` liefern beide `200`. Auf Produktion eine Variante festlegen und die andere mit `301` umleiten (sonst zwei erreichbare Hosts). Canonical verhindert Dubletten nur teilweise |
|
||||
| Weiterleitungen alter URLs (#5) | IMPROVE | `www.fewo-stommer.de` ist heute noch WordPress (`200`). Beim Umschalten fallen alte WordPress-URLs auf `404`. Vor dem Wechsel Liste der bekannten alten Adressen sammeln und per `.htaccess` `301` auf die neuen Seiten umleiten |
|
||||
| Interner Pfad in Redirect (#10) | IMPROVE | Ein Pfad mit Slash am Ende (`/storage/app/private/backups/`) wird per `301` auf `/releases/<id>/public/…` umgeleitet und endet in `403`. Es werden nur Release-ID und Ordnerstruktur offengelegt, kein Inhalt. Beheben, wenn sich in `public/.htaccess` ohnehin etwas ändert |
|
||||
| Sitemap | PASS | `/sitemap.xml` `200`, enthält nur veröffentlichte Seiten |
|
||||
| Produktionskonfiguration | **BLOCKER** (#3) | siehe oben |
|
||||
|
||||
---
|
||||
|
||||
## Trennung: gesetzlich relevant vs. technische Empfehlung
|
||||
|
||||
**Gesetzlich relevante Anforderungen (Betreiber/Recht bewertet, technische Umsetzung hier):**
|
||||
- Verschlüsselte Übertragung personenbezogener Daten (Art. 32 DSGVO) → BLOCKER #1
|
||||
- Datenschutzinformation bei der Datenerhebung erreichbar (Art. 13 DSGVO) → BLOCKER #2
|
||||
- Impressum/Datenschutz leicht erreichbar (DDG § 5) → PASS (technisch)
|
||||
- Notwendigkeit einer Einwilligung für Cookies (§ 25 TDDDG) → nach Befund keine Einwilligung nötig, Einordnung beim Betreiber
|
||||
- Wiederherstellbarkeit / Verfügbarkeit (Art. 32 DSGVO) → BLOCKER #4
|
||||
- Barrierefreiheit (BFSG): Anwendbarkeit/Kleinstunternehmensausnahme entscheidet der Betreiber
|
||||
|
||||
**Technische Empfehlungen (keine gesetzliche Pflicht festgestellt):** BLOCKER #3 (Betriebsfähigkeit), alle IMPROVE-Punkte, CSP, Weiterleitungen, Fehlerseiten.
|
||||
|
||||
---
|
||||
|
||||
## Vorgeschlagener Umfang für Phase 2 (nach Freigabe)
|
||||
|
||||
1. **Code (klein):** Datenschutz-Link am Formular (#2). Optional zugleich #6 (deutsche Fehlerseiten), #7 (Formularfehler barrierefrei) und #9 (`<noscript>`), wenn gewünscht.
|
||||
2. **Konfiguration (durch Betreiber/Technik, Freigabe nötig):** HTTPS-Weiterleitung (#1), Produktions-`.env`, SMTP, Datenbank, Domainzuordnung (#3).
|
||||
3. **Nachweis:** Restore-Test in Wegwerf-Datenbank (#4), Test-Anfrage inkl. Mailempfang, 5-Minuten-Browser-Cookiecheck, Handtest Tastatur/NVDA.
|
||||
4. **Phase 3:** Feature-Tests für Datenschutz-Link und Fehlerseiten, vollständige Suite, `vendor/bin/pint --dirty`, danach GO/NO-GO.
|
||||
|
||||
**Keine Änderungen, Migrationen, CMS-Anpassungen oder Deployments erfolgen ohne ausdrückliche Freigabe.**
|
||||
@@ -4,8 +4,11 @@
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Availability\CalendarClearance;
|
||||
use App\Documents\DocumentComposer;
|
||||
use App\Documents\DocumentFinding;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\OfferMode;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Pricing\QuoteException;
|
||||
@@ -18,7 +21,8 @@
|
||||
*
|
||||
* Rules: pre-reservation active (the dates are really blocked), guest e-mail known, dates still free, contract
|
||||
* texts released by the landlord (not the sample text; skipped while mails only go to the test recipient),
|
||||
* and the calendar clearance of {@see CalendarClearance} (fresh imports, instant-booking portals fetched our feed).
|
||||
* the calendar clearance of {@see CalendarClearance} (fresh imports, instant-booking portals fetched our feed) and an
|
||||
* offer composition without anything to confirm ({@see DocumentComposer}: template released, contract data complete).
|
||||
*/
|
||||
class AutoOffer
|
||||
{
|
||||
@@ -30,7 +34,7 @@ public function __construct(
|
||||
|
||||
public function applies(Booking $booking): bool
|
||||
{
|
||||
return $booking->property->offer_mode === OfferMode::Automatic;
|
||||
return $booking->processingMode() === ProcessingMode::Automatic;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -41,8 +45,8 @@ public function blockers(Booking $booking): array
|
||||
$property = $booking->property;
|
||||
$reasons = [];
|
||||
|
||||
if (! $property->pre_reservation_enabled) {
|
||||
$reasons[] = 'Die Vorreservierung ist für diese Wohnung ausgeschaltet; ohne Sperre im Kalender wird kein Angebot automatisch erteilt.';
|
||||
if (! $booking->process()->preReservation()) {
|
||||
$reasons[] = 'Anfragen reservieren den Zeitraum nicht (Einstellung „Vorreservierung“); ohne Sperre im Kalender wird kein Angebot automatisch erteilt.';
|
||||
}
|
||||
if ($booking->status !== BookingStatus::Reserved || ! $booking->isHoldActive()) {
|
||||
$reasons[] = 'Die Anfrage ist nicht mehr vorgemerkt (Frist abgelaufen oder bereits bearbeitet).';
|
||||
@@ -57,6 +61,9 @@ public function blockers(Booking $booking): array
|
||||
$reasons[] = 'Mietbedingungen, Stornobedingungen oder Bankverbindung sind noch nicht vom Betreiber freigegeben (leer oder Mustertext).';
|
||||
}
|
||||
|
||||
// Status, e-mail, dates and the missing reservation are checked above; the composition adds what concerns the document.
|
||||
$reasons = [...$reasons, ...app(DocumentComposer::class)->compose($booking, DocumentKind::Offer)->toConfirm(except: [DocumentFinding::HOLD_ZERO])];
|
||||
|
||||
return [...$reasons, ...$this->clearance->reasons($property, $booking->created_at)];
|
||||
}
|
||||
|
||||
@@ -69,7 +76,7 @@ public function handle(Booking $booking): array
|
||||
{
|
||||
$booking->loadMissing(['property', 'guest']);
|
||||
|
||||
if ($booking->property->pre_reservation_enabled) {
|
||||
if ($booking->process()->preReservation()) {
|
||||
$this->clearance->refresh($booking->property);
|
||||
}
|
||||
|
||||
@@ -79,7 +86,7 @@ public function handle(Booking $booking): array
|
||||
}
|
||||
|
||||
try {
|
||||
$this->sendOffer->handle($booking->fresh());
|
||||
$this->sendOffer->handle($booking->fresh(), ['expected_version' => 0]);
|
||||
} catch (QuoteException|ReservationException $exception) {
|
||||
// A mail failure keeps the saved offer (SendOffer reports it in the inbox); the landlord can resend the link.
|
||||
return [$exception->getMessage()];
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\BookingTaskKind;
|
||||
use App\Enums\BookingTaskStatus;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Mail\BookingCancelled;
|
||||
use App\Mail\CancellationRequested;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingTask;
|
||||
use App\Process\CaseLog;
|
||||
use App\Support\CancellationCost;
|
||||
use App\Support\Money;
|
||||
use App\Support\Settings;
|
||||
@@ -19,36 +21,53 @@
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* The landlord cancels a binding booking. The dates are free again; the guest and the landlord are informed by mail
|
||||
* (the guest mail can be switched off, e.g. when the guest cancelled by phone and was told already) and a task for
|
||||
* the cancellation costs is created. Open cancellation requests of the guest are completed.
|
||||
* The one way to cancel a binding booking (package 5). Own bookings: the dates are free again; the guest and the
|
||||
* landlord are informed by e-mail – the guest's e-mail can be switched off, e.g. when the guest cancelled by phone –, the
|
||||
* cancellation is recorded with who initiated it, why and who entered it, a task for the cancellation costs and – when
|
||||
* the guest paid us more than the costs – a refund task are created. Open cancellation requests of the guest are done.
|
||||
*
|
||||
* Bookings binding on a portal (A3–A5) are cancelled where the contract was made: here the cancellation is only
|
||||
* requested (task "Stornierung im Portal veranlassen bzw. prüfen", the dates stay occupied) until somebody confirms that
|
||||
* it is effective on the portal ({@see confirmOnPortal()}) – nothing is released silently.
|
||||
*/
|
||||
class CancelBooking
|
||||
{
|
||||
public const INITIATORS = ['guest' => 'vom Gast', 'landlord' => 'vom Vermieter', 'portal' => 'über das Portal'];
|
||||
|
||||
/**
|
||||
* @return bool whether the guest has been informed (true as well when no mail was wanted; false when it failed)
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Booking $booking, bool $notifyGuest = true, bool $costsTask = true, string $by = 'Verwaltung'): bool
|
||||
public function handle(Booking $booking, bool $notifyGuest = true, bool $costsTask = true, string $by = 'Verwaltung', string $initiatedBy = 'landlord', ?string $reason = null, bool $confirmedOnPortal = false): bool
|
||||
{
|
||||
if ($booking->caseType()->isExternallyBinding() && ! $confirmedOnPortal) {
|
||||
$this->requestOnPortal($booking, $by, $initiatedBy, $reason);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if ($notifyGuest && blank($booking->guest?->email)) {
|
||||
throw new ReservationException('Der Gast hat keine E-Mail-Adresse – bitte ohne Mail an den Gast stornieren oder die Adresse ergänzen.');
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($booking, $costsTask, $by): void {
|
||||
DB::transaction(function () use ($booking, $costsTask, $by, $initiatedBy, $reason): void {
|
||||
$booking->lockForTransition();
|
||||
|
||||
if (! in_array($booking->status, BookingStatus::occupying(), true)) {
|
||||
throw ReservationException::invalidTransition($booking->status->getLabel(), 'storniert');
|
||||
}
|
||||
|
||||
$booking->update(['status' => BookingStatus::Cancelled, 'cancelled_at' => now()]);
|
||||
app(RecordCancellation::class)->handle($booking, 'landlord');
|
||||
$booking->update(['status' => BookingStatus::Cancelled, 'cancelled_at' => now(), 'portal_cancellation_requested_at' => null]);
|
||||
app(RecordCancellation::class)->handle($booking, $initiatedBy)->update(['reason' => $reason, 'recorded_by' => $by]);
|
||||
|
||||
BookingTask::query()->where('booking_id', $booking->id)->where('kind', BookingTaskKind::CancellationRequest)->where('status', BookingTaskStatus::Open)
|
||||
BookingTask::query()->where('booking_id', $booking->id)
|
||||
->whereIn('kind', [BookingTaskKind::CancellationRequest, BookingTaskKind::PortalCancellation, BookingTaskKind::PortalCancellationReported])
|
||||
->where('status', BookingTaskStatus::Open)
|
||||
->update(['status' => BookingTaskStatus::Done, 'completed_by' => $by, 'completed_at' => now()]);
|
||||
|
||||
$this->refundTask($booking);
|
||||
|
||||
if ($costsTask) {
|
||||
$cost = CancellationCost::calculate($booking);
|
||||
BookingTask::query()->firstOrCreate(['booking_id' => $booking->id, 'kind' => BookingTaskKind::CancellationFee], [
|
||||
@@ -64,6 +83,60 @@ public function handle(Booking $booking, bool $notifyGuest = true, bool $costsTa
|
||||
return $this->notify($booking, $notifyGuest);
|
||||
}
|
||||
|
||||
/**
|
||||
* A booking binding on a portal was cancelled there (the landlord saw it on the portal, or the portal reported it):
|
||||
* now the case is cancelled as well. The portal informs the guest; costs are a task only when we collect the money.
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function confirmOnPortal(Booking $booking, string $by, string $initiatedBy = 'portal', ?string $reason = null): bool
|
||||
{
|
||||
return $this->handle($booking, notifyGuest: false, costsTask: $booking->process()->payments() === Responsibility::Landlord, by: $by, initiatedBy: $initiatedBy, reason: $reason, confirmedOnPortal: true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws ReservationException
|
||||
*/
|
||||
private function requestOnPortal(Booking $booking, string $by, string $initiatedBy, ?string $reason): void
|
||||
{
|
||||
DB::transaction(function () use ($booking, $by, $initiatedBy, $reason): void {
|
||||
$booking->lockForTransition();
|
||||
if (! in_array($booking->status, BookingStatus::occupying(), true)) {
|
||||
throw ReservationException::invalidTransition($booking->status->getLabel(), 'storniert');
|
||||
}
|
||||
|
||||
$portal = $booking->processChannel()?->name ?? 'Portal';
|
||||
$booking->update(['portal_cancellation_requested_at' => now()]);
|
||||
BookingTask::query()->updateOrCreate(['booking_id' => $booking->id, 'kind' => BookingTaskKind::PortalCancellation], [
|
||||
'tenant_id' => $booking->tenant_id, 'status' => BookingTaskStatus::Open, 'due_on' => today(), 'completed_by' => null, 'completed_at' => null,
|
||||
'note' => 'Stornierung im Portal „'.$portal.'“ veranlassen und prüfen, ob sie dort wirksam ist. Erst dann „Stornierung bestätigen“ – bis dahin bleibt der Zeitraum belegt.',
|
||||
]);
|
||||
CaseLog::record($booking, 'status', 'Stornierung beim Portal '.$portal.' veranlasst ('.(self::INITIATORS[$initiatedBy] ?? $initiatedBy).') – der Vorgang bleibt gebucht, bis sie bestätigt ist', $reason, actor: $by);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* When the guest paid us more than the cancellation costs, the difference is a refund to check.
|
||||
*/
|
||||
private function refundTask(Booking $booking): void
|
||||
{
|
||||
if ($booking->process()->payments() !== Responsibility::Landlord || $booking->paidToUs() <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$cost = CancellationCost::calculate($booking);
|
||||
$fee = $cost['fee'] ?? null;
|
||||
$paid = $booking->paidToUs();
|
||||
if ($fee !== null && $paid <= $fee) {
|
||||
return;
|
||||
}
|
||||
|
||||
BookingTask::query()->updateOrCreate(['booking_id' => $booking->id, 'kind' => BookingTaskKind::RefundCheck], [
|
||||
'tenant_id' => $booking->tenant_id, 'status' => BookingTaskStatus::Open, 'due_on' => today(), 'completed_by' => null, 'completed_at' => null,
|
||||
'note' => 'Bezahlt: '.Money::format($paid).($fee !== null ? ' · Stornokosten laut Regel: '.Money::format($fee).' · zu erstatten: '.Money::format($paid - $fee) : ' · Stornokosten von Hand festlegen, den Rest erstatten').'. Erstattung als Zahlung „Erstattung an den Gast“ erfassen.',
|
||||
]);
|
||||
}
|
||||
|
||||
private function notify(Booking $booking, bool $notifyGuest): bool
|
||||
{
|
||||
$informed = true;
|
||||
|
||||
@@ -0,0 +1,480 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\BookingTaskKind;
|
||||
use App\Enums\BookingTaskStatus;
|
||||
use App\Enums\ChangeBasis;
|
||||
use App\Enums\ChangeStatus;
|
||||
use App\Enums\QuoteLineType;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Mail\BookingChanged;
|
||||
use App\Mail\ChangeProposed;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingChange;
|
||||
use App\Models\BookingTask;
|
||||
use App\Models\Channel;
|
||||
use App\Pricing\PortalPrice;
|
||||
use App\Pricing\PriceCalculator;
|
||||
use App\Pricing\PriceQuote;
|
||||
use App\Pricing\PrivateStayPrice;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Pricing\QuoteLine;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Process\CaseLog;
|
||||
use App\Support\Money;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* Changes a booking after it became binding (package 5, UMSETZUNGSPLAN §4.6): dates, length of stay, number of guests,
|
||||
* services and price. Before anything changes the consequences are put together – calendar and portals, price and its
|
||||
* origin, payment plan, refund or additional payment, confirmation – and the person confirms them.
|
||||
*
|
||||
* Two ways, kept strictly apart:
|
||||
* - **agreed**: the change was already agreed with the guest (phone, e-mail, in person, on the portal); it takes effect
|
||||
* at once and the case keeps who asked, why, from when and on which basis. An updated confirmation only informs the
|
||||
* guest – it is not taken as the guest's consent.
|
||||
* - **proposed**: the guest still has to agree; nothing changes until the guest accepts through the signed link.
|
||||
*
|
||||
* Own bookings get their price recalculated (kept adjustments, or an agreed price); bookings binding on a portal take the
|
||||
* portal's new total; internal cases (A6) keep their agreed rent and recalculate services and tourist tax.
|
||||
*/
|
||||
class ChangeBooking
|
||||
{
|
||||
public const REQUESTED_BY = ['guest', 'landlord', 'portal'];
|
||||
|
||||
public function __construct(
|
||||
private PriceCalculator $calculator,
|
||||
private PrivateStayPrice $privateStay,
|
||||
private AvailabilityChecker $availability,
|
||||
private PortalPrice $portalPrice,
|
||||
private RecordPayment $payments,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* The consequences of a change, without changing anything.
|
||||
*
|
||||
* @param array{arrival?: ?string, departure?: ?string, guests?: ?int, extras?: ?array<int, int>, portal_total?: ?int, agreed_total?: ?int, agreed_total_label?: ?string, rent?: ?int, tourist_tax_persons?: ?int} $changes
|
||||
* @return array{errors: list<string>, before: array<string, mixed>, after: array<string, mixed>, summary: list<string>, calendar: list<string>, portals: list<string>, price: array{before: ?int, after: ?int, difference: ?int, source: string}, payment: list<string>, refund: int, confirmation: bool}
|
||||
*/
|
||||
public function preview(Booking $booking, array $changes): array
|
||||
{
|
||||
$booking->loadMissing(['property', 'payments', 'guest']);
|
||||
$errors = [];
|
||||
$before = self::snapshot($booking);
|
||||
|
||||
$arrival = CarbonImmutable::parse($changes['arrival'] ?? $booking->arrival);
|
||||
$departure = CarbonImmutable::parse($changes['departure'] ?? $booking->departure);
|
||||
$guests = array_key_exists('guests', $changes) && filled($changes['guests']) ? (int) $changes['guests'] : $booking->guests;
|
||||
$extras = array_key_exists('extras', $changes) && is_array($changes['extras']) ? array_filter(array_map('intval', $changes['extras'])) : (array) ($booking->extras ?? []);
|
||||
|
||||
if ($departure->lessThanOrEqualTo($arrival)) {
|
||||
$errors[] = 'Die Abreise muss nach der Anreise liegen.';
|
||||
} elseif (! $this->availability->isAvailable($booking->property, $arrival, $departure, ignore: $booking)) {
|
||||
$errors[] = 'Der neue Zeitraum ist nicht frei.';
|
||||
}
|
||||
if ($guests !== null && $guests > $booking->property->max_guests) {
|
||||
$errors[] = 'Höchstens '.$booking->property->max_guests.' Personen.';
|
||||
}
|
||||
|
||||
[$quote, $source, $priceError] = $departure->greaterThan($arrival) ? $this->price($booking, $changes, $arrival, $departure, $guests, $extras) : [null, '–', null];
|
||||
if ($priceError !== null) {
|
||||
$errors[] = $priceError;
|
||||
}
|
||||
|
||||
$paid = $booking->paidAmount();
|
||||
$total = $quote !== null ? $quote['total'] : $booking->total;
|
||||
$depositPaid = $booking->deposit !== null && $paid >= $booking->deposit && $paid > 0;
|
||||
$deposit = $quote === null ? $booking->deposit : ($depositPaid ? $booking->deposit : ($quote['deposit'] ?? $booking->deposit));
|
||||
$after = [
|
||||
'arrival' => $arrival->toDateString(), 'departure' => $departure->toDateString(), 'guests' => $guests, 'extras' => $extras,
|
||||
'quote' => $quote['quote'] ?? $booking->quote, 'total' => $total, 'deposit' => $deposit,
|
||||
'balance_due_on' => $quote['balance_due_on'] ?? $booking->balance_due_on?->toDateString(),
|
||||
'rent' => $changes['rent'] ?? null, 'tourist_tax_persons' => array_key_exists('tourist_tax_persons', $changes) ? $changes['tourist_tax_persons'] : $booking->tourist_tax_persons,
|
||||
];
|
||||
|
||||
[$calendar, $portals] = $this->calendarConsequences($booking, $arrival, $departure);
|
||||
$difference = $total !== null && $booking->total !== null ? $total - $booking->total : null;
|
||||
$refund = $total !== null ? max(0, $paid - $total) : 0;
|
||||
$payment = array_values(array_filter([
|
||||
$booking->wantsPaymentTasks() || ($total !== null && $total > 0 && $booking->process()->payments()->value === 'landlord' && ! $booking->isInternal()) ? 'Bezahlt bisher: '.Money::format($paid).' · danach offen: '.Money::format(max(0, (int) $total - $paid)) : null,
|
||||
$refund > 0 ? 'Der Gast hat mehr bezahlt als der neue Preis: '.Money::format($refund).' zu erstatten (Aufgabe wird angelegt).' : null,
|
||||
$depositPaid ? 'Die Anzahlung ist bezahlt und bleibt unverändert.' : null,
|
||||
$after['balance_due_on'] !== ($booking->balance_due_on?->toDateString()) && $after['balance_due_on'] !== null && ! $booking->isInternal() ? 'Restzahlung neu fällig am '.CarbonImmutable::parse($after['balance_due_on'])->format('d.m.Y').'.' : null,
|
||||
$booking->process()->payments()->value === 'portal' ? 'Die Zahlung läuft weiter über das Portal.' : null,
|
||||
]));
|
||||
|
||||
return [
|
||||
'errors' => $errors,
|
||||
'before' => $before,
|
||||
'after' => $after,
|
||||
'summary' => self::summary($before, $after),
|
||||
'calendar' => $calendar,
|
||||
'portals' => $portals,
|
||||
'price' => ['before' => $booking->total, 'after' => $total, 'difference' => $difference, 'source' => $source],
|
||||
'payment' => $payment,
|
||||
'refund' => $refund,
|
||||
'confirmation' => ! $booking->isInternal() && filled($booking->guest?->email),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* An agreed change (or a change of an internal case): takes effect at once.
|
||||
*
|
||||
* @param array<string, mixed> $changes
|
||||
* @param array{requested_by: string, reason: string, basis: ChangeBasis, agreed_at?: ?string, effective_on?: ?string, send_confirmation?: bool} $meta
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function apply(Booking $booking, array $changes, array $meta, ?string $by = null): BookingChange
|
||||
{
|
||||
$this->guard($booking);
|
||||
if ($meta['basis'] === ChangeBasis::GuestLink) {
|
||||
throw new ReservationException('Eine Zustimmung über den Link entsteht nur, wenn der Gast selbst annimmt.');
|
||||
}
|
||||
|
||||
$change = DB::transaction(function () use ($booking, $changes, $meta, $by): BookingChange {
|
||||
$booking->lockForTransition();
|
||||
$preview = $this->preview($booking, $changes);
|
||||
if ($preview['errors'] !== []) {
|
||||
throw new ReservationException(implode(' ', $preview['errors']));
|
||||
}
|
||||
|
||||
$change = $booking->changes()->create([
|
||||
'status' => ChangeStatus::Applied, 'requested_by' => $meta['requested_by'], 'basis' => $meta['basis'],
|
||||
'reason' => trim((string) $meta['reason']), 'effective_on' => $meta['effective_on'] ?? today()->toDateString(),
|
||||
'agreed_at' => $meta['basis'] === ChangeBasis::NotNeeded ? null : ($meta['agreed_at'] ?? now()),
|
||||
'agreed_by' => $meta['basis'] === ChangeBasis::NotNeeded ? null : ($booking->guest?->full_name ?? 'Gast'),
|
||||
'before' => $preview['before'], 'after' => $preview['after'], 'consequences' => self::consequences($preview),
|
||||
'applied_at' => now(), 'recorded_by' => $by,
|
||||
]);
|
||||
$change->tenant_id = $booking->tenant_id;
|
||||
$change->save();
|
||||
|
||||
$this->write($booking, $preview, $meta['reason'], $by, $change);
|
||||
|
||||
return $change;
|
||||
});
|
||||
|
||||
if ($meta['send_confirmation'] ?? false) {
|
||||
$this->confirm($booking->fresh(), $change);
|
||||
}
|
||||
|
||||
return $change->fresh();
|
||||
}
|
||||
|
||||
/**
|
||||
* A change the guest still has to agree to: nothing changes; the guest gets a link to accept or decline.
|
||||
*
|
||||
* @param array<string, mixed> $changes
|
||||
* @param array{requested_by: string, reason: string, effective_on?: ?string, valid_days?: int} $meta
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function propose(Booking $booking, array $changes, array $meta, ?string $by = null): BookingChange
|
||||
{
|
||||
$this->guard($booking);
|
||||
if ($booking->isInternal() || $booking->caseType()->isExternallyBinding()) {
|
||||
throw new ReservationException('Ein Vorschlag mit Zustimmungslink ist nur für eigene Buchungen möglich – Portalbuchungen werden im Portal geändert.');
|
||||
}
|
||||
if (blank($booking->guest?->email)) {
|
||||
throw new ReservationException('Für einen Vorschlag wird die E-Mail-Adresse des Gastes benötigt.');
|
||||
}
|
||||
if ($booking->changes()->where('status', ChangeStatus::Proposed)->exists()) {
|
||||
throw new ReservationException('Es liegt schon ein Änderungsvorschlag beim Gast. Bitte zuerst zurückziehen.');
|
||||
}
|
||||
|
||||
$preview = $this->preview($booking, $changes);
|
||||
if ($preview['errors'] !== []) {
|
||||
throw new ReservationException(implode(' ', $preview['errors']));
|
||||
}
|
||||
|
||||
$change = $booking->changes()->create([
|
||||
'status' => ChangeStatus::Proposed, 'requested_by' => $meta['requested_by'], 'reason' => trim((string) $meta['reason']),
|
||||
'effective_on' => $meta['effective_on'] ?? null, 'before' => $preview['before'], 'after' => $preview['after'],
|
||||
'consequences' => self::consequences($preview), 'expires_at' => now()->addDays((int) ($meta['valid_days'] ?? 7)), 'recorded_by' => $by,
|
||||
]);
|
||||
$change->tenant_id = $booking->tenant_id;
|
||||
$change->save();
|
||||
CaseLog::record($booking, 'change', 'Änderung dem Gast vorgeschlagen: '.implode(' · ', $preview['summary']), $meta['reason'], data: ['booking_change_id' => $change->id]);
|
||||
|
||||
try {
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ChangeProposed($booking, $change, $this->link($change)));
|
||||
} catch (Throwable $exception) {
|
||||
Log::warning('Änderungsvorschlag nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
|
||||
throw new ReservationException('Der Vorschlag ist gespeichert, aber die E-Mail konnte nicht versendet werden.');
|
||||
}
|
||||
|
||||
return $change;
|
||||
}
|
||||
|
||||
/**
|
||||
* The guest accepts a proposed change through the signed link: the dates are checked again, then it takes effect.
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function accept(BookingChange $change, ?string $ip = null): BookingChange
|
||||
{
|
||||
return DB::transaction(function () use ($change, $ip): BookingChange {
|
||||
$booking = $change->booking;
|
||||
$booking->lockForTransition();
|
||||
$change = BookingChange::query()->whereKey($change->id)->lockForUpdate()->firstOrFail();
|
||||
if ($change->status !== ChangeStatus::Proposed) {
|
||||
throw new ReservationException('Dieser Vorschlag ist nicht mehr offen.');
|
||||
}
|
||||
if ($change->expires_at !== null && $change->expires_at->isPast()) {
|
||||
$change->update(['status' => ChangeStatus::Expired]);
|
||||
throw new ReservationException('Dieser Vorschlag ist abgelaufen. Bitte melden Sie sich bei uns.');
|
||||
}
|
||||
|
||||
$after = (array) $change->after;
|
||||
$preview = $this->preview($booking, [...$after, 'agreed_total' => $after['total'] ?? null, 'portal_total' => null]);
|
||||
if ($preview['errors'] !== []) {
|
||||
throw new ReservationException('Die Änderung ist leider nicht mehr möglich: '.implode(' ', $preview['errors']));
|
||||
}
|
||||
|
||||
$change->update(['status' => ChangeStatus::Applied, 'basis' => ChangeBasis::GuestLink, 'agreed_at' => now(), 'agreed_by' => $booking->guest?->full_name,
|
||||
'decided_at' => now(), 'decision_ip_hash' => $ip ? hash('sha256', $ip) : null, 'applied_at' => now()]);
|
||||
CaseLog::context(fn () => $this->write($booking, $preview, (string) $change->reason, CaseLog::GUEST, $change), actor: CaseLog::GUEST);
|
||||
|
||||
return $change->fresh();
|
||||
});
|
||||
}
|
||||
|
||||
public function decline(BookingChange $change, ?string $ip = null): void
|
||||
{
|
||||
if ($change->status !== ChangeStatus::Proposed) {
|
||||
return;
|
||||
}
|
||||
|
||||
$change->update(['status' => ChangeStatus::Declined, 'decided_at' => now(), 'decision_ip_hash' => $ip ? hash('sha256', $ip) : null]);
|
||||
CaseLog::record($change->booking, 'change', 'Änderungsvorschlag vom Gast abgelehnt', actor: CaseLog::GUEST, data: ['booking_change_id' => $change->id]);
|
||||
}
|
||||
|
||||
public function withdraw(BookingChange $change, ?string $by = null): void
|
||||
{
|
||||
if ($change->status === ChangeStatus::Proposed) {
|
||||
$change->update(['status' => ChangeStatus::Withdrawn, 'decided_at' => now()]);
|
||||
CaseLog::record($change->booking, 'change', 'Änderungsvorschlag zurückgezogen', actor: $by);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The guest's signed link to a proposed change (valid while the proposal is).
|
||||
*/
|
||||
public function link(BookingChange $change): string
|
||||
{
|
||||
$until = $change->expires_at ?? now()->addDays(7);
|
||||
|
||||
return $change->booking->website()?->temporarySignedRoute('changes.show', $until, ['change' => $change])
|
||||
?? URL::temporarySignedRoute('changes.show', $until, ['change' => $change]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends the updated confirmation of an agreed change (information, not consent).
|
||||
*/
|
||||
public function confirm(Booking $booking, BookingChange $change): bool
|
||||
{
|
||||
if ($booking->isInternal() || blank($booking->guest?->email)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new BookingChanged($booking, $change));
|
||||
$change->update(['confirmation_sent_at' => now()]);
|
||||
|
||||
return true;
|
||||
} catch (Throwable $exception) {
|
||||
Log::warning('Änderungsbestätigung nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws ReservationException
|
||||
*/
|
||||
private function guard(Booking $booking): void
|
||||
{
|
||||
if (! in_array($booking->status, BookingStatus::occupying(), true)) {
|
||||
throw new ReservationException('Ändern lässt sich nur eine bestehende Buchung oder Belegung. Ein Angebot wird über „Angebot ändern & neu senden“ geändert.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes the new state on the case (inside the transaction of the caller).
|
||||
*
|
||||
* @param array<string, mixed> $preview
|
||||
*/
|
||||
private function write(Booking $booking, array $preview, string $reason, ?string $by, BookingChange $change): void
|
||||
{
|
||||
$after = $preview['after'];
|
||||
$booking->update([
|
||||
'arrival' => $after['arrival'], 'departure' => $after['departure'], 'guests' => $after['guests'], 'extras' => $after['extras'],
|
||||
'quote' => $after['quote'], 'total' => $after['total'], 'deposit' => $after['deposit'], 'balance_due_on' => $after['balance_due_on'],
|
||||
'tourist_tax_persons' => $after['tourist_tax_persons'],
|
||||
]);
|
||||
CaseLog::record($booking, 'change', 'Geändert: '.implode(' · ', $preview['summary']), $reason, data: ['booking_change_id' => $change->id], actor: $by);
|
||||
$this->payments->updateStatus($booking->fresh());
|
||||
|
||||
if ($preview['refund'] > 0) {
|
||||
BookingTask::query()->updateOrCreate(['booking_id' => $booking->id, 'kind' => BookingTaskKind::RefundCheck], [
|
||||
'tenant_id' => $booking->tenant_id, 'status' => BookingTaskStatus::Open, 'due_on' => today(),
|
||||
'note' => 'Nach der Änderung zu viel bezahlt: '.Money::format($preview['refund']).' an den Gast erstatten (als „Erstattung“ erfassen).',
|
||||
'completed_by' => null, 'completed_at' => null,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The new price and where it comes from.
|
||||
*
|
||||
* @param array<string, mixed> $changes
|
||||
* @param array<int, int> $extras
|
||||
* @return array{0: ?array{quote: array<string, mixed>, total: int, deposit: ?int, balance_due_on: ?string}, 1: string, 2: ?string}
|
||||
*/
|
||||
private function price(Booking $booking, array $changes, CarbonImmutable $arrival, CarbonImmutable $departure, ?int $guests, array $extras): array
|
||||
{
|
||||
if ($booking->isInternal()) {
|
||||
try {
|
||||
$rent = array_key_exists('rent', $changes) && $changes['rent'] !== null ? (int) $changes['rent'] : PrivateStayPrice::rentOf($booking->quote);
|
||||
$taxPersons = array_key_exists('tourist_tax_persons', $changes) ? ($changes['tourist_tax_persons'] === null ? null : (int) $changes['tourist_tax_persons']) : $booking->tourist_tax_persons;
|
||||
$quote = $this->privateStay->quote($booking->property, $arrival, $departure, $guests, $extras, $rent, $taxPersons);
|
||||
|
||||
return [['quote' => $quote->toArray(), 'total' => $quote->total(), 'deposit' => null, 'balance_due_on' => null], 'vereinbart (Miete, Leistungen, Kurabgabe)', null];
|
||||
} catch (QuoteException $exception) {
|
||||
return [null, '–', $exception->getMessage()];
|
||||
}
|
||||
}
|
||||
|
||||
if ($booking->caseType()->isExternallyBinding() || ($booking->quote['source'] ?? null) === 'portal') {
|
||||
$total = filled($changes['portal_total'] ?? null) ? (int) $changes['portal_total'] : $booking->total;
|
||||
if ($total === null) {
|
||||
return [null, 'laut Portal – noch nicht bekannt', null];
|
||||
}
|
||||
$columns = $this->portalPrice->columns($booking->property, $arrival, $departure, $guests, $total, $booking->processChannel()?->name);
|
||||
|
||||
return [['quote' => $columns['quote'], 'total' => (int) $columns['total'], 'deposit' => $columns['deposit'], 'balance_due_on' => $columns['balance_due_on']],
|
||||
filled($changes['portal_total'] ?? null) ? 'neuer Gesamtpreis laut Portal' : 'Gesamtpreis laut Portal unverändert – bitte neuen Betrag eintragen, falls das Portal ihn geändert hat', null];
|
||||
}
|
||||
|
||||
$agreed = filled($changes['agreed_total'] ?? null) ? (int) $changes['agreed_total'] : null;
|
||||
try {
|
||||
$quote = $this->calculator->calculate($booking->property, new StayRequest($arrival, $departure, max(1, (int) $guests), $extras, $booking->promo_code));
|
||||
foreach ((array) ($booking->quote['lines'] ?? []) as $line) {
|
||||
if (($line['type'] ?? null) === QuoteLineType::Adjustment->value) {
|
||||
$quote = $quote->withLine(new QuoteLine(QuoteLineType::Adjustment, (string) $line['label'], 1, (int) $line['amount'], (int) $line['amount']));
|
||||
}
|
||||
}
|
||||
$source = 'aus Ihren Preisen neu berechnet';
|
||||
} catch (QuoteException $exception) {
|
||||
if ($agreed === null) {
|
||||
return [null, '–', 'Preis: '.$exception->getMessage().' Bitte einen vereinbarten Preis eintragen.'];
|
||||
}
|
||||
$quote = new PriceQuote($arrival, $departure, (int) $guests, [new QuoteLine(QuoteLineType::Accommodation, 'Vereinbarter Preis', 1, $agreed, $agreed)], $booking->property->deposit_percent, $arrival->subDays($booking->property->balance_due_days_before_arrival));
|
||||
$source = 'vereinbarter Preis';
|
||||
}
|
||||
|
||||
if ($agreed !== null && $agreed !== $quote->total()) {
|
||||
$label = trim((string) ($changes['agreed_total_label'] ?? '')) ?: 'Vereinbarte Preisanpassung';
|
||||
$quote = $quote->withLine(new QuoteLine(QuoteLineType::Adjustment, $label, 1, $agreed - $quote->total(), $agreed - $quote->total()));
|
||||
$source = 'vereinbarter Preis';
|
||||
}
|
||||
|
||||
return [['quote' => $quote->toArray(), 'total' => $quote->total(), 'deposit' => $quote->deposit(), 'balance_due_on' => $quote->balanceDueOn->toDateString()], $source, null];
|
||||
}
|
||||
|
||||
/**
|
||||
* What happens in the calendar and on the portals that are blocked by hand.
|
||||
*
|
||||
* @return array{0: list<string>, 1: list<string>}
|
||||
*/
|
||||
private function calendarConsequences(Booking $booking, CarbonImmutable $arrival, CarbonImmutable $departure): array
|
||||
{
|
||||
$oldStart = $booking->arrival;
|
||||
$oldEnd = $booking->departure;
|
||||
if ($arrival->equalTo($oldStart) && $departure->equalTo($oldEnd)) {
|
||||
return [['Kalender unverändert.'], []];
|
||||
}
|
||||
|
||||
$added = array_values(array_filter([
|
||||
$arrival->lessThan($oldStart) ? [$arrival, $oldStart->min($departure)] : null,
|
||||
$departure->greaterThan($oldEnd) ? [$oldEnd->max($arrival), $departure] : null,
|
||||
]));
|
||||
$freed = array_values(array_filter([
|
||||
$oldStart->lessThan($arrival) ? [$oldStart, $arrival->min($oldEnd)] : null,
|
||||
$oldEnd->greaterThan($departure) ? [$departure->max($oldStart), $oldEnd] : null,
|
||||
]));
|
||||
$range = fn (array $pair): string => $pair[0]->format('d.m.').'–'.$pair[1]->format('d.m.Y');
|
||||
|
||||
$calendar = [
|
||||
...array_map(fn (array $pair): string => 'Neu belegt: '.$range($pair), $added),
|
||||
...array_map(fn (array $pair): string => 'Wieder frei: '.$range($pair), $freed),
|
||||
'Die Kalender für die Portale zeigen den neuen Zeitraum beim nächsten Abruf.',
|
||||
];
|
||||
|
||||
$origin = $booking->origin_channel_id ?? $booking->import_channel_id;
|
||||
$portals = $booking->property->channels()->active()->where('requires_manual_blocking', true)->get()
|
||||
->filter(fn (Channel $channel): bool => $channel->exportsOccupations() && $channel->id !== $origin)
|
||||
->map(fn (Channel $channel): string => 'Aufgabe für '.$channel->name.': '.implode(', ', [...array_map(fn (array $pair): string => 'sperren '.$range($pair), $added), ...array_map(fn (array $pair): string => 'freigeben '.$range($pair), $freed)]))
|
||||
->values()->all();
|
||||
if ($booking->caseType()->isExternallyBinding()) {
|
||||
$portals[] = 'Die Änderung selbst muss im Portal „'.($booking->processChannel()?->name ?? 'Portal').'“ vorliegen – hier wird sie nur nachgetragen.';
|
||||
}
|
||||
|
||||
return [$calendar, $portals];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private static function snapshot(Booking $booking): array
|
||||
{
|
||||
return [
|
||||
'arrival' => $booking->arrival->toDateString(), 'departure' => $booking->departure->toDateString(), 'guests' => $booking->guests,
|
||||
'extras' => (array) ($booking->extras ?? []), 'quote' => $booking->quote, 'total' => $booking->total, 'deposit' => $booking->deposit,
|
||||
'balance_due_on' => $booking->balance_due_on?->toDateString(), 'tourist_tax_persons' => $booking->tourist_tax_persons,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $before
|
||||
* @param array<string, mixed> $after
|
||||
* @return list<string>
|
||||
*/
|
||||
private static function summary(array $before, array $after): array
|
||||
{
|
||||
$date = fn (?string $value): string => $value ? CarbonImmutable::parse($value)->format('d.m.Y') : '–';
|
||||
$lines = [];
|
||||
if ($before['arrival'] !== $after['arrival'] || $before['departure'] !== $after['departure']) {
|
||||
$lines[] = 'Zeitraum '.$date($before['arrival']).'–'.$date($before['departure']).' → '.$date($after['arrival']).'–'.$date($after['departure']);
|
||||
}
|
||||
if ($before['guests'] !== $after['guests']) {
|
||||
$lines[] = 'Personen '.($before['guests'] ?? '?').' → '.($after['guests'] ?? '?');
|
||||
}
|
||||
if ((array) $before['extras'] != (array) $after['extras']) {
|
||||
$lines[] = 'Zusatzleistungen geändert';
|
||||
}
|
||||
if ($before['total'] !== $after['total']) {
|
||||
$lines[] = 'Preis '.($before['total'] === null ? '–' : Money::format($before['total'])).' → '.($after['total'] === null ? '–' : Money::format($after['total']));
|
||||
}
|
||||
|
||||
return $lines === [] ? ['keine inhaltliche Änderung'] : $lines;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $preview
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private static function consequences(array $preview): array
|
||||
{
|
||||
return ['summary' => $preview['summary'], 'calendar' => $preview['calendar'], 'portals' => $preview['portals'], 'price' => $preview['price'], 'payment' => $preview['payment'], 'refund' => $preview['refund']];
|
||||
}
|
||||
}
|
||||
@@ -6,11 +6,15 @@
|
||||
use App\Documents\OfferTerms;
|
||||
use App\Documents\RentalContract;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\InboxMessageKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Filament\Resources\Bookings\BookingResource;
|
||||
use App\Mail\BookingConfirmed;
|
||||
use App\Mail\BookingDocumentation;
|
||||
use App\Mail\StayConfirmed;
|
||||
use App\Models\Booking;
|
||||
use App\Process\CaseLog;
|
||||
use App\Support\Inbox;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
@@ -84,25 +88,39 @@ public function bind(Booking $booking): void
|
||||
*
|
||||
* @return bool whether the guest has the confirmation (true when no mail was requested)
|
||||
*/
|
||||
public function deliver(Booking $booking, bool $notifyGuest = true): bool
|
||||
public function deliver(Booking $booking, bool $notifyGuest = true, ?DocumentKind $kind = null): bool
|
||||
{
|
||||
$booking->loadMissing(['guest', 'property']);
|
||||
$kind ??= DocumentKind::forCase($booking) ?? DocumentKind::Confirmation;
|
||||
|
||||
try {
|
||||
$this->contract->generate($booking);
|
||||
$created = $booking->contract_path === null;
|
||||
$this->contract->generate($booking, kind: $kind);
|
||||
if ($created) {
|
||||
CaseLog::record($booking, 'document', $kind->getLabel().' erstellt'.(isset($booking->offer_terms['template']['name']) ? ' (Vorlage '.$booking->offer_terms['template']['name'].', Version '.$booking->offer_terms['template']['version'].')' : ' (Texte der Webseite)'), data: [
|
||||
'kind' => $kind->value,
|
||||
'template' => $booking->offer_terms['template'] ?? null,
|
||||
'annexes' => array_map(fn (array $annex): string => $annex['name'].' (Version '.$annex['version'].')', (array) ($booking->offer_terms['annexes'] ?? [])),
|
||||
'pdf_sha256' => $booking->contract_pdf_sha256,
|
||||
]);
|
||||
}
|
||||
|
||||
if (! $notifyGuest) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new BookingConfirmed($booking));
|
||||
$booking->forceFill(['confirmation_sent_at' => now(), 'confirmation_failed_at' => null])->saveQuietly();
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(match ($kind) {
|
||||
DocumentKind::ExternalRecord => new BookingDocumentation($booking),
|
||||
DocumentKind::StayConfirmation => new StayConfirmed($booking),
|
||||
default => new BookingConfirmed($booking),
|
||||
});
|
||||
$booking->forceFill(['confirmation_sent_at' => now(), 'confirmation_failed_at' => null])->save();
|
||||
|
||||
return true;
|
||||
} catch (Throwable $exception) {
|
||||
// Only class and booking id are logged: mail errors can contain the recipient's address.
|
||||
Log::warning('Buchungsbestätigung nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
|
||||
$booking->forceFill(['confirmation_failed_at' => now()])->saveQuietly();
|
||||
$booking->forceFill(['confirmation_failed_at' => now()])->save();
|
||||
$this->inbox->post(
|
||||
InboxMessageKind::ConfirmationFailed,
|
||||
'booking-'.$booking->id,
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\InternalKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Guest;
|
||||
use App\Models\Property;
|
||||
use App\Pricing\PrivateStayPrice;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Process\CaseLog;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Own use, a private stay or a block as a case (A6, package 6): the dates are occupied at once and the portals are
|
||||
* blocked like for any booking. A block has nothing but dates and an occasion; own use and private stays may have
|
||||
* guests, services, an agreed rent (0 by default), the tourist tax and payments – but never a rental contract, payment
|
||||
* reminders, reviews or marketing (the A6 profile switches them off).
|
||||
*/
|
||||
class CreateInternalCase
|
||||
{
|
||||
public function __construct(private AvailabilityChecker $availability, private PrivateStayPrice $price) {}
|
||||
|
||||
/**
|
||||
* @param array{occasion?: ?string, guest?: ?array<string, ?string>, guests?: ?int, extras?: ?array<int, int>, rent?: ?int, tourist_tax_persons?: ?int, tourist_tax_note?: ?string, notes?: ?string} $data
|
||||
*
|
||||
* @throws ReservationException
|
||||
* @throws QuoteException
|
||||
*/
|
||||
public function handle(Property $property, InternalKind $kind, CarbonImmutable $arrival, CarbonImmutable $departure, array $data = []): Booking
|
||||
{
|
||||
if ($departure->lessThanOrEqualTo($arrival)) {
|
||||
throw new ReservationException('Das Ende muss nach dem Beginn liegen.');
|
||||
}
|
||||
|
||||
return DB::transaction(function () use ($property, $kind, $arrival, $departure, $data): Booking {
|
||||
Property::query()->whereKey($property->id)->lockForUpdate()->firstOrFail();
|
||||
if (! $this->availability->isAvailable($property, $arrival, $departure)) {
|
||||
throw ReservationException::notAvailable();
|
||||
}
|
||||
|
||||
$guests = $kind === InternalKind::Block ? null : (filled($data['guests'] ?? null) ? (int) $data['guests'] : null);
|
||||
$extras = $kind === InternalKind::Block ? [] : array_filter(array_map('intval', (array) ($data['extras'] ?? [])));
|
||||
$taxPersons = $kind === InternalKind::Block ? null : (filled($data['tourist_tax_persons'] ?? null) ? (int) $data['tourist_tax_persons'] : null);
|
||||
$quote = $kind === InternalKind::Block ? null : $this->price->quote($property, $arrival, $departure, $guests, $extras, (int) ($data['rent'] ?? 0), $taxPersons);
|
||||
$guest = $kind->hasGuests() ? $this->guest((array) ($data['guest'] ?? [])) : null;
|
||||
|
||||
$booking = $property->bookings()->create([
|
||||
'guest_id' => $guest?->id,
|
||||
'status' => BookingStatus::Confirmed,
|
||||
'source' => 'internal',
|
||||
'intake' => IntakeKind::Internal,
|
||||
'internal_kind' => $kind,
|
||||
'occasion' => filled($data['occasion'] ?? null) ? trim((string) $data['occasion']) : null,
|
||||
'arrival' => $arrival->toDateString(),
|
||||
'departure' => $departure->toDateString(),
|
||||
'guests' => $guests,
|
||||
'extras' => $extras,
|
||||
'quote' => $quote?->toArray(),
|
||||
'total' => $quote?->total(),
|
||||
'tourist_tax_persons' => $taxPersons,
|
||||
'tourist_tax_note' => filled($data['tourist_tax_note'] ?? null) ? trim((string) $data['tourist_tax_note']) : null,
|
||||
'confirmed_at' => now(),
|
||||
'internal_notes' => filled($data['notes'] ?? null) ? trim((string) $data['notes']) : null,
|
||||
]);
|
||||
CaseLog::record($booking, 'intake', $kind->getLabel().' eingetragen'.($booking->occasion ? ': '.$booking->occasion : ''));
|
||||
|
||||
return $booking;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* The guest of a private stay – only with a real name; a known e-mail address finds the existing guest.
|
||||
*
|
||||
* @param array<string, ?string> $data
|
||||
*/
|
||||
private function guest(array $data): ?Guest
|
||||
{
|
||||
$data = array_map(fn ($value) => filled($value) ? trim((string) $value) : null, Arr::only($data, ['first_name', 'last_name', 'email', 'phone', 'street', 'postal_code', 'city']));
|
||||
if (blank($data['first_name'] ?? null) || blank($data['last_name'] ?? null)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$email = filled($data['email'] ?? null) ? mb_strtolower($data['email']) : null;
|
||||
if ($email !== null && ($known = Guest::query()->where('email', $email)->whereNull('anonymized_at')->first()) !== null) {
|
||||
return $known;
|
||||
}
|
||||
|
||||
return Guest::query()->create([...array_filter($data, fn ($value) => $value !== null), 'email' => $email ?? '']);
|
||||
}
|
||||
}
|
||||
@@ -4,15 +4,18 @@
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Mail\NewReservation;
|
||||
use App\Mail\ReservationReceived;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Guest;
|
||||
use App\Models\Property;
|
||||
use App\Pricing\PriceCalculator;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Process\ProcessSettings;
|
||||
use App\Support\Settings;
|
||||
use App\Tenancy\TenantContext;
|
||||
use App\Tenancy\TenantContextMissing;
|
||||
@@ -23,7 +26,7 @@
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* Turns a guest request into a reservation that holds the dates for the property's hold time,
|
||||
* Turns a guest request into a case (intake "request") that holds the dates for the hold time of the process settings,
|
||||
* and sends the quote to the guest and a notification to the landlord.
|
||||
*/
|
||||
class CreateReservation
|
||||
@@ -40,7 +43,7 @@ public function __construct(
|
||||
* @throws QuoteException
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Property $property, StayRequest $stay, array $guestData, ?string $message = null, string $source = 'website', bool $sendMails = true, array $attribution = []): Booking
|
||||
public function handle(Property $property, StayRequest $stay, array $guestData, ?string $message = null, string $source = 'website', bool $sendMails = true, array $attribution = [], ?Channel $originChannel = null): Booking
|
||||
{
|
||||
$tenant = $property->tenant;
|
||||
|
||||
@@ -50,7 +53,7 @@ public function handle(Property $property, StayRequest $stay, array $guestData,
|
||||
|
||||
return app(TenantContext::class)->run(
|
||||
$tenant,
|
||||
fn (): Booking => $this->create($property, $stay, $guestData, $message, $source, $sendMails, $attribution),
|
||||
fn (): Booking => $this->create($property, $stay, $guestData, $message, $source, $sendMails, $attribution, $originChannel),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -58,9 +61,13 @@ public function handle(Property $property, StayRequest $stay, array $guestData,
|
||||
* @param array{first_name: string, last_name: string, email: string, phone?: ?string, street?: ?string, postal_code?: ?string, city?: ?string, country?: ?string} $guestData
|
||||
* @param array{referral_source?: ?string, utm_source?: ?string, utm_medium?: ?string, utm_campaign?: ?string} $attribution
|
||||
*/
|
||||
private function create(Property $property, StayRequest $stay, array $guestData, ?string $message, string $source, bool $sendMails, array $attribution): Booking
|
||||
private function create(Property $property, StayRequest $stay, array $guestData, ?string $message, string $source, bool $sendMails, array $attribution, ?Channel $originChannel): Booking
|
||||
{
|
||||
$booking = DB::transaction(function () use ($property, $stay, $guestData, $message, $source, $attribution): Booking {
|
||||
if ($originChannel !== null && $originChannel->property_id !== $property->id) {
|
||||
throw new ReservationException('Der Kanal gehört nicht zu dieser Wohnung.');
|
||||
}
|
||||
|
||||
$booking = DB::transaction(function () use ($property, $stay, $guestData, $message, $source, $attribution, $originChannel): Booking {
|
||||
Property::whereKey($property->getKey())->lockForUpdate()->first();
|
||||
|
||||
if (! $this->availability->isAvailable($property, $stay->arrival, $stay->departure)) {
|
||||
@@ -70,11 +77,14 @@ private function create(Property $property, StayRequest $stay, array $guestData,
|
||||
$quote = $this->calculator->calculate($property, $stay);
|
||||
|
||||
[$guest, $differences] = $this->guestFor($guestData);
|
||||
$profile = app(ProcessSettings::class)->resolve($property, $originChannel, IntakeKind::Inquiry);
|
||||
|
||||
return $property->bookings()->create([
|
||||
'guest_id' => $guest->id,
|
||||
'status' => BookingStatus::Reserved,
|
||||
'source' => $source,
|
||||
'intake' => IntakeKind::Inquiry,
|
||||
'origin_channel_id' => $originChannel?->id,
|
||||
...Arr::only(array_filter($attribution), ['referral_source', 'utm_source', 'utm_medium', 'utm_campaign']),
|
||||
'arrival' => $stay->arrival->toDateString(),
|
||||
'departure' => $stay->departure->toDateString(),
|
||||
@@ -85,7 +95,7 @@ private function create(Property $property, StayRequest $stay, array $guestData,
|
||||
'total' => $quote->total(),
|
||||
'deposit' => $quote->deposit(),
|
||||
'balance_due_on' => $quote->balanceDueOn->toDateString(),
|
||||
'hold_expires_at' => $property->pre_reservation_enabled ? now()->addHours($property->hold_hours) : null,
|
||||
'hold_expires_at' => $profile->preReservation() ? now()->addHours($profile->holdHours()) : null,
|
||||
'message' => $message,
|
||||
'internal_notes' => $differences !== [] ? "Abweichende Angaben in dieser Anfrage (Gästekartei nicht geändert):\n".implode("\n", $differences) : null,
|
||||
]);
|
||||
@@ -165,7 +175,7 @@ private function sendMails(Booking $booking): void
|
||||
}
|
||||
|
||||
try {
|
||||
if (! $offerSent) {
|
||||
if (! $offerSent && filled($booking->guest?->email)) {
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ReservationReceived($booking));
|
||||
}
|
||||
Mail::to(Settings::notificationRecipients())->send(new NewReservation($booking, $offerSent, $blockers));
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\InternalKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Process\CaseLog;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Lifts a block or calls off an own use / private stay (A6). It is no cancellation: no costs, no refund rule, no mails –
|
||||
* the dates are free again and the portals are released like for any booking that ends.
|
||||
*/
|
||||
class EndInternalCase
|
||||
{
|
||||
/**
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Booking $booking, string $reason, ?string $by = null): void
|
||||
{
|
||||
if (! $booking->isInternal()) {
|
||||
throw new ReservationException('Nur eigene Nutzung, private Aufenthalte und Sperren werden so beendet.');
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($booking, $reason, $by): void {
|
||||
$booking->lockForTransition();
|
||||
if (! in_array($booking->status, BookingStatus::occupying(), true)) {
|
||||
throw ReservationException::invalidTransition($booking->status->getLabel(), 'aufgehoben');
|
||||
}
|
||||
|
||||
CaseLog::context(fn () => $booking->update(['status' => BookingStatus::Cancelled, 'cancelled_at' => now()]), actor: $by, reason: $reason);
|
||||
CaseLog::record($booking, 'status', self::label($booking), $reason, actor: $by);
|
||||
});
|
||||
}
|
||||
|
||||
public static function label(Booking $booking): string
|
||||
{
|
||||
return $booking->internal_kind === InternalKind::Block ? 'Sperre aufgehoben' : 'Aufenthalt abgesagt';
|
||||
}
|
||||
}
|
||||
@@ -2,90 +2,39 @@
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\OccupationKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Guest;
|
||||
use App\Models\Property;
|
||||
use App\Pricing\PortalPrice;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Tenancy\TenantContext;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Opens the booking file for a reservation that arrived through a portal calendar. The calendar only says "these
|
||||
* nights are taken"; the file gives the reservation its workflow (contact data, contract, payments, arrival,
|
||||
* cancellation) like every other booking. The imported calendar entry stays as the portal's mirror of the booking
|
||||
* (it keeps its calendar source and UID, but the booking now leads the calendar), the dates stay occupied throughout.
|
||||
*
|
||||
* Unknown facts stay unknown: the guest is a placeholder without contact data, the price is our own calculation (or
|
||||
* empty) until the portal price is entered.
|
||||
* Takes over a reservation found in a portal calendar as a case ({@see TakeOverExternalBooking}). The calendar only
|
||||
* says "these nights are taken"; the case gives the reservation its handling. The calendar entry stays as the portal's
|
||||
* mirror of the case. A first name from the calendar is no guest identity – it is kept as a note, not as a guest.
|
||||
*/
|
||||
class OpenPortalFile
|
||||
{
|
||||
public function __construct(private PortalPrice $price) {}
|
||||
public function __construct(private TakeOverExternalBooking $takeOver) {}
|
||||
|
||||
/**
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(BlockedPeriod $block): Booking
|
||||
{
|
||||
return DB::transaction(function () use ($block): Booking {
|
||||
Property::query()->whereKey($block->property_id)->lockForUpdate()->firstOrFail();
|
||||
$block = BlockedPeriod::query()->whereKey($block->id)->lockForUpdate()->firstOrFail();
|
||||
if ($block->channel === null) {
|
||||
throw new ReservationException('Übernehmen lassen sich nur Reservierungen aus einem Portalkalender.');
|
||||
}
|
||||
|
||||
if (! in_array($block->source, ['channel', 'email'], true) || $block->channel_id === null) {
|
||||
throw new ReservationException('Eine Akte gibt es nur für Reservierungen aus einem Portalkalender.');
|
||||
}
|
||||
if ($block->occupationKind() === OccupationKind::Block) {
|
||||
throw new ReservationException('Eine Sperrzeit ist keine Reservierung. Bitte zuerst „Einordnen“ und als Portalreservierung kennzeichnen.');
|
||||
}
|
||||
if ($block->is_representation && $block->linked_booking_id !== null) {
|
||||
return Booking::query()->findOrFail($block->linked_booking_id);
|
||||
}
|
||||
if ($block->is_representation) {
|
||||
throw new ReservationException('Dieser Eintrag ist die Spiegelung einer anderen Belegung. Die Akte gehört an die führende Belegung.');
|
||||
}
|
||||
$fields = (array) ($block->ical_interpretation['fields'] ?? []);
|
||||
$name = trim((string) ($fields['guest_first_name'] ?? ''));
|
||||
|
||||
$property = $block->property;
|
||||
$channel = $block->channel;
|
||||
$fields = (array) ($block->ical_interpretation['fields'] ?? []);
|
||||
$guest = $block->guest ?? Guest::query()->create([
|
||||
'first_name' => filled($fields['guest_first_name'] ?? null) ? (string) $fields['guest_first_name'] : 'Gast',
|
||||
'last_name' => '('.$channel->name.')',
|
||||
'email' => '',
|
||||
'tenant_id' => app(TenantContext::class)->id(),
|
||||
]);
|
||||
|
||||
$stay = new StayRequest(CarbonImmutable::parse($block->starts_on), CarbonImmutable::parse($block->ends_on), min(2, $property->max_guests));
|
||||
$booking = $property->bookings()->create([
|
||||
'guest_id' => $guest->id,
|
||||
'status' => BookingStatus::Reserved,
|
||||
'source' => 'portal',
|
||||
'origin_channel_id' => $block->origin_channel_id ?? $channel->id,
|
||||
'portal_reference' => $fields['booking_reference'] ?? null,
|
||||
'arrival' => $stay->arrival->toDateString(),
|
||||
'departure' => $stay->departure->toDateString(),
|
||||
'guests' => $stay->guests,
|
||||
'hold_expires_at' => null,
|
||||
'internal_notes' => 'Akte aus dem Portalkalender „'.$channel->name.'“ angelegt. Personenzahl und Preis sind nicht bekannt – bitte den Portalpreis erfassen.',
|
||||
...$this->price->unknownColumns($property, $stay),
|
||||
]);
|
||||
|
||||
$block->forceFill([
|
||||
'is_representation' => true, 'representation_automatic' => false, 'canonical_block_id' => null,
|
||||
'linked_booking_id' => $booking->id, 'export_approved' => false, 'needs_review' => false, 'reviewed_at' => now(),
|
||||
'occupation_kind' => OccupationKind::Reservation, 'guest_id' => $guest->id,
|
||||
'review_note' => 'Akte angelegt; die Buchung führt diese Belegung.',
|
||||
])->save();
|
||||
|
||||
app(ConfirmBooking::class)->bind($booking);
|
||||
app(ReconcileChannelRepresentations::class)->handle($property);
|
||||
|
||||
return $booking->refresh();
|
||||
});
|
||||
return $this->takeOver->handle(
|
||||
$block->property,
|
||||
$block->channel,
|
||||
CarbonImmutable::parse($block->starts_on),
|
||||
CarbonImmutable::parse($block->ends_on),
|
||||
['notes' => 'Aus dem Portalkalender „'.$block->channel->name.'“ übernommen.'.($name !== '' ? ' Name laut Kalender: '.$name.'.' : '')],
|
||||
$block,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Channels\ConflictDetector;
|
||||
use App\Channels\Intake\PortalIntake;
|
||||
use App\Channels\Mail\ParsedPortalMail;
|
||||
use App\Channels\Mail\PortalMail;
|
||||
use App\Channels\Mail\PortalMailParser;
|
||||
@@ -12,6 +13,7 @@
|
||||
use App\Mail\PortalMailNotification;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Channel;
|
||||
use App\Models\IntakeObservation;
|
||||
use App\Models\PortalEmail;
|
||||
use App\Support\Settings;
|
||||
use App\Tenancy\TenantFeatures;
|
||||
@@ -75,6 +77,9 @@ public function handle(PortalMail $mail): ?PortalEmail
|
||||
]);
|
||||
});
|
||||
|
||||
// One intake for all channels (package 4): bookings, requests and cancellations reach their case.
|
||||
rescue(fn () => $this->intake($channel, $parsed, $record));
|
||||
|
||||
if (in_array($record->status, [PortalEmailStatus::Blocked, PortalEmailStatus::Released, PortalEmailStatus::NeedsReview], true)) {
|
||||
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new PortalMailNotification($record)));
|
||||
}
|
||||
@@ -86,6 +91,17 @@ public function handle(PortalMail $mail): ?PortalEmail
|
||||
return $record;
|
||||
}
|
||||
|
||||
private function intake(Channel $channel, ParsedPortalMail $parsed, PortalEmail $record): void
|
||||
{
|
||||
$intake = app(PortalIntake::class);
|
||||
match ($parsed->type) {
|
||||
PortalEmailType::Booking => $record->blocked_period_id !== null ? $intake->process(BlockedPeriod::query()->findOrFail($record->blocked_period_id), IntakeObservation::SOURCE_MAIL) : null,
|
||||
PortalEmailType::Cancellation => $intake->cancellationMail($channel, $parsed, $record),
|
||||
PortalEmailType::Inquiry => $intake->inquiryMail($channel, $parsed, $record),
|
||||
PortalEmailType::Unknown => null,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Channels list the sender addresses or domains of their notification e-mails in settings.email_senders.
|
||||
*/
|
||||
@@ -177,6 +193,11 @@ private function release(Channel $channel, ParsedPortalMail $parsed): array
|
||||
default => null,
|
||||
};
|
||||
|
||||
// A block that belongs to a case is never released by a mail: the case leads, the landlord decides (E-019).
|
||||
if ($block && $block->linked_booking_id !== null) {
|
||||
return [PortalEmailStatus::NeedsReview, $block, 'Stornierung zu einem gebuchten Vorgang gemeldet – nichts automatisch freigegeben; Aufgabe am Vorgang prüfen.'];
|
||||
}
|
||||
|
||||
if ($block) {
|
||||
$block->delete();
|
||||
|
||||
|
||||
@@ -3,10 +3,13 @@
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Support\BookingProgress;
|
||||
use App\Models\Guest;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* The guest's contact data arrived (portal message, e-mail, phone) and is entered on the booking. The landlord chooses
|
||||
@@ -19,7 +22,7 @@ class ProvideGuestContact
|
||||
|
||||
public const MANUAL = 'manual';
|
||||
|
||||
public function __construct(private ConfirmBooking $confirm, private SendOffer $offer) {}
|
||||
public function __construct(private ConfirmBooking $confirm, private AutoOffer $autoOffer, private SendBookingDocuments $documents) {}
|
||||
|
||||
/**
|
||||
* @param array<string, ?string> $contact first_name, last_name, email, phone, street, postal_code, city, country
|
||||
@@ -38,9 +41,17 @@ public function handle(Booking $booking, array $contact, string $process = self:
|
||||
throw new ReservationException('Für den automatischen Ablauf wird die E-Mail-Adresse des Gastes benötigt.');
|
||||
}
|
||||
|
||||
$booking->guest->update(array_filter($contact, fn ($value) => $value !== null));
|
||||
if ($booking->guest === null) {
|
||||
if (blank($contact['first_name'] ?? null) || blank($contact['last_name'] ?? null)) {
|
||||
throw new ReservationException('Bitte Vor- und Nachnamen des Gastes angeben.');
|
||||
}
|
||||
$guest = Guest::query()->create([...array_filter($contact, fn ($value) => $value !== null), 'email' => $contact['email'] ?? '']);
|
||||
$booking->update(['guest_id' => $guest->id]);
|
||||
} else {
|
||||
$booking->guest->update(array_filter($contact, fn ($value) => $value !== null));
|
||||
}
|
||||
if ($guestConfirmed) {
|
||||
$booking->forceFill(['guest_confirmed_at' => $booking->guest_confirmed_at ?? now()])->saveQuietly();
|
||||
$booking->forceFill(['guest_confirmed_at' => $booking->guest_confirmed_at ?? now()])->save();
|
||||
}
|
||||
$booking->refresh()->load('guest');
|
||||
|
||||
@@ -48,19 +59,31 @@ public function handle(Booking $booking, array $contact, string $process = self:
|
||||
return 'Kontaktdaten gespeichert';
|
||||
}
|
||||
|
||||
$booking->update(['processing_mode' => ProcessingMode::Automatic]);
|
||||
|
||||
if (in_array($booking->status, BookingStatus::occupying(), true)) {
|
||||
$this->confirm->deliver($booking);
|
||||
$reasons = $this->documents->automatically($booking);
|
||||
if ($reasons !== []) {
|
||||
throw new ReservationException('Kontaktdaten gespeichert. Die Unterlagen werden noch nicht automatisch versendet: '.implode(' ', $reasons));
|
||||
}
|
||||
|
||||
return 'Kontaktdaten gespeichert, Vertrag gesendet';
|
||||
return 'Kontaktdaten gespeichert, Unterlagen gesendet';
|
||||
}
|
||||
|
||||
if (BookingProgress::kind($booking) === BookingProgress::PORTAL_BOOKING) {
|
||||
$this->confirm->handle($booking);
|
||||
if ($booking->intake === IntakeKind::Booking) {
|
||||
DB::transaction(fn () => $this->confirm->bind($booking));
|
||||
$reasons = $this->documents->automatically($booking->fresh());
|
||||
if ($reasons !== []) {
|
||||
throw new ReservationException('Kontaktdaten gespeichert und Buchung bestätigt. Die Unterlagen werden noch nicht automatisch versendet: '.implode(' ', $reasons));
|
||||
}
|
||||
|
||||
return 'Kontaktdaten gespeichert, Buchung bestätigt und Vertrag gesendet';
|
||||
return 'Kontaktdaten gespeichert, Buchung bestätigt und Unterlagen gesendet';
|
||||
}
|
||||
|
||||
$this->offer->handle($booking);
|
||||
$reasons = $this->autoOffer->handle($booking);
|
||||
if ($reasons !== []) {
|
||||
throw new ReservationException('Kontaktdaten gespeichert. Das Angebot wird noch nicht automatisch gesendet: '.implode(' ', $reasons));
|
||||
}
|
||||
|
||||
return 'Kontaktdaten gespeichert, Angebot gesendet';
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\PaymentKind;
|
||||
use App\Enums\PaymentMethod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Payment;
|
||||
@@ -10,20 +11,25 @@
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Records a received payment (or a refund with a negative amount) and moves the booking along:
|
||||
* Bestätigt → Anzahlung erhalten → Bezahlt.
|
||||
* Records a payment of a case with its kind (package 8): the guest paid us, the portal reports the guest paid it, the
|
||||
* portal paid out to us, or we refunded the guest. Only the guest's payments move the booking along
|
||||
* (Bestätigt → Anzahlung erhalten → Bezahlt); a refund is stored as a negative amount.
|
||||
*/
|
||||
class RecordPayment
|
||||
{
|
||||
public function handle(Booking $booking, int $amount, CarbonInterface $paidOn, PaymentMethod $method = PaymentMethod::Transfer, ?string $note = null, ?string $recordedBy = null): Payment
|
||||
public function handle(Booking $booking, int $amount, CarbonInterface $paidOn, PaymentMethod $method = PaymentMethod::Transfer, ?string $note = null, ?string $recordedBy = null, PaymentKind $kind = PaymentKind::Guest, ?string $source = null): Payment
|
||||
{
|
||||
return DB::transaction(function () use ($booking, $amount, $paidOn, $method, $note, $recordedBy): Payment {
|
||||
$amount = $kind === PaymentKind::Refund ? -abs($amount) : $amount;
|
||||
|
||||
return DB::transaction(function () use ($booking, $amount, $paidOn, $method, $note, $recordedBy, $kind, $source): Payment {
|
||||
$payment = $booking->payments()->create([
|
||||
'amount' => $amount,
|
||||
'paid_on' => $paidOn->toDateString(),
|
||||
'method' => $method,
|
||||
'note' => $note,
|
||||
'recorded_by' => $recordedBy,
|
||||
'kind' => $kind,
|
||||
'source' => $source,
|
||||
]);
|
||||
|
||||
$booking->unsetRelation('payments');
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\AmountKind;
|
||||
use App\Enums\PaymentKind;
|
||||
use App\Enums\PaymentMethod;
|
||||
use App\Models\Booking;
|
||||
use App\Pricing\PortalPrice;
|
||||
use App\Process\CaseAutomation;
|
||||
use App\Process\CaseLog;
|
||||
use App\Support\Money;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Takes over what a portal shows about a booking (package 8): the guest's total as the agreed price ("Gesamtpreis laut
|
||||
* Portal"), and – as far as the portal shows them – price positions, collective amounts, commission, announced payouts,
|
||||
* instalments and what the guest has paid to the portal. Every value is stored with its source and date as stated; the
|
||||
* total is never recalculated from the positions, and a statement entered twice is stored once.
|
||||
*/
|
||||
class RecordPortalAmounts
|
||||
{
|
||||
public function __construct(private PortalPrice $price, private RecordPayment $payments) {}
|
||||
|
||||
/**
|
||||
* @param list<array{kind: AmountKind|string, label?: ?string, amount: int, due_on?: ?string, note?: ?string}> $amounts
|
||||
* @param list<array{amount: int, paid_on: string}> $paidViaPortal instalments the portal shows as paid by the guest
|
||||
*/
|
||||
public function handle(Booking $booking, ?int $guestTotal, array $amounts, array $paidViaPortal, string $source, ?CarbonImmutable $statedOn = null, ?string $by = null): void
|
||||
{
|
||||
$statedOn ??= CarbonImmutable::today();
|
||||
|
||||
DB::transaction(function () use ($booking, $guestTotal, $amounts, $paidViaPortal, $source, $statedOn, $by): void {
|
||||
if ($guestTotal !== null && $guestTotal !== $booking->total) {
|
||||
$before = $booking->total;
|
||||
$booking->update($this->price->columns($booking->property, $booking->arrival, $booking->departure, $booking->guests, $guestTotal, $source));
|
||||
CaseLog::record($booking, 'price', 'Gesamtpreis laut '.$source.': '.Money::format($guestTotal).($before !== null ? ' (vorher '.Money::format($before).')' : ''));
|
||||
}
|
||||
|
||||
foreach ($amounts as $row) {
|
||||
$kind = $row['kind'] instanceof AmountKind ? $row['kind'] : AmountKind::from((string) $row['kind']);
|
||||
$label = filled($row['label'] ?? null) ? trim((string) $row['label']) : null;
|
||||
$exists = $booking->amounts()->where('kind', $kind)->where('amount', (int) $row['amount'])->where('source', $source)
|
||||
->where(fn ($query) => $label === null ? $query->whereNull('label') : $query->where('label', $label))->exists();
|
||||
if ($exists) {
|
||||
continue;
|
||||
}
|
||||
$booking->amounts()->create([
|
||||
'kind' => $kind, 'label' => $label, 'amount' => (int) $row['amount'], 'source' => $source,
|
||||
'stated_on' => $statedOn->toDateString(), 'due_on' => filled($row['due_on'] ?? null) ? $row['due_on'] : null,
|
||||
'note' => filled($row['note'] ?? null) ? trim((string) $row['note']) : null, 'recorded_by' => $by,
|
||||
]);
|
||||
}
|
||||
|
||||
foreach ($paidViaPortal as $row) {
|
||||
$paidOn = CarbonImmutable::parse($row['paid_on']);
|
||||
$known = $booking->payments()->where('kind', PaymentKind::GuestViaPortal)->where('amount', (int) $row['amount'])->whereDate('paid_on', $paidOn)->exists();
|
||||
if (! $known) {
|
||||
$this->payments->handle($booking, (int) $row['amount'], $paidOn, PaymentMethod::Other, 'laut '.$source, $by, PaymentKind::GuestViaPortal, $source);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
app(CaseAutomation::class)->advance($booking->fresh());
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Property;
|
||||
use App\Pricing\PortalPrice;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Pricing\StayRequest;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Records a booking that a portal already made binding (e.g. a direct booking on FeWo-direkt) – usually without
|
||||
* the guest's contact data. The booking keeps the portal as its origin channel and may carry the portal's price and
|
||||
* reference. The landlord decides how the contract process continues:
|
||||
*
|
||||
* - {@see self::CONFIRM}: the booking becomes binding right away (the dates are occupied), the contract follows
|
||||
* once the contact data is known ({@see ProvideGuestContact}) – no contract is generated before that;
|
||||
* - {@see self::CONTRACT}: binding and contract mail at once (needs the guest's e-mail address);
|
||||
* - {@see self::RECORD}: only recorded as a request, everything else is done by hand.
|
||||
*/
|
||||
class RecordPortalBooking
|
||||
{
|
||||
public const CONFIRM = 'confirm';
|
||||
|
||||
public const CONTRACT = 'contract';
|
||||
|
||||
public const RECORD = 'record';
|
||||
|
||||
public function __construct(
|
||||
private CreateReservation $create,
|
||||
private ConfirmBooking $confirm,
|
||||
private PortalPrice $price,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param array<string, ?string> $guestData first_name and last_name are required, everything else optional
|
||||
*
|
||||
* @throws QuoteException
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Property $property, Channel $channel, StayRequest $stay, array $guestData, string $process = self::CONFIRM, ?string $portalReference = null, ?int $portalTotal = null, ?string $notes = null, bool $guestConfirmed = false): Booking
|
||||
{
|
||||
if ($channel->property_id !== $property->id) {
|
||||
throw new ReservationException('Der Kanal gehört nicht zu dieser Wohnung.');
|
||||
}
|
||||
|
||||
if ($process === self::CONTRACT && blank($guestData['email'] ?? null)) {
|
||||
throw new ReservationException('Für den sofortigen Vertragsversand wird die E-Mail-Adresse des Gastes benötigt.');
|
||||
}
|
||||
|
||||
$booking = $this->create->handle($property, $stay, $guestData, source: 'portal', sendMails: false);
|
||||
|
||||
$changes = ['origin_channel_id' => $channel->id, 'portal_reference' => filled($portalReference) ? trim($portalReference) : null, 'internal_notes' => filled($notes) ? trim($notes) : $booking->internal_notes];
|
||||
if ($guestConfirmed) {
|
||||
$changes['guest_confirmed_at'] = now();
|
||||
}
|
||||
if ($portalTotal !== null) {
|
||||
$changes += $this->price->columns($property, $stay, $portalTotal);
|
||||
}
|
||||
$booking->update($changes);
|
||||
|
||||
if ($process === self::RECORD) {
|
||||
return $booking->refresh();
|
||||
}
|
||||
|
||||
if ($process === self::CONTRACT) {
|
||||
$this->confirm->handle($booking, notifyGuest: true);
|
||||
} else {
|
||||
DB::transaction(fn () => $this->confirm->bind($booking));
|
||||
}
|
||||
|
||||
return $booking->refresh();
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Mail\ReviewRequest;
|
||||
use App\Models\Booking;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
@@ -25,7 +26,8 @@ public function handle(): int
|
||||
->whereDoesntHave('review')
|
||||
->whereHas('guest', fn ($query) => $query->whereNull('anonymized_at')->whereNotNull('email')->where('email', '!=', ''))
|
||||
->with('guest')
|
||||
->get();
|
||||
->get()
|
||||
->filter(fn (Booking $booking): bool => $booking->process()->guestMessages() === Responsibility::Landlord);
|
||||
|
||||
foreach ($bookings as $booking) {
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ReviewRequest($booking));
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Documents\DocumentComposer;
|
||||
use App\Documents\DocumentComposition;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Process\CaseLog;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
|
||||
/**
|
||||
* Sends the documents of a binding case – the confirmation with the rental contract, or the booking documentation of a
|
||||
* booking already binding on a portal – from its composition ({@see DocumentComposer}). Automatically only when nothing
|
||||
* is missing and nothing has to be confirmed; by hand after the landlord confirmed every point. The documents go out
|
||||
* once: a lock and a fresh look at the case keep repeated runs, double clicks and parallel jobs from sending twice.
|
||||
* Until the first document exists the terms are taken from the composition (template and annexes as chosen); after
|
||||
* that they stay as they were sent.
|
||||
*/
|
||||
class SendBookingDocuments
|
||||
{
|
||||
public function __construct(private DocumentComposer $composer, private ConfirmBooking $confirm) {}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $changes
|
||||
*/
|
||||
public function compose(Booking $booking, array $changes = []): DocumentComposition
|
||||
{
|
||||
return $this->composer->compose($booking, self::kindFor($booking), $changes);
|
||||
}
|
||||
|
||||
/**
|
||||
* The automatic run: sends when the composition allows it.
|
||||
*
|
||||
* @return list<string> why nothing was sent (empty: sent or nothing to send)
|
||||
*/
|
||||
public function automatically(Booking $booking): array
|
||||
{
|
||||
if ($booking->confirmation_sent_at !== null) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$composition = $this->compose($booking);
|
||||
if (! $composition->canSendAutomatically()) {
|
||||
return [...$composition->blockers(), ...array_map(fn (string $point): string => 'Bitte prüfen: '.$point, $composition->toConfirm())];
|
||||
}
|
||||
|
||||
return $this->send($booking, $composition, acknowledged: false, automatic: true) ? [] : ['Die Unterlagen konnten nicht versendet werden (siehe Postfach).'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Sending by hand after the landlord saw the composition.
|
||||
*
|
||||
* @param array<string, mixed> $changes contract_template_id, annex_ids
|
||||
* @return bool whether the guest has the documents
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Booking $booking, array $changes = [], bool $acknowledged = false): bool
|
||||
{
|
||||
if (! $booking->isBinding()) {
|
||||
throw ReservationException::invalidTransition($booking->status->getLabel(), 'mit Unterlagen bestätigt');
|
||||
}
|
||||
|
||||
$composition = $this->compose($booking, $changes);
|
||||
if ($composition->blockers() !== []) {
|
||||
throw new ReservationException(implode(' ', $composition->blockers()));
|
||||
}
|
||||
if (! $composition->canSendByHand($acknowledged)) {
|
||||
throw new ReservationException('Bitte die Hinweise prüfen und ausdrücklich bestätigen: '.implode(' ', $composition->toConfirm()));
|
||||
}
|
||||
|
||||
return $this->send($booking, $composition, $acknowledged, automatic: false);
|
||||
}
|
||||
|
||||
/**
|
||||
* The document kind of a binding case (a case whose documents the portal sends has none from us).
|
||||
*/
|
||||
public static function kindFor(Booking $booking): DocumentKind
|
||||
{
|
||||
$kind = DocumentKind::forCase($booking);
|
||||
|
||||
return in_array($kind, [DocumentKind::Confirmation, DocumentKind::ExternalRecord, DocumentKind::StayConfirmation], true) ? $kind : DocumentKind::Confirmation;
|
||||
}
|
||||
|
||||
private function send(Booking $booking, DocumentComposition $composition, bool $acknowledged, bool $automatic): bool
|
||||
{
|
||||
$lock = Cache::lock('booking-documents-'.$booking->id, 120);
|
||||
if (! $lock->get()) {
|
||||
throw new ReservationException('Die Unterlagen werden gerade versendet. Bitte kurz warten und die Seite neu laden.');
|
||||
}
|
||||
|
||||
try {
|
||||
$booking->refresh();
|
||||
if ($booking->confirmation_sent_at !== null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (! $composition->termsFrozen && $booking->contract_path === null && $composition->terms !== null) {
|
||||
$booking->update(['offer_terms' => $composition->terms]);
|
||||
}
|
||||
|
||||
if ($acknowledged && $composition->toConfirm() !== []) {
|
||||
CaseLog::record($booking, 'document', 'Hinweise vor dem Versand bestätigt', data: ['confirmed' => $composition->toConfirm()]);
|
||||
}
|
||||
|
||||
return CaseLog::context(fn (): bool => $this->confirm->deliver($booking, kind: $composition->kind), actor: $automatic ? CaseLog::SYSTEM.' (automatisch)' : null);
|
||||
} finally {
|
||||
$lock->release();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\BookingTaskKind;
|
||||
use App\Enums\BookingTaskStatus;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Mail\ArrivalInformation;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingTask;
|
||||
@@ -60,7 +61,8 @@ public function handle(): array
|
||||
->whereNull('arrival_info_sent_at')
|
||||
->whereDate('arrival', '>=', $today)
|
||||
->whereDate('arrival', '<=', $today->copy()->addDays(self::ARRIVAL_INFO_MAX_DAYS_BEFORE)))
|
||||
->filter(fn (Booking $booking): bool => $booking->arrival->lessThanOrEqualTo($today->copy()->addDays($booking->property->arrival_info_days_before)));
|
||||
->filter(fn (Booking $booking): bool => $booking->process()->guestMessages() === Responsibility::Landlord
|
||||
&& $booking->arrival->lessThanOrEqualTo($today->copy()->addDays($booking->process()->arrivalInfoDaysBefore())));
|
||||
foreach ($arrivals as $booking) {
|
||||
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ArrivalInformation($booking));
|
||||
$booking->update(['arrival_info_sent_at' => now()]);
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Documents\DocumentComposer;
|
||||
use App\Documents\OfferTerms;
|
||||
use App\Documents\RentalContract;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\InboxMessageKind;
|
||||
use App\Enums\QuoteLineType;
|
||||
use App\Exceptions\ReservationException;
|
||||
@@ -17,6 +19,7 @@
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Pricing\QuoteLine;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Process\CaseLog;
|
||||
use App\Support\Inbox;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Arr;
|
||||
@@ -42,7 +45,12 @@ public function __construct(
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param array{arrival?: string, departure?: string, guests?: int, promo_code?: ?string, price_adjustment?: ?int, price_adjustment_label?: ?string, valid_until?: ?string, offer_message?: ?string, contract_template_id?: int|string|null, annex_ids?: ?list<int|string>, guest?: array<string, ?string>} $changes
|
||||
* The offer is checked through its composition ({@see DocumentComposer}) like every other document: points the
|
||||
* landlord has to confirm (e.g. an unreleased template, missing contract data, a request that by the settings
|
||||
* reserves nothing) stop it unless `acknowledged` is set. `expected_version` makes a repeated call harmless: when
|
||||
* another offer was sent in the meantime, nothing is sent again.
|
||||
*
|
||||
* @param array{arrival?: string, departure?: string, guests?: int, promo_code?: ?string, price_adjustment?: ?int, price_adjustment_label?: ?string, valid_until?: ?string, offer_message?: ?string, contract_template_id?: int|string|null, annex_ids?: ?list<int|string>, guest?: array<string, ?string>, acknowledged?: bool, expected_version?: ?int} $changes
|
||||
*
|
||||
* @throws QuoteException
|
||||
* @throws ReservationException
|
||||
@@ -57,6 +65,11 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
|
||||
throw ReservationException::invalidTransition($booking->status->getLabel(), 'als Angebot versendet');
|
||||
}
|
||||
|
||||
$toConfirm = app(DocumentComposer::class)->compose($booking, DocumentKind::Offer, $changes)->toConfirm();
|
||||
if ($toConfirm !== [] && ! ($changes['acknowledged'] ?? false)) {
|
||||
throw new ReservationException('Bitte die Hinweise prüfen und ausdrücklich bestätigen: '.implode(' ', $toConfirm));
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($booking, $changes): void {
|
||||
$booking->lockForTransition();
|
||||
|
||||
@@ -64,6 +77,10 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
|
||||
throw ReservationException::invalidTransition($booking->status->getLabel(), 'als Angebot versendet');
|
||||
}
|
||||
|
||||
if (isset($changes['expected_version']) && $booking->offer_version !== (int) $changes['expected_version']) {
|
||||
throw new ReservationException('Inzwischen wurde schon ein Angebot gesendet (Version '.$booking->offer_version.'). Es wurde nichts erneut gesendet.');
|
||||
}
|
||||
|
||||
$arrival = CarbonImmutable::parse($changes['arrival'] ?? $booking->arrival);
|
||||
$departure = CarbonImmutable::parse($changes['departure'] ?? $booking->departure);
|
||||
|
||||
@@ -75,7 +92,7 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
|
||||
$stay = new StayRequest($arrival, $departure, (int) ($changes['guests'] ?? $booking->guests), $booking->extras ?? [], $promoCode);
|
||||
$adjustment = (int) ($changes['price_adjustment'] ?? 0);
|
||||
$adjustmentLabel = trim((string) ($changes['price_adjustment_label'] ?? '')) ?: ($adjustment < 0 ? 'Nachlass' : 'Zuschlag');
|
||||
$quote = $this->quoteWithAdjustment($booking, $stay, $adjustment, $adjustmentLabel);
|
||||
$quote = $this->quoteFor($booking, $stay, $adjustment, $adjustmentLabel);
|
||||
|
||||
if (filled($changes['guest'] ?? null)) {
|
||||
$booking->guest->update(Arr::only(array_map(fn ($value) => filled($value) ? trim((string) $value) : null, $changes['guest']), ['first_name', 'last_name', 'phone', 'street', 'postal_code', 'city', 'country']));
|
||||
@@ -93,7 +110,7 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
|
||||
'total' => $quote->total(),
|
||||
'deposit' => $quote->deposit(),
|
||||
'balance_due_on' => $quote->balanceDueOn->toDateString(),
|
||||
'hold_expires_at' => filled($changes['valid_until'] ?? null) ? CarbonImmutable::parse($changes['valid_until']) : now()->addHours($booking->property->hold_hours),
|
||||
'hold_expires_at' => filled($changes['valid_until'] ?? null) ? CarbonImmutable::parse($changes['valid_until']) : now()->addHours($booking->process()->holdHours()),
|
||||
'offer_version' => $booking->offer_version + 1,
|
||||
'offer_sent_at' => now(),
|
||||
'offer_message' => $changes['offer_message'] ?? null,
|
||||
@@ -105,6 +122,14 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
|
||||
|
||||
$booking->refresh();
|
||||
$this->contract->generate($booking, draft: true);
|
||||
CaseLog::record($booking, 'document', 'Angebot Version '.$booking->offer_version.' erstellt'.(isset($booking->offer_terms['template']['name']) ? ' (Vorlage '.$booking->offer_terms['template']['name'].', Version '.$booking->offer_terms['template']['version'].')' : ' (Texte der Webseite)'), data: array_filter([
|
||||
'kind' => DocumentKind::Offer->value,
|
||||
'template' => $booking->offer_terms['template'] ?? null,
|
||||
'annexes' => array_map(fn (array $annex): string => $annex['name'].' (Version '.$annex['version'].')', (array) ($booking->offer_terms['annexes'] ?? [])),
|
||||
'pdf_sha256' => $booking->offer_pdf_sha256,
|
||||
'offer_hash' => $booking->offer_hash,
|
||||
'confirmed' => $toConfirm,
|
||||
]));
|
||||
|
||||
if ($sendMail) {
|
||||
$this->deliver($booking);
|
||||
@@ -155,7 +180,7 @@ public function offerUrl(Booking $booking): string
|
||||
*
|
||||
* @throws QuoteException
|
||||
*/
|
||||
private function quoteWithAdjustment(Booking $booking, StayRequest $stay, int $adjustment, string $label): PriceQuote
|
||||
public function quoteFor(Booking $booking, StayRequest $stay, int $adjustment, string $label): PriceQuote
|
||||
{
|
||||
$quote = $this->calculator->calculate($booking->property, $stay);
|
||||
if ($adjustment === 0) {
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingTask;
|
||||
use App\Process\CaseLog;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
@@ -33,6 +34,10 @@ public function handle(Booking $booking, BookingStatus $status, string $reason,
|
||||
throw new ReservationException('Auf diesen Status kann nicht von Hand gewechselt werden. Stornieren und Ablehnen haben eigene Aktionen.');
|
||||
}
|
||||
|
||||
if ($status === BookingStatus::Reserved && in_array($booking->status, BookingStatus::occupying(), true)) {
|
||||
throw new ReservationException('Eine verbindliche Buchung kann nicht wieder zur Anfrage gemacht werden. Soll sie enden, bitte „Beenden“ wählen – dann wird sie ordentlich storniert.');
|
||||
}
|
||||
|
||||
if (blank(trim($reason))) {
|
||||
throw new ReservationException('Bitte einen Grund für die Statusänderung angeben.');
|
||||
}
|
||||
@@ -44,6 +49,9 @@ public function handle(Booking $booking, BookingStatus $status, string $reason,
|
||||
if ($from === $status) {
|
||||
throw new ReservationException('Die Buchung hat diesen Status bereits.');
|
||||
}
|
||||
if ($status === BookingStatus::Reserved && in_array($from, BookingStatus::occupying(), true)) {
|
||||
throw new ReservationException('Eine verbindliche Buchung kann nicht wieder zur Anfrage gemacht werden.');
|
||||
}
|
||||
|
||||
$becomesBinding = in_array($status, BookingStatus::occupying(), true) && ! in_array($from, BookingStatus::occupying(), true);
|
||||
if ($becomesBinding && ! $this->availability->isAvailable($booking->property, $booking->arrival, $booking->departure, ignore: $booking)) {
|
||||
@@ -59,7 +67,7 @@ public function handle(Booking $booking, BookingStatus $status, string $reason,
|
||||
}
|
||||
|
||||
$line = now()->format('d.m.Y H:i').' '.$by.': Status von „'.$from->getLabel().'“ auf „'.$status->getLabel().'“ gesetzt – '.trim($reason);
|
||||
$booking->update($changes + ['internal_notes' => trim(($booking->internal_notes ? $booking->internal_notes."\n" : '').$line)]);
|
||||
CaseLog::context(fn () => $booking->update($changes + ['internal_notes' => trim(($booking->internal_notes ? $booking->internal_notes."\n" : '').$line)]), actor: $by, reason: 'Von Hand gesetzt: '.trim($reason));
|
||||
|
||||
// A booking taken back into the process no longer needs the cancellation follow-up.
|
||||
if ($becomesBinding) {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
use App\Channels\ChannelSyncException;
|
||||
use App\Channels\ConflictDetector;
|
||||
use App\Channels\ExternalPeriod;
|
||||
use App\Channels\Intake\PortalIntake;
|
||||
use App\Enums\ChannelEchoBehavior;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
@@ -135,6 +136,8 @@ public function handle(Channel $channel): ChannelSyncLog
|
||||
'alerted_at' => null, 'last_import_events' => count($periods), 'sync_warnings' => $warnings])->save();
|
||||
});
|
||||
app(ReportChannelConflicts::class)->handle($channel, $conflicts);
|
||||
// One intake for all channels (package 4); a failure there never fails the sync itself.
|
||||
rescue(fn () => app(PortalIntake::class)->afterSync($channel->fresh()));
|
||||
|
||||
return $channel->syncLogs()->create(['successful' => true, 'events' => count($periods), ...$counts,
|
||||
'conflicts' => count($conflicts), 'warnings' => $warnings,
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\OccupationKind;
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Guest;
|
||||
use App\Models\Property;
|
||||
use App\Pricing\PortalPrice;
|
||||
use App\Process\CaseAutomation;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Takes over a booking that a portal already made binding (case types A3–A5): one case with the portal as origin
|
||||
* channel (owner), its reference and the facts the portal delivered – nothing more. There is no offer and no second
|
||||
* acceptance; the agreed portal price is taken over as it is; guest, number of guests and price may be unknown and
|
||||
* stay unknown until somebody enters them. The case is binding at once and occupies the dates.
|
||||
*
|
||||
* Used for the manual entry ("Buchung von einem Portal") and for a reservation found in a portal calendar – then the
|
||||
* calendar entry stays as the portal's mirror of the case.
|
||||
*/
|
||||
class TakeOverExternalBooking
|
||||
{
|
||||
public function __construct(private ConfirmBooking $confirm, private PortalPrice $price) {}
|
||||
|
||||
/**
|
||||
* @param array{guest?: ?array<string, ?string>, guests?: ?int, portal_reference?: ?string, portal_total?: ?int, notes?: ?string, guest_confirmed?: bool, processing_mode?: ?ProcessingMode} $facts
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Property $property, Channel $channel, CarbonImmutable $arrival, CarbonImmutable $departure, array $facts = [], ?BlockedPeriod $evidence = null): Booking
|
||||
{
|
||||
if ($channel->property_id !== $property->id) {
|
||||
throw new ReservationException('Der Kanal gehört nicht zu dieser Wohnung.');
|
||||
}
|
||||
if ($departure->lessThanOrEqualTo($arrival)) {
|
||||
throw new ReservationException('Die Abreise muss nach der Anreise liegen.');
|
||||
}
|
||||
|
||||
$booking = DB::transaction(function () use ($property, $channel, $arrival, $departure, $facts, $evidence): Booking {
|
||||
Property::query()->whereKey($property->id)->lockForUpdate()->firstOrFail();
|
||||
|
||||
if ($evidence !== null) {
|
||||
$evidence = BlockedPeriod::query()->whereKey($evidence->id)->lockForUpdate()->firstOrFail();
|
||||
$existing = $this->checkEvidence($evidence);
|
||||
if ($existing !== null) {
|
||||
return $existing;
|
||||
}
|
||||
}
|
||||
|
||||
$guests = isset($facts['guests']) && (int) $facts['guests'] > 0 ? (int) $facts['guests'] : null;
|
||||
$guest = $evidence?->guest ?? $this->guestFrom((array) ($facts['guest'] ?? []));
|
||||
$portalTotal = isset($facts['portal_total']) && $facts['portal_total'] !== '' ? (int) $facts['portal_total'] : null;
|
||||
$reference = filled($facts['portal_reference'] ?? null) ? trim((string) $facts['portal_reference']) : ($evidence?->ical_interpretation['fields']['booking_reference'] ?? null);
|
||||
|
||||
$booking = $property->bookings()->create([
|
||||
'guest_id' => $guest?->id,
|
||||
'status' => BookingStatus::Reserved,
|
||||
'source' => 'portal',
|
||||
'intake' => IntakeKind::Booking,
|
||||
'origin_channel_id' => $evidence?->origin_channel_id ?? $channel->id,
|
||||
'portal_reference' => $reference,
|
||||
'arrival' => $arrival->toDateString(),
|
||||
'departure' => $departure->toDateString(),
|
||||
'guests' => $guests,
|
||||
'hold_expires_at' => null,
|
||||
'guest_confirmed_at' => ($facts['guest_confirmed'] ?? false) ? now() : null,
|
||||
'internal_notes' => filled($facts['notes'] ?? null) ? trim((string) $facts['notes']) : null,
|
||||
'processing_mode' => $facts['processing_mode'] ?? null,
|
||||
...$this->price->columns($property, $arrival, $departure, $guests, $portalTotal, $channel->name),
|
||||
]);
|
||||
|
||||
if ($evidence !== null) {
|
||||
$evidence->forceFill([
|
||||
'is_representation' => true, 'representation_automatic' => false, 'canonical_block_id' => null,
|
||||
'linked_booking_id' => $booking->id, 'export_approved' => false, 'needs_review' => false, 'reviewed_at' => now(),
|
||||
'occupation_kind' => OccupationKind::Reservation, 'guest_id' => $guest?->id,
|
||||
'review_note' => 'Als Vorgang übernommen; der Vorgang führt diese Belegung.',
|
||||
])->save();
|
||||
}
|
||||
|
||||
$this->confirm->bind($booking);
|
||||
|
||||
if ($evidence !== null) {
|
||||
app(ReconcileChannelRepresentations::class)->handle($property);
|
||||
}
|
||||
|
||||
return $booking->refresh();
|
||||
});
|
||||
|
||||
app(CaseAutomation::class)->advance($booking);
|
||||
|
||||
return $booking->refresh();
|
||||
}
|
||||
|
||||
/**
|
||||
* A portal calendar entry can become a case once: returns the case it already belongs to, or throws when the entry
|
||||
* is no reservation of a portal.
|
||||
*
|
||||
* @throws ReservationException
|
||||
*/
|
||||
private function checkEvidence(BlockedPeriod $evidence): ?Booking
|
||||
{
|
||||
if (! in_array($evidence->source, ['channel', 'email'], true) || $evidence->channel_id === null) {
|
||||
throw new ReservationException('Übernehmen lassen sich nur Reservierungen aus einem Portalkalender.');
|
||||
}
|
||||
if ($evidence->occupationKind() === OccupationKind::Block) {
|
||||
throw new ReservationException('Eine Sperrzeit ist keine Buchung. Bitte zuerst „Einordnen“ und als Portalreservierung kennzeichnen.');
|
||||
}
|
||||
if ($evidence->is_representation && $evidence->linked_booking_id !== null) {
|
||||
return Booking::query()->findOrFail($evidence->linked_booking_id);
|
||||
}
|
||||
if ($evidence->is_representation) {
|
||||
throw new ReservationException('Dieser Eintrag ist die Spiegelung einer anderen Belegung. Der Vorgang gehört an die führende Belegung.');
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The guest the portal named – only with a real name. A known e-mail address finds the existing guest without
|
||||
* overwriting his data; nothing is invented.
|
||||
*
|
||||
* @param array<string, ?string> $data
|
||||
*/
|
||||
private function guestFrom(array $data): ?Guest
|
||||
{
|
||||
$data = array_map(fn ($value) => filled($value) ? trim((string) $value) : null, Arr::only($data, ['first_name', 'last_name', 'email', 'phone', 'street', 'postal_code', 'city', 'country']));
|
||||
if (blank($data['first_name'] ?? null) || blank($data['last_name'] ?? null)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$email = filled($data['email'] ?? null) ? mb_strtolower($data['email']) : null;
|
||||
if ($email !== null && ($known = Guest::query()->where('email', $email)->whereNull('anonymized_at')->first()) !== null) {
|
||||
return $known;
|
||||
}
|
||||
|
||||
return Guest::query()->create([...array_filter($data, fn ($value) => $value !== null), 'email' => $email ?? '']);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
<?php
|
||||
|
||||
namespace App\Actions;
|
||||
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Process\CaseAutomation;
|
||||
use App\Process\ProcessSettings;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* A non-binding request through a portal (case type A2) as it arrives: dates and the portal's reference, nothing
|
||||
* invented. Guest, number of guests and price stay unknown until the landlord enters them; the case then asks for
|
||||
* exactly that and continues like a request of the own website. Whether the dates are reserved follows the channel's
|
||||
* settings for requests.
|
||||
*/
|
||||
class TakeOverPortalInquiry
|
||||
{
|
||||
public function __construct(private AvailabilityChecker $availability, private ProcessSettings $settings) {}
|
||||
|
||||
/**
|
||||
* @throws ReservationException
|
||||
*/
|
||||
public function handle(Channel $channel, CarbonImmutable $arrival, CarbonImmutable $departure, ?string $reference = null, ?string $notes = null, ?ProcessingMode $processingMode = null): Booking
|
||||
{
|
||||
$property = $channel->property;
|
||||
if ($departure->lessThanOrEqualTo($arrival)) {
|
||||
throw new ReservationException('Die Abreise muss nach der Anreise liegen.');
|
||||
}
|
||||
|
||||
$booking = DB::transaction(function () use ($property, $channel, $arrival, $departure, $reference, $notes, $processingMode): Booking {
|
||||
$property->newQuery()->whereKey($property->id)->lockForUpdate()->firstOrFail();
|
||||
if (! $this->availability->isAvailable($property, $arrival, $departure)) {
|
||||
throw ReservationException::notAvailable();
|
||||
}
|
||||
|
||||
$profile = $this->settings->resolve($property, $channel, IntakeKind::Inquiry);
|
||||
|
||||
return $property->bookings()->create([
|
||||
'status' => BookingStatus::Reserved,
|
||||
'source' => 'portal',
|
||||
'intake' => IntakeKind::Inquiry,
|
||||
'origin_channel_id' => $channel->id,
|
||||
'portal_reference' => $reference,
|
||||
'arrival' => $arrival->toDateString(),
|
||||
'departure' => $departure->toDateString(),
|
||||
'hold_expires_at' => $profile->preReservation() ? now()->addHours($profile->holdHours()) : null,
|
||||
'processing_mode' => $processingMode,
|
||||
'internal_notes' => $notes,
|
||||
]);
|
||||
});
|
||||
|
||||
app(CaseAutomation::class)->advance($booking);
|
||||
|
||||
return $booking->refresh();
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@ public function conflictsFor(BlockedPeriod $block): array
|
||||
$period = $block->starts_on->format('d.m.Y').' – '.$block->ends_on->format('d.m.Y');
|
||||
|
||||
$bookings = $property->bookings()->occupying()->overlapping($block->starts_on, $block->ends_on)->with('guest')->get()
|
||||
->map(fn (Booking $booking): string => "{$channelName} meldet {$period}, überschneidet sich mit Buchung {$booking->reference} ({$booking->guest->full_name}, {$booking->arrival->format('d.m.Y')} – {$booking->departure->format('d.m.Y')})");
|
||||
->map(fn (Booking $booking): string => "{$channelName} meldet {$period}, überschneidet sich mit Buchung {$booking->reference} ({$booking->guestName()}, {$booking->arrival->format('d.m.Y')} – {$booking->departure->format('d.m.Y')})");
|
||||
|
||||
$blocks = $property->blockedPeriods()
|
||||
->occupying()
|
||||
|
||||
@@ -41,6 +41,16 @@ public function properties(Channel $channel, Booking|BlockedPeriod $occupation):
|
||||
/** @return array<string, string|null> */
|
||||
public function context(Booking|BlockedPeriod $occupation): array
|
||||
{
|
||||
// Own use, private stays and blocks (A6) are exported exactly like the manual blocks they replace: no reference;
|
||||
// a guest's name only where the channel exports names at all.
|
||||
if ($occupation instanceof Booking && $occupation->isInternal()) {
|
||||
$guest = $occupation->guest?->anonymized_at === null ? $occupation->guest : null;
|
||||
|
||||
return ['occupation_label' => 'Belegt', 'property_name' => $occupation->property->name, 'arrival' => $occupation->arrival->format('d.m.Y'),
|
||||
'departure' => $occupation->departure->format('d.m.Y'), 'nights' => (string) (int) $occupation->arrival->diffInDays($occupation->departure), 'channel_name' => null,
|
||||
...($guest !== null ? ['guest_first_name' => $guest->first_name, 'guest_full_name' => filled($guest->last_name) ? $guest->full_name : null] : [])];
|
||||
}
|
||||
|
||||
$booking = $occupation instanceof Booking;
|
||||
$start = $booking ? $occupation->arrival : $occupation->starts_on;
|
||||
$end = $booking ? $occupation->departure : $occupation->ends_on;
|
||||
|
||||
@@ -33,7 +33,8 @@ public function build(Channel $channel): string
|
||||
}
|
||||
foreach ($bookings->with(['guest', 'property'])->orderBy('id')->get() as $booking) {
|
||||
/** @var Booking $booking */
|
||||
$events[] = $this->event("booking-{$booking->id}{$suffix}", $booking->arrival, $booking->departure, $booking->updated_at, (new ICalExportFields)->properties($channel, $booking));
|
||||
// A block taken over as a case keeps the identity the portals already know.
|
||||
$events[] = $this->event(($booking->export_uid ?? "booking-{$booking->id}").$suffix, $booking->arrival, $booking->departure, $booking->updated_at, (new ICalExportFields)->properties($channel, $booking));
|
||||
}
|
||||
|
||||
$blocks = $property->blockedPeriods()
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace App\Channels\Intake;
|
||||
|
||||
use App\Enums\CaseType;
|
||||
use App\Enums\IntakeOutcome;
|
||||
use App\Models\Booking;
|
||||
|
||||
/**
|
||||
* What the intake recognised in one incoming portal event, with its reasons in plain words.
|
||||
*/
|
||||
final class IntakeDecision
|
||||
{
|
||||
/**
|
||||
* @param list<string> $reasons why the intake decided so
|
||||
* @param list<string> $missing what the new case will not know yet
|
||||
*/
|
||||
public function __construct(
|
||||
public readonly IntakeOutcome $outcome,
|
||||
public readonly array $reasons = [],
|
||||
public readonly ?Booking $booking = null,
|
||||
public readonly ?CaseType $caseType = null,
|
||||
public readonly array $missing = [],
|
||||
public readonly ?string $reference = null,
|
||||
) {}
|
||||
|
||||
public function withBooking(Booking $booking): self
|
||||
{
|
||||
return new self($this->outcome, $this->reasons, $booking, $this->caseType ?? $booking->case_type, $this->missing, $this->reference);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $reasons
|
||||
*/
|
||||
public function as(IntakeOutcome $outcome, array $reasons): self
|
||||
{
|
||||
return new self($outcome, $reasons, $this->booking, $this->caseType, $this->missing, $this->reference);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,489 @@
|
||||
<?php
|
||||
|
||||
namespace App\Channels\Intake;
|
||||
|
||||
use App\Actions\ReconcileChannelRepresentations;
|
||||
use App\Actions\TakeOverExternalBooking;
|
||||
use App\Actions\TakeOverPortalInquiry;
|
||||
use App\Channels\Mail\ParsedPortalMail;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\BookingTaskKind;
|
||||
use App\Enums\BookingTaskStatus;
|
||||
use App\Enums\CaseIntakeMode;
|
||||
use App\Enums\ChannelBookingModel;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\IntakeOutcome;
|
||||
use App\Enums\OccupationKind;
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingTask;
|
||||
use App\Models\Channel;
|
||||
use App\Models\IntakeObservation;
|
||||
use App\Models\PortalEmail;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Process\CaseLog;
|
||||
use App\Process\ProcessSettings;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Collection;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* The one intake for bookings and requests from portals (UMSETZUNGSPLAN_v0.10 §5.5, package 4). Every incoming event –
|
||||
* an entry of a portal calendar, a booking, request or cancellation e-mail – is judged the same way:
|
||||
*
|
||||
* - **Same case first** (no duplicates): an entry already linked to a case; the portal's booking reference; the same
|
||||
* portal with exactly the same nights; the calendar mirror of an entry that belongs to a case. Different references
|
||||
* or overlapping but different dates are never merged – they are clarified.
|
||||
* - **New case only when certain**: a booking e-mail of the portal with dates and reference, or a calendar entry that
|
||||
* the channel's rules recognise as a reservation booked at this portal (or that the landlord classified so). Blocks,
|
||||
* mirrors of other portals, own use and unrecognised entries never become cases by themselves.
|
||||
* - **Reports about known cases** (cancellation e-mail, entry gone from the calendar, other dates) become a task on the
|
||||
* case and an entry in its history – the case itself is never cancelled, released or changed here (E-019).
|
||||
*
|
||||
* What happens then depends on the channel ({@see CaseIntakeMode}): nothing (off), only a record (observe), or the
|
||||
* cases and tasks are created (create; continue additionally lets the new cases follow the automatic handling).
|
||||
* Creating a case never sends anything the landlord did not release (package 3).
|
||||
*/
|
||||
class PortalIntake
|
||||
{
|
||||
public const LINK_NOTE = 'Automatisch dem Vorgang zugeordnet; der Vorgang führt diese Belegung.';
|
||||
|
||||
public function __construct(
|
||||
private TakeOverExternalBooking $takeOver,
|
||||
private TakeOverPortalInquiry $inquiry,
|
||||
private ProcessSettings $settings,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Judges one portal calendar entry or e-mail block without changing anything.
|
||||
*/
|
||||
public function evaluate(BlockedPeriod $block): IntakeDecision
|
||||
{
|
||||
$block->loadMissing(['channel', 'property', 'canonicalBlock', 'linkedBooking']);
|
||||
$channel = $block->channel;
|
||||
$reference = self::reference($block);
|
||||
|
||||
if ($channel === null || ! in_array($block->source, ['channel', 'email'], true)) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Kein importierter Portaleintrag.'], reference: $reference);
|
||||
}
|
||||
if ($block->trashed()) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Nicht mehr im Kalender des Portals.'], reference: $reference);
|
||||
}
|
||||
if ($block->linked_booking_id !== null && $block->linkedBooking !== null) {
|
||||
return new IntakeDecision(IntakeOutcome::Link, ['Bereits dem Vorgang zugeordnet.'], $block->linkedBooking, reference: $reference);
|
||||
}
|
||||
if ($block->is_representation) {
|
||||
$leaderCase = $block->canonicalBlock?->linkedBooking;
|
||||
|
||||
return $leaderCase !== null
|
||||
? new IntakeDecision(IntakeOutcome::Link, ['Spiegelung einer Belegung, die zu diesem Vorgang gehört.'], $leaderCase, reference: $reference)
|
||||
: new IntakeDecision(IntakeOutcome::Ignore, ['Spiegelung einer anderen Belegung, keine eigene Buchung.'], reference: $reference);
|
||||
}
|
||||
|
||||
if ($reference !== null && ($case = $this->caseByReference($channel, $reference)) !== null) {
|
||||
return new IntakeDecision(IntakeOutcome::Link, ['Gleiche Buchungsnummer '.$reference.' wie der Vorgang.'], $case, reference: $reference);
|
||||
}
|
||||
|
||||
if ($block->ends_on->lessThanOrEqualTo(CarbonImmutable::today())) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Liegt in der Vergangenheit.'], reference: $reference);
|
||||
}
|
||||
if ($block->occupationKind() === OccupationKind::Block) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Als Sperrzeit eingeordnet (z. B. Spiegelung, eigene Nutzung oder Wartung).'], reference: $reference);
|
||||
}
|
||||
if ($block->is_private) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Als private Belegung eingeordnet.'], reference: $reference);
|
||||
}
|
||||
|
||||
$origin = $block->origin_channel_id;
|
||||
if ($origin !== null && $origin !== $channel->id) {
|
||||
$case = $this->caseWithSameNights($block, $origin);
|
||||
|
||||
return $case !== null
|
||||
? new IntakeDecision(IntakeOutcome::Link, ['Laut Kalender über ein anderes Portal gebucht; dort gibt es den Vorgang mit genau diesen Nächten.'], $case, reference: $reference)
|
||||
: new IntakeDecision(IntakeOutcome::Clarify, ['Laut Kalender über ein anderes Portal gebucht – der Vorgang entsteht dort, nicht hier.'], reference: $reference);
|
||||
}
|
||||
|
||||
$case = $this->caseWithSameNights($block, $channel->id);
|
||||
if ($case !== null) {
|
||||
return filled($case->portal_reference) && $reference !== null && $case->portal_reference !== $reference
|
||||
? new IntakeDecision(IntakeOutcome::Clarify, ['Gleiche Nächte wie Vorgang '.$case->reference.', aber andere Buchungsnummer ('.$reference.' / '.$case->portal_reference.').'], reference: $reference)
|
||||
: new IntakeDecision(IntakeOutcome::Link, ['Dasselbe Portal mit genau denselben Nächten wie Vorgang '.$case->reference.'.'], $case, reference: $reference);
|
||||
}
|
||||
|
||||
$overlap = Booking::query()->occupying()->where('property_id', $block->property_id)->overlapping($block->starts_on, $block->ends_on)->first();
|
||||
if ($overlap !== null) {
|
||||
return new IntakeDecision(IntakeOutcome::Clarify, ['Überschneidet sich mit Vorgang '.$overlap->reference.' ('.$overlap->arrival->format('d.m.').'–'.$overlap->departure->format('d.m.Y').'), ohne dieselbe Buchung zu sein.'], reference: $reference);
|
||||
}
|
||||
$sameChannelOverlap = $channel->blockedPeriods()->occupying()->whereKeyNot($block->id)->overlapping($block->starts_on, $block->ends_on)->exists();
|
||||
if ($sameChannelOverlap) {
|
||||
return new IntakeDecision(IntakeOutcome::Clarify, ['Weitere Einträge desselben Portals überschneiden sich – keine Zusammenführung nach Terminen.'], reference: $reference);
|
||||
}
|
||||
|
||||
$certainty = $this->certainty($block, $reference);
|
||||
if ($certainty !== null) {
|
||||
return new IntakeDecision(IntakeOutcome::Clarify, [$certainty], reference: $reference);
|
||||
}
|
||||
if ($channel->booking_model === ChannelBookingModel::Inquiry) {
|
||||
return new IntakeDecision(IntakeOutcome::Clarify, ['Über dieses Portal kommen laut Einstellung nur Anfragen – eine feste Buchung bitte bestätigen.'], reference: $reference);
|
||||
}
|
||||
|
||||
$profile = $this->settings->resolve($block->property, $channel, IntakeKind::Booking);
|
||||
$fields = (array) ($block->ical_interpretation['fields'] ?? []);
|
||||
|
||||
return new IntakeDecision(
|
||||
IntakeOutcome::Create,
|
||||
[$block->source === 'email' ? 'Buchungsmail von '.$channel->name.' mit Zeitraum und Buchungsnummer.' : 'Kalendereintrag nach Regel „'.($block->ical_interpretation['rule'] ?? 'persönlich eingeordnet').'“ als Buchung bei '.$channel->name.' erkannt.'],
|
||||
caseType: $profile->caseType,
|
||||
missing: array_values(array_filter([
|
||||
blank($fields['guest_full_name'] ?? null) ? 'Name des Gastes' : 'Name des Gastes (nur als Hinweis aus dem Kalender)',
|
||||
'E-Mail-Adresse des Gastes',
|
||||
'Personenzahl',
|
||||
'Gesamtpreis laut Portal',
|
||||
$reference === null ? 'Buchungsnummer' : null,
|
||||
])),
|
||||
reference: $reference,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Judges an entry and acts as the channel allows: records what was recognised and – only when the channel creates
|
||||
* cases – creates the case, links the entry to its case or marks it for clarification.
|
||||
*/
|
||||
public function process(BlockedPeriod $block, string $source): IntakeDecision
|
||||
{
|
||||
$channel = $block->channel;
|
||||
$mode = $channel?->case_intake ?? CaseIntakeMode::Off;
|
||||
if (! $mode->records()) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Automatische Übernahme ist für dieses Portal aus.']);
|
||||
}
|
||||
|
||||
$decision = $this->evaluate($block);
|
||||
$applied = false;
|
||||
|
||||
if ($mode->creates()) {
|
||||
[$decision, $applied] = match ($decision->outcome) {
|
||||
IntakeOutcome::Create => $this->create($block, $decision, $mode, $source),
|
||||
IntakeOutcome::Link => [$decision, $this->link($block, $decision->booking, $decision->reasons[0] ?? '')],
|
||||
IntakeOutcome::Clarify => [$decision, $this->flag($block, $decision->reasons[0] ?? '')],
|
||||
default => [$decision, false],
|
||||
};
|
||||
}
|
||||
|
||||
$this->record($channel, $mode, $source, $decision, $applied, $block, null, $block->starts_on, $block->ends_on);
|
||||
|
||||
return $decision;
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes over an existing portal entry by an explicit run of the landlord or operator (stock adoption), whatever the
|
||||
* channel's switch says: certain bookings become cases (released by hand, never automatic), entries of known cases
|
||||
* are linked, everything else is only reported.
|
||||
*/
|
||||
public function adopt(BlockedPeriod $block): IntakeDecision
|
||||
{
|
||||
$decision = $this->evaluate($block);
|
||||
$applied = false;
|
||||
|
||||
if ($decision->outcome === IntakeOutcome::Create) {
|
||||
[$decision, $applied] = $this->create($block, $decision, CaseIntakeMode::Create, IntakeObservation::SOURCE_ADOPTION);
|
||||
} elseif ($decision->outcome === IntakeOutcome::Link) {
|
||||
$applied = $this->link($block, $decision->booking, $decision->reasons[0] ?? '');
|
||||
}
|
||||
|
||||
$this->record($block->channel, CaseIntakeMode::Create, IntakeObservation::SOURCE_ADOPTION, $decision, $applied, $block, null, $block->starts_on, $block->ends_on);
|
||||
|
||||
return $decision;
|
||||
}
|
||||
|
||||
/**
|
||||
* After a calendar sync: new or changed entries of the channel go through the intake; entries of known cases that
|
||||
* disappeared or show other nights become reports on the case.
|
||||
*/
|
||||
public function afterSync(Channel $channel): void
|
||||
{
|
||||
$mode = $channel->case_intake ?? CaseIntakeMode::Off;
|
||||
if (! $mode->records()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$open = $channel->blockedPeriods()->whereIn('source', ['channel', 'email'])->whereNull('linked_booking_id')
|
||||
->where('is_representation', false)->whereDate('ends_on', '>', CarbonImmutable::today())->orderBy('starts_on')->get();
|
||||
foreach ($open as $block) {
|
||||
$this->process($block, IntakeObservation::SOURCE_CALENDAR);
|
||||
}
|
||||
|
||||
$linked = $channel->blockedPeriods()->withTrashed()->with('linkedBooking')->where('source', 'channel')->whereNotNull('linked_booking_id')
|
||||
->whereHas('linkedBooking', fn ($query) => $query->whereIn('status', BookingStatus::occupying())->whereDate('departure', '>', CarbonImmutable::today()))->get();
|
||||
foreach ($linked as $block) {
|
||||
$case = $block->linkedBooking;
|
||||
if ($block->trashed()) {
|
||||
$this->report($channel, $mode, $case, IntakeOutcome::CancellationSignal, 'Der Eintrag '.$block->starts_on->format('d.m.').'–'.$block->ends_on->format('d.m.Y').' ist aus dem Kalender von '.$channel->name.' verschwunden. Das kann eine Stornierung sein, ist aber kein Nachweis – bitte im Portal prüfen.', 'gone:'.$block->id, IntakeObservation::SOURCE_CALENDAR, $block);
|
||||
} elseif (! $block->starts_on->equalTo($case->arrival) || ! $block->ends_on->equalTo($case->departure)) {
|
||||
$this->report($channel, $mode, $case, IntakeOutcome::ChangeSignal, 'Der Kalender von '.$channel->name.' meldet '.$block->starts_on->format('d.m.').'–'.$block->ends_on->format('d.m.Y').', der Vorgang hat '.$case->arrival->format('d.m.').'–'.$case->departure->format('d.m.Y').'. Bitte prüfen, ob die Buchung im Portal geändert wurde.', 'dates:'.$block->id.':'.$block->starts_on->toDateString().':'.$block->ends_on->toDateString(), IntakeObservation::SOURCE_CALENDAR, $block);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A portal e-mail reporting a cancellation: the case learns about it as a task; nothing is cancelled.
|
||||
*
|
||||
* @return Booking|null the case the report belongs to
|
||||
*/
|
||||
public function cancellationMail(Channel $channel, ParsedPortalMail $parsed, PortalEmail $mail): ?Booking
|
||||
{
|
||||
$case = $parsed->reference !== null ? $this->caseByReference($channel, $parsed->reference) : null;
|
||||
$mode = $channel->case_intake ?? CaseIntakeMode::Off;
|
||||
if ($case === null || ! $case->isBinding()) {
|
||||
$this->record($channel, $mode, IntakeObservation::SOURCE_MAIL, new IntakeDecision(IntakeOutcome::Clarify, [$parsed->reference === null ? 'Stornierungsmail ohne Buchungsnummer – keinem Vorgang sicher zuzuordnen.' : 'Kein gebuchter Vorgang mit der Buchungsnummer '.$parsed->reference.'.'], reference: $parsed->reference), false, null, $mail, $parsed->startsOn, $parsed->endsOn);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
$this->report($channel, $mode, $case, IntakeOutcome::CancellationSignal, $channel->name.' meldet eine Stornierung (E-Mail „'.$mail->subject.'“). Bitte prüfen Sie die Buchung und die nächsten Schritte.', 'mail:'.$mail->message_id, IntakeObservation::SOURCE_MAIL, null, $mail);
|
||||
|
||||
return $case;
|
||||
}
|
||||
|
||||
/**
|
||||
* A request e-mail of a portal: a request case with the dates and the reference (A2), when the channel creates
|
||||
* cases; otherwise only recorded.
|
||||
*/
|
||||
public function inquiryMail(Channel $channel, ParsedPortalMail $parsed, PortalEmail $mail): IntakeDecision
|
||||
{
|
||||
$mode = $channel->case_intake ?? CaseIntakeMode::Off;
|
||||
if (! $mode->records()) {
|
||||
return new IntakeDecision(IntakeOutcome::Ignore, ['Automatische Übernahme ist für dieses Portal aus.']);
|
||||
}
|
||||
|
||||
$profile = $this->settings->resolve($channel->property, $channel, IntakeKind::Inquiry);
|
||||
$decision = match (true) {
|
||||
! $parsed->hasPeriod() => new IntakeDecision(IntakeOutcome::Clarify, ['Anfrage erkannt, aber An- und Abreise nicht sicher lesbar.'], reference: $parsed->reference),
|
||||
$parsed->reference !== null && ($case = $this->caseByReference($channel, $parsed->reference)) !== null => new IntakeDecision(IntakeOutcome::Link, ['Gleiche Anfragenummer '.$parsed->reference.' wie der Vorgang.'], $case, reference: $parsed->reference),
|
||||
$parsed->endsOn->lessThanOrEqualTo(CarbonImmutable::today()) => new IntakeDecision(IntakeOutcome::Ignore, ['Liegt in der Vergangenheit.'], reference: $parsed->reference),
|
||||
default => new IntakeDecision(IntakeOutcome::Inquiry, ['Anfrage-Mail von '.$channel->name.' mit Zeitraum.'], caseType: $profile->caseType, missing: ['Name und E-Mail-Adresse des Gastes', 'Personenzahl'], reference: $parsed->reference),
|
||||
};
|
||||
|
||||
$applied = false;
|
||||
if ($mode->creates() && $decision->outcome === IntakeOutcome::Inquiry) {
|
||||
try {
|
||||
$case = $this->inquiry->handle($channel, $parsed->startsOn, $parsed->endsOn, $parsed->reference, 'Automatisch aus der Anfrage-Mail von '.$channel->name.' übernommen („'.$mail->subject.'“).', $mode === CaseIntakeMode::Create ? ProcessingMode::Manual : null);
|
||||
CaseLog::record($case, 'intake', 'Automatisch aus der Anfrage-Mail von '.$channel->name.' angelegt', actor: CaseLog::SYSTEM, data: ['source' => IntakeObservation::SOURCE_MAIL, 'message_id' => $mail->message_id]);
|
||||
$decision = $decision->withBooking($case);
|
||||
$applied = true;
|
||||
} catch (ReservationException|QuoteException $exception) {
|
||||
$decision = $decision->as(IntakeOutcome::Clarify, ['Anfrage nicht automatisch übernommen: '.$exception->getMessage()]);
|
||||
}
|
||||
}
|
||||
|
||||
$this->record($channel, $mode, IntakeObservation::SOURCE_MAIL, $decision, $applied, null, $mail, $parsed->startsOn, $parsed->endsOn);
|
||||
|
||||
return $decision;
|
||||
}
|
||||
|
||||
/**
|
||||
* The portal's booking reference of an entry: extracted by the calendar rules, or the one of a booking e-mail.
|
||||
*/
|
||||
public static function reference(BlockedPeriod $block): ?string
|
||||
{
|
||||
$fromRules = $block->ical_interpretation['fields']['booking_reference'] ?? null;
|
||||
if (filled($fromRules)) {
|
||||
return trim((string) $fromRules);
|
||||
}
|
||||
|
||||
if ($block->source === 'email' && str_starts_with((string) $block->external_uid, 'email:')) {
|
||||
$reference = substr((string) $block->external_uid, 6);
|
||||
|
||||
// Mails without a reference got a random identifier, which is no booking reference.
|
||||
return preg_match('/^[0-9a-f]{32}$/', $reference) === 1 ? null : $reference;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The case of a portal booking with this reference: on the case itself or on an entry that belongs to a case.
|
||||
*/
|
||||
public function caseByReference(Channel $channel, string $reference): ?Booking
|
||||
{
|
||||
$case = Booking::query()->where('portal_reference', $reference)
|
||||
->where(fn ($query) => $query->where('origin_channel_id', $channel->id)->orWhere('import_channel_id', $channel->id))
|
||||
->orderBy('id')->first();
|
||||
if ($case !== null) {
|
||||
return $case;
|
||||
}
|
||||
|
||||
$linked = $channel->blockedPeriods()->withTrashed()->whereNotNull('linked_booking_id')
|
||||
->whereIn('external_uid', [$reference, 'email:'.$reference])->value('linked_booking_id');
|
||||
|
||||
return $linked !== null ? Booking::query()->find($linked) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The one occupying case of this portal with exactly these nights (more than one: none – that is for a person).
|
||||
*/
|
||||
private function caseWithSameNights(BlockedPeriod $block, int $channelId): ?Booking
|
||||
{
|
||||
/** @var Collection<int, Booking> $cases */
|
||||
$cases = Booking::query()->occupying()->where('property_id', $block->property_id)
|
||||
->whereDate('arrival', $block->starts_on)->whereDate('departure', $block->ends_on)
|
||||
->where(fn ($query) => $query->where('origin_channel_id', $channelId)->orWhere('import_channel_id', $channelId))
|
||||
->get();
|
||||
|
||||
return $cases->count() === 1 ? $cases->first() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Null when the entry is certainly a booking of its portal, otherwise why not.
|
||||
*/
|
||||
private function certainty(BlockedPeriod $block, ?string $reference): ?string
|
||||
{
|
||||
if ($block->needs_review && ! in_array($block->review_note, [ReconcileChannelRepresentations::OVERLAP_NOTE], true)) {
|
||||
return 'Prüfhinweis am Eintrag: '.($block->review_note ?? 'bitte prüfen').'.';
|
||||
}
|
||||
|
||||
if ($block->source === 'email') {
|
||||
return $reference === null ? 'Buchungsmail ohne Buchungsnummer – ohne Nummer lässt sich ein späterer Kalendereintrag nicht sicher zuordnen.' : null;
|
||||
}
|
||||
|
||||
// Classified by the landlord as a reservation booked at this portal.
|
||||
if ($block->occupation_kind === OccupationKind::Reservation && $block->reviewed_at !== null && $block->origin_channel_id === $block->channel_id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$interpretation = (array) ($block->ical_interpretation ?? []);
|
||||
if (! ($interpretation['matched'] ?? false)) {
|
||||
return 'Kein Kalendermerkmal erkannt – eine reine Belegt-Meldung ist kein Nachweis einer Buchung.';
|
||||
}
|
||||
if (($interpretation['event_type'] ?? null) !== 'portal_reservation') {
|
||||
return 'Die Regel „'.($interpretation['rule'] ?? '').'“ ordnet den Eintrag nicht als Buchung ein.';
|
||||
}
|
||||
if (($interpretation['representation'] ?? null) !== 'leading_candidate' || $block->origin_channel_id !== $block->channel_id) {
|
||||
return 'Die Regel erkennt eine Reservierung, aber nicht sicher als Buchung bei diesem Portal.';
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{IntakeDecision, bool}
|
||||
*/
|
||||
private function create(BlockedPeriod $block, IntakeDecision $decision, CaseIntakeMode $mode, string $source): array
|
||||
{
|
||||
$channel = $block->channel;
|
||||
$fields = (array) ($block->ical_interpretation['fields'] ?? []);
|
||||
$name = trim((string) ($fields['guest_full_name'] ?? $fields['guest_first_name'] ?? ''));
|
||||
$origin = match ($source) {
|
||||
IntakeObservation::SOURCE_MAIL => 'der Buchungsmail',
|
||||
IntakeObservation::SOURCE_ADOPTION => 'dem Bestand der Portalbelegungen',
|
||||
default => 'dem Kalender',
|
||||
};
|
||||
|
||||
try {
|
||||
$case = $this->takeOver->handle($block->property, $channel, CarbonImmutable::parse($block->starts_on), CarbonImmutable::parse($block->ends_on), [
|
||||
'portal_reference' => $decision->reference,
|
||||
'notes' => 'Automatisch aus '.$origin.' von '.$channel->name.' übernommen.'.($name !== '' ? ' Name laut Portal: '.$name.'.' : ''),
|
||||
'processing_mode' => $mode === CaseIntakeMode::Create ? ProcessingMode::Manual : null,
|
||||
], $block);
|
||||
} catch (ReservationException $exception) {
|
||||
$this->flag($block, 'Nicht automatisch übernommen: '.$exception->getMessage());
|
||||
|
||||
return [$decision->as(IntakeOutcome::Clarify, ['Nicht automatisch übernommen: '.$exception->getMessage()]), false];
|
||||
}
|
||||
|
||||
CaseLog::record($case, 'intake', 'Automatisch aus '.$origin.' von '.$channel->name.' angelegt', actor: CaseLog::SYSTEM, data: ['source' => $source, 'blocked_period_id' => $block->id, 'reference' => $decision->reference]);
|
||||
|
||||
return [$decision->withBooking($case), true];
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes the entry a mirror of its case (the case leads availability and export).
|
||||
*/
|
||||
private function link(BlockedPeriod $block, ?Booking $case, string $reason): bool
|
||||
{
|
||||
if ($case === null || $block->linked_booking_id === $case->id || $block->is_representation) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$block->forceFill([
|
||||
'is_representation' => true, 'representation_automatic' => false, 'canonical_block_id' => null,
|
||||
'linked_booking_id' => $case->id, 'export_approved' => false, 'needs_review' => false, 'reviewed_at' => now(),
|
||||
'occupation_kind' => OccupationKind::Reservation, 'review_note' => self::LINK_NOTE,
|
||||
])->save();
|
||||
app(ReconcileChannelRepresentations::class)->handle($block->property);
|
||||
CaseLog::record($case, 'intake', 'Weitere Quelle zugeordnet: '.($block->source === 'email' ? 'E-Mail' : 'Kalender').' von '.$block->channel?->name.' ('.$block->starts_on->format('d.m.').'–'.$block->ends_on->format('d.m.Y').')', $reason, actor: CaseLog::SYSTEM, data: ['blocked_period_id' => $block->id]);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Puts an uncertain entry in front of the landlord ("Zu erledigen") with the reason.
|
||||
*/
|
||||
private function flag(BlockedPeriod $block, string $reason): bool
|
||||
{
|
||||
if ($block->needs_review || $block->reviewed_at !== null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$block->forceFill(['needs_review' => true, 'review_note' => mb_substr($reason, 0, 250)])->saveQuietly();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* A report of the portal about a known case: a task and an entry in the history – once per report.
|
||||
*/
|
||||
private function report(Channel $channel, CaseIntakeMode $mode, Booking $case, IntakeOutcome $outcome, string $message, string $key, string $source, ?BlockedPeriod $block = null, ?PortalEmail $mail = null): void
|
||||
{
|
||||
$fingerprint = hash('sha256', $channel->id.'|signal|'.$key);
|
||||
$known = $case->events()->where('type', 'portal_signal')->get()->contains(fn ($event): bool => ($event->data['fingerprint'] ?? null) === $fingerprint);
|
||||
$applied = false;
|
||||
|
||||
if ($mode->creates() && ! $known) {
|
||||
$kind = $outcome === IntakeOutcome::CancellationSignal ? BookingTaskKind::PortalCancellationReported : BookingTaskKind::PortalChangeReported;
|
||||
$task = BookingTask::query()->firstOrNew(['booking_id' => $case->id, 'kind' => $kind]);
|
||||
$task->forceFill(['tenant_id' => $case->tenant_id, 'status' => BookingTaskStatus::Open, 'due_on' => today(), 'note' => mb_substr($message, 0, 1000), 'completed_by' => null, 'completed_at' => null])->save();
|
||||
CaseLog::record($case, 'portal_signal', $message, actor: $channel->name, data: ['fingerprint' => $fingerprint, 'source' => $source]);
|
||||
$applied = true;
|
||||
}
|
||||
|
||||
$this->record($channel, $mode, $source, new IntakeDecision($outcome, [$message], $case, $case->case_type), $applied, $block, $mail, $block?->starts_on ?? $case->arrival, $block?->ends_on ?? $case->departure, $key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Records the decision once per event and result (repeated syncs and mails add nothing).
|
||||
*/
|
||||
private function record(?Channel $channel, CaseIntakeMode $mode, string $source, IntakeDecision $decision, bool $applied, ?BlockedPeriod $block, ?PortalEmail $mail, mixed $startsOn, mixed $endsOn, ?string $key = null): void
|
||||
{
|
||||
if ($channel === null || ! $mode->records()) {
|
||||
return;
|
||||
}
|
||||
|
||||
$fingerprint = hash('sha256', implode('|', [
|
||||
$channel->id, $mode->value, $decision->outcome->value, $key ?? '',
|
||||
$block?->id ?? '', $mail?->message_id ?? '', $decision->booking?->id ?? '',
|
||||
$startsOn instanceof \DateTimeInterface ? $startsOn->format('Y-m-d') : (string) $startsOn,
|
||||
$endsOn instanceof \DateTimeInterface ? $endsOn->format('Y-m-d') : (string) $endsOn,
|
||||
]));
|
||||
|
||||
try {
|
||||
$observation = IntakeObservation::query()->firstOrNew(['fingerprint' => $fingerprint]);
|
||||
if ($observation->exists) {
|
||||
return;
|
||||
}
|
||||
$observation->fill([
|
||||
'channel_id' => $channel->id, 'blocked_period_id' => $block?->id, 'portal_email_id' => $mail?->id,
|
||||
'booking_id' => $decision->booking?->id, 'source' => $source, 'mode' => $mode, 'outcome' => $decision->outcome,
|
||||
'applied' => $applied, 'case_type' => $decision->caseType?->value, 'reference' => $decision->reference,
|
||||
'starts_on' => $startsOn, 'ends_on' => $endsOn, 'reasons' => $decision->reasons, 'missing' => $decision->missing,
|
||||
'occurred_at' => now(),
|
||||
]);
|
||||
$observation->tenant_id = $channel->tenant_id;
|
||||
$observation->save();
|
||||
} catch (Throwable $exception) {
|
||||
// The record must never stop the intake itself.
|
||||
report($exception);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\InternalKind;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Tenant;
|
||||
use App\Process\CaseLog;
|
||||
use App\Process\ProcessSettings;
|
||||
use App\Tenancy\TenantRunner;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
#[Signature('cases:adopt-blocks
|
||||
{--apply : Wirklich übernehmen (ohne: nur Vorschau)}
|
||||
{--revert= : Eine frühere Übernahme anhand ihres Berichts zurücknehmen}')]
|
||||
#[Description('Bisherige manuelle Sperren als A6-Vorgänge übernehmen (Vorschau, Bericht, wiederholbar, rücknehmbar); der Kalenderexport für die Portale bleibt gleich')]
|
||||
class AdoptManualBlocks extends Command
|
||||
{
|
||||
private const DIRECTORY = 'block-adoptions';
|
||||
|
||||
private const ADOPTED = 'übernommen';
|
||||
|
||||
public function handle(TenantRunner $runner, ProcessSettings $settings): int
|
||||
{
|
||||
if (filled($this->option('revert'))) {
|
||||
return $this->revert((string) $this->option('revert'));
|
||||
}
|
||||
|
||||
$apply = (bool) $this->option('apply');
|
||||
$report = ['run' => now()->format('Ymd-His'), 'apply' => $apply, 'entries' => []];
|
||||
|
||||
$succeeded = $runner->each(function (Tenant $tenant) use ($apply, $settings, &$report): void {
|
||||
$blocks = BlockedPeriod::query()->with(['property', 'guest'])->where('source', 'manual')->whereNull('linked_booking_id')->orderBy('starts_on')->get();
|
||||
foreach ($blocks as $block) {
|
||||
$kind = $block->guest_id !== null ? InternalKind::PrivateStay : InternalKind::fromPurpose($block->block_purpose);
|
||||
$entry = [
|
||||
'tenant' => $tenant->id, 'blocked_period_id' => $block->id, 'property' => $block->property?->name,
|
||||
'period' => $block->starts_on->format('d.m.Y').'–'.$block->ends_on->format('d.m.Y'), 'kind' => $kind->value,
|
||||
'occasion' => $block->block_note ?: $block->reason, 'booking_id' => null, 'result' => 'neu',
|
||||
];
|
||||
|
||||
if (Booking::query()->where('export_uid', 'block-'.$block->id)->exists()) {
|
||||
$entry['result'] = 'schon übernommen';
|
||||
} elseif (Booking::query()->occupying()->where('property_id', $block->property_id)->overlapping($block->starts_on, $block->ends_on)->exists()) {
|
||||
$entry['result'] = 'unklar: überschneidet sich mit einem Vorgang – nicht übernommen';
|
||||
} elseif ($apply) {
|
||||
$entry['booking_id'] = $this->adopt($block, $kind, $settings)->id;
|
||||
$entry['result'] = self::ADOPTED;
|
||||
}
|
||||
$report['entries'][] = $entry;
|
||||
}
|
||||
});
|
||||
|
||||
$this->table(['Wohnung', 'Zeitraum', 'Art', 'Anlass', 'Ergebnis', 'Vorgang'], array_map(fn (array $entry): array => [
|
||||
$entry['property'], $entry['period'], InternalKind::from($entry['kind'])->getLabel(), $entry['occasion'], $entry['result'], $entry['booking_id'] ? '#'.$entry['booking_id'] : '–',
|
||||
], $report['entries']));
|
||||
|
||||
$suffix = $apply ? '' : '-vorschau';
|
||||
$path = self::DIRECTORY.'/'.$report['run'].$suffix.'.json';
|
||||
for ($number = 2; Storage::disk('local')->exists($path); $number++) {
|
||||
$path = self::DIRECTORY.'/'.$report['run'].$suffix.'-'.$number.'.json';
|
||||
}
|
||||
Storage::disk('local')->put($path, json_encode($report, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
|
||||
|
||||
$counts = collect($report['entries'])->countBy('result')->map(fn (int $count, string $result): string => $result.' '.$count)->implode(', ');
|
||||
$this->info(($apply ? 'Übernommen' : 'Vorschau – nichts geändert').': '.($counts ?: 'keine manuellen Sperren'));
|
||||
$this->line('Bericht: storage/app/private/'.$path.($apply ? ' (Rücknahme: --revert='.$path.')' : ''));
|
||||
|
||||
if ($succeeded < $runner->tenants()->count()) {
|
||||
$this->error('Bei mindestens einem Vermieter ist ein Fehler aufgetreten – Details im Protokoll (storage/logs).');
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* The block becomes a case without any side effect: no portal tasks and no mails (the portals have the dates
|
||||
* already), the same export identity and time stamp; the block is kept (deleted softly) for a revert.
|
||||
*/
|
||||
private function adopt(BlockedPeriod $block, InternalKind $kind, ProcessSettings $settings): Booking
|
||||
{
|
||||
return DB::transaction(function () use ($block, $kind, $settings): Booking {
|
||||
$profile = $settings->resolve($block->property, null, IntakeKind::Internal)->withOrigin('migration');
|
||||
$booking = Model::withoutEvents(function () use ($block, $kind, $profile): Booking {
|
||||
$booking = new Booking([
|
||||
'status' => BookingStatus::Confirmed, 'source' => 'internal', 'intake' => IntakeKind::Internal, 'internal_kind' => $kind,
|
||||
'occasion' => $block->block_note ?: $block->reason, 'arrival' => $block->starts_on->toDateString(), 'departure' => $block->ends_on->toDateString(),
|
||||
'export_uid' => 'block-'.$block->id, 'confirmed_at' => $block->created_at,
|
||||
]);
|
||||
$booking->forceFill([
|
||||
'tenant_id' => $block->tenant_id, 'property_id' => $block->property_id, 'guest_id' => $block->guest_id,
|
||||
'case_type' => $profile->caseType, 'profile' => $profile->toArray(),
|
||||
'created_at' => $block->created_at, 'updated_at' => $block->updated_at,
|
||||
]);
|
||||
$booking->timestamps = false;
|
||||
$booking->save();
|
||||
// Dates are only cast while timestamps are on; the reference counts by the year of creation.
|
||||
$booking->timestamps = true;
|
||||
$reference = $booking->refresh()->nextReference();
|
||||
$booking->timestamps = false;
|
||||
$booking->forceFill(['reference' => $reference])->save();
|
||||
|
||||
$block->forceFill(['linked_booking_id' => $booking->id, 'review_note' => 'In Vorgang übernommen (A6).'])->saveQuietly();
|
||||
$block->deleteQuietly();
|
||||
|
||||
return $booking;
|
||||
});
|
||||
CaseLog::record($booking, 'intake', 'Aus der bisherigen Sperrzeitenliste übernommen'.($booking->occasion ? ': '.$booking->occasion : ''), actor: CaseLog::SYSTEM, data: ['blocked_period_id' => $block->id]);
|
||||
|
||||
return $booking;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes an adoption back: the block comes back as it was and the case created by the run goes – unless somebody has
|
||||
* worked on the case since (then it is reported and kept).
|
||||
*/
|
||||
private function revert(string $path): int
|
||||
{
|
||||
if (! Storage::disk('local')->exists($path)) {
|
||||
$this->error('Bericht nicht gefunden: '.$path);
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
$report = json_decode((string) Storage::disk('local')->get($path), true);
|
||||
$kept = [];
|
||||
foreach ((array) ($report['entries'] ?? []) as $entry) {
|
||||
if (($entry['result'] ?? null) !== self::ADOPTED) {
|
||||
continue;
|
||||
}
|
||||
$booking = Booking::query()->withoutGlobalScopes()->find($entry['booking_id']);
|
||||
if ($booking !== null && $booking->events()->where('type', '!=', 'intake')->exists()) {
|
||||
$kept[] = $booking->reference;
|
||||
|
||||
continue;
|
||||
}
|
||||
Model::withoutEvents(function () use ($entry, $booking): void {
|
||||
$block = BlockedPeriod::query()->withoutGlobalScopes()->withTrashed()->find($entry['blocked_period_id']);
|
||||
$block?->forceFill(['linked_booking_id' => null, 'review_note' => null, 'deleted_at' => null])->saveQuietly();
|
||||
$booking?->delete();
|
||||
});
|
||||
}
|
||||
|
||||
$this->info('Zurückgenommen.'.($kept === [] ? '' : ' Nicht entfernt, weil seitdem bearbeitet: '.implode(', ', $kept)));
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Channels\Intake\PortalIntake;
|
||||
use App\Enums\ChannelTaskStatus;
|
||||
use App\Enums\IntakeOutcome;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Models\ChannelTask;
|
||||
use App\Models\Tenant;
|
||||
use App\Tenancy\TenantRunner;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
#[Signature('channels:adopt-occupations
|
||||
{--channel=* : Nur diese Kanal-IDs}
|
||||
{--apply : Wirklich übernehmen (ohne: nur Vorschau)}
|
||||
{--revert= : Eine frühere Übernahme anhand ihres Berichts zurücknehmen}')]
|
||||
#[Description('Bestehende Portalbelegungen ohne Vorgang prüfen und – nur mit --apply – als Vorgang übernehmen bzw. dem vorhandenen Vorgang zuordnen (Bericht, wiederholbar, rücknehmbar)')]
|
||||
class AdoptPortalOccupations extends Command
|
||||
{
|
||||
private const DIRECTORY = 'intake-adoptions';
|
||||
|
||||
/** Attributes of an entry that an adoption changes and a revert restores. */
|
||||
private const RESTORED = ['is_representation', 'representation_automatic', 'canonical_block_id', 'linked_booking_id', 'export_approved', 'needs_review', 'reviewed_at', 'occupation_kind', 'guest_id', 'review_note'];
|
||||
|
||||
public function handle(TenantRunner $runner, PortalIntake $intake): int
|
||||
{
|
||||
if (filled($this->option('revert'))) {
|
||||
return $this->revert((string) $this->option('revert'));
|
||||
}
|
||||
|
||||
$apply = (bool) $this->option('apply');
|
||||
$report = ['run' => now()->format('Ymd-His'), 'apply' => $apply, 'entries' => [], 'channel_task_ids' => []];
|
||||
$firstTask = (int) ChannelTask::query()->withoutGlobalScopes()->max('id');
|
||||
|
||||
$succeeded = $runner->each(function (Tenant $tenant) use ($intake, $apply, &$report): void {
|
||||
$channels = Channel::query()->when($this->option('channel'), fn ($query, $ids) => $query->whereKey($ids))->orderBy('id')->get();
|
||||
foreach ($channels as $channel) {
|
||||
$entries = $channel->blockedPeriods()->whereIn('source', ['channel', 'email'])->whereNull('linked_booking_id')
|
||||
->where('is_representation', false)->whereDate('ends_on', '>', today())->orderBy('starts_on')->get();
|
||||
foreach ($entries as $entry) {
|
||||
$before = collect(self::RESTORED)->mapWithKeys(fn (string $field): array => [$field => $entry->getRawOriginal($field)])->all();
|
||||
$decision = $apply ? $intake->adopt($entry) : $intake->evaluate($entry);
|
||||
$created = $apply && $decision->outcome === IntakeOutcome::Create && $decision->booking !== null;
|
||||
$report['entries'][] = [
|
||||
'tenant' => $tenant->id, 'channel' => $channel->name, 'blocked_period_id' => $entry->id,
|
||||
'period' => $entry->starts_on->format('d.m.Y').'–'.$entry->ends_on->format('d.m.Y'),
|
||||
'outcome' => $decision->outcome->value, 'case_type' => $decision->caseType?->value, 'reference' => $decision->reference,
|
||||
'booking_id' => $decision->booking?->id, 'created' => $created, 'reasons' => $decision->reasons, 'before' => $before,
|
||||
];
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if ($apply) {
|
||||
$report['channel_task_ids'] = ChannelTask::query()->withoutGlobalScopes()->where('id', '>', $firstTask)->pluck('id')->all();
|
||||
}
|
||||
|
||||
$this->table(['Kanal', 'Zeitraum', 'Ergebnis', 'Art', 'Nr.', 'Vorgang', 'Begründung'], array_map(fn (array $entry): array => [
|
||||
$entry['channel'], $entry['period'], IntakeOutcome::from($entry['outcome'])->getLabel(), strtoupper((string) $entry['case_type']), $entry['reference'] ?? '–',
|
||||
$entry['booking_id'] ? '#'.$entry['booking_id'].($entry['created'] ? ' (neu)' : '') : '–', implode(' ', $entry['reasons']),
|
||||
], $report['entries']));
|
||||
|
||||
$path = self::DIRECTORY.'/'.$report['run'].($apply ? '' : '-vorschau').'.json';
|
||||
for ($number = 2; Storage::disk('local')->exists($path); $number++) {
|
||||
$path = self::DIRECTORY.'/'.$report['run'].($apply ? '' : '-vorschau').'-'.$number.'.json';
|
||||
}
|
||||
Storage::disk('local')->put($path, json_encode($report, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
|
||||
$counts = collect($report['entries'])->countBy('outcome');
|
||||
$this->info(($apply ? 'Übernommen' : 'Vorschau – nichts geändert').': '.$counts->map(fn (int $count, string $outcome): string => IntakeOutcome::from($outcome)->getLabel().' '.$count)->implode(', '));
|
||||
$this->line('Bericht: storage/app/private/'.$path.($apply ? ' (Rücknahme: --revert='.$path.')' : ''));
|
||||
|
||||
if ($succeeded < $runner->tenants()->count()) {
|
||||
$this->error('Bei mindestens einem Vermieter ist ein Fehler aufgetreten – Details im Protokoll (storage/logs).');
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes an adoption back: cases created by it are removed again as long as nothing has happened with them (no
|
||||
* document, no payment), and every entry gets its former state. Cases with activity are reported, not touched.
|
||||
*/
|
||||
private function revert(string $path): int
|
||||
{
|
||||
if (! Storage::disk('local')->exists($path)) {
|
||||
$this->error('Bericht nicht gefunden: '.$path);
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
$report = json_decode((string) Storage::disk('local')->get($path), true);
|
||||
if (! ($report['apply'] ?? false)) {
|
||||
$this->info('Das war eine Vorschau – es gibt nichts zurückzunehmen.');
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
$kept = [];
|
||||
foreach ((array) $report['entries'] as $entry) {
|
||||
$block = BlockedPeriod::query()->withoutGlobalScopes()->withTrashed()->find($entry['blocked_period_id']);
|
||||
$case = ($entry['created'] ?? false) ? Booking::query()->withoutGlobalScopes()->find($entry['booking_id']) : null;
|
||||
if ($case !== null && ($case->contract_path !== null || $case->confirmation_sent_at !== null || $case->payments()->withoutGlobalScopes()->exists())) {
|
||||
$kept[] = $case->reference;
|
||||
|
||||
continue;
|
||||
}
|
||||
// The entry first gets its former state (it may point to the case), then the case created by the run goes.
|
||||
if ($block !== null && in_array($entry['outcome'], [IntakeOutcome::Create->value, IntakeOutcome::Link->value], true)) {
|
||||
$block->forceFill((array) $entry['before'])->saveQuietly();
|
||||
}
|
||||
$case?->delete();
|
||||
}
|
||||
|
||||
ChannelTask::query()->withoutGlobalScopes()->whereKey((array) ($report['channel_task_ids'] ?? []))->where('status', ChannelTaskStatus::Open)
|
||||
->update(['status' => ChannelTaskStatus::Dismissed, 'automation_error' => 'Bestandsübernahme zurückgenommen.']);
|
||||
|
||||
$this->info('Zurückgenommen.'.($kept === [] ? '' : ' Nicht entfernt, weil schon bearbeitet: '.implode(', ', $kept)));
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\IntakeOutcome;
|
||||
use App\Models\IntakeObservation;
|
||||
use App\Models\Tenant;
|
||||
use App\Tenancy\TenantRunner;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
#[Signature('channels:intake-report {--days=14 : Zeitraum in Tagen}')]
|
||||
#[Description('Bericht des Eingangsprotokolls: was über die Portale hereinkam und welche Vorgänge entstanden sind oder entstanden wären')]
|
||||
class IntakeReport extends Command
|
||||
{
|
||||
public function handle(TenantRunner $runner): int
|
||||
{
|
||||
$runner->each(function (Tenant $tenant): void {
|
||||
$observations = IntakeObservation::query()->with(['channel', 'booking'])
|
||||
->where('occurred_at', '>=', now()->subDays((int) $this->option('days')))->orderBy('occurred_at')->get();
|
||||
|
||||
$this->line("<options=bold>{$tenant->name}</>: ".$observations->count().' Einträge');
|
||||
$this->table(['Wann', 'Portal', 'Quelle', 'Zeitraum', 'Ergebnis', 'Ausgeführt', 'Vorgang', 'Begründung'], $observations->map(fn (IntakeObservation $observation): array => [
|
||||
$observation->occurred_at->format('d.m. H:i'),
|
||||
$observation->channel?->name,
|
||||
$observation->sourceLabel(),
|
||||
$observation->starts_on ? $observation->starts_on->format('d.m.').'–'.$observation->ends_on?->format('d.m.Y') : '–',
|
||||
$observation->outcome->getLabel(),
|
||||
$observation->applied ? 'ja' : 'nur protokolliert',
|
||||
$observation->booking?->reference ?? '–',
|
||||
implode(' ', (array) $observation->reasons),
|
||||
])->all());
|
||||
|
||||
$wouldCreate = $observations->filter(fn (IntakeObservation $observation): bool => ! $observation->applied && in_array($observation->outcome, [IntakeOutcome::Create, IntakeOutcome::Inquiry], true))->count();
|
||||
$this->info("Wären entstanden (Beobachten): {$wouldCreate}");
|
||||
});
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Property;
|
||||
use App\Models\Tenant;
|
||||
use App\Tenancy\TenantRunner;
|
||||
use Illuminate\Console\Attributes\Description;
|
||||
use Illuminate\Console\Attributes\Signature;
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
#[Signature('process:settings-report')]
|
||||
#[Description('Show every landlord’s process defaults and all deviations of properties and channels (read only)')]
|
||||
class ProcessSettingsReport extends Command
|
||||
{
|
||||
public function handle(TenantRunner $runner): int
|
||||
{
|
||||
$runner->each(function (Tenant $tenant): void {
|
||||
$this->line('');
|
||||
$this->info($tenant->name);
|
||||
|
||||
$defaults = (array) ($tenant->process_defaults ?? []);
|
||||
foreach (ProcessSetting::cases() as $setting) {
|
||||
if (! $setting->isLandlordSetting()) {
|
||||
continue;
|
||||
}
|
||||
$value = $setting->normalize($defaults[$setting->value] ?? null);
|
||||
$this->line(' Standard · '.$setting->question().' '.$setting->describe($value ?? $setting->default()).($value === null ? ' (Grundeinstellung)' : ''));
|
||||
}
|
||||
|
||||
$rows = [];
|
||||
foreach (Property::query()->orderBy('name')->get() as $property) {
|
||||
foreach ((array) ($property->process_overrides ?? []) as $key => $value) {
|
||||
$setting = ProcessSetting::tryFrom((string) $key);
|
||||
if ($setting?->normalize($value) !== null) {
|
||||
$rows[] = ['Wohnung '.$property->name, $setting->question(), $setting->describe($setting->normalize($value))];
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (Channel::query()->with('property')->orderBy('name')->get() as $channel) {
|
||||
foreach ((array) ($channel->process_overrides ?? []) as $intake => $values) {
|
||||
foreach ((array) $values as $key => $value) {
|
||||
$setting = ProcessSetting::tryFrom((string) $key);
|
||||
if ($setting?->normalize($value) !== null) {
|
||||
$rows[] = ['Portal '.$channel->name.' ('.$channel->property?->name.', '.(IntakeKind::tryFrom((string) $intake)?->getLabel() ?? $intake).')', $setting->question(), $setting->describe($setting->normalize($value))];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$rows === [] ? $this->line(' Keine Abweichungen.') : $this->table(['Wo', 'Einstellung', 'Wert'], $rows);
|
||||
});
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
use App\Actions\AutoOffer;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\OfferMode;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Tenant;
|
||||
use App\Tenancy\TenantRunner;
|
||||
@@ -27,9 +26,9 @@ public function handle(AutoOffer $autoOffer, TenantRunner $runner): int
|
||||
->where('status', BookingStatus::Reserved)
|
||||
->where('offer_version', 0)
|
||||
->where('hold_expires_at', '>', now())
|
||||
->whereHas('property', fn ($query) => $query->where('offer_mode', OfferMode::Automatic)->where('pre_reservation_enabled', true))
|
||||
->with(['property', 'guest'])
|
||||
->get();
|
||||
->with(['property', 'guest', 'importChannel', 'originChannel'])
|
||||
->get()
|
||||
->filter(fn (Booking $booking): bool => $autoOffer->applies($booking) && $booking->process()->preReservation());
|
||||
|
||||
$sent = 0;
|
||||
foreach ($pending as $booking) {
|
||||
|
||||
@@ -25,6 +25,8 @@ public function handle(): int
|
||||
$this->line("Versandweg: {$mailer}".($mailer === 'smtp' ? ' ('.config('mail.mailers.smtp.host').':'.config('mail.mailers.smtp.port').')' : '').' · Absender: '.config('mail.from.address'));
|
||||
if (filled($redirect)) {
|
||||
$this->line("Umleitung aktiv: die Mail geht an {$redirect} statt an {$to}.");
|
||||
} elseif (! Settings::isLive()) {
|
||||
$this->warn('Testbetrieb ohne Testadresse: Es wird keine E-Mail versendet. Testempfänger unter System › Betrieb eintragen.');
|
||||
}
|
||||
if ($mailer === 'log') {
|
||||
$this->warn('Versandweg "log": es wird nichts zugestellt. Zum echten Versand MAIL_MAILER=smtp und MAIL_PASSWORD setzen (docs/BETRIEB.md §5a).');
|
||||
|
||||
@@ -106,10 +106,10 @@ private static function values(Booking $booking, array $propertyData): array
|
||||
'anreise_datum' => $booking->arrival->format('d.m.Y'),
|
||||
'abreise_datum' => $booking->departure->format('d.m.Y'),
|
||||
'naechte' => (string) $booking->nights(),
|
||||
'personen' => (string) $booking->guests,
|
||||
'gesamtpreis' => Money::format($booking->total),
|
||||
'anzahlung' => Money::format($booking->deposit),
|
||||
'restzahlung' => Money::format($booking->total - $booking->deposit),
|
||||
'personen' => $booking->guests !== null ? (string) $booking->guests : null,
|
||||
'gesamtpreis' => $booking->total !== null ? Money::format($booking->total) : null,
|
||||
'anzahlung' => $booking->deposit !== null ? Money::format($booking->deposit) : null,
|
||||
'restzahlung' => $booking->total !== null && $booking->deposit !== null ? Money::format($booking->total - $booking->deposit) : null,
|
||||
'restzahlung_faellig' => $booking->balance_due_on?->format('d.m.Y'),
|
||||
'buchungsnummer' => $booking->reference,
|
||||
'datum' => ($booking->confirmed_at ?? $booking->offer_sent_at ?? now())->format('d.m.Y'),
|
||||
|
||||
@@ -0,0 +1,405 @@
|
||||
<?php
|
||||
|
||||
namespace App\Documents;
|
||||
|
||||
use App\Actions\SendOffer;
|
||||
use App\Availability\AvailabilityChecker;
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Models\Booking;
|
||||
use App\Models\CancellationPolicy;
|
||||
use App\Models\ContractTemplate;
|
||||
use App\Models\Extra;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Process\CaseActivities;
|
||||
use App\Process\ProcessProfile;
|
||||
use App\Process\ProcessSettings;
|
||||
use App\Support\Money;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Support\Arr;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* Prepares the document a case needs (UMSETZUNGSPLAN_v0.10 §4.5, package 3): applies the landlord's adjustments to a copy
|
||||
* of the case, takes template and annexes from the process settings, captures the terms the document would freeze and
|
||||
* lists – in plain words – what is missing, what has to be confirmed and what is only worth knowing. Nothing is saved.
|
||||
*
|
||||
* Only objective criteria lead to findings (missing or contradictory data, unreleased texts, terms not shown to be
|
||||
* agreed); nationality or origin of a guest never do.
|
||||
*/
|
||||
class DocumentComposer
|
||||
{
|
||||
/** Placeholders that state payments to the landlord. */
|
||||
private const PAYMENT_PLACEHOLDERS = ['anzahlung', 'restzahlung', 'restzahlung_faellig'];
|
||||
|
||||
public function __construct(
|
||||
private SendOffer $offer,
|
||||
private AvailabilityChecker $availability,
|
||||
private ProcessSettings $settings,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $changes adjustments of the landlord (offer: dates, guests, promo code, price adjustment
|
||||
* in cents, validity, message, guest data; all kinds: contract_template_id, annex_ids)
|
||||
*/
|
||||
public function compose(Booking $booking, ?DocumentKind $kind = null, array $changes = []): DocumentComposition
|
||||
{
|
||||
$booking->loadMissing(['guest', 'property', 'originChannel', 'importChannel']);
|
||||
$kind ??= DocumentKind::forCase($booking) ?? DocumentKind::Internal;
|
||||
$findings = [];
|
||||
|
||||
$draft = clone $booking;
|
||||
$draft->setRelation('guest', $booking->guest !== null ? (clone $booking->guest)->fill(self::guestChanges($changes)) : null);
|
||||
|
||||
if ($kind === DocumentKind::Offer) {
|
||||
$findings = [...$findings, ...$this->prepareOffer($booking, $draft, $changes)];
|
||||
}
|
||||
|
||||
$frozen = $kind !== DocumentKind::Offer && ($booking->contract_path !== null || ($booking->offer_version > 0 && is_array($booking->offer_terms)));
|
||||
$explicitTemplate = ! $frozen && filled($changes['contract_template_id'] ?? null);
|
||||
$template = match (true) {
|
||||
$kind === DocumentKind::StayConfirmation => null,
|
||||
$frozen => isset($booking->offer_terms['template']['id']) ? ContractTemplate::query()->find($booking->offer_terms['template']['id']) : null,
|
||||
default => OfferTerms::templateFor($booking, $explicitTemplate ? $changes['contract_template_id'] : null),
|
||||
};
|
||||
$terms = match (true) {
|
||||
! $kind->isForGuests() => null,
|
||||
$frozen => $booking->offer_terms,
|
||||
default => OfferTerms::capture($template, $draft, array_key_exists('annex_ids', $changes) && is_array($changes['annex_ids']) ? array_map('intval', $changes['annex_ids']) : null),
|
||||
};
|
||||
$draft->offer_terms = $terms;
|
||||
|
||||
$findings = [...$findings, ...$this->commonFindings($booking, $draft, $kind, $template, $frozen)];
|
||||
if ($kind === DocumentKind::ExternalRecord) {
|
||||
$findings = [...$findings, ...$this->externalFindings($booking, $template, $terms, $frozen)];
|
||||
}
|
||||
if ($kind === DocumentKind::Confirmation) {
|
||||
$findings = [...$findings, ...$this->confirmationFindings($booking)];
|
||||
}
|
||||
|
||||
return new DocumentComposition(
|
||||
kind: $kind,
|
||||
draft: $draft,
|
||||
intakeLabel: explode(' · ', CaseActivities::situation($booking))[0],
|
||||
priceLines: array_values(array_map(fn (array $line): array => ['label' => (string) $line['label'], 'amount' => (int) $line['amount']], (array) ($draft->quote['lines'] ?? []))),
|
||||
priceSource: $this->priceSource($booking, $draft, $kind),
|
||||
services: $this->services($draft),
|
||||
cancellation: $this->cancellation($terms, $kind),
|
||||
template: $template,
|
||||
templateSource: $this->templateSource($booking, $frozen, $explicitTemplate),
|
||||
annexes: array_values(array_map(fn (array $annex): array => ['id' => (int) $annex['id'], 'label' => $annex['name'].' (Version '.$annex['version'].')'], (array) ($terms['annexes'] ?? []))),
|
||||
terms: $terms,
|
||||
termsFrozen: $frozen,
|
||||
findings: $findings,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies the offer adjustments to the copy and calculates its price exactly as {@see SendOffer} will.
|
||||
*
|
||||
* @param array<string, mixed> $changes
|
||||
* @return list<DocumentFinding>
|
||||
*/
|
||||
private function prepareOffer(Booking $booking, Booking $draft, array $changes): array
|
||||
{
|
||||
$findings = [];
|
||||
|
||||
if (! in_array($booking->status, [BookingStatus::Reserved, BookingStatus::OfferSent, BookingStatus::Expired], true)) {
|
||||
$findings[] = DocumentFinding::blocker('Für diesen Vorgang ist kein Angebot mehr möglich ('.$booking->status->getLabel().').');
|
||||
}
|
||||
|
||||
try {
|
||||
$arrival = CarbonImmutable::parse($changes['arrival'] ?? $booking->arrival);
|
||||
$departure = CarbonImmutable::parse($changes['departure'] ?? $booking->departure);
|
||||
$guests = (int) ($changes['guests'] ?? $booking->guests);
|
||||
$promo = array_key_exists('promo_code', $changes) ? (filled($changes['promo_code']) ? trim((string) $changes['promo_code']) : null) : $booking->promo_code;
|
||||
$adjustment = (int) ($changes['price_adjustment'] ?? 0);
|
||||
$label = trim((string) ($changes['price_adjustment_label'] ?? '')) ?: ($adjustment < 0 ? 'Nachlass' : 'Zuschlag');
|
||||
$quote = $this->offer->quoteFor($booking, new StayRequest($arrival, $departure, max(1, $guests), $booking->extras ?? [], $promo), $adjustment, $label);
|
||||
|
||||
$draft->forceFill([
|
||||
'arrival' => $arrival->toDateString(),
|
||||
'departure' => $departure->toDateString(),
|
||||
'guests' => $quote->guests,
|
||||
'promo_code' => $quote->promoCodeApplied ? $promo : null,
|
||||
'quote' => $quote->toArray(),
|
||||
'total' => $quote->total(),
|
||||
'deposit' => $quote->deposit(),
|
||||
'balance_due_on' => $quote->balanceDueOn->toDateString(),
|
||||
]);
|
||||
|
||||
if (! $this->availability->isAvailable($booking->property, $arrival, $departure, ignore: $booking)) {
|
||||
$findings[] = DocumentFinding::blocker('Der Zeitraum ist nicht mehr frei.');
|
||||
}
|
||||
} catch (QuoteException $exception) {
|
||||
$findings[] = DocumentFinding::blocker('Preis: '.$exception->getMessage());
|
||||
} catch (Throwable) {
|
||||
$findings[] = DocumentFinding::blocker('Bitte Anreise, Abreise und Personen angeben.');
|
||||
}
|
||||
|
||||
$draft->forceFill([
|
||||
'hold_expires_at' => filled($changes['valid_until'] ?? null) ? CarbonImmutable::parse($changes['valid_until']) : now()->addHours($booking->process()->holdHours()),
|
||||
'offer_version' => $booking->offer_version + 1,
|
||||
'offer_sent_at' => now(),
|
||||
'offer_message' => $changes['offer_message'] ?? $booking->offer_message,
|
||||
]);
|
||||
|
||||
if (! $booking->process()->preReservation()) {
|
||||
$findings[] = DocumentFinding::confirm('Nach Ihrer Einstellung reservieren Anfragen den Zeitraum nicht. Ein Angebot mit Annahmelink reserviert ihn trotzdem bis '.$draft->hold_expires_at->format('d.m.Y, H:i').' Uhr, und der Gast kann bis dahin verbindlich annehmen. Eine Auskunft ohne Reservierung gibt es erst in einem späteren Ausbauschritt.', DocumentFinding::HOLD_ZERO);
|
||||
}
|
||||
if ($booking->offer_version > 0) {
|
||||
$findings[] = DocumentFinding::info('Ersetzt Angebot Version '.$booking->offer_version.'; dessen Link wird ungültig.');
|
||||
}
|
||||
|
||||
return $findings;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<DocumentFinding>
|
||||
*/
|
||||
private function commonFindings(Booking $booking, Booking $draft, DocumentKind $kind, ?ContractTemplate $template, bool $frozen): array
|
||||
{
|
||||
if (! $kind->isForGuests()) {
|
||||
return [DocumentFinding::info('Für diesen Vorgang geht kein Dokument an Gäste.')];
|
||||
}
|
||||
|
||||
$findings = [];
|
||||
if (! $kind->isAvailable()) {
|
||||
$findings[] = DocumentFinding::blocker('„'.$kind->getLabel().'“ kann erst mit einem späteren Ausbauschritt versendet werden; die Arbeitsfassung ist vorbereitet.');
|
||||
}
|
||||
if ($draft->guest === null) {
|
||||
$findings[] = DocumentFinding::blocker('Name und Kontaktdaten des Gastes fehlen.');
|
||||
} elseif (blank($draft->guest->email)) {
|
||||
$findings[] = DocumentFinding::blocker('Die E-Mail-Adresse des Gastes fehlt.');
|
||||
}
|
||||
if ($kind !== DocumentKind::Offer && $booking->total === null) {
|
||||
$findings[] = DocumentFinding::blocker($booking->intake === IntakeKind::Booking ? 'Der Gesamtpreis (laut Portal) fehlt.' : 'Der Preis fehlt.');
|
||||
}
|
||||
if ($booking->confirmation_sent_at !== null && $kind !== DocumentKind::Offer) {
|
||||
$findings[] = DocumentFinding::info('Bereits gesendet am '.$booking->confirmation_sent_at->format('d.m.Y, H:i').' Uhr. Erneutes Senden schickt dieselben Unterlagen.');
|
||||
}
|
||||
|
||||
if ($frozen) {
|
||||
return $findings;
|
||||
}
|
||||
|
||||
if ($kind->isAvailable() && ! DocumentReleases::isReleased($kind)) {
|
||||
$findings[] = DocumentFinding::confirm('Die Texte für „'.$kind->getLabel().'“ sind eine Arbeitsfassung und noch nicht freigegeben (So arbeite ich › Dokumente).');
|
||||
}
|
||||
if ($template !== null && ! $template->isReleased()) {
|
||||
$findings[] = DocumentFinding::confirm('Die Vorlage „'.$template->label().'“ ist noch nicht für Gäste freigegeben (Vorlagen › Freigabe).');
|
||||
}
|
||||
$missing = $this->missingPlaceholders($draft);
|
||||
if ($missing !== []) {
|
||||
$findings[] = DocumentFinding::confirm('Im Vertragstext fehlen Angaben, sie erscheinen als [name?]: '.implode(', ', $missing).'.');
|
||||
}
|
||||
|
||||
return $findings;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bookings already binding on a portal: no acceptance link, the portal price counts, and the template must not add
|
||||
* obligations the guest did not accept there (E-004).
|
||||
*
|
||||
* @param array<string, mixed>|null $terms
|
||||
* @return list<DocumentFinding>
|
||||
*/
|
||||
private function externalFindings(Booking $booking, ?ContractTemplate $template, ?array $terms, bool $frozen): array
|
||||
{
|
||||
$channel = $booking->processChannel()?->name ?? 'dem Portal';
|
||||
$findings = [DocumentFinding::info('Kein Annahmelink: Die Buchung ist bei '.$channel.' bereits verbindlich zustande gekommen.')];
|
||||
|
||||
if ($frozen) {
|
||||
return $findings;
|
||||
}
|
||||
|
||||
if ($template === null) {
|
||||
$findings[] = DocumentFinding::confirm('Für Buchungen über '.$channel.' ist keine eigene Vorlage hinterlegt. Die Unterlagen enthielten Ihre Mietbedingungen der Webseite – ihnen hat der Gast bei '.$channel.' nicht zugestimmt.');
|
||||
} elseif (! $template->confirmsPortalTerms()) {
|
||||
$findings[] = DocumentFinding::confirm('Die Vorlage „'.$template->label().'“ ist nicht als Wiedergabe der Bedingungen von '.$channel.' bestätigt. Zusätzliche Pflichten gelten nur, wenn der Gast ihnen dort zugestimmt hat.');
|
||||
$fees = $this->fees($terms);
|
||||
if ($fees !== []) {
|
||||
$findings[] = DocumentFinding::confirm('Gebühren in der Vorlage, die bei '.$channel.' nicht nachweislich vereinbart sind: '.implode('; ', $fees).'.');
|
||||
}
|
||||
}
|
||||
|
||||
if ($booking->process()->payments() === Responsibility::Portal && $this->mentionsPaymentsToUs($terms)) {
|
||||
$findings[] = DocumentFinding::confirm('Die Vorlage nennt Zahlungen an Sie (Anzahlung/Restzahlung), laut Einstellung zahlt der Gast über '.$channel.'.');
|
||||
}
|
||||
|
||||
return $findings;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<DocumentFinding>
|
||||
*/
|
||||
private function confirmationFindings(Booking $booking): array
|
||||
{
|
||||
return $booking->accepted_at !== null
|
||||
? [DocumentFinding::info('Bedingungen wie im angenommenen Angebot vom '.$booking->accepted_at->format('d.m.Y').' (unverändert).')]
|
||||
: [];
|
||||
}
|
||||
|
||||
private function priceSource(Booking $booking, Booking $draft, DocumentKind $kind): string
|
||||
{
|
||||
return match (true) {
|
||||
$draft->total === null => 'noch nicht bekannt',
|
||||
($draft->quote['source'] ?? null) === 'portal' => 'laut '.($booking->processChannel()?->name ?? 'Portal').' übernommen, nicht neu berechnet',
|
||||
$kind === DocumentKind::Offer => 'aus Ihren Preisen berechnet',
|
||||
$booking->accepted_at !== null => 'wie im angenommenen Angebot',
|
||||
default => 'aus Ihren Preisen berechnet',
|
||||
};
|
||||
}
|
||||
|
||||
private function templateSource(Booking $booking, bool $frozen, bool $explicit): string
|
||||
{
|
||||
if ($frozen) {
|
||||
return $booking->offer_version > 0 ? 'im angenommenen Angebot festgehalten' : 'mit den Unterlagen festgehalten';
|
||||
}
|
||||
if ($explicit) {
|
||||
return 'für diesen Vorgang gewählt';
|
||||
}
|
||||
|
||||
$source = $this->settings->forBooking($booking)->source(ProcessSetting::ContractTemplate);
|
||||
|
||||
return match ($source) {
|
||||
ProcessProfile::CHANNEL => 'eingestellt für '.$booking->processChannel()?->name.' ('.($booking->intake?->getLabel() ?? '').')',
|
||||
ProcessProfile::PROPERTY => 'eingestellt für die Wohnung '.$booking->property->name,
|
||||
ProcessProfile::TENANT => 'Ihre Standardeinstellung',
|
||||
default => 'keine Vorlage eingestellt',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<string>
|
||||
*/
|
||||
private function services(Booking $draft): array
|
||||
{
|
||||
$extras = array_filter((array) ($draft->extras ?? []), fn ($quantity): bool => (int) $quantity > 0);
|
||||
if ($extras === []) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return Extra::query()->whereIn('id', array_keys($extras))->orderBy('name')->get()
|
||||
->map(fn (Extra $extra): string => $extra->name.((int) $extras[$extra->id] > 1 ? ' × '.$extras[$extra->id] : ''))
|
||||
->values()->all();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed>|null $terms
|
||||
* @return list<string>
|
||||
*/
|
||||
private function cancellation(?array $terms, DocumentKind $kind): array
|
||||
{
|
||||
$lines = [];
|
||||
if ($kind === DocumentKind::ExternalRecord) {
|
||||
$lines[] = 'Maßgeblich ist die bei der Buchung über das Portal vereinbarte Regel.';
|
||||
}
|
||||
|
||||
$policy = $terms['cancellation_policy'] ?? null;
|
||||
if (is_array($policy) && ! empty($policy['tiers'])) {
|
||||
return [...$lines, ...CancellationPolicy::describe($policy)];
|
||||
}
|
||||
if (filled($terms['texts']['stay.cancellation'] ?? null)) {
|
||||
return [...$lines, 'Laut Text „Rücktritt / Stornierung“ der Vorlage bzw. Webseite (keine Staffel hinterlegt).'];
|
||||
}
|
||||
|
||||
return $terms === null ? $lines : [...$lines, 'Keine Stornoregel hinterlegt.'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Placeholders of the contract text that have no value for this case.
|
||||
*
|
||||
* @return list<string>
|
||||
*/
|
||||
private function missingPlaceholders(Booking $draft): array
|
||||
{
|
||||
$terms = (array) ($draft->offer_terms ?? []);
|
||||
$data = (array) ($terms['property_data'] ?? []);
|
||||
$texts = array_filter([
|
||||
$terms['document']['body'] ?? null,
|
||||
$terms['document']['annex_body'] ?? null,
|
||||
...array_map(fn (array $annex): ?string => $annex['body'] ?? null, (array) ($terms['annexes'] ?? [])),
|
||||
]);
|
||||
|
||||
return array_values(array_unique(array_merge(...array_map(fn (string $html): array => ContractPlaceholders::missing($html, $draft, $data), $texts ?: ['']))));
|
||||
}
|
||||
|
||||
/**
|
||||
* Fees a template states: the replacement fee of its cancellation rule and amounts written in its texts.
|
||||
*
|
||||
* @param array<string, mixed>|null $terms
|
||||
* @return list<string>
|
||||
*/
|
||||
private function fees(?array $terms): array
|
||||
{
|
||||
$fees = [];
|
||||
$policy = $terms['cancellation_policy'] ?? null;
|
||||
if (is_array($policy) && ($policy['replacement_fee'] ?? null) !== null) {
|
||||
$fees[] = 'Ersatzmieter-Gebühr '.Money::format((int) $policy['replacement_fee']);
|
||||
}
|
||||
if (is_array($policy) && ! empty($policy['tiers'])) {
|
||||
$fees[] = 'Stornokosten nach Staffel ('.$policy['name'].')';
|
||||
}
|
||||
|
||||
$text = strip_tags(implode(' ', $this->templateTexts($terms)));
|
||||
preg_match_all('/\d{1,3}(?:\.\d{3})*(?:,\d{1,2})?\s?(?:€|EUR\b|Euro\b)/u', html_entity_decode($text), $amounts);
|
||||
foreach (array_unique($amounts[0]) as $amount) {
|
||||
$fees[] = trim($amount).' (im Text)';
|
||||
}
|
||||
|
||||
return $fees;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed>|null $terms
|
||||
*/
|
||||
private function mentionsPaymentsToUs(?array $terms): bool
|
||||
{
|
||||
$text = implode(' ', $this->templateTexts($terms));
|
||||
foreach (self::PAYMENT_PLACEHOLDERS as $placeholder) {
|
||||
if (preg_match('/\{\{\s*'.$placeholder.'\s*\}\}/i', $text) === 1) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* The texts a template contributes (not the website texts it falls back to).
|
||||
*
|
||||
* @param array<string, mixed>|null $terms
|
||||
* @return list<string>
|
||||
*/
|
||||
private function templateTexts(?array $terms): array
|
||||
{
|
||||
if ($terms === null || ! isset($terms['template'])) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$template = ContractTemplate::query()->find($terms['template']['id']);
|
||||
|
||||
return array_values(array_filter([
|
||||
$terms['document']['body'] ?? null,
|
||||
$terms['document']['annex_body'] ?? null,
|
||||
...array_values($template?->overrides() ?? []),
|
||||
...array_map(fn (array $annex): ?string => $annex['body'] ?? null, (array) ($terms['annexes'] ?? [])),
|
||||
]));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $changes
|
||||
* @return array<string, ?string>
|
||||
*/
|
||||
private static function guestChanges(array $changes): array
|
||||
{
|
||||
$guest = (array) ($changes['guest'] ?? []);
|
||||
|
||||
return array_map(fn ($value): ?string => filled($value) ? trim((string) $value) : null, array_filter(Arr::only($guest, ['first_name', 'last_name', 'phone', 'street', 'postal_code', 'city', 'country']), 'filled'));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
<?php
|
||||
|
||||
namespace App\Documents;
|
||||
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Models\Booking;
|
||||
use App\Models\ContractTemplate;
|
||||
|
||||
/**
|
||||
* Everything a document of a case consists of before it is sent (UMSETZUNGSPLAN_v0.10 §4.5): recipient, stay, how the
|
||||
* case came in, price with its origin, services, cancellation rule, template and annexes, and what has to be checked.
|
||||
* The same composition is shown to the landlord, decides whether the automatic run may send, and is what is sent.
|
||||
*/
|
||||
final class DocumentComposition
|
||||
{
|
||||
/**
|
||||
* @param Booking $draft the case as the document will show it (never saved)
|
||||
* @param list<array{label: string, amount: int}> $priceLines
|
||||
* @param list<string> $services
|
||||
* @param list<string> $cancellation
|
||||
* @param list<array{id: int, label: string}> $annexes
|
||||
* @param array<string, mixed>|null $terms the terms the document freezes (null: the website texts apply live)
|
||||
* @param list<DocumentFinding> $findings
|
||||
*/
|
||||
public function __construct(
|
||||
public readonly DocumentKind $kind,
|
||||
public readonly Booking $draft,
|
||||
public readonly string $intakeLabel,
|
||||
public readonly array $priceLines,
|
||||
public readonly string $priceSource,
|
||||
public readonly array $services,
|
||||
public readonly array $cancellation,
|
||||
public readonly ?ContractTemplate $template,
|
||||
public readonly string $templateSource,
|
||||
public readonly array $annexes,
|
||||
public readonly ?array $terms,
|
||||
public readonly bool $termsFrozen,
|
||||
public readonly array $findings,
|
||||
) {}
|
||||
|
||||
public function recipientName(): ?string
|
||||
{
|
||||
return $this->draft->guest?->full_name;
|
||||
}
|
||||
|
||||
public function recipientEmail(): ?string
|
||||
{
|
||||
return filled($this->draft->guest?->email) ? $this->draft->guest->email : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<string>
|
||||
*/
|
||||
public function blockers(): array
|
||||
{
|
||||
return $this->messages(DocumentFinding::BLOCKER);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $except codes of findings left out
|
||||
* @return list<string>
|
||||
*/
|
||||
public function toConfirm(array $except = []): array
|
||||
{
|
||||
return $this->messages(DocumentFinding::CONFIRM, $except);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<string>
|
||||
*/
|
||||
public function information(): array
|
||||
{
|
||||
return $this->messages(DocumentFinding::INFO);
|
||||
}
|
||||
|
||||
/**
|
||||
* The automatic run sends only a document without blockers and without anything the landlord has to confirm.
|
||||
*/
|
||||
public function canSendAutomatically(): bool
|
||||
{
|
||||
return $this->blockers() === [] && $this->toConfirm() === [];
|
||||
}
|
||||
|
||||
/**
|
||||
* By hand: no blockers, and every point to confirm was confirmed.
|
||||
*/
|
||||
public function canSendByHand(bool $acknowledged): bool
|
||||
{
|
||||
return $this->blockers() === [] && ($this->toConfirm() === [] || $acknowledged);
|
||||
}
|
||||
|
||||
/**
|
||||
* The template as the landlord reads it.
|
||||
*/
|
||||
public function templateLabel(): string
|
||||
{
|
||||
if ($this->terms !== null && isset($this->terms['template']['name'])) {
|
||||
return $this->terms['template']['name'].' (Version '.$this->terms['template']['version'].')';
|
||||
}
|
||||
|
||||
return $this->template?->label() ?? 'Texte der Webseite';
|
||||
}
|
||||
|
||||
/**
|
||||
* What is stored about the document in the case history.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function record(): array
|
||||
{
|
||||
return [
|
||||
'kind' => $this->kind->value,
|
||||
'template' => $this->terms['template'] ?? null,
|
||||
'annexes' => array_map(fn (array $annex): string => $annex['label'], $this->annexes),
|
||||
'recipient' => $this->recipientEmail(),
|
||||
'total' => $this->draft->total,
|
||||
'price_source' => $this->priceSource,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $except
|
||||
* @return list<string>
|
||||
*/
|
||||
private function messages(string $severity, array $except = []): array
|
||||
{
|
||||
return array_values(array_map(fn (DocumentFinding $finding): string => $finding->message, array_filter($this->findings, fn (DocumentFinding $finding): bool => $finding->severity === $severity && ! in_array($finding->code, $except, true))));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
|
||||
namespace App\Documents;
|
||||
|
||||
/**
|
||||
* One finding of a document composition. A blocker stops the document (data missing or contradictory); a point to
|
||||
* confirm stops the automatic run and needs the landlord's explicit confirmation before sending by hand; information
|
||||
* only explains.
|
||||
*/
|
||||
final class DocumentFinding
|
||||
{
|
||||
public const BLOCKER = 'blocker';
|
||||
|
||||
public const CONFIRM = 'confirm';
|
||||
|
||||
public const INFO = 'info';
|
||||
|
||||
/** Code of the finding "the settings reserve nothing for requests" (Hold = 0, package 7). */
|
||||
public const HOLD_ZERO = 'hold_zero';
|
||||
|
||||
public function __construct(
|
||||
public readonly string $severity,
|
||||
public readonly string $message,
|
||||
public readonly ?string $code = null,
|
||||
) {}
|
||||
|
||||
public static function blocker(string $message): self
|
||||
{
|
||||
return new self(self::BLOCKER, $message);
|
||||
}
|
||||
|
||||
public static function confirm(string $message, ?string $code = null): self
|
||||
{
|
||||
return new self(self::CONFIRM, $message, $code);
|
||||
}
|
||||
|
||||
public static function info(string $message): self
|
||||
{
|
||||
return new self(self::INFO, $message);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
namespace App\Documents;
|
||||
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Settings;
|
||||
|
||||
/**
|
||||
* Which document kinds the landlord has released for guests (tenants.document_releases). A kind that is not released is
|
||||
* a working draft: it is never sent automatically, and by hand only after an explicit confirmation in the case.
|
||||
*/
|
||||
class DocumentReleases
|
||||
{
|
||||
public static function isReleased(DocumentKind $kind, ?Tenant $tenant = null): bool
|
||||
{
|
||||
$entry = self::entries($tenant)[$kind->value] ?? null;
|
||||
|
||||
return is_array($entry) ? (bool) ($entry['released'] ?? false) : $kind->releasedByDefault();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{released: bool, by: ?string, at: ?string}|null the landlord's decision, null when none was made
|
||||
*/
|
||||
public static function decision(DocumentKind $kind, ?Tenant $tenant = null): ?array
|
||||
{
|
||||
$entry = self::entries($tenant)[$kind->value] ?? null;
|
||||
|
||||
return is_array($entry) ? ['released' => (bool) ($entry['released'] ?? false), 'by' => $entry['by'] ?? null, 'at' => $entry['at'] ?? null] : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores the decision for one kind; an unchanged decision keeps its date and author.
|
||||
*/
|
||||
public static function set(DocumentKind $kind, bool $released, string $actor, ?Tenant $tenant = null): void
|
||||
{
|
||||
$tenant ??= Settings::tenant();
|
||||
if ($tenant === null || self::isReleased($kind, $tenant) === $released && self::decision($kind, $tenant) !== null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$entries = self::entries($tenant);
|
||||
$entries[$kind->value] = ['released' => $released, 'by' => $actor, 'at' => now()->toIso8601String()];
|
||||
$tenant->update(['document_releases' => $entries]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private static function entries(?Tenant $tenant): array
|
||||
{
|
||||
return (array) (($tenant ?? Settings::tenant())?->document_releases ?? []);
|
||||
}
|
||||
}
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
namespace App\Documents;
|
||||
|
||||
use App\Enums\ChannelBookingModel;
|
||||
use App\Models\Booking;
|
||||
use App\Models\ContractAnnex;
|
||||
use App\Models\ContractTemplate;
|
||||
use App\Process\ProcessSettings;
|
||||
use App\Support\Content;
|
||||
use Filament\Forms\Components\RichEditor\RichContentRenderer;
|
||||
use Illuminate\Support\HtmlString;
|
||||
@@ -56,16 +56,12 @@ public static function capture(?ContractTemplate $template = null, ?Booking $boo
|
||||
}
|
||||
|
||||
/**
|
||||
* The contract template for a booking: chosen explicitly, else the portal's (for bookings that are binding at the
|
||||
* portal its reservation template, otherwise its offer template), else the property's.
|
||||
* The contract template for a case: chosen explicitly, else the one of its process settings – the channel's
|
||||
* template for the case's intake kind (request or binding booking), else the property's, else the landlord's.
|
||||
*/
|
||||
public static function templateFor(Booking $booking, int|string|null $explicitId = null): ?ContractTemplate
|
||||
{
|
||||
$channel = $booking->importChannel ?? $booking->originChannel;
|
||||
$portalId = $channel === null ? null : ($channel->booking_model === ChannelBookingModel::PortalBooking
|
||||
? ($channel->contract_template_reservation_id ?? $channel->contract_template_id)
|
||||
: $channel->contract_template_id);
|
||||
$id = filled($explicitId) ? (int) $explicitId : ($portalId ?? $booking->property->contract_template_id);
|
||||
$id = filled($explicitId) ? (int) $explicitId : app(ProcessSettings::class)->forBooking($booking)->contractTemplateId();
|
||||
|
||||
return $id ? ContractTemplate::query()->find($id) : null;
|
||||
}
|
||||
|
||||
@@ -2,50 +2,73 @@
|
||||
|
||||
namespace App\Documents;
|
||||
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Site;
|
||||
use Barryvdh\DomPDF\Facade\Pdf;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
/**
|
||||
* The rental contract as PDF. As a draft it is part of the offer (offer_path, one file per offer version);
|
||||
* the final contract is generated at confirmation (contract_path). Both are stored, so later changes of
|
||||
* texts or prices do not alter a document the guest already received.
|
||||
* The PDF of a case's document. As a draft it is part of the offer (offer_path, one file per offer version); the
|
||||
* document of record – rental contract, booking documentation of a portal booking or stay confirmation, depending on
|
||||
* the case – is generated once when it is sent (contract_path). Both are stored, so later changes of texts or prices do
|
||||
* not alter a document the guest already received.
|
||||
*/
|
||||
class RentalContract
|
||||
{
|
||||
private const DISK = 'local';
|
||||
|
||||
public function generate(Booking $booking, bool $draft = false): string
|
||||
public function generate(Booking $booking, bool $draft = false, ?DocumentKind $kind = null): string
|
||||
{
|
||||
$booking->loadMissing(['guest', 'property']);
|
||||
$kind = $draft ? DocumentKind::Offer : ($kind ?? DocumentKind::forCase($booking) ?? DocumentKind::Confirmation);
|
||||
$filename = $draft
|
||||
? "contracts/Angebot-{$booking->reference}-v{$booking->offer_version}.pdf"
|
||||
: "contracts/Mietvertrag-{$booking->reference}.pdf";
|
||||
$path = "contracts/tenants/{$booking->tenant_id}/bookings/{$booking->id}/".basename($filename);
|
||||
? "Angebot-{$booking->reference}-v{$booking->offer_version}.pdf"
|
||||
: "{$kind->fileName()}-{$booking->reference}.pdf";
|
||||
$path = "contracts/tenants/{$booking->tenant_id}/bookings/{$booking->id}/{$filename}";
|
||||
|
||||
// The logo is embedded as a file: the PDF is rendered on the server and must not depend on
|
||||
// fetching anything over the network. Each website has its own (A14).
|
||||
$logo = $booking->website()?->brandPath(Site::BRAND_DOCUMENT_LOGO);
|
||||
|
||||
// The final contract is a document of record: once stored it is never rewritten (confirmation resends reuse it).
|
||||
// The document of record is never rewritten once stored (confirmation resends reuse it).
|
||||
if (! $draft && $booking->contract_path !== null && Storage::disk(self::DISK)->exists($booking->contract_path)) {
|
||||
return $booking->contract_path;
|
||||
}
|
||||
|
||||
$document = OfferTerms::document($booking);
|
||||
$pdf = Pdf::loadView($document !== null ? 'pdf.contract-document' : 'pdf.contract', [
|
||||
'booking' => $booking,
|
||||
'draft' => $draft,
|
||||
'logo' => $logo,
|
||||
'document' => $document,
|
||||
])->setPaper('a4')->output();
|
||||
$pdf = $this->render($booking, $kind, $draft);
|
||||
Storage::disk(self::DISK)->put($path, $pdf);
|
||||
$booking->update([$draft ? 'offer_path' : 'contract_path' => $path, $draft ? 'offer_pdf_sha256' : 'contract_pdf_sha256' => hash('sha256', $pdf)]);
|
||||
|
||||
return $path;
|
||||
}
|
||||
|
||||
/**
|
||||
* The PDF bytes of a document, without storing anything (also used for previews of a composition).
|
||||
*/
|
||||
public function render(Booking $booking, DocumentKind $kind, bool $draft = false): string
|
||||
{
|
||||
[$view, $data] = $this->view($booking, $kind, $draft);
|
||||
|
||||
return Pdf::loadView($view, $data)->setPaper('a4')->output();
|
||||
}
|
||||
|
||||
/**
|
||||
* The view and its data that make up the document.
|
||||
*
|
||||
* @return array{0: string, 1: array<string, mixed>}
|
||||
*/
|
||||
public function view(Booking $booking, DocumentKind $kind, bool $draft = false): array
|
||||
{
|
||||
// The logo is embedded as a file: the PDF is rendered on the server and must not depend on
|
||||
// fetching anything over the network. Each website has its own (A14).
|
||||
$logo = $booking->website()?->brandPath(Site::BRAND_DOCUMENT_LOGO);
|
||||
$document = $kind === DocumentKind::StayConfirmation ? null : OfferTerms::document($booking);
|
||||
$view = match (true) {
|
||||
$kind === DocumentKind::StayConfirmation => 'pdf.stay-confirmation',
|
||||
$document !== null => 'pdf.contract-document',
|
||||
default => 'pdf.contract',
|
||||
};
|
||||
|
||||
return [$view, ['booking' => $booking, 'draft' => $draft, 'logo' => $logo, 'document' => $document, 'kind' => $kind]];
|
||||
}
|
||||
|
||||
public function absolutePath(Booking $booking, bool $draft = false): ?string
|
||||
{
|
||||
$path = $draft ? $booking->offer_path : $booking->contract_path;
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasColor;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* Where an activity of a case stands (docs/Prozessarchitektur/Querschnitt/Gates_und_Nachweise.md: done by us, done
|
||||
* externally, not applicable, open, contradictory) – plus "waiting" for somebody else and "later" for what is not due.
|
||||
*/
|
||||
enum ActivityState: string implements HasColor, HasLabel
|
||||
{
|
||||
case Done = 'done';
|
||||
case External = 'external';
|
||||
case Open = 'open';
|
||||
case Problem = 'problem';
|
||||
case Waiting = 'waiting';
|
||||
case Later = 'later';
|
||||
case NotApplicable = 'not_applicable';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Done => 'erledigt',
|
||||
self::External => 'übernimmt das Portal',
|
||||
self::Open => 'zu tun',
|
||||
self::Problem => 'Problem',
|
||||
self::Waiting => 'wartet',
|
||||
self::Later => 'später',
|
||||
self::NotApplicable => 'entfällt',
|
||||
};
|
||||
}
|
||||
|
||||
public function getColor(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Done, self::External => 'success',
|
||||
self::Open => 'warning',
|
||||
self::Problem => 'danger',
|
||||
self::Waiting => 'info',
|
||||
self::Later, self::NotApplicable => 'gray',
|
||||
};
|
||||
}
|
||||
|
||||
public function icon(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Done, self::External => '✓',
|
||||
self::Open => '●',
|
||||
self::Problem => '!',
|
||||
self::Waiting => '…',
|
||||
self::Later => '○',
|
||||
self::NotApplicable => '–',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the landlord has to act.
|
||||
*/
|
||||
public function needsAction(): bool
|
||||
{
|
||||
return $this === self::Open || $this === self::Problem;
|
||||
}
|
||||
}
|
||||
@@ -2,14 +2,12 @@
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use App\Filament\Pages\Dashboard;
|
||||
use App\Filament\Pages\OccupancyCalendar;
|
||||
use App\Filament\Pages\PricesAndOffers;
|
||||
use App\Filament\Resources\BlockedPeriods\BlockedPeriodResource;
|
||||
use App\Filament\Resources\Bookings\BookingResource;
|
||||
use App\Filament\Resources\BookingTasks\BookingTaskResource;
|
||||
use App\Filament\Resources\ChannelTasks\ChannelTaskResource;
|
||||
use App\Filament\Resources\Guests\GuestResource;
|
||||
use App\Filament\Resources\InboxMessages\InboxMessageResource;
|
||||
use Filament\Support\Contracts\HasDescription;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
@@ -22,16 +20,15 @@ enum AdminMode: string implements HasDescription, HasLabel
|
||||
case Expert = 'expert';
|
||||
|
||||
/**
|
||||
* Menu entries of the simple mode: the few things needed every day: calendar, bookings with their file, tasks, mailbox, guests and prices.
|
||||
* Menu entries of the simple mode: the start page with everything to do, calendar, cases, guests, blocked periods
|
||||
* and prices. Tasks, portal tasks and the mailbox are part of the start page's work list.
|
||||
*
|
||||
* @var list<class-string>
|
||||
*/
|
||||
public const SIMPLE_NAVIGATION = [
|
||||
Dashboard::class,
|
||||
OccupancyCalendar::class,
|
||||
BookingResource::class,
|
||||
BookingTaskResource::class,
|
||||
ChannelTaskResource::class,
|
||||
InboxMessageResource::class,
|
||||
GuestResource::class,
|
||||
BlockedPeriodResource::class,
|
||||
PricesAndOffers::class,
|
||||
@@ -48,7 +45,7 @@ public function getLabel(): string
|
||||
public function getDescription(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Simple => 'Das Tägliche: Postfach, Anfragen, Buchungen und Verträge, Sperrzeiten, Preise & Angebote, Gäste, Kalenderabgleich (iCal), Portal-Aufgaben, Bewertungen, Fotos',
|
||||
self::Simple => 'Das Tägliche: Start mit allem, was zu tun ist, Kalender, Vorgänge, Gäste, Sperrzeiten, Preise',
|
||||
self::Expert => 'Alle Einstellungen: Preise, Angebote, Kalenderabgleich (iCal), Webseite, System',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* A stated amount of a case as a portal or another source shows it (package 8, K01): stored as stated, never derived.
|
||||
* Positions of the guest's price, what the landlord pays the portal, and what the portal announces to pay out stay
|
||||
* apart; an unexplained collective amount stays unexplained.
|
||||
*/
|
||||
enum AmountKind: string implements HasLabel
|
||||
{
|
||||
case Accommodation = 'accommodation';
|
||||
case Service = 'service';
|
||||
case Discount = 'discount';
|
||||
case Fee = 'fee';
|
||||
case Unexplained = 'unexplained';
|
||||
case Commission = 'commission';
|
||||
case PayoutAnnounced = 'payout_announced';
|
||||
case InstallmentDue = 'installment_due';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Accommodation => 'Übernachtung',
|
||||
self::Service => 'Leistung / Zusatzleistung',
|
||||
self::Discount => 'Rabatt (mit Minus)',
|
||||
self::Fee => 'Gebühr oder Steuer',
|
||||
self::Unexplained => 'Sammelposten, nicht aufgeschlüsselt',
|
||||
self::Commission => 'Provision / an das Portal gezahlt',
|
||||
self::PayoutAnnounced => 'Angekündigte Auszahlung an uns',
|
||||
self::InstallmentDue => 'Rate des Gastes laut Portal fällig',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the amount is part of the guest's price (and adds up to the guest total).
|
||||
*/
|
||||
public function isPricePosition(): bool
|
||||
{
|
||||
return in_array($this, [self::Accommodation, self::Service, self::Discount, self::Fee, self::Unexplained], true);
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,10 @@ enum BookingTaskKind: string implements HasLabel
|
||||
case BalanceReminder = 'balance_reminder';
|
||||
case CancellationRequest = 'cancellation_request';
|
||||
case CancellationFee = 'cancellation_fee';
|
||||
case PortalCancellation = 'portal_cancellation';
|
||||
case PortalCancellationReported = 'portal_cancel_reported';
|
||||
case PortalChangeReported = 'portal_change_reported';
|
||||
case RefundCheck = 'refund_check';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
@@ -25,12 +29,16 @@ public function getLabel(): string
|
||||
self::BalanceReminder => 'Restzahlung überfällig – anmahnen',
|
||||
self::CancellationRequest => 'Stornierungswunsch des Gastes',
|
||||
self::CancellationFee => 'Stornokosten prüfen und abrechnen',
|
||||
self::PortalCancellation => 'Stornierung im Portal veranlassen bzw. prüfen',
|
||||
self::PortalCancellationReported => 'Das Portal meldet eine Stornierung – bitte prüfen',
|
||||
self::PortalChangeReported => 'Das Portal meldet eine Änderung – bitte prüfen',
|
||||
self::RefundCheck => 'Erstattung an den Gast prüfen',
|
||||
};
|
||||
}
|
||||
|
||||
public function isPayment(): bool
|
||||
{
|
||||
return ! in_array($this, [self::CancellationRequest, self::CancellationFee], true);
|
||||
return ! in_array($this, [self::CancellationRequest, self::CancellationFee, self::PortalCancellation, self::PortalCancellationReported, self::PortalChangeReported, self::RefundCheck], true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -44,7 +52,7 @@ public function reminder(): ?array
|
||||
self::DepositReminder => [PaymentReminder::DEPOSIT_OVERDUE, 'deposit_reminded_at'],
|
||||
self::BalanceRequest => [PaymentReminder::BALANCE_REQUEST, 'balance_requested_at'],
|
||||
self::BalanceReminder => [PaymentReminder::BALANCE_OVERDUE, 'balance_reminded_at'],
|
||||
self::CancellationRequest, self::CancellationFee => null,
|
||||
self::CancellationRequest, self::CancellationFee, self::PortalCancellation, self::PortalCancellationReported, self::PortalChangeReported, self::RefundCheck => null,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasDescription;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* Whether bookings and requests recognised on a channel become cases by themselves (UMSETZUNGSPLAN_v0.10 §5.5). Every
|
||||
* channel starts switched off; observing only records what would happen. Creating cases never sends anything that the
|
||||
* landlord has not released (documents need their release, package 3); only the last mode lets the new cases follow
|
||||
* the automatic handling of the settings.
|
||||
*/
|
||||
enum CaseIntakeMode: string implements HasDescription, HasLabel
|
||||
{
|
||||
case Off = 'off';
|
||||
case Observe = 'observe';
|
||||
case Create = 'create';
|
||||
case Continue = 'continue';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Off => 'Aus – Sie übernehmen Buchungen selbst',
|
||||
self::Observe => 'Beobachten – nur protokollieren, was entstehen würde',
|
||||
self::Create => 'Vorgänge anlegen – die nächsten Schritte geben Sie frei',
|
||||
self::Continue => 'Vorgänge anlegen und nach Ihren Einstellungen weiterbearbeiten',
|
||||
};
|
||||
}
|
||||
|
||||
public function getDescription(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Off => 'Erkannte Buchungen erscheinen als Klärungsfall; nichts entsteht automatisch.',
|
||||
self::Observe => 'Es entsteht nichts. Das Eingangsprotokoll zeigt, welche Vorgänge entstanden wären und warum.',
|
||||
self::Create => 'Sicher erkannte Buchungen werden zum Vorgang; Sie geben jeden weiteren Schritt frei.',
|
||||
self::Continue => 'Wie „anlegen“; danach laufen die Vorgänge automatisch oder mit Freigabe – wie unter „So arbeite ich“ eingestellt.',
|
||||
};
|
||||
}
|
||||
|
||||
public function records(): bool
|
||||
{
|
||||
return $this !== self::Off;
|
||||
}
|
||||
|
||||
public function creates(): bool
|
||||
{
|
||||
return in_array($this, [self::Create, self::Continue], true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasDescription;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* The business constellation of a case (docs/Prozessarchitektur/01_Buchungsarchetypen.md). It follows from the way
|
||||
* the case came in and who handles what – not from the channel's name alone.
|
||||
*/
|
||||
enum CaseType: string implements HasDescription, HasLabel
|
||||
{
|
||||
/** Own website or own direct way (phone, e-mail): request, own offer, acceptance. */
|
||||
case A1 = 'a1';
|
||||
|
||||
/** Non-binding request passed on by an intermediary; own offer like A1. */
|
||||
case A2 = 'a2';
|
||||
|
||||
/** Binding external booking, everything else is handled by the landlord. */
|
||||
case A3 = 'a3';
|
||||
|
||||
/** Binding external booking with split handling (e.g. the portal collects the payments). */
|
||||
case A4 = 'a4';
|
||||
|
||||
/** Binding external booking the portal handles almost completely. */
|
||||
case A5 = 'a5';
|
||||
|
||||
/** Own use, private stay, maintenance or another block. */
|
||||
case A6 = 'a6';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::A1 => 'Eigene Anfrage',
|
||||
self::A2 => 'Anfrage über ein Portal',
|
||||
self::A3 => 'Portalbuchung, Abwicklung bei uns',
|
||||
self::A4 => 'Portalbuchung, Zahlung über das Portal',
|
||||
self::A5 => 'Portalbuchung, Abwicklung durch das Portal',
|
||||
self::A6 => 'Eigene Nutzung / Sperre',
|
||||
};
|
||||
}
|
||||
|
||||
public function getDescription(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::A1 => 'Anfrage → Angebot → Annahme durch den Gast',
|
||||
self::A2 => 'Anfrage aus einem Portal, Angebot und Vertrag von uns',
|
||||
self::A3 => 'Beim Portal schon verbindlich; Unterlagen, Zahlung und Gastkontakt übernehmen wir',
|
||||
self::A4 => 'Beim Portal schon verbindlich; Unterlagen von uns, das Geld zieht das Portal ein',
|
||||
self::A5 => 'Beim Portal schon verbindlich; das Portal erledigt Vertrag und Zahlung',
|
||||
self::A6 => 'Eigenbelegung, private Überlassung, Wartung oder sonstige Sperre',
|
||||
};
|
||||
}
|
||||
|
||||
public function isExternallyBinding(): bool
|
||||
{
|
||||
return in_array($this, [self::A3, self::A4, self::A5], true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* How a change of a booking was agreed with the guest – the evidence the case keeps (package 5). Sending an updated
|
||||
* confirmation is none of these: it informs the guest, it does not show the guest's consent.
|
||||
*/
|
||||
enum ChangeBasis: string implements HasLabel
|
||||
{
|
||||
case Phone = 'phone';
|
||||
case Email = 'email';
|
||||
case InPerson = 'in_person';
|
||||
case Portal = 'portal';
|
||||
case GuestLink = 'guest_link';
|
||||
case NotNeeded = 'not_needed';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Phone => 'am Telefon vereinbart',
|
||||
self::Email => 'per E-Mail / schriftlich vereinbart',
|
||||
self::InPerson => 'persönlich vereinbart',
|
||||
self::Portal => 'im Portal geändert',
|
||||
self::GuestLink => 'vom Gast über den Link angenommen',
|
||||
self::NotNeeded => 'keine Zustimmung nötig (eigener Vorgang)',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasColor;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
enum ChangeStatus: string implements HasColor, HasLabel
|
||||
{
|
||||
/** Sent to the guest, waiting for the guest's answer; nothing has changed yet. */
|
||||
case Proposed = 'proposed';
|
||||
|
||||
/** In force. */
|
||||
case Applied = 'applied';
|
||||
|
||||
case Declined = 'declined';
|
||||
|
||||
case Withdrawn = 'withdrawn';
|
||||
|
||||
case Expired = 'expired';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Proposed => 'dem Gast vorgeschlagen',
|
||||
self::Applied => 'wirksam',
|
||||
self::Declined => 'vom Gast abgelehnt',
|
||||
self::Withdrawn => 'zurückgezogen',
|
||||
self::Expired => 'nicht beantwortet',
|
||||
};
|
||||
}
|
||||
|
||||
public function getColor(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Proposed => 'warning',
|
||||
self::Applied => 'success',
|
||||
default => 'gray',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasColor;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* How far a block (or release) on a portal is proven (E-018). The three steps are different statements: entering the
|
||||
* block does not show that the portal took it over, and a calendar feed we provide proves nothing about the portal.
|
||||
*/
|
||||
enum ChannelTaskProof: string implements HasColor, HasLabel
|
||||
{
|
||||
/** The change was made or started (by hand or by an automation). */
|
||||
case Initiated = 'initiated';
|
||||
|
||||
/** The block was seen in the portal's own calendar. */
|
||||
case Observed = 'observed';
|
||||
|
||||
/** The portal confirmed it (e.g. its own confirmation or a test booking was refused). */
|
||||
case Confirmed = 'confirmed';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Initiated => 'veranlasst',
|
||||
self::Observed => 'im Portal gesehen',
|
||||
self::Confirmed => 'Wirksamkeit bestätigt',
|
||||
};
|
||||
}
|
||||
|
||||
public function getColor(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Initiated => 'warning',
|
||||
self::Observed => 'info',
|
||||
self::Confirmed => 'success',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The choice the landlord reads when completing a task.
|
||||
*/
|
||||
public function question(bool $block = true): string
|
||||
{
|
||||
$what = $block ? 'gesperrt' : 'freigegeben';
|
||||
|
||||
return match ($this) {
|
||||
self::Initiated => "Ich habe den Zeitraum im Portal {$what}.",
|
||||
self::Observed => "… und im Kalender des Portals gesehen, dass er {$what} ist.",
|
||||
self::Confirmed => 'Das Portal hat es bestätigt (z. B. Bestätigung oder Testanfrage abgelehnt).',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use App\Models\Booking;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* The kinds of documents a case can produce (UMSETZUNGSPLAN_v0.10 §5.4). Which one a case needs follows from its case
|
||||
* type, never from a choice of the landlord: a request gets a binding offer, a booking we made ourselves gets the
|
||||
* confirmation with the rental contract, a booking that is already binding on a portal gets the booking documentation
|
||||
* without an acceptance link (E-004). Information "unter Vorbehalt" (package 7) and the stay confirmation of A6
|
||||
* (package 6) are prepared as working drafts but cannot be sent yet.
|
||||
*/
|
||||
enum DocumentKind: string implements HasLabel
|
||||
{
|
||||
case Offer = 'offer';
|
||||
case Information = 'information';
|
||||
case Confirmation = 'confirmation';
|
||||
case ExternalRecord = 'external_record';
|
||||
case StayConfirmation = 'stay_confirmation';
|
||||
case Internal = 'internal';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Offer => 'Angebot mit Annahmelink',
|
||||
self::Information => 'Auskunft unter Vorbehalt',
|
||||
self::Confirmation => 'Buchungsbestätigung mit Mietvertrag',
|
||||
self::ExternalRecord => 'Buchungsunterlagen (beim Portal gebucht)',
|
||||
self::StayConfirmation => 'Aufenthaltsbestätigung (privat)',
|
||||
self::Internal => 'Nur intern, kein Dokument an Gäste',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* What the landlord reads about this kind on the settings page.
|
||||
*/
|
||||
public function description(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Offer => 'Für Anfragen: Preis, Vertragsentwurf und ein Link, mit dem der Gast verbindlich annimmt.',
|
||||
self::Information => 'Für Anfragen ohne Reservierung: Preis und Verfügbarkeit ohne Zusage; der Gast kann die Buchung anfragen. Folgt mit Paket 7.',
|
||||
self::Confirmation => 'Nach der Annahme eines Angebots oder einer direkt vereinbarten Buchung: Bestätigung mit dem Mietvertrag.',
|
||||
self::ExternalRecord => 'Für Buchungen, die beim Portal bereits verbindlich sind: Buchungsdaten und – falls hinterlegt – Ihre Vorlage, ohne erneute Annahme durch den Gast.',
|
||||
self::StayConfirmation => 'Für private Überlassungen (Familie, Freunde): Bestätigung des Aufenthalts ohne Mietvertrag, nur auf Wunsch.',
|
||||
self::Internal => 'Eigennutzung und Wartung: kein Dokument an Gäste.',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The document a case needs at its current stage, or null when nobody needs one from us (e.g. the portal sends it).
|
||||
*/
|
||||
public static function forCase(Booking $booking): ?self
|
||||
{
|
||||
$profile = $booking->process();
|
||||
|
||||
return match (true) {
|
||||
$booking->intake === IntakeKind::Internal => $booking->guest_id !== null ? self::StayConfirmation : self::Internal,
|
||||
$booking->caseType()->isExternallyBinding() => $profile->documents() === Responsibility::Portal ? null : self::ExternalRecord,
|
||||
$booking->isBinding() => $profile->documents() === Responsibility::Portal ? null : self::Confirmation,
|
||||
default => self::Offer,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the guest makes the contract by accepting this document (only the offer carries an acceptance link).
|
||||
*/
|
||||
public function hasAcceptanceLink(): bool
|
||||
{
|
||||
return $this === self::Offer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a rental contract is part of this document.
|
||||
*/
|
||||
public function containsContract(): bool
|
||||
{
|
||||
return in_array($this, [self::Offer, self::Confirmation, self::ExternalRecord], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether this kind can be sent with the current packages (the others exist as working drafts only).
|
||||
*/
|
||||
public function isAvailable(): bool
|
||||
{
|
||||
return in_array($this, [self::Offer, self::Confirmation, self::ExternalRecord, self::StayConfirmation], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the texts of this kind count as released while the landlord has not decided otherwise: the offer and the
|
||||
* confirmation are the documents in use since the start; every new kind starts as a working draft.
|
||||
*/
|
||||
public function releasedByDefault(): bool
|
||||
{
|
||||
return in_array($this, [self::Offer, self::Confirmation], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether this kind goes to guests at all.
|
||||
*/
|
||||
public function isForGuests(): bool
|
||||
{
|
||||
return $this !== self::Internal;
|
||||
}
|
||||
|
||||
/**
|
||||
* File name prefix of the stored PDF.
|
||||
*/
|
||||
public function fileName(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Offer => 'Angebot',
|
||||
self::Information => 'Auskunft',
|
||||
self::Confirmation => 'Mietvertrag',
|
||||
self::ExternalRecord => 'Buchungsunterlagen',
|
||||
self::StayConfirmation => 'Aufenthaltsbestaetigung',
|
||||
self::Internal => 'Intern',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* How a case arrived – the "Eingangsart". Settings of a channel may differ per intake kind, because one portal can
|
||||
* deliver both mere requests and bookings that are already binding.
|
||||
*/
|
||||
enum IntakeKind: string implements HasLabel
|
||||
{
|
||||
/** A request that is not binding yet (own website, phone, a portal passing on a request). */
|
||||
case Inquiry = 'inquiry';
|
||||
|
||||
/** A booking that is already binding when it reaches us (made on a portal). */
|
||||
case Booking = 'booking';
|
||||
|
||||
/** An internal occasion: own use, private stay, maintenance, block. */
|
||||
case Internal = 'internal';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Inquiry => 'Anfrage',
|
||||
self::Booking => 'Verbindliche Buchung',
|
||||
self::Internal => 'Eigene Nutzung / Sperre',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasColor;
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* What the intake made of one incoming event (portal calendar entry or portal e-mail).
|
||||
*/
|
||||
enum IntakeOutcome: string implements HasColor, HasLabel
|
||||
{
|
||||
/** A booking binding on the portal, recognised with confidence: a new case (A3–A5). */
|
||||
case Create = 'create';
|
||||
|
||||
/** A non-binding request through the portal: a new request case (A2). */
|
||||
case Inquiry = 'inquiry';
|
||||
|
||||
/** The same booking as an existing case (reference, same portal and dates, or its calendar mirror). */
|
||||
case Link = 'link';
|
||||
|
||||
/** Not certain enough: the landlord clarifies. */
|
||||
case Clarify = 'clarify';
|
||||
|
||||
/** No booking of this portal (block, mirror of another portal, own use, already clarified). */
|
||||
case Ignore = 'ignore';
|
||||
|
||||
/** The portal reports a cancellation of a known case. */
|
||||
case CancellationSignal = 'cancellation';
|
||||
|
||||
/** The portal reports other dates for a known case, or its calendar entry disappeared. */
|
||||
case ChangeSignal = 'change';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Create => 'Neuer Vorgang (Buchung)',
|
||||
self::Inquiry => 'Neuer Vorgang (Anfrage)',
|
||||
self::Link => 'Gehört zu vorhandenem Vorgang',
|
||||
self::Clarify => 'Klärung nötig',
|
||||
self::Ignore => 'Keine Buchung',
|
||||
self::CancellationSignal => 'Portal meldet Stornierung',
|
||||
self::ChangeSignal => 'Portal meldet Änderung',
|
||||
};
|
||||
}
|
||||
|
||||
public function getColor(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Create, self::Inquiry => 'success',
|
||||
self::Link, self::Ignore => 'gray',
|
||||
self::Clarify => 'warning',
|
||||
self::CancellationSignal, self::ChangeSignal => 'danger',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* The kinds of internal cases (A6): the landlord's own use, a private stay of family or friends, or a block without a
|
||||
* guest (maintenance and the like). None of them has a rental contract, payment reminders, reviews or marketing.
|
||||
*/
|
||||
enum InternalKind: string implements HasLabel
|
||||
{
|
||||
case OwnUse = 'own_use';
|
||||
case PrivateStay = 'private_stay';
|
||||
case Block = 'block';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::OwnUse => 'Eigene Nutzung',
|
||||
self::PrivateStay => 'Private Überlassung (Familie, Freunde)',
|
||||
self::Block => 'Sperre (z. B. Wartung)',
|
||||
};
|
||||
}
|
||||
|
||||
public function hasGuests(): bool
|
||||
{
|
||||
return $this === self::PrivateStay;
|
||||
}
|
||||
|
||||
public static function fromPurpose(?BlockedPeriodPurpose $purpose): self
|
||||
{
|
||||
return $purpose === BlockedPeriodPurpose::OwnUse ? self::OwnUse : self::Block;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* What a payment is (package 8): only the guest's payments count towards what the guest owes; a portal's payout is
|
||||
* money on our account but no payment of the guest, and "paid to the portal" is the portal's statement, not money we
|
||||
* received. Nothing is counted twice.
|
||||
*/
|
||||
enum PaymentKind: string implements HasLabel
|
||||
{
|
||||
/** The guest paid us (transfer, cash). */
|
||||
case Guest = 'guest';
|
||||
|
||||
/** The portal reports that the guest paid it (no money on our account). */
|
||||
case GuestViaPortal = 'guest_via_portal';
|
||||
|
||||
/** The portal paid out to us. */
|
||||
case PortalPayout = 'portal_payout';
|
||||
|
||||
/** We paid money back to the guest (entered as a positive amount, counted negative). */
|
||||
case Refund = 'refund';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Guest => 'Gast hat an uns gezahlt',
|
||||
self::GuestViaPortal => 'Gast hat laut Portal ans Portal gezahlt',
|
||||
self::PortalPayout => 'Auszahlung vom Portal erhalten',
|
||||
self::Refund => 'Erstattung an den Gast',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether it counts towards what the guest has paid of the agreed total.
|
||||
*/
|
||||
public function countsAsGuestPayment(): bool
|
||||
{
|
||||
return $this !== self::PortalPayout;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the money moved through our account.
|
||||
*/
|
||||
public function isOnOurAccount(): bool
|
||||
{
|
||||
return $this !== self::GuestViaPortal;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
/**
|
||||
* The settings that shape how a case is handled. Each one has a built-in default; the landlord sets his own default,
|
||||
* a property (expert area) and a channel per intake kind may deviate. A value that is not set inherits – a deliberately
|
||||
* set 0, "no" or "manual" is a value of its own.
|
||||
*/
|
||||
enum ProcessSetting: string
|
||||
{
|
||||
case Processing = 'processing';
|
||||
case PreReservation = 'pre_reservation';
|
||||
case HoldHours = 'hold_hours';
|
||||
case Documents = 'documents';
|
||||
case Payments = 'payments';
|
||||
case GuestMessages = 'guest_messages';
|
||||
case ArrivalInfoDaysBefore = 'arrival_info_days_before';
|
||||
case ContractTemplate = 'contract_template_id';
|
||||
|
||||
/**
|
||||
* Built-in default (the behaviour before any landlord setting existed).
|
||||
*/
|
||||
public function default(): string|int|bool|null
|
||||
{
|
||||
return match ($this) {
|
||||
self::Processing => ProcessingMode::Manual->value,
|
||||
self::PreReservation => true,
|
||||
self::HoldHours => 48,
|
||||
self::Documents, self::Payments, self::GuestMessages => Responsibility::Landlord->value,
|
||||
self::ArrivalInfoDaysBefore => 3,
|
||||
self::ContractTemplate => null,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The question shown to the landlord, in plain words.
|
||||
*/
|
||||
public function question(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Processing => 'Wie sollen neue Vorgänge bearbeitet werden?',
|
||||
self::PreReservation => 'Soll eine Anfrage den Zeitraum im Kalender reservieren?',
|
||||
self::HoldHours => 'Wie lange gilt ein Angebot (und bleibt der Zeitraum reserviert)?',
|
||||
self::Documents => 'Wer schickt dem Gast Vertrag bzw. Buchungsunterlagen?',
|
||||
self::Payments => 'Wer kümmert sich um die Zahlungen des Gastes?',
|
||||
self::GuestMessages => 'Wer schickt dem Gast Anreise-Informationen und die Bitte um eine Bewertung?',
|
||||
self::ArrivalInfoDaysBefore => 'Wann gehen die Anreise-Informationen an den Gast?',
|
||||
self::ContractTemplate => 'Welche Vertragsvorlage wird verwendet?',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Intake kinds for which a channel may deviate (empty: landlord and property level only).
|
||||
*
|
||||
* @return list<IntakeKind>
|
||||
*/
|
||||
public function channelIntakes(): array
|
||||
{
|
||||
return match ($this) {
|
||||
self::Processing, self::Payments, self::GuestMessages, self::ContractTemplate => [IntakeKind::Inquiry, IntakeKind::Booking],
|
||||
self::PreReservation, self::HoldHours => [IntakeKind::Inquiry],
|
||||
self::Documents => [IntakeKind::Booking],
|
||||
self::ArrivalInfoDaysBefore => [],
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the landlord sets this on his general settings page (the template is chosen per property or channel).
|
||||
*/
|
||||
public function isLandlordSetting(): bool
|
||||
{
|
||||
return $this !== self::ContractTemplate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalises a stored or submitted value; null means "not set".
|
||||
*/
|
||||
public function normalize(mixed $value): string|int|bool|null
|
||||
{
|
||||
if ($value === null || $value === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
return match ($this) {
|
||||
self::Processing => ($value instanceof ProcessingMode ? $value : ProcessingMode::tryFrom((string) $value))?->value,
|
||||
self::Documents, self::Payments, self::GuestMessages => ($value instanceof Responsibility ? $value : Responsibility::tryFrom((string) $value))?->value,
|
||||
self::PreReservation => filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE),
|
||||
self::HoldHours, self::ArrivalInfoDaysBefore, self::ContractTemplate => is_numeric($value) ? (int) $value : null,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The value in plain words, for showing where a value comes from.
|
||||
*/
|
||||
public function describe(string|int|bool|null $value): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Processing => ProcessingMode::tryFrom((string) $value)?->getLabel() ?? '–',
|
||||
self::Documents, self::Payments, self::GuestMessages => Responsibility::tryFrom((string) $value)?->getLabel() ?? '–',
|
||||
self::PreReservation => $value ? 'ja' : 'nein',
|
||||
self::HoldHours => $value.' Stunden',
|
||||
self::ArrivalInfoDaysBefore => $value.' Tage vor Anreise',
|
||||
self::ContractTemplate => $value === null ? 'Texte der Webseite' : 'Vorlage Nr. '.$value,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* Whether the system carries a case on by itself as far as the data allows, or prepares each step and waits for
|
||||
* the landlord's release.
|
||||
*/
|
||||
enum ProcessingMode: string implements HasLabel
|
||||
{
|
||||
case Automatic = 'automatic';
|
||||
case Manual = 'manual';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Automatic => 'Automatisch weiterbearbeiten',
|
||||
self::Manual => 'Jeden Schritt selbst freigeben',
|
||||
};
|
||||
}
|
||||
|
||||
public static function fromOfferMode(OfferMode $mode): self
|
||||
{
|
||||
return $mode === OfferMode::Automatic ? self::Automatic : self::Manual;
|
||||
}
|
||||
}
|
||||
@@ -13,11 +13,17 @@ enum QuoteLineType: string
|
||||
/** Manual price change by the landlord in an offer (negative = reduction). */
|
||||
case Adjustment = 'adjustment';
|
||||
|
||||
/** The agreed rent of an internal case (A6), e.g. 0 for family. */
|
||||
case Rent = 'rent';
|
||||
|
||||
/** The tourist tax (Kurabgabe) as its own position: persons × nights × the landlord's rate. */
|
||||
case TouristTax = 'tourist_tax';
|
||||
|
||||
/**
|
||||
* Whether the line counts towards the rent on which the deposit is calculated.
|
||||
*/
|
||||
public function isRent(): bool
|
||||
{
|
||||
return in_array($this, [self::Accommodation, self::ExtraGuest, self::Discount, self::Adjustment], true);
|
||||
return in_array($this, [self::Accommodation, self::ExtraGuest, self::Discount, self::Adjustment, self::Rent], true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
use Filament\Support\Contracts\HasLabel;
|
||||
|
||||
/**
|
||||
* Who takes care of a part of the handling: the landlord (with this system) or the portal.
|
||||
*/
|
||||
enum Responsibility: string implements HasLabel
|
||||
{
|
||||
case Landlord = 'landlord';
|
||||
case Portal = 'portal';
|
||||
|
||||
/** Nobody: internal cases (A6) have no rental documents, payment reminders or guest mails. */
|
||||
case Nobody = 'none';
|
||||
|
||||
public function getLabel(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Landlord => 'Wir',
|
||||
self::Portal => 'Das Portal',
|
||||
self::Nobody => 'Entfällt',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Forms;
|
||||
|
||||
use App\Documents\DocumentComposer;
|
||||
use App\Documents\DocumentComposition;
|
||||
use App\Documents\RentalContract;
|
||||
use App\Enums\AdminMode;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Mail\BookingConfirmed;
|
||||
use App\Mail\BookingDocumentation;
|
||||
use App\Mail\OfferMade;
|
||||
use App\Mail\StayConfirmed;
|
||||
use App\Models\Booking;
|
||||
use App\Models\User;
|
||||
use Closure;
|
||||
use Filament\Forms\Components\Checkbox;
|
||||
use Filament\Schemas\Components\Utilities\Get;
|
||||
use Filament\Schemas\Components\View;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* The composition of a document inside an action modal: the same picture for offer, confirmation and booking
|
||||
* documentation, recalculated whenever the landlord adjusts something, plus the explicit confirmation that is
|
||||
* required when there is something to check.
|
||||
*/
|
||||
class DocumentCompositionFields
|
||||
{
|
||||
/** @var array<string, DocumentComposition> */
|
||||
private static array $compositions = [];
|
||||
|
||||
/**
|
||||
* @param Closure(Get): array<string, mixed> $changes the adjustments currently in the form
|
||||
* @return list<View|Checkbox>
|
||||
*/
|
||||
public static function make(Booking $booking, DocumentKind $kind, Closure $changes, ?Closure $visible = null): array
|
||||
{
|
||||
$compose = fn (Get $get): DocumentComposition => self::compose($booking, $kind, $changes($get));
|
||||
|
||||
return [
|
||||
View::make('filament.document-composition')
|
||||
->viewData(fn (Get $get): array => self::viewData($compose($get), $changes($get))),
|
||||
Checkbox::make('acknowledged')
|
||||
->label('Ich habe die Hinweise geprüft und möchte das Dokument so senden.')
|
||||
->visible(fn (Get $get): bool => ($visible === null || $visible($get)) && $compose($get)->toConfirm() !== [])
|
||||
->accepted(),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* One composition per form state and request (the view and the confirmation box both need it).
|
||||
*
|
||||
* @param array<string, mixed> $changes
|
||||
*/
|
||||
public static function compose(Booking $booking, DocumentKind $kind, array $changes): DocumentComposition
|
||||
{
|
||||
$key = $booking->id.':'.$kind->value.':'.md5(serialize($changes)).':'.$booking->updated_at?->getTimestamp();
|
||||
|
||||
return self::$compositions[$key] ??= app(DocumentComposer::class)->compose($booking, $kind, $changes);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $changes
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private static function viewData(DocumentComposition $composition, array $changes): array
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
return [
|
||||
'composition' => $composition,
|
||||
'expert' => $user instanceof User && $user->adminMode() === AdminMode::Expert,
|
||||
'mailPreview' => self::mailPreview($composition),
|
||||
'documentPreview' => self::documentPreview($composition),
|
||||
'pdfUrl' => route('filament.admin.document-preview', ['booking' => $composition->draft->getRouteKey(), 'kind' => $composition->kind->value, 'changes' => base64_encode(json_encode($changes) ?: '[]')]),
|
||||
];
|
||||
}
|
||||
|
||||
private static function mailPreview(DocumentComposition $composition): string
|
||||
{
|
||||
$draft = $composition->draft;
|
||||
if ($draft->guest === null) {
|
||||
return '<p style="font-family:sans-serif">Keine Vorschau: Der Gast ist noch nicht bekannt.</p>';
|
||||
}
|
||||
|
||||
try {
|
||||
return match ($composition->kind) {
|
||||
DocumentKind::Offer => (new OfferMade($draft, '#'))->render(),
|
||||
DocumentKind::ExternalRecord => (new BookingDocumentation($draft))->render(),
|
||||
DocumentKind::StayConfirmation => (new StayConfirmed($draft))->render(),
|
||||
default => (new BookingConfirmed($draft))->render(),
|
||||
};
|
||||
} catch (Throwable $exception) {
|
||||
report($exception);
|
||||
|
||||
return '<p style="font-family:sans-serif">Die Vorschau der E-Mail ist gerade nicht möglich.</p>';
|
||||
}
|
||||
}
|
||||
|
||||
private static function documentPreview(DocumentComposition $composition): string
|
||||
{
|
||||
try {
|
||||
[$view, $data] = app(RentalContract::class)->view($composition->draft, $composition->kind, draft: $composition->kind === DocumentKind::Offer);
|
||||
|
||||
return view($view, $data)->render();
|
||||
} catch (Throwable $exception) {
|
||||
report($exception);
|
||||
|
||||
return '<p style="font-family:sans-serif">Die Vorschau des Dokuments ist gerade nicht möglich.</p>';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Forms;
|
||||
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Models\ContractTemplate;
|
||||
use Filament\Forms\Components\Field;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
|
||||
/**
|
||||
* Form fields of the process settings, asked as plain questions. On a deviation level (property, channel) an empty
|
||||
* field means "as the level above" and the placeholder says which value that is; on the landlord level an empty field
|
||||
* means the built-in default.
|
||||
*/
|
||||
class ProcessSettingFields
|
||||
{
|
||||
/**
|
||||
* @param list<ProcessSetting> $settings
|
||||
* @param callable(ProcessSetting): string $inherited plain-words value used when the field stays empty
|
||||
* @return list<Field>
|
||||
*/
|
||||
public static function make(string $prefix, array $settings, callable $inherited): array
|
||||
{
|
||||
return array_map(fn (ProcessSetting $setting): Field => self::field($prefix.$setting->value, $setting, $inherited($setting)), $settings);
|
||||
}
|
||||
|
||||
public static function field(string $name, ProcessSetting $setting, string $inheritedLabel): Field
|
||||
{
|
||||
$placeholder = 'wie Standard: '.$inheritedLabel;
|
||||
|
||||
return (match ($setting) {
|
||||
ProcessSetting::Processing => Select::make($name)->options(ProcessingMode::class)->placeholder($placeholder)
|
||||
->helperText('Automatisch: Das System sendet Angebote bzw. Unterlagen selbst, sobald alle Angaben da sind. Sonst bereitet es alles vor und Sie geben frei.'),
|
||||
ProcessSetting::PreReservation => Select::make($name)->options(['1' => 'Ja – der Zeitraum ist bis zum Ablauf des Angebots reserviert', '0' => 'Nein – eine Anfrage reserviert nichts'])->placeholder($placeholder),
|
||||
ProcessSetting::HoldHours => TextInput::make($name)->integer()->minValue(1)->maxValue(720)->suffix('Stunden')->placeholder($placeholder),
|
||||
ProcessSetting::Documents, ProcessSetting::Payments, ProcessSetting::GuestMessages => Select::make($name)->options([Responsibility::Landlord->value => Responsibility::Landlord->getLabel(), Responsibility::Portal->value => Responsibility::Portal->getLabel()])->placeholder($placeholder),
|
||||
ProcessSetting::ArrivalInfoDaysBefore => TextInput::make($name)->integer()->minValue(1)->maxValue(14)->suffix('Tage vor Anreise')->placeholder($placeholder),
|
||||
ProcessSetting::ContractTemplate => Select::make($name)
|
||||
->options(fn (): array => ContractTemplate::query()->orderBy('name')->orderBy('version')->get()->mapWithKeys(fn (ContractTemplate $template): array => [$template->id => $template->label()])->all())
|
||||
->placeholder($placeholder),
|
||||
})->label($setting->question());
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalised values of submitted fields; empty fields are dropped (not set = inherit).
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
* @param list<ProcessSetting> $settings
|
||||
* @return array<string, string|int|bool>
|
||||
*/
|
||||
public static function values(array $data, array $settings): array
|
||||
{
|
||||
$values = [];
|
||||
foreach ($settings as $setting) {
|
||||
$value = $setting->normalize($data[$setting->value] ?? null);
|
||||
if ($value !== null) {
|
||||
$values[$setting->value] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
return $values;
|
||||
}
|
||||
|
||||
/**
|
||||
* Stored values as form state (booleans as the select keys).
|
||||
*
|
||||
* @param array<string, mixed> $values
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public static function state(array $values): array
|
||||
{
|
||||
return array_map(fn (mixed $value): mixed => is_bool($value) ? ($value ? '1' : '0') : $value, $values);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Pages;
|
||||
|
||||
use App\Filament\Concerns\FollowsAdminMode;
|
||||
use BackedEnum;
|
||||
use Filament\Pages\Dashboard as BaseDashboard;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
|
||||
/**
|
||||
* The start page: first "Zu erledigen", then the coming stays and key figures.
|
||||
*/
|
||||
class Dashboard extends BaseDashboard
|
||||
{
|
||||
use FollowsAdminMode;
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedHome;
|
||||
|
||||
protected static ?string $navigationLabel = 'Start';
|
||||
|
||||
protected static ?string $title = 'Start';
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Pages;
|
||||
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Enums\UserRole;
|
||||
use App\Filament\Concerns\FollowsAdminMode;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Models\ContractTemplate;
|
||||
use App\Models\Property;
|
||||
use App\Process\ProcessProfile;
|
||||
use App\Process\ProcessSettings;
|
||||
use BackedEnum;
|
||||
use Filament\Pages\Page;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use UnitEnum;
|
||||
|
||||
/**
|
||||
* "Wirksame Einstellungen" (expert view, KONFIGURATION_UND_WIRKSAMKEIT): for every property, every way a case can come
|
||||
* in (direct request, each portal for requests and for binding bookings, own use) the value of every process setting
|
||||
* that applies right now and the level it comes from – and for one chosen case the profile that really was applied.
|
||||
* Read only: settings are changed where they belong ("So arbeite ich", the property, the portal).
|
||||
*/
|
||||
class EffectiveSettings extends Page
|
||||
{
|
||||
use FollowsAdminMode;
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedAdjustmentsHorizontal;
|
||||
|
||||
protected static string|UnitEnum|null $navigationGroup = 'System';
|
||||
|
||||
protected static ?string $navigationLabel = 'Wirksame Einstellungen';
|
||||
|
||||
protected static ?string $title = 'Wirksame Einstellungen';
|
||||
|
||||
protected static ?string $slug = 'wirksame-einstellungen';
|
||||
|
||||
protected static ?int $navigationSort = 3;
|
||||
|
||||
protected string $view = 'filament.pages.effective-settings';
|
||||
|
||||
public ?int $bookingId = null;
|
||||
|
||||
public static function canAccess(): bool
|
||||
{
|
||||
return (bool) auth()->user()?->hasRole(UserRole::Admin);
|
||||
}
|
||||
|
||||
public function mount(): void
|
||||
{
|
||||
$this->bookingId = is_numeric(request()->query('vorgang')) ? (int) request()->query('vorgang') : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Every way a case of a property can come in, with the profile that would apply now.
|
||||
*
|
||||
* @return list<array{property: Property, columns: list<array{label: string, profile: ProcessProfile}>}>
|
||||
*/
|
||||
public function matrix(): array
|
||||
{
|
||||
$settings = app(ProcessSettings::class);
|
||||
|
||||
return Property::query()->orderBy('name')->get()->map(function (Property $property) use ($settings): array {
|
||||
$columns = [['label' => 'Direkte Anfrage (Webseite, Telefon)', 'profile' => $settings->resolve($property, null, IntakeKind::Inquiry)]];
|
||||
foreach (Channel::query()->where('property_id', $property->id)->orderBy('name')->get() as $channel) {
|
||||
$columns[] = ['label' => $channel->name.' – Anfrage', 'profile' => $settings->resolve($property, $channel, IntakeKind::Inquiry)];
|
||||
$columns[] = ['label' => $channel->name.' – feste Buchung', 'profile' => $settings->resolve($property, $channel, IntakeKind::Booking)];
|
||||
}
|
||||
$columns[] = ['label' => 'Eigene Nutzung / Sperre (A6)', 'profile' => $settings->resolve($property, null, IntakeKind::Internal)];
|
||||
|
||||
return ['property' => $property, 'columns' => $columns];
|
||||
})->all();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<ProcessSetting>
|
||||
*/
|
||||
public function settings(): array
|
||||
{
|
||||
return ProcessSetting::cases();
|
||||
}
|
||||
|
||||
public function describe(ProcessSetting $setting, ProcessProfile $profile): string
|
||||
{
|
||||
$value = $profile->value($setting);
|
||||
if ($setting === ProcessSetting::ContractTemplate) {
|
||||
return $value === null ? 'Texte der Webseite' : (ContractTemplate::query()->find($value)?->label() ?? 'Vorlage Nr. '.$value);
|
||||
}
|
||||
|
||||
return $setting->describe($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Where a setting is changed in the application.
|
||||
*/
|
||||
public static function where(ProcessSetting $setting): string
|
||||
{
|
||||
return $setting === ProcessSetting::ContractTemplate
|
||||
? 'Wohnung › Abweichende Abwicklung (Experte) bzw. Portal › Anfragen / Feste Buchungen'
|
||||
: 'System › So arbeite ich; Abweichung: Wohnung (Experte), Portal je Anfrage/feste Buchung'.($setting->channelIntakes() === [] ? ' (kein Portal)' : '');
|
||||
}
|
||||
|
||||
/**
|
||||
* Recent cases to check.
|
||||
*
|
||||
* @return array<int, string>
|
||||
*/
|
||||
public function cases(): array
|
||||
{
|
||||
return Booking::query()->with('guest')->latest('id')->limit(60)->get()
|
||||
->mapWithKeys(fn (Booking $booking): array => [$booking->id => $booking->reference.' · '.$booking->guestName().' · '.$booking->caseType()->value])->all();
|
||||
}
|
||||
|
||||
public function booking(): ?Booking
|
||||
{
|
||||
return $this->bookingId ? Booking::query()->find($this->bookingId) : null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Pages;
|
||||
|
||||
use App\Documents\DocumentReleases;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Enums\UserRole;
|
||||
use App\Filament\Concerns\FollowsAdminMode;
|
||||
use App\Filament\Forms\ProcessSettingFields;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Property;
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Settings;
|
||||
use BackedEnum;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Pages\Page;
|
||||
use Filament\Schemas\Components\Actions;
|
||||
use Filament\Schemas\Components\EmbeddedSchema;
|
||||
use Filament\Schemas\Components\Form;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Components\Text;
|
||||
use Filament\Schemas\Schema;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use Illuminate\Support\HtmlString;
|
||||
use UnitEnum;
|
||||
|
||||
/**
|
||||
* "So arbeite ich": the landlord's own defaults for handling cases. A portal (Kanäle › Portal) and – in the expert
|
||||
* area – a property may deviate; everything not set there follows these defaults.
|
||||
*/
|
||||
class HandlingSettings extends Page
|
||||
{
|
||||
use FollowsAdminMode;
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedAdjustmentsVertical;
|
||||
|
||||
protected static string|UnitEnum|null $navigationGroup = 'System';
|
||||
|
||||
protected static ?string $navigationLabel = 'So arbeite ich';
|
||||
|
||||
protected static ?string $title = 'So arbeite ich';
|
||||
|
||||
protected static ?string $slug = 'abwicklung';
|
||||
|
||||
protected static ?int $navigationSort = 2;
|
||||
|
||||
/** @var array<string, mixed> */
|
||||
public array $data = [];
|
||||
|
||||
public static function canAccess(): bool
|
||||
{
|
||||
return (bool) auth()->user()?->hasRole(UserRole::Admin);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<ProcessSetting>
|
||||
*/
|
||||
public static function settings(): array
|
||||
{
|
||||
return array_values(array_filter(ProcessSetting::cases(), fn (ProcessSetting $setting): bool => $setting->isLandlordSetting()));
|
||||
}
|
||||
|
||||
public function mount(): void
|
||||
{
|
||||
$this->form->fill([
|
||||
...ProcessSettingFields::state((array) ($this->tenant()->process_defaults ?? [])),
|
||||
'document_releases' => collect(self::releasableKinds())->mapWithKeys(fn (DocumentKind $kind): array => [$kind->value => DocumentReleases::isReleased($kind, $this->tenant())])->all(),
|
||||
]);
|
||||
}
|
||||
|
||||
public function form(Schema $schema): Schema
|
||||
{
|
||||
return $schema
|
||||
->statePath('data')
|
||||
->components([
|
||||
Section::make('Ihre Standardeinstellungen')
|
||||
->description('Gilt für alle Wohnungen und Portale, solange dort nichts anderes eingestellt ist. Neue Einstellungen gelten für neue Vorgänge; laufende Vorgänge behalten ihre Regeln.')
|
||||
->columns(2)
|
||||
->schema(ProcessSettingFields::make('', self::settings(), fn (ProcessSetting $setting): string => 'Grundeinstellung ('.$setting->describe($setting->default()).')')),
|
||||
Section::make('Dokumente')
|
||||
->description('Welche Dokumente an Gäste gehen dürfen. Eine Arbeitsfassung wird nie automatisch versendet, von Hand nur nach ausdrücklicher Bestätigung im Vorgang. Vorlagen selbst geben Sie unter Vorlagen frei.')
|
||||
->schema([
|
||||
...array_map(fn (DocumentKind $kind): Toggle => Toggle::make('document_releases.'.$kind->value)
|
||||
->label($kind->getLabel().' – freigegeben')
|
||||
->helperText(fn (): string => $kind->description().self::decisionNote($kind)), self::releasableKinds()),
|
||||
Text::make(fn (): HtmlString => new HtmlString('<ul style="list-style:disc;padding-left:1.25rem">'.collect(DocumentKind::cases())
|
||||
->reject(fn (DocumentKind $kind): bool => in_array($kind, self::releasableKinds(), true) || ! $kind->isForGuests())
|
||||
->map(fn (DocumentKind $kind): string => '<li><strong>'.e($kind->getLabel()).'</strong>: '.e($kind->description()).' '.e($kind->isAvailable() ? '(in Verwendung; Texte unter Webseite › Texte bzw. Vorlagen)' : '(Arbeitsfassung vorbereitet, noch nicht nutzbar)').'</li>')
|
||||
->implode('').'</ul>')),
|
||||
]),
|
||||
Section::make('Abweichungen')
|
||||
->description('Wo Portale oder Wohnungen anders arbeiten. Ändern unter Portale bzw. Wohnungen (Expertenansicht).')
|
||||
->collapsed()
|
||||
->schema([Text::make(fn (): HtmlString => $this->deviations())]),
|
||||
]);
|
||||
}
|
||||
|
||||
public function content(Schema $schema): Schema
|
||||
{
|
||||
return $schema->components([
|
||||
Form::make([EmbeddedSchema::make('form')])
|
||||
->id('form')
|
||||
->livewireSubmitHandler('save')
|
||||
->footer([Actions::make([Action::make('save')->label('Speichern')->submit('save')])]),
|
||||
]);
|
||||
}
|
||||
|
||||
public function save(): void
|
||||
{
|
||||
$state = $this->form->getState();
|
||||
$this->tenant()->update(['process_defaults' => ProcessSettingFields::values($state, self::settings())]);
|
||||
foreach (self::releasableKinds() as $kind) {
|
||||
DocumentReleases::set($kind, (bool) ($state['document_releases'][$kind->value] ?? false), (string) auth()->user()?->name, $this->tenant());
|
||||
}
|
||||
|
||||
Notification::make()->title('Gespeichert')->body('Gilt für neue Vorgänge.')->success()->send();
|
||||
}
|
||||
|
||||
/**
|
||||
* Document kinds whose texts the landlord releases here: the new kinds that can already be sent. Offer and
|
||||
* confirmation are in use since the start; the others are drafts of later packages.
|
||||
*
|
||||
* @return list<DocumentKind>
|
||||
*/
|
||||
public static function releasableKinds(): array
|
||||
{
|
||||
return array_values(array_filter(DocumentKind::cases(), fn (DocumentKind $kind): bool => $kind->isAvailable() && ! $kind->releasedByDefault()));
|
||||
}
|
||||
|
||||
private static function decisionNote(DocumentKind $kind): string
|
||||
{
|
||||
$decision = DocumentReleases::decision($kind);
|
||||
|
||||
return $decision === null || $decision['at'] === null ? ' Bisher: Arbeitsfassung.' : ' Zuletzt geändert am '.CarbonImmutable::parse($decision['at'])->format('d.m.Y').' von '.$decision['by'].'.';
|
||||
}
|
||||
|
||||
/**
|
||||
* Every deviation of a property or a channel, in plain words.
|
||||
*/
|
||||
private function deviations(): HtmlString
|
||||
{
|
||||
$lines = [];
|
||||
foreach (Property::query()->orderBy('name')->get() as $property) {
|
||||
foreach ((array) ($property->process_overrides ?? []) as $key => $value) {
|
||||
$setting = ProcessSetting::tryFrom((string) $key);
|
||||
if ($setting !== null && $setting->normalize($value) !== null) {
|
||||
$lines[] = e($property->name).': '.e($setting->question()).' → <strong>'.e($setting->describe($setting->normalize($value))).'</strong>';
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (Channel::query()->with('property')->orderBy('name')->get() as $channel) {
|
||||
foreach ((array) ($channel->process_overrides ?? []) as $intake => $values) {
|
||||
foreach ((array) $values as $key => $value) {
|
||||
$setting = ProcessSetting::tryFrom((string) $key);
|
||||
if ($setting !== null && $setting->normalize($value) !== null) {
|
||||
$lines[] = e($channel->name.' ('.$channel->property?->name.', '.(IntakeKind::tryFrom((string) $intake)?->getLabel() ?? $intake).')').': '.e($setting->question()).' → <strong>'.e($setting->describe($setting->normalize($value))).'</strong>';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return new HtmlString($lines === [] ? 'Keine – überall gelten Ihre Standardeinstellungen.' : '<ul class="list-disc ps-5 space-y-1"><li>'.implode('</li><li>', $lines).'</li></ul>');
|
||||
}
|
||||
|
||||
private function tenant(): Tenant
|
||||
{
|
||||
$tenant = Settings::tenant();
|
||||
|
||||
abort_if($tenant === null, 404);
|
||||
|
||||
return $tenant;
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,10 @@
|
||||
|
||||
use App\Filament\Concerns\ListsCurrentProperty;
|
||||
use App\Filament\Resources\BlockedPeriods\BlockedPeriodResource;
|
||||
use Filament\Actions\CreateAction;
|
||||
use App\Filament\Resources\Bookings\BookingResource;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Resources\Pages\ManageRecords;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
|
||||
class ManageBlockedPeriods extends ManageRecords
|
||||
{
|
||||
@@ -16,7 +18,8 @@ class ManageBlockedPeriods extends ManageRecords
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
CreateAction::make()->label('Zeitraum sperren')->mutateDataUsing(fn (array $data): array => [...$data, 'source' => 'manual']),
|
||||
// New blocks are cases (A6) with their own page, history and portal tasks; this list keeps the old ones.
|
||||
Action::make('createCase')->label('Zeitraum sperren')->icon(Heroicon::OutlinedPlus)->url(BookingResource::getUrl('create', ['kind' => 'block'])),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -32,9 +32,9 @@ class BookingResource extends Resource
|
||||
|
||||
protected static string|UnitEnum|null $navigationGroup = 'Verwaltung';
|
||||
|
||||
protected static ?string $modelLabel = 'Buchung';
|
||||
protected static ?string $modelLabel = 'Vorgang';
|
||||
|
||||
protected static ?string $pluralModelLabel = 'Anfragen & Buchungen';
|
||||
protected static ?string $pluralModelLabel = 'Vorgänge';
|
||||
|
||||
protected static ?string $recordTitleAttribute = 'reference';
|
||||
|
||||
|
||||
@@ -3,10 +3,15 @@
|
||||
namespace App\Filament\Resources\Bookings\Pages;
|
||||
|
||||
use App\Actions\ConfirmBooking;
|
||||
use App\Actions\CreateInternalCase;
|
||||
use App\Actions\CreateReservation;
|
||||
use App\Actions\RecordPortalBooking;
|
||||
use App\Actions\SendBookingDocuments;
|
||||
use App\Actions\TakeOverExternalBooking;
|
||||
use App\Enums\InternalKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Filament\Resources\Bookings\BookingResource;
|
||||
use App\Filament\Resources\Bookings\Schemas\BookingForm;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Property;
|
||||
use App\Pricing\QuoteException;
|
||||
@@ -16,62 +21,130 @@
|
||||
use Filament\Resources\Pages\CreateRecord;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Entry of a new case that did not come through the website: a request (A1/A2) goes the same way as a website request,
|
||||
* a booking already binding on a portal (A3–A5) is taken over as it is.
|
||||
*/
|
||||
class CreateBooking extends CreateRecord
|
||||
{
|
||||
protected static string $resource = BookingResource::class;
|
||||
|
||||
protected static ?string $title = 'Buchung erfassen';
|
||||
protected static ?string $title = 'Neu eintragen';
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
protected function handleRecordCreation(array $data): Model
|
||||
{
|
||||
if (in_array($data['kind'] ?? null, [BookingForm::OWN_USE, BookingForm::BLOCK], true)) {
|
||||
return $this->createInternal($data);
|
||||
}
|
||||
|
||||
try {
|
||||
$property = Property::findOrFail($data['property_id']);
|
||||
$stay = new StayRequest(
|
||||
CarbonImmutable::parse($data['arrival']),
|
||||
CarbonImmutable::parse($data['departure']),
|
||||
(int) $data['guests'],
|
||||
promoCode: $data['promo_code'] ?: null,
|
||||
);
|
||||
$property = Property::query()->findOrFail($data['property_id']);
|
||||
$channel = filled($data['channel_id'] ?? null) ? Channel::query()->findOrFail($data['channel_id']) : null;
|
||||
$arrival = CarbonImmutable::parse($data['arrival']);
|
||||
$departure = CarbonImmutable::parse($data['departure']);
|
||||
$guest = Arr::only($data, ['first_name', 'last_name', 'email', 'phone', 'street', 'postal_code', 'city']);
|
||||
|
||||
if (filled($data['channel_id'] ?? null)) {
|
||||
$booking = app(RecordPortalBooking::class)->handle(
|
||||
$property,
|
||||
Channel::query()->findOrFail($data['channel_id']),
|
||||
$stay,
|
||||
$guest,
|
||||
$data['portal_process'] ?? RecordPortalBooking::CONFIRM,
|
||||
$data['portal_reference'] ?? null,
|
||||
filled($data['portal_total'] ?? null) ? (int) $data['portal_total'] : null,
|
||||
$data['internal_notes'] ?: null,
|
||||
(bool) ($data['guest_confirmed'] ?? false),
|
||||
);
|
||||
|
||||
return $booking;
|
||||
if ($data['kind'] === BookingForm::EXTERNAL) {
|
||||
return app(TakeOverExternalBooking::class)->handle($property, $channel, $arrival, $departure, [
|
||||
'guest' => $guest,
|
||||
'guests' => filled($data['guests'] ?? null) ? (int) $data['guests'] : null,
|
||||
'portal_reference' => $data['portal_reference'] ?? null,
|
||||
'portal_total' => filled($data['portal_total'] ?? null) ? (int) $data['portal_total'] : null,
|
||||
'notes' => $data['internal_notes'] ?? null,
|
||||
'guest_confirmed' => (bool) ($data['guest_confirmed'] ?? false),
|
||||
]);
|
||||
}
|
||||
|
||||
$booking = app(CreateReservation::class)->handle($property, $stay, $guest, source: 'manual', sendMails: $data['send_mails']);
|
||||
$stay = new StayRequest($arrival, $departure, (int) $data['guests'], promoCode: filled($data['promo_code'] ?? null) ? $data['promo_code'] : null);
|
||||
$sendMails = (bool) ($data['send_mails'] ?? false);
|
||||
$booking = app(CreateReservation::class)->handle($property, $stay, $guest, source: 'manual', sendMails: $sendMails && ! ($data['confirm_immediately'] ?? false), originChannel: $channel);
|
||||
|
||||
if ($data['confirm_immediately']) {
|
||||
app(ConfirmBooking::class)->handle($booking, notifyGuest: $data['send_mails']);
|
||||
if ($data['confirm_immediately'] ?? false) {
|
||||
DB::transaction(fn () => app(ConfirmBooking::class)->bind($booking));
|
||||
if ($sendMails && filled($booking->guest?->email)) {
|
||||
// The documents go out only when their composition needs no check; otherwise they wait on the case page.
|
||||
$waiting = app(SendBookingDocuments::class)->automatically($booking->fresh());
|
||||
if ($waiting !== []) {
|
||||
Notification::make()->title('Gebucht – Unterlagen noch nicht gesendet')->body(implode(' ', $waiting))->warning()->send();
|
||||
}
|
||||
} else {
|
||||
app(ConfirmBooking::class)->deliver($booking->fresh(), notifyGuest: false);
|
||||
}
|
||||
}
|
||||
} catch (QuoteException|ReservationException $exception) {
|
||||
Notification::make()->title('Buchung nicht möglich')->body($exception->getMessage())->danger()->send();
|
||||
|
||||
Notification::make()->title('Nicht möglich')->body($exception->getMessage())->danger()->send();
|
||||
$this->halt();
|
||||
}
|
||||
|
||||
$booking->update(['internal_notes' => $data['internal_notes'] ?: null]);
|
||||
if (filled($data['internal_notes'] ?? null)) {
|
||||
$booking->update(['internal_notes' => trim(($booking->internal_notes ? $booking->internal_notes."\n\n" : '').$data['internal_notes'])]);
|
||||
}
|
||||
|
||||
return $booking;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pre-filled from the calendar or the block list (?kind=block&von=…&bis=…&wohnung=…).
|
||||
*/
|
||||
protected function afterFill(): void
|
||||
{
|
||||
$kind = request()->query('kind');
|
||||
if (in_array($kind, [BookingForm::INQUIRY, BookingForm::EXTERNAL, BookingForm::OWN_USE, BookingForm::BLOCK], true)) {
|
||||
$this->data['kind'] = $kind;
|
||||
}
|
||||
foreach (['von' => 'arrival', 'bis' => 'departure'] as $parameter => $field) {
|
||||
$value = request()->query($parameter);
|
||||
if (is_string($value) && preg_match('/^\d{4}-\d{2}-\d{2}$/', $value) === 1) {
|
||||
$this->data[$field] = $value;
|
||||
}
|
||||
}
|
||||
if (is_numeric(request()->query('wohnung')) && Property::query()->whereKey((int) request()->query('wohnung'))->exists()) {
|
||||
$this->data['property_id'] = (int) request()->query('wohnung');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Own use, a private stay or a block as a case (A6).
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
private function createInternal(array $data): Model
|
||||
{
|
||||
$kind = $data['kind'] === BookingForm::BLOCK ? InternalKind::Block : InternalKind::from((string) ($data['internal_kind'] ?? InternalKind::OwnUse->value));
|
||||
$extras = [];
|
||||
foreach ((array) ($data['items'] ?? []) as $item) {
|
||||
if (filled($item['extra_id'] ?? null)) {
|
||||
$extras[(int) $item['extra_id']] = ((int) ($extras[(int) $item['extra_id']] ?? 0)) + max(1, (int) ($item['quantity'] ?? 1));
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
return app(CreateInternalCase::class)->handle(Property::query()->findOrFail($data['property_id']), $kind, CarbonImmutable::parse($data['arrival']), CarbonImmutable::parse($data['departure']), [
|
||||
'occasion' => $data['occasion'] ?? null,
|
||||
'guest' => ['first_name' => $data['stay_first_name'] ?? null, 'last_name' => $data['stay_last_name'] ?? null, 'email' => $data['stay_email'] ?? null, 'phone' => $data['stay_phone'] ?? null],
|
||||
'guests' => $data['guests'] ?? null,
|
||||
'extras' => $extras,
|
||||
'rent' => (int) ($data['rent'] ?? 0),
|
||||
'tourist_tax_persons' => filled($data['tourist_tax_persons'] ?? null) ? (int) $data['tourist_tax_persons'] : null,
|
||||
'tourist_tax_note' => $data['tourist_tax_note'] ?? null,
|
||||
'notes' => $data['internal_notes'] ?? null,
|
||||
]);
|
||||
} catch (QuoteException|ReservationException $exception) {
|
||||
Notification::make()->title('Nicht möglich')->body($exception->getMessage())->danger()->send();
|
||||
$this->halt();
|
||||
}
|
||||
}
|
||||
|
||||
protected function getRedirectUrl(): string
|
||||
{
|
||||
return BookingResource::getUrl('view', ['record' => $this->getRecord()]);
|
||||
/** @var Booking $record */
|
||||
$record = $this->getRecord();
|
||||
|
||||
return BookingResource::getUrl('view', ['record' => $record]);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -3,15 +3,19 @@
|
||||
namespace App\Filament\Resources\Bookings\RelationManagers;
|
||||
|
||||
use App\Actions\RecordPayment;
|
||||
use App\Enums\PaymentKind;
|
||||
use App\Enums\PaymentMethod;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Filament\Forms\Components\EuroInput;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Payment;
|
||||
use App\Pricing\CaseMoney;
|
||||
use App\Support\Money;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Actions\DeleteAction;
|
||||
use Filament\Forms\Components\DatePicker;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Notifications\Notification;
|
||||
@@ -38,11 +42,13 @@ public function table(Table $table): Table
|
||||
{
|
||||
return $table
|
||||
->recordTitleAttribute('amount')
|
||||
->description(fn (): string => 'Bezahlt: '.Money::format($this->ownerRecord->paidAmount()).' · offen: '.Money::format($this->ownerRecord->openAmount()))
|
||||
->description(fn (): string => 'Vom Gast bezahlt: '.Money::format($this->ownerRecord->paidAmount()).' (davon an uns '.Money::format($this->ownerRecord->paidToUs()).', laut Portal ans Portal '.Money::format($this->ownerRecord->paidViaPortal()).') · Auszahlungen vom Portal: '.Money::format($this->ownerRecord->payoutsReceived()).' · offen bei uns: '.Money::format(CaseMoney::of($this->ownerRecord)->openForUs()))
|
||||
->columns([
|
||||
TextColumn::make('paid_on')->label('Eingang')->date('d.m.Y'),
|
||||
TextColumn::make('amount')->label('Betrag')->money('EUR', divideBy: 100, locale: 'de'),
|
||||
TextColumn::make('method')->label('Art'),
|
||||
TextColumn::make('kind')->label('Was')->badge()->state(fn (Payment $record): PaymentKind => $record->kind ?? PaymentKind::Guest),
|
||||
TextColumn::make('method')->label('Zahlweg'),
|
||||
TextColumn::make('source')->label('Quelle')->placeholder('–')->toggleable(isToggledHiddenByDefault: true),
|
||||
TextColumn::make('note')->label('Notiz')->placeholder('–'),
|
||||
TextColumn::make('recorded_by')->label('Erfasst von')->placeholder('–'),
|
||||
])
|
||||
@@ -54,9 +60,11 @@ public function table(Table $table): Table
|
||||
'amount' => number_format(($this->ownerRecord->openDeposit() ?: $this->ownerRecord->openAmount()) / 100, 2, '.', ''),
|
||||
'paid_on' => today(),
|
||||
'method' => PaymentMethod::Transfer,
|
||||
'kind' => $this->ownerRecord->process()->payments() === Responsibility::Portal ? PaymentKind::PortalPayout->value : PaymentKind::Guest->value,
|
||||
])
|
||||
->schema([
|
||||
EuroInput::make('amount')->label('Betrag')->helperText('Erstattungen mit Minus erfassen.')->minValue(null)->required(),
|
||||
Radio::make('kind')->label('Was ist passiert?')->options(PaymentKind::class)->required(),
|
||||
EuroInput::make('amount')->label('Betrag')->helperText('Immer den Betrag ohne Vorzeichen; eine Erstattung wird automatisch abgezogen.')->required(),
|
||||
DatePicker::make('paid_on')->label('Zahlungseingang')->required(),
|
||||
Select::make('method')->label('Art')->options(PaymentMethod::class)->required(),
|
||||
TextInput::make('note')->label('Notiz')->maxLength(255),
|
||||
@@ -69,6 +77,8 @@ public function table(Table $table): Table
|
||||
$data['method'] instanceof PaymentMethod ? $data['method'] : PaymentMethod::from($data['method']),
|
||||
$data['note'] ?: null,
|
||||
auth()->user()?->name,
|
||||
$data['kind'] instanceof PaymentKind ? $data['kind'] : PaymentKind::from($data['kind']),
|
||||
in_array($data['kind'] instanceof PaymentKind ? $data['kind']->value : $data['kind'], [PaymentKind::GuestViaPortal->value, PaymentKind::PortalPayout->value], true) ? ($this->ownerRecord->processChannel()?->name ?? 'Portal') : null,
|
||||
);
|
||||
|
||||
Notification::make()->title('Zahlung erfasst – Status: '.$this->ownerRecord->fresh()->status->getLabel())->success()->send();
|
||||
|
||||
@@ -2,13 +2,16 @@
|
||||
|
||||
namespace App\Filament\Resources\Bookings\Schemas;
|
||||
|
||||
use App\Actions\RecordPortalBooking;
|
||||
use App\Enums\InternalKind;
|
||||
use App\Filament\Forms\Components\EuroInput;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Extra;
|
||||
use App\Models\Property;
|
||||
use App\Support\CurrentProperty;
|
||||
use App\Support\Money;
|
||||
use Filament\Forms\Components\DatePicker;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\Repeater;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\Textarea;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
@@ -18,17 +21,55 @@
|
||||
use Filament\Schemas\Schema;
|
||||
|
||||
/**
|
||||
* Manual entry of a booking received by phone or e-mail, or made binding by a portal (e.g. FeWo-direkt, usually
|
||||
* without the guest's contact data). The price is calculated automatically; a portal price can be entered.
|
||||
* "Neu": one entry for everything that arrives outside the website. The first question is what it is – a request,
|
||||
* a booking already binding on a portal, or own use / a block – and only the fields that matter for that answer follow.
|
||||
* Nothing has to be invented: unknown guest data, number of guests or portal price stay empty.
|
||||
*/
|
||||
class BookingForm
|
||||
{
|
||||
public const INQUIRY = 'inquiry';
|
||||
|
||||
public const EXTERNAL = 'external';
|
||||
|
||||
public const OWN_USE = 'own_use';
|
||||
|
||||
public const BLOCK = 'block';
|
||||
|
||||
public static function configure(Schema $schema): Schema
|
||||
{
|
||||
$is = fn (string $kind): \Closure => fn (Get $get): bool => $get('kind') === $kind;
|
||||
$isCase = fn (Get $get): bool => in_array($get('kind'), [self::INQUIRY, self::EXTERNAL], true);
|
||||
$isInternal = fn (Get $get): bool => in_array($get('kind'), [self::OWN_USE, self::BLOCK], true);
|
||||
$hasGuests = fn (Get $get): bool => $get('kind') === self::OWN_USE && $get('internal_kind') === InternalKind::PrivateStay->value;
|
||||
|
||||
return $schema
|
||||
->components([
|
||||
Section::make('Aufenthalt')
|
||||
Section::make('Was möchten Sie eintragen?')
|
||||
->schema([
|
||||
Radio::make('kind')
|
||||
->hiddenLabel()
|
||||
->options([
|
||||
self::INQUIRY => 'Eine Anfrage – per Telefon, E-Mail oder Nachricht über ein Portal',
|
||||
self::EXTERNAL => 'Eine Buchung, die bei einem Portal schon fest gebucht ist',
|
||||
self::OWN_USE => 'Eigene Nutzung oder Besuch von Familie und Freunden',
|
||||
self::BLOCK => 'Eine Sperre ohne Gäste (z. B. Wartung, Renovierung)',
|
||||
])
|
||||
->default(self::INQUIRY)
|
||||
->required()
|
||||
->live(),
|
||||
Radio::make('internal_kind')
|
||||
->label('Wer wohnt in der Wohnung?')
|
||||
->options([InternalKind::OwnUse->value => 'Wir selbst (eigene Nutzung)', InternalKind::PrivateStay->value => 'Familie oder Freunde (private Überlassung, ohne Mietvertrag)'])
|
||||
->default(InternalKind::OwnUse->value)
|
||||
->visible($is(self::OWN_USE))
|
||||
->live(),
|
||||
TextInput::make('occasion')->label(fn (Get $get): string => $get('kind') === self::BLOCK ? 'Grund der Sperre' : 'Anlass')
|
||||
->placeholder(fn (Get $get): string => $get('kind') === self::BLOCK ? 'z. B. Malerarbeiten im Bad' : 'z. B. Besuch von Tochter Anna')
|
||||
->maxLength(255)->required($is(self::BLOCK))->visible($isInternal),
|
||||
]),
|
||||
Section::make('Zeitraum')
|
||||
->columns(2)
|
||||
->visible(fn (Get $get): bool => $isCase($get) || $isInternal($get))
|
||||
->schema([
|
||||
Select::make('property_id')
|
||||
->label('Wohnung')
|
||||
@@ -40,58 +81,82 @@ public static function configure(Schema $schema): Schema
|
||||
->label('Personen')
|
||||
->integer()
|
||||
->minValue(1)
|
||||
->default(2)
|
||||
->required(),
|
||||
DatePicker::make('arrival')
|
||||
->label('Anreise')
|
||||
->required(),
|
||||
DatePicker::make('departure')
|
||||
->label('Abreise')
|
||||
->after('arrival')
|
||||
->required(),
|
||||
TextInput::make('promo_code')
|
||||
->label('Aktionscode'),
|
||||
->helperText(fn (Get $get): ?string => $get('kind') === self::EXTERNAL ? 'Leer lassen, wenn nicht bekannt.' : null)
|
||||
->visible(fn (Get $get): bool => $get('kind') !== self::BLOCK)
|
||||
->live(onBlur: true)
|
||||
->required($is(self::INQUIRY)),
|
||||
DatePicker::make('arrival')->label(fn (Get $get): string => $isInternal($get) ? 'Beginn' : 'Anreise')->required(),
|
||||
DatePicker::make('departure')->label(fn (Get $get): string => $isInternal($get) ? 'Ende (erster freier Tag)' : 'Abreise')->after('arrival')->required(),
|
||||
]),
|
||||
Section::make('Buchungsweg')
|
||||
->description('Telefon oder E-Mail: nichts auswählen. Hat ein Portal die Buchung bereits verbindlich gemacht (z. B. FeWo-direkt), das Portal wählen – dann genügen Name und Zeitraum, die Kontaktdaten können später nachgetragen werden.')
|
||||
Section::make('Gäste')
|
||||
->description('Nur eintragen, was Sie brauchen – z. B. für eine Aufenthaltsbestätigung.')
|
||||
->columns(2)
|
||||
->visible($hasGuests)
|
||||
->schema([
|
||||
TextInput::make('stay_first_name')->label('Vorname')->maxLength(255),
|
||||
TextInput::make('stay_last_name')->label('Nachname')->maxLength(255),
|
||||
TextInput::make('stay_email')->label('E-Mail (für eine Bestätigung)')->email()->maxLength(255),
|
||||
TextInput::make('stay_phone')->label('Telefon')->tel()->maxLength(50),
|
||||
]),
|
||||
Section::make('Leistungen und Kosten (optional)')
|
||||
->description('Miete ist bei Familie meist 0 €. Zahlungen lassen sich später erfassen; es gibt keine Zahlungserinnerungen.')
|
||||
->columns(2)
|
||||
->visible($is(self::OWN_USE))
|
||||
->collapsed(fn (Get $get): bool => $get('internal_kind') !== InternalKind::PrivateStay->value)
|
||||
->schema([
|
||||
EuroInput::make('rent')->label('Vereinbarte Miete')->default(0),
|
||||
TextInput::make('tourist_tax_persons')->label('Kurabgabe: Personen')->integer()->minValue(0)
|
||||
->helperText(fn (Get $get): string => ($rate = Property::query()->find($get('property_id'))?->tourist_tax_rate) ? 'Satz je Person und Nacht: '.Money::format((int) $rate).' (Wohnung › Kurabgabe)' : 'Kein Satz hinterlegt (Wohnung › Kurabgabe) – es wird nichts berechnet.'),
|
||||
TextInput::make('tourist_tax_note')->label('Befreiungen / Hinweis zur Kurabgabe')->maxLength(255)->columnSpanFull(),
|
||||
Repeater::make('items')->label('Zusatzleistungen')->columns(2)->defaultItems(0)->addActionLabel('Leistung hinzufügen')->columnSpanFull()->schema([
|
||||
Select::make('extra_id')->label('Leistung')->options(fn (Get $get): array => Extra::query()->where('property_id', $get('../../property_id'))->orderBy('name')->pluck('name', 'id')->all())->required(),
|
||||
TextInput::make('quantity')->label('Menge')->integer()->minValue(1)->default(1)->required(),
|
||||
]),
|
||||
]),
|
||||
Section::make('Portal')
|
||||
->columns(2)
|
||||
->visible($isCase)
|
||||
->schema([
|
||||
Select::make('channel_id')
|
||||
->label('Über Portal')
|
||||
->placeholder('Direkt / telefonisch / per E-Mail')
|
||||
->label(fn (Get $get): string => $get('kind') === self::EXTERNAL ? 'Gebucht über' : 'Über ein Portal (optional)')
|
||||
->placeholder('Direkt – kein Portal')
|
||||
->options(fn (Get $get): array => Channel::query()->where('property_id', $get('property_id'))->orderBy('name')->pluck('name', 'id')->all())
|
||||
->live(),
|
||||
TextInput::make('portal_reference')->label('Referenz im Portal (Buchungsnummer)')->maxLength(100)->visible(fn (Get $get): bool => filled($get('channel_id'))),
|
||||
EuroInput::make('portal_total')->label('Preis laut Portal (Gesamtpreis, optional)')->helperText('Weicht er von unserer Berechnung ab, wird die Differenz als Zeile „Abweichung Portalpreis“ geführt.')->visible(fn (Get $get): bool => filled($get('channel_id'))),
|
||||
->required($is(self::EXTERNAL)),
|
||||
TextInput::make('portal_reference')->label('Buchungsnummer im Portal')->maxLength(100)->visible($is(self::EXTERNAL)),
|
||||
EuroInput::make('portal_total')
|
||||
->label('Gesamtpreis laut Portal')
|
||||
->helperText('Der Betrag, den der Gast beim Portal gebucht hat. Leer lassen, wenn noch nicht bekannt – er wird nicht geschätzt.')
|
||||
->visible($is(self::EXTERNAL)),
|
||||
]),
|
||||
Section::make('Gast')
|
||||
->description(fn (Get $get): ?string => filled($get('channel_id')) ? 'Bei Portalbuchungen ohne Kontaktdaten genügt der Name – E-Mail und Adresse können später ergänzt werden.' : null)
|
||||
->description('Nur eintragen, was bekannt ist. Fehlendes wird später ergänzt; das System erinnert daran.')
|
||||
->columns(2)
|
||||
->visible($isCase)
|
||||
->schema([
|
||||
TextInput::make('first_name')->label('Vorname')->required()->maxLength(255),
|
||||
TextInput::make('last_name')->label('Nachname')->required()->maxLength(255),
|
||||
TextInput::make('email')->label('E-Mail')->email()->required(fn (Get $get): bool => blank($get('channel_id')))->maxLength(255),
|
||||
TextInput::make('first_name')->label('Vorname')->required($is(self::INQUIRY))->maxLength(255),
|
||||
TextInput::make('last_name')->label('Nachname')->required($is(self::INQUIRY))->maxLength(255),
|
||||
TextInput::make('email')->label('E-Mail')->email()->maxLength(255),
|
||||
TextInput::make('phone')->label('Telefon')->tel()->maxLength(50),
|
||||
TextInput::make('street')->label('Straße')->maxLength(255),
|
||||
TextInput::make('postal_code')->label('PLZ')->maxLength(20),
|
||||
TextInput::make('city')->label('Ort')->maxLength(255),
|
||||
Toggle::make('guest_confirmed')->label('Der Gast hat die Buchung bereits per E-Mail bestätigt')->visible($is(self::EXTERNAL)),
|
||||
]),
|
||||
Section::make('Abschluss')
|
||||
Section::make('Wie geht es weiter?')
|
||||
->visible($is(self::INQUIRY))
|
||||
->schema([
|
||||
Textarea::make('internal_notes')->label('Interne Notiz'),
|
||||
Toggle::make('confirm_immediately')->label('Sofort verbindlich bestätigen')->default(true)->visible(fn (Get $get): bool => blank($get('channel_id'))),
|
||||
Toggle::make('send_mails')->label('E-Mails an den Gast senden')->default(false)->visible(fn (Get $get): bool => blank($get('channel_id'))),
|
||||
Radio::make('portal_process')
|
||||
->label('Wie geht der Vertragsprozess weiter?')
|
||||
->options([
|
||||
RecordPortalBooking::CONFIRM => 'Buchung bestätigen (Zeitraum belegen), Vertrag später – sobald die Kontaktdaten da sind',
|
||||
RecordPortalBooking::CONTRACT => 'Buchung bestätigen und Vertrag jetzt per E-Mail senden (E-Mail-Adresse nötig)',
|
||||
RecordPortalBooking::RECORD => 'Nur als Anfrage erfassen – alles Weitere von Hand',
|
||||
])
|
||||
->default(RecordPortalBooking::CONFIRM)
|
||||
->required(fn (Get $get): bool => filled($get('channel_id')))
|
||||
->visible(fn (Get $get): bool => filled($get('channel_id'))),
|
||||
Toggle::make('guest_confirmed')->label('Der Gast hat die Buchung bereits per E-Mail bestätigt')->visible(fn (Get $get): bool => filled($get('channel_id'))),
|
||||
Toggle::make('confirm_immediately')
|
||||
->label('Die Buchung ist mit dem Gast schon fest vereinbart – gleich verbindlich eintragen')
|
||||
->helperText('Aus: Das System bereitet das Angebot vor; je nach Einstellung geht es automatisch hinaus oder wartet auf Ihre Freigabe.')
|
||||
->default(false),
|
||||
Toggle::make('send_mails')->label('Dem Gast E-Mails senden (Eingangsbestätigung bzw. Buchungsbestätigung)')->default(true),
|
||||
TextInput::make('promo_code')->label('Aktionscode')->maxLength(50),
|
||||
]),
|
||||
Section::make('Notiz')
|
||||
->visible(fn (Get $get): bool => $isCase($get) || $isInternal($get))
|
||||
->collapsed()
|
||||
->schema([
|
||||
Textarea::make('internal_notes')->hiddenLabel()->placeholder('Interne Notiz (nur für Sie sichtbar)'),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -3,8 +3,20 @@
|
||||
namespace App\Filament\Resources\Bookings\Schemas;
|
||||
|
||||
use App\Documents\OfferTerms;
|
||||
use App\Enums\ActivityState;
|
||||
use App\Enums\AdminMode;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\ProcessingMode;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Enums\Responsibility;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Support\BookingProgress;
|
||||
use App\Models\IntakeObservation;
|
||||
use App\Models\User;
|
||||
use App\Pricing\CaseMoney;
|
||||
use App\Process\CaseActivities;
|
||||
use App\Process\CaseAutomation;
|
||||
use App\Process\ProcessProfile;
|
||||
use App\Support\Money;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Filament\Infolists\Components\RepeatableEntry;
|
||||
@@ -15,189 +27,224 @@
|
||||
use Filament\Schemas\Schema;
|
||||
use Illuminate\Support\HtmlString;
|
||||
|
||||
/**
|
||||
* The case page: first where it stands and what is next, then the activities and the history, then the facts (guest,
|
||||
* stay, price and payments, documents). Technical details are shown in the expert view only.
|
||||
*/
|
||||
class BookingInfolist
|
||||
{
|
||||
/**
|
||||
* The process as a checklist: every milestone with its state and the activities that belong to it. Open
|
||||
* activities name the action on this page that does them.
|
||||
*/
|
||||
private static function timeline(Booking $booking): HtmlString
|
||||
{
|
||||
$badge = [
|
||||
'done' => ['✓', '#16a34a', 'erledigt'],
|
||||
'current' => ['●', '#d97706', 'jetzt'],
|
||||
'todo' => ['○', '#9ca3af', 'später'],
|
||||
'skipped' => ['–', '#9ca3af', 'entfällt'],
|
||||
];
|
||||
|
||||
$rows = collect(BookingProgress::steps($booking))->map(function (array $step) use ($badge): string {
|
||||
[$icon, $color, $word] = $badge[$step['state']];
|
||||
$activities = collect($step['activities'])->map(fn (array $activity): string => '<li style="margin:.15rem 0;'.($activity['done'] ? 'color:#15803d' : '').'">'.($activity['done'] ? '✓ ' : '○ ').e($activity['label']).($activity['action'] && $step['state'] !== 'skipped' ? ' <span style="color:#b45309">→ Aktion „'.e($activity['action']).'“</span>' : '').'</li>')->implode('');
|
||||
|
||||
return '<div style="display:flex;gap:.75rem;padding:.55rem 0;border-bottom:1px solid rgba(128,128,128,.25)">'
|
||||
.'<div style="width:1.6rem;text-align:center;font-weight:700;color:'.$color.'" title="'.$word.'">'.$icon.'</div>'
|
||||
.'<div style="flex:1"><div style="'.($step['state'] === 'current' ? 'font-weight:700' : '').($step['state'] === 'skipped' ? ';color:#9ca3af' : '').'">'.e($step['label']).($step['detail'] ? ' <span style="font-weight:400;color:#6b7280">· '.e($step['detail']).'</span>' : '').'</div>'
|
||||
.($activities !== '' ? '<ul style="list-style:none;padding:0;margin:.2rem 0 0;font-size:.85rem">'.$activities.'</ul>' : '').'</div></div>';
|
||||
})->implode('');
|
||||
|
||||
return new HtmlString('<div>'.$rows.'</div>');
|
||||
}
|
||||
|
||||
/**
|
||||
* What has happened so far, oldest first.
|
||||
*/
|
||||
private static function chronicle(Booking $booking): HtmlString
|
||||
{
|
||||
$rows = collect(BookingProgress::history($booking))->map(fn (array $event): string => '<li style="margin:.2rem 0"><span style="color:#6b7280">'.$event['at']->format('d.m.Y H:i').'</span> · '.e($event['label']).'</li>')->implode('');
|
||||
|
||||
return new HtmlString('<ul style="list-style:none;padding:0;margin:0;font-size:.9rem">'.$rows.'</ul>');
|
||||
}
|
||||
|
||||
/**
|
||||
* The standard process that applies to this booking: which template (with cancellation rule and annexes) comes from
|
||||
* the portal and booking type, and whether payments become tasks.
|
||||
*/
|
||||
private static function setup(Booking $booking): string
|
||||
{
|
||||
$channel = $booking->importChannel ?? $booking->originChannel;
|
||||
$template = OfferTerms::templateFor($booking);
|
||||
$policy = $template?->cancellationPolicy;
|
||||
$annexes = $template?->annexesFor($booking)->map(fn ($annex) => $annex->name)->implode(', ');
|
||||
|
||||
return collect([
|
||||
$channel ? 'Portal: '.$channel->name : 'Eigene Buchung (Webseite / manuell)',
|
||||
'Vertragsvorlage: '.($template ? $template->label() : 'Texte der Webseite'),
|
||||
'Stornoregel: '.($policy ? $policy->name : 'keine hinterlegt'),
|
||||
'Anlagen: '.($annexes ?: 'keine'),
|
||||
'Zahlungsaufgaben: '.($booking->wantsPaymentTasks() ? 'ja' : 'nein (läuft über das Portal)'),
|
||||
])->implode(' · ');
|
||||
}
|
||||
|
||||
public static function configure(Schema $schema): Schema
|
||||
{
|
||||
return $schema
|
||||
->columns(3)
|
||||
->components([
|
||||
Section::make('Vorgang')
|
||||
Section::make('Als Nächstes')
|
||||
->columnSpanFull()
|
||||
->schema([
|
||||
TextEntry::make('process')->label('Art des Vorgangs')->state(fn (Booking $record): string => BookingProgress::kindLabel($record)),
|
||||
TextEntry::make('next')
|
||||
->label(fn (Booking $record): string => 'Nächster Schritt: '.BookingProgress::next($record)['title'])
|
||||
->state(fn (Booking $record): string => BookingProgress::next($record)['text'])
|
||||
->color(fn (Booking $record): string => BookingProgress::next($record)['color'])
|
||||
->weight('bold'),
|
||||
TextEntry::make('setup')
|
||||
->label('Standardprozess (aus Portal und Buchungstyp)')
|
||||
->state(fn (Booking $record): string => self::setup($record))
|
||||
->columnSpanFull(),
|
||||
TextEntry::make('steps')
|
||||
->label('Ablauf: Meilensteine und Aktivitäten')
|
||||
->state(fn (Booking $record): HtmlString => self::timeline($record))
|
||||
->html()
|
||||
->columnSpanFull(),
|
||||
TextEntry::make('chronicle')
|
||||
->label('Bisheriger Verlauf')
|
||||
->state(fn (Booking $record): HtmlString => self::chronicle($record))
|
||||
->html()
|
||||
->columnSpanFull(),
|
||||
->hiddenLabel()
|
||||
->state(fn (Booking $record): HtmlString => self::nextStep($record))
|
||||
->html(),
|
||||
]),
|
||||
Grid::make(1)
|
||||
->columnSpan(2)
|
||||
->schema([
|
||||
Section::make('Vertrag')
|
||||
->columns(2)
|
||||
->schema([
|
||||
TextEntry::make('contract_template')->label('Vorlage')->state(fn (Booking $record): string => isset($record->offer_terms['template']) ? $record->offer_terms['template']['name'].' (Version '.$record->offer_terms['template']['version'].')' : ($record->offer_terms ? 'Texte der Webseite (Stand '.CarbonImmutable::parse($record->offer_terms['captured_at'])->format('d.m.Y').')' : 'Noch kein Angebot / Vertrag')),
|
||||
TextEntry::make('contract_state')->label('Dokumente')->state(fn (Booking $record): string => collect([
|
||||
$record->offer_path ? 'Angebot (PDF) Version '.$record->offer_version : null,
|
||||
$record->contract_path ? 'Mietvertrag (PDF, unveränderlich, Prüfsumme '.substr((string) $record->contract_pdf_sha256, 0, 10).')' : null,
|
||||
])->filter()->implode(' · ') ?: 'Noch kein Dokument – der Vertrag entsteht mit dem Angebot bzw. der Bestätigung'),
|
||||
TextEntry::make('contract_mail')->label('Zustellung')->state(fn (Booking $record): string => $record->confirmation_sent_at ? 'Bestätigung mit Vertrag gesendet am '.$record->confirmation_sent_at->format('d.m.Y, H:i') : ($record->confirmation_failed_at ? 'Versand fehlgeschlagen' : 'Noch nicht gesendet'))->columnSpanFull(),
|
||||
]),
|
||||
Section::make('Aufenthalt')
|
||||
->columns(3)
|
||||
->schema([
|
||||
TextEntry::make('property.name')->label('Wohnung'),
|
||||
TextEntry::make('arrival')->label('Anreise')->date('l, d.m.Y'),
|
||||
TextEntry::make('departure')->label('Abreise')->date('l, d.m.Y'),
|
||||
TextEntry::make('nights')->label('Nächte')->state(fn (Booking $record): int => $record->nights()),
|
||||
TextEntry::make('guests')->label('Personen'),
|
||||
TextEntry::make('promo_code')->label('Aktionscode')->placeholder('–'),
|
||||
]),
|
||||
Section::make('Preis')
|
||||
Section::make('Ablauf')
|
||||
->description('Was erledigt ist, was wartet und was noch kommt.')
|
||||
->schema([TextEntry::make('activities')->hiddenLabel()->state(fn (Booking $record): HtmlString => self::activities($record))->html()]),
|
||||
Section::make('Preis und Zahlungen')
|
||||
->schema([
|
||||
TextEntry::make('price_unknown')
|
||||
->hiddenLabel()
|
||||
->state('Der Gesamtpreis ist noch nicht bekannt.')
|
||||
->color('warning')
|
||||
->visible(fn (Booking $record): bool => $record->total === null),
|
||||
RepeatableEntry::make('quote.lines')
|
||||
->hiddenLabel()
|
||||
->table([
|
||||
TableColumn::make('Leistung'),
|
||||
TableColumn::make('Betrag')->alignEnd(),
|
||||
])
|
||||
->visible(fn (Booking $record): bool => filled($record->quote['lines'] ?? null))
|
||||
->table([TableColumn::make('Leistung'), TableColumn::make('Betrag')->alignEnd()])
|
||||
->schema([
|
||||
TextEntry::make('label'),
|
||||
TextEntry::make('amount')->formatStateUsing(fn (int $state): string => Money::format($state))->alignEnd(),
|
||||
]),
|
||||
Grid::make(4)->schema([
|
||||
TextEntry::make('total')->label('Gesamtpreis')->money('EUR', divideBy: 100, locale: 'de')->weight('bold'),
|
||||
TextEntry::make('deposit')->label('Anzahlung')->money('EUR', divideBy: 100, locale: 'de'),
|
||||
TextEntry::make('balance')->label('Restzahlung')->state(fn (Booking $record): string => Money::format($record->total - $record->deposit)),
|
||||
TextEntry::make('balance_due_on')->label('Rest fällig am')->date('d.m.Y'),
|
||||
TextEntry::make('paid')->label('Bezahlt')->state(fn (Booking $record): string => Money::format($record->paidAmount())),
|
||||
TextEntry::make('open')->label('Offen')->state(fn (Booking $record): string => Money::format($record->openAmount()))->color(fn (Booking $record): string => $record->openAmount() > 0 ? 'danger' : 'success'),
|
||||
TextEntry::make('deposit_due_on')->label('Anzahlung fällig am')->date('d.m.Y')->placeholder('–'),
|
||||
]),
|
||||
TextEntry::make('money')->hiddenLabel()->html()
|
||||
->state(fn (Booking $record): HtmlString => new HtmlString(view('filament.case-money', ['money' => CaseMoney::of($record), 'booking' => $record])->render())),
|
||||
TextEntry::make('balance_due_on')->label('Restzahlung fällig am')->date('d.m.Y')
|
||||
->visible(fn (Booking $record): bool => $record->wantsPaymentTasks() && $record->balance_due_on !== null),
|
||||
]),
|
||||
Section::make('Verlauf')
|
||||
->collapsible()
|
||||
->schema([TextEntry::make('history')->hiddenLabel()->state(fn (Booking $record): HtmlString => self::history($record))->html()]),
|
||||
Section::make('Nachricht des Gastes')
|
||||
->visible(fn (Booking $record): bool => filled($record->message))
|
||||
->schema([
|
||||
TextEntry::make('message')->hiddenLabel(),
|
||||
]),
|
||||
->schema([TextEntry::make('message')->hiddenLabel()]),
|
||||
]),
|
||||
Grid::make(1)
|
||||
->columnSpan(1)
|
||||
->schema([
|
||||
Section::make('Status')
|
||||
->schema([
|
||||
TextEntry::make('status')->label('Status')->badge(),
|
||||
TextEntry::make('hold_expires_at')->label('Vorgemerkt bis')->dateTime('d.m.Y, H:i')->visible(fn (Booking $record): bool => $record->hold_expires_at !== null),
|
||||
TextEntry::make('confirmed_at')->label('Bestätigt am')->dateTime('d.m.Y, H:i')->visible(fn (Booking $record): bool => $record->confirmed_at !== null),
|
||||
TextEntry::make('created_at')->label('Eingegangen')->dateTime('d.m.Y, H:i'),
|
||||
TextEntry::make('processing')
|
||||
->label('Bearbeitung / Vorreservierung')
|
||||
->state(fn (Booking $record): string => $record->property->offer_mode->value === 'automatic' ? 'Automatisch' : 'Manuell')
|
||||
->visible(fn (Booking $record): bool => $record->isDirect()),
|
||||
TextEntry::make('offer')
|
||||
->label('Angebot')
|
||||
->state(fn (Booking $record): string => 'Version '.$record->offer_version.', gesendet '.$record->offer_sent_at?->format('d.m.Y, H:i').' · Prüfsumme '.substr((string) $record->offer_hash, 0, 12).(isset($record->offer_terms['template']) ? ' · Vorlage '.$record->offer_terms['template']['name'].' v'.$record->offer_terms['template']['version'] : ''))
|
||||
->visible(fn (Booking $record): bool => $record->offer_version > 0),
|
||||
TextEntry::make('accepted_at')->label('Angenommen am')->dateTime('d.m.Y, H:i:s')->visible(fn (Booking $record): bool => $record->accepted_at !== null),
|
||||
TextEntry::make('confirmation')
|
||||
->label('Bestätigungs-E-Mail')
|
||||
->state(fn (Booking $record): string => $record->confirmation_sent_at !== null ? 'Gesendet '.$record->confirmation_sent_at->format('d.m.Y, H:i') : 'Nicht zugestellt – bitte „Bestätigung erneut senden“')
|
||||
->color(fn (Booking $record): string => $record->confirmation_sent_at !== null ? 'success' : 'danger')
|
||||
->visible(fn (Booking $record): bool => $record->confirmation_sent_at !== null || $record->confirmation_failed_at !== null),
|
||||
TextEntry::make('source')->label('Buchungskanal / Quelle')->state(fn (Booking $record): string => $record->bookingChannelLabel()),
|
||||
TextEntry::make('referral_source')->label('Aufmerksam geworden durch')->placeholder('–'),
|
||||
TextEntry::make('utm')
|
||||
->label('Kampagne (UTM)')
|
||||
->state(fn (Booking $record): ?string => collect([$record->utm_source, $record->utm_medium, $record->utm_campaign])->filter()->implode(' / ') ?: null)
|
||||
->visible(fn (Booking $record): bool => filled($record->utm_source)),
|
||||
]),
|
||||
Section::make('Gast')
|
||||
->schema([
|
||||
TextEntry::make('guest.full_name')->label('Name'),
|
||||
TextEntry::make('guest.email')->label('E-Mail')->placeholder('Unbekannt')->copyable(),
|
||||
TextEntry::make('guest_name')->label('Name')->state(fn (Booking $record): string => $record->guestName())
|
||||
->color(fn (Booking $record): ?string => $record->guest === null ? 'warning' : null),
|
||||
TextEntry::make('guest.email')->label('E-Mail')->placeholder('noch nicht bekannt')->copyable(),
|
||||
TextEntry::make('guest.phone')->label('Telefon')->placeholder('–'),
|
||||
TextEntry::make('guest_address')
|
||||
->label('Adresse')
|
||||
->state(fn (Booking $record): ?string => collect([$record->guest->street, trim("{$record->guest->postal_code} {$record->guest->city}")])->filter()->implode(', ') ?: null)
|
||||
->state(fn (Booking $record): ?string => $record->guest === null ? null : (collect([$record->guest->street, trim("{$record->guest->postal_code} {$record->guest->city}")])->filter()->implode(', ') ?: null))
|
||||
->placeholder('–'),
|
||||
]),
|
||||
Section::make('Interne Notizen')
|
||||
Section::make('Aufenthalt')
|
||||
->schema([
|
||||
TextEntry::make('internal_notes')->hiddenLabel()->placeholder('Keine Notizen'),
|
||||
TextEntry::make('property.name')->label('Wohnung'),
|
||||
TextEntry::make('period')->label('Zeitraum')->state(fn (Booking $record): string => $record->arrival->translatedFormat('D, d.m.Y').' – '.$record->departure->translatedFormat('D, d.m.Y').' ('.$record->nights().' Nächte)'),
|
||||
TextEntry::make('guests')->label('Personen')->placeholder('noch nicht bekannt'),
|
||||
TextEntry::make('channel')->label('Über')->state(fn (Booking $record): string => $record->bookingChannelLabel().($record->portal_reference ? ' · Nr. '.$record->portal_reference : '')),
|
||||
]),
|
||||
Section::make('Dokumente')
|
||||
->schema([
|
||||
TextEntry::make('documents')->hiddenLabel()->html()->state(fn (Booking $record): HtmlString => self::documents($record)),
|
||||
TextEntry::make('document_kind')->label('Vorgesehen')->state(fn (Booking $record): string => DocumentKind::forCase($record)?->getLabel() ?? 'Unterlagen schickt das Portal'),
|
||||
TextEntry::make('template')->label('Vorlage')->visible(fn (Booking $record): bool => ! $record->isInternal())->state(fn (Booking $record): string => isset($record->offer_terms['template']) && ($record->contract_path !== null || $record->offer_path !== null)
|
||||
? $record->offer_terms['template']['name'].' (Version '.$record->offer_terms['template']['version'].', festgeschrieben)'
|
||||
: (OfferTerms::templateFor($record)?->label() ?? 'Texte der Webseite').' (vorgesehen)'),
|
||||
]),
|
||||
Section::make('Interne Notizen')
|
||||
->collapsible()
|
||||
->schema([TextEntry::make('internal_notes')->hiddenLabel()->placeholder('Keine Notizen')]),
|
||||
]),
|
||||
Section::make('Technische Angaben')
|
||||
->description('Expertenansicht')
|
||||
->columnSpanFull()
|
||||
->collapsed()
|
||||
->visible(fn (): bool => auth()->user() instanceof User && auth()->user()->adminMode() === AdminMode::Expert)
|
||||
->columns(3)
|
||||
->schema([
|
||||
TextEntry::make('status')->label('Status')->badge(),
|
||||
TextEntry::make('case_type')->label('Vorgangsart')->state(fn (Booking $record): string => strtoupper($record->caseType()->value).' – '.$record->caseType()->getLabel()),
|
||||
TextEntry::make('intake')->label('Eingangsart')->state(fn (Booking $record): string => $record->intake?->getLabel() ?? '–'),
|
||||
TextEntry::make('sources')->label('Quellen und Kalenderdarstellungen')->state(fn (Booking $record): HtmlString => self::sources($record))->html()->columnSpanFull(),
|
||||
TextEntry::make('profile')->label('Abwicklungsprofil (eingefroren)')->state(fn (Booking $record): HtmlString => self::profile($record))->html()->columnSpanFull(),
|
||||
TextEntry::make('hold_expires_at')->label('Reserviert bis')->dateTime('d.m.Y, H:i')->placeholder('–'),
|
||||
TextEntry::make('offer_hash')->label('Angebot (Prüfsumme)')->state(fn (Booking $record): ?string => $record->offer_version > 0 ? 'Version '.$record->offer_version.' · '.substr((string) $record->offer_hash, 0, 16) : null)->placeholder('–'),
|
||||
TextEntry::make('contract_pdf_sha256')->label('Vertrag (Prüfsumme)')->formatStateUsing(fn (?string $state): string => substr((string) $state, 0, 16))->placeholder('–'),
|
||||
TextEntry::make('accepted_at')->label('Angenommen am')->dateTime('d.m.Y, H:i:s')->placeholder('–'),
|
||||
TextEntry::make('source')->label('Quelle'),
|
||||
TextEntry::make('referral_source')->label('Aufmerksam geworden durch')->placeholder('–'),
|
||||
TextEntry::make('utm')->label('Kampagne (UTM)')->state(fn (Booking $record): ?string => collect([$record->utm_source, $record->utm_medium, $record->utm_campaign])->filter()->implode(' / ') ?: null)->placeholder('–'),
|
||||
TextEntry::make('created_at')->label('Eingegangen')->dateTime('d.m.Y, H:i'),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* The next step in large type, with what keeps an automatic case waiting.
|
||||
*/
|
||||
private static function nextStep(Booking $booking): HtmlString
|
||||
{
|
||||
$next = CaseActivities::next($booking);
|
||||
$automatic = $booking->processingMode() === ProcessingMode::Automatic;
|
||||
$waiting = collect(CaseActivities::for($booking))->first(fn ($activity): bool => $activity->state === ActivityState::Waiting);
|
||||
|
||||
$title = match (true) {
|
||||
$next !== null => e($next->label),
|
||||
$waiting !== null => 'Nichts zu tun – es wartet: '.e($waiting->label),
|
||||
default => 'Nichts zu tun.',
|
||||
};
|
||||
$color = $next?->state === ActivityState::Problem ? '#dc2626' : ($next !== null ? '#b45309' : '#15803d');
|
||||
$detail = $next?->detail ?? $waiting?->detail;
|
||||
$mode = $automatic
|
||||
? 'Dieser Vorgang läuft automatisch weiter, sobald alle Angaben da sind.'.(($blockers = self::blockers($booking)) !== [] ? ' Es fehlt: '.e(implode(' ', $blockers)) : '')
|
||||
: 'Sie geben jeden Schritt selbst frei. Der Knopf oben rechts führt zum nächsten Schritt.';
|
||||
|
||||
return new HtmlString('<div style="font-size:1.35rem;font-weight:700;color:'.$color.'">'.$title.'</div>'
|
||||
.($detail ? '<div style="margin-top:.2rem">'.e($detail).'</div>' : '')
|
||||
.'<div style="margin-top:.5rem;color:#6b7280;font-size:.9rem">'.$mode.'</div>');
|
||||
}
|
||||
|
||||
/**
|
||||
* Every portal entry (calendar or e-mail) that belongs to the case, and what the intake recorded about it.
|
||||
*/
|
||||
private static function sources(Booking $booking): HtmlString
|
||||
{
|
||||
$lines = BlockedPeriod::query()->withTrashed()->with('channel')->where('linked_booking_id', $booking->id)->orderBy('id')->get()
|
||||
->map(fn (BlockedPeriod $entry): string => e(($entry->source === 'email' ? 'E-Mail' : 'Kalender').' von '.($entry->channel?->name ?? '–').': '.$entry->starts_on->format('d.m.').'–'.$entry->ends_on->format('d.m.Y')
|
||||
.($entry->trashed() ? ' · nicht mehr im Kalender' : '').($entry->starts_on->equalTo($booking->arrival) && $entry->ends_on->equalTo($booking->departure) ? '' : ' · abweichende Termine').' · Kennung '.$entry->external_uid));
|
||||
$observations = IntakeObservation::query()->with('channel')->where('booking_id', $booking->id)->orderBy('occurred_at')->get()
|
||||
->map(fn (IntakeObservation $observation): string => e($observation->occurred_at->format('d.m.Y H:i').' · '.$observation->sourceLabel().' '.$observation->channel?->name.' · '.$observation->outcome->getLabel().($observation->applied ? '' : ' (nur protokolliert)')));
|
||||
|
||||
$html = $lines->isEmpty() ? 'Keine Portaleinträge zugeordnet.' : $lines->implode('<br>');
|
||||
|
||||
return new HtmlString($observations->isEmpty() ? $html : $html.'<br><span style="color:#6b7280">Eingang: '.$observations->implode('<br>').'</span>');
|
||||
}
|
||||
|
||||
/**
|
||||
* The documents made for the case, as recorded when they were created (kind, template, date).
|
||||
*/
|
||||
private static function documents(Booking $booking): HtmlString
|
||||
{
|
||||
$lines = $booking->events()->where('type', 'document')->whereNotNull('data')->reorder()->orderBy('occurred_at')->orderBy('id')->get()
|
||||
->filter(fn ($event): bool => isset($event->data['kind']))
|
||||
->map(fn ($event): string => e($event->occurred_at->format('d.m.Y').' · '.$event->summary));
|
||||
|
||||
if ($lines->isEmpty()) {
|
||||
$lines = collect([
|
||||
$booking->offer_path ? 'Angebot Version '.$booking->offer_version : null,
|
||||
$booking->contract_path ? 'Mietvertrag' : null,
|
||||
$booking->confirmation_sent_at ? 'Bestätigung gesendet am '.$booking->confirmation_sent_at->format('d.m.Y') : null,
|
||||
])->filter()->map(fn (string $line): string => e($line));
|
||||
}
|
||||
|
||||
return new HtmlString($lines->isEmpty() ? 'Noch keine' : $lines->implode('<br>'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<string>
|
||||
*/
|
||||
private static function blockers(Booking $booking): array
|
||||
{
|
||||
return $booking->isBinding() && $booking->confirmation_sent_at === null && $booking->process()->documents() === Responsibility::Landlord
|
||||
? app(CaseAutomation::class)->documentBlockers($booking)
|
||||
: [];
|
||||
}
|
||||
|
||||
private static function activities(Booking $booking): HtmlString
|
||||
{
|
||||
$colors = ['success' => '#15803d', 'warning' => '#b45309', 'danger' => '#dc2626', 'info' => '#2563eb', 'gray' => '#9ca3af'];
|
||||
|
||||
$rows = collect(CaseActivities::for($booking))
|
||||
->reject(fn ($activity): bool => $activity->state === ActivityState::NotApplicable)
|
||||
->map(function ($activity) use ($colors): string {
|
||||
$color = $colors[$activity->state->getColor()];
|
||||
$strong = $activity->state->needsAction() ? 'font-weight:700' : '';
|
||||
|
||||
return '<li style="display:flex;gap:.75rem;padding:.45rem 0;border-bottom:1px solid rgba(128,128,128,.2)">'
|
||||
.'<span style="width:1.4rem;text-align:center;font-weight:700;color:'.$color.'">'.$activity->state->icon().'</span>'
|
||||
.'<span style="flex:1;'.$strong.'">'.e($activity->label)
|
||||
.($activity->detail ? ' <span style="font-weight:400;color:#6b7280">· '.e($activity->detail).'</span>' : '')
|
||||
.($activity->url && $activity->state->needsAction() ? ' <a href="'.e($activity->url).'" style="color:#2563eb;text-decoration:underline">erledigen</a>' : '')
|
||||
.'</span><span style="color:'.$color.';font-size:.85rem">'.e($activity->state->getLabel()).'</span></li>';
|
||||
})->implode('');
|
||||
|
||||
return new HtmlString('<ul style="list-style:none;margin:0;padding:0">'.$rows.'</ul>');
|
||||
}
|
||||
|
||||
private static function history(Booking $booking): HtmlString
|
||||
{
|
||||
$rows = $booking->events()->get()->map(fn ($event): string => '<li style="margin:.25rem 0"><span style="color:#6b7280">'.$event->occurred_at->format('d.m.Y H:i').'</span> · '.e($event->summary)
|
||||
.($event->actor ? ' <span style="color:#6b7280">('.e($event->actor).')</span>' : '')
|
||||
.($event->reason ? '<div style="color:#6b7280;margin-left:1rem">Grund: '.e($event->reason).'</div>' : '').'</li>')->implode('');
|
||||
|
||||
return new HtmlString($rows === '' ? 'Noch keine Einträge.' : '<ul style="list-style:none;padding:0;margin:0;font-size:.9rem">'.$rows.'</ul>');
|
||||
}
|
||||
|
||||
private static function profile(Booking $booking): HtmlString
|
||||
{
|
||||
$profile = $booking->process();
|
||||
$rows = collect(ProcessSetting::cases())
|
||||
->reject(fn (ProcessSetting $setting): bool => in_array($setting, ProcessProfile::LIVE, true))
|
||||
->map(fn (ProcessSetting $setting): string => '<li>'.e($setting->question()).' <strong>'.e($setting->describe($profile->value($setting))).'</strong> <span style="color:#6b7280">('.e(ProcessProfile::sourceLabel($profile->source($setting))).')</span></li>')
|
||||
->implode('');
|
||||
|
||||
return new HtmlString('<ul style="list-style:disc;padding-left:1.2rem">'.$rows.'</ul><div style="color:#6b7280;font-size:.85rem">Festgelegt '.e(($profile->origin === 'migration' ? 'bei der Übernahme der bisherigen Daten' : 'beim Eingang').($profile->frozenAt ? ' am '.CarbonImmutable::parse($profile->frozenAt)->format('d.m.Y H:i') : '')).($booking->processing_mode ? ' · Bearbeitung für diesen Vorgang: '.e($booking->processing_mode->getLabel()) : '').'</div>');
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@ class BookingsTable
|
||||
public static function configure(Table $table, ?int $guestId = null): Table
|
||||
{
|
||||
return $table
|
||||
->description('Eigene Anfragen und Buchungen sowie erkannte Portalreservierungen in einer Liste. „Akte öffnen“ zeigt alles zu einem Vorgang: nächster Schritt, Vertrag, Zahlungen, Aufgaben und E-Mails. Fehlende Gastzuordnungen lassen sich in den Details ergänzen; unbekannte Belegungen haben einen eigenen Klärungsbereich.')
|
||||
->description('Eigene Anfragen und Buchungen sowie erkannte Portalreservierungen in einer Liste. „Öffnen“ zeigt alles zu einem Vorgang: nächster Schritt, Vertrag, Zahlungen, Aufgaben und E-Mails. Fehlende Gastzuordnungen lassen sich in den Details ergänzen; unbekannte Belegungen haben einen eigenen Klärungsbereich.')
|
||||
->records(function (?string $search, ?string $sortColumn, ?string $sortDirection, array $filters, int $page, int|string $recordsPerPage) use ($guestId, $table): LengthAwarePaginator {
|
||||
$propertyId = filled($filters['property']['value'] ?? null) ? (int) $filters['property']['value'] : null;
|
||||
$records = app(OccupancyOverview::class)->records($propertyId, $guestId);
|
||||
@@ -102,6 +102,6 @@ public static function configure(Table $table, ?int $guestId = null): Table
|
||||
Filter::make('without_guest')->label('Gastzuordnung offen'),
|
||||
])
|
||||
->recordUrl(fn (array $record): string => $record['url'])
|
||||
->recordActions([Action::make('view')->label(fn (array $record): string => $record['record_type'] === 'booking' ? 'Akte öffnen' : ($record['kind'] === 'block' ? 'Details' : 'Akte anlegen'))->icon('heroicon-o-folder-open')->button()->color('primary')->url(fn (array $record): string => $record['url'])]);
|
||||
->recordActions([Action::make('view')->label(fn (array $record): string => $record['record_type'] === 'booking' ? 'Öffnen' : ($record['kind'] === 'block' ? 'Details' : 'Als Buchung übernehmen'))->icon('heroicon-o-folder-open')->button()->color('primary')->url(fn (array $record): string => $record['url'])]);
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,13 @@
|
||||
|
||||
namespace App\Filament\Resources\ChannelTasks\Tables;
|
||||
|
||||
use App\Enums\ChannelTaskAction;
|
||||
use App\Enums\ChannelTaskProof;
|
||||
use App\Enums\ChannelTaskStatus;
|
||||
use App\Models\ChannelTask;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\Textarea;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use Filament\Tables\Columns\TextColumn;
|
||||
use Filament\Tables\Filters\SelectFilter;
|
||||
@@ -24,6 +28,8 @@ public static function configure(Table $table): Table
|
||||
TextColumn::make('reason')->label('Anlass')->wrap(),
|
||||
TextColumn::make('status')->label('Status')->badge()
|
||||
->description(fn (ChannelTask $record): ?string => $record->completed_by ? "{$record->completed_by}, {$record->completed_at?->format('d.m. H:i')}" : null),
|
||||
TextColumn::make('proof')->label('Nachweis')->state(fn (ChannelTask $record): string => $record->proofLabel())
|
||||
->description(fn (ChannelTask $record): ?string => $record->proof_by ? "{$record->proof_by}, {$record->proof_at?->format('d.m. H:i')}" : null)->wrap(),
|
||||
TextColumn::make('created_at')->label('Seit')->since(),
|
||||
TextColumn::make('automation_error')->label('Automatisierung')->placeholder('–')->limit(40)->toggleable(isToggledHiddenByDefault: true),
|
||||
])
|
||||
@@ -45,7 +51,26 @@ public static function configure(Table $table): Table
|
||||
->icon(Heroicon::OutlinedCheck)
|
||||
->color('success')
|
||||
->visible(fn (ChannelTask $record): bool => $record->status === ChannelTaskStatus::Open)
|
||||
->action(fn (ChannelTask $record) => $record->complete(auth()->user()->name)),
|
||||
->modalHeading(fn (ChannelTask $record): string => ($record->action === ChannelTaskAction::Block ? 'Sperre in ' : 'Freigabe in ').$record->channel->name.' erledigt')
|
||||
->modalDescription('Was können Sie sagen? Ein bereitgestellter Kalender beweist nicht, dass das Portal ihn schon übernommen hat.')
|
||||
->fillForm(['proof' => ChannelTaskProof::Initiated->value])
|
||||
->schema(fn (ChannelTask $record): array => [
|
||||
Radio::make('proof')->hiddenLabel()->required()
|
||||
->options(collect(ChannelTaskProof::cases())->mapWithKeys(fn (ChannelTaskProof $proof): array => [$proof->value => $proof->question($record->action === ChannelTaskAction::Block)])->all()),
|
||||
Textarea::make('note')->label('Notiz (optional)')->placeholder('z. B. „im Vermieterkalender rot markiert“')->rows(2),
|
||||
])
|
||||
->action(fn (ChannelTask $record, array $data) => $record->complete(auth()->user()->name, ChannelTaskProof::from($data['proof']), $data['note'] ?? null)),
|
||||
Action::make('prove')
|
||||
->label('Nachweis ergänzen')
|
||||
->icon(Heroicon::OutlinedShieldCheck)
|
||||
->color('gray')
|
||||
->visible(fn (ChannelTask $record): bool => $record->status === ChannelTaskStatus::Done && $record->proof !== ChannelTaskProof::Confirmed)
|
||||
->schema(fn (ChannelTask $record): array => [
|
||||
Radio::make('proof')->hiddenLabel()->required()
|
||||
->options(collect([ChannelTaskProof::Observed, ChannelTaskProof::Confirmed])->mapWithKeys(fn (ChannelTaskProof $proof): array => [$proof->value => $proof->question($record->action === ChannelTaskAction::Block)])->all()),
|
||||
Textarea::make('note')->label('Notiz (optional)')->rows(2),
|
||||
])
|
||||
->action(fn (ChannelTask $record, array $data) => $record->prove(ChannelTaskProof::from($data['proof']), auth()->user()->name, $data['note'] ?? null)),
|
||||
Action::make('dismiss')
|
||||
->label('Verwerfen')
|
||||
->icon(Heroicon::OutlinedXMark)
|
||||
|
||||
@@ -3,15 +3,18 @@
|
||||
namespace App\Filament\Resources\Channels\Schemas;
|
||||
|
||||
use App\Channels\ChannelRegistry;
|
||||
use App\Enums\CaseIntakeMode;
|
||||
use App\Enums\ChannelBookingModel;
|
||||
use App\Enums\ChannelEchoBehavior;
|
||||
use App\Enums\ChannelExportMode;
|
||||
use App\Enums\ChannelStatus;
|
||||
use App\Enums\IntakeKind;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Filament\Forms\ProcessSettingFields;
|
||||
use App\Models\Channel;
|
||||
use App\Models\ContractAnnex;
|
||||
use App\Models\ContractTemplate;
|
||||
use App\Models\Property;
|
||||
use App\Support\CurrentProperty;
|
||||
use App\Support\Settings;
|
||||
use Filament\Forms\Components\DateTimePicker;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\Textarea;
|
||||
@@ -51,34 +54,16 @@ public static function configure(Schema $schema, bool $selectProperty = false):
|
||||
->required()
|
||||
->maxLength(100),
|
||||
Select::make('status')->label('Kanalstatus')->options(ChannelStatus::class)->default(ChannelStatus::Setup)->required(),
|
||||
Select::make('booking_model')->label('Buchungsmodell')->options(ChannelBookingModel::class)->default(ChannelBookingModel::Mixed)->required()
|
||||
Select::make('booking_model')->label('Was kommt über dieses Portal?')->options(ChannelBookingModel::class)->default(ChannelBookingModel::Mixed)->required()
|
||||
->helperText('„Portalbuchung“ und „Gemischt“ gelten als Sofortbuchung: automatische Angebote für diese Wohnung warten, bis das Portal unseren Kalender abgerufen hat. „Vermittlung / Anfrage“: keine Sofortbuchung.'),
|
||||
Section::make('Standardprozess für Buchungen über dieses Portal')
|
||||
->description('Hier legen Sie fest, was bei einer Buchung über dieses Portal gilt – getrennt nach Buchungstyp. Die Vertragsvorlage bringt Vertragstext, Stornoregel und Vertragsanlagen mit (Menü Einrichtung › Vertragsvorlagen). Der Ablauf selbst (Kontaktdaten, Vertrag, Zahlung, Anreise) steht in der Akte jeder Buchung.')
|
||||
->columns(2)
|
||||
->columnSpanFull()
|
||||
->schema([
|
||||
Select::make('contract_template_id')
|
||||
->label('Anfrage über dieses Portal: Vertragsvorlage')
|
||||
->options(fn (): array => ContractTemplate::query()->orderBy('name')->orderBy('version')->get()->mapWithKeys(fn (ContractTemplate $template): array => [$template->id => $template->label()])->all())
|
||||
->placeholder('Standard der Wohnung')
|
||||
->live()
|
||||
->helperText(fn (Get $get): string => self::templateSummary($get('contract_template_id'), 'Wir antworten persönlich, Angebot und Vertrag kommen von uns. ')),
|
||||
Select::make('contract_template_reservation_id')
|
||||
->label('Buchung beim Portal verbindlich: Vertragsvorlage')
|
||||
->options(fn (): array => ContractTemplate::query()->orderBy('name')->orderBy('version')->get()->mapWithKeys(fn (ContractTemplate $template): array => [$template->id => $template->label()])->all())
|
||||
->placeholder('wie bei Anfragen')
|
||||
->live()
|
||||
->helperText(fn (Get $get): string => self::templateSummary($get('contract_template_reservation_id') ?? $get('contract_template_id'), 'Das Portal hat die Buchung schon verbindlich gemacht, wir senden den Vertrag. ')),
|
||||
Toggle::make('payment_tasks_inquiry')
|
||||
->label('Anfrage über dieses Portal: Zahlungsaufgaben anlegen')
|
||||
->helperText('Fällige Anzahlungen/Restzahlungen erscheinen als Aufgabe (Mails an Gäste gehen nie automatisch).')
|
||||
->default(true),
|
||||
Toggle::make('payment_tasks_reservation')
|
||||
->label('Buchung beim Portal verbindlich: Zahlungsaufgaben anlegen')
|
||||
->helperText('Aus, wenn das Portal das Geld einzieht und mahnt (z. B. FeWo-direkt Online-Buchung).')
|
||||
->default(false),
|
||||
]),
|
||||
Select::make('case_intake')
|
||||
->label('Erkannte Buchungen automatisch als Vorgang übernehmen?')
|
||||
->options(CaseIntakeMode::class)
|
||||
->default(CaseIntakeMode::Off)
|
||||
->required()
|
||||
->helperText('Zuerst „Beobachten“: Dann entsteht nichts, aber das Eingangsprotokoll (Expertenansicht) zeigt, welche Vorgänge entstanden wären. Unklare Belegungen und Meldungen zu gebuchten Vorgängen erscheinen unter „Zu erledigen“. Unterlagen gehen nie ohne Ihre Freigabe hinaus.')
|
||||
->columnSpanFull(),
|
||||
...self::processSections(),
|
||||
Select::make('connector')
|
||||
->label('Kalenderanbindung')
|
||||
->helperText('Diese Verbindung gleicht Belegungszeiträume über iCal ab. Weitere Portalfunktionen benötigen eine eigene Anbindung.')
|
||||
@@ -128,15 +113,35 @@ public static function configure(Schema $schema, bool $selectProperty = false):
|
||||
/**
|
||||
* What a contract template brings along, shown under the template choice.
|
||||
*/
|
||||
private static function templateSummary(mixed $templateId, string $intro): string
|
||||
/**
|
||||
* Deviations of this portal from the landlord's defaults, separately for requests and for bookings that are already
|
||||
* binding when they arrive. Empty fields follow the defaults (System › So arbeite ich).
|
||||
*
|
||||
* @return list<Section>
|
||||
*/
|
||||
private static function processSections(): array
|
||||
{
|
||||
$template = filled($templateId) ? ContractTemplate::query()->with('cancellationPolicy')->find($templateId) : null;
|
||||
if ($template === null) {
|
||||
return $intro.'Ohne Auswahl gilt die Vorlage der Wohnung bzw. die Texte der Webseite.';
|
||||
}
|
||||
$defaults = (array) (Settings::tenant()?->process_defaults ?? []);
|
||||
$inherited = function (ProcessSetting $setting) use ($defaults): string {
|
||||
$value = $setting->normalize($defaults[$setting->value] ?? null) ?? $setting->default();
|
||||
|
||||
$annexes = ContractAnnex::query()->whereIn('id', (array) ($template->annex_ids ?? []))->orderBy('name')->pluck('name')->implode(', ');
|
||||
return $setting === ProcessSetting::ContractTemplate ? 'Vorlage der Wohnung' : $setting->describe($value);
|
||||
};
|
||||
$settingsFor = fn (IntakeKind $intake): array => array_values(array_filter(ProcessSetting::cases(), fn (ProcessSetting $setting): bool => in_array($intake, $setting->channelIntakes(), true)));
|
||||
|
||||
return $intro.'Die Vorlage bringt mit: Stornoregel '.($template->cancellationPolicy?->name ?? '– keine –').' · Anlagen: '.($annexes ?: 'keine').'.';
|
||||
return [
|
||||
Section::make('Anfragen über dieses Portal')
|
||||
->description('Nur ausfüllen, was bei diesem Portal anders ist als in Ihren Standardeinstellungen.')
|
||||
->columns(2)
|
||||
->columnSpanFull()
|
||||
->collapsible()
|
||||
->schema(ProcessSettingFields::make('process_overrides.inquiry.', $settingsFor(IntakeKind::Inquiry), $inherited)),
|
||||
Section::make('Feste Buchungen über dieses Portal')
|
||||
->description('Buchungen, die beim Portal schon verbindlich sind. Die Vertragsvorlage bringt Vertragstext, Stornoregel und Anlagen mit.')
|
||||
->columns(2)
|
||||
->columnSpanFull()
|
||||
->collapsible()
|
||||
->schema(ProcessSettingFields::make('process_overrides.booking.', $settingsFor(IntakeKind::Booking), $inherited)),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,9 @@
|
||||
namespace App\Filament\Resources\ContractTemplates\Pages;
|
||||
|
||||
use App\Filament\Resources\ContractTemplates\ContractTemplateResource;
|
||||
use App\Models\ContractTemplate;
|
||||
use Filament\Resources\Pages\CreateRecord;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class CreateContractTemplate extends CreateRecord
|
||||
{
|
||||
@@ -21,4 +23,16 @@ protected function mutateFormDataBeforeCreate(array $data): array
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
protected function handleRecordCreation(array $data): Model
|
||||
{
|
||||
$template = new ContractTemplate(collect($data)->except(['is_released', 'is_portal_terms'])->all());
|
||||
$template->applyStatements((bool) ($data['is_released'] ?? false), (bool) ($data['is_portal_terms'] ?? false), (string) auth()->user()?->name);
|
||||
$template->save();
|
||||
|
||||
return $template;
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,10 @@
|
||||
namespace App\Filament\Resources\ContractTemplates\Pages;
|
||||
|
||||
use App\Filament\Resources\ContractTemplates\ContractTemplateResource;
|
||||
use App\Models\ContractTemplate;
|
||||
use Filament\Actions\DeleteAction;
|
||||
use Filament\Resources\Pages\EditRecord;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class EditContractTemplate extends EditRecord
|
||||
{
|
||||
@@ -14,4 +16,26 @@ protected function getHeaderActions(): array
|
||||
{
|
||||
return [DeleteAction::make()];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $data
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
protected function mutateFormDataBeforeFill(array $data): array
|
||||
{
|
||||
return [...$data, 'is_released' => $data['released_at'] !== null, 'is_portal_terms' => $data['portal_terms_confirmed_at'] !== null];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $data
|
||||
*/
|
||||
protected function handleRecordUpdate(Model $record, array $data): Model
|
||||
{
|
||||
/** @var ContractTemplate $record */
|
||||
$record->fill(collect($data)->except(['is_released', 'is_portal_terms'])->all());
|
||||
$record->applyStatements((bool) ($data['is_released'] ?? false), (bool) ($data['is_portal_terms'] ?? false), (string) auth()->user()?->name);
|
||||
$record->save();
|
||||
|
||||
return $record;
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\Textarea;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Components\Text;
|
||||
use Filament\Schemas\Schema;
|
||||
@@ -65,6 +66,17 @@ public static function configure(Schema $schema): Schema
|
||||
Textarea::make('texts.closing')->label('Vertragsschluss')->rows(3)->columnSpanFull(),
|
||||
Textarea::make('texts.contract_note')->label('Hinweis im Angebots-PDF')->rows(3)->columnSpanFull(),
|
||||
]),
|
||||
Section::make('Freigabe')
|
||||
->description('Ihre Erklärung zu genau diesem Text. Ändert sich der Text, gilt sie erst nach erneutem Speichern mit Haken wieder; eine neue Version beginnt ohne Freigabe.')
|
||||
->columnSpanFull()
|
||||
->schema([
|
||||
Toggle::make('is_released')
|
||||
->label('Für den Versand an Gäste freigegeben')
|
||||
->helperText('Ohne Freigabe wird die Vorlage nie automatisch versendet; von Hand nur nach ausdrücklicher Bestätigung im Vorgang.'),
|
||||
Toggle::make('is_portal_terms')
|
||||
->label('Gibt nur wieder, was Gäste bei der Buchung über das Portal akzeptieren')
|
||||
->helperText('Nur für Vorlagen, die bei beim Portal gebuchten Vorgängen verwendet werden. Ohne diesen Haken weist der Vorgang auf Gebühren und Bedingungen der Vorlage hin und verlangt vor dem Versand eine Bestätigung.'),
|
||||
]),
|
||||
Textarea::make('notes')->label('Interne Notiz')->rows(2)->columnSpanFull(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ public static function configure(Table $table): Table
|
||||
->columns([
|
||||
TextColumn::make('name')->label('Vorlage')->searchable()->weight('medium'),
|
||||
TextColumn::make('version')->label('Version')->badge(),
|
||||
IconColumn::make('released')->label('Freigegeben')->boolean()->state(fn (ContractTemplate $record): bool => $record->isReleased()),
|
||||
IconColumn::make('portal_terms')->label('Portalbedingungen')->boolean()->state(fn (ContractTemplate $record): bool => $record->confirmsPortalTerms()),
|
||||
IconColumn::make('used')->label('In Angeboten verwendet')->boolean()->state(fn (ContractTemplate $record): bool => $record->isUsed()),
|
||||
TextColumn::make('updated_at')->label('Geändert')->dateTime('d.m.Y, H:i'),
|
||||
])
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Resources\IntakeObservations;
|
||||
|
||||
use App\Enums\CaseIntakeMode;
|
||||
use App\Enums\IntakeOutcome;
|
||||
use App\Filament\Concerns\FollowsAdminMode;
|
||||
use App\Filament\Resources\Bookings\BookingResource;
|
||||
use App\Filament\Resources\IntakeObservations\Pages\ListIntakeObservations;
|
||||
use App\Models\Channel;
|
||||
use App\Models\IntakeObservation;
|
||||
use BackedEnum;
|
||||
use Filament\Resources\Resource;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use Filament\Tables\Columns\IconColumn;
|
||||
use Filament\Tables\Columns\TextColumn;
|
||||
use Filament\Tables\Filters\SelectFilter;
|
||||
use Filament\Tables\Table;
|
||||
use UnitEnum;
|
||||
|
||||
/**
|
||||
* The intake record (expert view): what came in over each portal, what the intake recognised, whether it acted or only
|
||||
* observed, and why. Read only – the work itself happens under "Zu erledigen" and on the case page.
|
||||
*/
|
||||
class IntakeObservationResource extends Resource
|
||||
{
|
||||
use FollowsAdminMode;
|
||||
|
||||
protected static ?string $model = IntakeObservation::class;
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedInboxArrowDown;
|
||||
|
||||
protected static string|UnitEnum|null $navigationGroup = 'System';
|
||||
|
||||
protected static ?string $navigationLabel = 'Eingangsprotokoll';
|
||||
|
||||
protected static ?string $modelLabel = 'Eingang';
|
||||
|
||||
protected static ?string $pluralModelLabel = 'Eingangsprotokoll';
|
||||
|
||||
protected static ?int $navigationSort = 20;
|
||||
|
||||
public static function canCreate(): bool
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public static function table(Table $table): Table
|
||||
{
|
||||
return $table
|
||||
->description('Was über die Portale hereinkam und was daraus wurde. „Nur protokolliert“ heißt: Das Portal steht auf „Beobachten“ (oder es war nichts zu tun) – es ist nichts entstanden.')
|
||||
->defaultSort('occurred_at', 'desc')
|
||||
->modifyQueryUsing(fn ($query) => $query->with(['channel', 'booking']))
|
||||
->columns([
|
||||
TextColumn::make('occurred_at')->label('Wann')->dateTime('d.m.Y H:i')->sortable(),
|
||||
TextColumn::make('channel.name')->label('Portal')->description(fn (IntakeObservation $record): string => $record->sourceLabel()),
|
||||
TextColumn::make('period')->label('Zeitraum')->state(fn (IntakeObservation $record): ?string => $record->starts_on ? $record->starts_on->format('d.m.').'–'.$record->ends_on?->format('d.m.Y') : null)->placeholder('–'),
|
||||
TextColumn::make('outcome')->label('Ergebnis')->badge()->description(fn (IntakeObservation $record): string => implode(' ', (array) $record->reasons))->wrap(),
|
||||
TextColumn::make('case_type')->label('Art')->formatStateUsing(fn (?string $state): string => strtoupper((string) $state))->placeholder('–'),
|
||||
IconColumn::make('applied')->label('Ausgeführt')->boolean()->tooltip('Ja: Vorgang angelegt, zugeordnet, Aufgabe erstellt oder zur Klärung vorgelegt. Nein: nur protokolliert.'),
|
||||
TextColumn::make('mode')->label('Einstellung')->formatStateUsing(fn (CaseIntakeMode $state): string => match ($state) {
|
||||
CaseIntakeMode::Observe => 'Beobachten',
|
||||
CaseIntakeMode::Create => 'Anlegen',
|
||||
CaseIntakeMode::Continue => 'Anlegen + weiter',
|
||||
CaseIntakeMode::Off => 'Aus',
|
||||
})->toggleable(),
|
||||
TextColumn::make('reference')->label('Buchungsnr.')->placeholder('–')->toggleable(),
|
||||
TextColumn::make('booking.reference')->label('Vorgang')->placeholder('–')
|
||||
->url(fn (IntakeObservation $record): ?string => $record->booking ? BookingResource::getUrl('view', ['record' => $record->booking]) : null),
|
||||
TextColumn::make('missing')->label('Fehlt noch')->state(fn (IntakeObservation $record): string => implode(', ', (array) $record->missing))->placeholder('–')->wrap()->toggleable(isToggledHiddenByDefault: true),
|
||||
])
|
||||
->filters([
|
||||
SelectFilter::make('channel_id')->label('Portal')->options(fn (): array => Channel::query()->orderBy('name')->pluck('name', 'id')->all()),
|
||||
SelectFilter::make('outcome')->label('Ergebnis')->options(IntakeOutcome::class),
|
||||
SelectFilter::make('applied')->label('Ausgeführt')->options(['1' => 'ja', '0' => 'nur protokolliert']),
|
||||
]);
|
||||
}
|
||||
|
||||
public static function getPages(): array
|
||||
{
|
||||
return ['index' => ListIntakeObservations::route('/')];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Resources\IntakeObservations\Pages;
|
||||
|
||||
use App\Filament\Resources\IntakeObservations\IntakeObservationResource;
|
||||
use Filament\Resources\Pages\ListRecords;
|
||||
|
||||
class ListIntakeObservations extends ListRecords
|
||||
{
|
||||
protected static string $resource = IntakeObservationResource::class;
|
||||
}
|
||||
@@ -3,7 +3,9 @@
|
||||
namespace App\Filament\Resources\PortalOccupations\Pages;
|
||||
|
||||
use App\Filament\Resources\PortalOccupations\PortalOccupationResource;
|
||||
use Filament\Actions\ActionGroup;
|
||||
use Filament\Resources\Pages\ViewRecord;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
|
||||
class ViewPortalOccupation extends ViewRecord
|
||||
{
|
||||
@@ -16,6 +18,9 @@ public function getTitle(): string
|
||||
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return PortalOccupationResource::occupationActions();
|
||||
$actions = PortalOccupationResource::occupationActions();
|
||||
[$primary, $more] = [array_slice($actions, 0, 3), array_slice($actions, 3)];
|
||||
|
||||
return [...$primary, ActionGroup::make($more)->label('Weitere Möglichkeiten')->icon(Heroicon::OutlinedEllipsisHorizontal)->button()->color('gray')];
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
use App\Actions\ClassifyPortalOccupation;
|
||||
use App\Actions\OpenPortalFile;
|
||||
use App\Actions\ResolveChannelOccupation;
|
||||
use App\Enums\OccupationKind;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Filament\Actions\AssignGuestAction;
|
||||
@@ -15,11 +16,13 @@
|
||||
use App\Filament\Resources\PortalOccupations\Pages\ManagePortalOccupations;
|
||||
use App\Filament\Resources\PortalOccupations\Pages\ViewPortalOccupation;
|
||||
use App\Models\BlockedPeriod;
|
||||
use App\Models\Booking;
|
||||
use App\Models\Channel;
|
||||
use BackedEnum;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Actions\ActionGroup;
|
||||
use Filament\Actions\ViewAction;
|
||||
use Filament\Forms\Components\Radio;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Infolists\Components\TextEntry;
|
||||
use Filament\Notifications\Notification;
|
||||
@@ -80,13 +83,13 @@ public static function table(Table $table): Table
|
||||
TextColumn::make('channel.name')->label('Importkanal'),
|
||||
TextColumn::make('property.name')->label('Wohnung')->toggleable(),
|
||||
TextColumn::make('needs_review')->label('Prüffall')->formatStateUsing(fn (bool $state): string => $state ? 'Bitte prüfen' : '–')->description(fn (BlockedPeriod $record): ?string => $record->review_note),
|
||||
])->recordActions([Action::make('fileLink')->label('Akte anlegen')->icon(Heroicon::OutlinedFolderPlus)->button()->color('primary')->visible(fn (BlockedPeriod $record): bool => static::canOpenFile($record))->url(fn (BlockedPeriod $record): string => static::getUrl('view', ['record' => $record])), static::showFileAction()->button(), ViewAction::make(), ActionGroup::make(static::occupationActions(withFile: false))->label('Weitere Aktionen')]);
|
||||
])->recordActions([Action::make('clarifyLink')->label('Klären')->icon(Heroicon::OutlinedQuestionMarkCircle)->button()->color('warning')->visible(fn (BlockedPeriod $record): bool => static::isUnclear($record))->url(fn (BlockedPeriod $record): string => static::getUrl('view', ['record' => $record])), Action::make('fileLink')->label('Als Buchung übernehmen')->icon(Heroicon::OutlinedFolderPlus)->button()->color('primary')->visible(fn (BlockedPeriod $record): bool => static::canOpenFile($record))->url(fn (BlockedPeriod $record): string => static::getUrl('view', ['record' => $record])), static::showFileAction()->button(), ViewAction::make(), ActionGroup::make(static::occupationActions(withFile: false))->label('Weitere Aktionen')]);
|
||||
}
|
||||
|
||||
public static function occupationActions(bool $withFile = true): array
|
||||
{
|
||||
return [
|
||||
...($withFile ? [static::openFileAction(), static::showFileAction()] : []),
|
||||
...($withFile ? [static::clarifyAction(), static::openFileAction(), static::showFileAction()] : []),
|
||||
AssignGuestAction::make(),
|
||||
static::classificationAction(),
|
||||
...BlockedPeriodResource::portalActions(),
|
||||
@@ -94,16 +97,82 @@ public static function occupationActions(bool $withFile = true): array
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens the booking file (workflow, contract, payments, tasks) for a reservation from a portal calendar.
|
||||
* Whether the entry still waits for the landlord's answer (it is listed under "Zu erledigen").
|
||||
*/
|
||||
public static function isUnclear(BlockedPeriod $record): bool
|
||||
{
|
||||
return ! $record->trashed() && BlockedPeriod::query()->unclear()->whereKey($record->id)->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* The one question for an unclear portal entry, in plain words: is it a booking (then it becomes a case), does it
|
||||
* belong to a case that already exists, or is it no booking at all? The detailed tools stay under "Weitere".
|
||||
*/
|
||||
public static function clarifyAction(): Action
|
||||
{
|
||||
return Action::make('clarify')->label('Klären: Was ist das?')->icon(Heroicon::OutlinedQuestionMarkCircle)->color('primary')
|
||||
->visible(fn (BlockedPeriod $record): bool => static::isUnclear($record) && ! $record->is_representation)
|
||||
->authorize(fn (BlockedPeriod $record): bool => auth()->user()?->can('update', $record) ?? false)
|
||||
->modalHeading(fn (BlockedPeriod $record): string => 'Belegung von '.($record->channel?->name ?? 'einem Portal').' am '.$record->starts_on->format('d.m.').'–'.$record->ends_on->format('d.m.Y'))
|
||||
->modalDescription(fn (BlockedPeriod $record): string => 'Für diesen Zeitraum wurde eine Belegung gemeldet. Bitte wählen Sie, was es ist.'.($record->review_note ? ' Hinweis: '.$record->review_note : ''))
|
||||
->modalSubmitActionLabel('Übernehmen')
|
||||
->schema(fn (BlockedPeriod $record): array => [
|
||||
Radio::make('answer')->hiddenLabel()->required()->live()->options(array_filter([
|
||||
'booking' => static::canOpenFile($record) ? 'Eine Buchung über '.($record->channel?->name ?? 'das Portal').' – als Vorgang übernehmen' : null,
|
||||
'case' => static::sameNightCases($record) !== [] ? 'Gehört zu einem Vorgang, der schon da ist' : null,
|
||||
'block' => 'Keine Buchung: Sperre, eigene Nutzung oder Spiegelung eines anderen Portals',
|
||||
])),
|
||||
Select::make('booking_id')->label('Vorgang')->options(fn (): array => static::sameNightCases($record))
|
||||
->visible(fn (Get $get): bool => $get('answer') === 'case')->required(fn (Get $get): bool => $get('answer') === 'case'),
|
||||
])
|
||||
->action(function (BlockedPeriod $record, array $data, OpenPortalFile $open, ResolveChannelOccupation $resolve, ClassifyPortalOccupation $classify) {
|
||||
try {
|
||||
if ($data['answer'] === 'booking') {
|
||||
$booking = $open->handle($record);
|
||||
Notification::make()->title('Als Buchung übernommen')->success()->send();
|
||||
|
||||
return redirect(BookingResource::getUrl('view', ['record' => $booking]));
|
||||
}
|
||||
if ($data['answer'] === 'case') {
|
||||
$resolve->handle($record, 'booking', (int) $data['booking_id']);
|
||||
Notification::make()->title('Dem Vorgang zugeordnet')->success()->send();
|
||||
|
||||
return null;
|
||||
}
|
||||
$classify->handle($record, OccupationKind::Block);
|
||||
$record->refresh()->forceFill(['needs_review' => false, 'reviewed_at' => now(), 'review_note' => 'Persönlich als Sperre eingeordnet.'])->save();
|
||||
Notification::make()->title('Als Sperre eingeordnet')->success()->send();
|
||||
} catch (ReservationException $exception) {
|
||||
Notification::make()->title('Nicht möglich')->body($exception->getMessage())->danger()->send();
|
||||
}
|
||||
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Cases of the same property with exactly these nights (the only ones the entry may belong to).
|
||||
*
|
||||
* @return array<int, string>
|
||||
*/
|
||||
public static function sameNightCases(BlockedPeriod $record): array
|
||||
{
|
||||
return Booking::query()->occupying()->with('guest')->where('property_id', $record->property_id)
|
||||
->whereDate('arrival', $record->starts_on)->whereDate('departure', $record->ends_on)->get()
|
||||
->mapWithKeys(fn (Booking $booking): array => [$booking->id => $booking->reference.' · '.$booking->guestName().' · '.$booking->bookingChannelLabel()])->all();
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes a reservation from a portal calendar over as a case (no second, manual "file").
|
||||
*/
|
||||
public static function openFileAction(): Action
|
||||
{
|
||||
return Action::make('openFile')->label('Akte anlegen')->icon(Heroicon::OutlinedFolderPlus)->color('primary')
|
||||
return Action::make('openFile')->label('Als Buchung übernehmen')->icon(Heroicon::OutlinedFolderPlus)->color('primary')
|
||||
->visible(fn (BlockedPeriod $record): bool => static::canOpenFile($record))
|
||||
->authorize(fn (BlockedPeriod $record): bool => auth()->user()?->can('update', $record) ?? false)
|
||||
->requiresConfirmation()
|
||||
->modalHeading('Akte für diese Reservierung anlegen')
|
||||
->modalDescription('Aus der Kalenderbelegung wird eine Buchung mit Ablauf: Kontaktdaten, Vertrag, Zahlungen, Anreise, Storno. Der Zeitraum bleibt durchgehend belegt. Gast, Personenzahl und Preis sind noch unbekannt und werden in der Akte ergänzt.')
|
||||
->modalHeading('Reservierung als Buchung übernehmen')
|
||||
->modalDescription('Aus der Kalenderbelegung wird ein Vorgang „Gebucht über das Portal“. Der Zeitraum bleibt durchgehend belegt. Gast, Personenzahl und Preis bleiben leer, bis sie bekannt sind – der Vorgang erinnert daran.')
|
||||
->action(function (BlockedPeriod $record, OpenPortalFile $open) {
|
||||
try {
|
||||
$booking = $open->handle($record);
|
||||
@@ -113,7 +182,7 @@ public static function openFileAction(): Action
|
||||
return null;
|
||||
}
|
||||
|
||||
Notification::make()->title('Akte angelegt')->success()->send();
|
||||
Notification::make()->title('Als Buchung übernommen')->success()->send();
|
||||
|
||||
return redirect(BookingResource::getUrl('view', ['record' => $booking]));
|
||||
});
|
||||
@@ -121,7 +190,7 @@ public static function openFileAction(): Action
|
||||
|
||||
public static function showFileAction(): Action
|
||||
{
|
||||
return Action::make('showFile')->label('Akte öffnen')->icon(Heroicon::OutlinedFolderOpen)->color('primary')
|
||||
return Action::make('showFile')->label('Vorgang öffnen')->icon(Heroicon::OutlinedFolderOpen)->color('primary')
|
||||
->visible(fn (BlockedPeriod $record): bool => $record->linked_booking_id !== null)
|
||||
->url(fn (BlockedPeriod $record): ?string => $record->linked_booking_id ? BookingResource::getUrl('view', ['record' => $record->linked_booking_id]) : null);
|
||||
}
|
||||
|
||||
@@ -2,13 +2,17 @@
|
||||
|
||||
namespace App\Filament\Resources\Properties\Schemas;
|
||||
|
||||
use App\Enums\AdminMode;
|
||||
use App\Enums\CancellationMode;
|
||||
use App\Enums\OfferMode;
|
||||
use App\Enums\ProcessSetting;
|
||||
use App\Filament\Forms\Components\EuroInput;
|
||||
use App\Filament\Forms\ProcessSettingFields;
|
||||
use App\Filament\Pages\HandlingSettings;
|
||||
use App\ImageWorlds\ImageWorldRegistry;
|
||||
use App\Models\ContractTemplate;
|
||||
use App\Models\Site;
|
||||
use Closure;
|
||||
use App\Models\User;
|
||||
use App\Support\Settings;
|
||||
use Filament\Forms\Components\KeyValue;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
@@ -91,6 +95,9 @@ public static function configure(Schema $schema): Schema
|
||||
->label('Endreinigung & Service (einmalig)')
|
||||
->required()
|
||||
->default(0),
|
||||
EuroInput::make('tourist_tax_rate')
|
||||
->label('Kurabgabe je Person und Nacht')
|
||||
->helperText('Ihr Satz laut Gemeinde. Wird bei eigener Nutzung und privaten Aufenthalten als eigene Position berechnet; Befreiungen tragen Sie im Vorgang ein. Leer lassen: keine Berechnung.'),
|
||||
]),
|
||||
Section::make('Zahlungsbedingungen')
|
||||
->columns(2)
|
||||
@@ -111,14 +118,6 @@ public static function configure(Schema $schema): Schema
|
||||
->minValue(0)
|
||||
->suffix('Tage vor Anreise')
|
||||
->default(28),
|
||||
TextInput::make('hold_hours')
|
||||
->label('Vorreservierung halten')
|
||||
->helperText('So lange bleibt ein angefragter Zeitraum ohne Ihre Bestätigung blockiert.')
|
||||
->required()
|
||||
->integer()
|
||||
->minValue(1)
|
||||
->suffix('Stunden')
|
||||
->default(48),
|
||||
Select::make('cancellation_mode')
|
||||
->label('Stornierungslink in der Buchungsbestätigung')
|
||||
->options(CancellationMode::class)
|
||||
@@ -144,32 +143,17 @@ public static function configure(Schema $schema): Schema
|
||||
->options(fn (): array => ContractTemplate::query()->orderBy('name')->orderBy('version')->get()->mapWithKeys(fn (ContractTemplate $template): array => [$template->id => $template->label()])->all())
|
||||
->placeholder('Texte der Webseite')
|
||||
->helperText('Wird bei neuen Angeboten verwendet, sofern das Portal keine eigene Vorlage hat.'),
|
||||
TextInput::make('arrival_info_days_before')
|
||||
->label('Anreise-E-Mail senden')
|
||||
->helperText('Automatische Mail mit den letzten Hinweisen (Texte unter Texte › Aufenthalt).')
|
||||
->required()
|
||||
->integer()
|
||||
->minValue(1)
|
||||
->maxValue(14)
|
||||
->suffix('Tage vor Anreise')
|
||||
->default(3),
|
||||
Toggle::make('pre_reservation_enabled')
|
||||
->label('Anfrage blockiert den Kalender (Vorreservierung)')
|
||||
->helperText('Aus: eine bloße Anfrage sperrt keinen Zeitraum. Dann ist kein automatisches Angebot möglich.')
|
||||
->default(true)
|
||||
->live(),
|
||||
Select::make('offer_mode')
|
||||
->label('Bearbeitung von Anfragen')
|
||||
->options(OfferMode::class)
|
||||
->default(OfferMode::Manual)
|
||||
->required()
|
||||
->helperText('Automatisch: das Angebot geht sofort an den Gast, wenn die Kalenderprüfung bestanden ist (Kalenderstand aktuell, bei Portalen mit Sofortbuchung unser Feed nachweislich abgerufen). Sonst entscheiden Sie von Hand. Unabhängig vom Testbetrieb der E-Mails.')
|
||||
->rules([fn (Get $get): Closure => function (string $attribute, mixed $value, Closure $fail) use ($get): void {
|
||||
if (($value === OfferMode::Automatic->value || $value === OfferMode::Automatic) && ! $get('pre_reservation_enabled')) {
|
||||
$fail('Automatische Angebote brauchen die Vorreservierung: ohne Sperre im Kalender kann ein verbindlich annehmbares Angebot nicht sicher erteilt werden.');
|
||||
}
|
||||
}]),
|
||||
]),
|
||||
Section::make('Abweichende Abwicklung dieser Wohnung')
|
||||
->description('Nur nötig, wenn diese Wohnung anders bearbeitet wird als in „So arbeite ich“ eingestellt. Leere Felder folgen Ihren Standardeinstellungen.')
|
||||
->visible(fn (): bool => auth()->user() instanceof User && auth()->user()->adminMode() === AdminMode::Expert)
|
||||
->collapsed()
|
||||
->columns(2)
|
||||
->schema(ProcessSettingFields::make('process_overrides.', HandlingSettings::settings(), function (ProcessSetting $setting): string {
|
||||
$defaults = (array) (Settings::tenant()?->process_defaults ?? []);
|
||||
|
||||
return $setting->describe($setting->normalize($defaults[$setting->value] ?? null) ?? $setting->default());
|
||||
})),
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public function table(Table $table): Table
|
||||
TextColumn::make('arrival')->label('Anreise')->date('D, d.m.')
|
||||
->description(fn (Booking $record): ?string => $record->arrival->isToday() ? 'heute' : ($record->arrival->isPast() ? 'läuft' : null)),
|
||||
TextColumn::make('departure')->label('Abreise')->date('D, d.m.'),
|
||||
TextColumn::make('guest.last_name')->label('Gast')->formatStateUsing(fn (Booking $record): string => $record->guest->full_name),
|
||||
TextColumn::make('guest.last_name')->label('Gast')->formatStateUsing(fn (Booking $record): string => $record->guestName()),
|
||||
TextColumn::make('guests')->label('Pers.'),
|
||||
TextColumn::make('status')->label('Status')->badge(),
|
||||
TextColumn::make('open')->label('Offen')
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Widgets;
|
||||
|
||||
use App\Enums\UserRole;
|
||||
use App\Process\WorkList;
|
||||
use Filament\Widgets\Widget;
|
||||
|
||||
/**
|
||||
* "Zu erledigen" at the top of the start page: one list of everything the landlord has to do.
|
||||
*/
|
||||
class WorkListWidget extends Widget
|
||||
{
|
||||
protected static ?int $sort = 0;
|
||||
|
||||
protected static bool $isLazy = false;
|
||||
|
||||
protected int|string|array $columnSpan = 'full';
|
||||
|
||||
protected string $view = 'filament.widgets.work-list';
|
||||
|
||||
public static function canView(): bool
|
||||
{
|
||||
return (bool) auth()->user()?->hasRole(UserRole::Admin, UserRole::Rentals);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
protected function getViewData(): array
|
||||
{
|
||||
return ['items' => WorkList::items()];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Actions\ChangeBooking;
|
||||
use App\Enums\ChangeStatus;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Mail\ChangeAnswered;
|
||||
use App\Models\BookingChange;
|
||||
use App\Support\Settings;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
/**
|
||||
* The guest's page for a proposed change of a booking (signed link): see it, accept it or decline it. Only the acceptance
|
||||
* here makes the change binding; it is recorded with time and (hashed) address.
|
||||
*/
|
||||
class ChangeController extends Controller
|
||||
{
|
||||
public function show(BookingChange $change): View
|
||||
{
|
||||
return view('change', ['change' => $change, 'booking' => $change->booking]);
|
||||
}
|
||||
|
||||
public function accept(Request $request, BookingChange $change, ChangeBooking $changes): RedirectResponse
|
||||
{
|
||||
$request->validate(['agree' => ['accepted']], ['agree.accepted' => 'Bitte bestätigen Sie, dass Sie mit der Änderung einverstanden sind.']);
|
||||
|
||||
try {
|
||||
$changes->accept($change, $request->ip());
|
||||
} catch (ReservationException $exception) {
|
||||
return back()->with('change.error', $exception->getMessage());
|
||||
}
|
||||
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new ChangeAnswered($change->fresh(), accepted: true)));
|
||||
|
||||
return back()->with('change.success', 'Vielen Dank – die Änderung ist jetzt verbindlich.');
|
||||
}
|
||||
|
||||
public function decline(BookingChange $change, ChangeBooking $changes): RedirectResponse
|
||||
{
|
||||
if ($change->status === ChangeStatus::Proposed) {
|
||||
$changes->decline($change, request()->ip());
|
||||
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new ChangeAnswered($change->fresh(), accepted: false)));
|
||||
}
|
||||
|
||||
return back()->with('change.success', 'Sie haben die Änderung abgelehnt. Ihre Buchung bleibt unverändert.');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Documents\DocumentComposer;
|
||||
use App\Documents\RentalContract;
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Models\Booking;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
/**
|
||||
* The PDF of a document composition as it would be sent, for the landlord's preview in the admin area. Nothing is
|
||||
* stored; the case is only read (and only within the current landlord, by the tenant scope of the route binding).
|
||||
*/
|
||||
class DocumentPreviewController extends Controller
|
||||
{
|
||||
public function __invoke(Request $request, Booking $booking, string $kind, DocumentComposer $composer, RentalContract $contract): Response
|
||||
{
|
||||
$documentKind = DocumentKind::tryFrom($kind);
|
||||
abort_if($documentKind === null || ! $documentKind->isForGuests(), 404);
|
||||
|
||||
$changes = json_decode((string) base64_decode((string) $request->query('changes', ''), true), true);
|
||||
$composition = $composer->compose($booking, $documentKind, is_array($changes) ? $changes : []);
|
||||
$pdf = $contract->render($composition->draft, $documentKind, draft: $documentKind === DocumentKind::Offer);
|
||||
|
||||
return response($pdf, 200, [
|
||||
'Content-Type' => 'application/pdf',
|
||||
'Content-Disposition' => 'inline; filename="Vorschau-'.$documentKind->fileName().'-'.$booking->reference.'.pdf"',
|
||||
'Cache-Control' => 'no-store',
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Process\CaseLog;
|
||||
use DateTimeInterface;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
@@ -50,7 +51,7 @@ public function accept(Request $request, Booking $booking, AcceptOffer $accept):
|
||||
$request->validate(['terms' => ['accepted']], ['terms.accepted' => 'Bitte bestätigen Sie, dass Sie die Bedingungen gelesen haben.']);
|
||||
|
||||
return $this->answer($request, $booking, function (int $version) use ($accept, $booking): string {
|
||||
$concluded = $accept->handle($booking, $version);
|
||||
$concluded = CaseLog::context(fn (): bool => $accept->handle($booking, $version), actor: CaseLog::GUEST);
|
||||
$booking->refresh();
|
||||
|
||||
if (! $concluded) {
|
||||
@@ -66,7 +67,7 @@ public function accept(Request $request, Booking $booking, AcceptOffer $accept):
|
||||
public function reject(Request $request, Booking $booking, RejectOffer $reject): RedirectResponse
|
||||
{
|
||||
return $this->answer($request, $booking, function (int $version) use ($reject, $booking): string {
|
||||
$reject->handle($booking, $version);
|
||||
CaseLog::context(fn () => $reject->handle($booking, $version), actor: CaseLog::GUEST);
|
||||
|
||||
return 'Schade – wir haben Ihre Absage erhalten und den Zeitraum wieder freigegeben. Vielleicht ein anderes Mal!';
|
||||
});
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
use App\Enums\CancellationMode;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use App\Process\CaseLog;
|
||||
use App\Support\CancellationCost;
|
||||
use DateTimeInterface;
|
||||
use Illuminate\Contracts\View\View;
|
||||
@@ -37,7 +38,7 @@ public function showRelease(Booking $booking): View
|
||||
public function release(Booking $booking, ReleaseReservation $release): RedirectResponse
|
||||
{
|
||||
try {
|
||||
$release->handle($booking);
|
||||
CaseLog::context(fn () => $release->handle($booking), actor: CaseLog::GUEST);
|
||||
} catch (ReservationException $exception) {
|
||||
return redirect()->to($this->signed('reservations.release', $booking, now()->addDays(2)))->with('self-service.error', $exception->getMessage());
|
||||
}
|
||||
@@ -67,7 +68,7 @@ public function cancel(Request $request, Booking $booking, CancelBookingByGuest
|
||||
$back = fn (int $days): string => $this->signed('bookings.cancel', $booking, now()->addDays($days));
|
||||
|
||||
try {
|
||||
$outcome = $cancel->handle($booking, $data['message'] ?? null);
|
||||
$outcome = CaseLog::context(fn () => $cancel->handle($booking, $data['message'] ?? null), actor: CaseLog::GUEST);
|
||||
} catch (ReservationException $exception) {
|
||||
return redirect()->to($back(2))->with('self-service.error', $exception->getMessage());
|
||||
}
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
/**
|
||||
* Sends plain-HTTP requests to the same address over HTTPS. Done in the application (not in .htaccess) because on
|
||||
* Strato the .htaccess in the deploy folder is rewritten by every deployment; the application also sees the
|
||||
* cleaned request path, so no internal release folder can leak into the target address.
|
||||
*/
|
||||
class ForceHttps
|
||||
{
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
{
|
||||
if (! config('fewo.force_https') || $request->isSecure()) {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
$target = 'https://'.$request->getHost().$request->getRequestUri();
|
||||
|
||||
// 308 keeps the method for automation callers (POST webhooks); browsers and crawlers get 301.
|
||||
return redirect()->away($target, in_array($request->getMethod(), ['GET', 'HEAD'], true) ? 301 : 308);
|
||||
}
|
||||
}
|
||||
@@ -45,6 +45,13 @@ public function handle(Request $request, Closure $next): Response
|
||||
$context->set($tenant);
|
||||
}
|
||||
|
||||
if ($this->staysOnRequestedAddress($request)) {
|
||||
URL::forceRootUrl($request->getSchemeAndHttpHost());
|
||||
URL::forceScheme($request->getScheme());
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
if ($redirect = $this->toMainAddress($request, $theme->site)) {
|
||||
return $redirect;
|
||||
}
|
||||
@@ -54,6 +61,17 @@ public function handle(Request $request, Closure $next): Response
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Signed links (offers, reviews, newsletter) are bound to the host they were issued for, and portals and
|
||||
* automations call feeds and endpoints under the address they were given. These paths are answered on the
|
||||
* address they came in on – a redirect to the main address would invalidate old signatures and feed URLs
|
||||
* after a change of the main address. Links on such a page keep the requested host (session, CSRF).
|
||||
*/
|
||||
private function staysOnRequestedAddress(Request $request): bool
|
||||
{
|
||||
return $request->is('angebot/*', 'bewertung/*', 'angebote/*', 'kalender/*', 'automation/*', 'health/*');
|
||||
}
|
||||
|
||||
/**
|
||||
* A website answers on one main address. Visitors coming in through a further address (e.g. www.…) are
|
||||
* sent there permanently – otherwise the page would load its scripts, fonts and videos from the main
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
<?php
|
||||
|
||||
namespace App\Listeners;
|
||||
|
||||
use App\Models\Tenant;
|
||||
use App\Support\Settings;
|
||||
use Illuminate\Mail\Events\MessageSending;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Symfony\Component\Mime\Address;
|
||||
use Symfony\Component\Mime\Email;
|
||||
|
||||
/**
|
||||
* The one gate every outgoing e-mail passes – whichever mailer, mailable or notification sent it (Laravel fires
|
||||
* MessageSending for every message right before the transport). In test operation it replaces every recipient (To, Cc,
|
||||
* Bcc) by the test recipient; when no test recipient can be determined, the mail is not sent at all. Only a landlord
|
||||
* switched live (and no server override) lets mails reach their real recipients.
|
||||
*
|
||||
* The operating mode is read fresh from the database for every mail, so a switch in the admin applies at once, also in
|
||||
* long-running processes. Without any landlord the installation counts as being in test operation.
|
||||
*/
|
||||
class EnforceMailTestMode
|
||||
{
|
||||
public const ORIGINAL_RECIPIENTS_HEADER = 'X-Fewo-Testbetrieb-Original';
|
||||
|
||||
/**
|
||||
* @return false|null false stops the mail; null lets it go on
|
||||
*/
|
||||
public function handle(MessageSending $event): ?bool
|
||||
{
|
||||
$message = $event->message;
|
||||
$tenant = Settings::tenant();
|
||||
$tenant = $tenant instanceof Tenant ? ($tenant->fresh() ?? $tenant) : null;
|
||||
$override = config('fewo.mail_redirect_to');
|
||||
|
||||
if (blank($override) && $tenant?->isLive()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$redirect = Settings::mailRedirectFor($tenant);
|
||||
if (blank($redirect) || filter_var($redirect, FILTER_VALIDATE_EMAIL) === false) {
|
||||
// Test operation without anybody to redirect to: never fall through to the real recipients.
|
||||
Log::warning('E-Mail im Testbetrieb nicht versendet: keine Testadresse eingerichtet.', ['subject' => $message instanceof Email ? $message->getSubject() : null, 'tenant' => $tenant?->id]);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! $message instanceof Email) {
|
||||
Log::warning('E-Mail im Testbetrieb nicht versendet: unbekannter Nachrichtentyp.', ['type' => $message::class]);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
$original = collect([...$message->getTo(), ...$message->getCc(), ...$message->getBcc()])
|
||||
->map(fn (Address $address): string => $address->getAddress())->unique()->implode(', ');
|
||||
|
||||
$headers = $message->getHeaders();
|
||||
$headers->remove('Cc');
|
||||
$headers->remove('Bcc');
|
||||
$headers->remove(self::ORIGINAL_RECIPIENTS_HEADER);
|
||||
$message->to($redirect);
|
||||
if ($original !== '') {
|
||||
$headers->addTextHeader(self::ORIGINAL_RECIPIENTS_HEADER, mb_substr($original, 0, 900));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingChange;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Address;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* Confirms a change that was already agreed with the guest – information about what now applies, not a request for
|
||||
* consent (package 5).
|
||||
*/
|
||||
class BookingChanged extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
public function __construct(public Booking $booking, public BookingChange $change) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(
|
||||
subject: 'Änderung Ihrer Buchung '.$this->booking->reference,
|
||||
replyTo: [new Address(config('fewo.owner.email'), config('fewo.owner.name'))],
|
||||
);
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(markdown: 'mail.booking-changed');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Documents\RentalContract;
|
||||
use App\Models\Booking;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Address;
|
||||
use Illuminate\Mail\Mailables\Attachment;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* The booking documentation for a booking already binding on a portal (A3/A4): the stay as booked there and our
|
||||
* document, without an acceptance link and without a cancellation link of our own (E-004).
|
||||
*/
|
||||
class BookingDocumentation extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
public function __construct(public Booking $booking) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(
|
||||
subject: 'Ihre Buchungsunterlagen '.($this->booking->portal_reference ?? $this->booking->reference),
|
||||
replyTo: [new Address(config('fewo.owner.email'), config('fewo.owner.name'))],
|
||||
);
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(markdown: 'mail.booking-documentation');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<Attachment>
|
||||
*/
|
||||
public function attachments(): array
|
||||
{
|
||||
$path = app(RentalContract::class)->absolutePath($this->booking);
|
||||
|
||||
return $path ? [Attachment::fromPath($path)->as("Buchungsunterlagen-{$this->booking->reference}.pdf")->withMime('application/pdf')] : [];
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@ public function __construct(public Booking $booking, public bool $cancelled) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(subject: ($this->cancelled ? 'Storniert: ' : 'Stornierungswunsch: ').$this->booking->reference.' – '.$this->booking->guest->full_name);
|
||||
return new Envelope(subject: ($this->cancelled ? 'Storniert: ' : 'Stornierungswunsch: ').$this->booking->reference.' – '.$this->booking->guestName());
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Models\BookingChange;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* Tells the landlord how the guest answered a proposed change.
|
||||
*/
|
||||
class ChangeAnswered extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
public function __construct(public BookingChange $change, public bool $accepted) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(subject: ($this->accepted ? 'Änderung angenommen: ' : 'Änderung abgelehnt: ').$this->change->booking->reference);
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(markdown: 'mail.change-answered');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingChange;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Address;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* Proposes a change to the guest: nothing has changed yet; the guest accepts or declines through the signed link
|
||||
* (package 5). Only the guest's acceptance makes it binding.
|
||||
*/
|
||||
class ChangeProposed extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
public function __construct(public Booking $booking, public BookingChange $change, public string $url) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(
|
||||
subject: 'Vorschlag zur Änderung Ihrer Buchung '.$this->booking->reference,
|
||||
replyTo: [new Address(config('fewo.owner.email'), config('fewo.owner.name'))],
|
||||
);
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(markdown: 'mail.change-proposed');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Documents\RentalContract;
|
||||
use App\Models\Booking;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Address;
|
||||
use Illuminate\Mail\Mailables\Attachment;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* The confirmation of a private stay (A6, on request): the stay, no rental contract (package 6).
|
||||
*/
|
||||
class StayConfirmed extends Mailable
|
||||
{
|
||||
use Queueable, SerializesModels;
|
||||
|
||||
public function __construct(public Booking $booking) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(
|
||||
subject: 'Bestätigung Ihres Aufenthalts '.$this->booking->reference,
|
||||
replyTo: [new Address(config('fewo.owner.email'), config('fewo.owner.name'))],
|
||||
);
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(markdown: 'mail.stay-confirmed');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<Attachment>
|
||||
*/
|
||||
public function attachments(): array
|
||||
{
|
||||
$path = app(RentalContract::class)->absolutePath($this->booking);
|
||||
|
||||
return $path ? [Attachment::fromPath($path)->as("Aufenthaltsbestaetigung-{$this->booking->reference}.pdf")->withMime('application/pdf')] : [];
|
||||
}
|
||||
}
|
||||
Loaded 100 of 220 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user