Compare commits

...
Author SHA1 Message Date
LarsandClaude Opus 5.5 4e6ad792eb Stand Wohnungsumschalter, Saisonfotos und Banner dokumentieren
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 19:02:01 +01:00
LarsandClaude Opus 5.5 d2b1a853dc Banner zentral: je Website, Saison und Prioritaet, auch fuer Sonderangebote
Hinweise werden zu Bannern mit Website, Erscheinungsbildern, Prioritaet und
optionalem Sonderangebot (Text, Termin und Link aus dem Angebot, sichtbar nur
solange es beworben wird). Sonderangebote lassen sich mit einem Klick als Banner
zeigen; die Liste nennt das heute sichtbare Banner. Banner-Texte der
Erscheinungsbilder werden zu saisonalen Bannern.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 19:01:48 +01:00
LarsandClaude Opus 5.5 791786ed3e Saisonfotos am Foto statt am Erscheinungsbild
Ein Foto gehoert zu keinem (ganzjaehrig) oder mehreren Erscheinungsbildern und
erscheint nur dort, vor den ganzjaehrigen Fotos. Bausteine waehlen "automatisch"
oder eine eigene Auswahl; Titelbereich und Abschluss zeigen das erste passende
Foto ihrer Liste. Titelbild und "Bilder je Baustein" des Erscheinungsbilds werden
in die Bausteine uebernommen und entfallen dort.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 18:53:56 +01:00
LarsandClaude Opus 5.5 d02f3e05c7 Eigene Fotokategorie fuer Grundrisse und Plaene, nie in Galerien
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 18:43:02 +01:00
LarsandClaude Opus 5.5 8bcda9a4bc Wohnungsumschalter im Verwaltungsmenue und wohnungsbezogene Listen
Oben im Seitenmenue waehlt man die Wohnung; Listen, neue Eintraege, Belegungsplan
und Preise & Angebote folgen ihr. Ein geoeffneter Eintrag einer anderen Wohnung
schaltet auf diese um. Galerie und Ersatz-Titelbild der Website zeigen nur Fotos
der Wohnung des Bausteins und Fotos ohne Wohnung.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 18:40:13 +01:00
Lars e74033a958 Bereitstellung der Kalenderspiegelungen und abweichende Originaltermine dokumentieren [skip ci] 2026-10-29 17:05:59 +01:00
Lars add2367869 Eindeutige iCal-Kalenderspiegelungen automatisch und widerrufbar zuordnen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m53s
2026-10-29 17:01:30 +01:00
Lars 8b36e07dc4 Bereitgestellte Regeldialog-Korrektur und lesende Abnahme dokumentieren [skip ci] 2026-10-29 16:30:25 +01:00
Lars a0497fcccd iCal-Regelanwendung bei Zeitstempelupdates erlauben und Dialogfehler anzeigen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m53s
2026-10-29 16:25:29 +01:00
Lars 678e15256d Bereitgestellte Zeitstempel-Kompatibilitaet und echten Abruf dokumentieren [skip ci] 2026-10-29 16:08:31 +01:00
Lars 2ae48e77fa iCal-Ereignisse mit LAST-MODIFIED statt fehlendem DTSTAMP lesen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 3m3s
2026-10-29 15:53:55 +01:00
Lars 386e2cf0a9 Bereitgestellte iCal-Regelbedienung und Konfigurationsbefund dokumentieren [skip ci] 2026-10-29 15:44:04 +01:00
Lars 54efd3b858 Portalreservierungen im Zuordnungsdialog eindeutig benennen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m42s
2026-10-29 15:39:13 +01:00
Lars 7d998e2b81 iCal-Regelentwuerfe sichtbar speichern und Aktivierungsstand anzeigen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 3m0s
2026-10-29 15:34:02 +01:00
Lars e7efb06277 Grundrissvarianten und Hausgrafiken als Entwuerfe sichern [skip ci] 2026-10-29 14:58:41 +01:00
Lars 94df35e702 Lokalen iCal-Snapshotvergleich versionieren [skip ci] 2026-10-29 14:58:41 +01:00
Lars bc3872c01f n8n-Betriebsnachweise und Wiederherstellung dokumentieren [skip ci] 2026-10-29 14:58:40 +01:00
Lars 0bba50bd7b Fachliche Architektur und Vermietungskonzept versionieren [skip ci] 2026-10-29 14:57:38 +01:00
Lars 5bffe44435 Bereitgestellten Sperrzweck und Privat-Kanal dokumentieren [skip ci] 2026-10-27 22:30:54 +01:00
Lars 4389894959 Sperrzeiten um Eigenbelegung und privaten Buchungskanal erweitern
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m49s
2026-10-27 22:26:47 +01:00
Lars 2b2e732612 Bereitgestellte vollstaendige Gastanlage im Dialog dokumentieren [skip ci] 2026-10-27 22:17:51 +01:00
Lars 78aafd7c28 Vollstaendige Gastdaten direkt im Zuordnungsdialog erfassen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m48s
2026-10-27 22:13:43 +01:00
Lars 13f1b5856c Bereitgestellte Belegungsverwaltung und unveraenderten Kalenderbestand dokumentieren [skip ci] 2026-10-27 22:01:37 +01:00
Lars f19d698203 Sperrgruende im Belegungsplan anzeigen und zugeordnete Gaeste verlinken
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m47s
2026-10-27 21:57:06 +01:00
Lars f369018a68 Zentralen Belegungsplan und plattformuebergreifende Buchungs- und Gaesteverwaltung integrieren
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m41s
2026-10-27 21:51:56 +01:00
Lars c74199e978 Automatischen n8n-Scheduler mit zwei Importlaeufen nachweisen [skip ci] 2026-10-27 21:01:50 +01:00
Lars 4186872b3f n8n-Zugang ueber lokalen SSH-Tunnel wiederherstellen und dokumentieren [skip ci] 2026-10-27 20:52:38 +01:00
Lars f80c0f9f3b Angelegten n8n-Scheduler und erfolgreichen Einzeltest dokumentieren [skip ci] 2026-10-27 20:44:10 +01:00
Lars 1fb839b24e Externen FewoPortal-Scheduler als n8n-Workflow vorbereiten [skip ci] 2026-10-27 19:44:49 +01:00
Lars 2dca2bccfa Fehlende Detailansicht importierter Ostseeklar-Eintraege festhalten [skip ci] 2026-10-27 19:28:54 +01:00
Lars 952f8574c8 Ostseeklar-Rueckmeldung zur fehlenden Namensanzeige dokumentieren [skip ci] 2026-10-27 19:27:46 +01:00
Lars 089d7f894b Umlaute im Auslieferungsnachweis korrigieren [skip ci] 2026-10-27 19:19:45 +01:00
Lars 606ef8850f Abnahme und Auslieferungsstand der iCal-Regelengine dokumentieren [skip ci] 2026-10-27 19:19:22 +01:00
Lars 7c7955b982 Namensweitergabe direkt abschaltbar machen und reale Regelresultate dokumentieren
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m39s
2026-10-27 19:14:39 +01:00
Lars e9db98701b Visuelle iCal-Regelengine mit Originaldaten und individuellen Exportfeldern integrieren
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m37s
2026-10-27 19:00:25 +01:00
Lars c4ebccbbea Bereitgestellten iCal-Funktionsbereich dokumentieren [skip ci] 2026-10-27 18:12:05 +01:00
Lars 8927f2eeb1 Kalenderabgleich ueber iCal von weiteren Portalfunktionen abgrenzen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m37s
2026-10-27 18:07:48 +01:00
Lars 25b5a61461 Exportlink und Statuskorrektur als ausgeliefert festhalten [skip ci] 2026-10-27 18:02:59 +01:00
Lars e5a083ce71 Ausstehenden Erstimport von veraltetem Kalender unterscheiden
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m41s
2026-10-27 17:58:07 +01:00
Lars 0be1cfcdb8 Exportlink direkt in der Portalkonfiguration anzeigen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m34s
2026-10-27 17:55:59 +01:00
Lars 2893192344 Kacheln und nachgewiesene Kalenderabrufe dokumentieren [skip ci] 2026-10-27 17:53:41 +01:00
Lars 511faa64d2 Portale als Kacheln zeigen und Kalenderabrufe je Kanal protokollieren
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m41s
2026-10-27 17:48:17 +01:00
Lars 98eabaeb0c Bereitgestellte Portalverwaltung und Abnahme dokumentieren [skip ci] 2026-10-27 17:35:43 +01:00
Lars 1f59cbb9a5 Eigene Verwaltung fuer frei konfigurierbare Portale und Kalender anbieten
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m34s
2026-10-27 17:29:24 +01:00
Lars 783068501c Generische iCal-Kanäle mit Bestandsklärung und sicheren Exporten bereitstellen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m33s
2026-10-27 17:14:45 +01:00
Lars 6fe5bbc6e3 Doku: Mandantenabschluss auf Strato bestätigt [skip ci] 2026-10-26 17:14:38 +01:00
Lars 06df80e4db Mandantenabschluss: Marken, Vertragsdateien und Archive trennen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m23s
2026-10-26 17:07:11 +01:00
Lars Stommer 86374b1659 Phase-7-Abschluss im Mandantenplan und Übergabestand konsistent festhalten
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m30s
2026-10-26 16:00:02 +01:00
Lars Stommer 1b03689c46 Erprobten Pipeline-Weg und Agentenregeln für FeWo festhalten
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m44s
2026-10-26 14:52:59 +01:00
Lars Stommer e7f79e4075 Runner-Benutzer für OpenSSH im Deployment-Container auflösen
Deploy FeWo mit PipelineManager / deploy (push) Successful in 2m42s
2026-10-26 14:47:05 +01:00
Lars Stommer f5d8be5eaf FeWo-Pilot mit freigegebenem PipelineManager 0.1.1 ausführen
Deploy FeWo mit PipelineManager / deploy (push) Failing after 1m59s
2026-10-26 14:43:58 +01:00
Lars Stommer 92fb01da9d PDF-Featuretests im Pipeline-Container mit 512 MB ausführen
Deploy FeWo mit PipelineManager / deploy (push) Failing after 1m10s
2026-10-26 14:36:12 +01:00
Lars Stommer 01900d6550 FeWo-Paket für Stratos Dateilimit bereinigen
Deploy FeWo mit PipelineManager / deploy (push) Failing after 39s
2026-10-26 14:34:50 +01:00
Lars Stommer 8eae37e11d FeWo als Pilot an den eigenständigen PipelineManager anbinden 2026-10-26 13:27:52 +01:00
Lars Stommer 92ccf40312 CI: Host-Umgebung vor PHP-Setup prüfen und Self-hosted-Modus setzen
Deploy / test (push) Failing after 15s
Deploy / deploy (push) Skipped
2026-10-26 08:31:46 +01:00
Lars Stommer 6d8f1d6692 Doku: Phase 7 auf Strato ausgeliefert, Release 20261026072521
Deploy / test (push) Failing after 14s
Deploy / deploy (push) Skipped
2026-10-26 08:27:04 +01:00
Lars Stommer abf0e9004b Wohnung je Baustein wählen und Gitea-Runner-Kompatibilität herstellen
Deploy / test (push) Failing after 2m47s
Deploy / deploy (push) Skipped
2026-10-26 08:23:14 +01:00
Lars StommerandClaude Opus 5 3a0bb6e40f Doku: Phase 6 ist ausgeliefert (Release 20261026065920)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Server und main sind wieder gleich. Die Prüfung am lebenden Server steht
dabei: Bildwelt ostsee mit 11 Plätzen, Auflösung über die Vorgabe der
Installation, Marke noch leer.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-26 08:03:19 +01:00
Lars StommerandClaude Opus 5 361acfa12a Doku: Übergabe für die Phase-7-Sitzung
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Der wichtigste Hinweis steht jetzt als erstes in Abschnitt 7: `main` ist
dem Server voraus. Phase 6 liegt auf `main` und ist nicht ausgeliefert, und
sie bringt eine Migration mit. Wer das übersieht, deployt entweder blind
oder hält Server und Code für gleich.

Dazu, was Phase 7 anfassen muss: `Theme::property()` merkt sich die
Wohnung, es fehlt ein Weg, sie je Baustein zu setzen und zurückzusetzen –
mit dem ausdrücklichen Hinweis, dass es eine solche Methode heute nicht
gibt. Und die Regel, die über den ganzen Umbau gilt: jede neue Tabelle
bekommt `tenant_id` und gehört in `TenantArchive::DELETE_ORDER`, sonst
überlebt sie die Kündigung ihres Mandanten.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-26 07:56:04 +01:00
Lars StommerandClaude Opus 5 c459f7f83c Doku: Bildwelten und Marke in STATUS, Plan und Vertragsprotokoll; Platzhalter-Hash korrigiert
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-26 07:38:45 +01:00
Lars StommerandClaude Opus 5 4e66add1f0 Phase 6, Anwendungsseite: Bildwelten und die Marke je Website
Die Theme-Sitzung wartete darauf: Seebad ruft schon ortsneutrale Plätze
über `partials/motif` auf und behilft sich mit einem eigenen `motifs/`-
Ordner. Der Kommentar dort sagt es selbst – „so a later picture-world
system can replace the mapping below". Das System gibt es jetzt.

**Bildwelten** (A18–A20) sind Pakete wie Themes: `resources/image-worlds/
<key>/` mit `world.json` und `svg/`. Eine Website wählt eine Bildwelt, eine
Wohnung darf eine andere tragen – das ist der Platz für die Bergwohnung auf
einer Küsten-Website. Vorlagen fragen über `$theme->motif($slot)` nach einem
Platz, nie nach einer Datei.

Die Render-Logik ist aus Seebads Partial in die Anwendung gewandert, damit
jedes Theme sie bekommt: Inline-SVG (nimmt die Textfarbe an, kein zweiter
Request), Titel und ARIA entfernt, und die internen Ids je Aufruf eindeutig
gemacht – zwei Kopien derselben Grafik auf einer Seite würden sonst auf
denselben Verlauf zeigen und eine davon verlöre ihre Farben.

Ein leerer Platz ist kein Fehler: die Vorlage bekommt schlicht keine
Dekoration. Weil das leicht zu übersehen ist, meldet
`php artisan image-worlds:check`, welcher Platz ohne Datei dasteht.

**Marke je Website** (A14/A22): Logo, Favicon und ein Logo für E-Mail und
Vertrag als Medien der Website. Der Mietvertrag bettet die Datei ein statt
eine URL zu holen – er wird auf dem Server gerendert und darf nicht davon
abhängen, dass dieser sich selbst erreicht. Ohne Logo bleibt der Vertrag
wie bisher.

`resources/themes/**` ist unberührt: die Ostsee-Grafiken sind kopiert, nicht
verschoben. Was die Theme-Sitzung nun tun kann, steht in
ZUSAMMENARBEIT.md §6; ihr Wunsch aus §5 ist als erledigt vermerkt.

272 Feature-Tests grün.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-26 07:35:17 +01:00
Lars StommerandClaude Opus 5 f686996122 Doku: ausgelieferter Stand 20261024152057 und die Prüfungen am Server
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 17:39:06 +02:00
Lars Stommer 2c5b5fc2d7 Merge branch 'feature/mandanten-phase4-5' (Phasen 4 und 5)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-24 17:15:31 +02:00
Lars StommerandClaude Opus 5 9cd39f791f Doku: Phasen 1 bis 5 umgesetzt, Grundumbau der Mandantenfähigkeit fertig
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 17:15:30 +02:00
Lars StommerandClaude Opus 5 c55937d20e Phase 4 und 5: Hintergrundläufe je Mandant, Export und Kündigung
**Phase 4 – was im Hintergrund lief, kannte keinen Mandanten.**

`App\Tenancy\TenantRunner` führt jeden Lauf einmal je aktivem Mandanten
aus, mit gesetztem Kontext. Ohne ihn sah der Scheduler bei zwei Mandanten
gar keinen: Abfragen filterten nicht mehr und der Absender fiel auf die
.env zurück – eine Erinnerung des einen Vermieters wäre unter der Adresse
des anderen verschickt worden. Seit gestern gibt es zwei Mandanten; nur
weil der Cronjob auf Strato noch nicht eingerichtet ist, ist das bisher
niemandem passiert.

Betroffen: Vormerkungen, Portal-Abgleich, Portal-Postfach, Überwachung,
Erinnerungen, Bewertungsbitten, Anonymisierung. Die Datenbank-Sicherung
bleibt global – eine Datenbank, ein Dump. Ein Mandant, dessen Lauf
scheitert, hält die anderen nicht auf.

Das Postfach gehört jetzt dem Mandanten (`mailbox_*`, Passwort
verschlüsselt, leerer Server = aus). Es steht im Mandanten-Admin und nur,
wenn der Betreiber den Dienst freigeschaltet hat. Auch die Zustands-
Schlüssel im Cache tragen den Mandanten – sonst meldeten zwei Mandanten
einander ihre letzte erfolgreiche Abholung.

**Phase 5 – Kündigung.**

`App\Tenancy\TenantArchive` mit zwei Befehlen des Betreibers:
`tenants:export <slug>` schreibt alle Zeilen und Dateien in ein Zip,
`tenants:delete <slug>` exportiert erst, fragt nach und löscht dann in
der Reihenfolge, die die Fremdschlüssel erlauben, Medien eingeschlossen.

Konten, die nur zu diesem Mandanten gehörten, gehen mit – ein Konto, das
nirgends mehr hineinkommt, ist personenbezogenes Datum ohne Zweck. Wer
noch für einen anderen Mandanten arbeitet, und der Betreiber, bleiben.
Der Export nennt die Konten mit Rolle, aber ohne Passwort-Hashes und ohne
2FA-Geheimnisse: er wird herausgegeben.

Löschen ist bewusst keine Schaltfläche im Panel.

`TenantSeparationTest` füllt jeden Bereich aus A1 für zwei Mandanten,
exportiert und löscht einen und prüft, dass der andere Zeile für Zeile
unverändert ist – auch die Hosts, die über die Website am Mandanten
hängen und keine eigene tenant_id haben. Dieser Test merkt künftig, wenn
eine neue Tabelle ihre tenant_id vergisst.

262 Feature-Tests grün. Der Export einmal auf echten Daten ausgeführt
(2,3 MB mit Fotos); das Löschen nicht, weil es Dateien aus dem echten
Speicher entfernt.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 11:15:55 +02:00
Lars StommerandClaude Opus 5 c2cf632ad5 Doku: Betreiber-Provisionierung, Sperrseite und systemweite Einstellungen
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Dazu ein genauerer Testname: Links tragen die Hauptadresse ihrer Website,
nicht die Adresse, über die der Besucher kam. Das ist der kanonische Host
und war vorher falsch benannt.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 10:25:48 +02:00
Lars Stommer f2e78446a8 Merge branch 'feature/betreiber-provisionierung'
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-24 10:20:28 +02:00
Lars StommerandClaude Opus 5 03ad4667ac Betreiber richtet Mandanten vollständig ein: Adressen, Sperrseite, Systemwerte
Ein neu angelegter Mandant war eine Sackgasse. Er bekam keine Website, also
keinen Host, also keine Adresse – und der Host wird im Mandanten-Admin
eingetragen, den er ohne Adresse nicht erreicht. „Im Admin öffnen" half
nicht: ohne Domain landete es beim Mandanten des aktuellen Hosts.

Einsprungsadressen gehören jetzt dem Betreiber, weil Webspace und Hosting
ihm gehören und ein Mandant nicht die Adresse eines anderen auf sich
zeigen lassen darf. Im Mandanten-Formular: Websites mit ihren Adressen.
Beim Anlegen entstehen Website, Host-Einträge und eine leere Startseite –
ohne Startseite antwortet die Website mit 404. Im Mandanten-Admin sind die
Adressen nur noch sichtbar, nicht änderbar. Die Domain beim Hoster auf das
Verzeichnis zu legen bleibt ein Schritt von Hand.

Gesperrter Mandant: statt 404 ein Hinweis mit Status 503, Text je Mandant
einstellbar. 503 hält die Seiten im Suchindex, weil die Sperre vorübergehend
ist.

Behoben: `URL::forceRootUrl(APP_URL)` zwang **alle** Links auf einen festen
Host. Mit einem Mandanten unsichtbar; mit zwei Domains hätte jeder interne
Link der zweiten Website auf die erste gezeigt. Der Ursprung ist jetzt der
Host der aufgelösten Website.

Neu: systemweite Einstellungen sind im Betreiber-Bereich änderbar
(Löschfristen, Bot-Schutz, Flutgrenze, Sicherungen, Portal-Fristen,
Versandweg, SMTP, harte Mail-Umleitung, Tokens). Leer heißt: der Wert der
.env gilt wieder – und zwar sofort, nicht erst beim nächsten Start.
Geheimnisse liegen verschlüsselt. Datenbank-Zugang und APP_KEY bleiben in
der .env, weil sie gebraucht werden, um die Datenbank zu öffnen und das
Gespeicherte zu entschlüsseln.

253 Feature-Tests grün.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 10:20:18 +02:00
Lars StommerandClaude Opus 5 d9383cf3e5 Betreiber: Knopf zum Anlegen heißt jetzt "Neuen Mandanten anlegen"
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Die Schaltfläche hieß nur "Erstellen" (Filaments Vorgabe) und war als
Einstieg nicht erkennbar. Dazu ein Test, der den ganzen Weg geht: Liste,
Formular, Anlegen samt Dienste-Freischaltung – und prüft, dass ein neuer
Mandant nichts von dem Mandanten erbt, den der Betreiber gerade ansieht.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 09:39:41 +02:00
Lars StommerandClaude Opus 5 e0e8c1d856 Doku: Dienste-Steuerung, Host-Verwaltung und der zweite Mandant auf stommer.info
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 09:33:07 +02:00
Lars Stommer 2f2aceb3bd Merge branch 'feature/mandanten-dienste' (Dienste-Steuerung und Host-Verwaltung)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-24 09:25:23 +02:00
Lars StommerandClaude Opus 5 2e3f2ca938 Mehrere Adressen je Website, damit ein zweiter Mandant niemanden abschaltet
Bisher schrieb das Feld „Domain" genau einen Host nach `site_domains` und
löschte den vorherigen. Solange es einen Mandanten gibt, fällt das nicht
auf: jede Adresse liefert die Standard-Website. Ab dem zweiten Mandanten
bekommt jede nicht eingetragene Adresse 404 – und „www.beispiel.de" ist
eine eigene Adresse. stommer.info hätte einen zweiten Mandanten nicht
überlebt.

Das Formular hat jetzt „Hauptadresse" (steht in Gästelinks) und „Weitere
Adressen". Eingaben werden normalisiert, „https://WWW.Beispiel.de/" wird
zu „www.beispiel.de".

Eine Adresse, die schon zu einer anderen Website gehört, wird abgelehnt.
Ohne diese Sperre könnte ein Mandant die Besucher eines anderen auf seine
eigene Seite ziehen, indem er dessen Adresse einträgt.

242 Feature-Tests grün.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 09:25:22 +02:00
Lars StommerandClaude Opus 5 fd2a7f7ded Dienste wirklich anschließen: zentrale Steuerung statt folgenloser Schalter
Die Schalter aus Phase 3 schrieben nur in eine Tabelle, die niemand las.
Ein gesperrter Portal-Abgleich lief trotzdem weiter. Das ist behoben.

`App\Tenancy\TenantFeatures` ist die eine Stelle, die beantwortet, ob ein
Mandant einen Dienst hat. Sie wird an allen Wegen abgefragt, die zum Dienst
führen:

- `RolePolicy::allows()` – damit greift die Mandanten-Ebene in *jeder*
  Richtlinie des Admins. Die Rolle sagt, was ein Benutzer darf; der Dienst
  sagt, was der Mandant überhaupt hat. Keine Rolle wiegt einen gesperrten
  Dienst auf.
- `Channel::importsOccupations()` – Import und Scheduler.
- Der öffentliche iCal-Feed antwortet mit 404.
- `ProcessPortalMail` und `channels:fetch-mail` für den Postfach-Schnellweg.

`TenantServiceKey::isWired()` trennt Gebautes von Geplantem. Nur verdrahtete
Dienste erscheinen als Schalter; die drei KI-Dienste stehen als Hinweis da,
bis die Anwendung sie abfragt. Eigene API-Schlüssel sind aus dem Betreiber-
Formular verschwunden – sie gehören in den Admin des Mandanten, wenn es
soweit ist (A16).

Neu im Betreiber-Bereich: Seite „System" mit den Grenzen, die für alle
Mandanten gelten (aus der .env, bewusst nicht änderbar), der Mandantenliste
und dem Zugriffsprotokoll. Bisher war dort nur die Mandantenliste.

Die Migration schaltet jedem vorhandenen Mandanten die Portal-Dienste frei,
damit der Umbau laufenden Betrieb nicht stillschweigend stoppt.

240 Feature-Tests grün, davon fünf neue in `TenantServiceGateTest`.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-24 09:14:10 +02:00
Lars StommerandClaude Opus 5 220ec6bfdb Doku: Sicherung, Migrationsstand und Prüfung des Phase-3-Deploys
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-23 22:02:29 +02:00
Lars StommerandClaude Opus 5 afffa79289 Doku: Phase 3 ist auf stommer.info; Release-Nummern korrigiert
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Im Stand stand noch `20261023100346`, obwohl danach vier weitere Deploys
liefen (Grundriss, Fotos-Fix). Jetzt steht überall die wirklich aktive
Version `20261023195835` mit Phase 3.

Neu vermerkt: die Bankverbindung ist am Mandanten leer, weil die .env von
stommer.info keine `FEWO_BANK_*`-Werte hat – sie gehört jetzt in
System › Betrieb.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-23 22:01:53 +02:00
Lars Stommer f143a4f5f4 Merge branch 'feature/mandanten-phase3' (Mandanten Phase 3)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-23 20:49:47 +02:00
Lars StommerandClaude Opus 5 e6d4d89141 Mandanten Phase 3: Einstellungen, Texte und Dienste gehören dem Mandanten
Vermieterdaten, Bank, Steuerangabe, Adressen, Betriebsart und Fristen sind
Spalten von `tenants`. `App\Tenancy\TenantConfig` legt sie über
`config('fewo.*')` und `mail.from`, sobald der Mandantenkontext wechselt –
so lesen Vorlagen, Mails und der Mietvertrag weiter dieselben Schlüssel und
`resources/themes/**` bleibt unangetastet.

Die `.env` ist die Grundlinie: Rückfall, solange kein Mandant feststeht, und
Grenze für Löschfristen und Bot-Schutz (nur verschärfen, nicht lockern). Die
Flutgrenze bleibt global. Bank, Steuerangabe und eigene Dienst-Schlüssel
liegen verschlüsselt.

Die Seite System › Betrieb schreibt jetzt den Mandanten und enthält
zusätzlich Vermieterdaten, Bank und die Fristen. Tabelle `settings` und
Modell `Setting` entfallen; die Migration übernimmt die bisherigen Werte
aus `settings` und der Konfiguration in den Mandanten Stommer.

Neu: `tenant_services` (Freischaltung je Dienst mit optionalem eigenem
API-Schlüssel, nur im Betreiber-Bereich schaltbar) und `service_usages`.
Es zählt noch nichts, weil kein Dienst aufruft.

235 Feature-Tests grün. Der Umbauweg wurde zusätzlich auf einer Kopie der
lokalen Datenbank durchgespielt.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-10-23 20:49:22 +02:00
LarsandClaude Opus 5.5 12e4079126 Docs: photo storage fix (admin uploads were private) in BETRIEB §8 and STATUS
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 20:17:18 +02:00
LarsandClaude Opus 5.5 1871c04507 Fix: photos uploaded in the admin were stored privately and did not show on the website
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
The admin upload field used Filament's default disk (FILESYSTEM_DISK=local, private), while imports
and the website use the public disk – a photo uploaded in the admin appeared in the photo list but
its web sizes returned 403 (e.g. as floor plan picture). The photo collection and the upload field
now always use the public disk; a data migration moves photos already stored privately (original and
web sizes, folder = media id) to the public disk. Tests for the upload and the migration.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 17:12:32 +02:00
LarsandClaude Opus 5.5 dfd3f77a5d Floor plan editor: move corners by drag or arrow keys, insert on edges, delete by double click
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Corners stay editable after drawing: drag a corner (mouse or touch), focus it and nudge with the arrow
keys (Shift for larger steps), '+' on an edge inserts a corner in its middle, double click or Delete
removes one. Tested in a browser harness with the real field markup.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 16:47:55 +02:00
LarsandClaude Opus 5.5 f7cbc66451 Section "Grundriss (interaktiv)": floor plan with rooms, admin editor, Seebad view
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
- Table floor_plans (tenant_id, one per apartment, picture = website photo, rooms as JSON with
  corners in percent of the picture), model FloorPlan with BelongsToTenant, Property::floorPlan()
- Admin › Webseite › Grundriss: room list with name, description, photos, equipment (from the
  equipment list), accessibility hint, visibility, and an area editor (click the corners on the picture)
- Section floor_plan: base view without JavaScript (areas jump to the room list), Seebad view with
  room buttons, highlighted area and a cartouche per room (theme.js initFloorPlans)
- Tests: tenant inheritance, point parsing, website output, admin create incl. validation; the
  render test for all themes now includes the floor plan
- Docs: THEMES §5, ZUSAMMENARBEIT §6, STATUS §6 (incl. note for tenancy phase 5)
- styles/grundriss: revised rendering, WebP renditions, room areas of the Stommer flat in percent

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 15:26:02 +02:00
LarsandClaude Opus 5.5 04b5189bd8 Floor plan: rendering (source + WebP 900/1712) and room areas in image coordinates
Seven rooms incl. entrance; the areas use the image's own coordinate system (viewBox 0 0 1712 919),
so an SVG overlay scales exactly with the image. A traced vector version was tested and rejected
(2.7 MB, posterised).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 15:11:17 +02:00
LarsandClaude Opus 5.5 9b8a851ce9 Floor plan in a light 3D view (cutaway): SVG, generator and projected room areas
Generated from the plan coordinates of the scanned floor plan (photo 20); the JSON holds the room
polygons in the same projection for the interactive section. Draft for the planned section
'Interaktiver Grundriss' (STATUS §6).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 12:52:06 +02:00
Lars b3114cdfe3 Merge remote-tracking branch 'origin/main' into theme/seebad
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-23 12:33:33 +02:00
LarsandCursor faf2133232 Record that the staging admin works after the tenancy deploy.
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-23 12:33:26 +02:00
LarsandClaude Opus 5.5 d2f53ceb84 Theme Seebad 0.4.0: menu panels; fix missing chevron icons; render test for all themes
- Menu panels: arrow next to each main menu item opens a panel with the page description (SEO text),
  jump links to the headed sections and a cartouche with booking and phone; Escape/outside click closes,
  focus returns; without JavaScript the menu stays plain links
- Header: booking button hidden between 1280 and 1535 px (too narrow with the arrows), desktop phone removed
- Fix: offers carousel and menu used outline chevron icons that do not exist (500 as soon as offers are shown);
  now mini chevrons
- New test: every installed theme renders all pages with reviews and offers in every display mode
- Wish: menu photo per page (ZUSAMMENARBEIT §5)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 12:33:11 +02:00
LarsandCursor ab1dffc72f Record the tenancy handoff so the next session can start at phase 3.
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
STATUS section 7 names the deployed release, the pieces that are built, and what must stay untouched.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-23 12:26:29 +02:00
LarsandCursor fc61369c4a Record that stommer.info now runs as the Stommer landlord.
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-23 12:05:57 +02:00
Lars cec49da1be Merge branch 'feature/mandanten' 2026-10-23 12:00:22 +02:00
LarsandCursor 8ebc1a3878 Assign the existing site to one landlord so stommer.info can run tenancy.
Seebad 0.3 stays in this release. With a single landlord every host still reaches the default website.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-23 12:00:11 +02:00
LarsandClaude Opus 5.5 d9e52c4789 Status: design theme section (open points, plan for new sections)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 10:08:03 +02:00
Lars 3621f7e924 Merge branch 'theme/seebad' (Seebad 0.3.0: all sections)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-23 10:02:11 +02:00
LarsandClaude Opus 5.5 6930d3ab0f Theme Seebad 0.3.0: own gallery, offers, reviews, FAQ, contact, booking and rich text
- All 15 sections now in Seebad style: offers and contact framed with terrace-brace brackets,
  reviews with large average and serif quotes, FAQ with large toggles, gallery with captions on focus
- Booking page offers the phone number ("Lieber persönlich?")

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 10:01:58 +02:00
Lars c215da0590 Merge branch 'theme/seebad' (Seebad 0.2.0: logo, Bäderstil details)
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
2026-10-23 09:53:16 +02:00
LarsandClaude Opus 5.5 e49f160496 Theme Seebad 0.2.0: logo from satz4 and Bäderstil details of the house
- Logo (satz4) traced to SVG masters (styles/satz4/svg: full logo, picture mark, wordmark) with a palette
  sampled from the original; WebP renditions for the website; favicon/apple touch icon = simplified corner bay
- House details as theme elements: arched dormer (crest of the cartouche), hero arch with window surround and
  keystone, terrace braces as corner brackets (search box, cartouche), balcony railing on the dark band
- Colours from the logo (navy, roof terracotta as accent, wave blues, sun)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 09:52:57 +02:00
Lars bc2b175556 Merge branch 'theme/seebad' (Seebad 0.1.1)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
2026-10-23 08:39:22 +02:00
LarsandClaude Opus 5.5 5416b37dfc Theme Seebad 0.1.1: header no longer overlaps, readable amenities and prices
- Header: full menu from 1280 px, menu button below; site name never shrinks into the menu
- Hero: photo and text side by side from 1024 px
- Own amenities (serif area headings, check marks) and prices (extras as list, larger table, mobile layout)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 08:39:12 +02:00
Lars StommerandClaude Opus 5.5 30e9aa7b26 Git auto-sync script (fast-forward only), lockfile resynced so npm ci works again
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 08:32:32 +02:00
Lars 4951f227f1 Merge branch 'theme/seebad' (Theme Seebad, first version)
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
2026-10-23 08:25:20 +02:00
LarsandClaude Opus 5.5 a9ad4dbf0b Theme Seebad: first version of design direction A
- New child theme "seebad": Newsreader + Atkinson Hyperlegible Next (self-hosted), larger base size,
  tokens chalk white / ink blue / brick / evening blue
- Picture world "Ostsee" as inline SVG slots (partials/motif): villa mark, wave bands, shell, gulls, vignettes
- Own layout, header (mobile menu as dark panel with call button), footer, banner, mobile booking bar
- Sections: hero with arch photo and search box, facts, text_image, location, host, cta in cartouche
- Wishes to the application recorded in ZUSAMMENARBEIT.md §5

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 08:22:23 +02:00
LarsandClaude Opus 5.5 e276cd0548 Design concept, multi-tenancy requirements, graphic set 3 (originals + hand-drawn SVGs)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
- docs/DESIGN-KONZEPT.md: target group couples, three design directions, configurator extensions
- docs/MANDANTEN-ANFORDERUNGEN.md: requirements for tenants (SaaS landlord websites), roles per tenant
- styles/satz3: AI-generated originals and clean SVG redraws (villa mark, vignettes, bands, ornaments)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 08:07:20 +02:00
Lars StommerandClaude Opus 5.5 0c98d82cf2 Addresses of the internal communication in the admin (notification recipients, contact/reply-to, sender)
Deploy / test (push) Failing after 2s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 07:14:25 +02:00
Lars StommerandClaude Opus 5.5 749537342e Status: switch contact address to info@fewo-stommer.de at go-live
Deploy / test (push) Failing after 3s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 07:09:12 +02:00
Lars StommerandClaude Opus 5.5 b681327d3a Sender address info@fewo-stommer.de (SMTP login with that mailbox)
Deploy / test (push) Failing after 11s
Deploy / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-23 07:01:23 +02:00
Lars StommerandClaude Opus 5.5 bde99657cf mail:test: clear message for the log mailer
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 23:04:58 +02:00
Lars StommerandClaude Opus 5.5 d018c97be4 Operating mode in the admin (test mode sends all mail to a test recipient until switched live), bot protection for booking requests, mail rendering tests, mail:test command
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 23:01:44 +02:00
Lars StommerandClaude Opus 5.5 fdcb68d578 Documentation: project README, status, rules for parallel sessions (theme branch), updated operations/concept/theme guide
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 22:50:35 +02:00
Lars StommerandClaude Opus 5.5 70a8c5072b Minimum stay exceptions (gap filled, ends on changeover day, offers, absolute minimum); copy seasons aligned to a weekday
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 22:38:27 +02:00
Lars StommerandClaude Opus 5.5 20235b9139 Front controller: remove the internal release prefix Strato puts into REQUEST_URI (signed links)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 22:28:43 +02:00
Lars StommerandClaude Opus 5.5 565eee4325 Fix signed links behind the Strato release rewrite (base URL), mail redirect for test environments
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 22:24:31 +02:00
Lars StommerandClaude Opus 5.5 fd744edf8c Prices & offers page (seasons, special offers/promo codes, extras) and photos in the simple admin mode
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 22:19:08 +02:00
Lars StommerandClaude Opus 5.5 7a6ee316cd Admin: show the offer link (e.g. to share it, or on staging where mails go to the log)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 21:46:34 +02:00
Lars StommerandClaude Opus 5.5 6690beafe6 Strip photo metadata with GD (Imagick keeps EXIF), --force option, stricter test
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 21:43:54 +02:00
494 changed files with 25265 additions and 1241 deletions

No files matched your search

+7
View File
@@ -0,0 +1,7 @@
{
"permissions": {
"allow": [
"Bash(git merge *)"
]
}
}
+4 -2
View File
@@ -35,14 +35,16 @@ MAIL_MAILER=smtp
MAIL_HOST=smtp.strato.de
MAIL_PORT=465
MAIL_SCHEME=smtps
MAIL_USERNAME=fewo@stommer.de
MAIL_USERNAME=info@fewo-stommer.de
MAIL_PASSWORD=
MAIL_FROM_ADDRESS="fewo@stommer.de"
MAIL_FROM_ADDRESS="info@fewo-stommer.de"
MAIL_FROM_NAME="${APP_NAME}"
FEWO_OWNER_NAME="Brigitte Stommer"
FEWO_OWNER_EMAIL=fewo@stommer.de
FEWO_NOTIFICATION_EMAIL=fewo@stommer.de
# Harte Umleitung aller E-Mails (gilt immer). Normal leer lassen – Testbetrieb/Scharfschalten: Admin › System › Betrieb
FEWO_MAIL_REDIRECT_TO=
FEWO_BANK_ACCOUNT_HOLDER=
FEWO_BANK_IBAN=
FEWO_BANK_BIC=
+46 -88
View File
@@ -1,105 +1,63 @@
# Tests on every push; deployment to Strato for tags "v*" or by hand (Gitea › Actions › Deploy › Run workflow).
# Needs a Gitea act_runner (e.g. on the private server) and these repository secrets:
# DEPLOY_SSH_KEY private key whose public key is stored at Strato (SFTP & SSH)
# DEPLOY_HOST package-specific SSH server, e.g. 51539426.ssh.w1.strato.hosting (not ssh.strato.de)
# DEPLOY_USER SSH user from the Strato customer login
# DEPLOY_PATH e.g. fewo-production
# DEPLOY_PHP e.g. /opt/RZphp84/bin/php-cli
# DEPLOY_URL e.g. https://www.fewo-stommer.de
name: Deploy
name: Deploy FeWo mit PipelineManager
on:
push:
branches: [main]
tags: ['v*']
branches: [develop, main]
workflow_dispatch:
inputs:
environment:
description: Ziel
type: choice
options: [production, staging]
default: production
jobs:
test:
runs-on: ubuntu-latest
services:
mariadb:
image: mariadb:11.8
env:
MARIADB_DATABASE: fewo_test
MARIADB_ROOT_PASSWORD: test
ports: ['3306:3306']
options: >-
--health-cmd="healthcheck.sh --connect --innodb_initialized"
--health-interval=5s --health-timeout=5s --health-retries=20
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: '8.4'
extensions: mbstring, intl, gd, exif, zip, pdo_sqlite, sqlite3, pdo_mysql, fileinfo, openssl
tools: composer:v2
- uses: actions/setup-node@v4
with:
node-version: '22'
cache: npm
- name: Install
run: |
composer install --no-interaction --no-progress --prefer-dist
npm ci --no-audit --no-fund
npm run build
cp .env.example .env
php artisan key:generate
- name: Tests (SQLite)
run: php artisan test --compact
- name: Tests (MariaDB 11.8, wie auf Strato)
env:
DB_CONNECTION: mariadb
DB_HOST: 127.0.0.1
DB_PORT: '3306'
DB_DATABASE: fewo_test
DB_USERNAME: root
DB_PASSWORD: test
run: php artisan test --compact
deploy:
needs: test
if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
# Raspi5-Paperless: existing host runner; all PHP/Node work happens inside the image.
runs-on: ubuntu-latest
env:
PIPELINE_IMAGE: pipeline-manager:0.1.1
PIPELINE_HOME: /home/lars/docker/pipeline-manager
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: '8.4'
extensions: mbstring, intl, gd, exif, zip, fileinfo, openssl
tools: composer:v2
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: '22'
cache: npm
- name: SSH key
- name: Anwendung im Manager-Container vorbereiten und testen
id: build
run: |
mkdir -p ~/.ssh
printf '%s\n' "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key
chmod 600 ~/.ssh/deploy_key
ssh-keyscan -H "${{ secrets.DEPLOY_HOST }}" >> ~/.ssh/known_hosts
set -eu
case "$GITHUB_REF" in
refs/heads/develop) TARGET=staging ;;
refs/heads/main) TARGET=production ;;
*) echo 'Unzulässiger Branch'; exit 1 ;;
esac
docker image inspect "$PIPELINE_IMAGE" >/dev/null
STATUS=0
docker run --rm --user "$(id -u):$(id -g)" \
-v "$(pwd -P):/workspace:ro" "$PIPELINE_IMAGE" \
pipeline-manager check --environment "$TARGET" || STATUS=$?
if [ "$STATUS" = 3 ]; then
echo 'enabled=false' >> "$GITHUB_OUTPUT"
exit 0
fi
test "$STATUS" = 0
umask 077
mkdir -p "$PIPELINE_HOME/cache/composer" "$PIPELINE_HOME/cache/npm" "$PIPELINE_HOME/backups" .pipeline
docker run --rm --user "$(id -u):$(id -g)" --cpus=2 --memory=2g --pids-limit=512 \
-e HOME=/tmp \
-v "$(pwd -P):/workspace" \
-v "$PIPELINE_HOME/cache:/cache" "$PIPELINE_IMAGE" \
pipeline-manager prepare
echo "target=$TARGET" >> "$GITHUB_OUTPUT"
echo 'enabled=true' >> "$GITHUB_OUTPUT"
- name: Deploy
- name: Sichern und nach Strato übertragen
if: steps.build.outputs.enabled == 'true'
env:
TARGET: ${{ steps.build.outputs.target }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
DEPLOY_PHP: ${{ secrets.DEPLOY_PHP }}
DEPLOY_URL: ${{ secrets.DEPLOY_URL }}
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
run: |
export DEPLOY_SSH_KEY="$HOME/.ssh/deploy_key"
bash scripts/deploy.sh "${{ inputs.environment || 'production' }}" deploy
set -eu
docker run --rm --user "$(id -u):$(id -g)" --cpus=1 --memory=512m --pids-limit=128 \
-e GITHUB_REF -e GITHUB_SHA -e DEPLOY_HOST -e DEPLOY_USER -e DEPLOY_SSH_KEY -e DEPLOY_KNOWN_HOSTS \
-v /etc/passwd:/etc/passwd:ro \
-v "$(pwd -P):/workspace:ro" \
-v "$PIPELINE_HOME/backups:/backups" "$PIPELINE_IMAGE" \
pipeline-manager deploy --environment "$TARGET" --backup-root /backups
+2
View File
@@ -24,6 +24,7 @@
/storage/*.key
/storage/pail
/vendor
/.pipeline/
_ide_helper.php
Homestead.json
Homestead.yaml
@@ -32,3 +33,4 @@ Thumbs.db
# Deployment settings with access data
/scripts/deploy.*.env
!/scripts/deploy.example.env
storage/app/private/exports/
+7 -4
View File
@@ -1,8 +1,8 @@
# Ferienwohnung Stommer
Website + booking management for a holiday apartment in Kühlungsborn. Concept and roadmap: `docs/KONZEPT.md`.
Website + booking management for a holiday apartment in Kühlungsborn. Concept and roadmap: `docs/KONZEPT.md`. **Current state and next steps: `docs/STATUS.md` – start there and update it after larger changes.** Parallel sessions (e.g. theme design on another machine): follow `docs/ZUSAMMENARBEIT.md` (branches and file ownership; `develop` deploys staging, a merge from `develop` to `main` deploys production once enabled).
- Hosting target: Strato shared webhosting (PHP + MySQL, no Node at runtime) – build assets locally.
- Hosting target: Strato shared webhosting (PHP + MySQL, no Node at runtime) – CI builds assets in the versioned PipelineManager image on the Pi, independently of the development machine.
- UI and all user-facing texts are German; code, identifiers and PHPDoc are English.
- Money is stored as integer euro cents; edit via `App\Filament\Forms\Components\EuroInput`, display via `->money('EUR', divideBy: 100, locale: 'de')`.
- Season periods are half-open: a night belongs to a season when `starts_on <= night < ends_on`.
@@ -10,14 +10,17 @@ # Ferienwohnung Stommer
- Portals must be integrated through a pluggable channel-connector system (see concept §7), never hard-coded.
- Bookings/blocks use nights: `arrival <= night < departure`; same-day changeover is allowed. Reservations with an elapsed hold never occupy the calendar (scope `Booking::occupying()`), cron only updates status.
- Business operations live in `app/Actions` (CreateReservation, ConfirmBooking, …); Filament pages and Livewire components call them instead of changing bookings directly.
- Booking path 1 (KONZEPT §6a): request (`Reserved`, hold) → `SendOffer` (`OfferSent`, versioned, contract draft, signed link `offers.show`) → guest `AcceptOffer` (acceptance record, then `ConfirmBooking`) or `RejectOffer`; `ExpireReservations` handles both holding statuses (`BookingStatus::holding()`). Manual price changes are `QuoteLineType::Adjustment` lines.
- Minimum stay: season `min_nights`, relaxed in `PriceCalculator::minimumStayRelaxed` (offer `waives_min_stay`, gap filled completely, departure on the property's `changeover_weekday`, never below `min_stay_absolute`).
- Special offers are evaluated automatically by `PriceCalculator`; discounts are `QuoteLineType::Discount` lines with negative amounts. Kinds (`OfferKind`): rule, fixed dates, gap filler (`App\Availability\GapFinder`). Which offers the website advertises is decided by `App\Pricing\OfferShowcase` (not by appearances); it prices fixed dates/gaps with `PriceCalculator`.
- Portal sync lives in `app/Channels` (connector interface + registry in `config/channels.php`, iCal connector/parser/feed). Our system leads; `SyncChannel` imports portal occupations as `BlockedPeriod` rows with `channel_id`; each channel's export feed excludes its own blocks. Observers on Booking/BlockedPeriod create `ChannelTask`s for portals with `requires_manual_blocking`. Portal booking e-mails are a fast path (`app/Channels/Mail`, `ProcessPortalMail`): they create blocks with source `email`, which `SyncChannel` later confirms/replaces and never removes as stale. Portal analysis: `docs/PORTALE.md`.
- 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`.
- Deployment: `.gitea/workflows/deploy.yml` runs the separate PipelineManager image using this project's `pipeline.toml`: push `develop` -> staging; merge commit `develop` -> `main` -> production, currently disabled. Manager source and agent instructions: `C:\dev\pipelinemanager`, https://gitea.stommer.de/Lars/PipelineManager. No permanent API service or new container image per application deployment; the runner starts containers from an existing released image. Secrets stay in Gitea Secrets. Strato retains only the active release; the workflow commit and server `REVISION` identify deployments. Legacy maintenance fallback: `scripts/deploy.sh <env> setup|deploy [ref]|rollback|releases|artisan` (its manual deploy creates Git tags). Read docs/DEPLOYMENT.md before use. 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) – test mode (default) sends every mail to the test recipient only, live delivers normally; `FEWO_MAIL_REDIRECT_TO` is a hard override. Internal addresses are admin settings too: send notifications to `Settings::notificationRecipients()` (never `config('fewo.notification_email')` directly); contact/reply-to (`fewo.owner.email`) and sender (`mail.from`) are overridden at boot by `Settings::applyAddressOverrides()`. 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`.
- Git remote: Gitea `https://gitea.stommer.de/Lars/fewo-stommer.git`; development/integration branch `develop`, production branch `main`.
<laravel-boost-guidelines>
=== foundation rules ===
+4 -1
View File
@@ -1,6 +1,6 @@
# Ferienwohnung Stommer
Website + booking management for a holiday apartment in Kühlungsborn. Concept and roadmap: `docs/KONZEPT.md`.
Website + booking management for a holiday apartment in Kühlungsborn. Concept and roadmap: `docs/KONZEPT.md`. **Current state and next steps: `docs/STATUS.md` – start there and update it after larger changes.** Parallel sessions (e.g. theme design on another machine): follow `docs/ZUSAMMENARBEIT.md` (branches, file ownership, deploy only from an up-to-date `main`).
- Hosting target: Strato shared webhosting (PHP + MySQL, no Node at runtime) – build assets locally.
- UI and all user-facing texts are German; code, identifiers and PHPDoc are English.
@@ -10,11 +10,14 @@ # Ferienwohnung Stommer
- Portals must be integrated through a pluggable channel-connector system (see concept §7), never hard-coded.
- Bookings/blocks use nights: `arrival <= night < departure`; same-day changeover is allowed. Reservations with an elapsed hold never occupy the calendar (scope `Booking::occupying()`), cron only updates status.
- Business operations live in `app/Actions` (CreateReservation, ConfirmBooking, …); Filament pages and Livewire components call them instead of changing bookings directly.
- Booking path 1 (KONZEPT §6a): request (`Reserved`, hold) → `SendOffer` (`OfferSent`, versioned, contract draft, signed link `offers.show`) → guest `AcceptOffer` (acceptance record, then `ConfirmBooking`) or `RejectOffer`; `ExpireReservations` handles both holding statuses (`BookingStatus::holding()`). Manual price changes are `QuoteLineType::Adjustment` lines.
- Minimum stay: season `min_nights`, relaxed in `PriceCalculator::minimumStayRelaxed` (offer `waives_min_stay`, gap filled completely, departure on the property's `changeover_weekday`, never below `min_stay_absolute`).
- Special offers are evaluated automatically by `PriceCalculator`; discounts are `QuoteLineType::Discount` lines with negative amounts. Kinds (`OfferKind`): rule, fixed dates, gap filler (`App\Availability\GapFinder`). Which offers the website advertises is decided by `App\Pricing\OfferShowcase` (not by appearances); it prices fixed dates/gaps with `PriceCalculator`.
- Portal sync lives in `app/Channels` (connector interface + registry in `config/channels.php`, iCal connector/parser/feed). Our system leads; `SyncChannel` imports portal occupations as `BlockedPeriod` rows with `channel_id`; each channel's export feed excludes its own blocks. Observers on Booking/BlockedPeriod create `ChannelTask`s for portals with `requires_manual_blocking`. Portal booking e-mails are a fast path (`app/Channels/Mail`, `ProcessPortalMail`): they create blocks with source `email`, which `SyncChannel` later confirms/replaces and never removes as stale. Portal analysis: `docs/PORTALE.md`.
- 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). 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`.
+27 -48
View File
@@ -1,58 +1,37 @@
<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
# Ferienwohnung Stommer – Webseite und Vermietungsverwaltung
<p align="center">
<a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
</p>
Webseite mit Buchungsanfrage und eine Verwaltung (Admin) für die Ferienwohnung Stommer, Strandstraße 15, 18225 Kühlungsborn. Ersetzt die bisherige WordPress-Seite www.fewo-stommer.de. Laravel 13, Filament 5, Livewire 4, Tailwind 4; Hosting bei Strato (Shared Webhosting, Hosting Pro).
## About Laravel
**Testbetrieb:** https://stommer.info · Verwaltung: https://stommer.info/admin (Konto + Zwei-Faktor-Anmeldung, siehe docs/BETRIEB.md §7)
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
## Wo steht was?
- [Simple, fast routing engine](https://laravel.com/docs/routing).
- [Powerful dependency injection container](https://laravel.com/docs/container).
- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
- [Robust background job processing](https://laravel.com/docs/queues).
- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
| Dokument | Inhalt |
|---|---|
| [docs/STATUS.md](docs/STATUS.md) | **Aktueller Stand**: was fertig ist, was offen ist, nächste Schritte – hier anfangen |
| [docs/ZUSAMMENARBEIT.md](docs/ZUSAMMENARBEIT.md) | Regeln für parallele Arbeit (z. B. Theme-Entwicklung auf einem anderen Rechner) – Branches, Dateibereiche, Ausliefern |
| [docs/KONZEPT.md](docs/KONZEPT.md) | Fachliches Konzept und alle Entscheidungen (Buchungswege §6a, Festlegungen §6b) |
| [docs/BETRIEB.md](docs/BETRIEB.md) | Server, Zugänge, Konfiguration, Konten/2FA, Backups, Löschfristen, bekannte Eigenheiten |
| [docs/DEPLOYMENT.md](docs/DEPLOYMENT.md) | Auslieferung auf Strato (Skript, Versionen, Gitea Actions) |
| [docs/THEMES.md](docs/THEMES.md) | Theme-System: Architektur, Bausteine und ihre Daten (Vorlagen-Vertrag) |
| [docs/THEME-ERSTELLUNG.md](docs/THEME-ERSTELLUNG.md) | **Verbindliche Anleitung für ein neues Theme** (Design-Sitzung) |
| [docs/PORTALE.md](docs/PORTALE.md) | Buchungsportale, Kalenderabgleich, Portal-E-Mails |
| [styles/README.md](styles/README.md) | Markenelemente (Logo, Favicon, Symbole, Wellenband) |
| docs/DATENSCHUTZ-*, GAP-DELTA, GO-LIVE-CHECKLISTE, LOESCHKONZEPT, BUCHUNGSPROZESS, DATENMODELL-KONZEPT | Analyse eines Datenschutz-Agenten (Annahmen markiert; maßgeblich ist KONZEPT.md) |
| [CLAUDE.md](CLAUDE.md) / [AGENTS.md](AGENTS.md) | Technische Leitplanken für KI-Assistenten (identisch) |
Laravel is accessible, powerful, and provides tools required for large, robust applications.
## Learning Laravel
Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
In addition, [Laracasts](https://laracasts.com) contains thousands of video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
You can also watch bite-sized lessons with real-world projects on [Laravel Learn](https://laravel.com/learn), where you will be guided through building a Laravel application from scratch while learning PHP fundamentals.
## Agentic Development
Laravel's predictable structure and conventions make it ideal for AI coding agents like Claude Code, Cursor, and GitHub Copilot. Install [Laravel Boost](https://laravel.com/docs/ai) to supercharge your AI workflow:
## Lokal starten
```bash
composer require laravel/boost --dev
php artisan boost:install
composer install && npm ci
cp .env.example .env && php artisan key:generate
touch database/database.sqlite # PowerShell: New-Item database/database.sqlite
php artisan migrate:fresh --seed # Testdaten: Wohnung, Preise 2026, Seiten, Erscheinungsbilder
npm run build # oder npm run dev
php artisan serve # http://localhost:8000 · /admin: admin@example.com / password (2FA beim ersten Login)
php artisan test --compact # alle Tests müssen grün sein
```
Boost provides your agent 15+ tools and skills that help agents build Laravel applications while following best practices.
## Ausliefern
## Contributing
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
## Code of Conduct
In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
## Security Vulnerabilities
If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
## License
The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
`bash scripts/deploy.sh staging deploy` – baut den **letzten Commit** und spielt ihn auf stommer.info (Details und Regeln: docs/DEPLOYMENT.md, docs/ZUSAMMENARBEIT.md).
+2 -1
View File
@@ -7,6 +7,7 @@
use App\Mail\OfferAnswered;
use App\Models\Booking;
use App\Support\Content;
use App\Support\Settings;
use Illuminate\Support\Facades\Mail;
use Throwable;
@@ -41,7 +42,7 @@ public function handle(Booking $booking, int $offerVersion): void
$this->confirm->handle($booking);
try {
Mail::to(config('fewo.notification_email'))->send(new OfferAnswered($booking, accepted: true));
Mail::to(Settings::notificationRecipients())->send(new OfferAnswered($booking, accepted: true));
} catch (Throwable $exception) {
report($exception);
}
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Actions;
use App\Channels\ChannelSyncException;
use App\Channels\ICal\ICalAnalysis;
use App\Channels\ICal\ICalConnector;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
class AnalyzeChannelCalendar
{
public function handle(Channel $channel): Channel
{
if ($channel->connector !== 'ical' || blank($channel->setting('import_url')) || ! $channel->servesItsLandlord()) {
throw new ChannelSyncException('Für die Analyse eine iCal-Importadresse hinterlegen und den Kalenderdienst freischalten.');
}
$url = $channel->setting('import_url');
$analysis = app(ICalAnalysis::class)->summarize(app(ICalConnector::class)->fetchDocument($channel));
return DB::transaction(function () use ($channel, $url, $analysis): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
if ($locked->setting('import_url') !== $url) {
throw new ChannelSyncException('Die Importadresse wurde während der Analyse geändert. Bitte erneut analysieren.');
}
$locked->forceFill(['ical_analysis' => $analysis, 'ical_analyzed_at' => now()])->save();
return $locked;
});
}
}
+2
View File
@@ -22,12 +22,14 @@ public function handle(): int
->whereNull('anonymized_at')
->whereDate('created_at', '<', $cutoff)
->whereDoesntHave('bookings', fn ($query) => $query->whereDate('departure', '>=', $cutoff))
->whereDoesntHave('portalStays', fn ($query) => $query->withTrashed()->whereDate('ends_on', '>=', $cutoff))
->get();
$inquiryCutoff = now()->subMonths(config('fewo.retention.inquiry_months'));
$inquiriesOnly = Guest::query()
->whereNull('anonymized_at')
->whereDoesntHave('bookings', fn ($query) => $query->whereNotNull('confirmed_at'))
->whereDoesntHave('portalStays', fn ($query) => $query->withTrashed())
->whereDoesntHave('bookings', fn ($query) => $query->where('updated_at', '>=', $inquiryCutoff))
->where('updated_at', '<', $inquiryCutoff)
->get();
+92
View File
@@ -0,0 +1,92 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalRuleEngine;
use App\Models\BlockedPeriod;
use App\Models\Channel;
use App\Models\Property;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
class ApplyChannelRules
{
public function attributes(Channel $channel, ?BlockedPeriod $block, array $properties): array
{
$result = app(ICalRuleEngine::class)->evaluate($channel, $properties);
$attributes = ['ical_interpretation' => $result, 'ical_event_type' => $result['event_type'],
'leading_priority' => $result['representation'] === 'leading_candidate' ? max(1, 10001 - $result['priority']) : 0];
$previousOrigin = $block?->ical_interpretation['origin_channel_id'] ?? null;
if ($block === null || ($block->occupation_kind === null && $block->reviewed_at === null && ($block->origin_channel_id === null || $block->origin_channel_id === $previousOrigin))) {
$attributes['origin_channel_id'] = $result['origin_channel_id'];
}
return $attributes;
}
public function store(BlockedPeriod $block, array $attributes): void
{
foreach ($attributes as $field => $value) {
if ($block->getAttribute($field) !== $value) {
$block->forceFill([$field => $value]);
}
}
if ($block->isDirty()) {
$block->saveQuietly();
}
}
/** @return array{classified: int, missing_raw: int} */
public function handle(Channel $channel): array
{
return DB::transaction(function () use ($channel): array {
$channel = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
app(ICalRuleEngine::class)->validate($channel, $channel->ical_rules ?? []);
$channel->forceFill(['ical_active_rules' => $channel->ical_rules ?? []])->save();
Property::query()->whereKey($channel->property_id)->lockForUpdate()->firstOrFail();
$events = collect($channel->ical_analysis['events'] ?? [])->keyBy('uid');
$counts = ['classified' => 0, 'missing_raw' => 0];
foreach ($channel->blockedPeriods()->where('source', 'channel')->lockForUpdate()->get() as $block) {
$event = $events->get($block->external_uid);
if ($event && $block->ical_raw !== null && $channel->ical_analyzed_at !== null
&& $block->updated_at->greaterThan($channel->ical_analyzed_at) && $block->ical_raw !== $event['raw']) {
if (! $this->hasEquivalentTimestampUpdate($channel, $block, $event)) {
throw ValidationException::withMessages(['rules' => 'Der Importbestand hat sich seit der Vorschau geändert. Den Kalender erneut analysieren und die Vorschau prüfen.']);
}
$event = [...$event, 'properties' => $block->ical_properties, 'raw' => $block->ical_raw];
}
$properties = $event['properties'] ?? $block->ical_properties;
if ($properties === null) {
$counts['missing_raw']++;
continue;
}
$attributes = $this->attributes($channel, $block, $properties);
if ($event && $event['starts_on'] !== null && ($block->starts_on->toDateString() !== $event['starts_on'] || $block->ends_on->toDateString() !== $event['ends_on'])) {
$attributes = [...$attributes, 'needs_review' => true, 'review_note' => 'Die Analyse meldet einen anderen Zeitraum. Die Klassifikation ändert keine Termine; Kalenderabgleich und Zuordnung prüfen.'];
}
$this->store($block, [...$attributes, 'ical_properties' => $properties, 'ical_raw' => $event['raw'] ?? $block->ical_raw]);
$counts['classified']++;
}
app(ReconcileChannelRepresentations::class)->handle($channel->property);
return $counts;
});
}
private function hasEquivalentTimestampUpdate(Channel $channel, BlockedPeriod $block, array $event): bool
{
if ($block->ical_properties === null) {
return false;
}
$withoutTimestamps = fn (string $raw): string => preg_replace('/^(?:DTSTAMP|LAST-MODIFIED)(?:;[^:\r\n]*)?:[^\r\n]*(?:\r\n|\n|$)/mi', '', $raw);
if ($withoutTimestamps($block->ical_raw) !== $withoutTimestamps($event['raw'])) {
return false;
}
$engine = app(ICalRuleEngine::class);
return $engine->evaluate($channel, $block->ical_properties) === $engine->evaluate($channel, $event['properties']);
}
}
+52
View File
@@ -0,0 +1,52 @@
<?php
namespace App\Actions;
use App\Enums\OccupationKind;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Guest;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
class AssignOccupationGuest
{
/** @param array{first_name?: string, last_name?: ?string, email?: ?string, phone?: ?string, street?: ?string, postal_code?: ?string, city?: ?string, country?: ?string, notes?: ?string, tags?: ?array} $details */
public function handle(Booking|BlockedPeriod $occupation, ?int $guestId, array $details = []): Guest
{
Gate::authorize('update', $occupation);
return DB::transaction(function () use ($occupation, $guestId, $details): Guest {
$record = $occupation->newQuery()->whereKey($occupation->id)->lockForUpdate()->firstOrFail();
if ($record instanceof BlockedPeriod && ($record->occupationKind() !== OccupationKind::Reservation || $record->is_representation)) {
throw ValidationException::withMessages(['guest_id' => 'Zuerst als eigenständige Portalreservierung einordnen. Darstellungen werden an der führenden Buchung gepflegt.']);
}
if ($guestId !== null) {
$guest = Guest::query()->where('tenant_id', $record->tenant_id)->whereNull('anonymized_at')->findOrFail($guestId);
Gate::authorize('view', $guest);
} else {
Gate::authorize('create', Guest::class);
$data = Validator::make($details, [
'first_name' => ['required', 'string', 'max:255'],
'last_name' => ['nullable', 'string', 'max:255'],
'email' => ['nullable', 'email', 'max:255'],
'phone' => ['nullable', 'string', 'max:50'],
'street' => ['nullable', 'string', 'max:255'],
'postal_code' => ['nullable', 'string', 'max:20'],
'city' => ['nullable', 'string', 'max:255'],
'country' => ['nullable', 'string', 'size:2', 'regex:/^[A-Z]{2}$/'],
'notes' => ['nullable', 'string'],
'tags' => ['nullable', 'array'],
'tags.*' => ['string', 'max:255'],
])->validate();
$guest = new Guest([...$data, 'last_name' => $data['last_name'] ?? '', 'email' => filled($data['email'] ?? null) ? mb_strtolower(trim($data['email'])) : null, 'country' => $data['country'] ?? 'DE']);
$guest->forceFill(['tenant_id' => $record->tenant_id])->save();
}
$record->forceFill(['guest_id' => $guest->id])->save();
return $guest;
});
}
}
+52
View File
@@ -0,0 +1,52 @@
<?php
namespace App\Actions;
use App\Enums\BlockedPeriodPurpose;
use App\Enums\OccupationKind;
use App\Models\BlockedPeriod;
use App\Models\Channel;
use App\Models\Property;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
class ClassifyPortalOccupation
{
/** @param array{block_purpose?: BlockedPeriodPurpose|string|null, block_note?: string|null, is_private?: bool} $details */
public function handle(BlockedPeriod $occupation, OccupationKind $kind, ?int $originId = null, array $details = []): void
{
Gate::authorize('update', $occupation);
if (($details['block_purpose'] ?? null) instanceof BlockedPeriodPurpose) {
$details['block_purpose'] = $details['block_purpose']->value;
}
$details = Validator::make($details, [
'block_purpose' => ['nullable', Rule::enum(BlockedPeriodPurpose::class)],
'block_note' => ['nullable', 'string', 'max:255'],
'is_private' => ['sometimes', 'boolean'],
])->validate();
if (($details['is_private'] ?? false) && $originId !== null) {
throw ValidationException::withMessages(['origin_channel_id' => 'Privat und ein externer Buchungskanal können nicht gleichzeitig gewählt werden.']);
}
DB::transaction(function () use ($occupation, $kind, $originId, $details): void {
Property::query()->whereKey($occupation->property_id)->lockForUpdate()->firstOrFail();
$record = BlockedPeriod::query()->whereKey($occupation->id)->lockForUpdate()->firstOrFail();
if (! in_array($record->source, ['channel', 'email'], true) || $record->is_representation) {
throw ValidationException::withMessages(['occupation_kind' => 'Nur eigenständige Portalereignisse können hier eingeordnet werden.']);
}
if ($originId !== null && ! Channel::query()->where('property_id', $record->property_id)->whereKey($originId)->exists()) {
throw ValidationException::withMessages(['origin_channel_id' => 'Der Ursprungskanal muss zur selben Wohnung gehören.']);
}
$record->forceFill([
'occupation_kind' => $kind,
'origin_channel_id' => $originId,
'is_private' => $details['is_private'] ?? false,
'block_purpose' => $kind === OccupationKind::Block ? (array_key_exists('block_purpose', $details) ? $details['block_purpose'] : $record->block_purpose) : null,
'block_note' => $kind === OccupationKind::Block ? (array_key_exists('block_note', $details) ? $details['block_note'] : $record->block_note) : null,
])->save();
app(ReconcileChannelRepresentations::class)->handle($record->property);
});
}
}
+49
View File
@@ -0,0 +1,49 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalFeed;
use App\Channels\ICal\ICalParser;
use App\Enums\ChannelStatus;
use App\Models\Channel;
use App\Models\Property;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
class ConfigureChannel
{
/** @param array<string, mixed> $data */
public function handle(Property $property, array $data, ?Channel $channel = null): Channel
{
return DB::transaction(function () use ($property, $data, $channel): Channel {
$stored = $channel ? $property->channels()->whereKey($channel->id)->lockForUpdate()->firstOrFail() : null;
$candidate = $stored ? clone $stored : new Channel;
$candidate->fill($data);
$candidate->property_id = $property->id;
$candidate->tenant_id = $property->tenant_id;
if ($stored && $stored->setting('import_url') !== $candidate->setting('import_url')) {
$candidate->forceFill(['ical_analysis' => null, 'ical_analyzed_at' => null]);
}
if ($stored) {
$candidate->is_active = $candidate->status === ChannelStatus::Active;
}
if ($candidate->import_enabled && blank($candidate->setting('import_url'))) {
throw ValidationException::withMessages(['settings.import_url' => 'Für einen aktivierten Import ist eine Kalenderadresse erforderlich.']);
}
if ($stored && $stored->setting('import_url') !== $candidate->setting('import_url') && $stored->blockedPeriods()->withTrashed()->exists()) {
throw ValidationException::withMessages(['settings.import_url' => 'Bei bestehendem Importbestand die Quelladresse nicht ungeprüft ersetzen. Einen neuen Kanal anlegen oder die Bestandsumstellung gesondert freigeben.']);
}
if ($stored && $stored->exportsOccupations() && ! $candidate->exportsOccupations() && $stored->export_snapshot === null) {
$body = app(ICalFeed::class)->build($stored);
app(ICalParser::class)->parse($body);
$candidate->forceFill(['export_snapshot' => $body, 'export_snapshot_at' => now()]);
}
if ($stored && $stored->importsOccupations() !== $candidate->importsOccupations()) {
$stored->blockedPeriods()->where('source', 'channel')->update(['missing_imports' => 0]);
}
$candidate->save();
return $candidate->refresh();
});
}
}
+30
View File
@@ -0,0 +1,30 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalExportFields;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
class ConfigureChannelExport
{
public function handle(Channel $channel, array $mapping, bool $allowNames): Channel
{
Validator::make(['export_mapping' => $mapping], [
'export_mapping' => ['array', 'max:3'],
'export_mapping.*.field' => ['required', 'distinct', Rule::in(array_keys(ICalExportFields::ICAL_FIELDS))],
'export_mapping.*.items' => ['required', 'array', 'min:1'],
'export_mapping.*.items.*' => ['required', Rule::in(array_keys(ICalExportFields::FIELDS))],
'export_mapping.*.separator' => ['nullable', 'string', 'max:30'],
])->validate();
return DB::transaction(function () use ($channel, $mapping, $allowNames): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
$locked->forceFill(['ical_export_mapping' => array_values($mapping), 'ical_export_names' => $allowNames])->save();
return $locked;
});
}
}
+4
View File
@@ -28,6 +28,10 @@ public function __construct(
*/
public function handle(Booking $booking, bool $notifyGuest = true): void
{
if ($notifyGuest && blank($booking->guest?->email)) {
throw new ReservationException('Vor dem E-Mail-Versand bitte die E-Mail-Adresse des zugeordneten Gastes ergänzen.');
}
if (! in_array($booking->status, [BookingStatus::Reserved, BookingStatus::OfferSent, BookingStatus::Expired], true)) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'bestätigt');
}
+35 -6
View File
@@ -3,26 +3,40 @@
namespace App\Actions;
use App\Models\Property;
use Carbon\CarbonImmutable;
/**
* Copies all seasons starting in a given year to the following year with the same calendar dates,
* so a new price year only needs adjusting instead of re-entering.
* Copies all seasons starting in a given year to the following year, so a new price year only needs adjusting
* instead of re-entering. Optionally every season start is moved to the nearest given weekday (e.g. Saturday
* as changeover day); seasons that were adjacent stay adjacent.
*/
class CopySeasonsToNextYear
{
/**
* @param int|null $alignToWeekday ISO weekday (1 = Monday … 7 = Sunday) or null for the same calendar dates
* @return array{created: int, skipped: int}
*/
public function handle(Property $property, int $year): array
public function handle(Property $property, int $year, ?int $alignToWeekday = null): array
{
$created = 0;
$skipped = 0;
$seasons = $property->seasons()->whereYear('starts_on', $year)->get();
$seasons = $property->seasons()->whereYear('starts_on', $year)->orderBy('starts_on')->get();
// New start per old start date; an end that equals another season's start follows that start.
$moved = [];
foreach ($seasons as $season) {
$moved[$season->starts_on->toDateString()] = $this->shift($season->starts_on, $alignToWeekday);
}
foreach ($seasons as $season) {
$startsOn = $season->starts_on->addYearNoOverflow();
$endsOn = $season->ends_on->addYearNoOverflow();
$startsOn = $moved[$season->starts_on->toDateString()];
$endsOn = $moved[$season->ends_on->toDateString()] ?? $this->shift($season->ends_on, $alignToWeekday);
if ($endsOn->lessThanOrEqualTo($startsOn)) {
$skipped++;
continue;
}
if ($property->seasons()->overlapping($startsOn, $endsOn)->exists()) {
$skipped++;
@@ -40,4 +54,19 @@ public function handle(Property $property, int $year): array
return ['created' => $created, 'skipped' => $skipped];
}
/**
* One year later; with a weekday, moved to the nearest such day (at most 3 days earlier or later).
*/
private function shift(CarbonImmutable $date, ?int $weekday): CarbonImmutable
{
$next = $date->addYearNoOverflow();
if ($weekday === null) {
return $next;
}
$difference = ($weekday - $next->isoWeekday() + 7) % 7;
return $difference <= 3 ? $next->addDays($difference) : $next->subDays(7 - $difference);
}
}
+72 -9
View File
@@ -2,11 +2,16 @@
namespace App\Actions;
use App\Availability\AvailabilityChecker;
use App\Enums\ChannelExportMode;
use App\Enums\ChannelTaskAction;
use App\Enums\ChannelTaskStatus;
use App\Mail\ChannelTasksNotification;
use App\Models\Channel;
use App\Models\ChannelTask;
use App\Models\Property;
use App\Support\Settings;
use Carbon\CarbonImmutable;
use Carbon\CarbonInterface;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Mail;
@@ -23,7 +28,7 @@ class CreateChannelTasks
/**
* @return list<ChannelTask>
*/
public function handle(Property $property, CarbonInterface $startsOn, CarbonInterface $endsOn, ChannelTaskAction $action, string $reason, ?int $exceptChannelId = null): array
public function handle(Property $property, CarbonInterface $startsOn, CarbonInterface $endsOn, ChannelTaskAction $action, string $reason, ?int $exceptChannelId = null, ?int $originChannelId = null, bool $external = false): array
{
if ($endsOn->lessThanOrEqualTo(today())) {
return [];
@@ -32,20 +37,31 @@ public function handle(Property $property, CarbonInterface $startsOn, CarbonInte
$channels = $property->channels()->active()
->where('requires_manual_blocking', true)
->when($exceptChannelId, fn ($query) => $query->whereKeyNot($exceptChannelId))
->get();
->when($originChannelId, fn ($query) => $query->whereKeyNot($originChannelId))
->get()->filter(fn (Channel $channel): bool => $channel->exportsOccupations()
&& (! ($external || $exceptChannelId !== null || $originChannelId !== null) || $channel->export_mode === ChannelExportMode::Regular));
$tasks = $channels->map(fn (Channel $channel): ChannelTask => $channel->tasks()->create([
'action' => $action,
'starts_on' => $startsOn->toDateString(),
'ends_on' => $endsOn->toDateString(),
'reason' => $reason,
]))->all();
$tasks = [];
foreach ($channels as $channel) {
$segments = $action === ChannelTaskAction::Unblock ? $this->freeSegments($property, $startsOn, $endsOn) : [[$startsOn, $endsOn]];
foreach ($segments as [$start, $end]) {
$task = $channel->tasks()->where('action', $action)->where('status', ChannelTaskStatus::Open)
->whereDate('starts_on', $start)->whereDate('ends_on', $end)->first()
?? $channel->tasks()->create([
'action' => $action, 'starts_on' => $start->toDateString(), 'ends_on' => $end->toDateString(),
'status' => ChannelTaskStatus::Open, 'reason' => $reason,
]);
if ($task->wasRecentlyCreated) {
$tasks[] = $task;
}
}
}
if ($tasks === []) {
return [];
}
rescue(fn () => Mail::to(config('fewo.notification_email'))->send(new ChannelTasksNotification($tasks)));
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new ChannelTasksNotification($tasks)));
foreach ($tasks as $task) {
$this->sendToAutomation($task);
@@ -60,6 +76,30 @@ public function handle(Property $property, CarbonInterface $startsOn, CarbonInte
*/
public function sendToAutomation(ChannelTask $task): void
{
$task->refresh();
if ($task->status !== ChannelTaskStatus::Open) {
return;
}
if (! $task->channel->exportsOccupations()) {
$task->update(['automation_error' => 'Kanalexport ist pausiert; keine automatische Portaländerung.']);
return;
}
if ($task->action === ChannelTaskAction::Unblock && ! app(AvailabilityChecker::class)->isAvailable($task->channel->property, $task->starts_on, $task->ends_on)) {
$task->update(['status' => ChannelTaskStatus::Dismissed, 'automation_error' => 'Zeitraum ist inzwischen wieder belegt; nicht entsperren.']);
return;
}
if ($task->action === ChannelTaskAction::Block) {
$occupied = app(AvailabilityChecker::class)->occupiedNights($task->channel->property, $task->starts_on, $task->ends_on);
for ($night = $task->starts_on; $night->lessThan($task->ends_on); $night = $night->addDay()) {
if (! isset($occupied[$night->toDateString()])) {
$task->update(['status' => ChannelTaskStatus::Dismissed, 'automation_error' => 'Sperraufgabe ist durch eine Belegungsänderung überholt; aktuellen Zeitraum prüfen.']);
return;
}
}
}
$url = config('fewo.automation.webhook_url');
$secret = config('fewo.automation.secret');
if (blank($url) || blank($secret)) {
@@ -89,4 +129,27 @@ public function sendToAutomation(ChannelTask $task): void
$task->update(['automation_error' => $exception->getMessage()]);
}
}
/** @return list<array{CarbonImmutable, CarbonImmutable}> */
private function freeSegments(Property $property, CarbonInterface $startsOn, CarbonInterface $endsOn): array
{
$start = CarbonImmutable::instance($startsOn);
$end = CarbonImmutable::instance($endsOn);
$occupied = app(AvailabilityChecker::class)->occupiedNights($property, $start, $end);
$segments = [];
$segmentStart = null;
for ($night = $start; $night->lessThan($end); $night = $night->addDay()) {
if (! isset($occupied[$night->toDateString()])) {
$segmentStart ??= $night;
} elseif ($segmentStart !== null) {
$segments[] = [$segmentStart, $night];
$segmentStart = null;
}
}
if ($segmentStart !== null) {
$segments[] = [$segmentStart, $end];
}
return $segments;
}
}
+27 -2
View File
@@ -13,6 +13,9 @@
use App\Pricing\PriceCalculator;
use App\Pricing\QuoteException;
use App\Pricing\StayRequest;
use App\Support\Settings;
use App\Tenancy\TenantContext;
use App\Tenancy\TenantContextMissing;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
@@ -37,6 +40,24 @@ public function __construct(
* @throws ReservationException
*/
public function handle(Property $property, StayRequest $stay, array $guestData, ?string $message = null, string $source = 'website', bool $sendMails = true, array $attribution = []): Booking
{
$tenant = $property->tenant;
if ($tenant === null) {
throw new TenantContextMissing(Property::class);
}
return app(TenantContext::class)->run(
$tenant,
fn (): Booking => $this->create($property, $stay, $guestData, $message, $source, $sendMails, $attribution),
);
}
/**
* @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
{
$booking = DB::transaction(function () use ($property, $stay, $guestData, $message, $source, $attribution): Booking {
Property::whereKey($property->getKey())->lockForUpdate()->first();
@@ -90,7 +111,11 @@ private function guestFor(array $guestData): array
$guest = Guest::query()->where('email', $email)->first();
if ($guest === null) {
return [Guest::create([...$guestData, 'email' => $email]), []];
return [Guest::create([
...$guestData,
'email' => $email,
'tenant_id' => app(TenantContext::class)->id(),
]), []];
}
$labels = ['first_name' => 'Vorname', 'last_name' => 'Nachname', 'phone' => 'Telefon', 'street' => 'Straße', 'postal_code' => 'PLZ', 'city' => 'Ort', 'country' => 'Land'];
@@ -119,7 +144,7 @@ private function sendMails(Booking $booking): void
{
try {
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ReservationReceived($booking));
Mail::to(config('fewo.notification_email'))->send(new NewReservation($booking));
Mail::to(Settings::notificationRecipients())->send(new NewReservation($booking));
} catch (Throwable $exception) {
report($exception);
}
+4
View File
@@ -15,6 +15,10 @@ class DeclineBooking
*/
public function handle(Booking $booking, bool $notifyGuest = true): void
{
if ($notifyGuest && blank($booking->guest?->email)) {
throw new ReservationException('Vor dem E-Mail-Versand bitte die E-Mail-Adresse des zugeordneten Gastes ergänzen.');
}
if (! in_array($booking->status, [BookingStatus::Reserved, BookingStatus::OfferSent, BookingStatus::Expired], true)) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'abgelehnt');
}
+2 -1
View File
@@ -5,6 +5,7 @@
use App\Enums\BookingStatus;
use App\Mail\ReservationExpired;
use App\Models\Booking;
use App\Support\Settings;
use Illuminate\Support\Facades\Mail;
/**
@@ -24,7 +25,7 @@ public function handle(): int
foreach ($expired as $booking) {
$booking->update(['status' => BookingStatus::Expired]);
Mail::to(config('fewo.notification_email'))->send(new ReservationExpired($booking));
Mail::to(Settings::notificationRecipients())->send(new ReservationExpired($booking));
}
return $expired->count();
+4 -3
View File
@@ -6,6 +6,7 @@
use App\Mail\ChannelSyncAlert;
use App\Mail\MailboxAlert;
use App\Models\Channel;
use App\Support\Settings;
use Carbon\CarbonImmutable;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Mail;
@@ -24,7 +25,7 @@ public function handle(): int
->filter(fn (Channel $channel): bool => $channel->isStale());
foreach ($channels as $channel) {
Mail::to(config('fewo.notification_email'))->send(new ChannelSyncAlert($channel));
Mail::to(Settings::notificationRecipients())->send(new ChannelSyncAlert($channel));
$channel->forceFill(['alerted_at' => now()])->save();
}
@@ -37,7 +38,7 @@ public static function mailboxIsStale(): bool
return false;
}
$lastSuccess = Cache::get(MailboxReader::LAST_SUCCESS_KEY);
$lastSuccess = Cache::get(MailboxReader::key(MailboxReader::LAST_SUCCESS_KEY));
return $lastSuccess === null
|| CarbonImmutable::parse($lastSuccess)->lessThan(now()->subMinutes(config('fewo.mailbox.stale_after_minutes')));
@@ -55,7 +56,7 @@ private function monitorMailbox(): int
return 0;
}
Mail::to(config('fewo.notification_email'))->send(new MailboxAlert(Cache::get(MailboxReader::LAST_ERROR_KEY)));
Mail::to(Settings::notificationRecipients())->send(new MailboxAlert(Cache::get(MailboxReader::key(MailboxReader::LAST_ERROR_KEY))));
Cache::forever(self::MAILBOX_ALERTED_KEY, true);
return 1;
+32 -9
View File
@@ -8,11 +8,14 @@
use App\Channels\Mail\PortalMailParser;
use App\Enums\PortalEmailStatus;
use App\Enums\PortalEmailType;
use App\Enums\TenantServiceKey;
use App\Mail\ChannelConflict;
use App\Mail\PortalMailNotification;
use App\Models\BlockedPeriod;
use App\Models\Channel;
use App\Models\PortalEmail;
use App\Support\Settings;
use App\Tenancy\TenantFeatures;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
@@ -39,6 +42,11 @@ public function handle(PortalMail $mail): ?PortalEmail
return null;
}
// The fast path is a service of its own: a landlord without it keeps the mail unprocessed.
if (! app(TenantFeatures::class)->enabled(TenantServiceKey::PortalMail, $channel->tenant)) {
return null;
}
$parsed = $this->parser->parse($mail->subject, $mail->text);
$conflicts = [];
@@ -68,11 +76,11 @@ public function handle(PortalMail $mail): ?PortalEmail
});
if (in_array($record->status, [PortalEmailStatus::Blocked, PortalEmailStatus::Released, PortalEmailStatus::NeedsReview], true)) {
rescue(fn () => Mail::to(config('fewo.notification_email'))->send(new PortalMailNotification($record)));
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new PortalMailNotification($record)));
}
if ($conflicts !== []) {
rescue(fn () => Mail::to(config('fewo.notification_email'))->send(new ChannelConflict($channel, $conflicts)));
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new ChannelConflict($channel, $conflicts)));
}
return $record;
@@ -85,7 +93,7 @@ public function channelFor(string $from): ?Channel
{
$from = mb_strtolower($from);
return Channel::query()->active()->get()->first(function (Channel $channel) use ($from): bool {
$matches = Channel::query()->active()->get()->filter(function (Channel $channel) use ($from): bool {
foreach ($this->senders($channel) as $sender) {
if (str_contains($from, $sender)) {
return true;
@@ -94,6 +102,16 @@ public function channelFor(string $from): ?Channel
return false;
});
if ($matches->count() > 1) {
foreach ($matches as $channel) {
$channel->forceFill(['sync_warnings' => array_values(array_unique([
...($channel->sync_warnings ?? []), 'Portal-Mail-Absender passt zu mehreren Kanälen. Keine automatische Wohnungszuordnung vorgenommen.',
]))])->saveQuietly();
}
}
return $matches->count() === 1 ? $matches->first() : null;
}
/**
@@ -117,11 +135,13 @@ private function block(Channel $channel, ParsedPortalMail $parsed, array &$confl
return [PortalEmailStatus::NeedsReview, null, 'Buchung erkannt, aber An-/Abreise nicht sicher lesbar.'];
}
$known = $channel->blockedPeriods()
->whereDate('starts_on', $parsed->startsOn)
->whereDate('ends_on', $parsed->endsOn)
->first();
$known = $parsed->reference === null ? null : $channel->blockedPeriods()
->whereIn('external_uid', ['email:'.$parsed->reference, $parsed->reference])->first();
if ($known) {
if ($known->source === 'email') {
$known->update(['starts_on' => $parsed->startsOn->toDateString(), 'ends_on' => $parsed->endsOn->toDateString()]);
}
return [PortalEmailStatus::AlreadyKnown, $known, null];
}
@@ -131,9 +151,13 @@ private function block(Channel $channel, ParsedPortalMail $parsed, array &$confl
'ends_on' => $parsed->endsOn->toDateString(),
'reason' => "{$channel->name} (E-Mail)".($parsed->reference ? ": {$parsed->reference}" : ''),
'source' => 'email',
'external_uid' => 'email:'.($parsed->reference ?? $parsed->startsOn->format('Ymd').'-'.$parsed->endsOn->format('Ymd')),
'external_uid' => 'email:'.($parsed->reference ?? bin2hex(random_bytes(16))),
]);
if ($channel->blockedPeriods()->whereKeyNot($block->id)->overlapping($block->starts_on, $block->ends_on)->exists()) {
$block->forceFill(['needs_review' => true, 'review_note' => 'Überlappende Portalrepräsentationen ohne gemeinsame Kennung persönlich prüfen.'])->saveQuietly();
}
$conflicts = $this->conflictDetector->conflictsFor($block);
return [PortalEmailStatus::Blocked, $block, null];
@@ -150,7 +174,6 @@ private function release(Channel $channel, ParsedPortalMail $parsed): array
$block = match (true) {
$parsed->reference !== null => (clone $emailBlocks)->where('external_uid', 'email:'.$parsed->reference)->first(),
$parsed->hasPeriod() => (clone $emailBlocks)->whereDate('starts_on', $parsed->startsOn)->whereDate('ends_on', $parsed->endsOn)->first(),
default => null,
};
@@ -0,0 +1,113 @@
<?php
namespace App\Actions;
use App\Enums\ChannelEchoBehavior;
use App\Enums\OccupationKind;
use App\Models\BlockedPeriod;
use App\Models\Property;
use Illuminate\Support\Facades\DB;
class ReconcileChannelRepresentations
{
public const OVERLAP_NOTE = 'Mehrere Belegungsrepräsentationen oder Überschneidungen prüfen; keine automatische Zusammenführung anhand von Terminen.';
private const LINK_NOTE = 'Automatisch als Kalenderspiegelung einer eindeutig passenden führenden Portalreservierung zugeordnet.';
private const RECHECK_NOTE = 'Automatische Kalenderspiegelung nicht mehr eindeutig. Quellen, Termine und mögliche Stornierung prüfen; der weiterhin gemeldete Zeitraum bleibt belegt.';
/** @return array{linked: int, unlinked: int} */
public function handle(Property $property): array
{
return DB::transaction(function () use ($property): array {
$property = Property::query()->whereKey($property->id)->lockForUpdate()->firstOrFail();
$blocks = $property->blockedPeriods()->with('channel')->withCount('channelRepresentations')->orderBy('id')->lockForUpdate()->get()->keyBy('id');
$independent = $blocks->filter(fn (BlockedPeriod $block): bool => ! $block->is_representation || $block->representation_automatic);
$mirrors = $independent->filter(fn (BlockedPeriod $block): bool => $this->isMirror($block));
$leaders = $independent->filter(fn (BlockedPeriod $block): bool => $this->isLeader($block));
$bookings = $property->bookings()->occupying()->get(['id', 'arrival', 'departure']);
$targets = [];
foreach ($mirrors as $mirror) {
$matches = $leaders->filter(fn (BlockedPeriod $leader): bool => $leader->channel_id !== $mirror->channel_id && $this->sameDates($leader, $mirror));
if ($matches->count() !== 1) {
continue;
}
$leader = $matches->sole();
$contradiction = $independent->contains(fn (BlockedPeriod $other): bool => $other->id !== $mirror->id && $other->id !== $leader->id
&& $other->starts_on->lessThan($leader->ends_on) && $other->ends_on->greaterThan($leader->starts_on)
&& ! ($mirrors->has($other->id) && $this->sameDates($other, $leader)));
if ($contradiction || $bookings->contains(fn ($booking): bool => $booking->arrival->lessThan($leader->ends_on) && $booking->departure->greaterThan($leader->starts_on))) {
continue;
}
$targets[$mirror->id] = $leader;
}
$counts = ['linked' => 0, 'unlinked' => 0];
foreach ($blocks as $block) {
$leader = $targets[$block->id] ?? null;
if ($leader === null) {
if ($block->representation_automatic) {
$block->forceFill(['representation_automatic' => false, 'is_representation' => false, 'canonical_block_id' => null, 'export_approved' => false,
'needs_review' => true, 'review_note' => self::RECHECK_NOTE])->save();
$counts['unlinked']++;
}
continue;
}
$newLink = ! $block->is_representation || $block->canonical_block_id !== $leader->id;
$block->forceFill(['representation_automatic' => true, 'is_representation' => true, 'canonical_block_id' => $leader->id,
'needs_review' => false, 'review_note' => self::LINK_NOTE]);
if ($block->isDirty()) {
$block->save();
}
$counts['linked'] += (int) $newLink;
if ($leader->reviewed_at === null) {
if ($leader->channel?->echo_behavior !== ChannelEchoBehavior::Reexports) {
$leader->forceFill(['export_approved' => true]);
}
if ($leader->review_note === self::OVERLAP_NOTE) {
$leader->forceFill(['needs_review' => false, 'review_note' => null]);
}
if ($leader->isDirty()) {
$leader->save();
}
}
}
return $counts;
});
}
private function isMirror(BlockedPeriod $block): bool
{
$interpretation = $block->ical_interpretation ?? [];
return $block->source === 'channel' && $block->channel_id !== null && $block->missing_imports === 0
&& $block->occupation_kind === null && $block->guest_id === null && ! $block->is_private
&& $block->block_purpose === null && blank($block->block_note) && $block->reviewed_at === null
&& $block->origin_channel_id === null && $block->linked_booking_id === null && $block->channel_representations_count === 0
&& $block->ical_event_type === 'block' && ($interpretation['matched'] ?? false)
&& ($interpretation['representation'] ?? null) === 'additional_block' && ($interpretation['origin_channel_id'] ?? null) === null
&& blank($interpretation['fields']['booking_reference'] ?? null) && blank($interpretation['fields']['guest_full_name'] ?? null)
&& blank($interpretation['fields']['guest_first_name'] ?? null) && $this->hasCompatibleReview($block);
}
private function isLeader(BlockedPeriod $block): bool
{
return $block->source === 'channel' && $block->channel_id !== null && ! $block->is_representation
&& $block->occupationKind() === OccupationKind::Reservation && $block->ical_event_type === 'portal_reservation'
&& $block->missing_imports === 0 && ! $block->is_private && $block->leading_priority > 0
&& $block->origin_channel_id === $block->channel_id && ($block->ical_interpretation['matched'] ?? false)
&& ($block->ical_interpretation['representation'] ?? null) === 'leading_candidate' && $this->hasCompatibleReview($block);
}
private function hasCompatibleReview(BlockedPeriod $block): bool
{
return ! $block->needs_review || in_array($block->review_note, [self::OVERLAP_NOTE, self::LINK_NOTE, self::RECHECK_NOTE], true);
}
private function sameDates(BlockedPeriod $first, BlockedPeriod $second): bool
{
return $first->starts_on->equalTo($second->starts_on) && $first->ends_on->equalTo($second->ends_on);
}
}
+2 -1
View File
@@ -6,6 +6,7 @@
use App\Exceptions\ReservationException;
use App\Mail\OfferAnswered;
use App\Models\Booking;
use App\Support\Settings;
use Illuminate\Support\Facades\Mail;
use Throwable;
@@ -34,7 +35,7 @@ public function handle(Booking $booking, int $offerVersion): void
]);
try {
Mail::to(config('fewo.notification_email'))->send(new OfferAnswered($booking, accepted: false));
Mail::to(Settings::notificationRecipients())->send(new OfferAnswered($booking, accepted: false));
} catch (Throwable $exception) {
report($exception);
}
+2 -1
View File
@@ -4,6 +4,7 @@
use App\Mail\ChannelTasksNotification;
use App\Models\ChannelTask;
use App\Support\Settings;
use Illuminate\Support\Facades\Mail;
/**
@@ -24,7 +25,7 @@ public function handle(): int
return 0;
}
Mail::to(config('fewo.notification_email'))->send(new ChannelTasksNotification($tasks->all(), reminder: true));
Mail::to(Settings::notificationRecipients())->send(new ChannelTasksNotification($tasks->all(), reminder: true));
ChannelTask::whereKey($tasks->modelKeys())->update(['reminded_at' => now()]);
return $tasks->count();
+1 -1
View File
@@ -23,7 +23,7 @@ public function handle(): int
->whereDate('departure', '<=', $latestDeparture)
->whereDate('departure', '>', $latestDeparture->copy()->subDays(30))
->whereDoesntHave('review')
->whereHas('guest', fn ($query) => $query->whereNull('anonymized_at'))
->whereHas('guest', fn ($query) => $query->whereNull('anonymized_at')->whereNotNull('email')->where('email', '!=', ''))
->with('guest')
->get();
+53
View File
@@ -0,0 +1,53 @@
<?php
namespace App\Actions;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Channel;
use App\Models\Property;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
class ResolveChannelOccupation
{
public function handle(BlockedPeriod $block, string $resolution, ?int $targetId = null, ?int $originId = null): BlockedPeriod
{
return DB::transaction(function () use ($block, $resolution, $targetId, $originId): BlockedPeriod {
Property::query()->whereKey($block->property_id)->lockForUpdate()->firstOrFail();
$block = BlockedPeriod::query()->whereKey($block->id)->lockForUpdate()->firstOrFail();
if (! in_array($block->source, ['channel', 'email'], true)) {
throw ValidationException::withMessages(['resolution' => 'Nur importierte Portalereignisse benötigen diese Zuordnung.']);
}
if (! in_array($resolution, ['independent', 'block', 'booking'], true)) {
throw ValidationException::withMessages(['resolution' => 'Bitte eine gültige Klärung wählen.']);
}
if ($originId !== null && ! Channel::query()->whereKey($originId)->where('property_id', $block->property_id)->exists()) {
throw ValidationException::withMessages(['origin_channel_id' => 'Der Ursprungskanal muss zur selben Wohnung gehören.']);
}
$attributes = ['is_representation' => false, 'canonical_block_id' => null, 'linked_booking_id' => null,
'origin_channel_id' => $originId, 'is_private' => $originId === null && $block->is_private, 'export_approved' => true, 'needs_review' => false,
'reviewed_at' => now(), 'review_note' => 'Als eigenständige Belegung persönlich bestätigt.'];
if ($resolution !== 'independent') {
$query = $resolution === 'booking' ? Booking::query()->occupying() : BlockedPeriod::query()->occupying()->whereKeyNot($block->id);
$target = $query->where('property_id', $block->property_id)->whereKey($targetId)->lockForUpdate()->first();
$start = $resolution === 'booking' ? $target?->arrival : $target?->starts_on;
$end = $resolution === 'booking' ? $target?->departure : $target?->ends_on;
if ($target === null || ! $block->starts_on->equalTo($start) || ! $block->ends_on->equalTo($end)) {
throw ValidationException::withMessages(['target_id' => 'Eine belegende Buchung oder führende Sperre derselben Wohnung mit genau diesem Zeitraum wählen.']);
}
if (BlockedPeriod::query()->where('canonical_block_id', $block->id)->exists()) {
throw ValidationException::withMessages(['target_id' => 'Diese Sperre führt bereits andere Kalenderdarstellungen. Die Zuordnung an der untergeordneten Darstellung ändern.']);
}
$attributes = [...$attributes, 'is_representation' => true, 'export_approved' => false,
'canonical_block_id' => $resolution === 'block' ? $target->id : null,
'linked_booking_id' => $resolution === 'booking' ? $target->id : null,
'review_note' => 'Persönlich zugeordnet; nur die führende Belegung steuert Verfügbarkeit und Export.'];
}
$block->forceFill(['representation_automatic' => false])->fill($attributes)->save();
app(ReconcileChannelRepresentations::class)->handle($block->property);
return $block->refresh();
});
}
}
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace App\Actions;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
class RotateChannelToken
{
public function handle(Channel $channel, int $graceHours = 168): Channel
{
return DB::transaction(function () use ($channel, $graceHours): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
if ($graceHours < 24 || $graceHours > 720 || $locked->previous_export_token_expires_at?->isFuture()) {
throw ValidationException::withMessages(['grace_hours' => '24 bis 720 Stunden wählen; eine laufende Token-Übergangsphase muss zuerst ablaufen.']);
}
$locked->forceFill([
'previous_export_token' => $locked->export_token,
'previous_export_token_expires_at' => now()->addHours($graceHours),
'export_token' => Str::random(48),
])->save();
return $locked->refresh();
});
}
}
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Actions;
use App\Channels\ICal\ICalRuleEngine;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
class SaveChannelRules
{
public function handle(Channel $channel, array $rules): Channel
{
return DB::transaction(function () use ($channel, $rules): Channel {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
$validated = app(ICalRuleEngine::class)->validate($locked, $rules);
$locked->forceFill(['ical_rules' => $validated])->save();
return $locked;
});
}
}
+1 -1
View File
@@ -82,7 +82,7 @@ public function handle(): array
private function bookings(callable $constraints): Collection
{
return $constraints(Booking::query()->with(['guest', 'property', 'payments']))
->whereHas('guest', fn (Builder $query) => $query->whereNull('anonymized_at'))
->whereHas('guest', fn (Builder $query) => $query->whereNull('anonymized_at')->whereNotNull('email')->where('email', '!=', ''))
->get()
->toBase();
}
+8 -1
View File
@@ -42,6 +42,10 @@ public function __construct(
*/
public function handle(Booking $booking, array $changes = [], bool $sendMail = true): Booking
{
if ($sendMail && blank($booking->guest?->email)) {
throw new ReservationException('Vor dem E-Mail-Versand bitte die E-Mail-Adresse des zugeordneten Gastes ergänzen.');
}
if (! in_array($booking->status, [BookingStatus::Reserved, BookingStatus::OfferSent, BookingStatus::Expired], true)) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'als Angebot versendet');
}
@@ -98,7 +102,10 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
*/
public function offerUrl(Booking $booking): string
{
return URL::temporarySignedRoute('offers.show', $booking->hold_expires_at, ['booking' => $booking, 'v' => $booking->offer_version]);
$parameters = ['booking' => $booking, 'v' => $booking->offer_version];
return $booking->website()?->temporarySignedRoute('offers.show', $booking->hold_expires_at, $parameters)
?? URL::temporarySignedRoute('offers.show', $booking->hold_expires_at, $parameters);
}
/**
+2 -1
View File
@@ -7,6 +7,7 @@
use App\Mail\NewReview;
use App\Models\Booking;
use App\Models\Review;
use App\Support\Settings;
use Illuminate\Support\Facades\Mail;
use RuntimeException;
@@ -32,7 +33,7 @@ public function handle(Booking $booking, array $data): Review
'stayed_on' => $booking->arrival,
]);
Mail::to(config('fewo.notification_email'))->send(new NewReview($review));
Mail::to(Settings::notificationRecipients())->send(new NewReview($review));
return $review;
}
+121 -95
View File
@@ -5,18 +5,20 @@
use App\Channels\ChannelSyncException;
use App\Channels\ConflictDetector;
use App\Channels\ExternalPeriod;
use App\Enums\ChannelEchoBehavior;
use App\Mail\ChannelConflict;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Channel;
use App\Models\ChannelSyncLog;
use App\Models\Property;
use App\Support\Settings;
use Carbon\CarbonImmutable;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
/**
* Imports the occupations of one portal as blocked periods and reports overlaps with
* occupations from anywhere else immediately (possible double booking).
*/
/** Imports one complete channel snapshot without guessing that overlapping events are identical. */
class SyncChannel
{
public function __construct(private ConflictDetector $conflictDetector = new ConflictDetector) {}
@@ -24,105 +26,129 @@ public function __construct(private ConflictDetector $conflictDetector = new Con
public function handle(Channel $channel): ChannelSyncLog
{
$startedAt = microtime(true);
try {
$periods = $channel->connector()->fetchOccupations($channel);
} catch (ChannelSyncException $exception) {
$channel->forceFill(['last_synced_at' => now(), 'last_error' => $exception->getMessage()])->save();
return $channel->syncLogs()->create([
'successful' => false,
'message' => $exception->getMessage(),
'duration_ms' => $this->elapsed($startedAt),
]);
$lock = Cache::lock("channel-sync:{$channel->tenant_id}:{$channel->id}", 120);
if (! $lock->get()) {
return $channel->syncLogs()->create(['successful' => false, 'message' => 'Für diesen Kanal läuft bereits ein Abgleich.']);
}
$today = CarbonImmutable::today();
$suffix = config('channels.uid_suffix');
$periods = array_values(array_filter(
$periods,
fn (ExternalPeriod $period): bool => $period->endsOn->greaterThan($today) && ! str_ends_with($period->uid, $suffix),
));
$counts = ['added' => 0, 'changed' => 0, 'removed' => 0];
$conflicts = [];
DB::transaction(function () use ($channel, $periods, $today, &$counts, &$conflicts): void {
$existing = $channel->blockedPeriods()->where('source', 'channel')->get()->keyBy('external_uid');
$fromEmails = $channel->blockedPeriods()->where('source', 'email')->get();
$seen = [];
foreach ($periods as $period) {
$seen[$period->uid] = true;
$block = $existing->get($period->uid);
if ($block && $block->starts_on->equalTo($period->startsOn) && $block->ends_on->equalTo($period->endsOn)) {
continue;
try {
$channel->refresh();
if (! $channel->importsOccupations()) {
return $channel->syncLogs()->create(['successful' => false, 'message' => 'Import ist pausiert oder noch nicht eingerichtet.']);
}
$importUrl = $channel->setting('import_url');
$periods = $channel->connector()->fetchOccupations($channel);
$suffix = config('channels.uid_suffix');
if (! is_string($suffix) || $suffix === '') {
throw new ChannelSyncException('Der UID-Echofilter ist nicht eingerichtet.');
}
$today = CarbonImmutable::today();
$periods = array_values(array_filter($periods, fn (ExternalPeriod $period): bool => $period->endsOn->greaterThan($today) && ! str_ends_with($period->uid, $suffix)));
$counts = ['added' => 0, 'changed' => 0, 'removed' => 0];
$warnings = [];
$conflicts = [];
DB::transaction(function () use ($channel, $periods, $importUrl, $today, &$counts, &$warnings, &$conflicts): void {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
if (! $locked->importsOccupations() || $locked->setting('import_url') !== $importUrl) {
throw new ChannelSyncException('Die Kanalkonfiguration wurde während des Abrufs geändert.');
}
$attributes = [
'property_id' => $channel->property_id,
'starts_on' => $period->startsOn->toDateString(),
'ends_on' => $period->endsOn->toDateString(),
// The portal's SUMMARY is not stored: it may contain guest names (data minimisation).
'reason' => $channel->name,
'source' => 'channel',
];
$confirmedEmailBlock = $block ? null : $fromEmails->first(fn (BlockedPeriod $emailBlock): bool => $emailBlock->starts_on->equalTo($period->startsOn) && $emailBlock->ends_on->equalTo($period->endsOn));
if ($confirmedEmailBlock) {
// Already blocked from the portal's e-mail; the calendar only confirms it.
$confirmedEmailBlock->update([...$attributes, 'external_uid' => $period->uid]);
$fromEmails = $fromEmails->reject(fn (BlockedPeriod $emailBlock): bool => $emailBlock->is($confirmedEmailBlock));
$counts['changed']++;
continue;
Property::query()->whereKey($channel->property_id)->lockForUpdate()->firstOrFail();
$rows = $channel->blockedPeriods()->withTrashed()->where('source', 'channel')->get();
if ($rows->groupBy('external_uid')->contains(fn ($group): bool => $group->count() > 1) || $rows->contains(fn (BlockedPeriod $block): bool => blank($block->external_uid))) {
throw new ChannelSyncException('Vorhandene Kalender-Dubletten oder fehlende UIDs benötigen eine manuelle Prüfung. Der Bestand bleibt erhalten.');
}
if ($block) {
$block->update($attributes);
$counts['changed']++;
$existing = $rows->keyBy('external_uid');
$emails = $channel->blockedPeriods()->where('source', 'email')->get();
$seen = [];
foreach ($periods as $period) {
$seen[$period->uid] = true;
$block = $existing->get($period->uid);
$matchedMail = $block ? null : $emails->firstWhere('external_uid', 'email:'.$period->uid);
$attributes = ['property_id' => $channel->property_id, 'starts_on' => $period->startsOn->toDateString(),
'ends_on' => $period->endsOn->toDateString(), 'reason' => $channel->name, 'source' => 'channel',
'external_uid' => $period->uid, 'missing_imports' => 0];
$interpretation = $period->properties !== [] ? app(ApplyChannelRules::class)->attributes($locked, $block ?? $matchedMail, $period->properties) : [];
if ($matchedMail) {
$block = $matchedMail;
$block->update($attributes);
$emails = $emails->reject(fn (BlockedPeriod $mail): bool => $mail->is($block));
$counts['changed']++;
} elseif ($block) {
if ($block->trashed()) {
$block->fill($attributes)->restore();
$counts['added']++;
} elseif (! $block->starts_on->equalTo($period->startsOn) || ! $block->ends_on->equalTo($period->endsOn)) {
$block->update($attributes);
$counts['changed']++;
} elseif ($block->missing_imports !== 0) {
$block->forceFill(['missing_imports' => 0])->saveQuietly();
}
} else {
$overlap = $channel->property->blockedPeriods()->occupying()->overlapping($period->startsOn, $period->endsOn)->exists()
|| $channel->property->bookings()->occupying()->overlapping($period->startsOn, $period->endsOn)->exists();
$attributes['export_approved'] = ! $overlap && $locked->echo_behavior !== ChannelEchoBehavior::Reexports;
$block = new BlockedPeriod($attributes);
$block->forceFill($interpretation);
$channel->blockedPeriods()->save($block);
$counts['added']++;
}
if ($period->properties !== []) {
app(ApplyChannelRules::class)->store($block, [...$interpretation, 'ical_properties' => $period->properties, 'ical_raw' => $period->raw]);
}
$existing->put($period->uid, $block);
}
$missing = $rows->filter(fn (BlockedPeriod $block): bool => ! $block->trashed() && ! isset($seen[$block->external_uid]) && $block->ends_on->greaterThan($today));
if ($missing->count() > config('channels.max_automatic_removals', 5)) {
$warnings[] = 'Ungewöhnlich viele Ereignisse fehlen. Keine automatische Entfernung; Portalkalender persönlich prüfen.';
foreach ($missing as $block) {
$block->forceFill(['needs_review' => true, 'review_note' => end($warnings)])->saveQuietly();
}
} else {
$block = $channel->blockedPeriods()->create([...$attributes, 'external_uid' => $period->uid]);
$counts['added']++;
foreach ($missing as $block) {
$block->increment('missing_imports');
if ($block->missing_imports >= config('channels.removal_confirmation_runs', 2)) {
$block->delete();
$counts['removed']++;
} else {
$warnings[] = 'Fehlende Ereignisse bleiben bis zum nächsten bestätigenden Kalenderstand gesperrt.';
}
}
}
// E-mail blocks of this portal overlapping the calendar entry describe the same booking with deviating dates.
$superseded = $fromEmails->filter(fn (BlockedPeriod $emailBlock): bool => $emailBlock->starts_on->lessThan($block->ends_on) && $emailBlock->ends_on->greaterThan($block->starts_on));
$superseded->each->delete();
$fromEmails = $fromEmails->diff($superseded);
array_push($conflicts, ...$this->conflictDetector->conflictsFor($block));
app(ReconcileChannelRepresentations::class)->handle($channel->property);
foreach ($channel->blockedPeriods()->with(['canonicalBlock', 'linkedBooking'])->where('source', 'channel')->whereIn('external_uid', array_keys($seen))->get() as $block) {
$overlap = $channel->blockedPeriods()->occupying()->overlapping($block->starts_on, $block->ends_on)->whereKeyNot($block->id)->exists();
$foundConflicts = $block->is_representation ? [] : $this->conflictDetector->conflictsFor($block);
$linked = $block->canonicalBlock ?? $block->linkedBooking;
$linkedStart = $linked instanceof Booking ? $linked->arrival : $linked?->starts_on;
$linkedEnd = $linked instanceof Booking ? $linked->departure : $linked?->ends_on;
$representationChanged = $block->is_representation && ($linked === null || ! $block->starts_on->equalTo($linkedStart) || ! $block->ends_on->equalTo($linkedEnd));
if ($representationChanged || (! $block->is_representation && $block->reviewed_at === null && ($overlap || $emails->isNotEmpty() || $foundConflicts !== [] || ! $block->export_approved))) {
$note = ReconcileChannelRepresentations::OVERLAP_NOTE;
$block->forceFill(['needs_review' => true, 'review_note' => $note])->saveQuietly();
foreach ($emails as $mailBlock) {
$mailBlock->forceFill(['needs_review' => true, 'review_note' => $note])->saveQuietly();
}
$warnings[] = $note;
}
array_push($conflicts, ...$foundConflicts);
}
$warnings = array_values(array_unique($warnings));
$locked->forceFill(['last_synced_at' => now(), 'last_success_at' => now(), 'last_error' => null,
'alerted_at' => null, 'last_import_events' => count($periods), 'sync_warnings' => $warnings])->save();
});
if ($conflicts !== []) {
rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new ChannelConflict($channel, array_values(array_unique($conflicts)))));
}
$stale = $existing->reject(fn (BlockedPeriod $block, string $uid): bool => isset($seen[$uid]) || $block->ends_on->lessThanOrEqualTo($today));
$stale->each->delete();
$counts['removed'] = $stale->count();
});
return $channel->syncLogs()->create(['successful' => true, 'events' => count($periods), ...$counts,
'conflicts' => count(array_unique($conflicts)), 'warnings' => $warnings,
'duration_ms' => (int) round((microtime(true) - $startedAt) * 1000)]);
} catch (ChannelSyncException $exception) {
$channel->forceFill(['last_synced_at' => now(), 'last_error_at' => now(), 'last_error' => $exception->getMessage()])->save();
$channel->forceFill([
'last_synced_at' => now(),
'last_success_at' => now(),
'last_error' => null,
'alerted_at' => null,
])->save();
if ($conflicts !== []) {
rescue(fn () => Mail::to(config('fewo.notification_email'))->send(new ChannelConflict($channel, $conflicts)));
return $channel->syncLogs()->create(['successful' => false, 'message' => $exception->getMessage(),
'duration_ms' => (int) round((microtime(true) - $startedAt) * 1000)]);
} finally {
$lock->release();
}
return $channel->syncLogs()->create([
'successful' => true,
'events' => count($periods),
...$counts,
'conflicts' => count($conflicts),
'duration_ms' => $this->elapsed($startedAt),
]);
}
private function elapsed(float $startedAt): int
{
return (int) round((microtime(true) - $startedAt) * 1000);
}
}
+2 -2
View File
@@ -21,7 +21,7 @@ public function isAvailable(Property $property, CarbonImmutable $from, CarbonImm
->when($ignore, fn ($query) => $query->whereKeyNot($ignore->getKey()))
->exists();
return ! $bookingConflict && ! $property->blockedPeriods()->overlapping($from, $until)->exists();
return ! $bookingConflict && ! $property->blockedPeriods()->occupying()->overlapping($from, $until)->exists();
}
/**
@@ -33,7 +33,7 @@ public function occupiedNights(Property $property, CarbonImmutable $from, Carbon
{
$periods = $property->bookings()->occupying()->overlapping($from, $until)->get(['arrival', 'departure'])
->map(fn (Booking $booking): array => [$booking->arrival, $booking->departure])
->concat($property->blockedPeriods()->overlapping($from, $until)->get(['starts_on', 'ends_on'])
->concat($property->blockedPeriods()->occupying()->overlapping($from, $until)->get(['starts_on', 'ends_on'])
->map(fn (BlockedPeriod $period): array => [$period->starts_on, $period->ends_on]));
$nights = [];
+105
View File
@@ -0,0 +1,105 @@
<?php
namespace App\Availability;
use App\Enums\BookingStatus;
use App\Filament\Resources\BlockedPeriods\BlockedPeriodResource;
use App\Filament\Resources\Bookings\BookingResource;
use App\Filament\Resources\Guests\GuestResource;
use App\Filament\Resources\PortalOccupations\PortalOccupationResource;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Property;
use Carbon\CarbonImmutable;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Gate;
class OccupancyOverview
{
/**
* One read model over local booking workflows and their external calendar counterparts.
* Source records retain their identities; linked representations never become a second stay.
*
* @return Collection<int|string, array<string, mixed>>
*/
public function records(?int $propertyId = null, ?int $guestId = null, bool $includeBlocks = false, ?CarbonImmutable $from = null, ?CarbonImmutable $until = null): Collection
{
Gate::authorize('viewAny', Booking::class);
$representations = ['channelRepresentations' => fn ($query) => $query->select(['id', 'channel_id', 'canonical_block_id', 'linked_booking_id'])->with('channel:id,name')];
$bookings = Booking::query()->with(['guest', 'property', 'originChannel', 'importChannel'])->with($representations)->withCount('channelRepresentations')
->when($propertyId, fn ($query) => $query->where('property_id', $propertyId))
->when($guestId, fn ($query) => $query->where('guest_id', $guestId))
->when($from, fn ($query) => $query->whereDate('departure', '>=', $from))
->when($until, fn ($query) => $query->whereDate('arrival', '<', $until))
->get();
$records = collect();
foreach ($bookings as $booking) {
$records->put($booking->id, [
'record_type' => 'booking', 'record_id' => $booking->id, 'reference' => $booking->reference,
'kind' => 'booking', 'kind_label' => 'Anfrage / Buchung',
'property_id' => $booking->property_id, 'property' => $booking->property->name,
'arrival' => $booking->arrival->toDateString(), 'departure' => $booking->departure->toDateString(),
'nights' => $booking->nights(), 'persons' => $booking->guests, 'total' => $booking->total,
'guest_id' => $booking->guest_id, 'guest' => $booking->guest?->full_name ?? 'Gastzuordnung offen',
'guest_email' => $booking->guest?->email, 'guest_assigned' => $booking->guest_id !== null,
'source' => $booking->bookingChannelLabel(), 'status' => $booking->status->getLabel(),
'status_key' => $booking->status->value, 'color' => $booking->status->getColor(),
'occupies' => in_array($booking->status, BookingStatus::occupying(), true) || $booking->isHoldActive(),
'needs_review' => false, 'review_note' => null, 'reason' => null, 'archived' => false,
'representations' => $booking->channel_representations_count,
'mirrored_channels' => $booking->channelRepresentations->pluck('channel.name')->filter()->unique()->values()->all(),
'url' => BookingResource::getUrl('view', ['record' => $booking->id]),
'guest_url' => $booking->guest_id ? GuestResource::getUrl('edit', ['record' => $booking->guest_id]) : null,
]);
}
$blocks = BlockedPeriod::query()->select(['id', 'tenant_id', 'property_id', 'guest_id', 'channel_id', 'origin_channel_id', 'starts_on', 'ends_on', 'reason', 'source', 'occupation_kind', 'block_purpose', 'block_note', 'is_private', 'ical_event_type', 'ical_interpretation', 'is_representation', 'needs_review', 'review_note', 'deleted_at'])->withTrashed()->occupying()->with(['guest', 'property', 'channel', 'originChannel'])->with($representations)->withCount('channelRepresentations')
->when(! $includeBlocks, fn ($query) => $query->reservations())
->when($propertyId, fn ($query) => $query->where('property_id', $propertyId))
->when($guestId, fn ($query) => $query->where('guest_id', $guestId)->reservations())
->when($from, fn ($query) => $query->whereDate('ends_on', '>=', $from))
->when($until, fn ($query) => $query->whereDate('starts_on', '<', $until))
->get();
foreach ($blocks as $block) {
$kind = $block->occupationKind();
$records->put('portal-'.$block->id, [
'record_type' => 'portal', 'record_id' => $block->id,
'reference' => $block->ical_interpretation['fields']['booking_reference'] ?? 'Kalender-'.$block->id,
'kind' => $kind->value, 'kind_label' => $kind->getLabel(),
'property_id' => $block->property_id, 'property' => $block->property->name,
'arrival' => $block->starts_on->toDateString(), 'departure' => $block->ends_on->toDateString(),
'nights' => (int) $block->starts_on->diffInDays($block->ends_on), 'persons' => null, 'total' => null,
'guest_id' => $block->guest_id, 'guest' => $block->guestName() ?? 'Gastzuordnung offen',
'guest_email' => $block->guest?->email, 'guest_assigned' => $block->guest_id !== null,
'source' => $block->bookingChannelLabel(),
'status' => $block->trashed() ? 'Nicht mehr im Kalenderfeed' : ($block->needs_review ? 'Klärung erforderlich' : 'Im Kalender geführt'),
'status_key' => $block->trashed() ? 'archived' : 'imported', 'color' => $block->needs_review ? 'warning' : $kind->getColor(),
'occupies' => ! $block->trashed(), 'needs_review' => $block->needs_review, 'review_note' => $block->review_note, 'reason' => $block->blockDescription(),
'archived' => $block->trashed(), 'representations' => $block->channel_representations_count,
'mirrored_channels' => $block->channelRepresentations->pluck('channel.name')->filter()->unique()->values()->all(),
'url' => $block->source === 'manual' ? BlockedPeriodResource::getUrl() : PortalOccupationResource::getUrl('view', ['record' => $block->id]),
'guest_url' => $block->guest_id ? GuestResource::getUrl('edit', ['record' => $block->guest_id]) : null,
]);
}
return $records;
}
/** @return array{month: CarbonImmutable, days: array, rows: Collection, free: int, occupied: int} */
public function calendar(Property $property, CarbonImmutable $month): array
{
$month = $month->startOfMonth();
$until = $month->addMonth();
$records = $this->records($property->id, includeBlocks: true, from: $month, until: $until);
$occupying = $records->where('occupies', true);
$days = [];
for ($date = $month; $date->lessThan($until); $date = $date->addDay()) {
$day = $date->toDateString();
$nights = $occupying->filter(fn (array $record): bool => $record['arrival'] <= $day && $day < $record['departure']);
$departures = $occupying->where('departure', $day);
$days[] = ['date' => $date, 'free' => $nights->isEmpty(), 'occupations' => $nights->values()->all(), 'departures' => $departures->values()->all(), 'overlap' => $nights->count() > 1];
}
$free = collect($days)->where('free', true)->count();
return ['month' => $month, 'days' => $days, 'rows' => $records->sortBy('arrival'), 'free' => $free, 'occupied' => count($days) - $free];
}
}
+1
View File
@@ -24,6 +24,7 @@ public function conflictsFor(BlockedPeriod $block): array
->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')})");
$blocks = $property->blockedPeriods()
->occupying()
->overlapping($block->starts_on, $block->ends_on)
->whereKeyNot($block->getKey())
->when($block->channel_id, fn ($query) => $query->where(fn ($query) => $query->whereNull('channel_id')->orWhere('channel_id', '!=', $block->channel_id)))
+2
View File
@@ -14,5 +14,7 @@ public function __construct(
public CarbonImmutable $startsOn,
public CarbonImmutable $endsOn,
public ?string $summary = null,
public array $properties = [],
public ?string $raw = null,
) {}
}
+43
View File
@@ -0,0 +1,43 @@
<?php
namespace App\Channels\ICal;
class ICalAnalysis
{
/** @return array<string, mixed> */
public function summarize(array $document): array
{
$events = [];
$fields = [];
$engine = new ICalRuleEngine;
foreach ($document['events'] as $event) {
$period = $event['period'];
$events[] = ['uid' => $event['uid'], 'properties' => $event['properties'], 'raw' => $event['raw'],
'starts_on' => $period?->startsOn->toDateString(), 'ends_on' => $period?->endsOn->toDateString(), 'occupying' => $period !== null];
foreach (array_keys($event['properties']) as $field) {
$fields[$field] ??= ['count' => 0, 'values' => [], 'patterns' => []];
$fields[$field]['count']++;
foreach (array_unique($engine->values($event['properties'], $field)) as $value) {
$fields[$field]['values'][$value] = ($fields[$field]['values'][$value] ?? 0) + 1;
$pattern = $value;
foreach ([' - ', ': ', ' / '] as $delimiter) {
if (($position = mb_strpos($value, $delimiter)) !== false) {
$pattern = mb_substr($value, 0, $position + mb_strlen($delimiter)).'…';
break;
}
}
$fields[$field]['patterns'][$pattern] = ($fields[$field]['patterns'][$pattern] ?? 0) + 1;
}
}
}
ksort($fields);
foreach ($fields as &$field) {
arsort($field['values']);
arsort($field['patterns']);
$field['values'] = array_slice($field['values'], 0, 10, true);
$field['patterns'] = array_slice($field['patterns'], 0, 10, true);
}
return ['count' => count($events), 'events' => $events, 'fields' => $fields, 'calendar' => $document['calendar']];
}
}
+16 -3
View File
@@ -32,9 +32,11 @@ public static function settingsSchema(): array
{
return [
TextInput::make('settings.import_url')
->label('iCal-Export-Adresse des Portals')
->label('Importadresse: iCal-Export des externen Portals')
->helperText('Im Vermieterbereich des Portals unter „Kalender exportieren“. Leer lassen, wenn das Portal keinen Kalender anbietet.')
->url()
->password()
->revealable()
->maxLength(2048),
];
}
@@ -45,6 +47,17 @@ public function canImport(Channel $channel): bool
}
public function fetchOccupations(Channel $channel): array
{
return $this->parser->parse($this->fetchCalendar($channel));
}
/** @return array{events: list<array>, calendar: array} */
public function fetchDocument(Channel $channel): array
{
return $this->parser->parseDocument($this->fetchCalendar($channel));
}
private function fetchCalendar(Channel $channel): string
{
$url = preg_replace('#^webcals?://#i', 'https://', (string) $channel->setting('import_url'));
@@ -55,9 +68,9 @@ public function fetchOccupations(Channel $channel): array
->get($url)
->throw();
} catch (ConnectionException|RequestException $exception) {
throw new ChannelSyncException('Kalender konnte nicht abgerufen werden: '.$exception->getMessage(), previous: $exception);
throw new ChannelSyncException('Kalender konnte nicht abgerufen werden. Netzwerkverbindung und Portaladresse prüfen.', previous: $exception);
}
return $this->parser->parse($response->body());
return $response->body();
}
}
+41
View File
@@ -0,0 +1,41 @@
<?php
namespace App\Channels\ICal;
use App\Models\Channel;
use Illuminate\Support\Facades\DB;
class ICalExport
{
public function __construct(private ICalFeed $feed, private ICalParser $parser) {}
public function build(Channel $channel, string $method = 'GET', ?string $userAgent = null): ?string
{
$requestedAt = now();
return DB::transaction(function () use ($channel, $method, $userAgent, $requestedAt): ?string {
$locked = Channel::query()->whereKey($channel->id)->lockForUpdate()->firstOrFail();
if ($locked->exportsOccupations()) {
$body = $this->feed->build($locked);
$this->parser->parse($body);
$locked->forceFill(['export_snapshot' => $body, 'export_snapshot_at' => now()]);
}
$lastRequest = $locked->last_export_requested_at;
$locked->forceFill(['last_export_requested_at' => $lastRequest?->greaterThan($requestedAt) ? $lastRequest : $requestedAt])->saveQuietly();
$userAgent = str_replace(array_filter([$locked->export_token, $locked->previous_export_token]), '[Token entfernt]', $userAgent ?? '');
$locked->exportRequests()->create([
'requested_at' => $requestedAt,
'method' => $method,
'user_agent' => filled($userAgent) ? mb_substr(str_replace(["\r", "\n"], ' ', $userAgent), 0, 512) : null,
'response_status' => $locked->export_snapshot === null ? 503 : 200,
'export_state' => $locked->export_snapshot === null ? 'unavailable' : ($locked->exportsOccupations() ? 'live' : 'frozen'),
]);
$expired = $locked->exportRequests()->skip(max(1, (int) config('channels.export_request_history_limit', 100)))->take(1000)->pluck('id');
if ($expired->isNotEmpty()) {
$locked->exportRequests()->whereIn('id', $expired)->delete();
}
return $locked->export_snapshot;
});
}
}
+62
View File
@@ -0,0 +1,62 @@
<?php
namespace App\Channels\ICal;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Channel;
class ICalExportFields
{
public const FIELDS = ['occupation_label' => 'Belegungsbeschreibung', 'guest_first_name' => 'Gastvorname / Namensbestandteil', 'guest_full_name' => 'Vollständiger Gastname', 'booking_reference' => 'Buchungsreferenz', 'note' => 'Zusätzliche Textinformation', 'property_name' => 'Wohnungsname', 'channel_name' => 'Bekannter Ursprung / Importkanal', 'arrival' => 'Anreise', 'departure' => 'Abreise', 'nights' => 'Anzahl Nächte'];
public const ICAL_FIELDS = ['SUMMARY' => 'SUMMARY – Bezeichnung', 'DESCRIPTION' => 'DESCRIPTION – Beschreibung', 'LOCATION' => 'LOCATION – Ort / Wohnung'];
/** @return array<string, string> */
public function properties(Channel $channel, Booking|BlockedPeriod $occupation): array
{
$context = $this->context($occupation);
if (! $channel->ical_export_names) {
unset($context['guest_first_name'], $context['guest_full_name']);
}
$properties = ['SUMMARY' => 'Belegt'];
foreach ($channel->ical_export_mapping ?? [] as $mapping) {
if (! isset(self::ICAL_FIELDS[$mapping['field'] ?? ''])) {
continue;
}
$parts = [];
foreach ($mapping['items'] ?? [] as $item) {
if (isset(self::FIELDS[$item]) && filled($context[$item] ?? null)) {
$parts[] = $context[$item];
}
}
if ($parts !== []) {
$properties[$mapping['field']] = implode($mapping['separator'] ?? ' – ', $parts);
}
}
return $properties;
}
/** @return array<string, string|null> */
public function context(Booking|BlockedPeriod $occupation): array
{
$booking = $occupation instanceof Booking;
$start = $booking ? $occupation->arrival : $occupation->starts_on;
$end = $booking ? $occupation->departure : $occupation->ends_on;
$context = ['occupation_label' => $booking ? 'Buchung' : (ICalRuleEngine::TYPES[$occupation->ical_event_type] ?? 'Belegt'),
'property_name' => $occupation->property->name, 'arrival' => $start->format('d.m.Y'), 'departure' => $end->format('d.m.Y'),
'nights' => (string) (int) $start->diffInDays($end),
'channel_name' => $booking ? null : ($occupation->originChannel?->name ?? $occupation->channel?->name)];
if ($booking) {
return [...$context, 'guest_first_name' => $occupation->guest?->first_name, 'guest_full_name' => $occupation->guest?->full_name, 'booking_reference' => $occupation->reference];
}
$fields = array_intersect_key($occupation->ical_interpretation['fields'] ?? [], self::FIELDS);
if ($occupation->guest !== null) {
$fields['guest_first_name'] = $occupation->guest->anonymized_at === null ? $occupation->guest->first_name : null;
$fields['guest_full_name'] = $occupation->guest->anonymized_at === null && filled($occupation->guest->last_name) ? $occupation->guest->full_name : null;
}
return [...$context, ...$fields];
}
}
+40 -11
View File
@@ -2,6 +2,7 @@
namespace App\Channels\ICal;
use App\Enums\ChannelExportMode;
use App\Models\Booking;
use App\Models\Channel;
use Carbon\CarbonImmutable;
@@ -23,21 +24,32 @@ public function build(Channel $channel): string
$events = [];
foreach ($property->bookings()->occupying()->overlapping($from, $until)->get() as $booking) {
$bookings = $property->bookings()->occupying()->overlapping($from, $until);
if ($channel->export_mode === ChannelExportMode::Test) {
$bookings->whereNull('import_channel_id')->whereNull('origin_channel_id')->whereIn('source', Booking::DIRECT_SOURCES);
} else {
$bookings->where(fn ($query) => $query->whereNull('import_channel_id')->orWhere('import_channel_id', '!=', $channel->id))
->where(fn ($query) => $query->whereNull('origin_channel_id')->orWhere('origin_channel_id', '!=', $channel->id));
}
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);
$events[] = $this->event("booking-{$booking->id}{$suffix}", $booking->arrival, $booking->departure, $booking->updated_at, (new ICalExportFields)->properties($channel, $booking));
}
$blocks = $property->blockedPeriods()
->occupying()->where('export_approved', true)
->overlapping($from, $until)
->where(fn ($query) => $query->whereNull('channel_id')->orWhere('channel_id', '!=', $channel->id))
->get();
foreach ($blocks as $block) {
$events[] = $this->event("block-{$block->id}{$suffix}", $block->starts_on, $block->ends_on, $block->updated_at);
->where(fn ($query) => $query->whereNull('origin_channel_id')->orWhere('origin_channel_id', '!=', $channel->id));
if ($channel->export_mode === ChannelExportMode::Test) {
$blocks->whereNull('channel_id')->whereNull('origin_channel_id')->where('source', 'manual');
}
return implode("\r\n", [
foreach ($blocks->with(['property', 'channel', 'originChannel', 'guest'])->orderBy('id')->get() as $block) {
$events[] = $this->event("block-{$block->id}{$suffix}", $block->starts_on, $block->ends_on, $block->updated_at, (new ICalExportFields)->properties($channel, $block));
}
$lines = [
'BEGIN:VCALENDAR',
'VERSION:2.0',
'PRODID:-//Ferienwohnung Stommer//Belegung//DE',
@@ -46,10 +58,12 @@ public function build(Channel $channel): string
'X-WR-CALNAME:'.$this->escape($property->name),
...$events,
'END:VCALENDAR',
])."\r\n";
];
return implode("\r\n", array_map(fn (string $line): string => $this->fold($line), explode("\r\n", implode("\r\n", $lines))))."\r\n";
}
private function event(string $uid, CarbonInterface $start, CarbonInterface $end, ?CarbonInterface $modified): string
private function event(string $uid, CarbonInterface $start, CarbonInterface $end, ?CarbonInterface $modified, array $properties): string
{
return implode("\r\n", [
'BEGIN:VEVENT',
@@ -57,7 +71,7 @@ private function event(string $uid, CarbonInterface $start, CarbonInterface $end
'DTSTAMP:'.($modified ?? now())->utc()->format('Ymd\THis\Z'),
'DTSTART;VALUE=DATE:'.$start->format('Ymd'),
'DTEND;VALUE=DATE:'.$end->format('Ymd'),
'SUMMARY:Belegt',
...array_map(fn (string $field, string $value): string => $field.':'.$this->escape($value), array_keys($properties), array_values($properties)),
'TRANSP:OPAQUE',
'END:VEVENT',
]);
@@ -65,6 +79,21 @@ private function event(string $uid, CarbonInterface $start, CarbonInterface $end
private function escape(string $text): string
{
return str_replace(['\\', ';', ',', "\n"], ['\\\\', '\\;', '\\,', '\\n'], $text);
return str_replace(['\\', ';', ',', "\n"], ['\\\\', '\\;', '\\,', '\\n'], str_replace(["\r\n", "\r"], "\n", $text));
}
private function fold(string $line): string
{
$parts = [];
$limit = 75;
while (strlen($line) > $limit) {
$part = mb_strcut($line, 0, $limit, 'UTF-8');
$parts[] = $part;
$line = substr($line, strlen($part));
$limit = 74;
}
$parts[] = $line;
return implode("\r\n ", $parts);
}
}
+186 -63
View File
@@ -5,117 +5,240 @@
use App\Channels\ChannelSyncException;
use App\Channels\ExternalPeriod;
use Carbon\CarbonImmutable;
use Throwable;
/**
* Minimal RFC 5545 reader for availability feeds: VEVENTs with DTSTART/DTEND (date or date-time),
* UID and SUMMARY. Cancelled events and events without a positive length are skipped.
*/
/** Complete non-recurring availability snapshots; damaged feeds never become deletions. */
class ICalParser
{
/**
* @return list<ExternalPeriod>
*
* @throws ChannelSyncException
*/
/** @return list<ExternalPeriod> */
public function parse(string $ics): array
{
if (! str_contains($ics, 'BEGIN:VCALENDAR')) {
throw new ChannelSyncException('Die Antwort ist kein iCal-Kalender.');
return array_values(array_filter(array_column($this->parseDocument($ics)['events'], 'period')));
}
/** @return array{events: list<array>, calendar: array} */
public function parseDocument(string $ics): array
{
if (str_starts_with($ics, "\xEF\xBB\xBF")) {
$ics = substr($ics, 3);
}
$lines = explode("\n", preg_replace("/\r?\n[ \t]/", '', str_replace("\r\n", "\n", $ics)));
$ics = preg_replace("/\r?\n[ \t]/", '', $ics);
if (! mb_check_encoding($ics, 'UTF-8') || str_contains($ics, "\0")) {
throw new ChannelSyncException('Kalender enthält ungültige Zeichen.');
}
$lines = explode("\n", str_replace("\r\n", "\n", $ics));
$stack = [];
$calendar = [];
$event = [];
$periods = [];
$event = null;
$properties = [];
$eventLines = [];
$identities = [];
$propertyIdentities = [];
$started = false;
$closed = false;
foreach ($lines as $line) {
$line = rtrim($line, "\r");
if ($line === 'BEGIN:VEVENT') {
$event = [];
if (in_array('VEVENT', $stack, true)) {
$eventLines[] = $line;
}
if ($line === '' && $stack === []) {
continue;
}
if ($line === 'END:VEVENT') {
if ($event !== null && ($period = $this->toPeriod($event))) {
$periods[] = $period;
if ($closed || ! preg_match('/^((?:[^:"]|"[^"]*")*):(.*)$/D', $line, $match)) {
throw new ChannelSyncException('Kalender ist unvollständig oder enthält ungültige Inhaltszeilen.');
}
$parts = preg_split('/;(?=(?:[^"]*"[^"]*")*[^"]*$)/', $match[1]);
$name = strtoupper(array_shift($parts));
$value = $match[2];
if (! preg_match('/^[A-Z0-9-]+$/D', $name)) {
throw new ChannelSyncException('Ungültige Kalendereigenschaft.');
}
if ($name === 'BEGIN') {
$component = strtoupper($value);
if ($stack === []) {
if ($started || $component !== 'VCALENDAR') {
throw new ChannelSyncException('Die Antwort ist kein vollständiger iCal-Kalender.');
}
$started = true;
} elseif ($component === 'VCALENDAR' || ($component === 'VEVENT' && $stack !== ['VCALENDAR'])) {
throw new ChannelSyncException('Ungültig verschachtelte Kalenderkomponente.');
}
$event = null;
if ($stack === ['VCALENDAR'] && ! in_array($component, ['VEVENT', 'VTIMEZONE'], true)) {
throw new ChannelSyncException('Nicht unterstützte Kalenderkomponente im Belegungsfeed.');
}
if ($component === 'VEVENT') {
$event = [];
$properties = [];
$eventLines = [$line];
}
$stack[] = $component;
continue;
}
if ($name === 'END') {
if ($stack === [] || end($stack) !== strtoupper($value)) {
throw new ChannelSyncException('Kalenderkomponente ist nicht vollständig geschlossen.');
}
if (end($stack) === 'VEVENT') {
$uid = trim($event['UID']['value'] ?? '');
if ($uid === '') {
throw new ChannelSyncException('Ein Kalenderereignis hat keine eindeutige UID.');
}
$period = $this->toPeriod($event);
$identity = $period ? $period->startsOn->toDateString().'|'.$period->endsOn->toDateString() : 'not-occupying';
if (isset($identities[$uid]) && $identities[$uid] !== $identity) {
throw new ChannelSyncException('Eine UID enthält widersprüchliche Ereignisse; bitte den Portalkalender prüfen.');
}
$normalized = $properties;
ksort($normalized);
if (isset($propertyIdentities[$uid]) && $propertyIdentities[$uid] !== $normalized) {
throw new ChannelSyncException('Eine UID enthält widersprüchliche Originalangaben; bitte den Kalender prüfen.');
}
$propertyIdentities[$uid] = $normalized;
if (! isset($identities[$uid])) {
$raw = implode("\r\n", $eventLines)."\r\n";
$enriched = $period === null ? null : new ExternalPeriod($period->uid, $period->startsOn, $period->endsOn, $period->summary, $properties, $raw);
$periods[] = ['uid' => $uid, 'properties' => $properties, 'raw' => $raw, 'period' => $enriched];
}
$identities[$uid] = $identity;
}
array_pop($stack);
if ($stack === []) {
$closed = true;
}
if ($event !== null && str_contains($line, ':')) {
[$nameWithParams, $value] = explode(':', $line, 2);
$parts = explode(';', $nameWithParams);
$event[strtoupper($parts[0])] = ['value' => $value, 'params' => array_slice($parts, 1)];
continue;
}
if ($stack === []) {
throw new ChannelSyncException('Inhalt außerhalb des Kalenders.');
}
$property = ['value' => $value, 'params' => $parts];
if ($stack === ['VCALENDAR']) {
if (isset($calendar[$name]) && in_array($name, ['VERSION', 'PRODID', 'METHOD'], true)) {
throw new ChannelSyncException('Doppelte Kalender-Kopfdaten.');
}
$calendar[$name] = $property;
} elseif ($stack === ['VCALENDAR', 'VEVENT']) {
if (isset($event[$name]) && in_array($name, ['UID', 'DTSTART', 'DTEND', 'DTSTAMP', 'LAST-MODIFIED', 'STATUS'], true)) {
throw new ChannelSyncException('Doppelte Identitäts- oder Datumsangaben im Kalenderereignis.');
}
$event[$name] = $property;
}
if (in_array('VEVENT', $stack, true)) {
$prefix = count($stack) > 2 ? implode('.', array_slice($stack, 2)).'.' : '';
$properties[$prefix.$name][] = $property;
}
}
if (! $closed || $stack !== [] || ($calendar['VERSION']['value'] ?? '') !== '2.0' || blank($calendar['PRODID']['value'] ?? null)) {
throw new ChannelSyncException('Kalender ist unvollständig; VERSION, PRODID und geschlossene Komponenten sind erforderlich.');
}
if (isset($calendar['METHOD']) && strtoupper($calendar['METHOD']['value']) !== 'PUBLISH') {
throw new ChannelSyncException('Erwartet wird ein vollständiger Kalenderstand, keine einzelne Kalendernachricht.');
}
return $periods;
return ['events' => $periods, 'calendar' => $calendar];
}
public static function text(string $value): string
{
return preg_replace_callback('/\\\\([nN,;\\\\])/', fn (array $match): string => in_array($match[1], ['n', 'N'], true) ? "\n" : $match[1], $value);
}
/**
* Availability feeds may omit DTSTAMP. Validate event-level LAST-MODIFIED in its place,
* retaining the actual original properties and rejecting an invalid present DTSTAMP.
*
* @param array<string, array{value: string, params: list<string>}> $event
*/
private function toPeriod(array $event): ?ExternalPeriod
{
if (! isset($event['DTSTART']) || strtoupper($event['STATUS']['value'] ?? '') === 'CANCELLED') {
$stamp = $event['DTSTAMP']['value'] ?? $event['LAST-MODIFIED']['value'] ?? '';
try {
if (! preg_match('/^\d{8}T\d{6}Z$/D', $stamp) || CarbonImmutable::createFromFormat('!Ymd\THis\Z', $stamp, 'UTC')->format('Ymd\THis\Z') !== $stamp) {
throw new \RuntimeException;
}
} catch (Throwable) {
throw new ChannelSyncException('Ein Ereignis benötigt einen gültigen UTC-Zeitstempel (DTSTAMP oder ersatzweise LAST-MODIFIED).');
}
foreach (['RRULE', 'RDATE', 'EXDATE', 'RECURRENCE-ID', 'DURATION'] as $unsupported) {
if (isset($event[$unsupported])) {
throw new ChannelSyncException('Serien oder Dauerangaben werden für diesen Belegungskalender nicht unterstützt.');
}
}
if (strtoupper($event['STATUS']['value'] ?? '') === 'CANCELLED') {
return null;
}
if (! isset($event['DTSTART'])) {
throw new ChannelSyncException('Einem Kalenderereignis fehlt die Anreise.');
}
$start = $this->toDate($event['DTSTART']);
$end = isset($event['DTEND']) ? $this->toDate($event['DTEND']) : $start?->addDay();
if ($start === null || $end === null || $end->lessThanOrEqualTo($start)) {
if (! isset($event['DTEND']) && ! preg_match('/^\d{8}$/D', $event['DTSTART']['value'])) {
throw new ChannelSyncException('Zeitgebundene Ereignisse benötigen eine ausdrückliche Abreise.');
}
$end = isset($event['DTEND']) ? $this->toDate($event['DTEND']) : $start->addDay();
if (isset($event['DTEND']) && preg_match('/^\d{8}$/D', $event['DTSTART']['value']) !== preg_match('/^\d{8}$/D', $event['DTEND']['value'])) {
throw new ChannelSyncException('An- und Abreise verwenden verschiedene Datumstypen.');
}
if ($end->lessThanOrEqualTo($start)) {
throw new ChannelSyncException('Ein Kalenderereignis hat keinen positiven Übernachtungszeitraum.');
}
if (strtoupper($event['TRANSP']['value'] ?? '') === 'TRANSPARENT') {
return null;
}
$summary = $event['SUMMARY']['value'] ?? null;
$uid = $event['UID']['value'] ?? sha1($start->toDateString().'|'.$end->toDateString());
return new ExternalPeriod($uid, $start, $end, $this->unescape($event['SUMMARY']['value'] ?? null));
return new ExternalPeriod($event['UID']['value'], $start, $end, $summary === null ? null : self::text($summary));
}
/**
* @param array{value: string, params: list<string>} $property
*/
private function toDate(array $property): ?CarbonImmutable
/** @param array{value: string, params: list<string>} $property */
private function toDate(array $property): CarbonImmutable
{
$value = trim($property['value']);
if (preg_match('/^\d{8}$/', $value)) {
return CarbonImmutable::createFromFormat('!Ymd', $value);
foreach ($property['params'] as $param) {
if (str_starts_with(strtoupper($param), 'VALUE=')) {
$type = strtoupper(trim(substr($param, 6), '"'));
if (! in_array($type, ['DATE', 'DATE-TIME'], true) || ($type === 'DATE') !== (preg_match('/^\d{8}$/D', $value) === 1)) {
throw new ChannelSyncException('Ungültiger Datumswerttyp.');
}
}
if (str_starts_with(strtoupper($param), 'TZID=') && (preg_match('/^\d{8}$/D', $value) || str_ends_with($value, 'Z'))) {
throw new ChannelSyncException('Unzulässige Kombination von Datum und Zeitzone.');
}
}
if (preg_match('/^(\d{8})T(\d{6})(Z?)$/', $value, $match)) {
$timezone = $match[3] === 'Z' ? 'UTC' : $this->timezone($property['params']);
return CarbonImmutable::createFromFormat('YmdHis', $match[1].$match[2], $timezone)
->setTimezone(config('app.timezone'))
->startOfDay();
try {
if (preg_match('/^\d{8}$/D', $value)) {
$date = CarbonImmutable::createFromFormat('!Ymd', $value);
if ($date->format('Ymd') === $value) {
return $date;
}
} elseif (preg_match('/^(\d{8})T(\d{6})(Z?)$/D', $value, $match)) {
$zone = $match[3] === 'Z' ? 'UTC' : $this->timezone($property['params']);
$date = CarbonImmutable::createFromFormat('!YmdHis', $match[1].$match[2], $zone);
if ($date->format('YmdHis') === $match[1].$match[2]) {
return $date->setTimezone(config('app.timezone'))->startOfDay();
}
}
} catch (Throwable) {
throw new ChannelSyncException('Ungültiges Kalenderdatum oder unbekannte Zeitzone.');
}
return null;
throw new ChannelSyncException('Ungültiges Kalenderdatum.');
}
/**
* @param list<string> $params
*/
/** @param list<string> $params */
private function timezone(array $params): string
{
foreach ($params as $param) {
if (str_starts_with(strtoupper($param), 'TZID=')) {
$tz = trim(substr($param, 5), '"');
$zone = trim(substr($param, 5), '"');
if (! in_array($zone, timezone_identifiers_list(), true)) {
throw new ChannelSyncException('Unbekannte Kalenderzeitzone.');
}
return in_array($tz, timezone_identifiers_list(), true) ? $tz : config('app.timezone');
return $zone;
}
}
return config('app.timezone');
}
private function unescape(?string $text): ?string
{
return $text === null ? null : str_replace(['\\n', '\\N', '\\,', '\\;', '\\\\'], ["\n", "\n", ',', ';', '\\'], $text);
}
}
+149
View File
@@ -0,0 +1,149 @@
<?php
namespace App\Channels\ICal;
use App\Models\Channel;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
class ICalRuleEngine
{
public const OPERATORS = ['equals' => 'Ist gleich', 'not_equals' => 'Ist nicht gleich', 'starts_with' => 'Beginnt mit', 'ends_with' => 'Endet mit', 'contains' => 'Enthält', 'exists' => 'Ist vorhanden', 'empty' => 'Ist leer'];
public const TYPES = ['unknown' => 'Nicht erkannt', 'portal_reservation' => 'Portalreservierung', 'block' => 'Allgemeine Sperre'];
public const REPRESENTATIONS = ['unspecified' => 'Unbestimmt', 'leading_candidate' => 'Kandidat für führende Belegung', 'additional_block' => 'Zusätzliche Sperre'];
public const TARGETS = ['guest_first_name' => 'Gastvorname / Namensbestandteil', 'guest_full_name' => 'Vollständiger Gastname', 'booking_reference' => 'Buchungsreferenz', 'occupation_label' => 'Belegungsbeschreibung', 'note' => 'Zusätzliche Textinformation'];
public const EXTRACTIONS = ['whole' => 'Gesamter Text', 'after' => 'Text nach', 'before' => 'Text vor', 'between' => 'Text zwischen'];
/** @return list<string> */
public function values(array $properties, string $field): array
{
return array_map(fn (array $property): string => ICalParser::text($property['value']), $properties[$field] ?? []);
}
/** @return array<string, mixed> */
public function evaluate(Channel $channel, array $properties, ?array $rules = null): array
{
$rules = collect($rules ?? $channel->ical_active_rules ?? [])->values()
->map(fn (array $rule, int $index): array => [...$rule, '_index' => $index])
->sortBy(fn (array $rule): array => [(int) ($rule['priority'] ?? 100), $rule['_index']]);
foreach ($rules as $rule) {
if (! ($rule['enabled'] ?? true) || empty($rule['conditions'])) {
continue;
}
$matches = array_map(fn (array $condition): bool => $this->matches($properties, $condition, (bool) ($rule['case_sensitive'] ?? false)), array_values($rule['conditions']));
if (($rule['match'] ?? 'all') === 'any' ? ! in_array(true, $matches, true) : in_array(false, $matches, true)) {
continue;
}
$fields = [];
foreach ($rule['extractions'] ?? [] as $extraction) {
$value = $this->extract($this->values($properties, $extraction['field'] ?? '')[0] ?? '', $extraction);
if (isset(self::TARGETS[$extraction['target'] ?? '']) && filled($value)) {
$fields[$extraction['target']] = $value;
}
}
$origin = $rule['origin'] ?? 'unknown';
return ['matched' => true, 'rule' => $rule['name'] ?? 'Unbenannte Regel', 'rule_index' => $rule['_index'],
'event_type' => $rule['event_type'] ?? 'unknown', 'representation' => $rule['representation'] ?? 'unspecified',
'priority' => (int) ($rule['priority'] ?? 100),
'origin_channel_id' => $origin === 'current' ? $channel->id : (str_starts_with($origin, 'channel:') ? (int) substr($origin, 8) : null), 'fields' => $fields];
}
return ['matched' => false, 'rule' => null, 'event_type' => 'unknown', 'representation' => 'unspecified', 'origin_channel_id' => null, 'priority' => 0, 'fields' => []];
}
private function matches(array $properties, array $condition, bool $caseSensitive): bool
{
$field = $condition['field'] ?? '';
if ($field === '') {
return false;
}
$values = $this->values($properties, $field);
$operator = $condition['operator'] ?? 'equals';
if ($operator === 'exists') {
return array_key_exists($field, $properties);
}
if ($operator === 'empty') {
return $values === [] || collect($values)->every(fn (string $value): bool => trim($value) === '');
}
$expected = (string) ($condition['value'] ?? '');
if (! $caseSensitive) {
$expected = mb_strtolower($expected);
$values = array_map(mb_strtolower(...), $values);
}
if ($operator === 'not_equals') {
return $values !== [] && ! in_array($expected, $values, true);
}
return collect($values)->contains(fn (string $value): bool => match ($operator) {
'equals' => $value === $expected,
'starts_with' => str_starts_with($value, $expected),
'ends_with' => str_ends_with($value, $expected),
'contains' => str_contains($value, $expected),
default => false,
});
}
private function extract(string $text, array $extraction): ?string
{
$method = $extraction['method'] ?? 'whole';
if (in_array($method, ['after', 'between'], true)) {
$start = (string) ($extraction['start'] ?? '');
$position = $start === '' ? false : mb_strpos($text, $start);
if ($position === false) {
return null;
}
$text = mb_substr($text, $position + mb_strlen($start));
}
if (in_array($method, ['before', 'between'], true)) {
$end = (string) ($extraction['end'] ?? '');
$position = $end === '' ? false : mb_strpos($text, $end);
if ($position === false) {
return null;
}
$text = mb_substr($text, 0, $position);
}
return trim($text);
}
/** @return list<array<string, mixed>> */
public function validate(Channel $channel, array $rules): array
{
$fields = array_keys($channel->ical_analysis['fields'] ?? []);
$origins = ['unknown', 'current', ...$channel->property->channels()->pluck('id')->map(fn ($id): string => 'channel:'.$id)->all()];
Validator::make(['rules' => $rules], [
'rules' => ['array'], 'rules.*.name' => ['required', 'string', 'max:120'],
'rules.*.enabled' => ['boolean'], 'rules.*.priority' => ['required', 'integer', 'min:0', 'max:10000'],
'rules.*.match' => ['required', Rule::in(['all', 'any'])], 'rules.*.case_sensitive' => ['boolean'],
'rules.*.conditions' => ['required', 'array', 'min:1', 'max:30'],
'rules.*.conditions.*.field' => ['required', Rule::in($fields)],
'rules.*.conditions.*.operator' => ['required', Rule::in(array_keys(self::OPERATORS))],
'rules.*.conditions.*.value' => ['nullable', 'string', 'max:2000'],
'rules.*.event_type' => ['required', Rule::in(array_keys(self::TYPES))],
'rules.*.origin' => ['required', Rule::in($origins)],
'rules.*.representation' => ['required', Rule::in(array_keys(self::REPRESENTATIONS))],
'rules.*.extractions' => ['array', 'max:20'],
'rules.*.extractions.*.field' => ['required', Rule::in($fields)],
'rules.*.extractions.*.target' => ['required', Rule::in(array_keys(self::TARGETS))],
'rules.*.extractions.*.method' => ['required', Rule::in(array_keys(self::EXTRACTIONS))],
'rules.*.extractions.*.start' => ['nullable', 'string', 'max:500'],
'rules.*.extractions.*.end' => ['nullable', 'string', 'max:500'],
])->validate();
foreach ($rules as $index => $rule) {
foreach ($rule['extractions'] ?? [] as $extraction) {
if ((in_array($extraction['method'], ['after', 'between'], true) && blank($extraction['start'] ?? null))
|| (in_array($extraction['method'], ['before', 'between'], true) && blank($extraction['end'] ?? null))) {
throw ValidationException::withMessages(['rules.'.$index.'.extractions' => 'Für die Textextraktion die benötigten Anfangs- und Endtexte angeben.']);
}
}
}
return array_values($rules);
}
}
+30 -5
View File
@@ -3,6 +3,7 @@
namespace App\Channels\Mail;
use App\Channels\ChannelSyncException;
use App\Support\Settings;
use Carbon\CarbonImmutable;
use Illuminate\Support\Facades\Cache;
use Throwable;
@@ -17,11 +18,31 @@ class MailboxReader
{
public const LAST_SUCCESS_KEY = 'mailbox:last_success_at';
/**
* The state of one landlord's mailbox. Without the landlord in the key, two landlords would report
* each other's last success and alerts would be raised for the wrong one.
*/
public static function key(string $base): string
{
return $base.':'.(Settings::tenant()?->id ?? 0);
}
public const LAST_ERROR_KEY = 'mailbox:last_error';
/**
* The mailbox of the current landlord. Each landlord reads their own; an empty one means the fast path
* is off for them.
*
* @return array<string, mixed>|null
*/
public static function configuration(): ?array
{
return Settings::tenant()?->mailbox();
}
public static function isConfigured(): bool
{
return filled(config('fewo.mailbox.host')) && filled(config('fewo.mailbox.username'));
return self::configuration() !== null;
}
/**
@@ -32,7 +53,11 @@ public static function isConfigured(): bool
*/
public function fetch(array $senders): array
{
$config = config('fewo.mailbox');
$config = self::configuration();
if ($config === null) {
throw new ChannelSyncException('Für diesen Mandanten ist kein Postfach hinterlegt.');
}
try {
$client = (new ClientManager)->make([
@@ -62,13 +87,13 @@ public function fetch(array $senders): array
$client->disconnect();
} catch (Throwable $exception) {
Cache::forever(self::LAST_ERROR_KEY, $exception->getMessage());
Cache::forever(self::key(self::LAST_ERROR_KEY), $exception->getMessage());
throw new ChannelSyncException('Postfach konnte nicht gelesen werden: '.$exception->getMessage(), previous: $exception);
}
Cache::forever(self::LAST_SUCCESS_KEY, now()->toIso8601String());
Cache::forget(self::LAST_ERROR_KEY);
Cache::forever(self::key(self::LAST_SUCCESS_KEY), now()->toIso8601String());
Cache::forget(self::key(self::LAST_ERROR_KEY));
return $mails;
}
+71
View File
@@ -0,0 +1,71 @@
<?php
namespace App\Console\Commands;
use App\ImageWorlds\ImageWorldManifest;
use App\ImageWorlds\ImageWorldRegistry;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('image-worlds:check')]
#[Description('Check every picture world: does each slot in the manifest have its SVG file?')]
class CheckImageWorlds extends Command
{
/**
* A slot without a file is not an error at runtime – templates simply get no decoration. That makes it
* easy to miss, so it is reported here instead of silently leaving a page bare.
*/
public function handle(ImageWorldRegistry $registry): int
{
$worlds = $registry->all();
if ($worlds === []) {
$this->warn('Keine Bildwelt gefunden.');
return self::SUCCESS;
}
$incomplete = 0;
foreach ($worlds as $world) {
$missing = $world->missingFiles();
if ($missing === []) {
$this->info(sprintf('✓ %s (%s): %d Plätze', $world->name, $world->key, count($world->slots)));
continue;
}
$incomplete++;
$this->error(sprintf('✗ %s (%s): ohne Datei – %s', $world->name, $world->key, implode(', ', $missing)));
}
$this->newLine();
$this->line($this->slotOverview($worlds));
return $incomplete === 0 ? self::SUCCESS : self::FAILURE;
}
/**
* Which slot is filled by which world – so a template author sees what they may rely on.
*
* @param array<string, ImageWorldManifest> $worlds
*/
private function slotOverview(array $worlds): string
{
$slots = [];
foreach ($worlds as $world) {
foreach (array_keys($world->slots) as $slot) {
$slots[$slot][] = $world->key;
}
}
ksort($slots);
return collect($slots)
->map(fn (array $keys, string $slot): string => sprintf(' %-18s %s', $slot, implode(', ', $keys)))
->implode(PHP_EOL);
}
}
+46 -2
View File
@@ -3,7 +3,9 @@
namespace App\Console\Commands;
use App\Enums\UserRole;
use App\Models\Tenant;
use App\Models\User;
use App\Tenancy\TenantContext;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
@@ -13,7 +15,7 @@
use function Laravel\Prompts\select;
use function Laravel\Prompts\text;
#[Signature('users:create {email? : E-Mail-Adresse} {--name= : Name} {--role= : admin, rentals oder content}')]
#[Signature('users:create {email? : E-Mail-Adresse} {--name= : Name} {--role= : admin, rentals oder content} {--tenant= : Kurzname des Mandanten}')]
#[Description('Create an admin panel account (the password is entered interactively and never passed as an argument)')]
class CreateUser extends Command
{
@@ -22,6 +24,12 @@ class CreateUser extends Command
*/
public function handle(): int
{
$tenant = $this->resolveTenant();
if ($tenant === false) {
return self::FAILURE;
}
$email = $this->argument('email') ?? text('E-Mail-Adresse', required: true, validate: ['email' => 'email']);
$email = mb_strtolower(trim($email));
@@ -51,7 +59,12 @@ public function handle(): int
return self::FAILURE;
}
User::create(['name' => $name, 'email' => $email, 'role' => $role, 'password' => $password]);
$user = User::create(['name' => $name, 'email' => $email, 'role' => $role, 'password' => $password]);
if ($tenant instanceof Tenant) {
app(TenantContext::class)->set($tenant);
$user->attachCurrentRole($tenant);
}
$this->info("Benutzer {$email} ({$role->getLabel()}) angelegt.");
@@ -59,4 +72,35 @@ public function handle(): int
return self::SUCCESS;
}
/**
* One landlord is used automatically. Several landlords need --tenant. None is allowed:
* the account exists and is attached later.
*/
private function resolveTenant(): Tenant|false|null
{
$slug = $this->option('tenant');
if (is_string($slug) && $slug !== '') {
$tenant = Tenant::query()->where('slug', $slug)->first();
if ($tenant === null) {
$this->error("Kein Mandant mit dem Kurznamen {$slug}.");
return false;
}
return $tenant;
}
$count = Tenant::query()->count();
if ($count > 1) {
$this->error('Es gibt mehrere Mandanten. Bitte --tenant=kurzname angeben.');
return false;
}
return $count === 1 ? Tenant::query()->first() : null;
}
}
+51
View File
@@ -0,0 +1,51 @@
<?php
namespace App\Console\Commands;
use App\Models\Tenant;
use App\Tenancy\TenantArchive;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
use function Laravel\Prompts\confirm;
#[Signature('tenants:delete {slug : Kurzname des Mandanten} {--keep-export : Nicht vorher exportieren} {--force : Ohne Rückfrage}')]
#[Description('Export a landlord and then remove them with all their data and files')]
class DeleteTenant extends Command
{
/**
* Exports first, unless told otherwise: a deletion that cannot be undone should leave something behind.
*/
public function handle(TenantArchive $archive): int
{
$tenant = Tenant::query()->where('slug', $this->argument('slug'))->first();
if ($tenant === null) {
$this->error('Kein Mandant mit dem Kurznamen '.$this->argument('slug').'.');
return self::FAILURE;
}
if (! $this->option('keep-export')) {
$path = $archive->export($tenant, storage_path('app/private/exports'));
$this->info('Export geschrieben: '.$path);
}
if (! $this->option('force') && ! confirm('Mandant '.$tenant->name.' mit allen Daten und Dateien endgültig löschen?', default: false)) {
$this->line('Abgebrochen.');
return self::SUCCESS;
}
$removed = $archive->delete($tenant);
foreach ($removed as $table => $count) {
$this->line(sprintf(' %-22s %d', $table, $count));
}
$this->info('Mandant '.$tenant->name.' gelöscht.');
return self::SUCCESS;
}
}
@@ -3,22 +3,26 @@
namespace App\Console\Commands;
use App\Actions\ExpireReservations;
use App\Models\Tenant;
use App\Tenancy\TenantRunner;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('bookings:expire-holds')]
#[Description('Mark reservations with an elapsed hold time as expired and notify the landlord')]
#[Description('Mark reservations with an elapsed hold time as expired and notify the landlord – once per landlord')]
class ExpireReservationHolds extends Command
{
/**
* Execute the console command.
*/
public function handle(ExpireReservations $expireReservations): int
public function handle(ExpireReservations $expireReservations, TenantRunner $runner): int
{
$count = $expireReservations->handle();
$runner->each(function (Tenant $tenant) use ($expireReservations): void {
$count = $expireReservations->handle();
$this->info("{$count} Vormerkung(en) abgelaufen.");
$this->info("{$tenant->name}: {$count} Vormerkung(en) abgelaufen.");
});
return self::SUCCESS;
}
+40
View File
@@ -0,0 +1,40 @@
<?php
namespace App\Console\Commands;
use App\Models\Tenant;
use App\Tenancy\TenantArchive;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('tenants:export {slug : Kurzname des Mandanten} {--to= : Zielordner, sonst storage/app/private/exports}')]
#[Description('Write all data and files of one landlord into a zip archive')]
class ExportTenant extends Command
{
public function handle(TenantArchive $archive): int
{
$tenant = Tenant::query()->where('slug', $this->argument('slug'))->first();
if ($tenant === null) {
$this->error('Kein Mandant mit dem Kurznamen '.$this->argument('slug').'.');
return self::FAILURE;
}
$path = $archive->export($tenant, (string) ($this->option('to') ?: storage_path('app/private/exports')));
$this->info('Export von '.$tenant->name.': '.$path.' ('.$this->size($path).')');
return self::SUCCESS;
}
private function size(string $path): string
{
$bytes = (int) (filesize($path) ?: 0);
return $bytes > 1048576
? round($bytes / 1048576, 1).' MB'
: round($bytes / 1024).' KB';
}
}
+27 -13
View File
@@ -5,24 +5,40 @@
use App\Actions\ProcessPortalMail;
use App\Channels\ChannelSyncException;
use App\Channels\Mail\MailboxReader;
use App\Enums\TenantServiceKey;
use App\Models\Channel;
use App\Models\Tenant;
use App\Tenancy\TenantFeatures;
use App\Tenancy\TenantRunner;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('channels:fetch-mail')]
#[Description('Read booking notifications of the portals from the mailbox and block recognised bookings immediately')]
#[Description('Read booking notifications of the portals from each landlord\'s mailbox and block recognised bookings immediately')]
class FetchPortalMail extends Command
{
/**
* Execute the console command.
* Execute the console command. Every landlord has their own mailbox, so every landlord gets their own
* run – one landlord's credentials are never used to read another one's mail.
*/
public function handle(MailboxReader $reader, ProcessPortalMail $processPortalMail): int
public function handle(MailboxReader $reader, ProcessPortalMail $processPortalMail, TenantRunner $runner): int
{
if (! MailboxReader::isConfigured()) {
$this->line('Kein Postfach konfiguriert (FEWO_MAILBOX_HOST).');
$runner->each(fn (Tenant $tenant) => $this->fetchForCurrentLandlord($reader, $processPortalMail, $tenant));
return self::SUCCESS;
return self::SUCCESS;
}
private function fetchForCurrentLandlord(MailboxReader $reader, ProcessPortalMail $processPortalMail, Tenant $tenant): void
{
if (! app(TenantFeatures::class)->enabled(TenantServiceKey::PortalMail, $tenant)) {
return;
}
if (! MailboxReader::isConfigured()) {
$this->line("{$tenant->name}: kein Postfach hinterlegt.");
return;
}
$senders = Channel::query()->active()->get()
@@ -32,25 +48,23 @@ public function handle(MailboxReader $reader, ProcessPortalMail $processPortalMa
->all();
if ($senders === []) {
$this->line('Für kein Portal sind Absender hinterlegt.');
$this->line("{$tenant->name}: für kein Portal sind Absender hinterlegt.");
return self::SUCCESS;
return;
}
try {
$mails = $reader->fetch($senders);
} catch (ChannelSyncException $exception) {
$this->error($exception->getMessage());
$this->error("{$tenant->name}: {$exception->getMessage()}");
return self::FAILURE;
return;
}
foreach ($mails as $mail) {
if ($record = $processPortalMail->handle($mail)) {
$this->info("{$record->channel->name}: {$record->type->getLabel()} → {$record->status->getLabel()} ({$record->subject})");
$this->info("{$tenant->name} – {$record->channel->name}: {$record->type->getLabel()} → {$record->status->getLabel()} ({$record->subject})");
}
}
return self::SUCCESS;
}
}
+58
View File
@@ -0,0 +1,58 @@
<?php
namespace App\Console\Commands;
use App\Models\Site;
use App\Tenancy\TenantContext;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('sites:import-stommer-brand {site : ID der bestehenden Stommer-Website}')]
#[Description('Copy the legacy Stommer brand into its own website without replacing uploaded graphics')]
class ImportSiteBrand extends Command
{
/**
* Execute the console command.
*/
public function handle(): int
{
$site = Site::withoutGlobalScope('tenant')->with('tenant')->find($this->argument('site'));
if ($site === null || $site->tenant?->slug !== 'stommer') {
$this->error('Nur die bestehende Stommer-Website darf diese Marke übernehmen.');
return self::FAILURE;
}
$seebad = $site->theme === 'seebad';
$sources = [
Site::BRAND_LOGO => $seebad ? resource_path('themes/seebad/img/logo-bildmarke-720.webp') : public_path('brand/logo.svg'),
Site::BRAND_FAVICON => $seebad ? resource_path('themes/seebad/img/favicon.svg') : public_path('brand/favicon.svg'),
Site::BRAND_DOCUMENT_LOGO => public_path('brand/logo-600.png'),
];
foreach ($sources as $collection => $path) {
if (! $site->hasMedia($collection) && ! is_file($path)) {
$this->error('Markenquelle fehlt: '.$path);
return self::FAILURE;
}
}
app(TenantContext::class)->run($site->tenant, function () use ($site, $sources): void {
foreach ($sources as $collection => $path) {
if ($site->hasMedia($collection)) {
$this->line($collection.': vorhandene Grafik beibehalten.');
continue;
}
$site->addMedia($path)->preservingOriginal()->toMediaCollection($collection);
$this->info($collection.': übernommen.');
}
});
return self::SUCCESS;
}
}
+34
View File
@@ -0,0 +1,34 @@
<?php
namespace App\Console\Commands;
use App\Models\User;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('users:promote-operator {email : E-Mail-Adresse}')]
#[Description('Grant the operator flag. The account keeps its password, two-factor setup and any landlord role.')]
class PromoteOperator extends Command
{
/**
* Execute the console command.
*/
public function handle(): int
{
$email = mb_strtolower(trim((string) $this->argument('email')));
$user = User::query()->where('email', $email)->first();
if ($user === null) {
$this->error('Kein Benutzer mit dieser E-Mail.');
return self::FAILURE;
}
$user->forceFill(['is_operator' => true])->save();
$this->info("{$email} ist jetzt Betreiber. Eine bestehende Mandanten-Rolle bleibt.");
return self::SUCCESS;
}
}
+51
View File
@@ -0,0 +1,51 @@
<?php
namespace App\Console\Commands;
use App\Support\Settings;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Mail;
use Throwable;
#[Signature('mail:test {to? : Empfänger (Standard: Benachrichtigungsadresse)}')]
#[Description('Send a test e-mail through the configured mailer and report delivery errors (e.g. SMTP login)')]
class SendTestMail extends Command
{
/**
* Execute the console command.
*/
public function handle(): int
{
$to = (string) ($this->argument('to') ?: Settings::notificationRecipients()[0] ?? config('fewo.owner.email'));
$mailer = (string) config('mail.default');
$redirect = Settings::mailRedirect();
$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}.");
}
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).');
}
try {
Mail::raw("Testmail der Ferienwohnung Stommer\n\nGesendet am ".now()->format('d.m.Y H:i:s').' von '.config('app.url').".\nWenn diese Mail ankommt, funktioniert der Versand.", function ($message) use ($to): void {
$message->to($to)->subject('Testmail Ferienwohnung Stommer – '.now()->format('d.m.Y H:i'));
});
} catch (Throwable $exception) {
$this->error('Versand fehlgeschlagen: '.$exception->getMessage());
return self::FAILURE;
}
if ($mailer === 'log') {
$this->line('Mail erzeugt, aber nicht zugestellt (Versandweg "log").');
} else {
$this->info('Übergeben an den Mailserver – bitte Posteingang (und Spam-Ordner) prüfen.');
}
return self::SUCCESS;
}
}
+2 -2
View File
@@ -9,7 +9,7 @@
use Illuminate\Console\Command;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
#[Signature('photos:strip-metadata')]
#[Signature('photos:strip-metadata {--force : Auch bereits bereinigte Fotos erneut bearbeiten}')]
#[Description('Remove metadata (GPS position, camera data) from all stored original photos – new uploads are cleaned automatically')]
class StripPhotoMetadata extends Command
{
@@ -19,7 +19,7 @@ class StripPhotoMetadata extends Command
public function handle(): int
{
$cleaned = Media::query()->where('collection_name', Photo::COLLECTION)->get()
->filter(fn (Media $media): bool => StripImageMetadata::strip($media))
->filter(fn (Media $media): bool => StripImageMetadata::strip($media, (bool) $this->option('force')))
->count();
$this->info("{$cleaned} Original-Foto(s) bereinigt.");
+12 -5
View File
@@ -4,18 +4,27 @@
use App\Actions\SyncChannel;
use App\Models\Channel;
use App\Tenancy\TenantRunner;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('channels:sync {channel? : ID of a single channel}')]
#[Description('Import the occupations of all active portals (or one) and report conflicts')]
#[Description('Import the occupations of all active portals (or one) and report conflicts – once per landlord')]
class SyncChannels extends Command
{
/**
* Execute the console command.
* Execute the console command. Runs per landlord so that conflict mails carry the right sender and
* reach the right people.
*/
public function handle(SyncChannel $syncChannel): int
public function handle(SyncChannel $syncChannel, TenantRunner $runner): int
{
$runner->each(fn () => $this->syncCurrentLandlord($syncChannel));
return self::SUCCESS;
}
private function syncCurrentLandlord(SyncChannel $syncChannel): void
{
$channels = Channel::query()->active()
->when($this->argument('channel'), fn ($query, $id) => $query->whereKey($id))
@@ -29,7 +38,5 @@ public function handle(SyncChannel $syncChannel): int
? $this->info("✓ {$channel->name}: {$log->events} Belegungen, +{$log->added} ~{$log->changed} -{$log->removed}, Konflikte: {$log->conflicts}")
: $this->error("✗ {$channel->name}: {$log->message}");
}
return self::SUCCESS;
}
}
+12 -2
View File
@@ -3,6 +3,7 @@
namespace App\Documents;
use App\Models\Booking;
use App\Models\Site;
use Barryvdh\DomPDF\Facade\Pdf;
use Illuminate\Support\Facades\Storage;
@@ -18,11 +19,20 @@ class RentalContract
public function generate(Booking $booking, bool $draft = false): string
{
$booking->loadMissing(['guest', 'property']);
$path = $draft
$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);
Storage::disk(self::DISK)->put($path, Pdf::loadView('pdf.contract', ['booking' => $booking, 'draft' => $draft])->setPaper('a4')->output());
// 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);
Storage::disk(self::DISK)->put($path, Pdf::loadView('pdf.contract', [
'booking' => $booking,
'draft' => $draft,
'logo' => $logo,
])->setPaper('a4')->output());
$booking->update([$draft ? 'offer_path' : 'contract_path' => $path]);
return $path;
+12 -2
View File
@@ -2,10 +2,15 @@
namespace App\Enums;
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\Channels\ChannelResource;
use App\Filament\Resources\ChannelTasks\ChannelTaskResource;
use App\Filament\Resources\Guests\GuestResource;
use App\Filament\Resources\Photos\PhotoResource;
use App\Filament\Resources\PortalOccupations\PortalOccupationResource;
use App\Filament\Resources\Reviews\ReviewResource;
use Filament\Support\Contracts\HasDescription;
use Filament\Support\Contracts\HasLabel;
@@ -24,11 +29,16 @@ enum AdminMode: string implements HasDescription, HasLabel
* @var list<class-string>
*/
public const SIMPLE_NAVIGATION = [
OccupancyCalendar::class,
BookingResource::class,
PortalOccupationResource::class,
BlockedPeriodResource::class,
PricesAndOffers::class,
GuestResource::class,
ChannelTaskResource::class,
ChannelResource::class,
ReviewResource::class,
PhotoResource::class,
];
public function getLabel(): string
@@ -42,8 +52,8 @@ public function getLabel(): string
public function getDescription(): string
{
return match ($this) {
self::Simple => 'Nur das Tägliche: Anfragen, Buchungen und Verträge, Sperrzeiten, Gäste, Portal-Aufgaben, Bewertungen',
self::Expert => 'Alle Einstellungen: Preise, Angebote, Portale, Webseite, System',
self::Simple => 'Das Tägliche: Anfragen, Buchungen und Verträge, Sperrzeiten, Preise & Angebote, Gäste, Kalenderabgleich (iCal), Portal-Aufgaben, Bewertungen, Fotos',
self::Expert => 'Alle Einstellungen: Preise, Angebote, Kalenderabgleich (iCal), Webseite, System',
};
}
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasLabel;
enum BlockedPeriodPurpose: string implements HasLabel
{
case OwnUse = 'own_use';
case Maintenance = 'maintenance';
case Other = 'other';
public function getLabel(): string
{
return match ($this) {
self::OwnUse => 'Eigenbelegung',
self::Maintenance => 'Wartung / Renovierung',
self::Other => 'Sonstige Sperre',
};
}
}
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasLabel;
enum ChannelBookingModel: string implements HasLabel
{
case Inquiry = 'inquiry';
case PortalBooking = 'portal_booking';
case Mixed = 'mixed';
public function getLabel(): string
{
return match ($this) {
self::Inquiry => 'Vermittlung / Anfrage',
self::PortalBooking => 'Portalbuchung',
self::Mixed => 'Gemischt',
};
}
}
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasLabel;
enum ChannelEchoBehavior: string implements HasLabel
{
case Unverified = 'unverified';
case NoReexport = 'no_reexport';
case Reexports = 'reexports';
public function getLabel(): string
{
return match ($this) {
self::Unverified => 'Noch ungeprüft',
self::NoReexport => 'Im geprüften Fall keine Weitergabe importierter Ereignisse',
self::Reexports => 'Gibt importierte Ereignisse weiter – neue Belegungen erst klären',
};
}
}
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasLabel;
enum ChannelExportMode: string implements HasLabel
{
case Test = 'test';
case Regular = 'regular';
public function getLabel(): string
{
return match ($this) {
self::Test => 'Testbetrieb: nur eigene Belegungen',
self::Regular => 'Regulär: alle übrigen Kanäle einbeziehen',
};
}
}
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasLabel;
enum ChannelStatus: string implements HasLabel
{
case Setup = 'setup';
case Active = 'active';
case Paused = 'paused';
public function getLabel(): string
{
return match ($this) {
self::Setup => 'Noch nicht eingerichtet',
self::Active => 'Aktiv',
self::Paused => 'Pausiert',
};
}
}
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasColor;
use Filament\Support\Contracts\HasLabel;
enum OccupationKind: string implements HasColor, HasLabel
{
case Reservation = 'reservation';
case Block = 'block';
case Unknown = 'unknown';
public function getLabel(): string
{
return match ($this) {
self::Reservation => 'Portalreservierung',
self::Block => 'Sperrzeit',
self::Unknown => 'Ungeklärte Belegung',
};
}
public function getColor(): string
{
return match ($this) {
self::Reservation => 'info',
self::Block => 'gray',
self::Unknown => 'warning',
};
}
}
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace App\Enums;
/**
* What a role may do inside the current landlord. A new role is a new case on UserRole plus a list here.
*/
enum Permission: string
{
case Bookings = 'bookings';
case Properties = 'properties';
case Guests = 'guests';
case Reviews = 'reviews';
case Channels = 'channels';
case Content = 'content';
case Users = 'users';
case Settings = 'settings';
}
+13
View File
@@ -9,6 +9,8 @@ enum PhotoCategory: string implements HasLabel
case Apartment = 'apartment';
case Outdoor = 'outdoor';
case Area = 'area';
/** Floor plans and drawings: chosen explicitly (e.g. for the interactive floor plan), never shown in galleries. */
case Plan = 'plan';
public function getLabel(): string
{
@@ -16,6 +18,17 @@ public function getLabel(): string
self::Apartment => 'Wohnung',
self::Outdoor => 'Terrasse & Garten',
self::Area => 'Kühlungsborn & Umgebung',
self::Plan => 'Grundriss & Pläne',
};
}
/**
* Categories a gallery or an automatic photo may show.
*
* @return list<self>
*/
public static function forGalleries(): array
{
return array_values(array_filter(self::cases(), fn (self $category): bool => $category !== self::Plan));
}
}
+76
View File
@@ -0,0 +1,76 @@
<?php
namespace App\Enums;
/**
* Services the operator unlocks per landlord. `isWired()` says whether the application really asks before
* it acts – a service that nothing asks for must not be offered as a switch, because switching it would
* promise something that does not happen.
*/
enum TenantServiceKey: string
{
case PortalSync = 'portal_sync';
case PortalMail = 'portal_mail';
case AiOffers = 'ai_offers';
case AiMarketing = 'ai_marketing';
case AiGuestMail = 'ai_guest_mail';
public function label(): string
{
return match ($this) {
self::PortalSync => 'Portal-Abgleich (iCal)',
self::PortalMail => 'Portal-Postfach (Schnellweg)',
self::AiOffers => 'KI: Angebotsentwürfe',
self::AiMarketing => 'KI: Vermarktungsassistent',
self::AiGuestMail => 'KI: Gästekommunikation',
};
}
public function description(): string
{
return match ($this) {
self::PortalSync => 'Belegungen der Portale über iCal einlesen und den eigenen Kalender als Feed anbieten.',
self::PortalMail => 'Buchungsmails der Portale aus dem Postfach lesen und Termine sofort sperren.',
self::AiOffers, self::AiMarketing, self::AiGuestMail => 'Noch nicht gebaut.',
};
}
/**
* Whether the application asks this switch before it acts. Only wired services are offered for switching.
*/
public function isWired(): bool
{
return match ($this) {
self::PortalSync, self::PortalMail => true,
self::AiOffers, self::AiMarketing, self::AiGuestMail => false,
};
}
/**
* What applies to a landlord the operator has not decided about yet. The portal services were part of
* the product before there were landlords, so switching tenancy on must not silently stop them.
*/
public function enabledByDefault(): bool
{
return $this->isWired();
}
/**
* Whether the landlord's own API key is of any use. Nothing calls out yet, so no service has one.
*/
public function usesApiKey(): bool
{
return match ($this) {
self::AiOffers, self::AiMarketing, self::AiGuestMail => true,
self::PortalSync, self::PortalMail => false,
};
}
/**
* @return list<self>
*/
public static function wired(): array
{
return array_values(array_filter(self::cases(), fn (self $service): bool => $service->isWired()));
}
}
+30 -2
View File
@@ -14,7 +14,7 @@ enum UserRole: string implements HasDescription, HasLabel
public function getLabel(): string
{
return match ($this) {
self::Admin => 'Administrator',
self::Admin => 'Mandanten-Administrator',
self::Rentals => 'Vermietung',
self::Content => 'Inhalte',
};
@@ -23,9 +23,37 @@ public function getLabel(): string
public function getDescription(): string
{
return match ($this) {
self::Admin => 'Alles, inklusive Benutzerverwaltung',
self::Admin => 'Alles im eigenen Mandanten, inklusive Benutzerverwaltung',
self::Rentals => 'Buchungen, Gäste, Preise, Angebote und Bewertungen',
self::Content => 'Bilder, Texte, FAQ, Hinweise und Bewertungen',
};
}
public function grants(Permission $permission): bool
{
return in_array($permission, $this->permissions(), true);
}
/**
* Abilities inside the current landlord. The operator is not a role here.
*
* @return list<Permission>
*/
public function permissions(): array
{
return match ($this) {
self::Admin => Permission::cases(),
self::Rentals => [
Permission::Bookings,
Permission::Properties,
Permission::Guests,
Permission::Reviews,
Permission::Channels,
],
self::Content => [
Permission::Content,
Permission::Reviews,
],
};
}
}
@@ -0,0 +1,50 @@
<?php
namespace App\Filament\Actions;
use App\Actions\AssignOccupationGuest;
use App\Enums\OccupationKind;
use App\Filament\Resources\Guests\Schemas\GuestForm;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Guest;
use Filament\Actions\Action;
use Filament\Forms\Components\Select;
use Filament\Notifications\Notification;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Get;
class AssignGuestAction
{
public static function make(): Action
{
return Action::make('assignGuest')->label('Gast zuordnen')
->modalWidth('3xl')
->visible(fn (Booking|BlockedPeriod $record): bool => auth()->user()?->can('update', $record)
&& ($record instanceof Booking || (! $record->trashed() && ! $record->is_representation && $record->occupationKind() === OccupationKind::Reservation)))
->authorize(fn (Booking|BlockedPeriod $record): bool => auth()->user()?->can('update', $record) ?? false)
->modalDescription('Einen vorhandenen Gast persönlich auswählen oder einen neuen Gast anlegen. Ein Namensfragment ist kein Identitätsnachweis. Die Zuordnung versendet keine Nachricht und ändert keine Belegungszeiträume.')
->fillForm(fn (Booking|BlockedPeriod $record): array => [
'mode' => 'existing', 'guest_id' => $record->guest_id, 'country' => 'DE',
'first_name' => $record instanceof BlockedPeriod ? ($record->ical_interpretation['fields']['guest_first_name'] ?? '') : '',
])
->schema([
Select::make('mode')->label('Zuordnung')->options(['existing' => 'Vorhandenen Gast auswählen', 'new' => 'Neuen Gast anlegen'])->required()->live(),
Select::make('guest_id')->label('Gast')->searchable()
->getSearchResultsUsing(fn (string $search): array => Guest::query()->whereNull('anonymized_at')
->where(fn ($query) => $query->where('first_name', 'like', '%'.$search.'%')->orWhere('last_name', 'like', '%'.$search.'%')->orWhere('email', 'like', '%'.$search.'%'))
->orderBy('last_name')->orderBy('id')->limit(50)->get()->mapWithKeys(fn (Guest $guest): array => [$guest->id => $guest->full_name.($guest->email ? ' · '.$guest->email : ' · E-Mail unbekannt')])->all())
->getOptionLabelUsing(fn ($value): ?string => Guest::find($value)?->full_name)
->visible(fn (Get $get): bool => $get('mode') === 'existing')->required(fn (Get $get): bool => $get('mode') === 'existing'),
Section::make('Kontakt & Adresse')->columns(2)->visible(fn (Get $get): bool => $get('mode') === 'new')
->schema(GuestForm::contactFields()),
Section::make('Notizen & Markierungen')->visible(fn (Get $get): bool => $get('mode') === 'new')
->schema(GuestForm::personalFields()),
])
->action(function (Booking|BlockedPeriod $record, array $data, AssignOccupationGuest $assign): void {
$assign->handle($record, $data['mode'] === 'existing' ? (int) $data['guest_id'] : null, $data);
$record->refresh()->load('guest');
Notification::make()->title('Gast zugeordnet')->success()->send();
});
}
}
@@ -0,0 +1,33 @@
<?php
namespace App\Filament\Concerns;
use App\Models\Property;
use App\Support\CurrentProperty;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;
/**
* Limits a resource list to the apartment chosen in the admin menu (CurrentProperty).
* Records stay reachable by URL; opening one switches to its apartment (SelectsRecordProperty).
*/
trait ListsCurrentProperty
{
protected function getTableQuery(): Builder|Relation|null
{
$query = parent::getTableQuery();
$property = app(CurrentProperty::class)->get();
return $query instanceof Builder && $property !== null ? $this->scopeToProperty($query, $property) : $query;
}
/**
* @param Builder<Model> $query
* @return Builder<Model>
*/
protected function scopeToProperty(Builder $query, Property $property): Builder
{
return $query->where($query->qualifyColumn('property_id'), $property->id);
}
}
@@ -0,0 +1,34 @@
<?php
namespace App\Filament\Concerns;
use App\Models\Property;
use App\Support\CurrentProperty;
use Closure;
use Illuminate\Database\Eloquent\Model;
/**
* Opening a record of another apartment (e.g. from a notification e-mail) switches the admin to that apartment,
* so the menu always shows the apartment the open record belongs to.
*/
trait SelectsRecordProperty
{
public static function resolveRecordRouteBinding(int|string $key, ?Closure $modifyQuery = null): ?Model
{
$record = parent::resolveRecordRouteBinding($key, $modifyQuery);
$propertyId = $record !== null ? static::recordPropertyId($record) : null;
if ($propertyId !== null && $propertyId !== app(CurrentProperty::class)->id() && ($property = Property::query()->find($propertyId))) {
app(CurrentProperty::class)->select($property);
}
return $record;
}
public static function recordPropertyId(Model $record): ?int
{
$id = $record->getAttribute('property_id');
return $id !== null ? (int) $id : null;
}
}
@@ -40,7 +40,8 @@ public static function optionLabel(Photo $photo): string
? '<img src="'.e($thumbnail).'" alt="" loading="lazy" style="width:4.5rem;height:3rem;object-fit:cover;border-radius:.25rem;flex-shrink:0">'
: '<span style="width:4.5rem;height:3rem;border-radius:.25rem;background:#e5e7eb;flex-shrink:0"></span>';
$hidden = $photo->is_published ? '' : ' <em style="opacity:.6">(ausgeblendet)</em>';
$seasons = $photo->appearanceNames() === [] ? '' : ' <em style="opacity:.75">· nur '.e(implode(', ', $photo->appearanceNames())).'</em>';
return '<span style="display:flex;align-items:center;gap:.75rem">'.$image.'<span>'.e($photo->alt_text).$hidden.'</span></span>';
return '<span style="display:flex;align-items:center;gap:.75rem">'.$image.'<span>'.e($photo->alt_text).$seasons.$hidden.'</span></span>';
}
}
@@ -0,0 +1,74 @@
<?php
namespace App\Filament\Operator\Concerns;
use App\Enums\TenantServiceKey;
use App\Models\Tenant;
use App\Tenancy\TenantFeatures;
/**
* The service switches of the tenant form. They live in their own table, so the form state is read and
* written separately from the landlord's own columns. Only wired services are written – a switch for a
* service nothing asks about would promise something that does not happen.
*
* Holds no Filament hooks; EditsTenantSetup calls these.
*/
trait EditsTenantServices
{
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
private function fillServices(array $data): array
{
$tenant = $this->record;
if (! $tenant instanceof Tenant) {
return $data; // creating: there is nothing to read yet
}
$stored = $tenant->services->keyBy('service');
$data['services'] = collect(TenantServiceKey::wired())
->mapWithKeys(fn (TenantServiceKey $service): array => [$service->value => [
'is_enabled' => $stored->get($service->value)?->is_enabled ?? $service->enabledByDefault(),
]])
->all();
return $data;
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
private function takeServices(array $data): array
{
$this->services = is_array($data['services'] ?? null) ? $data['services'] : [];
unset($data['services']);
return $data;
}
private function saveServices(): void
{
$tenant = $this->record;
if (! $tenant instanceof Tenant) {
return;
}
foreach (TenantServiceKey::wired() as $service) {
$state = $this->services[$service->value] ?? [];
$tenant->services()->updateOrCreate(
['service' => $service->value],
['is_enabled' => (bool) ($state['is_enabled'] ?? false)],
);
}
$tenant->unsetRelation('services');
app(TenantFeatures::class)->forget($tenant);
}
}
@@ -0,0 +1,58 @@
<?php
namespace App\Filament\Operator\Concerns;
/**
* Everything the operator sets up for a landlord that does not live in the tenants table itself:
* the websites with their entry addresses, and the services that are unlocked.
*/
trait EditsTenantSetup
{
use EditsTenantServices;
use EditsTenantWebsites;
/** @var array<string, array<string, mixed>> */
public array $services = [];
/** @var list<array<string, mixed>> */
public array $websites = [];
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
protected function mutateFormDataBeforeFill(array $data): array
{
return $this->fillWebsites($this->fillServices($data));
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
protected function mutateFormDataBeforeCreate(array $data): array
{
return $this->takeWebsites($this->takeServices($data));
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
protected function mutateFormDataBeforeSave(array $data): array
{
return $this->takeWebsites($this->takeServices($data));
}
protected function afterCreate(): void
{
$this->saveServices();
$this->saveWebsites();
}
protected function afterSave(): void
{
$this->saveServices();
$this->saveWebsites();
}
}
@@ -0,0 +1,182 @@
<?php
namespace App\Filament\Operator\Concerns;
use App\Models\Page;
use App\Models\Site;
use App\Models\SiteDomain;
use App\Models\Tenant;
use App\Tenancy\TenantContext;
use Illuminate\Validation\ValidationException;
/**
* The websites of a landlord and the addresses they answer on. These belong to the operator: the webspace
* and the hosting are the operator's, and a landlord must not be able to point an address at themselves.
*
* Wiring a new domain to this directory stays a manual step at the hoster. What is kept here is the other
* half: which host belongs to which website, and through it to which landlord.
*
* Holds no Filament hooks; EditsTenantSetup calls these.
*/
trait EditsTenantWebsites
{
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
private function fillWebsites(array $data): array
{
$tenant = $this->record;
if (! $tenant instanceof Tenant) {
return $data;
}
$data['websites'] = $tenant->sites()->withoutGlobalScope('tenant')->with('domains')->get()
->map(fn (Site $site): array => [
'id' => $site->id,
'name' => $site->name,
'hosts' => $site->domains->pluck('host')->all(),
])
->all();
return $data;
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
private function takeWebsites(array $data): array
{
$this->websites = is_array($data['websites'] ?? null) ? array_values($data['websites']) : [];
$this->normaliseWebsites();
unset($data['websites']);
return $data;
}
/**
* Cleans the entered addresses and refuses what already belongs elsewhere, before anything is written.
*/
private function normaliseWebsites(): void
{
$seen = [];
foreach ($this->websites as $index => $website) {
$hosts = [];
foreach ((array) ($website['hosts'] ?? []) as $host) {
$host = SiteDomain::normalise(is_string($host) ? $host : null);
if ($host === '') {
continue;
}
if (in_array($host, $seen, true)) {
throw ValidationException::withMessages([
'data.websites' => 'Die Adresse '.$host.' ist mehrfach eingetragen.',
]);
}
$seen[] = $host;
$hosts[] = $host;
}
$this->websites[$index]['hosts'] = $hosts;
}
$this->refuseForeignHosts($seen);
}
/**
* @param list<string> $hosts
*/
private function refuseForeignHosts(array $hosts): void
{
$ownIds = collect($this->websites)->pluck('id')->filter()->all();
$taken = SiteDomain::query()
->whereIn('host', $hosts)
->whereNotIn('site_id', $ownIds ?: [0])
->pluck('host');
if ($taken->isNotEmpty()) {
throw ValidationException::withMessages([
'data.websites' => 'Gehört bereits zu einer anderen Website: '.$taken->implode(', '),
]);
}
}
/**
* Writes the websites. A website that is new gets an empty home page straight away, because a website
* without one answers 404 and the landlord would have no way in.
*/
private function saveWebsites(): void
{
$tenant = $this->record;
if (! $tenant instanceof Tenant) {
return;
}
app(TenantContext::class)->run($tenant, function () use ($tenant): void {
$keep = [];
foreach ($this->websites as $website) {
$name = trim((string) ($website['name'] ?? ''));
if ($name === '') {
continue;
}
$hosts = (array) ($website['hosts'] ?? []);
$site = $this->siteFor($tenant, $website['id'] ?? null, $name, $hosts);
$keep[] = $site->id;
$site->domains()->whereNotIn('host', $hosts ?: [''])->delete();
foreach ($hosts as $host) {
SiteDomain::query()->updateOrCreate(['host' => $host], ['site_id' => $site->id]);
}
}
$tenant->sites()->whereNotIn('id', $keep ?: [0])->each(fn (Site $site) => $site->delete());
});
}
/**
* @param list<string> $hosts
*/
private function siteFor(Tenant $tenant, mixed $id, string $name, array $hosts): Site
{
$site = $id ? Site::query()->whereKey($id)->first() : null;
if ($site !== null) {
$site->update(['name' => $name, 'domain' => $hosts[0] ?? null]);
return $site;
}
$site = Site::query()->create([
'tenant_id' => $tenant->id,
'name' => $name,
'domain' => $hosts[0] ?? null,
'is_default' => $tenant->sites()->count() === 0,
'theme' => config('themes.base'),
]);
Page::query()->create([
'site_id' => $site->id,
'slug' => Page::HOME,
'title' => $name,
'sections' => [],
'is_published' => true,
]);
return $site;
}
}
@@ -0,0 +1,116 @@
<?php
namespace App\Filament\Operator\Pages;
use App\Enums\TenantServiceKey;
use App\Models\Tenant;
use App\Models\TenantAccessLog;
use App\Tenancy\TenantConfig;
use BackedEnum;
use Filament\Pages\Page;
use Filament\Support\Icons\Heroicon;
use Illuminate\Support\Collection;
/**
* What applies to the whole installation: the limits every landlord is bound by, the delivery path, and
* who opened whose admin. These values come from the server's .env and are deliberately not editable here –
* they protect the system against the landlords, so a landlord's admin must not be able to reach them.
*/
class SystemOverview extends Page
{
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedServerStack;
protected static ?string $navigationLabel = 'System';
protected static ?string $title = 'System';
protected static ?string $slug = 'system';
protected static ?int $navigationSort = 2;
protected string $view = 'filament.operator.system-overview';
/**
* The ceilings a landlord may tighten but never exceed.
*
* @return list<array{label: string, value: string, note: string}>
*/
public function limits(): array
{
$config = app(TenantConfig::class);
$rows = [
['Gästedaten löschen nach', 'fewo.guest_retention_years', 'Jahre', 'Ein Mandant kann kürzer löschen, nicht länger aufbewahren.'],
['Nicht gebuchte Anfragen löschen nach', 'fewo.retention.inquiry_months', 'Monate', ''],
['Portal-Mail-Auszug löschen nach', 'fewo.retention.portal_email_excerpt_days', 'Tage', ''],
['Herkunftsangaben löschen nach', 'fewo.retention.attribution_months', 'Monate', ''],
['Bot-Schutz: Mindestzeit im Formular', 'fewo.spam.min_seconds', 'Sekunden', 'Ein Mandant kann länger warten lassen, nicht kürzer.'],
['Bot-Schutz: Anfragen je IP und Stunde', 'fewo.spam.per_ip_per_hour', '', ''],
['Bot-Schutz: Anfragen je E-Mail und Tag', 'fewo.spam.per_email_per_day', '', ''],
['Bot-Schutz: offene Anfragen je E-Mail', 'fewo.spam.open_requests_per_email', '', ''],
['Bot-Schutz: Links im Text', 'fewo.spam.max_links', '', ''],
];
return array_map(fn (array $row): array => [
'label' => $row[0],
'value' => trim($config->baselineValue($row[1]).' '.$row[2]),
'note' => $row[3],
], $rows);
}
/**
* Values that belong to the whole installation and to no landlord.
*
* @return list<array{label: string, value: string, note: string}>
*/
public function global(): array
{
$redirect = config('fewo.mail_redirect_to');
return [
[
'label' => 'Anfragen aller Websites zusammen',
'value' => config('fewo.spam.total_per_hour').' je Stunde',
'note' => 'Flutgrenze über alle Mandanten. Kein Mandant kann sie anheben.',
],
[
'label' => 'Harte Mail-Umleitung',
'value' => filled($redirect) ? (string) $redirect : 'nicht gesetzt',
'note' => filled($redirect)
? 'FEWO_MAIL_REDIRECT_TO: jede E-Mail dieses Servers geht hierhin, auch bei scharf geschalteten Mandanten.'
: 'Ohne Umleitung entscheidet die Betriebsart des jeweiligen Mandanten.',
],
[
'label' => 'Versandweg',
'value' => (string) config('mail.default'),
'note' => 'SMTP-Zugang und Datenbank sind Infrastruktur und liegen in der .env des Servers.',
],
[
'label' => 'Datenbank-Sicherungen',
'value' => config('fewo.backup.keep').' Stück',
'note' => 'Eine Sicherung der ganzen Datenbank, über alle Mandanten.',
],
];
}
/**
* @return Collection<int, Tenant>
*/
public function tenants(): Collection
{
return Tenant::query()->withCount(['services' => fn ($query) => $query->where('is_enabled', true)])->orderBy('name')->get();
}
public function wiredServiceCount(): int
{
return count(TenantServiceKey::wired());
}
/**
* @return Collection<int, TenantAccessLog>
*/
public function accessLog(): Collection
{
return TenantAccessLog::query()->with(['tenant', 'user'])->latest('created_at')->limit(20)->get();
}
}
@@ -0,0 +1,114 @@
<?php
namespace App\Filament\Operator\Pages;
use App\Support\SystemSettings;
use BackedEnum;
use Filament\Actions\Action;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
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;
/**
* The settings of the whole installation. They are the baseline every landlord is bound by, and a
* landlord's admin never reaches this page.
*
* Empty means: the value from the server's .env applies again. Database credentials and APP_KEY are not
* here and cannot be – they are needed to open the database and to decrypt what is stored in it.
*/
class SystemSettingsPage extends Page
{
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedAdjustmentsHorizontal;
protected static ?string $navigationLabel = 'Einstellungen';
protected static ?string $title = 'Systemweite Einstellungen';
protected static ?string $slug = 'einstellungen';
protected static ?int $navigationSort = 3;
/** @var array<string, mixed> */
public array $data = [];
public function mount(): void
{
$this->form->fill(collect(SystemSettings::EDITABLE)
->mapWithKeys(fn (array $definition, string $key): array => [self::field($key) => SystemSettings::get($key)])
->all());
}
public function form(Schema $schema): Schema
{
$sections = collect(SystemSettings::EDITABLE)
->groupBy(fn (array $definition): string => $definition[2], preserveKeys: true)
->map(fn ($group, string $section) => Section::make($section)
->columns(2)
->schema($group->keys()->map(fn (string $key) => $this->field_($key))->all()));
return $schema
->statePath('data')
->components([
Text::make('Leer lassen heißt: der Wert aus der .env des Servers gilt wieder. Datenbank-Zugang und APP_KEY stehen bewusst nicht hier – sie werden gebraucht, um die Datenbank überhaupt zu öffnen und das Gespeicherte zu entschlüsseln.'),
...$sections->values()->all(),
]);
}
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
{
$data = $this->form->getState();
SystemSettings::save(collect(SystemSettings::EDITABLE)
->mapWithKeys(fn (array $definition, string $key): array => [$key => $data[self::field($key)] ?? null])
->all());
Notification::make()->title('Gespeichert')->success()->send();
}
/**
* Config keys contain dots, which Filament would read as nesting.
*/
private static function field(string $key): string
{
return str_replace('.', '__', $key);
}
private function field_(string $key): TextInput|Select
{
[$label, $kind, , $help] = SystemSettings::EDITABLE[$key];
$name = self::field($key);
if ($kind === 'mailer') {
return Select::make($name)
->label($label)
->helperText($help)
->options(['smtp' => 'SMTP (echter Versand)', 'log' => 'Nur Logdatei (kein Versand)', 'array' => 'Verwerfen (nur für Tests)']);
}
$field = TextInput::make($name)->label($label)->helperText($help);
return match ($kind) {
'int' => $field->numeric()->integer()->minValue(0),
'secret' => $field->password()->revealable()->autocomplete(false),
default => $field,
};
}
}
+144
View File
@@ -0,0 +1,144 @@
<?php
namespace App\Filament\Operator;
use App\Enums\TenantServiceKey;
use App\Filament\Operator\Tenants\Pages\CreateTenant;
use App\Filament\Operator\Tenants\Pages\EditTenant;
use App\Filament\Operator\Tenants\Pages\ListTenants;
use App\Models\Tenant;
use App\Models\TenantAccessLog;
use BackedEnum;
use Filament\Actions\Action;
use Filament\Actions\EditAction;
use Filament\Forms\Components\Hidden;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\TagsInput;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Resources\Resource;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Text;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Columns\ToggleColumn;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
class TenantResource extends Resource
{
protected static ?string $model = Tenant::class;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedBuildingOffice;
protected static ?string $modelLabel = 'Mandant';
protected static ?string $pluralModelLabel = 'Mandanten';
protected static ?string $navigationLabel = 'Mandanten';
protected static ?int $navigationSort = 1;
public static function form(Schema $schema): Schema
{
return $schema
->components([
TextInput::make('name')
->label('Name')
->required()
->maxLength(255),
TextInput::make('slug')
->label('Kurzname')
->required()
->alphaDash()
->unique(ignoreRecord: true)
->maxLength(255),
Toggle::make('is_active')
->label('Zugang freigeschaltet')
->helperText('Ausgeschaltet sehen Besucher statt der Webseite nur den Hinweis unten. Der Betreiber kommt weiter hinein.')
->default(true)
->live(),
Textarea::make('suspended_message')
->label('Hinweis bei gesperrtem Zugang')
->placeholder('Diese Webseite ist zurzeit nicht erreichbar. Bitte versuchen Sie es später noch einmal.')
->helperText('Leer = der Standardtext. Wird mit Status 503 ausgeliefert, damit Suchmaschinen die Seite nicht aus dem Index werfen.')
->rows(2)
->columnSpanFull(),
Section::make('Einsprungsadressen')
->description('Unter welchen Adressen dieser Mandant antwortet. Die Adresse muss zusätzlich beim Hoster einmalig auf dieses Verzeichnis gelegt werden – das passiert nicht hier. Ab dem zweiten Mandanten bekommt jede nicht eingetragene Adresse eine Fehlerseite.')
->columnSpanFull()
->schema([
Repeater::make('websites')
->label('Websites')
->addActionLabel('Weitere Website')
->defaultItems(1)
->itemLabel(fn (array $state): ?string => $state['name'] ?? null)
->schema([
Hidden::make('id'),
TextInput::make('name')
->label('Name der Website')
->required()
->maxLength(120),
TagsInput::make('hosts')
->label('Adressen')
->placeholder('beispiel.de')
->helperText('Jede Schreibweise ist eine eigene Adresse: „www.beispiel.de“ und „beispiel.de“ sind zwei. Die erste gilt als Hauptadresse und steht in Links an Gäste.')
->nestedRecursiveRules(['string', 'max:190']),
]),
]),
Section::make('Dienste')
->description('Was dieser Mandant nutzen darf. Ein gesperrter Dienst verschwindet auch aus seinem Admin – die Rolle eines Benutzers kann das nicht aufwiegen.')
->columnSpanFull()
->schema([
...array_map(fn (TenantServiceKey $service): Toggle => Toggle::make('services.'.$service->value.'.is_enabled')
->label($service->label())
->helperText($service->description()), TenantServiceKey::wired()),
Text::make('Noch nicht gebaut und deshalb nicht schaltbar: '.implode(', ', array_map(
fn (TenantServiceKey $service): string => $service->label(),
array_values(array_filter(TenantServiceKey::cases(), fn (TenantServiceKey $service): bool => ! $service->isWired())),
)).'. Diese Dienste erscheinen hier, sobald die Anwendung sie wirklich abfragt; eigene API-Schlüssel gehören dann in den Admin des Mandanten.'),
]),
]);
}
public static function table(Table $table): Table
{
return $table
->columns([
TextColumn::make('name')->label('Name')->searchable(),
TextColumn::make('slug')->label('Kurzname'),
TextColumn::make('services_count')
->label('Dienste frei')
->counts(['services' => fn (Builder $query): Builder => $query->where('is_enabled', true)])
->suffix(' von '.count(TenantServiceKey::wired())),
ToggleColumn::make('is_active')->label('Aktiv'),
])
->recordActions([
EditAction::make(),
Action::make('openAdmin')
->label('Im Admin öffnen')
->icon(Heroicon::OutlinedArrowTopRightOnSquare)
->action(function (Tenant $record) {
TenantAccessLog::query()->create([
'tenant_id' => $record->id,
'user_id' => auth()->id(),
]);
$domain = $record->sites()->withoutGlobalScope('tenant')->whereNotNull('domain')->value('domain');
return redirect(is_string($domain) && $domain !== '' ? 'https://'.$domain.'/admin' : url('/admin'));
}),
]);
}
public static function getPages(): array
{
return [
'index' => ListTenants::route('/'),
'create' => CreateTenant::route('/create'),
'edit' => EditTenant::route('/{record}/edit'),
];
}
}
@@ -0,0 +1,14 @@
<?php
namespace App\Filament\Operator\Tenants\Pages;
use App\Filament\Operator\Concerns\EditsTenantSetup;
use App\Filament\Operator\TenantResource;
use Filament\Resources\Pages\CreateRecord;
class CreateTenant extends CreateRecord
{
use EditsTenantSetup;
protected static string $resource = TenantResource::class;
}
@@ -0,0 +1,14 @@
<?php
namespace App\Filament\Operator\Tenants\Pages;
use App\Filament\Operator\Concerns\EditsTenantSetup;
use App\Filament\Operator\TenantResource;
use Filament\Resources\Pages\EditRecord;
class EditTenant extends EditRecord
{
use EditsTenantSetup;
protected static string $resource = TenantResource::class;
}
@@ -0,0 +1,22 @@
<?php
namespace App\Filament\Operator\Tenants\Pages;
use App\Filament\Operator\TenantResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Filament\Support\Icons\Heroicon;
class ListTenants extends ListRecords
{
protected static string $resource = TenantResource::class;
protected function getHeaderActions(): array
{
return [
CreateAction::make()
->label('Neuen Mandanten anlegen')
->icon(Heroicon::OutlinedPlus),
];
}
}
+77
View File
@@ -0,0 +1,77 @@
<?php
namespace App\Filament\Pages;
use App\Availability\OccupancyOverview;
use App\Filament\Concerns\FollowsAdminMode;
use App\Models\Booking;
use App\Models\Property;
use App\Support\CurrentProperty;
use BackedEnum;
use Carbon\CarbonImmutable;
use Filament\Pages\Page;
use Filament\Support\Icons\Heroicon;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Validator;
use Livewire\Attributes\Computed;
use Livewire\Attributes\Url;
use UnitEnum;
class OccupancyCalendar extends Page
{
use FollowsAdminMode;
protected string $view = 'filament.pages.occupancy-calendar';
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCalendarDays;
protected static string|UnitEnum|null $navigationGroup = 'Vermietung';
protected static ?string $title = 'Belegungsplan';
protected static ?string $navigationLabel = 'Belegungsplan';
protected static ?string $slug = 'belegungsplan';
protected static ?int $navigationSort = 0;
#[Url(as: 'monat')]
public string $month = '';
#[Url(as: 'wohnung')]
public ?int $propertyId = null;
public static function canAccess(): bool
{
return Gate::allows('viewAny', Booking::class);
}
public function getSubheading(): ?string
{
return app(CurrentProperty::class)->hasChoice() ? Property::query()->find($this->propertyId)?->name : null;
}
public function mount(): void
{
$this->month = $this->month ?: now()->format('Y-m');
$this->propertyId = app(CurrentProperty::class)->followUrl($this->propertyId);
}
#[Computed]
public function calendar(): ?array
{
Validator::make(['month' => $this->month], ['month' => ['required', 'date_format:Y-m']])->validate();
if ($this->propertyId === null) {
return null;
}
return app(OccupancyOverview::class)->calendar(Property::findOrFail($this->propertyId), CarbonImmutable::createFromFormat('!Y-m', $this->month));
}
public function moveMonth(int $direction): void
{
Validator::make(['month' => $this->month, 'direction' => $direction], ['month' => ['required', 'date_format:Y-m'], 'direction' => ['in:-1,1']])->validate();
$this->month = CarbonImmutable::createFromFormat('!Y-m', $this->month)->addMonths($direction)->format('Y-m');
unset($this->calendar);
}
}
+312
View File
@@ -0,0 +1,312 @@
<?php
namespace App\Filament\Pages;
use App\Enums\TenantServiceKey;
use App\Enums\UserRole;
use App\Filament\Concerns\FollowsAdminMode;
use App\Models\Tenant;
use App\Support\Settings;
use App\Tenancy\TenantConfig;
use App\Tenancy\TenantFeatures;
use BackedEnum;
use Filament\Actions\Action;
use Filament\Forms\Components\Radio;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TagsInput;
use Filament\Forms\Components\TextInput;
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\Components\Utilities\Get;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use UnitEnum;
/**
* Operating data of the landlord: operating mode (test mode sends every e-mail to one test recipient only;
* live delivers to the real recipients), the addresses of the internal communication, the landlord's own
* address and bank details, and the periods. Administrators only.
*/
class Operations extends Page
{
use FollowsAdminMode;
/** Periods and counters the landlord may set (column => label). Empty means the system default. */
private const PERIODS = [
'deposit_due_days' => 'Anzahlung fällig nach (Tage)',
'review_request_after_days' => 'Bewertungsbitte nach Abreise (Tage)',
'guest_retention_years' => 'Gästedaten löschen nach (Jahre)',
'retention_inquiry_months' => 'Nicht gebuchte Anfragen löschen nach (Monate)',
'retention_portal_email_excerpt_days' => 'Portal-Mail-Auszug löschen nach (Tage)',
'retention_attribution_months' => 'Herkunftsangaben löschen nach (Monate)',
'spam_min_seconds' => 'Bot-Schutz: Mindestzeit im Formular (Sekunden)',
'spam_per_ip_per_hour' => 'Bot-Schutz: Anfragen je IP und Stunde',
'spam_per_email_per_day' => 'Bot-Schutz: Anfragen je E-Mail und Tag',
'spam_open_requests_per_email' => 'Bot-Schutz: gleichzeitig offene Anfragen je E-Mail',
'spam_max_links' => 'Bot-Schutz: erlaubte Links im Text',
'channel_stale_after_minutes' => 'Portal-Abgleich gilt als veraltet nach (Minuten)',
'channel_task_reminder_after_minutes' => 'Erinnerung an Portal-Aufgaben nach (Minuten)',
];
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedPower;
protected static string|UnitEnum|null $navigationGroup = 'System';
protected static ?string $navigationLabel = 'Betrieb';
protected static ?string $title = 'Betrieb';
protected static ?string $slug = 'betrieb';
protected static ?int $navigationSort = 1;
/** @var array<string, mixed> */
public array $data = [];
public static function canAccess(): bool
{
return (bool) auth()->user()?->hasRole(UserRole::Admin);
}
public function mount(): void
{
$tenant = $this->tenant();
$this->form->fill([
'mode' => $tenant->operating_mode ?: Settings::MODE_TEST,
'test_recipient' => $tenant->test_recipient ?: auth()->user()?->email,
'notification_recipients' => $tenant->notificationRecipients(),
'contact_email' => $tenant->contact_email,
'sender_name' => $tenant->sender_name,
'sender_email' => $tenant->sender_email,
'owner_name' => $tenant->owner_name,
'owner_street' => $tenant->owner_street,
'owner_city' => $tenant->owner_city,
'owner_phone' => $tenant->owner_phone,
'bank_account_holder' => $tenant->bank_account_holder,
'bank_name' => $tenant->bank_name,
'bank_iban' => $tenant->bank_iban,
'bank_bic' => $tenant->bank_bic,
'tax_note' => $tenant->tax_note,
'mailbox_host' => $tenant->mailbox_host,
'mailbox_port' => $tenant->mailbox_port,
'mailbox_username' => $tenant->mailbox_username,
'mailbox_password' => $tenant->mailbox_password,
'mailbox_encryption' => $tenant->mailbox_encryption,
'mailbox_folder' => $tenant->mailbox_folder,
...$this->periodValues($tenant),
]);
}
public function form(Schema $schema): Schema
{
return $schema
->statePath('data')
->components([
Section::make('E-Mail-Versand')
->description('Im Testbetrieb gehen alle E-Mails – Eingangsbestätigungen, Angebote, Bestätigungen, Erinnerungen, Benachrichtigungen – ausschließlich an die Testadresse, egal welche Adresse auf der Webseite eingetragen wurde.')
->schema([
Radio::make('mode')
->label('Betriebsart')
->options([
Settings::MODE_TEST => 'Testbetrieb – alle E-Mails an die Testadresse',
Settings::MODE_LIVE => 'Scharf geschaltet – E-Mails an Gäste und Vermieterin',
])
->required()
->live(),
TextInput::make('test_recipient')
->label('Testadresse')
->email()
->required(fn (Get $get): bool => $get('mode') === Settings::MODE_TEST)
->visible(fn (Get $get): bool => $get('mode') === Settings::MODE_TEST),
Text::make(fn (): string => filled(config('fewo.mail_redirect_to'))
? 'Hinweis: Auf diesem Server ist zusätzlich FEWO_MAIL_REDIRECT_TO='.config('fewo.mail_redirect_to').' gesetzt – diese Umleitung gilt immer, auch wenn hier scharf geschaltet ist.'
: ''),
]),
Section::make('Adressen der internen Kommunikation')
->description('Gelten sofort für alle E-Mails, die Webseite und den Mietvertrag. Im Testbetrieb gehen trotzdem alle E-Mails nur an die Testadresse.')
->columns(2)
->schema([
TagsInput::make('notification_recipients')
->label('Benachrichtigungen an')
->helperText('Neue Anfragen, angenommene/abgelehnte Angebote, abgelaufene Fristen, Bewertungen, Portal-Mails und -Aufgaben, Kopie der Zahlungserinnerungen. Mehrere Adressen möglich (Enter nach jeder Adresse).')
->placeholder('adresse@beispiel.de')
->nestedRecursiveRules(['email'])
->required()
->columnSpanFull(),
TextInput::make('contact_email')
->label('Kontakt- und Antwortadresse')
->helperText('Steht auf der Webseite und im Mietvertrag; Antworten der Gäste auf unsere E-Mails gehen hierhin.')
->email()
->required(),
TextInput::make('sender_name')
->label('Absendername')
->required()
->maxLength(100),
TextInput::make('sender_email')
->label('Absenderadresse')
->helperText(fn (): string => 'Muss das Postfach sein, mit dem der Server versendet (SMTP-Anmeldung: '.(config('mail.mailers.smtp.username') ?: 'nicht gesetzt').') – sonst lehnt Strato den Versand ab.')
->email()
->required(),
Text::make(fn (Get $get): string => filled(config('mail.mailers.smtp.username')) && filled($get('sender_email')) && strcasecmp((string) $get('sender_email'), (string) config('mail.mailers.smtp.username')) !== 0
? '⚠ Die Absenderadresse weicht vom SMTP-Postfach ('.config('mail.mailers.smtp.username').') ab. Strato stellt solche E-Mails in der Regel nicht zu.'
: '')
->columnSpanFull(),
]),
Section::make('Vermieterin')
->description('Steht in E-Mails, im Angebot, im Mietvertrag und auf der Webseite.')
->columns(2)
->schema([
TextInput::make('owner_name')->label('Name')->required()->maxLength(255),
TextInput::make('owner_phone')->label('Telefon')->maxLength(50),
TextInput::make('owner_street')->label('Straße und Hausnummer')->maxLength(255),
TextInput::make('owner_city')->label('PLZ und Ort')->maxLength(255),
]),
Section::make('Bankverbindung und Steuer')
->description('Steht im Mietvertrag und in den Zahlungsaufforderungen. Die Angaben liegen verschlüsselt in der Datenbank.')
->columns(2)
->schema([
TextInput::make('bank_account_holder')->label('Kontoinhaber')->maxLength(255),
TextInput::make('bank_name')->label('Bank')->maxLength(255),
TextInput::make('bank_iban')->label('IBAN')->maxLength(40),
TextInput::make('bank_bic')->label('BIC')->maxLength(20),
TextInput::make('tax_note')
->label('Steuerangabe')
->helperText('Zum Beispiel die Steuernummer oder der Hinweis auf die Kleinunternehmerregelung.')
->maxLength(255)
->columnSpanFull(),
]),
Section::make('Portal-Postfach')
->description('Aus diesem Postfach werden die Buchungsmails der Portale gelesen, damit ein Termin sofort gesperrt wird. Leerer Server = ausgeschaltet. Das Passwort liegt verschlüsselt in der Datenbank.')
->columns(2)
->collapsed()
->visible(fn (): bool => app(TenantFeatures::class)->enabled(TenantServiceKey::PortalMail))
->schema([
TextInput::make('mailbox_host')->label('IMAP-Server')->maxLength(190),
TextInput::make('mailbox_port')->label('Port')->numeric()->integer()->placeholder('993'),
TextInput::make('mailbox_username')->label('Benutzer')->maxLength(190),
TextInput::make('mailbox_password')->label('Passwort')->password()->revealable()->autocomplete(false)->maxLength(190),
Select::make('mailbox_encryption')
->label('Verschlüsselung')
->options(['ssl' => 'SSL', 'tls' => 'TLS', 'starttls' => 'STARTTLS'])
->placeholder('SSL'),
TextInput::make('mailbox_folder')->label('Ordner')->placeholder('INBOX')->maxLength(190),
]),
Section::make('Fristen und Grenzen')
->description('Leer bedeutet: die Vorgabe des Systems gilt. Löschfristen und Bot-Schutz lassen sich verschärfen, aber nicht über die Vorgabe hinaus lockern.')
->columns(3)
->collapsed()
->schema($this->periodFields()),
]);
}
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
{
$data = $this->form->getState();
$tenant = $this->tenant();
$wasLive = $tenant->isLive();
$tenant->update([
'operating_mode' => $data['mode'],
'test_recipient' => $data['test_recipient'] ?? $tenant->test_recipient,
'notification_emails' => implode(', ', Settings::addressList(implode(',', $data['notification_recipients'] ?? []))),
'contact_email' => $data['contact_email'],
'sender_name' => $data['sender_name'],
'sender_email' => $data['sender_email'],
'owner_name' => $data['owner_name'],
'owner_street' => $data['owner_street'] ?? null,
'owner_city' => $data['owner_city'] ?? null,
'owner_phone' => $data['owner_phone'] ?? null,
'bank_account_holder' => $data['bank_account_holder'] ?? null,
'bank_name' => $data['bank_name'] ?? null,
'bank_iban' => $data['bank_iban'] ?? null,
'bank_bic' => $data['bank_bic'] ?? null,
'tax_note' => $data['tax_note'] ?? null,
'mailbox_host' => $data['mailbox_host'] ?? null,
'mailbox_port' => filled($data['mailbox_port'] ?? null) ? (int) $data['mailbox_port'] : null,
'mailbox_username' => $data['mailbox_username'] ?? null,
'mailbox_password' => $data['mailbox_password'] ?? null,
'mailbox_encryption' => $data['mailbox_encryption'] ?? null,
'mailbox_folder' => $data['mailbox_folder'] ?? null,
...array_map(fn (mixed $value): ?int => filled($value) ? (int) $value : null, $this->periodInput($data)),
]);
app(TenantConfig::class)->refresh();
if ($data['mode'] === Settings::MODE_LIVE && ! $wasLive) {
Notification::make()->title('Scharf geschaltet')->body('Ab jetzt erhalten Gäste und Vermieterin die E-Mails direkt.')->warning()->send();
} else {
Notification::make()->title('Gespeichert')->success()->send();
}
}
/**
* The landlord this page edits: the one of the request, else the only one there is.
*/
private function tenant(): Tenant
{
$tenant = Settings::tenant();
abort_if($tenant === null, 404);
return $tenant;
}
/**
* @return array<string, ?int>
*/
private function periodValues(Tenant $tenant): array
{
return array_combine(array_keys(self::PERIODS), array_map(fn (string $column): ?int => $tenant->{$column}, array_keys(self::PERIODS)));
}
/**
* @param array<string, mixed> $data
* @return array<string, mixed>
*/
private function periodInput(array $data): array
{
return array_combine(array_keys(self::PERIODS), array_map(fn (string $column): mixed => $data[$column] ?? null, array_keys(self::PERIODS)));
}
/**
* @return list<TextInput>
*/
private function periodFields(): array
{
return array_map(function (string $column) {
$field = TextInput::make($column)
->label(self::PERIODS[$column])
->numeric()
->integer()
->minValue(0);
$config = app(TenantConfig::class);
if (($ceiling = $config->ceilingFor($column)) !== null) {
return $field->maxValue($ceiling)->helperText('Vorgabe des Systems: höchstens '.$ceiling);
}
if (($floor = $config->floorFor($column)) !== null) {
return $field->minValue($floor)->helperText('Vorgabe des Systems: mindestens '.$floor);
}
return $field;
}, array_keys(self::PERIODS));
}
}
+87
View File
@@ -0,0 +1,87 @@
<?php
namespace App\Filament\Pages;
use App\Enums\UserRole;
use App\Filament\Concerns\FollowsAdminMode;
use App\Filament\Resources\Properties\Pages\EditProperty;
use App\Filament\Resources\Properties\RelationManagers\ExtrasRelationManager;
use App\Filament\Resources\Properties\RelationManagers\SeasonsRelationManager;
use App\Filament\Resources\Properties\RelationManagers\SpecialOffersRelationManager;
use App\Models\Property;
use App\Support\CurrentProperty;
use BackedEnum;
use Filament\Pages\Page;
use Filament\Schemas\Components\Livewire;
use Filament\Schemas\Components\Tabs;
use Filament\Schemas\Components\Tabs\Tab;
use Filament\Schemas\Components\Text;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Livewire\Attributes\Url;
use UnitEnum;
/**
* The yearly price work in one place, without the other apartment settings: seasons & prices,
* special offers & promo codes, extras. Reuses the relation managers of the apartment.
*/
class PricesAndOffers extends Page
{
use FollowsAdminMode;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedCurrencyEuro;
protected static string|UnitEnum|null $navigationGroup = 'Vermietung';
protected static ?string $navigationLabel = 'Preise & Angebote';
protected static ?string $title = 'Preise & Angebote';
protected static ?string $slug = 'preise-und-angebote';
protected static ?int $navigationSort = 5;
#[Url(as: 'wohnung')]
public ?int $propertyId = null;
public static function canAccess(): bool
{
return (bool) auth()->user()?->hasRole(UserRole::Admin, UserRole::Rentals);
}
public function getSubheading(): ?string
{
return app(CurrentProperty::class)->hasChoice() ? Property::query()->find($this->propertyId)?->name : null;
}
public function mount(): void
{
$this->propertyId = app(CurrentProperty::class)->followUrl($this->propertyId);
}
public function content(Schema $schema): Schema
{
$property = Property::find($this->propertyId);
if ($property === null) {
return $schema->components([Text::make('Es ist noch keine Wohnung angelegt (Expertenansicht › Wohnungen).')]);
}
$context = ['ownerRecord' => $property, 'pageClass' => EditProperty::class];
return $schema->components([
Tabs::make('prices')
->persistTabInQueryString()
->tabs([
Tab::make('Saisons & Preise')->icon(Heroicon::OutlinedCalendar)->schema([
Livewire::make(SeasonsRelationManager::class, $context)->key("seasons-{$property->id}"),
]),
Tab::make('Sonderangebote & Rabattcodes')->icon(Heroicon::OutlinedSparkles)->schema([
Livewire::make(SpecialOffersRelationManager::class, $context)->key("offers-{$property->id}"),
]),
Tab::make('Extras')->icon(Heroicon::OutlinedGift)->schema([
Livewire::make(ExtrasRelationManager::class, $context)->key("extras-{$property->id}"),
]),
]),
]);
}
}
@@ -3,6 +3,7 @@
namespace App\Filament\Resources\Amenities;
use App\Filament\Concerns\FollowsAdminMode;
use App\Filament\Concerns\SelectsRecordProperty;
use App\Filament\Resources\Amenities\Pages\CreateAmenity;
use App\Filament\Resources\Amenities\Pages\EditAmenity;
use App\Filament\Resources\Amenities\Pages\ListAmenities;
@@ -18,7 +19,7 @@
class AmenityResource extends Resource
{
use FollowsAdminMode;
use FollowsAdminMode, SelectsRecordProperty;
protected static ?string $model = Amenity::class;
@@ -2,12 +2,15 @@
namespace App\Filament\Resources\Amenities\Pages;
use App\Filament\Concerns\ListsCurrentProperty;
use App\Filament\Resources\Amenities\AmenityResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
class ListAmenities extends ListRecords
{
use ListsCurrentProperty;
protected static string $resource = AmenityResource::class;
protected function getHeaderActions(): array
@@ -4,6 +4,7 @@
use App\Enums\AmenityArea;
use App\Models\Property;
use App\Support\CurrentProperty;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
@@ -28,7 +29,7 @@ public static function configure(Schema $schema): Schema
Select::make('property_id')
->label('Wohnung')
->options(fn (): array => Property::query()->pluck('name', 'id')->all())
->default(fn (): ?int => Property::query()->value('id'))
->default(fn (): ?int => app(CurrentProperty::class)->id())
->required(),
Toggle::make('is_highlight')
->label('Highlight (auf der Startseite hervorheben)'),
@@ -2,21 +2,15 @@
namespace App\Filament\Resources\Appearances\Schemas;
use App\Filament\Forms\Components\PhotoSelect;
use App\Models\Appearance;
use App\Models\Page;
use App\Models\Photo;
use App\Models\Site;
use App\Themes\SectionRegistry;
use App\Themes\Sections\Section as SectionBlock;
use App\Themes\ThemeRegistry;
use Closure;
use Filament\Forms\Components\ColorPicker;
use Filament\Forms\Components\Radio;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Schemas\Components\Component;
use Filament\Schemas\Components\Fieldset;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Text;
use Filament\Schemas\Components\Utilities\Get;
@@ -45,20 +39,13 @@ public static function configure(Schema $schema): Schema
Toggle::make('is_default')->label('Standard (wenn kein Zeitraum passt)')->inline(false),
Toggle::make('is_active')->label('Aktiv')->default(true)->inline(false),
]),
Section::make('Titelbild')
->description('Gilt für alle Titelbereiche und als Vorschaubild beim Teilen in sozialen Medien – einzelne Bausteine können unten ein eigenes Bild bekommen. Sonderangebote werden unabhängig vom Erscheinungsbild beworben (Wohnung › Sonderangebote).')
Section::make('Bilder')
->description('Welche Fotos in diesem Erscheinungsbild erscheinen, legen Sie beim Foto fest: Webseite › Fotos › „Zeigen in“. Ein Foto kann zu mehreren Erscheinungsbildern gehören; Fotos ohne Angabe erscheinen ganzjährig.')
->schema([
PhotoSelect::make('hero_photo_id')
->label('Titelbild')
->placeholder('Bild der Seite verwenden'),
Text::make(fn (?Appearance $record): string => self::photoSummary($record)),
]),
Section::make('Bilder je Baustein')
->description('Für jeden Baustein mit Bildern ein eigenes Saisonbild wählen. Leer = Bild aus der Seite. Neue Bilder laden Sie unter Webseite › Fotos hoch.')
->collapsible()
->columnSpanFull()
->schema(fn (Get $get): array => self::sectionPhotoFields($get('site_id'))),
Section::make('Texte')
->description('Leer lassen = Text der Seite bzw. kein Banner.')
->description('Leer lassen = Text der Seite. Banner pflegen Sie unter Webseite › Banner & Hinweise – dort auch nur für dieses Erscheinungsbild.')
->columns(2)
->collapsible()
->schema(collect(Appearance::OVERRIDABLE)
@@ -75,57 +62,21 @@ public static function configure(Schema $schema): Schema
}
/**
* One group per page and one field set per placed section that has photo slots
* (see Section::photoSlots); stored in section_photos[<section id>][<slot>].
*
* @return list<Component>
* How many photos are made for this appearance.
*/
public static function sectionPhotoFields(int|string|null $siteId): array
public static function photoSummary(?Appearance $appearance): string
{
$registry = app(SectionRegistry::class);
$pages = Page::query()->where('site_id', $siteId)->orderBy('sort_order')->get();
$groups = [];
foreach ($pages as $page) {
$fieldsets = [];
foreach ($page->sections ?? [] as $stored) {
$class = $registry->all()[$stored['type'] ?? ''] ?? null;
$sectionId = $stored['data']['id'] ?? null;
if ($class === null || blank($sectionId) || $class::photoSlots() === []) {
continue;
}
$fields = [];
foreach ($class::photoSlots() as $slot => $definition) {
$field = PhotoSelect::make("section_photos.{$sectionId}.{$slot}")
->label($definition['label'])
->placeholder('Standard (Bild aus der Seite)')
->multiple($definition['type'] !== SectionBlock::SLOT_SINGLE);
if (isset($definition['max'])) {
$field->maxItems($definition['max']);
}
$fields[] = $field;
if ($definition['type'] === SectionBlock::SLOT_COLLECTION) {
$fields[] = Radio::make("section_photos.{$sectionId}.mode")
->label('Saisonbilder')
->options(['replace' => 'ersetzen die Bilder des Bausteins', 'prepend' => 'kommen zuerst, danach die übrigen'])
->default('replace')
->inline();
}
}
$fieldsets[] = Fieldset::make(collect([$class::label(), $class::summary($stored['data'] ?? [])])->filter()->implode(' · '))
->columns(1)
->schema($fields);
}
if ($fieldsets !== []) {
$groups[] = Section::make($page->title)->compact()->collapsible()->schema($fieldsets);
}
if ($appearance === null) {
return 'Nach dem Speichern können Sie Fotos diesem Erscheinungsbild zuordnen.';
}
return $groups ?: [Text::make('Auf den Seiten gibt es noch keine Bausteine mit Bildern.')];
$count = Photo::query()->get(['id', 'appearance_ids'])->filter(fn (Photo $photo): bool => $photo->isMadeFor($appearance))->count();
return match ($count) {
0 => 'Noch keine Fotos zugeordnet – es erscheinen die ganzjährigen Fotos.',
1 => '1 Foto ist diesem Erscheinungsbild zugeordnet.',
default => "{$count} Fotos sind diesem Erscheinungsbild zugeordnet.",
};
}
/**
@@ -2,17 +2,29 @@
namespace App\Filament\Resources\BlockedPeriods;
use App\Actions\ResolveChannelOccupation;
use App\Channels\ICal\ICalRuleEngine;
use App\Enums\BlockedPeriodPurpose;
use App\Filament\Concerns\FollowsAdminMode;
use App\Filament\Concerns\SelectsRecordProperty;
use App\Filament\Resources\BlockedPeriods\Pages\ManageBlockedPeriods;
use App\Filament\Resources\PortalOccupations\PortalOccupationResource;
use App\Models\BlockedPeriod;
use App\Models\Booking;
use App\Models\Channel;
use App\Models\Property;
use App\Support\CurrentProperty;
use BackedEnum;
use Filament\Actions\Action;
use Filament\Actions\DeleteAction;
use Filament\Actions\EditAction;
use Filament\Forms\Components\DatePicker;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Infolists\Components\TextEntry;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tables\Columns\TextColumn;
@@ -22,12 +34,12 @@
use UnitEnum;
/**
* All blocked periods of all apartments in one place (own use, renovation, portal occupations).
* Portal and e-mail blocks are maintained by the sync and can only be viewed here.
* Explicit blocks of all apartments. Imported reservations and unresolved periods have their own views.
* Portal dates remain maintained by the sync; business classification can be edited separately.
*/
class BlockedPeriodResource extends Resource
{
use FollowsAdminMode;
use FollowsAdminMode, SelectsRecordProperty;
protected static ?string $model = BlockedPeriod::class;
@@ -39,7 +51,7 @@ class BlockedPeriodResource extends Resource
protected static ?string $pluralModelLabel = 'Sperrzeiten';
protected static ?int $navigationSort = 2;
protected static ?int $navigationSort = 3;
public static function form(Schema $schema): Schema
{
@@ -49,53 +61,102 @@ public static function form(Schema $schema): Schema
Select::make('property_id')
->label('Wohnung')
->options(fn (): array => Property::query()->orderBy('name')->pluck('name', 'id')->all())
->default(fn (): ?int => Property::query()->where('is_active', true)->value('id'))
->default(fn (): ?int => app(CurrentProperty::class)->id())
->required()
->columnSpanFull()
->hidden(fn (): bool => Property::query()->count() <= 1)
->dehydratedWhenHidden(),
DatePicker::make('starts_on')->label('Von (erste gesperrte Nacht)')->required(),
DatePicker::make('ends_on')->label('Bis (erster freier Tag)')->after('starts_on')->required(),
...static::purposeFields(),
Select::make('is_private')->label('Buchungskanal')->options([0 => 'Nicht angegeben', 1 => 'Privat'])
->default(0)->formatStateUsing(fn (mixed $state): int => (int) $state)->required(),
TextInput::make('reason')
->label('Grund')
->label('Bisheriger Sperrgrund / zusätzliche Angabe')
->placeholder('z. B. Eigennutzung, Renovierung')
->maxLength(255)
->columnSpanFull(),
]);
}
public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()->explicitBlocks()->occupying();
}
/** @return array<Select|TextInput> */
public static function purposeFields(): array
{
return [
Select::make('block_purpose')->label('Zweck der Sperrzeit')->options(BlockedPeriodPurpose::class)->placeholder('Noch nicht angegeben'),
TextInput::make('block_note')->label('Hinweis zum Zweck')->maxLength(255)->placeholder('z. B. Aufenthalt der Familie'),
];
}
public static function table(Table $table): Table
{
return $table
->description('Zeiträume, in denen die Wohnung nicht vermietet wird. Belegungen aus Portalen erscheinen hier automatisch.')
->description('Eigennutzung, Wartung und ausdrücklich als Sperrzeit bestätigte Zeiträume. Portalreservierungen stehen unter Anfragen & Buchungen; unbekannte Zeiten unter Ungeklärte Belegungen.')
->defaultSort('starts_on')
->columns([
TextColumn::make('starts_on')->label('Von')->date('D, d.m.Y')->sortable(),
TextColumn::make('ends_on')->label('Bis')->date('D, d.m.Y'),
TextColumn::make('reason')->label('Grund')->placeholder('–'),
TextColumn::make('property.name')->label('Wohnung')->visible(fn (): bool => Property::query()->count() > 1),
TextColumn::make('source')
->label('Quelle')
->formatStateUsing(fn (string $state): string => match ($state) {
'manual' => 'von Hand',
'channel' => 'Portal-Kalender',
'email' => 'Portal-E-Mail',
default => $state,
})
->badge(),
TextColumn::make('ends_on')->label('Bis / erster freier Tag')->date('D, d.m.Y'),
TextColumn::make('purpose')->label('Zweck / Grund')->state(fn (BlockedPeriod $record): ?string => $record->blockDescription())->placeholder('–'),
TextColumn::make('booking_channel')->label('Buchungskanal')->state(fn (BlockedPeriod $record): string => $record->bookingChannelLabel()),
TextColumn::make('property.name')->label('Wohnung'),
TextColumn::make('channel.name')->label('Kalenderquelle')->placeholder('Eigene Sperre'),
])
->filters([
Filter::make('upcoming')
->label('Nur kommende')
->default()
Filter::make('upcoming')->label('Nur kommende')->default()
->query(fn (Builder $query): Builder => $query->whereDate('ends_on', '>=', today())),
])
->recordActions([
Action::make('viewPortal')->label('Details')->visible(fn (BlockedPeriod $record): bool => $record->source !== 'manual')
->url(fn (BlockedPeriod $record): string => PortalOccupationResource::getUrl('view', ['record' => $record->id])),
EditAction::make()->visible(fn (BlockedPeriod $record): bool => $record->source === 'manual'),
PortalOccupationResource::classificationAction(),
DeleteAction::make()->visible(fn (BlockedPeriod $record): bool => $record->source === 'manual'),
]);
}
public static function portalActions(): array
{
return [
Action::make('icalOriginal')->label('iCal-Original & Erkennung')->visible(fn (BlockedPeriod $record): bool => $record->ical_raw !== null)
->modalSubmitAction(false)->modalCancelActionLabel('Schließen')->schema([
TextEntry::make('recognized_rule')->label('Treffende Regel')->state(fn (BlockedPeriod $record): string => $record->ical_interpretation['rule'] ?? 'Keine'),
TextEntry::make('recognized_representation')->label('Fachliche Einordnung')->state(fn (BlockedPeriod $record): string => ICalRuleEngine::REPRESENTATIONS[$record->ical_interpretation['representation'] ?? 'unspecified']),
TextEntry::make('original')->label('Originalereignis (entfaltet)')->state(fn (BlockedPeriod $record): string => $record->ical_raw)->wrap()->extraAttributes(['style' => 'white-space:pre-wrap;overflow-wrap:anywhere']),
]),
Action::make('resolve')->label('Belegung zuordnen / klären')
->visible(fn (BlockedPeriod $record): bool => ! $record->trashed() && in_array($record->source, ['channel', 'email'], true))
->authorize(fn (BlockedPeriod $record): bool => auth()->user()?->can('update', $record) ?? false)
->modalDescription('Nur nach persönlicher Prüfung zuordnen. Eine Darstellung steuert keine eigene Belegung mehr; die führende Buchung oder Sperre übernimmt Änderungen und Stornierungen. Kalenderereignisse und UIDs bleiben nachvollziehbar erhalten.')
->schema([
Select::make('resolution')->label('Fachliche Klärung')->options(['independent' => 'Eigenständige Belegung bestätigen', 'block' => 'Weitere Darstellung einer Kalenderbelegung (Portalreservierung oder Sperrzeit)', 'booking' => 'Weitere Darstellung einer eigenen Buchung'])->default('independent')->required()->live(),
Select::make('target_id')->label('Führende Belegung mit demselben Zeitraum')
->visible(fn (Get $get): bool => $get('resolution') !== 'independent')
->required(fn (Get $get): bool => $get('resolution') !== 'independent')
->options(function (BlockedPeriod $record, Get $get): array {
if ($get('resolution') === 'booking') {
return Booking::query()->where('property_id', $record->property_id)->occupying()->whereDate('arrival', $record->starts_on)->whereDate('departure', $record->ends_on)->get()
->mapWithKeys(fn (Booking $booking): array => [$booking->id => 'Buchung '.$booking->reference])->all();
}
return BlockedPeriod::query()->where('property_id', $record->property_id)->occupying()->whereKeyNot($record->id)->whereDate('starts_on', $record->starts_on)->whereDate('ends_on', $record->ends_on)->orderByDesc('leading_priority')->orderBy('id')->get()
->mapWithKeys(fn (BlockedPeriod $block): array => [$block->id => '#'.$block->id.' · '.$block->occupationKind()->getLabel().' · '.($block->reason ?? 'Kalenderbelegung').($block->leading_priority ? ' · bevorzugter Führungskandidat' : '')])->all();
}),
Select::make('origin_channel_id')->label('Ursprünglicher Buchungskanal, sofern persönlich bekannt')
->options(fn (BlockedPeriod $record): array => Channel::query()->where('property_id', $record->property_id)->pluck('name', 'id')->all())
->default(fn (BlockedPeriod $record): ?int => $record->origin_channel_id)->placeholder('Unbekannt / eigene Vermietung'),
])
->action(function (BlockedPeriod $record, array $data, ResolveChannelOccupation $resolve): void {
$resolve->handle($record, $data['resolution'], filled($data['target_id'] ?? null) ? (int) $data['target_id'] : null, filled($data['origin_channel_id'] ?? null) ? (int) $data['origin_channel_id'] : null);
Notification::make()->title('Belegungszuordnung gespeichert')->success()->send();
}),
];
}
public static function getPages(): array
{
return [
@@ -2,12 +2,15 @@
namespace App\Filament\Resources\BlockedPeriods\Pages;
use App\Filament\Concerns\ListsCurrentProperty;
use App\Filament\Resources\BlockedPeriods\BlockedPeriodResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ManageRecords;
class ManageBlockedPeriods extends ManageRecords
{
use ListsCurrentProperty;
protected static string $resource = BlockedPeriodResource::class;
protected function getHeaderActions(): array
@@ -4,6 +4,7 @@
use App\Enums\BookingStatus;
use App\Filament\Concerns\FollowsAdminMode;
use App\Filament\Concerns\SelectsRecordProperty;
use App\Filament\Resources\Bookings\Pages\CreateBooking;
use App\Filament\Resources\Bookings\Pages\ListBookings;
use App\Filament\Resources\Bookings\Pages\ViewBooking;
@@ -21,7 +22,7 @@
class BookingResource extends Resource
{
use FollowsAdminMode;
use FollowsAdminMode, SelectsRecordProperty;
protected static ?string $model = Booking::class;
@@ -2,7 +2,9 @@
namespace App\Filament\Resources\Bookings\Pages;
use App\Filament\Pages\OccupancyCalendar;
use App\Filament\Resources\Bookings\BookingResource;
use Filament\Actions\Action;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
@@ -13,6 +15,7 @@ class ListBookings extends ListRecords
protected function getHeaderActions(): array
{
return [
Action::make('calendar')->label('Belegungsplan')->url(OccupancyCalendar::getUrl()),
CreateAction::make(),
];
}
@@ -8,6 +8,7 @@
use App\Documents\RentalContract;
use App\Enums\BookingStatus;
use App\Exceptions\ReservationException;
use App\Filament\Actions\AssignGuestAction;
use App\Filament\Resources\Bookings\BookingResource;
use App\Models\Booking;
use App\Pricing\PriceCalculator;
@@ -45,6 +46,7 @@ public function getTitle(): string
protected function getHeaderActions(): array
{
return [
AssignGuestAction::make(),
Action::make('sendOffer')
->label(fn (): string => $this->record->status === BookingStatus::OfferSent ? 'Angebot ändern & neu senden' : 'Angebot senden')
->icon(Heroicon::OutlinedPaperAirplane)
@@ -105,6 +107,18 @@ protected function getHeaderActions(): array
fn () => $send->handle($this->record, $this->offerChanges($data)),
'Angebot gesendet',
)),
Action::make('offerLink')
->label('Angebotslink')
->icon(Heroicon::OutlinedLink)
->color('gray')
->visible(fn (): bool => $this->record->status === BookingStatus::OfferSent && $this->record->hold_expires_at?->isFuture())
->modalHeading('Link zum Angebot')
->modalDescription('Derselbe Link wie in der Angebots-E-Mail – z. B. zum Weitergeben per Messenger. Gültig bis zum Ende der Angebotsfrist.')
->schema([
TextInput::make('url')->label('Link')->default(fn (SendOffer $send): string => $send->offerUrl($this->record))->readOnly()->copyable(),
])
->modalSubmitAction(false)
->modalCancelActionLabel('Schließen'),
Action::make('offerPdf')
->label('Angebot (PDF)')
->icon(Heroicon::OutlinedDocumentText)
@@ -3,6 +3,7 @@
namespace App\Filament\Resources\Bookings\Schemas;
use App\Models\Property;
use App\Support\CurrentProperty;
use Filament\Forms\Components\DatePicker;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
@@ -26,7 +27,7 @@ public static function configure(Schema $schema): Schema
Select::make('property_id')
->label('Wohnung')
->options(fn (): array => Property::query()->orderBy('name')->pluck('name', 'id')->all())
->default(fn (): ?int => Property::query()->value('id'))
->default(fn (): ?int => app(CurrentProperty::class)->id())
->required(),
TextInput::make('guests')
->label('Personen')
@@ -68,7 +68,7 @@ public static function configure(Schema $schema): Schema
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('source')->label('Quelle'),
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)')
@@ -78,7 +78,7 @@ public static function configure(Schema $schema): Schema
Section::make('Gast')
->schema([
TextEntry::make('guest.full_name')->label('Name'),
TextEntry::make('guest.email')->label('E-Mail')->copyable(),
TextEntry::make('guest.email')->label('E-Mail')->placeholder('Unbekannt')->copyable(),
TextEntry::make('guest.phone')->label('Telefon')->placeholder('–'),
TextEntry::make('guest_address')
->label('Adresse')
@@ -2,72 +2,76 @@
namespace App\Filament\Resources\Bookings\Tables;
use App\Availability\OccupancyOverview;
use App\Enums\BookingStatus;
use App\Models\Booking;
use App\Support\Money;
use Filament\Actions\ViewAction;
use App\Models\Property;
use App\Support\CurrentProperty;
use Filament\Actions\Action;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\Filter;
use Filament\Tables\Filters\SelectFilter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Pagination\LengthAwarePaginator;
class BookingsTable
{
public static function configure(Table $table): Table
public static function configure(Table $table, ?int $guestId = null): Table
{
return $table
->modifyQueryUsing(fn (Builder $query): Builder => $query->with(['guest', 'property', 'payments']))
->defaultSort('created_at', 'desc')
->description('Eigene Anfragen und Buchungen sowie erkannte Portalreservierungen in einer Liste. 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);
if (filled($search)) {
$term = mb_strtolower($search);
$records = $records->filter(fn (array $record): bool => str_contains(mb_strtolower(implode(' ', [$record['reference'], $record['guest'], $record['guest_email'], $record['source'], $record['property']])), $term));
}
if ($filters['upcoming']['isActive'] ?? false) {
$records = $records->filter(fn (array $record): bool => $record['departure'] >= today()->toDateString());
}
if ($filters['without_guest']['isActive'] ?? false) {
$records = $records->where('guest_assigned', false);
}
if (filled($filters['kind']['value'] ?? null)) {
$records = $records->where('record_type', $filters['kind']['value']);
}
if (filled($filters['status']['values'] ?? [])) {
$records = $records->whereIn('status_key', $filters['status']['values']);
}
$column = in_array($sortColumn, ['arrival', 'departure', 'reference', 'guest', 'source', 'total'], true) ? $sortColumn : 'arrival';
$records = $records->sortBy($column, SORT_REGULAR, $sortDirection === 'desc');
$perPage = $recordsPerPage === 'all' ? max(1, $records->count()) : $recordsPerPage;
return new LengthAwarePaginator($records->forPage($page, $perPage), $records->count(), $perPage, $page, ['pageName' => $table->getLivewire()->getTablePaginationPageName()]);
})
->defaultSort('arrival')->searchable()->recordAction(null)
->columns([
TextColumn::make('reference')
->label('Nr.')
->searchable(),
TextColumn::make('status')
->label('Status')
->badge()
->description(fn (Booking $record): ?string => $record->isHoldActive() ? 'bis '.$record->hold_expires_at->format('d.m. H:i') : null),
TextColumn::make('guest.last_name')
->label('Gast')
->formatStateUsing(fn (Booking $record): string => $record->guest->full_name)
->description(fn (Booking $record): string => $record->guest->email)
->searchable(['first_name', 'last_name', 'email']),
TextColumn::make('property.name')
->label('Wohnung')
->toggleable(isToggledHiddenByDefault: true),
TextColumn::make('arrival')
->label('Anreise')
->date('D, d.m.Y')
->sortable(),
TextColumn::make('departure')
->label('Abreise')
->date('D, d.m.Y')
->description(fn (Booking $record): string => $record->nights().' Nächte'),
TextColumn::make('guests')
->label('Pers.'),
TextColumn::make('total')
->label('Gesamt')
->money('EUR', divideBy: 100, locale: 'de')
->description(fn (Booking $record): ?string => in_array($record->status, BookingStatus::occupying(), true) && $record->openAmount() > 0 ? 'offen '.Money::format($record->openAmount()) : null),
TextColumn::make('source')
->label('Quelle')
->toggleable(isToggledHiddenByDefault: true),
TextColumn::make('created_at')
->label('Eingang')
->since()
->sortable(),
TextColumn::make('reference')->label('Nr. / Referenz')->sortable(),
TextColumn::make('kind_label')->label('Art')->badge(),
TextColumn::make('status')->label('Status')->badge()->color(fn (array $record): string => $record['color']),
TextColumn::make('guest')->label('Gast / Namensinformation')->sortable()
->description(fn (array $record): string => $record['guest_assigned'] ? ($record['guest_email'] ?? 'E-Mail unbekannt') : 'Gastzuordnung offen'),
TextColumn::make('source')->label('Buchungskanal / Quelle')->sortable(),
TextColumn::make('arrival')->label('Anreise')->date('d.m.Y')->sortable(),
TextColumn::make('departure')->label('Abreise')->date('d.m.Y')->sortable()
->description(fn (array $record): string => $record['nights'].' Nächte'),
TextColumn::make('persons')->label('Personen')->placeholder('Unbekannt')->toggleable(isToggledHiddenByDefault: true),
TextColumn::make('total')->label('Bekannter Gesamtpreis')->money('EUR', divideBy: 100, locale: 'de')->placeholder('Unbekannt')->toggleable(isToggledHiddenByDefault: true),
TextColumn::make('property')->label('Wohnung')->toggleable(isToggledHiddenByDefault: true),
])
->filters([
SelectFilter::make('status')
->label('Status')
->options(BookingStatus::class)
->multiple(),
Filter::make('upcoming')
->label('Nur kommende Aufenthalte')
->query(fn (Builder $query): Builder => $query->whereDate('departure', '>=', today())),
SelectFilter::make('property')->label('Wohnung')->options(fn (): array => Property::query()->orderBy('name')->pluck('name', 'id')->all())
// The booking list starts with the apartment chosen in the menu; a guest's bookings show all apartments.
->default(fn (): ?int => $guestId === null ? app(CurrentProperty::class)->id() : null),
SelectFilter::make('kind')->label('Buchungsweg')->options(['booking' => 'Eigene Anfragen & Buchungen', 'portal' => 'Portalreservierungen']),
SelectFilter::make('status')->label('Status')->multiple()->options([
...collect(BookingStatus::cases())->mapWithKeys(fn (BookingStatus $status): array => [$status->value => $status->getLabel()])->all(),
'imported' => 'Im Portalkalender geführt', 'archived' => 'Nicht mehr im Kalenderfeed',
]),
Filter::make('upcoming')->label('Nur kommende Aufenthalte'),
Filter::make('without_guest')->label('Gastzuordnung offen'),
])
->recordActions([
ViewAction::make(),
]);
->recordUrl(fn (array $record): string => $record['url'])
->recordActions([Action::make('view')->label('Details')->url(fn (array $record): string => $record['url'])]);
}
}
@@ -2,10 +2,20 @@
namespace App\Filament\Resources\ChannelTasks\Pages;
use App\Filament\Concerns\ListsCurrentProperty;
use App\Filament\Resources\ChannelTasks\ChannelTaskResource;
use App\Models\Property;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Database\Eloquent\Builder;
class ListChannelTasks extends ListRecords
{
use ListsCurrentProperty;
protected static string $resource = ChannelTaskResource::class;
protected function scopeToProperty(Builder $query, Property $property): Builder
{
return $query->whereHas('channel', fn (Builder $channel) => $channel->where('property_id', $property->id));
}
}
@@ -0,0 +1,66 @@
<?php
namespace App\Filament\Resources\Channels;
use App\Filament\Concerns\FollowsAdminMode;
use App\Filament\Concerns\SelectsRecordProperty;
use App\Filament\Resources\Channels\Pages\ChannelRules;
use App\Filament\Resources\Channels\Pages\CreateChannel;
use App\Filament\Resources\Channels\Pages\EditChannel;
use App\Filament\Resources\Channels\Pages\ListChannels;
use App\Filament\Resources\Channels\Schemas\ChannelForm;
use App\Filament\Resources\Channels\Tables\ChannelsTable;
use App\Models\Channel;
use BackedEnum;
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Model;
use UnitEnum;
class ChannelResource extends Resource
{
use FollowsAdminMode, SelectsRecordProperty;
protected static ?string $model = Channel::class;
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedArrowsRightLeft;
protected static string|UnitEnum|null $navigationGroup = 'Vermietung';
protected static ?string $navigationLabel = 'Kalenderabgleich (iCal)';
protected static ?string $modelLabel = 'iCal-Verbindung';
protected static ?string $pluralModelLabel = 'Kalenderabgleich (iCal)';
protected static ?int $navigationSort = 4;
protected static ?string $recordTitleAttribute = 'name';
public static function form(Schema $schema): Schema
{
return ChannelForm::configure($schema, selectProperty: true);
}
public static function table(Table $table): Table
{
return ChannelsTable::configure($table);
}
public static function canDelete(Model $record): bool
{
return false;
}
public static function getPages(): array
{
return [
'index' => ListChannels::route('/'),
'create' => CreateChannel::route('/create'),
'edit' => EditChannel::route('/{record}/edit'),
'rules' => ChannelRules::route('/{record}/rules'),
];
}
}
@@ -0,0 +1,212 @@
<?php
namespace App\Filament\Resources\Channels\Pages;
use App\Actions\AnalyzeChannelCalendar;
use App\Actions\ApplyChannelRules;
use App\Actions\ConfigureChannelExport;
use App\Actions\SaveChannelRules;
use App\Channels\ChannelSyncException;
use App\Channels\ICal\ICalExportFields;
use App\Channels\ICal\ICalFeed;
use App\Channels\ICal\ICalParser;
use App\Channels\ICal\ICalRuleEngine;
use App\Filament\Resources\Channels\ChannelResource;
use App\Filament\Resources\PortalOccupations\PortalOccupationResource;
use App\Models\BlockedPeriod;
use App\Models\Channel;
use Filament\Actions\Action;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Infolists\Components\TextEntry;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\EditRecord;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Components\View;
use Filament\Schemas\Schema;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
class ChannelRules extends EditRecord
{
protected static string $resource = ChannelResource::class;
protected static ?string $title = 'Kalenderanalyse, Regeln & Exportfelder';
public function fieldOptions(): array
{
return collect(array_keys($this->record->ical_analysis['fields'] ?? []))->mapWithKeys(fn (string $field): array => [$field => $field])->all();
}
protected function mutateFormDataBeforeFill(array $data): array
{
return ['rules' => $this->record->ical_rules ?? [], 'export_names' => (bool) $this->record->ical_export_names, 'export_mapping' => $this->record->ical_export_mapping ?? []];
}
public function form(Schema $schema): Schema
{
return $schema->components([
TextEntry::make('rule_status')->label('Gespeicherter Regelstand')
->state(fn (): string => $this->savedRulesStatus())
->helperText('Speichern legt einen Entwurf ab. „Speichern & anwenden“ aktiviert ihn für vorhandene Einträge und die nächsten Importe.')
->columnSpanFull(),
Section::make('1. Gefundene Kalenderfelder und Originalereignisse')->description('„Kalender analysieren“ liest die hinterlegte Adresse. Die Analyse verändert keine Belegungen.')
->schema([View::make('filament.resources.channels.rule-analysis')]),
Section::make('2. Erkennungsregeln')->description('Kleinere Prioritätszahlen zuerst. Bei mehreren Treffern gilt die erste passende aktive Regel. „Entwurf speichern“ und „Speichern & anwenden“ stehen oben auf dieser Seite.')
->schema([
Repeater::make('rules')->label('Regeln')->defaultItems(0)->addActionLabel('Regel hinzufügen')->live(debounce: 600)
->itemLabel(fn (array $state): string => $state['name'] ?? 'Neue Regel')
->schema([
TextInput::make('name')->label('Regelname')->required()->maxLength(120),
TextInput::make('priority')->label('Priorität (kleinere Zahl zuerst)')->integer()->minValue(0)->maxValue(10000)->default(100)->required(),
Toggle::make('enabled')->label('Regel aktiviert')->default(true),
Toggle::make('case_sensitive')->label('Groß-/Kleinschreibung beachten')->default(false),
Select::make('match')->label('Bedingungen verknüpfen')->options(['all' => 'UND – alle Bedingungen', 'any' => 'ODER – mindestens eine Bedingung'])->default('all')->required(),
Repeater::make('conditions')->label('Wenn')->minItems(1)->defaultItems(1)->addActionLabel('Bedingung hinzufügen')->columns(3)->schema([
Select::make('field')->label('Gefundenes Feld')->options(fn (): array => $this->fieldOptions())->required()->searchable(),
Select::make('operator')->label('Vergleich')->options(ICalRuleEngine::OPERATORS)->default('equals')->required()->live(),
TextInput::make('value')->label('Vergleichstext')->maxLength(2000)->visible(fn (Get $get): bool => ! in_array($get('operator'), ['exists', 'empty'], true))->live(debounce: 600),
])->columnSpanFull(),
Select::make('event_type')->label('Dann: Ereignistyp')->options(ICalRuleEngine::TYPES)->default('unknown')->required(),
Select::make('origin')->label('Ursprünglicher Buchungskanal')->options(fn (): array => ['unknown' => 'Unbekannt', 'current' => 'Dieser Portalkanal', ...$this->record->property->channels()->get()->mapWithKeys(fn (Channel $channel): array => ['channel:'.$channel->id => $channel->name])->all()])->default('unknown')->required(),
Select::make('representation')->label('Fachliche Einordnung')->options(ICalRuleEngine::REPRESENTATIONS)->default('unspecified')->required()->columnSpanFull()
->helperText('Eine allgemeine Sperre mit „Zusätzliche Sperre“ und unbekanntem Ursprung kann automatisch einer eindeutigen führenden Portalreservierung desselben Zeitraums zugeordnet werden. Eigene Buchungsmerkmale und persönliche Entscheidungen verhindern dies.'),
Repeater::make('extractions')->label('Informationen aus Text übernehmen')
->helperText('Ein Name im Original wird erst mit einer Textextraktion angezeigt. Für einen vollständigen Namen das passende Kalenderfeld und „Vollständiger Gastname“ wählen. Die Vorschau prüft das Ergebnis; es wird kein Gast automatisch angelegt.')
->defaultItems(0)->addActionLabel('Textextraktion hinzufügen')->columns(2)->schema([
Select::make('field')->label('Aus Kalenderfeld')->options(fn (): array => $this->fieldOptions())->required(),
Select::make('target')->label('Übernehmen als')->options(ICalRuleEngine::TARGETS)->required(),
Select::make('method')->label('Textauswahl')->options(ICalRuleEngine::EXTRACTIONS)->default('whole')->required()->live(),
TextInput::make('start')->label('Text nach / Anfangstext')->maxLength(500)->visible(fn (Get $get): bool => in_array($get('method'), ['after', 'between'], true))->live(debounce: 600),
TextInput::make('end')->label('Text vor / Endtext')->maxLength(500)->visible(fn (Get $get): bool => in_array($get('method'), ['before', 'between'], true))->live(debounce: 600),
])->columnSpanFull(),
])->columns(2),
]),
Section::make('3. Live-Vorschau')->description('Auswertung des gespeicherten echten Kalenderstands mit dem aktuellen Regelentwurf. Identische Termine sind lediglich Zuordnungskandidaten.')
->schema([View::make('filament.resources.channels.rule-preview')]),
Section::make('4. Informationen im Export an diesen Zielkanal')->description('Diese Exportkonfiguration wird beim Speichern wirksam. Die Vorschau zeigt den aktuell berechneten Inhalt; ein pausierter Export bleibt eingefroren. Nicht vorhandene Informationen werden ausgelassen.')
->schema([
Toggle::make('export_names')->label('Gastnamen ausdrücklich an diesen Zielkanal weitergeben')->default(false)->live()
->helperText('Gilt für neu erzeugte Exporte. Ein pausierter Export behält seinen gespeicherten Stand bis zur Reaktivierung.'),
Repeater::make('export_mapping')->label('iCal-Felder befüllen')->maxItems(3)->defaultItems(0)->live(debounce: 600)->addActionLabel('Exportfeld hinzufügen')->schema([
Select::make('field')->label('iCal-Zielfeld')->options(ICalExportFields::ICAL_FIELDS)->required(),
Select::make('items')->label('Enthaltene Informationen (in dieser Reihenfolge)')->options(ICalExportFields::FIELDS)->multiple()->required(),
TextInput::make('separator')->label('Trennzeichen')->default(' – ')->maxLength(30),
]),
View::make('filament.resources.channels.export-preview'),
]),
]);
}
public function preview(): array
{
$engine = app(ICalRuleEngine::class);
$rules = array_values($this->data['rules'] ?? []);
$counts = array_fill(0, count($rules), 0);
$unmatched = 0;
$rows = [];
$occupations = $this->record->property->blockedPeriods()->with('channel')->get();
$blocks = $occupations->where('is_representation', false);
foreach ($this->record->ical_analysis['events'] ?? [] as $event) {
$result = $engine->evaluate($this->record, $event['properties'], $rules);
if ($result['matched']) {
$counts[$result['rule_index']]++;
} else {
$unmatched++;
}
$candidates = $blocks->filter(fn (BlockedPeriod $block): bool => $block->starts_on->toDateString() === $event['starts_on'] && $block->ends_on->toDateString() === $event['ends_on'] && ! ($block->channel_id === $this->record->id && $block->external_uid === $event['uid']))->sortByDesc('leading_priority');
$occupation = $occupations->first(fn (BlockedPeriod $block): bool => $block->channel_id === $this->record->id && $block->external_uid === $event['uid']);
$rows[] = [...$event, 'summary' => $engine->values($event['properties'], 'SUMMARY')[0] ?? '(ohne SUMMARY)', 'result' => $result,
'occupation_url' => $occupation ? PortalOccupationResource::getUrl('view', ['record' => $occupation->id]) : null,
'candidates' => $candidates->map(fn (BlockedPeriod $block): array => [
'id' => $block->id, 'reason' => $block->channel?->name ?? $block->reason,
'priority' => $block->leading_priority, 'kind' => $block->occupationKind()->getLabel(),
'url' => in_array($block->source, ['channel', 'email'], true) ? PortalOccupationResource::getUrl('view', ['record' => $block->id]) : null,
])->all()];
}
return ['rows' => $rows, 'counts' => $counts, 'rules' => $rules, 'unmatched' => $unmatched];
}
public function savedRulesStatus(): string
{
$draft = $this->record->ical_rules ?? [];
$active = $this->record->ical_active_rules ?? [];
if ($draft !== $active) {
return 'Gespeicherte Regeln sind noch nicht aktiv. Entwurf: '.count($draft).' Regeln; aktiv: '.count($active).' Regeln.';
}
return $active === [] ? 'Es sind noch keine Erkennungsregeln aktiviert.' : 'Gespeicherter Entwurf und aktive Regeln stimmen überein. Aktiv: '.count($active).' Regeln.';
}
public function exportPreview(): array
{
$channel = clone $this->record;
$channel->forceFill(['ical_export_names' => (bool) ($this->data['export_names'] ?? false), 'ical_export_mapping' => array_values($this->data['export_mapping'] ?? [])]);
return app(ICalParser::class)->parseDocument(app(ICalFeed::class)->build($channel))['events'];
}
protected function handleRecordUpdate(Model $record, array $data): Model
{
DB::transaction(function () use ($record, $data): Model {
$channel = app(SaveChannelRules::class)->handle($record, array_values($data['rules'] ?? []));
return app(ConfigureChannelExport::class)->handle($channel, array_values($data['export_mapping'] ?? []), (bool) ($data['export_names'] ?? false));
});
return $record->refresh();
}
protected function getSavedNotificationTitle(): ?string
{
return 'Regelentwurf und Exportkonfiguration gespeichert';
}
protected function getHeaderActions(): array
{
return [
Action::make('saveDraft')->label('Entwurf speichern')->color('gray')
->action(function (): void {
$this->save(shouldRedirect: false);
}),
Action::make('analyze')->label('Kalender analysieren')->action(function (AnalyzeChannelCalendar $analyze): void {
try {
$this->record = $analyze->handle($this->record);
Notification::make()->title($this->record->ical_analysis['count'].' Originalereignisse analysiert')->success()->send();
} catch (ChannelSyncException $exception) {
Notification::make()->title('Analyse nicht möglich')->body($exception->getMessage())->danger()->send();
}
}),
Action::make('applyRules')->label('Speichern & anwenden')->requiresConfirmation()
->modalDescription('Der Regelentwurf wird aktiviert und der vorhandene Kalenderbestand neu klassifiziert. IDs, Termine und persönliche Zuordnungen bleiben erhalten. Bekannte Herkunft beeinflusst den kanalspezifischen Export. Bei Namensfreigabe werden die gewählten Exportinformationen ebenfalls gespeichert.')
->action(function (ApplyChannelRules $apply, Action $action): void {
try {
$counts = DB::transaction(function () use ($apply): array {
$this->record = $this->handleRecordUpdate($this->record, $this->form->getState());
return $apply->handle($this->record);
});
} catch (ValidationException $exception) {
$this->record->refresh();
$this->setErrorBag($exception->errors());
Notification::make()->title('Regeln wurden nicht angewendet')
->body(collect($exception->errors())->flatten()->unique()->implode(' '))
->danger()->persistent()->send();
$action->cancel();
}
$this->record->refresh();
$this->rememberData();
Notification::make()->title($counts['classified'].' Einträge neu klassifiziert')
->body($counts['missing_raw'].' Einträge ohne Originaldaten unverändert. Eindeutige allgemeine Belegtmeldungen werden als Kalenderspiegelung zugeordnet; widersprüchliche Einträge bleiben zur Klärung sichtbar.')
->success()->send();
}),
Action::make('configuration')->label('Kalenderverbindung')->url(fn (): string => ChannelResource::getUrl('edit', ['record' => $this->record])),
];
}
}
Loaded 100 of 494 files, more files were not shown because too many files have changed in this diff. Show more