Buchungsprozess: Angebots-Snapshot, atomare Annahme, Auto-Angebot, Kanalfreigabe
Deploy FeWo mit PipelineManager / deploy (push) Failing after 3m38s

- Angebotsbedingungen und Zahlungsdaten werden je Version eingefroren (offer_terms, offer_hash)
- Annahme in einer gesperrten Transaktion, idempotent, mit Nachweis; Mail- und Portalfehler
  machen eine gespeicherte Buchung nicht ungueltig (Postfach, Nachversand)
- Je Wohnung: manuelle/automatische Angebote, optionale Vorreservierung
- Automatische Freigabe abhaengig von aktuellen Importen und Feed-Abruf bei Sofortbuchungsportalen
- Deutsche Fehlerseiten, Buchungsseite zeigt Angebots- und Zustellstatus
- Dokumentation: BOOKING-E2E-*.md, BOOKING-COMPLIANCE-HANDOVER.md

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
LarsandClaude Sonnet 5.5 committed 2026-10-30 12:01:02 +01:00
1 parent e7cc37a15b
commit eafab8a2cb
47 files changed
+2099 -104

No files matched your search

+141 -24
View File
@@ -2,53 +2,91 @@
namespace App\Actions;
use App\Availability\CalendarClearance;
use App\Documents\OfferTerms;
use App\Enums\BookingStatus;
use App\Enums\InboxMessageKind;
use App\Exceptions\ReservationException;
use App\Filament\Resources\Bookings\BookingResource;
use App\Mail\OfferAnswered;
use App\Models\Booking;
use App\Support\Content;
use App\Support\Inbox;
use App\Support\Settings;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Throwable;
/**
* The guest accepts the offer on the signed offer page: the booking is concluded. A record of what was
* accepted is kept (offer version, time, fingerprints of price and terms – no IP address), then the booking
* is confirmed as usual (contract + confirmation mail as electronic acknowledgement).
* The guest accepts the offer on the signed offer page: the booking is concluded. Everything happens in one
* locked transaction (property + booking row): status, validity, integrity of the frozen offer and availability
* are checked, the acceptance record is written and the booking becomes binding – or nothing changes at all.
* Accepting the same version again is idempotent (no second booking, no second mail). Mails follow after the commit
* and never undo the acceptance.
*/
class AcceptOffer
{
public function __construct(private ConfirmBooking $confirm) {}
public function __construct(private ConfirmBooking $confirm, private Inbox $inbox, private CalendarClearance $clearance) {}
/**
* @return bool true when this call concluded the booking, false when the version had already been accepted
*
* @throws ReservationException
*/
public function handle(Booking $booking, int $offerVersion): void
public function handle(Booking $booking, int $offerVersion): bool
{
$this->ensureAcceptable($booking, $offerVersion);
$booking->update([
'accepted_at' => now(),
'acceptance' => [
'offer_version' => $booking->offer_version,
'accepted_at' => now()->toIso8601String(),
'total' => $booking->total,
'quote_sha256' => hash('sha256', json_encode($booking->quote)),
'terms_sha256' => hash('sha256', (string) Content::get('contract.terms').'|'.Content::get('stay.cancellation')),
'via' => 'offer_link',
],
]);
$this->confirm->handle($booking);
if ($booking->status === BookingStatus::OfferSent) {
$this->ensureCalendarFresh($booking);
}
try {
Mail::to(Settings::notificationRecipients())->send(new OfferAnswered($booking, accepted: true));
} catch (Throwable $exception) {
report($exception);
$accepted = DB::transaction(function () use ($booking, $offerVersion): bool {
$booking->lockForTransition();
if ($this->alreadyAccepted($booking, $offerVersion)) {
return false;
}
$this->ensureAcceptable($booking, $offerVersion);
$this->ensureUnchanged($booking);
$validUntil = $booking->hold_expires_at?->toIso8601String();
$this->confirm->bind($booking);
$booking->update([
'accepted_at' => now(),
'acceptance' => [
'offer_version' => $booking->offer_version,
'accepted_at' => now()->toIso8601String(),
'offer_sent_at' => $booking->offer_sent_at?->toIso8601String(),
'valid_until' => $validUntil,
'total' => $booking->total,
'offer_hash' => $booking->offer_hash,
'quote_sha256' => hash('sha256', json_encode($booking->quote)),
'terms_sha256' => hash('sha256', json_encode($booking->offer_terms['texts'] ?? [])),
'accept_button' => $booking->offerText('offer.accept_button'),
'via' => 'offer_link',
],
]);
return true;
});
} catch (ReservationException $exception) {
$this->noteRejection($booking, $offerVersion, $exception);
throw $exception;
}
if ($accepted) {
$this->confirm->deliver($booking);
$this->notifyLandlord($booking);
}
return $accepted;
}
/**
* Checks that make the offer page show the form: version, status and validity (no locks, read only).
*
* @throws ReservationException
*/
public function ensureAcceptable(Booking $booking, int $offerVersion): void
@@ -65,4 +103,83 @@ public function ensureAcceptable(Booking $booking, int $offerVersion): void
throw ReservationException::offerExpired();
}
}
/**
* The frozen offer must still match its fingerprint (price, dates, terms); offers made before the
* fingerprint existed have none and are not checked.
*
* @throws ReservationException
*/
public function ensureUnchanged(Booking $booking): void
{
if ($booking->offer_hash !== null && ! hash_equals($booking->offer_hash, OfferTerms::hash($booking))) {
throw ReservationException::offerChanged();
}
}
/**
* Before the guest becomes bound, the imported portal calendars must be recent (an import is tried first –
* network access, so outside the transaction). Otherwise nothing is concluded and the landlord is told.
*
* @throws ReservationException
*/
private function ensureCalendarFresh(Booking $booking): void
{
$property = $booking->property;
$this->clearance->refresh($property);
$stale = $this->clearance->staleImports($property);
if ($stale->isEmpty()) {
return;
}
$this->inbox->post(
InboxMessageKind::SyncFailed,
'accept-'.$booking->id.':'.now()->format('YmdH'),
'Annahme von '.$booking->reference.' zurückgestellt: Kalenderstand nicht aktuell',
'Der Gast wollte das Angebot annehmen, aber der Import von '.$stale->pluck('name')->implode(', ').' ist nicht aktuell. Bitte Kalenderabgleich prüfen und den Gast kontaktieren.',
actionUrl: BookingResource::getUrl('view', ['record' => $booking]),
propertyId: $booking->property_id,
);
throw ReservationException::calendarUnverified();
}
private function alreadyAccepted(Booking $booking, int $offerVersion): bool
{
return in_array($booking->status, BookingStatus::occupying(), true)
&& $booking->accepted_at !== null
&& ($booking->acceptance['offer_version'] ?? null) === $offerVersion;
}
private function noteRejection(Booking $booking, int $offerVersion, ReservationException $exception): void
{
if ($offerVersion !== $booking->offer_version || $booking->status !== BookingStatus::OfferSent) {
return;
}
$reasonIsUnexpected = $exception->getMessage() === ReservationException::offerChanged()->getMessage()
|| $exception->getMessage() === ReservationException::notAvailable()->getMessage();
if (! $reasonIsUnexpected) {
return;
}
$this->inbox->post(
InboxMessageKind::OfferRejected,
'booking-'.$booking->id.':v'.$offerVersion,
'Annahme von Angebot '.$booking->reference.' abgewiesen',
'Der Gast wollte das Angebot annehmen, aber: '.$exception->getMessage().' Bitte den Gast kontaktieren oder ein neues Angebot senden.',
actionUrl: BookingResource::getUrl('view', ['record' => $booking]),
propertyId: $booking->property_id,
);
}
private function notifyLandlord(Booking $booking): void
{
try {
Mail::to(Settings::notificationRecipients())->send(new OfferAnswered($booking, accepted: true));
} catch (Throwable $exception) {
Log::warning('Benachrichtigung über Annahme nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
}
}
}
+103
View File
@@ -0,0 +1,103 @@
<?php
namespace App\Actions;
use App\Availability\AvailabilityChecker;
use App\Availability\CalendarClearance;
use App\Enums\BookingStatus;
use App\Enums\OfferMode;
use App\Exceptions\ReservationException;
use App\Models\Booking;
use App\Pricing\QuoteException;
use App\Support\Content;
use App\Support\Settings;
/**
* Automatic offer processing (property setting "Automatisch"): sends the offer without the landlord when every
* release rule is met, otherwise leaves the request untouched for manual processing and says why.
*
* 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).
*/
class AutoOffer
{
public function __construct(
private SendOffer $sendOffer,
private CalendarClearance $clearance,
private AvailabilityChecker $availability,
) {}
public function applies(Booking $booking): bool
{
return $booking->property->offer_mode === OfferMode::Automatic;
}
/**
* @return list<string> reasons why the offer cannot be sent automatically (empty = may be sent)
*/
public function blockers(Booking $booking): array
{
$property = $booking->property;
$reasons = [];
if (! $property->pre_reservation_enabled) {
$reasons[] = 'Die Vorreservierung ist für diese Wohnung ausgeschaltet; ohne Sperre im Kalender wird kein Angebot automatisch erteilt.';
}
if ($booking->status !== BookingStatus::Reserved || ! $booking->isHoldActive()) {
$reasons[] = 'Die Anfrage ist nicht mehr vorgemerkt (Frist abgelaufen oder bereits bearbeitet).';
}
if (blank($booking->guest?->email)) {
$reasons[] = 'Die E-Mail-Adresse des Gastes fehlt.';
}
if (! $this->availability->isAvailable($property, $booking->arrival, $booking->departure, ignore: $booking)) {
$reasons[] = 'Der Zeitraum ist inzwischen belegt.';
}
if (! $this->contractTextsReleased()) {
$reasons[] = 'Mietbedingungen, Stornobedingungen oder Bankverbindung sind noch nicht vom Betreiber freigegeben (leer oder Mustertext).';
}
return [...$reasons, ...$this->clearance->reasons($property, $booking->created_at)];
}
/**
* Tries to send the offer. Imports of stale channels are refreshed first (network access, outside transactions).
*
* @return list<string> reasons for the manual fallback; empty when the offer was sent
*/
public function handle(Booking $booking): array
{
$booking->loadMissing(['property', 'guest']);
if ($booking->property->pre_reservation_enabled) {
$this->clearance->refresh($booking->property);
}
$reasons = $this->blockers($booking);
if ($reasons !== []) {
return $reasons;
}
try {
$this->sendOffer->handle($booking->fresh());
} 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()];
}
return [];
}
private function contractTextsReleased(): bool
{
if (! Settings::isLive()) {
return true;
}
$terms = (string) Content::get('contract.terms');
return filled($terms) && ! str_contains($terms, '[MUSTER')
&& filled(Content::get('stay.cancellation'))
&& filled(config('fewo.bank.iban'));
}
}
+87 -15
View File
@@ -3,56 +3,128 @@
namespace App\Actions;
use App\Availability\AvailabilityChecker;
use App\Documents\OfferTerms;
use App\Documents\RentalContract;
use App\Enums\BookingStatus;
use App\Enums\InboxMessageKind;
use App\Exceptions\ReservationException;
use App\Filament\Resources\Bookings\BookingResource;
use App\Mail\BookingConfirmed;
use App\Models\Booking;
use App\Support\Inbox;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Throwable;
/**
* Makes a booking binding: payment due dates are fixed, the rental contract is generated and sent with the
* confirmation. Used when the guest accepts an offer (AcceptOffer) and when the landlord confirms directly
* (e.g. a booking agreed on the phone). Expired requests/offers can still be confirmed while the dates are free.
*
* Binding is one locked database step ({@see bind()}); contract and mail follow afterwards ({@see deliver()}).
* A failing mail server never undoes a binding booking – the failure is recorded and the mail can be resent.
*/
class ConfirmBooking
{
public function __construct(
private AvailabilityChecker $availability,
private RentalContract $contract,
private Inbox $inbox,
) {}
/**
* @return bool whether the guest has the confirmation (true when no mail was requested)
*
* @throws ReservationException
*/
public function handle(Booking $booking, bool $notifyGuest = true): void
public function handle(Booking $booking, bool $notifyGuest = true): bool
{
if ($notifyGuest && blank($booking->guest?->email)) {
throw new ReservationException('Vor dem E-Mail-Versand bitte die E-Mail-Adresse des zugeordneten Gastes ergänzen.');
}
DB::transaction(fn () => $this->bind($booking));
return $this->deliver($booking, $notifyGuest);
}
/**
* Locks the property and the booking, checks status and availability and makes the booking binding.
* Must run inside a transaction; every writer of bookings takes the same property lock, so two
* overlapping stays can never both become binding.
*
* @throws ReservationException
*/
public function bind(Booking $booking): void
{
$booking->lockForTransition();
if (! in_array($booking->status, [BookingStatus::Reserved, BookingStatus::OfferSent, BookingStatus::Expired], true)) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'bestätigt');
}
DB::transaction(function () use ($booking): void {
if (! $this->availability->isAvailable($booking->property, $booking->arrival, $booking->departure, ignore: $booking)) {
throw ReservationException::notAvailable();
if (! $this->availability->isAvailable($booking->property, $booking->arrival, $booking->departure, ignore: $booking)) {
throw ReservationException::notAvailable();
}
$terms = $booking->offer_terms ?? OfferTerms::capture();
$booking->update([
'status' => BookingStatus::Confirmed,
'hold_expires_at' => null,
'confirmed_at' => now(),
'offer_terms' => $terms,
'deposit_due_on' => today()->addDays((int) ($terms['deposit_due_days'] ?? config('fewo.deposit_due_days')))->toDateString(),
]);
}
/**
* Generates the contract and sends the confirmation – after the booking is saved, with every failure
* contained: the booking stays binding, the failure is marked and shown in the admin inbox.
*
* @return bool whether the guest has the confirmation (true when no mail was requested)
*/
public function deliver(Booking $booking, bool $notifyGuest = true): bool
{
$booking->loadMissing(['guest', 'property']);
try {
$this->contract->generate($booking);
if (! $notifyGuest) {
return true;
}
$booking->update([
'status' => BookingStatus::Confirmed,
'hold_expires_at' => null,
'confirmed_at' => now(),
'deposit_due_on' => today()->addDays(config('fewo.deposit_due_days'))->toDateString(),
]);
});
$this->contract->generate($booking);
if ($notifyGuest) {
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new BookingConfirmed($booking));
$booking->forceFill(['confirmation_sent_at' => now(), 'confirmation_failed_at' => null])->saveQuietly();
return true;
} catch (Throwable $exception) {
// Only class and booking id are logged: mail errors can contain the recipient's address.
Log::warning('Buchungsbestätigung nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
$booking->forceFill(['confirmation_failed_at' => now()])->saveQuietly();
$this->inbox->post(
InboxMessageKind::ConfirmationFailed,
'booking-'.$booking->id,
'Buchungsbestätigung '.$booking->reference.' nicht zugestellt',
'Die Buchung ist verbindlich gespeichert, aber der Vertrag konnte nicht erzeugt oder die Bestätigung nicht versendet werden. Auf der Buchungsseite kann die Bestätigung erneut gesendet werden.',
actionUrl: BookingResource::getUrl('view', ['record' => $booking]),
propertyId: $booking->property_id,
);
return false;
}
}
/**
* Sends the confirmation again (admin action / command). Does nothing for bookings that are not binding.
*/
public function resend(Booking $booking): bool
{
if (! in_array($booking->status, BookingStatus::occupying(), true)) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'erneut bestätigt');
}
return $this->deliver($booking);
}
}
+29 -5
View File
@@ -18,6 +18,7 @@
use App\Tenancy\TenantContextMissing;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Throwable;
@@ -84,7 +85,7 @@ private function create(Property $property, StayRequest $stay, array $guestData,
'total' => $quote->total(),
'deposit' => $quote->deposit(),
'balance_due_on' => $quote->balanceDueOn->toDateString(),
'hold_expires_at' => now()->addHours($property->hold_hours),
'hold_expires_at' => $property->pre_reservation_enabled ? now()->addHours($property->hold_hours) : null,
'message' => $message,
'internal_notes' => $differences !== [] ? "Abweichende Angaben in dieser Anfrage (Gästekartei nicht geändert):\n".implode("\n", $differences) : null,
]);
@@ -138,15 +139,38 @@ private function guestFor(array $guestData): array
}
/**
* A failing mail server must not lose the reservation; failures are reported and visible in the log.
* Automatic mode first tries to send the offer; the guest then gets the offer instead of the receipt, the
* landlord a note either way (with the reasons when the automatic offer was not possible). A failing mail
* server or any other error must not lose the reservation; failures are logged without personal data.
*/
private function sendMails(Booking $booking): void
{
$blockers = [];
$offerSent = false;
try {
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ReservationReceived($booking));
Mail::to(Settings::notificationRecipients())->send(new NewReservation($booking));
$auto = app(AutoOffer::class);
if ($auto->applies($booking)) {
$blockers = $auto->handle($booking);
$offerSent = $blockers === [];
if (! $offerSent) {
$booking->update(['internal_notes' => trim(($booking->internal_notes ? $booking->internal_notes."\n\n" : '')."Automatisches Angebot nicht versendet:\n- ".implode("\n- ", $blockers))]);
}
$booking->refresh();
}
} catch (Throwable $exception) {
report($exception);
Log::warning('Automatisches Angebot fehlgeschlagen', ['booking' => $booking->id, 'exception' => $exception::class]);
$blockers = ['Technischer Fehler beim automatischen Angebot – bitte von Hand bearbeiten.'];
$offerSent = false;
}
try {
if (! $offerSent) {
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new ReservationReceived($booking));
}
Mail::to(Settings::notificationRecipients())->send(new NewReservation($booking, $offerSent, $blockers));
} catch (Throwable $exception) {
Log::warning('Eingangsmail nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
}
}
}
+16 -11
View File
@@ -7,6 +7,7 @@
use App\Mail\OfferAnswered;
use App\Models\Booking;
use App\Support\Settings;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
use Throwable;
@@ -20,19 +21,23 @@ class RejectOffer
*/
public function handle(Booking $booking, int $offerVersion): void
{
if ($offerVersion !== $booking->offer_version) {
throw ReservationException::offerOutdated();
}
DB::transaction(function () use ($booking, $offerVersion): void {
$booking->lockForTransition();
if ($booking->status !== BookingStatus::OfferSent) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'abgelehnt');
}
if ($offerVersion !== $booking->offer_version) {
throw ReservationException::offerOutdated();
}
$booking->update([
'status' => BookingStatus::Declined,
'declined_by' => 'guest',
'hold_expires_at' => null,
]);
if ($booking->status !== BookingStatus::OfferSent) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'abgelehnt');
}
$booking->update([
'status' => BookingStatus::Declined,
'declined_by' => 'guest',
'hold_expires_at' => null,
]);
});
try {
Mail::to(Settings::notificationRecipients())->send(new OfferAnswered($booking, accepted: false));
+43 -1
View File
@@ -3,10 +3,13 @@
namespace App\Actions;
use App\Availability\AvailabilityChecker;
use App\Documents\OfferTerms;
use App\Documents\RentalContract;
use App\Enums\BookingStatus;
use App\Enums\InboxMessageKind;
use App\Enums\QuoteLineType;
use App\Exceptions\ReservationException;
use App\Filament\Resources\Bookings\BookingResource;
use App\Mail\OfferMade;
use App\Models\Booking;
use App\Pricing\PriceCalculator;
@@ -14,11 +17,14 @@
use App\Pricing\QuoteException;
use App\Pricing\QuoteLine;
use App\Pricing\StayRequest;
use App\Support\Inbox;
use Carbon\CarbonImmutable;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\URL;
use Throwable;
/**
* Booking path 1 (docs/KONZEPT.md §6a): the landlord turns a request into an offer. Dates, guests, promo
@@ -32,6 +38,7 @@ public function __construct(
private PriceCalculator $calculator,
private AvailabilityChecker $availability,
private RentalContract $contract,
private Inbox $inbox,
) {}
/**
@@ -51,6 +58,12 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
}
DB::transaction(function () use ($booking, $changes): void {
$booking->lockForTransition();
if (! in_array($booking->status, [BookingStatus::Reserved, BookingStatus::OfferSent, BookingStatus::Expired], true)) {
throw ReservationException::invalidTransition($booking->status->getLabel(), 'als Angebot versendet');
}
$arrival = CarbonImmutable::parse($changes['arrival'] ?? $booking->arrival);
$departure = CarbonImmutable::parse($changes['departure'] ?? $booking->departure);
@@ -84,19 +97,48 @@ public function handle(Booking $booking, array $changes = [], bool $sendMail = t
'offer_version' => $booking->offer_version + 1,
'offer_sent_at' => now(),
'offer_message' => $changes['offer_message'] ?? null,
'offer_terms' => OfferTerms::capture(),
]);
$booking->refresh();
$booking->update(['offer_hash' => OfferTerms::hash($booking)]);
});
$booking->refresh();
$this->contract->generate($booking, draft: true);
if ($sendMail) {
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new OfferMade($booking, $this->offerUrl($booking)));
$this->deliver($booking);
}
return $booking;
}
/**
* Sends the offer mail. The offer is already saved (and its validity runs), so a failing mail server is
* recorded in the admin inbox and reported to the caller instead of being lost.
*
* @throws ReservationException
*/
public function deliver(Booking $booking): void
{
try {
Mail::to($booking->guest->email, $booking->guest->full_name)->send(new OfferMade($booking, $this->offerUrl($booking)));
} catch (Throwable $exception) {
// Only class and booking id are logged: mail errors can contain the recipient's address.
Log::warning('Angebot nicht zugestellt', ['booking' => $booking->id, 'exception' => $exception::class]);
$this->inbox->post(
InboxMessageKind::OfferMailFailed,
'booking-'.$booking->id.':v'.$booking->offer_version,
'Angebot '.$booking->reference.' nicht zugestellt',
'Das Angebot ist gespeichert und der Zeitraum gehalten, aber die E-Mail konnte nicht versendet werden. Auf der Buchungsseite kann der Angebotslink kopiert und dem Gast anders übermittelt werden.',
actionUrl: BookingResource::getUrl('view', ['record' => $booking]),
propertyId: $booking->property_id,
);
throw new ReservationException('Das Angebot wurde gespeichert, aber die E-Mail konnte nicht versendet werden. Der Angebotslink kann über „Angebotslink“ kopiert werden.');
}
}
/**
* The guest's link to the offer page; valid while the offer is valid and only for this offer version.
*/
+106
View File
@@ -0,0 +1,106 @@
<?php
namespace App\Availability;
use App\Actions\SyncChannel;
use App\Enums\ChannelBookingModel;
use App\Models\Channel;
use App\Models\ChannelExportRequest;
use App\Models\Property;
use Carbon\CarbonInterface;
use Illuminate\Support\Collection;
use Throwable;
/**
* Whether the calendars of the connected portals are good enough to commit to a stay without a human looking.
*
* Two kinds of evidence, both taken from what the synchronisation already records:
* - import: the last successful import of every importing channel is recent (otherwise one import is tried first);
* - export: a channel that can book instantly (booking model portal booking / mixed) has fetched OUR feed after the
* block was created. The feed is built from the database on every request, so a successful fetch of that channel's
* own token after the block existed contains it. This proves delivery, not that the portal has processed it –
* the remaining risk is documented in BOOKING-E2E-IMPLEMENTATION.md.
*
* Network access happens only in {@see refresh()} and never inside a database transaction.
*/
class CalendarClearance
{
public function __construct(private SyncChannel $sync) {}
/**
* @return Collection<int, Channel>
*/
public function staleImports(Property $property): Collection
{
$limit = now()->subMinutes((int) config('fewo.channels.fresh_within_minutes'));
return $property->channels()->active()->get()
->filter(fn (Channel $channel): bool => $channel->importsOccupations())
->filter(fn (Channel $channel): bool => $channel->last_success_at === null || $channel->last_success_at->lessThan($limit))
->values();
}
/**
* Imports the channels whose calendar is not recent (one attempt each); failures stay visible as stale.
*/
public function refresh(Property $property): void
{
foreach ($this->staleImports($property) as $channel) {
try {
$this->sync->handle($channel);
} catch (Throwable) {
// The sync log records the failure; the channel simply stays stale.
}
}
}
/**
* Instant-booking channels that have not fetched our feed since the block exists.
*
* @return Collection<int, Channel>
*/
public function unprovenInstantChannels(Property $property, CarbonInterface $blockedSince): Collection
{
return $property->channels()->active()->get()
->filter(fn (Channel $channel): bool => $this->canBookInstantly($channel))
->reject(fn (Channel $channel): bool => $channel->exportsOccupations() && $this->fetchedFeedSince($channel, $blockedSince))
->values();
}
public function canBookInstantly(Channel $channel): bool
{
return in_array($channel->booking_model, [ChannelBookingModel::PortalBooking, ChannelBookingModel::Mixed], true);
}
/**
* Reasons (German, for the admin) why the calendar state cannot be trusted yet; empty = cleared.
*
* @return list<string>
*/
public function reasons(Property $property, CarbonInterface $blockedSince): array
{
$reasons = [];
foreach ($this->staleImports($property) as $channel) {
$reasons[] = "Kalenderstand von {$channel->name} ist nicht aktuell (letzter erfolgreicher Import: ".($channel->last_success_at?->format('d.m.Y, H:i') ?? 'nie').').';
}
foreach ($this->unprovenInstantChannels($property, $blockedSince) as $channel) {
$reasons[] = $channel->exportsOccupations()
? "{$channel->name} (Sofortbuchung) hat unseren Kalender seit der Sperre noch nicht abgerufen."
: "Der Kalenderexport an {$channel->name} (Sofortbuchung) ist nicht aktiv.";
}
return $reasons;
}
private function fetchedFeedSince(Channel $channel, CarbonInterface $blockedSince): bool
{
return ChannelExportRequest::query()
->where('channel_id', $channel->id)
->where('requested_at', '>=', $blockedSince->copy()->addSecond())
->where('response_status', 200)
->where('export_state', 'live')
->exists();
}
}
@@ -0,0 +1,41 @@
<?php
namespace App\Console\Commands;
use App\Actions\ConfirmBooking;
use App\Enums\BookingStatus;
use App\Models\Booking;
use App\Models\Tenant;
use App\Tenancy\TenantRunner;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
#[Signature('bookings:resend-confirmations')]
#[Description('Retry booking confirmations whose mail failed (last three days) – once per landlord')]
class ResendBookingConfirmations extends Command
{
/**
* Execute the console command.
*/
public function handle(ConfirmBooking $confirmBooking, TenantRunner $runner): int
{
$runner->each(function (Tenant $tenant) use ($confirmBooking): void {
$sent = 0;
$failed = Booking::query()
->whereIn('status', BookingStatus::occupying())
->whereNotNull('confirmation_failed_at')
->where('confirmation_failed_at', '>=', now()->subDays(3))
->whereNull('confirmation_sent_at')
->get();
foreach ($failed as $booking) {
$sent += $confirmBooking->resend($booking) ? 1 : 0;
}
$this->info("{$tenant->name}: {$sent} von {$failed->count()} Bestätigung(en) nachgesendet.");
});
return self::SUCCESS;
}
}
@@ -0,0 +1,48 @@
<?php
namespace App\Console\Commands;
use App\Actions\AutoOffer;
use App\Enums\BookingStatus;
use App\Enums\OfferMode;
use App\Models\Booking;
use App\Models\Tenant;
use App\Tenancy\TenantRunner;
use Illuminate\Console\Attributes\Description;
use Illuminate\Console\Attributes\Signature;
use Illuminate\Console\Command;
use Throwable;
#[Signature('bookings:auto-offers')]
#[Description('Retry automatic offers of pending requests (e.g. once an instant-booking portal has fetched our calendar) – once per landlord')]
class SendPendingAutoOffers extends Command
{
/**
* Execute the console command.
*/
public function handle(AutoOffer $autoOffer, TenantRunner $runner): int
{
$runner->each(function (Tenant $tenant) use ($autoOffer): void {
$pending = Booking::query()
->where('status', BookingStatus::Reserved)
->where('offer_version', 0)
->where('hold_expires_at', '>', now())
->whereHas('property', fn ($query) => $query->where('offer_mode', OfferMode::Automatic)->where('pre_reservation_enabled', true))
->with(['property', 'guest'])
->get();
$sent = 0;
foreach ($pending as $booking) {
try {
$sent += $autoOffer->handle($booking) === [] ? 1 : 0;
} catch (Throwable) {
// The request stays pending for the landlord; the next run tries again.
}
}
$this->info("{$tenant->name}: {$sent} von {$pending->count()} Angebot(e) automatisch versendet.");
});
return self::SUCCESS;
}
}
+111
View File
@@ -0,0 +1,111 @@
<?php
namespace App\Documents;
use App\Models\Booking;
use App\Support\Content;
use Filament\Forms\Components\RichEditor\RichContentRenderer;
use Illuminate\Support\HtmlString;
/**
* The terms of one offer version, frozen when the offer is made (bookings.offer_terms): contract texts,
* payment period and landlord/bank data. Offer page, PDFs, acceptance and confirmation read from this snapshot,
* so later changes of the website texts never alter an offer the guest already received.
* Bookings without a snapshot (created before it existed) fall back to the live texts.
*/
class OfferTerms
{
/** Website text keys that form part of the contract. */
public const TEXT_KEYS = [
'contract.intro',
'contract.terms',
'contract.closing',
'stay.cancellation',
'stay.house_rules',
'offer.contract_note',
'offer.accept_note',
'offer.accept_button',
];
/**
* @return array{captured_at: string, texts: array<string, ?string>, deposit_due_days: int, owner: array<string, mixed>, bank: array<string, mixed>}
*/
public static function capture(): array
{
return [
'captured_at' => now()->toIso8601String(),
'texts' => collect(self::TEXT_KEYS)->mapWithKeys(fn (string $key): array => [$key => Content::get($key)])->all(),
'deposit_due_days' => (int) config('fewo.deposit_due_days'),
'owner' => (array) config('fewo.owner'),
'bank' => (array) config('fewo.bank'),
];
}
public static function text(Booking $booking, string $key): ?string
{
$texts = $booking->offer_terms['texts'] ?? null;
return is_array($texts) ? ($texts[$key] ?? null) : Content::get($key);
}
public static function html(Booking $booking, string $key): HtmlString
{
$value = self::text($booking, $key);
return new HtmlString(filled($value) ? RichContentRenderer::make($value)->toHtml() : '');
}
public static function depositDueDays(Booking $booking): int
{
return (int) ($booking->offer_terms['deposit_due_days'] ?? config('fewo.deposit_due_days'));
}
/**
* @return array<string, mixed>
*/
public static function owner(Booking $booking): array
{
return $booking->offer_terms['owner'] ?? (array) config('fewo.owner');
}
/**
* @return array<string, mixed>
*/
public static function bank(Booking $booking): array
{
return $booking->offer_terms['bank'] ?? (array) config('fewo.bank');
}
/**
* Fingerprint of everything the guest agrees to in this offer version. The validity (hold_expires_at) is
* not part of it – the landlord may extend it – but is checked separately.
*/
public static function hash(Booking $booking): string
{
return hash('sha256', json_encode(self::canonical([
'version' => $booking->offer_version,
'arrival' => $booking->arrival->toDateString(),
'departure' => $booking->departure->toDateString(),
'guests' => $booking->guests,
'quote' => $booking->quote,
'total' => $booking->total,
'deposit' => $booking->deposit,
'balance_due_on' => $booking->balance_due_on->toDateString(),
'terms' => $booking->offer_terms,
]), JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE));
}
private static function canonical(mixed $value): mixed
{
if (! is_array($value)) {
return $value;
}
$value = array_map(self::canonical(...), $value);
if (! array_is_list($value)) {
ksort($value);
}
return $value;
}
}
+10 -1
View File
@@ -11,18 +11,27 @@
enum InboxMessageKind: string implements HasColor, HasLabel
{
case ChannelConflict = 'channel_conflict';
case ConfirmationFailed = 'confirmation_failed';
case OfferMailFailed = 'offer_mail_failed';
case OfferRejected = 'offer_rejected';
case SyncFailed = 'sync_failed';
public function getLabel(): string
{
return match ($this) {
self::ChannelConflict => 'Mögliche Doppelbuchung',
self::ConfirmationFailed => 'Buchungsbestätigung nicht zugestellt',
self::OfferMailFailed => 'Angebot nicht zugestellt',
self::OfferRejected => 'Annahme abgewiesen',
self::SyncFailed => 'Kalenderabgleich gestört',
};
}
public function getColor(): string
{
return match ($this) {
self::ChannelConflict => 'danger',
self::ChannelConflict, self::SyncFailed => 'danger',
self::ConfirmationFailed, self::OfferMailFailed, self::OfferRejected => 'warning',
};
}
}
+25
View File
@@ -0,0 +1,25 @@
<?php
namespace App\Enums;
use Filament\Support\Contracts\HasLabel;
/**
* How requests for a property are turned into offers.
*/
enum OfferMode: string implements HasLabel
{
/** The landlord reviews every request and sends the offer. */
case Manual = 'manual';
/** The offer is sent automatically when all release rules are met; otherwise the request waits for the landlord. */
case Automatic = 'automatic';
public function getLabel(): string
{
return match ($this) {
self::Manual => 'Manuell – ich prüfe jede Anfrage und sende das Angebot',
self::Automatic => 'Automatisch – Angebot sofort, wenn alle Prüfungen bestanden sind',
};
}
}
+10
View File
@@ -24,6 +24,16 @@ public static function offerOutdated(): self
return new self('Zu dieser Anfrage gibt es inzwischen ein aktualisiertes Angebot. Bitte verwenden Sie den Link aus unserer neuesten E-Mail.');
}
public static function offerChanged(): self
{
return new self('Dieses Angebot kann nicht angenommen werden, weil sich seine Angaben geändert haben. Bitte melden Sie sich bei uns – gern erstellen wir Ihnen ein neues Angebot.');
}
public static function calendarUnverified(): self
{
return new self('Wir können die Verfügbarkeit gerade nicht sicher bestätigen, daher wurde Ihre Annahme noch nicht gespeichert. Bitte versuchen Sie es in einigen Minuten noch einmal oder rufen Sie uns an – wir kümmern uns darum.');
}
public static function invalidTransition(string $statusLabel, string $action): self
{
return new self("Eine Buchung im Status „{$statusLabel}“ kann nicht {$action} werden.");
@@ -168,6 +168,18 @@ protected function getHeaderActions(): array
Notification::make()->title('Vorgemerkt bis '.$this->record->hold_expires_at->format('d.m.Y, H:i'))->success()->send();
}),
Action::make('resendConfirmation')
->label(fn (): string => $this->record->confirmation_failed_at !== null ? 'Bestätigung erneut senden (Versand fehlgeschlagen)' : 'Bestätigung erneut senden')
->icon(Heroicon::OutlinedEnvelope)
->color(fn (): string => $this->record->confirmation_failed_at !== null ? 'danger' : 'gray')
->visible(fn (): bool => in_array($this->record->status, BookingStatus::occupying(), true))
->requiresConfirmation()
->modalDescription('Die Buchungsbestätigung mit dem Mietvertrag wird noch einmal an den Gast gesendet.')
->action(function (ConfirmBooking $confirm): void {
$sent = $confirm->resend($this->record->fresh());
$notification = Notification::make()->title($sent ? 'Bestätigung gesendet' : 'Versand fehlgeschlagen');
($sent ? $notification->success() : $notification->danger()->body('Details im Postfach.'))->send();
}),
Action::make('contract')
->label('Mietvertrag')
->icon(Heroicon::OutlinedDocumentText)
@@ -180,7 +192,7 @@ protected function getHeaderActions(): array
->icon(Heroicon::OutlinedArrowPath)
->visible(fn (): bool => in_array($this->record->status, [...BookingStatus::occupying()], true))
->requiresConfirmation()
->modalDescription('Der Vertrag wird mit den aktuellen Texten neu erstellt. Der Gast erhält ihn nicht automatisch.')
->modalDescription('Der Vertrag wird mit den Bedingungen des angenommenen Angebots neu erstellt. Der Gast erhält ihn nicht automatisch.')
->action(function (RentalContract $contract): void {
$contract->generate($this->record);
Notification::make()->title('Mietvertrag neu erzeugt')->success()->send();
@@ -68,6 +68,20 @@ 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('processing')
->label('Bearbeitung / Vorreservierung')
->state(fn (Booking $record): string => $record->property->offer_mode->value === 'automatic' ? 'Automatisch' : 'Manuell')
->visible(fn (Booking $record): bool => $record->isDirect()),
TextEntry::make('offer')
->label('Angebot')
->state(fn (Booking $record): string => 'Version '.$record->offer_version.', gesendet '.$record->offer_sent_at?->format('d.m.Y, H:i').' · Prüfsumme '.substr((string) $record->offer_hash, 0, 12))
->visible(fn (Booking $record): bool => $record->offer_version > 0),
TextEntry::make('accepted_at')->label('Angenommen am')->dateTime('d.m.Y, H:i:s')->visible(fn (Booking $record): bool => $record->accepted_at !== null),
TextEntry::make('confirmation')
->label('Bestätigungs-E-Mail')
->state(fn (Booking $record): string => $record->confirmation_sent_at !== null ? 'Gesendet '.$record->confirmation_sent_at->format('d.m.Y, H:i') : 'Nicht zugestellt – bitte „Bestätigung erneut senden“')
->color(fn (Booking $record): string => $record->confirmation_sent_at !== null ? 'success' : 'danger')
->visible(fn (Booking $record): bool => $record->confirmation_sent_at !== null || $record->confirmation_failed_at !== null),
TextEntry::make('source')->label('Buchungskanal / Quelle')->state(fn (Booking $record): string => $record->bookingChannelLabel()),
TextEntry::make('referral_source')->label('Aufmerksam geworden durch')->placeholder('–'),
TextEntry::make('utm')
@@ -2,14 +2,17 @@
namespace App\Filament\Resources\Properties\Schemas;
use App\Enums\OfferMode;
use App\Filament\Forms\Components\EuroInput;
use App\ImageWorlds\ImageWorldRegistry;
use App\Models\Site;
use Closure;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\TimePicker;
use Filament\Forms\Components\Toggle;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Components\Utilities\Set;
use Filament\Schemas\Schema;
use Illuminate\Support\Str;
@@ -113,6 +116,22 @@ public static function configure(Schema $schema): Schema
->minValue(1)
->suffix('Stunden')
->default(48),
Toggle::make('pre_reservation_enabled')
->label('Anfrage blockiert den Kalender (Vorreservierung)')
->helperText('Aus: eine bloße Anfrage sperrt keinen Zeitraum. Dann ist kein automatisches Angebot möglich.')
->default(true)
->live(),
Select::make('offer_mode')
->label('Bearbeitung von Anfragen')
->options(OfferMode::class)
->default(OfferMode::Manual)
->required()
->helperText('Automatisch: das Angebot geht sofort an den Gast, wenn die Kalenderprüfung bestanden ist (Kalenderstand aktuell, bei Portalen mit Sofortbuchung unser Feed nachweislich abgerufen). Sonst entscheiden Sie von Hand. Unabhängig vom Testbetrieb der E-Mails.')
->rules([fn (Get $get): Closure => function (string $attribute, mixed $value, Closure $fail) use ($get): void {
if (($value === OfferMode::Automatic->value || $value === OfferMode::Automatic) && ! $get('pre_reservation_enabled')) {
$fail('Automatische Angebote brauchen die Vorreservierung: ohne Sperre im Kalender kann ein verbindlich annehmbares Angebot nicht sicher erteilt werden.');
}
}]),
]),
]);
}
+22 -5
View File
@@ -49,24 +49,41 @@ public function accept(Request $request, Booking $booking, AcceptOffer $accept):
{
$request->validate(['terms' => ['accepted']], ['terms.accepted' => 'Bitte bestätigen Sie, dass Sie die Bedingungen gelesen haben.']);
return $this->answer($request, $booking, fn (int $version) => $accept->handle($booking, $version), 'Vielen Dank! Ihre Buchung ist verbindlich. Die Bestätigung mit dem Mietvertrag haben wir Ihnen per E-Mail gesendet.');
return $this->answer($request, $booking, function (int $version) use ($accept, $booking): string {
$concluded = $accept->handle($booking, $version);
$booking->refresh();
if (! $concluded) {
return 'Ihre Buchung ist bereits verbindlich bestätigt – Sie müssen nichts weiter tun.';
}
return $booking->confirmation_sent_at !== null
? 'Vielen Dank! Ihre Buchung ist verbindlich. Die Bestätigung mit dem Mietvertrag haben wir Ihnen per E-Mail gesendet.'
: 'Vielen Dank! Ihre Buchung ist verbindlich. Die Bestätigung mit dem Mietvertrag erhalten Sie in Kürze per E-Mail; kommt sie nicht an, melden wir uns bei Ihnen.';
});
}
public function reject(Request $request, Booking $booking, RejectOffer $reject): RedirectResponse
{
return $this->answer($request, $booking, fn (int $version) => $reject->handle($booking, $version), 'Schade – wir haben Ihre Absage erhalten und den Zeitraum wieder freigegeben. Vielleicht ein anderes Mal!');
return $this->answer($request, $booking, function (int $version) use ($reject, $booking): string {
$reject->handle($booking, $version);
return 'Schade – wir haben Ihre Absage erhalten und den Zeitraum wieder freigegeben. Vielleicht ein anderes Mal!';
});
}
/**
* Runs the answer and returns to a freshly signed offer page with the result.
* Runs the answer (it returns the success message) and returns to a freshly signed offer page with the result.
*
* @param callable(int): string $action
*/
private function answer(Request $request, Booking $booking, callable $action, string $success): RedirectResponse
private function answer(Request $request, Booking $booking, callable $action): RedirectResponse
{
$version = (int) $request->query('v');
$back = $this->signed($booking, 'offers.show', now()->addDays(30), $version);
try {
$action($version);
$success = $action($version);
} catch (ReservationException $exception) {
return redirect()->to($back)->with('offer.error', $exception->getMessage());
}
+6 -2
View File
@@ -17,12 +17,16 @@ class NewReservation extends Mailable
{
use Queueable, SerializesModels;
public function __construct(public Booking $booking) {}
/**
* @param bool $offerSent the offer already went to the guest automatically
* @param list<string> $blockers why the automatic offer was not sent (automatic mode only)
*/
public function __construct(public Booking $booking, public bool $offerSent = false, public array $blockers = []) {}
public function envelope(): Envelope
{
return new Envelope(
subject: 'Neue Anfrage '.$this->booking->reference.': '.$this->booking->guest->full_name.', '.$this->booking->arrival->format('d.m.').'–'.$this->booking->departure->format('d.m.Y'),
subject: ($this->offerSent ? 'Angebot automatisch versendet' : 'Neue Anfrage').' '.$this->booking->reference.': '.$this->booking->guest->full_name.', '.$this->booking->arrival->format('d.m.').'–'.$this->booking->departure->format('d.m.Y'),
replyTo: [new Address($this->booking->guest->email, $this->booking->guest->full_name)],
);
}
+1 -1
View File
@@ -22,7 +22,7 @@ public function __construct(public Booking $booking) {}
public function envelope(): Envelope
{
return new Envelope(
subject: 'Ihre Anfrage '.$this->booking->reference.' – Termin vorgemerkt, Angebot folgt',
subject: 'Ihre Anfrage '.$this->booking->reference.($this->booking->isHoldActive() ? ' – Termin vorgemerkt, Angebot folgt' : ' – Eingang bestätigt, Angebot folgt'),
replyTo: [new Address(config('fewo.owner.email'), config('fewo.owner.name'))],
);
}
+34
View File
@@ -2,6 +2,7 @@
namespace App\Models;
use App\Documents\OfferTerms;
use App\Enums\BookingStatus;
use App\Enums\ReferralSource;
use App\Models\Concerns\BelongsToTenant;
@@ -18,6 +19,7 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\HtmlString;
/**
* A reservation or booking. arrival is the first night, departure the day the guest leaves,
@@ -53,10 +55,14 @@
'offer_sent_at',
'offer_message',
'offer_path',
'offer_terms',
'offer_hash',
'message',
'internal_notes',
'confirmed_at',
'accepted_at',
'confirmation_sent_at',
'confirmation_failed_at',
'acceptance',
'declined_by',
'cancelled_at',
@@ -132,6 +138,9 @@ protected function casts(): array
'offer_sent_at' => 'immutable_datetime',
'accepted_at' => 'immutable_datetime',
'acceptance' => 'array',
'offer_terms' => 'array',
'confirmation_sent_at' => 'immutable_datetime',
'confirmation_failed_at' => 'immutable_datetime',
'cancelled_at' => 'immutable_datetime',
'review_requested_at' => 'immutable_datetime',
'deposit_reminded_at' => 'immutable_datetime',
@@ -262,6 +271,31 @@ public function nights(): int
return (int) $this->arrival->diffInDays($this->departure);
}
/**
* Inside a transaction: locks the property (the lock every writer of bookings takes) and this booking's row
* and reloads the attributes from the locked row, so status and dates are the latest committed ones.
*/
public function lockForTransition(): void
{
Property::withoutGlobalScope('tenant')->whereKey($this->property_id)->lockForUpdate()->first();
$locked = static::withoutGlobalScope('tenant')->whereKey($this->getKey())->lockForUpdate()->firstOrFail();
$this->setRawAttributes($locked->getAttributes(), sync: true);
}
/**
* A contract text of this offer version (frozen snapshot, live text for bookings without one).
*/
public function offerText(string $key): ?string
{
return OfferTerms::text($this, $key);
}
public function offerHtml(string $key): HtmlString
{
return OfferTerms::html($this, $key);
}
public function isHoldActive(): bool
{
return in_array($this->status, BookingStatus::holding(), true) && $this->hold_expires_at?->isFuture();
+7
View File
@@ -2,6 +2,7 @@
namespace App\Models;
use App\Enums\OfferMode;
use App\Models\Concerns\BelongsToTenant;
use Carbon\CarbonImmutable;
use Database\Factories\PropertyFactory;
@@ -29,6 +30,8 @@
'deposit_percent',
'balance_due_days_before_arrival',
'hold_hours',
'offer_mode',
'pre_reservation_enabled',
'check_in_time',
'check_out_time',
'changeover_weekday',
@@ -56,12 +59,16 @@ class Property extends Model
'min_stay_fill_gaps' => true,
'min_stay_until_changeover' => false,
'min_stay_absolute' => 2,
'offer_mode' => 'manual',
'pre_reservation_enabled' => true,
];
protected function casts(): array
{
return [
'is_active' => 'boolean',
'offer_mode' => OfferMode::class,
'pre_reservation_enabled' => 'boolean',
'min_stay_fill_gaps' => 'boolean',
'min_stay_until_changeover' => 'boolean',
'changeover_weekday' => 'integer',
+34 -4
View File
@@ -5,11 +5,15 @@
use App\Actions\CreateChannelTasks;
use App\Enums\BookingStatus;
use App\Enums\ChannelTaskAction;
use App\Enums\InboxMessageKind;
use App\Models\Booking;
use App\Models\Property;
use App\Support\Inbox;
use App\Tenancy\TenantContext;
use Carbon\CarbonImmutable;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Throwable;
/**
* Keeps manually maintained portals in step when a booking starts or stops occupying the calendar.
@@ -42,6 +46,26 @@ public function updated(Booking $booking): void
}
}
private function reportSyncFailure(int $propertyId, int $bookingId, string $reason, Throwable $exception): void
{
Log::error('Portalaufgaben für Buchung nicht angelegt', ['booking' => $bookingId, 'exception' => $exception::class]);
rescue(function () use ($propertyId, $bookingId, $reason): void {
$property = Property::withoutGlobalScope('tenant')->find($propertyId);
if ($property === null) {
return;
}
app(TenantContext::class)->run($property->tenant, fn () => app(Inbox::class)->post(
InboxMessageKind::SyncFailed,
'booking-'.$bookingId.':'.now()->format('YmdH'),
'Portalabgleich für '.$reason.' fehlgeschlagen',
'Die Buchung ist gespeichert, aber die Sperr-/Freigabeaufgaben für die Portale konnten nicht angelegt werden. Bitte den Kalender der Portale prüfen und gegebenenfalls von Hand sperren.',
propertyId: $propertyId,
));
}, report: false);
}
private function occupies(BookingStatus|string|null $status): bool
{
$status = is_string($status) ? BookingStatus::tryFrom($status) : $status;
@@ -58,10 +82,16 @@ private function tasks(Booking $booking, ChannelTaskAction $action, ?CarbonImmut
$startsOn ??= $booking->arrival;
$endsOn ??= $booking->departure;
$reason = "Buchung {$booking->reference}";
DB::afterCommit(function () use ($propertyId, $channelId, $originId, $external, $startsOn, $endsOn, $action, $reason): void {
$property = Property::withoutGlobalScope('tenant')->find($propertyId);
if ($property !== null) {
app(TenantContext::class)->run($property->tenant, fn () => $this->createChannelTasks->handle($property, $startsOn, $endsOn, $action, $reason, $channelId, $originId, $external));
$bookingId = $booking->id;
DB::afterCommit(function () use ($propertyId, $channelId, $originId, $external, $startsOn, $endsOn, $action, $reason, $bookingId): void {
// The booking is already saved: a failing portal task must never turn into an error for the guest.
try {
$property = Property::withoutGlobalScope('tenant')->find($propertyId);
if ($property !== null) {
app(TenantContext::class)->run($property->tenant, fn () => $this->createChannelTasks->handle($property, $startsOn, $endsOn, $action, $reason, $channelId, $originId, $external));
}
} catch (Throwable $exception) {
$this->reportSyncFailure($propertyId, $bookingId, $reason, $exception);
}
});
}
+2 -2
View File
@@ -18,7 +18,7 @@ class Inbox
/**
* @return InboxMessage|null the message to e-mail now – new (wasRecentlyCreated) or due for a reminder – else null
*/
public function post(InboxMessageKind $kind, string $fingerprint, string $subject, string $body, ?Channel $channel = null, ?string $actionUrl = null): ?InboxMessage
public function post(InboxMessageKind $kind, string $fingerprint, string $subject, string $body, ?Channel $channel = null, ?string $actionUrl = null, ?int $propertyId = null): ?InboxMessage
{
$fingerprint = $kind->value.':'.$fingerprint;
@@ -37,7 +37,7 @@ public function post(InboxMessageKind $kind, string $fingerprint, string $subjec
'subject' => mb_substr($subject, 0, 255),
'body' => $body,
'channel_id' => $channel?->id,
'property_id' => $channel?->property_id,
'property_id' => $channel?->property_id ?? $propertyId,
'action_url' => $actionUrl,
'notified_at' => now(),
'last_seen_at' => now(),