Buchungsprozess: Angebots-Snapshot, atomare Annahme, Auto-Angebot, Kanalfreigabe
Deploy FeWo mit PipelineManager / deploy (push) Failing after 3m38s
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:
1 parent
e7cc37a15b
commit
eafab8a2cb
47 files changed
+2099
-104
No files matched your search
+141
-24
@@ -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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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'));
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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
@@ -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));
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user