Dokumentenzusammenstellung und Vorlagensteuerung (Paket 3, Prozessarchitektur v0.10)
Deploy FeWo mit PipelineManager / deploy (push) Successful in 3m59s

Eine Zusammenstellung vor jedem Dokument (Angebot, Bestaetigung, Buchungsunterlagen
extern), Dokumentart je Vorgangsart, Freigaben fuer Vorlagen und Dokumentarten,
Schutz vor unvereinbarten Bedingungen bei Portalbuchungen (E-004), kein doppelter
Versand, Absicherung Hold 0 bis Paket 7, A6-Aufenthaltsbestaetigung vorbereitet.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
LarsandClaude Opus 5.5 committed 2026-11-01 19:44:52 +01:00
1 parent 64248c09fa
commit cf11c8a474
45 files changed
+2385 -144

No files matched your search

+9 -2
View File
@@ -4,7 +4,10 @@
use App\Availability\AvailabilityChecker;
use App\Availability\CalendarClearance;
use App\Documents\DocumentComposer;
use App\Documents\DocumentFinding;
use App\Enums\BookingStatus;
use App\Enums\DocumentKind;
use App\Enums\ProcessingMode;
use App\Exceptions\ReservationException;
use App\Models\Booking;
@@ -18,7 +21,8 @@
*
* Rules: pre-reservation active (the dates are really blocked), guest e-mail known, dates still free, contract
* texts released by the landlord (not the sample text; skipped while mails only go to the test recipient),
* and the calendar clearance of {@see CalendarClearance} (fresh imports, instant-booking portals fetched our feed).
* the calendar clearance of {@see CalendarClearance} (fresh imports, instant-booking portals fetched our feed) and an
* offer composition without anything to confirm ({@see DocumentComposer}: template released, contract data complete).
*/
class AutoOffer
{
@@ -57,6 +61,9 @@ public function blockers(Booking $booking): array
$reasons[] = 'Mietbedingungen, Stornobedingungen oder Bankverbindung sind noch nicht vom Betreiber freigegeben (leer oder Mustertext).';
}
// Status, e-mail, dates and the missing reservation are checked above; the composition adds what concerns the document.
$reasons = [...$reasons, ...app(DocumentComposer::class)->compose($booking, DocumentKind::Offer)->toConfirm(except: [DocumentFinding::HOLD_ZERO])];
return [...$reasons, ...$this->clearance->reasons($property, $booking->created_at)];
}
@@ -79,7 +86,7 @@ public function handle(Booking $booking): array
}
try {
$this->sendOffer->handle($booking->fresh());
$this->sendOffer->handle($booking->fresh(), ['expected_version' => 0]);
} catch (QuoteException|ReservationException $exception) {
// A mail failure keeps the saved offer (SendOffer reports it in the inbox); the landlord can resend the link.
return [$exception->getMessage()];
+16 -3
View File
@@ -6,11 +6,14 @@
use App\Documents\OfferTerms;
use App\Documents\RentalContract;
use App\Enums\BookingStatus;
use App\Enums\DocumentKind;
use App\Enums\InboxMessageKind;
use App\Exceptions\ReservationException;
use App\Filament\Resources\Bookings\BookingResource;
use App\Mail\BookingConfirmed;
use App\Mail\BookingDocumentation;
use App\Models\Booking;
use App\Process\CaseLog;
use App\Support\Inbox;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@@ -84,18 +87,28 @@ public function bind(Booking $booking): void
*
* @return bool whether the guest has the confirmation (true when no mail was requested)
*/
public function deliver(Booking $booking, bool $notifyGuest = true): bool
public function deliver(Booking $booking, bool $notifyGuest = true, ?DocumentKind $kind = null): bool
{
$booking->loadMissing(['guest', 'property']);
$kind ??= DocumentKind::forCase($booking) ?? DocumentKind::Confirmation;
try {
$this->contract->generate($booking);
$created = $booking->contract_path === null;
$this->contract->generate($booking, kind: $kind);
if ($created) {
CaseLog::record($booking, 'document', $kind->getLabel().' erstellt'.(isset($booking->offer_terms['template']['name']) ? ' (Vorlage '.$booking->offer_terms['template']['name'].', Version '.$booking->offer_terms['template']['version'].')' : ' (Texte der Webseite)'), data: [
'kind' => $kind->value,
'template' => $booking->offer_terms['template'] ?? null,
'annexes' => array_map(fn (array $annex): string => $annex['name'].' (Version '.$annex['version'].')', (array) ($booking->offer_terms['annexes'] ?? [])),
'pdf_sha256' => $booking->contract_pdf_sha256,
]);
}
if (! $notifyGuest) {
return true;
}
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new BookingConfirmed($booking));
Mail::to($booking->guest->email, $booking->guest->full_name)->send($kind === DocumentKind::ExternalRecord ? new BookingDocumentation($booking) : new BookingConfirmed($booking));
$booking->forceFill(['confirmation_sent_at' => now(), 'confirmation_failed_at' => null])->save();
return true;
+16 -10
View File
@@ -8,8 +8,8 @@
use App\Exceptions\ReservationException;
use App\Models\Booking;
use App\Models\Guest;
use App\Process\CaseAutomation;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
/**
* The guest's contact data arrived (portal message, e-mail, phone) and is entered on the booking. The landlord chooses
@@ -22,7 +22,7 @@ class ProvideGuestContact
public const MANUAL = 'manual';
public function __construct(private ConfirmBooking $confirm, private SendOffer $offer) {}
public function __construct(private ConfirmBooking $confirm, private AutoOffer $autoOffer, private SendBookingDocuments $documents) {}
/**
* @param array<string, ?string> $contact first_name, last_name, email, phone, street, postal_code, city, country
@@ -62,22 +62,28 @@ public function handle(Booking $booking, array $contact, string $process = self:
$booking->update(['processing_mode' => ProcessingMode::Automatic]);
if (in_array($booking->status, BookingStatus::occupying(), true)) {
$missing = app(CaseAutomation::class)->documentBlockers($booking);
if ($missing !== []) {
throw new ReservationException('Kontaktdaten gespeichert. Die Unterlagen können noch nicht automatisch versendet werden: '.implode(' ', $missing));
$reasons = $this->documents->automatically($booking);
if ($reasons !== []) {
throw new ReservationException('Kontaktdaten gespeichert. Die Unterlagen werden noch nicht automatisch versendet: '.implode(' ', $reasons));
}
$this->confirm->deliver($booking);
return 'Kontaktdaten gespeichert, Vertrag gesendet';
return 'Kontaktdaten gespeichert, Unterlagen gesendet';
}
if ($booking->intake === IntakeKind::Booking) {
$this->confirm->handle($booking);
DB::transaction(fn () => $this->confirm->bind($booking));
$reasons = $this->documents->automatically($booking->fresh());
if ($reasons !== []) {
throw new ReservationException('Kontaktdaten gespeichert und Buchung bestätigt. Die Unterlagen werden noch nicht automatisch versendet: '.implode(' ', $reasons));
}
return 'Kontaktdaten gespeichert, Buchung bestätigt und Vertrag gesendet';
return 'Kontaktdaten gespeichert, Buchung bestätigt und Unterlagen gesendet';
}
$this->offer->handle($booking);
$reasons = $this->autoOffer->handle($booking);
if ($reasons !== []) {
throw new ReservationException('Kontaktdaten gespeichert. Das Angebot wird noch nicht automatisch gesendet: '.implode(' ', $reasons));
}
return 'Kontaktdaten gespeichert, Angebot gesendet';
}
+113
View File
@@ -0,0 +1,113 @@
<?php
namespace App\Actions;
use App\Documents\DocumentComposer;
use App\Documents\DocumentComposition;
use App\Enums\DocumentKind;
use App\Exceptions\ReservationException;
use App\Models\Booking;
use App\Process\CaseLog;
use Illuminate\Support\Facades\Cache;
/**
* Sends the documents of a binding case – the confirmation with the rental contract, or the booking documentation of a
* booking already binding on a portal – from its composition ({@see DocumentComposer}). Automatically only when nothing
* is missing and nothing has to be confirmed; by hand after the landlord confirmed every point. The documents go out
* once: a lock and a fresh look at the case keep repeated runs, double clicks and parallel jobs from sending twice.
* Until the first document exists the terms are taken from the composition (template and annexes as chosen); after
* that they stay as they were sent.
*/
class SendBookingDocuments
{
public function __construct(private DocumentComposer $composer, private ConfirmBooking $confirm) {}
/**
* @param array<string, mixed> $changes
*/
public function compose(Booking $booking, array $changes = []): DocumentComposition
{
return $this->composer->compose($booking, self::kindFor($booking), $changes);
}
/**
* The automatic run: sends when the composition allows it.
*
* @return list<string> why nothing was sent (empty: sent or nothing to send)
*/
public function automatically(Booking $booking): array
{
if ($booking->confirmation_sent_at !== null) {
return [];
}
$composition = $this->compose($booking);
if (! $composition->canSendAutomatically()) {
return [...$composition->blockers(), ...array_map(fn (string $point): string => 'Bitte prüfen: '.$point, $composition->toConfirm())];
}
return $this->send($booking, $composition, acknowledged: false, automatic: true) ? [] : ['Die Unterlagen konnten nicht versendet werden (siehe Postfach).'];
}
/**
* Sending by hand after the landlord saw the composition.
*
* @param array<string, mixed> $changes contract_template_id, annex_ids
* @return bool whether the guest has the documents
*
* @throws ReservationException
*/
public function handle(Booking $booking, array $changes = [], bool $acknowledged = false): bool
{
if (! $booking->isBinding()) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'mit Unterlagen bestätigt');
}
$composition = $this->compose($booking, $changes);
if ($composition->blockers() !== []) {
throw new ReservationException(implode(' ', $composition->blockers()));
}
if (! $composition->canSendByHand($acknowledged)) {
throw new ReservationException('Bitte die Hinweise prüfen und ausdrücklich bestätigen: '.implode(' ', $composition->toConfirm()));
}
return $this->send($booking, $composition, $acknowledged, automatic: false);
}
/**
* The document kind of a binding case (a case whose documents the portal sends has none from us).
*/
public static function kindFor(Booking $booking): DocumentKind
{
$kind = DocumentKind::forCase($booking);
return in_array($kind, [DocumentKind::Confirmation, DocumentKind::ExternalRecord], true) ? $kind : DocumentKind::Confirmation;
}
private function send(Booking $booking, DocumentComposition $composition, bool $acknowledged, bool $automatic): bool
{
$lock = Cache::lock('booking-documents-'.$booking->id, 120);
if (! $lock->get()) {
throw new ReservationException('Die Unterlagen werden gerade versendet. Bitte kurz warten und die Seite neu laden.');
}
try {
$booking->refresh();
if ($booking->confirmation_sent_at !== null) {
return true;
}
if (! $composition->termsFrozen && $booking->contract_path === null && $composition->terms !== null) {
$booking->update(['offer_terms' => $composition->terms]);
}
if ($acknowledged && $composition->toConfirm() !== []) {
CaseLog::record($booking, 'document', 'Hinweise vor dem Versand bestätigt', data: ['confirmed' => $composition->toConfirm()]);
}
return CaseLog::context(fn (): bool => $this->confirm->deliver($booking, kind: $composition->kind), actor: $automatic ? CaseLog::SYSTEM.' (automatisch)' : null);
} finally {
$lock->release();
}
}
}
+28 -3
View File
@@ -3,9 +3,11 @@
namespace App\Actions;
use App\Availability\AvailabilityChecker;
use App\Documents\DocumentComposer;
use App\Documents\OfferTerms;
use App\Documents\RentalContract;
use App\Enums\BookingStatus;
use App\Enums\DocumentKind;
use App\Enums\InboxMessageKind;
use App\Enums\QuoteLineType;
use App\Exceptions\ReservationException;
@@ -17,6 +19,7 @@
use App\Pricing\QuoteException;
use App\Pricing\QuoteLine;
use App\Pricing\StayRequest;
use App\Process\CaseLog;
use App\Support\Inbox;
use Carbon\CarbonImmutable;
use Illuminate\Support\Arr;
@@ -42,7 +45,12 @@ public function __construct(
) {}
/**
* @param array{arrival?: string, departure?: string, guests?: int, promo_code?: ?string, price_adjustment?: ?int, price_adjustment_label?: ?string, valid_until?: ?string, offer_message?: ?string, contract_template_id?: int|string|null, annex_ids?: ?list<int|string>, guest?: array<string, ?string>} $changes
* The offer is checked through its composition ({@see DocumentComposer}) like every other document: points the
* landlord has to confirm (e.g. an unreleased template, missing contract data, a request that by the settings
* reserves nothing) stop it unless `acknowledged` is set. `expected_version` makes a repeated call harmless: when
* another offer was sent in the meantime, nothing is sent again.
*
* @param array{arrival?: string, departure?: string, guests?: int, promo_code?: ?string, price_adjustment?: ?int, price_adjustment_label?: ?string, valid_until?: ?string, offer_message?: ?string, contract_template_id?: int|string|null, annex_ids?: ?list<int|string>, guest?: array<string, ?string>, acknowledged?: bool, expected_version?: ?int} $changes
*
* @throws QuoteException
* @throws ReservationException
@@ -57,6 +65,11 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
throw ReservationException::invalidTransition($booking->status->getLabel(), 'als Angebot versendet');
}
$toConfirm = app(DocumentComposer::class)->compose($booking, DocumentKind::Offer, $changes)->toConfirm();
if ($toConfirm !== [] && ! ($changes['acknowledged'] ?? false)) {
throw new ReservationException('Bitte die Hinweise prüfen und ausdrücklich bestätigen: '.implode(' ', $toConfirm));
}
DB::transaction(function () use ($booking, $changes): void {
$booking->lockForTransition();
@@ -64,6 +77,10 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
throw ReservationException::invalidTransition($booking->status->getLabel(), 'als Angebot versendet');
}
if (isset($changes['expected_version']) && $booking->offer_version !== (int) $changes['expected_version']) {
throw new ReservationException('Inzwischen wurde schon ein Angebot gesendet (Version '.$booking->offer_version.'). Es wurde nichts erneut gesendet.');
}
$arrival = CarbonImmutable::parse($changes['arrival'] ?? $booking->arrival);
$departure = CarbonImmutable::parse($changes['departure'] ?? $booking->departure);
@@ -75,7 +92,7 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
$stay = new StayRequest($arrival, $departure, (int) ($changes['guests'] ?? $booking->guests), $booking->extras ?? [], $promoCode);
$adjustment = (int) ($changes['price_adjustment'] ?? 0);
$adjustmentLabel = trim((string) ($changes['price_adjustment_label'] ?? '')) ?: ($adjustment < 0 ? 'Nachlass' : 'Zuschlag');
$quote = $this->quoteWithAdjustment($booking, $stay, $adjustment, $adjustmentLabel);
$quote = $this->quoteFor($booking, $stay, $adjustment, $adjustmentLabel);
if (filled($changes['guest'] ?? null)) {
$booking->guest->update(Arr::only(array_map(fn ($value) => filled($value) ? trim((string) $value) : null, $changes['guest']), ['first_name', 'last_name', 'phone', 'street', 'postal_code', 'city', 'country']));
@@ -105,6 +122,14 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
$booking->refresh();
$this->contract->generate($booking, draft: true);
CaseLog::record($booking, 'document', 'Angebot Version '.$booking->offer_version.' erstellt'.(isset($booking->offer_terms['template']['name']) ? ' (Vorlage '.$booking->offer_terms['template']['name'].', Version '.$booking->offer_terms['template']['version'].')' : ' (Texte der Webseite)'), data: array_filter([
'kind' => DocumentKind::Offer->value,
'template' => $booking->offer_terms['template'] ?? null,
'annexes' => array_map(fn (array $annex): string => $annex['name'].' (Version '.$annex['version'].')', (array) ($booking->offer_terms['annexes'] ?? [])),
'pdf_sha256' => $booking->offer_pdf_sha256,
'offer_hash' => $booking->offer_hash,
'confirmed' => $toConfirm,
]));
if ($sendMail) {
$this->deliver($booking);
@@ -155,7 +180,7 @@ public function offerUrl(Booking $booking): string
*
* @throws QuoteException
*/
private function quoteWithAdjustment(Booking $booking, StayRequest $stay, int $adjustment, string $label): PriceQuote
public function quoteFor(Booking $booking, StayRequest $stay, int $adjustment, string $label): PriceQuote
{
$quote = $this->calculator->calculate($booking->property, $stay);
if ($adjustment === 0) {