diff --git a/app/Actions/AutoOffer.php b/app/Actions/AutoOffer.php index 19bc5b5..a745dc9 100644 --- a/app/Actions/AutoOffer.php +++ b/app/Actions/AutoOffer.php @@ -8,6 +8,7 @@ use App\Documents\DocumentFinding; use App\Enums\BookingStatus; use App\Enums\DocumentKind; +use App\Enums\InquiryAnswer; use App\Enums\ProcessingMode; use App\Exceptions\ReservationException; use App\Models\Booking; @@ -49,14 +50,16 @@ public function blockers(Booking $booking): array { $property = $booking->property; $reasons = []; - $information = ! $booking->process()->preReservation(); + $information = $booking->process()->inquiryAnswer() === InquiryAnswer::Information; if ($information && ($booking->status !== BookingStatus::Reserved || $booking->information_version > 0)) { $reasons[] = 'Die Anfrage ist bereits beantwortet oder nicht mehr offen.'; } // A request after its clarification hold (v0.11) only needs free dates, which are checked below. $clarified = $booking->hold_purpose === Booking::HOLD_CLARIFICATION; - if (! $information && ($booking->status !== BookingStatus::Reserved || (! $clarified && ! $booking->isHoldActive()))) { + // Without a reservation at the request (offer without early hold) the offer itself creates the hold; availability is checked below. + $holdRequired = $booking->process()->preReservation(); + if (! $information && ($booking->status !== BookingStatus::Reserved || ($holdRequired && ! $clarified && ! $booking->isHoldActive()))) { $reasons[] = 'Die Anfrage ist nicht mehr vorgemerkt (Frist abgelaufen oder bereits bearbeitet).'; } if (blank($booking->guest?->email)) { @@ -87,7 +90,7 @@ public function handle(Booking $booking): array { $booking->loadMissing(['property', 'guest']); - if ($booking->process()->preReservation()) { + if ($booking->process()->inquiryAnswer() === InquiryAnswer::Offer) { $this->clearance->refresh($booking->property); } @@ -97,7 +100,7 @@ public function handle(Booking $booking): array } try { - if (! $booking->process()->preReservation()) { + if ($booking->process()->inquiryAnswer() === InquiryAnswer::Information) { $this->sendInformation->handle($booking->fresh(), ['expected_version' => 0, 'acknowledged' => true]); } else { $this->sendOffer->handle($booking->fresh(), ['expected_version' => 0]); diff --git a/app/Actions/RequestCaseData.php b/app/Actions/RequestCaseData.php index 3186303..58376d5 100644 --- a/app/Actions/RequestCaseData.php +++ b/app/Actions/RequestCaseData.php @@ -9,6 +9,7 @@ use App\Enums\DataRequestMode; use App\Enums\DocumentKind; use App\Enums\FactSource; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Mail\DataRequested; use App\Models\Booking; @@ -70,7 +71,7 @@ public static function needs(Booking $booking): ?array } $purpose = match (true) { - $booking->process()->preReservation() => self::FOR_OFFER, + $booking->process()->inquiryAnswer() === InquiryAnswer::Offer => self::FOR_OFFER, $booking->wish_at !== null => self::FOR_WISH, default => null, }; diff --git a/app/Actions/RequestReviews.php b/app/Actions/RequestReviews.php index 77b4f0c..9eceefd 100644 --- a/app/Actions/RequestReviews.php +++ b/app/Actions/RequestReviews.php @@ -29,7 +29,7 @@ public function handle(): int ->whereHas('guest', fn ($query) => $query->whereNull('anonymized_at')->whereNotNull('email')->where('email', '!=', '')) ->with('guest') ->get() - ->filter(fn (Booking $booking): bool => $booking->process()->guestMessages() === Responsibility::Landlord + ->filter(fn (Booking $booking): bool => $booking->process()->reviewRequestSender() === Responsibility::Landlord // The step can be switched off per channel (Kanal › Ablauf); an open portal report holds it back (O4). && ProcessPlan::of($booking)->enabled('review.request') && OutwardSuspension::reason($booking) === null); diff --git a/app/Actions/SendBookingReminders.php b/app/Actions/SendBookingReminders.php index a6ca912..cb34f4c 100644 --- a/app/Actions/SendBookingReminders.php +++ b/app/Actions/SendBookingReminders.php @@ -63,7 +63,7 @@ public function handle(): array ->whereNull('arrival_info_sent_at') ->whereDate('arrival', '>=', $today) ->whereDate('arrival', '<=', $today->copy()->addDays(self::ARRIVAL_INFO_MAX_DAYS_BEFORE))) - ->filter(fn (Booking $booking): bool => $booking->process()->guestMessages() === Responsibility::Landlord + ->filter(fn (Booking $booking): bool => $booking->process()->arrivalInfoSender() === Responsibility::Landlord && $booking->arrival->lessThanOrEqualTo($today->copy()->addDays($booking->process()->arrivalInfoDaysBefore())) // Decision O4: an open portal report of a cancellation or change holds the message back until clarified. && OutwardSuspension::reason($booking) === null); diff --git a/app/Documents/DocumentComposer.php b/app/Documents/DocumentComposer.php index 4cc9a71..3775a57 100644 --- a/app/Documents/DocumentComposer.php +++ b/app/Documents/DocumentComposer.php @@ -7,6 +7,7 @@ use App\Availability\AvailabilityChecker; use App\Enums\BookingStatus; use App\Enums\DocumentKind; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\ProcessSetting; use App\Enums\Responsibility; @@ -167,7 +168,7 @@ private function prepareOffer(Booking $booking, Booking $draft, array $changes, 'offer_message' => $changes['offer_message'] ?? $booking->offer_message, ]); - if (! $booking->process()->preReservation()) { + if ($booking->process()->inquiryAnswer() === InquiryAnswer::Information) { $findings[] = DocumentFinding::confirm('Nach Ihrer Einstellung reservieren Anfragen den Zeitraum nicht; vorgesehen ist eine unverbindliche Auskunft. Ein Angebot mit Annahmelink reserviert den Zeitraum für diesen Vorgang trotzdem bis '.$draft->hold_expires_at->format('d.m.Y, H:i').' Uhr, und der Gast kann bis dahin verbindlich annehmen.', DocumentFinding::HOLD_ZERO); } if ($booking->offer_version > 0) { diff --git a/app/Enums/DocumentKind.php b/app/Enums/DocumentKind.php index 2834a97..c536579 100644 --- a/app/Enums/DocumentKind.php +++ b/app/Enums/DocumentKind.php @@ -62,7 +62,7 @@ public static function forCase(Booking $booking): ?self $booking->intake === IntakeKind::Internal => $booking->guest_id !== null ? self::StayConfirmation : self::Internal, $booking->caseType()->isExternallyBinding() => $profile->documents() === Responsibility::Portal ? null : self::ExternalRecord, $booking->isBinding() => $profile->documents() === Responsibility::Portal ? null : self::Confirmation, - ! $profile->preReservation() => self::Information, + $profile->inquiryAnswer() === InquiryAnswer::Information => self::Information, default => self::Offer, }; } diff --git a/app/Enums/InquiryAnswer.php b/app/Enums/InquiryAnswer.php new file mode 100644 index 0000000..79cf8a0 --- /dev/null +++ b/app/Enums/InquiryAnswer.php @@ -0,0 +1,23 @@ + 'Unverbindliche Auskunft', + self::Offer => 'Verbindliches Angebot', + }; + } +} diff --git a/app/Enums/ProcessSetting.php b/app/Enums/ProcessSetting.php index 50bf87b..30b3413 100644 --- a/app/Enums/ProcessSetting.php +++ b/app/Enums/ProcessSetting.php @@ -29,6 +29,9 @@ enum ProcessSetting: string case BookingNotice = 'booking_notice'; case AwaitPortalConfirmation = 'await_portal_confirmation'; case PortalConfirmationWaitHours = 'portal_confirmation_wait_hours'; + case InquiryAnswer = 'inquiry_answer'; + case ArrivalInfoSender = 'arrival_info_sender'; + case ReviewRequestSender = 'review_request_sender'; /** * Built-in default (the behaviour before any landlord setting existed). @@ -54,6 +57,8 @@ public function default(): string|int|bool|null self::BookingNotice => BookingNoticeMode::Off->value, self::AwaitPortalConfirmation => false, self::PortalConfirmationWaitHours => 48, + // Not set: derived (ProcessSettings) – the answer from the reservation, the senders from guest_messages. + self::InquiryAnswer, self::ArrivalInfoSender, self::ReviewRequestSender => null, }; } @@ -83,6 +88,9 @@ public function question(): string self::BookingNotice => 'Bekommt der Gast von uns eine Buchungsinformation (ohne Vertrag)?', self::AwaitPortalConfirmation => 'Sollen Unterlagen und Nachrichten erst nach der Bestätigungsmail des Portals gehen?', self::PortalConfirmationWaitHours => 'Wie lange wird auf die Bestätigungsmail des Portals gewartet, bevor Sie benachrichtigt werden?', + self::InquiryAnswer => 'Womit wird eine Anfrage zuerst beantwortet?', + self::ArrivalInfoSender => 'Wer schickt dem Gast die Anreise-Informationen?', + self::ReviewRequestSender => 'Wer bittet den Gast nach dem Aufenthalt um eine Bewertung?', }; } @@ -94,7 +102,8 @@ public function question(): string public function channelIntakes(): array { return match ($this) { - self::Processing, self::Payments, self::GuestMessages, self::ContractTemplate => [IntakeKind::Inquiry, IntakeKind::Booking], + self::Processing, self::Payments, self::GuestMessages, self::ContractTemplate, self::ArrivalInfoSender, self::ReviewRequestSender => [IntakeKind::Inquiry, IntakeKind::Booking], + self::InquiryAnswer => [IntakeKind::Inquiry], self::PreReservation, self::HoldHours => [IntakeKind::Inquiry], self::Documents, self::ContractDelivery, self::BookingNotice, self::AwaitPortalConfirmation, self::PortalConfirmationWaitHours => [IntakeKind::Booking], self::ArrivalInfoDaysBefore, self::GuestLinkValidDays => [], @@ -108,7 +117,7 @@ public function channelIntakes(): array */ public function isLandlordSetting(): bool { - return $this !== self::ContractTemplate; + return ! in_array($this, [self::ContractTemplate, self::InquiryAnswer], true); } /** @@ -122,7 +131,8 @@ public function normalize(mixed $value): string|int|bool|null return match ($this) { self::Processing => ($value instanceof ProcessingMode ? $value : ProcessingMode::tryFrom((string) $value))?->value, - self::Documents, self::Payments, self::GuestMessages => ($value instanceof Responsibility ? $value : Responsibility::tryFrom((string) $value))?->value, + self::Documents, self::Payments, self::GuestMessages, self::ArrivalInfoSender, self::ReviewRequestSender => ($value instanceof Responsibility ? $value : Responsibility::tryFrom((string) $value))?->value, + self::InquiryAnswer => ($value instanceof InquiryAnswer ? $value : InquiryAnswer::tryFrom((string) $value))?->value, self::PreReservation, self::FormRequiresAddress, self::AwaitPortalConfirmation => is_bool($value) ? $value : filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE), self::HoldHours, self::ArrivalInfoDaysBefore, self::ContractTemplate => is_numeric($value) ? (int) $value : null, self::DataRequest => ($value instanceof DataRequestMode ? $value : DataRequestMode::tryFrom((string) $value))?->value, @@ -141,7 +151,8 @@ public function describe(string|int|bool|null $value): string { return match ($this) { self::Processing => ProcessingMode::tryFrom((string) $value)?->getLabel() ?? '–', - self::Documents, self::Payments, self::GuestMessages => Responsibility::tryFrom((string) $value)?->getLabel() ?? '–', + self::Documents, self::Payments, self::GuestMessages, self::ArrivalInfoSender, self::ReviewRequestSender => Responsibility::tryFrom((string) $value)?->getLabel() ?? '–', + self::InquiryAnswer => InquiryAnswer::tryFrom((string) $value)?->getLabel() ?? '–', self::PreReservation => $value ? 'ja' : 'nein', self::HoldHours => $value.' Stunden', self::ArrivalInfoDaysBefore => $value.' Tage vor Anreise', diff --git a/app/Filament/Forms/ProcessSettingFields.php b/app/Filament/Forms/ProcessSettingFields.php index 1403be4..61ced38 100644 --- a/app/Filament/Forms/ProcessSettingFields.php +++ b/app/Filament/Forms/ProcessSettingFields.php @@ -5,6 +5,7 @@ use App\Enums\BookingNoticeMode; use App\Enums\ContractDelivery; use App\Enums\DataRequestMode; +use App\Enums\InquiryAnswer; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; use App\Enums\Responsibility; @@ -39,7 +40,8 @@ public static function field(string $name, ProcessSetting $setting, string $inhe ->helperText('Automatisch: Das System sendet Angebote bzw. Unterlagen selbst, sobald alle Angaben da sind. Sonst bereitet es alles vor und Sie geben frei.'), ProcessSetting::PreReservation => Select::make($name)->options(['1' => 'Ja – der Zeitraum ist bis zum Ablauf des Angebots reserviert', '0' => 'Nein – der Gast erhält eine unverbindliche Auskunft und kann daraus die Buchung anfragen (erneute Prüfung vor der Bestätigung)'])->placeholder($placeholder), ProcessSetting::HoldHours => TextInput::make($name)->integer()->minValue(1)->maxValue(720)->suffix('Stunden')->placeholder($placeholder), - ProcessSetting::Documents, ProcessSetting::Payments, ProcessSetting::GuestMessages => Select::make($name)->options([Responsibility::Landlord->value => Responsibility::Landlord->getLabel(), Responsibility::Portal->value => Responsibility::Portal->getLabel()])->placeholder($placeholder), + ProcessSetting::Documents, ProcessSetting::Payments, ProcessSetting::GuestMessages, ProcessSetting::ArrivalInfoSender, ProcessSetting::ReviewRequestSender => Select::make($name)->options([Responsibility::Landlord->value => Responsibility::Landlord->getLabel(), Responsibility::Portal->value => Responsibility::Portal->getLabel()])->placeholder($placeholder), + ProcessSetting::InquiryAnswer => Select::make($name)->options(InquiryAnswer::class)->placeholder($placeholder), ProcessSetting::ArrivalInfoDaysBefore => TextInput::make($name)->integer()->minValue(1)->maxValue(14)->suffix('Tage vor Anreise')->placeholder($placeholder), ProcessSetting::ContractTemplate => Select::make($name) ->options(fn (): array => ContractTemplate::query()->orderBy('name')->orderBy('version')->get()->mapWithKeys(fn (ContractTemplate $template): array => [$template->id => $template->label()])->all()) diff --git a/app/Filament/Pages/EffectiveSettings.php b/app/Filament/Pages/EffectiveSettings.php index c2c8a29..352aad2 100644 --- a/app/Filament/Pages/EffectiveSettings.php +++ b/app/Filament/Pages/EffectiveSettings.php @@ -2,6 +2,7 @@ namespace App\Filament\Pages; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\ProcessSetting; use App\Enums\UserRole; @@ -112,7 +113,9 @@ public static function where(ProcessSetting $setting): string public static function answer(ProcessProfile $profile): string { return match ($profile->intake) { - IntakeKind::Inquiry => $profile->preReservation() ? 'Angebot mit Annahmelink, Zeitraum reserviert' : 'Unverbindliche Auskunft, „Buchung anfragen“, erneute Prüfung', + IntakeKind::Inquiry => $profile->inquiryAnswer() === InquiryAnswer::Offer + ? 'Angebot mit Annahmelink'.($profile->preReservation() ? ', Zeitraum schon bei der Anfrage reserviert' : ', Zeitraum erst mit dem Angebot reserviert') + : 'Unverbindliche Auskunft, „Buchung anfragen“, erneute Prüfung', IntakeKind::Booking => 'keine – beim Portal bereits verbindlich', IntakeKind::Internal => 'keine – eigene Belegung', }; diff --git a/app/Filament/Resources/Bookings/Pages/Concerns/HandlesWishAndStay.php b/app/Filament/Resources/Bookings/Pages/Concerns/HandlesWishAndStay.php index de0e6e4..355b699 100644 --- a/app/Filament/Resources/Bookings/Pages/Concerns/HandlesWishAndStay.php +++ b/app/Filament/Resources/Bookings/Pages/Concerns/HandlesWishAndStay.php @@ -12,6 +12,7 @@ use App\Enums\BookingTaskKind; use App\Enums\BookingTaskStatus; use App\Enums\DocumentKind; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\Responsibility; use App\Exceptions\ReservationException; @@ -52,7 +53,7 @@ private function sendInformationAction(): Action ->label(fn (): string => $this->record->information_version > 0 ? 'Auskunft ändern & neu senden' : 'Unverbindliche Auskunft prüfen und senden') ->icon(Heroicon::OutlinedPaperAirplane) ->visible(fn (): bool => in_array($this->record->status, [BookingStatus::Reserved, BookingStatus::Expired], true) && $this->record->intake !== IntakeKind::Booking - && ! $this->record->process()->preReservation() && $this->record->offer_version === 0 && ! $this->record->isHoldActive()) + && $this->record->process()->inquiryAnswer() === InquiryAnswer::Information && $this->record->offer_version === 0 && ! $this->record->isHoldActive()) ->modalHeading('Unverbindliche Auskunft an den Gast') ->modalDescription('Nach Ihrer Einstellung reservieren Anfragen den Zeitraum nicht. Der Gast erhält Preis und Verfügbarkeit zum heutigen Stand und kann daraus die Buchung anfragen; dann wird erneut geprüft. Verbindlich wird erst Ihre (oder die automatische) Bestätigung.') ->modalSubmitActionLabel('Senden') diff --git a/app/Filament/Resources/Bookings/Pages/ViewBooking.php b/app/Filament/Resources/Bookings/Pages/ViewBooking.php index be0748b..640450b 100644 --- a/app/Filament/Resources/Bookings/Pages/ViewBooking.php +++ b/app/Filament/Resources/Bookings/Pages/ViewBooking.php @@ -26,6 +26,7 @@ use App\Enums\ChangeBasis; use App\Enums\ChangeStatus; use App\Enums\DocumentKind; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\InternalKind; use App\Enums\ProcessingMode; @@ -190,7 +191,7 @@ private function sendOfferAction(): Action return Action::make('sendOffer') ->label(fn (): string => match (true) { $this->record->status === BookingStatus::OfferSent => 'Angebot ändern & neu senden', - ! $this->record->process()->preReservation() => 'Stattdessen verbindliches Angebot mit Reservierung senden', + $this->record->process()->inquiryAnswer() === InquiryAnswer::Information => 'Stattdessen verbindliches Angebot mit Reservierung senden', default => 'Angebot prüfen und senden', }) ->icon(Heroicon::OutlinedPaperAirplane) diff --git a/app/Filament/Resources/Channels/Pages/ChannelProcess.php b/app/Filament/Resources/Channels/Pages/ChannelProcess.php index 02fc8cb..33cdcc5 100644 --- a/app/Filament/Resources/Channels/Pages/ChannelProcess.php +++ b/app/Filament/Resources/Channels/Pages/ChannelProcess.php @@ -15,7 +15,6 @@ use App\Process\ChannelCapabilities; use App\Process\ChannelProcessConfiguration; use App\Process\ConfigurationImpact; -use App\Process\Models\ExternalBookingModel; use App\Process\Models\ProcessModel; use App\Process\ProcessCatalogue; use App\Process\ProcessProfile; @@ -243,10 +242,11 @@ public function chooseTemplate(string $area, string $key): void public function applyPreset(string $archetype): void { $presets = $this->presets(); - $base = app(ProcessCatalogue::class)->model(ExternalBookingModel::key()); - if (! isset($presets[$archetype]) || ! in_array(IntakeKind::from($this->intake), $base::intakes(), true)) { + $composedBy = isset($presets[$archetype]) ? app(ProcessCatalogue::class)->model($archetype)::composedBy() : null; + if ($composedBy === null) { return; } + $base = app(ProcessCatalogue::class)->model($composedBy); $this->acknowledge = false; $this->drafts[$this->intake]['model'] = $base::key(); $this->drafts[$this->intake]['variant'] = 'standard'; diff --git a/app/Process/ChannelProcessConfiguration.php b/app/Process/ChannelProcessConfiguration.php index f322fbb..12107b0 100644 --- a/app/Process/ChannelProcessConfiguration.php +++ b/app/Process/ChannelProcessConfiguration.php @@ -6,16 +6,15 @@ use App\Enums\ChannelBookingModel; use App\Enums\ContractDelivery; use App\Enums\DataRequestMode; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Models\Channel; -use App\Process\Models\ExternalBookingModel; use App\Process\Models\ProcessModel; use App\Process\Models\Responsibilities; use App\Process\Templates\FunctionTemplate; -use App\Process\Templates\TemplateArea; use App\Process\Templates\TemplateComposer; /** @@ -34,13 +33,14 @@ final class ChannelProcessConfiguration public const STEP_CONTROLS = [ 'guest.details' => ['parameters' => [ProcessSetting::FormRequiresAddress]], 'guest.data_request' => ['mode' => ProcessSetting::DataRequest, 'parameters' => [ProcessSetting::DataRequestReminderHours, ProcessSetting::DataRequestRemindersMax, ProcessSetting::DataRequestFollowupsMax, ProcessSetting::GuestLinkValidDays]], - 'hold' => ['parameters' => [ProcessSetting::ClarificationHoldAutoMinutes, ProcessSetting::ClarificationHoldManualMinutes]], + 'hold' => ['parameters' => [ProcessSetting::PreReservation, ProcessSetting::HoldHours, ProcessSetting::ClarificationHoldAutoMinutes, ProcessSetting::ClarificationHoldManualMinutes]], 'offer.binding' => ['mode' => ProcessSetting::Processing, 'parameters' => [ProcessSetting::HoldHours, ProcessSetting::ContractTemplate]], 'offer.information' => ['mode' => ProcessSetting::Processing, 'parameters' => [ProcessSetting::GuestLinkValidDays]], 'documents.send' => ['mode' => ProcessSetting::Processing, 'parameters' => [ProcessSetting::ContractDelivery, ProcessSetting::ContractTemplate]], 'documents.booking_notice' => ['parameters' => [ProcessSetting::BookingNotice]], 'portal.confirmation' => ['parameters' => [ProcessSetting::AwaitPortalConfirmation, ProcessSetting::PortalConfirmationWaitHours]], - 'arrival.info' => ['performer' => ['field' => 'guest_messages', 'setting' => ProcessSetting::GuestMessages], 'parameters' => [ProcessSetting::ArrivalInfoDaysBefore]], + 'arrival.info' => ['performer' => ['field' => 'guest_messages', 'setting' => ProcessSetting::ArrivalInfoSender], 'parameters' => [ProcessSetting::ArrivalInfoDaysBefore]], + 'review.request' => ['performer' => ['field' => 'guest_messages', 'setting' => ProcessSetting::ReviewRequestSender]], ]; public function __construct(private ProcessCatalogue $catalogue, private TemplateComposer $composer) {} @@ -98,7 +98,8 @@ public function modelOptions(Channel $channel, IntakeKind $intake, ?array $capab $capabilities = app(ChannelCapabilities::class)->resolve($channel, $capabilityDraft); $options = []; foreach ($this->catalogue->admissible($intake) as $key => $model) { - if ($channel->isWebsite() !== str_starts_with($key, 'a1.')) { + // The archetypes of the other way (website: A1, portal: A2) are not offered; the base process fits both. + if (($channel->isWebsite() && str_starts_with($key, 'a2.')) || (! $channel->isWebsite() && str_starts_with($key, 'a1.'))) { continue; } $restrictions = []; @@ -152,6 +153,12 @@ public function templateOptions(Channel $channel, ProcessModel $model, ?array $c foreach ($model->slots() as $area) { foreach ($this->catalogue->templates($area) as $key => $class) { $restrictions = $hints = $unconfirmed = []; + if (isset($model::templateRestrictions()[$key])) { + $restrictions[] = new Restriction(Restriction::BUSINESS, '„'.$class::label().'“ passt nicht zu „'.$model::label().'“: '.$model::templateRestrictions()[$key]); + } + if ($channel->isWebsite() && in_array(true, $class::capabilityRequirements(), true)) { + $restrictions[] = new Restriction(Restriction::BUSINESS, '„'.$class::label().'“ setzt ein Portal voraus; die eigene Webseite hat keines.'); + } foreach ($class::capabilityRequirements() as $capability => $required) { $actual = $capabilities[$capability] ?? null; $definition = ChannelCapabilities::definitions()[$capability]; @@ -197,7 +204,9 @@ public function currentTemplates(Channel $channel, IntakeKind $intake): array return $this->composer->resolve($model, $current['templates']); } - return $model::presetTemplates() === [] ? [] : $this->composer->resolve($this->catalogue->model(ExternalBookingModel::key()), $model::presetTemplates()); + $base = $model::composedBy(); + + return $base === null || $model::presetTemplates() === [] ? [] : $this->composer->resolve($this->catalogue->model($base), $model::presetTemplates()); } /** @@ -382,11 +391,11 @@ public function preview(Channel $channel, IntakeKind $intake, array $draft): arr $on = ($draft['steps'][$key]['on'] ?? true) !== false || ! $definition->isOptional(); $reason = match (true) { ! $on => 'im Kanal abgeschaltet', - $key === 'hold' && ! $profile->preReservation() => 'keine Vorreservierung in diesem Modell', - $key === 'offer.information' && $profile->preReservation() => 'nicht in diesem Modell (verbindliches Angebot)', - $key === 'offer.binding' && ! $profile->preReservation() => 'erst, wenn ein Angebot von Hand gesendet wird', + $key === 'hold' && ! $profile->preReservation() => 'keine Reservierung bei der Anfrage', + $key === 'offer.information' && $profile->inquiryAnswer() === InquiryAnswer::Offer => 'nicht bei verbindlichem Angebot', + $key === 'offer.binding' && $profile->inquiryAnswer() === InquiryAnswer::Information => 'erst, wenn ein Angebot von Hand gesendet wird', $key === 'portal.payout' && $profile->payments() !== Responsibility::Portal => 'wir kassieren selbst', - $key === 'review.request' && $profile->guestMessages() !== Responsibility::Landlord => 'das Portal schreibt dem Gast', + $key === 'review.request' && $profile->reviewRequestSender() !== Responsibility::Landlord => 'die Bewertungsbitte kommt nicht von uns', $key === 'guest.details' && $intake === IntakeKind::Booking && $profile->documents() === Responsibility::Portal && $profile->payments() === Responsibility::Portal && $profile->guestMessages() === Responsibility::Portal => 'wir schreiben dem Gast nicht', default => null, }; @@ -394,7 +403,8 @@ public function preview(Channel $channel, IntakeKind $intake, array $draft): arr $performer = match ($key) { 'documents.send' => $profile->documents()->value, 'payments.monitor' => $profile->payments()->value, - 'arrival.info' => $profile->guestMessages()->value, + 'arrival.info' => $profile->arrivalInfoSender()->value, + 'review.request' => $profile->reviewRequestSender()->value, default => $definition->performers[0] ?? null, }; $rows[] = ['module' => $key, 'label' => $definition->label, 'phase' => $definition->phase, 'on' => $on && $reason === null, 'reason' => $reason, @@ -486,10 +496,13 @@ private function templateProblems(Channel $channel, ProcessModel $model, array $ foreach ($options[$area][$class::key()]['restrictions'] ?? [] as $restriction) { $problems[] = $restriction->text(); } - $setting = TemplateArea::from($area)->setting(); - $value = $setting->normalize($draft['settings'][$setting->value] ?? null); - if ($value !== null && (string) $value !== $class::responsibility()->value) { - $problems[] = $setting->question().' „'.$setting->describe($value).'“ widerspricht der Schablone „'.$class::label().'“ ('.$setting->describe($class::responsibility()->value).').'; + foreach ($class::fixes() as $key => $fixed) { + $setting = ProcessSetting::tryFrom($key); + $value = $setting?->normalize($draft['settings'][$key] ?? null); + $fixedValue = $setting?->normalize($fixed) ?? $fixed; + if ($setting !== null && $value !== null && (string) $value !== (string) $fixedValue) { + $problems[] = $setting->question().' „'.$setting->describe($value).'“ widerspricht der Schablone „'.$class::label().'“ ('.$setting->describe($fixedValue).').'; + } } } $messages = app(ChannelCapabilities::class)->resolve($channel, $capabilities)[ChannelCapabilities::MESSAGES_GUEST] ?? null; diff --git a/app/Process/ConfigurationImpact.php b/app/Process/ConfigurationImpact.php index 190ad19..761a58b 100644 --- a/app/Process/ConfigurationImpact.php +++ b/app/Process/ConfigurationImpact.php @@ -4,6 +4,7 @@ use App\Enums\Execution; use App\Enums\IntakeKind; +use App\Enums\ProcessSetting; use App\Models\Channel; use App\Process\Modules\ModuleDefinition; use App\Process\Templates\TemplateComposer; @@ -95,7 +96,23 @@ public function ofTemplates(Channel $channel, IntakeKind $intake, array $draft): $after = $toClass::modules(); $removed = array_values(array_diff($before, $after)); $setting = $area->setting(); - $storedValue = $setting->normalize($stored[$setting->value] ?? null); + $changedFixes = []; + $replaced = []; + foreach ([...array_keys($toClass::fixes()), ...array_keys($toClass::defaults())] as $key) { + $changed = ProcessSetting::tryFrom($key); + $wanted = $toClass::fixes()[$key] ?? $toClass::defaults()[$key]; + $previous = $fromClass === null ? null : ($fromClass::fixes()[$key] ?? $fromClass::defaults()[$key] ?? null); + if ($changed === null) { + continue; + } + if ($previous !== null && (string) $changed->normalize($previous) !== (string) $changed->normalize($wanted)) { + $changedFixes[] = $changed->question().' '.$changed->describe($changed->normalize($previous)).' → '.$changed->describe($changed->normalize($wanted)).(array_key_exists($key, $toClass::fixes()) ? '' : ' (nur ein Vorschlag – ausdrücklich gesetzte Werte bleiben)'); + } + $storedValue = $changed->normalize($stored[$key] ?? null); + if (array_key_exists($key, $toClass::fixes()) && $storedValue !== null && (string) $storedValue !== (string) $changed->normalize($wanted)) { + $replaced[] = $changed->question().' Bisher gespeichert: „'.$changed->describe($storedValue).'“, künftig durch die Schablone: „'.$changed->describe($changed->normalize($wanted)).'“. Der gespeicherte Wert muss beim Speichern ausdrücklich entfernt werden.'; + } + } $impacts[] = [ 'area' => $area->label(), @@ -107,10 +124,9 @@ public function ofTemplates(Channel $channel, IntakeKind $intake, array $draft): 'responsibility' => $fromClass !== null && $fromClass::responsibility() !== $toClass::responsibility() ? ['from' => $setting->describe($fromClass::responsibility()->value), 'to' => $setting->describe($toClass::responsibility()->value)] : null, + 'changed_settings' => $changedFixes, 'switches_lost' => array_map($labelOf, array_values(array_filter($removed, fn (string $module): bool => ($stored['steps'][$module]['on'] ?? true) === false))), - 'settings_replaced' => $storedValue !== null && (string) $storedValue !== $toClass::responsibility()->value - ? [$setting->question().' Bisher gespeichert: „'.$setting->describe($storedValue).'“, künftig durch die Schablone: „'.$setting->describe($toClass::responsibility()->value).'“. Der gespeicherte Wert muss beim Speichern ausdrücklich entfernt werden.'] - : [], + 'settings_replaced' => $replaced, 'needs' => array_map(fn (string $result): string => 'Voraussetzung: '.$result, $toClass::requires()), 'extensions' => $toClass::extensions(), ]; diff --git a/app/Process/Models/A1InformationModel.php b/app/Process/Models/A1InformationModel.php index c769cf9..2127c6a 100644 --- a/app/Process/Models/A1InformationModel.php +++ b/app/Process/Models/A1InformationModel.php @@ -34,6 +34,21 @@ public static function caseTypes(): array return [CaseType::A1]; } + public static function isLegacy(): bool + { + return true; + } + + public static function composedBy(): ?string + { + return 'inquiry.request'; + } + + public static function presetTemplates(): array + { + return ['inquiry_answer' => 'inquiry.information']; + } + public static function fixes(): array { return ['pre_reservation' => false]; diff --git a/app/Process/Models/A1OfferModel.php b/app/Process/Models/A1OfferModel.php index 18c3acf..b3b448d 100644 --- a/app/Process/Models/A1OfferModel.php +++ b/app/Process/Models/A1OfferModel.php @@ -34,6 +34,21 @@ public static function caseTypes(): array return [CaseType::A1]; } + public static function isLegacy(): bool + { + return true; + } + + public static function composedBy(): ?string + { + return 'inquiry.request'; + } + + public static function presetTemplates(): array + { + return ['inquiry_answer' => 'inquiry.binding_offer']; + } + public static function fixes(): array { return ['pre_reservation' => true]; diff --git a/app/Process/Models/A2InformationModel.php b/app/Process/Models/A2InformationModel.php index 31fa024..41015cb 100644 --- a/app/Process/Models/A2InformationModel.php +++ b/app/Process/Models/A2InformationModel.php @@ -35,6 +35,21 @@ public static function caseTypes(): array return [CaseType::A2]; } + public static function isLegacy(): bool + { + return true; + } + + public static function composedBy(): ?string + { + return 'inquiry.request'; + } + + public static function presetTemplates(): array + { + return ['inquiry_answer' => 'inquiry.information']; + } + public static function fixes(): array { return ['pre_reservation' => false]; diff --git a/app/Process/Models/A2OfferModel.php b/app/Process/Models/A2OfferModel.php index 52c5689..2ed4720 100644 --- a/app/Process/Models/A2OfferModel.php +++ b/app/Process/Models/A2OfferModel.php @@ -35,6 +35,21 @@ public static function caseTypes(): array return [CaseType::A2]; } + public static function isLegacy(): bool + { + return true; + } + + public static function composedBy(): ?string + { + return 'inquiry.request'; + } + + public static function presetTemplates(): array + { + return ['inquiry_answer' => 'inquiry.binding_offer']; + } + public static function fixes(): array { return ['pre_reservation' => true]; diff --git a/app/Process/Models/A3PortalBookingModel.php b/app/Process/Models/A3PortalBookingModel.php index 81d175b..8025815 100644 --- a/app/Process/Models/A3PortalBookingModel.php +++ b/app/Process/Models/A3PortalBookingModel.php @@ -53,6 +53,11 @@ public static function isLegacy(): bool return true; } + public static function composedBy(): ?string + { + return 'external.booking'; + } + public static function presetTemplates(): array { return ['collection' => 'collection.own', 'contract_documents' => 'contract_docs.own']; diff --git a/app/Process/Models/A4PortalBookingModel.php b/app/Process/Models/A4PortalBookingModel.php index e68866b..474fd8d 100644 --- a/app/Process/Models/A4PortalBookingModel.php +++ b/app/Process/Models/A4PortalBookingModel.php @@ -53,6 +53,11 @@ public static function isLegacy(): bool return true; } + public static function composedBy(): ?string + { + return 'external.booking'; + } + public static function presetTemplates(): array { return ['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.own']; diff --git a/app/Process/Models/A5PortalBookingModel.php b/app/Process/Models/A5PortalBookingModel.php index 11efb6e..17ade54 100644 --- a/app/Process/Models/A5PortalBookingModel.php +++ b/app/Process/Models/A5PortalBookingModel.php @@ -53,6 +53,11 @@ public static function isLegacy(): bool return true; } + public static function composedBy(): ?string + { + return 'external.booking'; + } + public static function presetTemplates(): array { return ['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.external']; diff --git a/app/Process/Models/ExternalBookingModel.php b/app/Process/Models/ExternalBookingModel.php index a38b8c2..a4ff3d6 100644 --- a/app/Process/Models/ExternalBookingModel.php +++ b/app/Process/Models/ExternalBookingModel.php @@ -16,7 +16,7 @@ class ExternalBookingModel extends ProcessModel { /** Results the base process provides to the templates. */ - public const PROVIDES = ['case.recorded', 'guest.identified', 'binding.portal_total']; + public const PROVIDES = ['case.recorded', 'guest.identified', 'binding.portal_total', 'price.known']; public static function key(): string { @@ -76,6 +76,7 @@ public static function defaultTemplates(): array return [ TemplateArea::Collection->value => 'collection.own', TemplateArea::ContractDocuments->value => 'contract_docs.own', + TemplateArea::GuestCommunication->value => 'guest_comm.own', ]; } @@ -93,8 +94,7 @@ public function steps(): array Step::slot(TemplateArea::Collection), Step::module('case.tasks'), Step::module('change.proposal'), - Step::module('arrival.details'), - Step::module('arrival.info'), + Step::slot(TemplateArea::GuestCommunication), Step::module('guest.data_request'), Step::point(Point::BeforeStay), Step::module('stay'), diff --git a/app/Process/Models/InquiryRequestModel.php b/app/Process/Models/InquiryRequestModel.php new file mode 100644 index 0000000..75828e9 --- /dev/null +++ b/app/Process/Models/InquiryRequestModel.php @@ -0,0 +1,135 @@ + Responsibility::Landlord, 'collection' => Responsibility::Landlord, 'contract_documents' => Responsibility::Landlord], + variable: [ + 'guest_messages' => [Responsibility::Landlord, Responsibility::Portal], + 'supplementary_documents' => [Responsibility::Landlord, Responsibility::Nobody], + 'local_services' => [Responsibility::Landlord], + ], + ); + } + + public static function providedResults(): array + { + return self::PROVIDES; + } + + public static function templateRestrictions(): array + { + return [ + 'collection.portal' => 'Bei einer Anfrage schließen wir den Vertrag selbst (Annahme des Angebots) und kassieren selbst; Inkasso beim Portal gibt es nur bei bereits verbindlich gebuchten Portalbuchungen.', + 'contract_docs.external' => 'Bei einer Anfrage entsteht der Vertrag erst durch unser Angebot und die Annahme des Gastes; das Portal kann keine Vertragsunterlagen dafür bereitstellen.', + ]; + } + + public static function defaultTemplates(): array + { + return [ + TemplateArea::InquiryAnswer->value => 'inquiry.binding_offer', + TemplateArea::ContractDocuments->value => 'contract_docs.own', + TemplateArea::Collection->value => 'collection.own', + TemplateArea::GuestCommunication->value => 'guest_comm.own', + ]; + } + + public function steps(): array + { + return [ + Step::module('intake.record'), + Step::module('guest.details'), + Step::point(Point::AfterGuestIdentified), + Step::module('hold'), + Step::module('availability.check'), + Step::slot(TemplateArea::InquiryAnswer), + Step::point(Point::BeforePriceFixing), + Step::module('offer.binding'), + Step::point(Point::BeforeBindingOffer), + Step::module('offer.acceptance'), + Step::point(Point::AfterBinding), + Step::slot(TemplateArea::ContractDocuments), + Step::module('channels.block'), + Step::slot(TemplateArea::Collection), + Step::module('case.tasks'), + Step::module('change.proposal'), + Step::slot(TemplateArea::GuestCommunication), + Step::module('guest.data_request'), + Step::point(Point::BeforeStay), + Step::module('stay'), + Step::module('review.request'), + Step::point(Point::BeforeSettlement), + Step::module('case.closure'), + Step::module('case.settlement'), + ]; + } + + /** + * The extension variants of the architecture proof (tester only), as on the former offer model. + * + * @return list + */ + public function variants(): array + { + return [ + Variant::make('standard', 'Standard'), + Variant::make('loyalty', 'Mit Stammgastrabatt (Architekturnachweis, nur im Prozess-Tester)') + ->testerOnly() + ->insert(Point::AfterGuestIdentified, 'guest.loyalty_status') + ->insert(Point::BeforePriceFixing, 'pricing.loyalty_discount'), + Variant::make('address_check', 'Mit Anschriftsprüfung (Zusatzschritt, nur im Prozess-Tester)') + ->testerOnly() + ->insert(Point::AfterGuestIdentified, 'guest.address_check'), + ]; + } +} diff --git a/app/Process/Models/ProcessModel.php b/app/Process/Models/ProcessModel.php index bda08c5..ccfa8af 100644 --- a/app/Process/Models/ProcessModel.php +++ b/app/Process/Models/ProcessModel.php @@ -85,6 +85,24 @@ public function slots(): array return array_values(array_map(fn (Step $step): TemplateArea => $step->slot, array_filter($this->steps(), fn (Step $step): bool => $step->isSlot()))); } + /** + * Templates a model does not take, with the business reason (template key => reason). Everything not listed fits. + * + * @return array + */ + public static function templateRestrictions(): array + { + return []; + } + + /** + * For a legacy model: the key of the base process whose template combination it reproduces. + */ + public static function composedBy(): ?string + { + return null; + } + /** * The results the base course provides to the templates of its slots (see FunctionTemplate::requires()). * diff --git a/app/Process/Modules/Intake/GuestDetails.php b/app/Process/Modules/Intake/GuestDetails.php index 72793a0..5a21aea 100644 --- a/app/Process/Modules/Intake/GuestDetails.php +++ b/app/Process/Modules/Intake/GuestDetails.php @@ -4,6 +4,7 @@ use App\Enums\ActivityState; use App\Enums\Execution; +use App\Enums\InquiryAnswer; use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Models\DataRequest; @@ -49,7 +50,7 @@ public function applies(CaseContext $case): bool { $profile = $case->profile; - return $case->inquiry || $profile->documents() === Responsibility::Landlord || $profile->guestMessages() === Responsibility::Landlord || $profile->payments() === Responsibility::Landlord; + return $case->inquiry || $profile->documents() === Responsibility::Landlord || $profile->guestMessages() === Responsibility::Landlord || $profile->arrivalInfoSender() === Responsibility::Landlord || $profile->reviewRequestSender() === Responsibility::Landlord || $profile->payments() === Responsibility::Landlord; } public function activities(CaseContext $case): array @@ -58,7 +59,7 @@ public function activities(CaseContext $case): array $profile = $case->profile; $hasEmail = filled($booking->guest?->email); // v0.11 (G2a): before the own binding offer – or the binding confirmation of a wish – every required detail. - $action = $profile->preReservation() || $booking->offer_version > 0 ? CaseRequirements::OFFER : CaseRequirements::WISH_CONFIRMATION; + $action = $profile->inquiryAnswer() === InquiryAnswer::Offer || $booking->offer_version > 0 ? CaseRequirements::OFFER : CaseRequirements::WISH_CONFIRMATION; $needsDetails = $case->inquiry && ! $case->binding && $booking->offer_version === 0 && ($action === CaseRequirements::OFFER || $booking->wish_at !== null); $missing = $hasEmail && $needsDetails ? CaseRequirements::missing($booking, $action) : []; $request = $booking->openDataRequest(); diff --git a/app/Process/Modules/Offer/BindingOffer.php b/app/Process/Modules/Offer/BindingOffer.php index 747c3bc..530ac3f 100644 --- a/app/Process/Modules/Offer/BindingOffer.php +++ b/app/Process/Modules/Offer/BindingOffer.php @@ -6,6 +6,7 @@ use App\Enums\ActivityState; use App\Enums\BookingStatus; use App\Enums\Execution; +use App\Enums\InquiryAnswer; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; use App\Process\Activity; @@ -59,7 +60,7 @@ public static function definition(): ModuleDefinition /** The binding way: the request reserves (pre-reservation) or an offer was made anyway. */ public function applies(CaseContext $case): bool { - return $case->inquiry && ! ($case->profile->preReservation() === false && $case->booking->offer_version === 0); + return $case->inquiry && ! ($case->profile->inquiryAnswer() === InquiryAnswer::Information && $case->booking->offer_version === 0); } public function activities(CaseContext $case): array diff --git a/app/Process/Modules/Offer/Information.php b/app/Process/Modules/Offer/Information.php index 9a8d52a..c18ea34 100644 --- a/app/Process/Modules/Offer/Information.php +++ b/app/Process/Modules/Offer/Information.php @@ -5,6 +5,7 @@ use App\Enums\ActivityState; use App\Enums\BookingStatus; use App\Enums\Execution; +use App\Enums\InquiryAnswer; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; use App\Process\Activity; @@ -49,7 +50,7 @@ public static function definition(): ModuleDefinition public function applies(CaseContext $case): bool { - return $case->inquiry && ! $case->profile->preReservation() && $case->booking->offer_version === 0; + return $case->inquiry && $case->profile->inquiryAnswer() === InquiryAnswer::Information && $case->booking->offer_version === 0; } public function activities(CaseContext $case): array diff --git a/app/Process/Modules/Stay/ArrivalInformation.php b/app/Process/Modules/Stay/ArrivalInformation.php index c0c5f9e..47be009 100644 --- a/app/Process/Modules/Stay/ArrivalInformation.php +++ b/app/Process/Modules/Stay/ArrivalInformation.php @@ -34,7 +34,7 @@ public static function definition(): ModuleDefinition effects: ['guest_mail'], waits: ['time', 'portal'], triggers: ['schedule:reminders'], - parameters: [ProcessSetting::GuestMessages, ProcessSetting::ArrivalInfoDaysBefore], + parameters: [ProcessSetting::ArrivalInfoSender, ProcessSetting::ArrivalInfoDaysBefore], performers: ['system', 'portal', 'service_provider'], events: ['document', 'mail'], ); @@ -45,7 +45,7 @@ public function activities(CaseContext $case): array $booking = $case->booking; $profile = $case->profile; - return [$profile->guestMessages() === Responsibility::Portal + return [$profile->arrivalInfoSender() === Responsibility::Portal ? new Activity('arrival_info', 'Anreise-Informationen an den Gast', ActivityState::External, 'durch '.($booking->processChannel()?->name ?? 'das Portal').' (angekündigt) – eine Zustellung ist damit nicht nachgewiesen') : new Activity('arrival_info', 'Anreise-Informationen an den Gast (automatisch)', $case->later($booking->arrival_info_sent_at !== null ? ActivityState::Done : ActivityState::Later), $booking->arrival_info_sent_at ? 'gesendet am '.$booking->arrival_info_sent_at->format('d.m.Y') : $profile->arrivalInfoDaysBefore().' Tage vor Anreise')]; } diff --git a/app/Process/Modules/Stay/ReviewRequest.php b/app/Process/Modules/Stay/ReviewRequest.php index f33376b..06a5b0e 100644 --- a/app/Process/Modules/Stay/ReviewRequest.php +++ b/app/Process/Modules/Stay/ReviewRequest.php @@ -4,6 +4,7 @@ use App\Enums\ActivityState; use App\Enums\Execution; +use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Process\Activity; use App\Process\CaseContext; @@ -35,6 +36,7 @@ public static function definition(): ModuleDefinition waits: ['time'], triggers: ['schedule:reviews'], toggle: ModuleDefinition::TOGGLE_OPTIONAL, + parameters: [ProcessSetting::ReviewRequestSender], performers: ['system'], events: ['mail'], ); @@ -42,7 +44,7 @@ public static function definition(): ModuleDefinition public function applies(CaseContext $case): bool { - return $case->profile->guestMessages() === Responsibility::Landlord && ! $case->booking->isInternal(); + return $case->profile->reviewRequestSender() === Responsibility::Landlord && ! $case->booking->isInternal(); } public function activities(CaseContext $case): array diff --git a/app/Process/ProcessCatalogue.php b/app/Process/ProcessCatalogue.php index 5d5267f..8325ac1 100644 --- a/app/Process/ProcessCatalogue.php +++ b/app/Process/ProcessCatalogue.php @@ -3,6 +3,7 @@ namespace App\Process; use App\Enums\CaseType; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Process\Models\ProcessModel; use App\Process\Modules\ProcessModule; @@ -154,7 +155,7 @@ public function derivedModel(ProcessProfile $profile): string { return match ($profile->intake) { IntakeKind::Internal => 'a6.internal', - IntakeKind::Inquiry => ($profile->caseType === CaseType::A2 ? 'a2' : 'a1').($profile->preReservation() ? '.offer' : '.information'), + IntakeKind::Inquiry => ($profile->caseType === CaseType::A2 ? 'a2' : 'a1').($profile->inquiryAnswer() === InquiryAnswer::Offer ? '.offer' : '.information'), IntakeKind::Booking => match ($profile->caseType) { CaseType::A5 => 'a5.portal_booking', CaseType::A4 => 'a4.portal_booking', @@ -213,8 +214,14 @@ public function problems(): array if (! in_array($class::area()->result(), $class::provides(), true)) { $problems[] = "Schablone {$class::reference()}: liefert das Ergebnis ihres Bereichs ({$class::area()->result()}) nicht."; } - if ($class::fixes() === [] || array_keys($class::fixes()) !== [$class::area()->setting()->value]) { - $problems[] = "Schablone {$class::reference()}: darf nur die Verantwortlichkeit ihres Bereichs festlegen."; + $allowed = array_map(fn ($setting): string => $setting->value, $class::area()->settings()); + if (array_diff([...array_keys($class::fixes()), ...array_keys($class::defaults())], $allowed) !== []) { + $problems[] = "Schablone {$class::reference()}: darf nur Einstellungen ihres Bereichs ({$class::area()->label()}) festlegen oder vorschlagen."; + } + foreach ($class::configures() as $module) { + if (! $this->hasModule($module)) { + $problems[] = "Schablone {$class::reference()}: konfiguriertes Modul {$module} ist nicht registriert."; + } } } } diff --git a/app/Process/ProcessProfile.php b/app/Process/ProcessProfile.php index d617576..2573c86 100644 --- a/app/Process/ProcessProfile.php +++ b/app/Process/ProcessProfile.php @@ -6,6 +6,7 @@ use App\Enums\CaseType; use App\Enums\ContractDelivery; use App\Enums\DataRequestMode; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; @@ -35,6 +36,12 @@ final class ProcessProfile /** Fixed by a function template chosen for the channel (Schablonenkomposition). */ public const TEMPLATE = 'template'; + /** Suggested by a function template (lowest level above the built-in default; every explicit level wins). */ + public const TEMPLATE_DEFAULT = 'template_default'; + + /** Not set anywhere: derived from a related setting (the answer from the reservation, a sender from guest_messages). */ + public const DERIVED = 'derived'; + /** Fixed by the case type (A6), not settable. */ public const CASE_TYPE = 'case_type'; @@ -108,6 +115,27 @@ public function payments(): Responsibility return Responsibility::tryFrom((string) $this->value(ProcessSetting::Payments)) ?? Responsibility::Landlord; } + /** + * How a request is answered first. Profiles frozen before the setting existed derive it from the reservation (an + * information reserved nothing, an offer did) – exactly the former behaviour. + */ + public function inquiryAnswer(): InquiryAnswer + { + return InquiryAnswer::tryFrom((string) ($this->values[ProcessSetting::InquiryAnswer->value] ?? '')) ?? ($this->preReservation() ? InquiryAnswer::Offer : InquiryAnswer::Information); + } + + /** Who sends the arrival information; not set: whoever writes to the guest (guest_messages). */ + public function arrivalInfoSender(): Responsibility + { + return Responsibility::tryFrom((string) ($this->values[ProcessSetting::ArrivalInfoSender->value] ?? '')) ?? $this->guestMessages(); + } + + /** Who asks for the review; not set: whoever writes to the guest (guest_messages). */ + public function reviewRequestSender(): Responsibility + { + return Responsibility::tryFrom((string) ($this->values[ProcessSetting::ReviewRequestSender->value] ?? '')) ?? $this->guestMessages(); + } + public function guestMessages(): Responsibility { return Responsibility::tryFrom((string) $this->value(ProcessSetting::GuestMessages)) ?? Responsibility::Landlord; @@ -199,6 +227,8 @@ public static function sourceLabel(string $source): string self::CASE_TYPE => 'fest für diese Vorgangsart', self::MODEL => 'festgelegt durch das gewählte Ablaufmodell', self::TEMPLATE => 'festgelegt durch die gewählte Funktionsschablone', + self::TEMPLATE_DEFAULT => 'Vorschlag der gewählten Funktionsschablone', + self::DERIVED => 'abgeleitet aus einer verwandten Einstellung', 'migration' => 'aus dem bisherigen Stand übernommen', default => 'Grundeinstellung', }; diff --git a/app/Process/ProcessSettings.php b/app/Process/ProcessSettings.php index 59da17b..669741f 100644 --- a/app/Process/ProcessSettings.php +++ b/app/Process/ProcessSettings.php @@ -3,6 +3,7 @@ namespace App\Process; use App\Enums\ChannelBookingModel; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Enums\ProcessSetting; use App\Enums\Responsibility; @@ -34,11 +35,23 @@ public function resolve(Property $property, ?Channel $channel, IntakeKind $intak ($channel?->isWebsite() ? ProcessProfile::WEBSITE : ProcessProfile::CHANNEL) => $intake === IntakeKind::Internal || $channel === null ? [] : (array) (($channel->process_overrides ?? [])[$intake->value] ?? []), ]; + $model = $this->chosenModel($channel, $intake); + $templates = $this->chosenTemplates($channel, $intake, $model); + $suggested = []; + foreach ($templates as $class) { + $suggested = [...$suggested, ...$class::defaults()]; + } + $values = []; $sources = []; foreach (ProcessSetting::cases() as $setting) { $values[$setting->value] = $setting->default(); $sources[$setting->value] = ProcessProfile::SYSTEM; + // A function template only suggests: below every level the landlord can set. + if (($suggestion = $setting->normalize($suggested[$setting->value] ?? null)) !== null) { + $values[$setting->value] = $suggestion; + $sources[$setting->value] = ProcessProfile::TEMPLATE_DEFAULT; + } foreach ($levels as $level => $settings) { if (in_array($level, [ProcessProfile::CHANNEL, ProcessProfile::WEBSITE], true) && ! in_array($intake, $setting->channelIntakes(), true)) { @@ -54,7 +67,6 @@ public function resolve(Property $property, ?Channel $channel, IntakeKind $intak // Architektur V2: the process model chosen for the channel and intake kind fixes some settings (e.g. the // pre-reservation of the offer model, the responsibilities of A3–A5); these win over every level. - $model = $this->chosenModel($channel, $intake); foreach ($model === null ? [] : $model::fixes() as $key => $fixed) { $setting = ProcessSetting::tryFrom($key); if ($setting !== null) { @@ -64,9 +76,9 @@ public function resolve(Property $property, ?Channel $channel, IntakeKind $intak } // Function templates chosen for the model's slots fix the responsibility of their area. - foreach ($this->chosenTemplates($channel, $intake, $model) as $class) { + foreach ($templates as $class) { foreach ($class::fixes() as $key => $fixed) { - $values[$key] = $fixed; + $values[$key] = ProcessSetting::tryFrom($key)?->normalize($fixed) ?? $fixed; $sources[$key] = ProcessProfile::TEMPLATE; } } @@ -84,6 +96,18 @@ public function resolve(Property $property, ?Channel $channel, IntakeKind $intak $sources[ProcessSetting::Documents->value] = ProcessProfile::SYSTEM; } + // What was set nowhere follows the related setting, as it always did. + foreach ([ProcessSetting::ArrivalInfoSender, ProcessSetting::ReviewRequestSender] as $sender) { + if ($values[$sender->value] === null && $intake !== IntakeKind::Internal) { + $values[$sender->value] = $values[ProcessSetting::GuestMessages->value]; + $sources[$sender->value] = ProcessProfile::DERIVED; + } + } + if ($values[ProcessSetting::InquiryAnswer->value] === null && $intake === IntakeKind::Inquiry) { + $values[ProcessSetting::InquiryAnswer->value] = $values[ProcessSetting::PreReservation->value] ? InquiryAnswer::Offer->value : InquiryAnswer::Information->value; + $sources[ProcessSetting::InquiryAnswer->value] = ProcessProfile::DERIVED; + } + $documents = Responsibility::from((string) $values[ProcessSetting::Documents->value]); $payments = Responsibility::from((string) $values[ProcessSetting::Payments->value]); diff --git a/app/Process/Templates/FunctionTemplate.php b/app/Process/Templates/FunctionTemplate.php index 4ff82b8..eb9380b 100644 --- a/app/Process/Templates/FunctionTemplate.php +++ b/app/Process/Templates/FunctionTemplate.php @@ -30,8 +30,11 @@ abstract public static function purpose(): string; */ abstract public static function modules(): array; - /** Who answers for the result of the area. It becomes the value of the area's responsibility setting. */ - abstract public static function responsibility(): Responsibility; + /** Who answers for the result of the area (we, unless the template hands it to the portal). */ + public static function responsibility(): Responsibility + { + return Responsibility::Landlord; + } /** * The portal capability that must hold for the template to fit: capability key => required value (the channel's @@ -64,6 +67,27 @@ public static function provides(): array return [static::area()->result()]; } + /** + * Standard configuration the template suggests (setting key => value). It sits below every level the landlord can set + * – landlord, property, channel – so it never overrides an explicit value, and every module stays configurable. + * + * @return array + */ + public static function defaults(): array + { + return []; + } + + /** + * Modules outside the template's own slot that its defaults or fixes configure (shown with the template). + * + * @return list + */ + public static function configures(): array + { + return []; + } + /** * Templates (keys) that must not be combined with this one, with the reason. * diff --git a/app/Process/Templates/InformationAnswer.php b/app/Process/Templates/InformationAnswer.php new file mode 100644 index 0000000..62632e6 --- /dev/null +++ b/app/Process/Templates/InformationAnswer.php @@ -0,0 +1,61 @@ + 'information', 'pre_reservation' => false]; + } + + public static function dimensions(): array + { + return [ + 'Verbindlichkeit' => 'Keine; der Vertrag entsteht erst nach dem Buchungswunsch und unserer Bestätigung.', + 'Reservierung' => 'Keine (Festlegung der Auskunft, nicht des Prozesses).', + 'Ausführung' => 'Automatisch, nach Freigabe oder von Hand (Modul „Unverbindliche Auskunft“).', + 'Nachweis' => 'Versendete Auskunft mit Version und Stand der Prüfung.', + ]; + } +} diff --git a/app/Process/Templates/OfferAnswer.php b/app/Process/Templates/OfferAnswer.php new file mode 100644 index 0000000..db352ac --- /dev/null +++ b/app/Process/Templates/OfferAnswer.php @@ -0,0 +1,67 @@ + 'offer']; + } + + public static function defaults(): array + { + return ['pre_reservation' => true]; + } + + public static function dimensions(): array + { + return [ + 'Verbindlichkeit' => 'Mit der Annahme des Gastes (Annahmeprotokoll).', + 'Reservierung' => 'Vorschlag: Zeitraum schon bei der Anfrage reservieren; frei einstellbar. Das Angebot hält den Zeitraum in jedem Fall für seine Gültigkeit.', + 'Ausführung' => 'Automatisch, nach Freigabe oder von Hand; Preisänderungen nur als Anpassungszeile.', + 'Nachweis' => 'Angebotsversion, Annahme mit Zeitstempel und Prüfsumme.', + ]; + } +} diff --git a/app/Process/Templates/OwnCollection.php b/app/Process/Templates/OwnCollection.php index 132114b..b907617 100644 --- a/app/Process/Templates/OwnCollection.php +++ b/app/Process/Templates/OwnCollection.php @@ -52,7 +52,7 @@ public static function capabilityRequirements(): array public static function requires(): array { - return ['binding.portal_total']; + return ['price.known']; } public static function provides(): array diff --git a/app/Process/Templates/OwnGuestCommunication.php b/app/Process/Templates/OwnGuestCommunication.php new file mode 100644 index 0000000..84e46c0 --- /dev/null +++ b/app/Process/Templates/OwnGuestCommunication.php @@ -0,0 +1,64 @@ + 'landlord']; + } + + public static function dimensions(): array + { + return [ + 'Anreise-Information' => 'Von uns, N Tage vor Anreise (einstellbar).', + 'Bewertungsbitte' => 'Von uns nach dem Aufenthalt.', + 'Medium' => 'E-Mail (über das Mail-Tor; weitere Medien sind nicht angebunden).', + ]; + } +} diff --git a/app/Process/Templates/PortalCollection.php b/app/Process/Templates/PortalCollection.php index 25dbf8f..6c1505a 100644 --- a/app/Process/Templates/PortalCollection.php +++ b/app/Process/Templates/PortalCollection.php @@ -52,7 +52,7 @@ public static function capabilityRequirements(): array public static function requires(): array { - return ['binding.portal_total']; + return ['price.known']; } public static function provides(): array diff --git a/app/Process/Templates/PortalGuestCommunication.php b/app/Process/Templates/PortalGuestCommunication.php new file mode 100644 index 0000000..e07e7dc --- /dev/null +++ b/app/Process/Templates/PortalGuestCommunication.php @@ -0,0 +1,76 @@ + true]; + } + + public static function fixes(): array + { + return []; + } + + public static function defaults(): array + { + return ['guest_messages' => 'portal', 'arrival_info_sender' => 'portal', 'review_request_sender' => 'portal']; + } + + public static function dimensions(): array + { + return [ + 'Anreise-Information' => 'Durch das Portal (angekündigt, nicht nachgewiesen).', + 'Bewertungsbitte' => 'Durch das Portal.', + 'Medium' => 'Das des Portals.', + ]; + } +} diff --git a/app/Process/Templates/TemplateArea.php b/app/Process/Templates/TemplateArea.php index 1d716d0..cb169af 100644 --- a/app/Process/Templates/TemplateArea.php +++ b/app/Process/Templates/TemplateArea.php @@ -12,12 +12,16 @@ enum TemplateArea: string { case Collection = 'collection'; case ContractDocuments = 'contract_documents'; + case InquiryAnswer = 'inquiry_answer'; + case GuestCommunication = 'guest_communication'; public function label(): string { return match ($this) { self::Collection => 'Finanzabwicklung (Inkasso)', self::ContractDocuments => 'Vertragsdokumentation', + self::InquiryAnswer => 'Beantwortung der Anfrage', + self::GuestCommunication => 'Gastkommunikation', }; } @@ -26,6 +30,8 @@ public function question(): string return match ($this) { self::Collection => 'Wer zieht das Geld des Gastes ein?', self::ContractDocuments => 'Wer stellt dem Gast die Vertragsunterlagen bereit?', + self::InquiryAnswer => 'Womit antworten wir zuerst auf eine Anfrage?', + self::GuestCommunication => 'Wer schreibt dem Gast zu welchem Anlass? (Standard – jeder Anlass bleibt einzeln einstellbar)', }; } @@ -35,6 +41,8 @@ public function result(): string return match ($this) { self::Collection => 'money.collection_handled', self::ContractDocuments => 'contract.documented', + self::InquiryAnswer => 'inquiry.answered', + self::GuestCommunication => 'guest.communication_assigned', }; } @@ -44,6 +52,23 @@ public function setting(): ProcessSetting return match ($this) { self::Collection => ProcessSetting::Payments, self::ContractDocuments => ProcessSetting::Documents, + self::InquiryAnswer => ProcessSetting::InquiryAnswer, + self::GuestCommunication => ProcessSetting::GuestMessages, + }; + } + + /** + * Every setting a template of this area may fix or suggest – nothing else (no hidden coupling to other areas). + * + * @return list + */ + public function settings(): array + { + return match ($this) { + self::Collection, self::ContractDocuments => [$this->setting()], + // An information reserves nothing by definition; for an offer the reservation is only suggested. + self::InquiryAnswer => [ProcessSetting::InquiryAnswer, ProcessSetting::PreReservation], + self::GuestCommunication => [ProcessSetting::GuestMessages, ProcessSetting::ArrivalInfoSender, ProcessSetting::ReviewRequestSender], }; } } diff --git a/app/Process/Templates/TemplateComposer.php b/app/Process/Templates/TemplateComposer.php index 2ffacba..d77d027 100644 --- a/app/Process/Templates/TemplateComposer.php +++ b/app/Process/Templates/TemplateComposer.php @@ -72,6 +72,11 @@ public function problems(ProcessModel $model, array $chosen, string $variant = ' $classes = []; foreach ($resolved as $area => $reference) { $class = $this->catalogue->templateClass($reference); + if ($class !== null && isset($model::templateRestrictions()[$class::key()])) { + $problems[] = '„'.$class::label().'“ passt nicht zu „'.$model::label().'“: '.$model::templateRestrictions()[$class::key()]; + + continue; + } if ($class === null) { $problems[] = 'Die Schablone „'.$reference.'“ gibt es nicht.'; diff --git a/app/Process/Tester/Scenarios/CompleteRequest.php b/app/Process/Tester/Scenarios/CompleteRequest.php index d97ac93..b8da640 100644 --- a/app/Process/Tester/Scenarios/CompleteRequest.php +++ b/app/Process/Tester/Scenarios/CompleteRequest.php @@ -5,6 +5,7 @@ use App\Actions\AcceptOffer; use App\Actions\SendOffer; use App\Enums\BookingStatus; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Process\Tester\SandboxContext; @@ -40,7 +41,7 @@ public function events(array $inputs): array new ScenarioEvent('Gast fragt mit allen Angaben an', fn (SandboxContext $context) => $context->request(['street' => 'Teststraße 1', 'postal_code' => '18225', 'city' => 'Kühlungsborn', 'country' => 'DE'])), new ScenarioEvent('Sie senden das Angebot (falls es nicht automatisch ging)', function (SandboxContext $context): void { $booking = $context->booking->fresh(); - if ($booking->status === BookingStatus::Reserved && $booking->offer_version === 0 && $booking->process()->preReservation()) { + if ($booking->status === BookingStatus::Reserved && $booking->offer_version === 0 && $booking->process()->inquiryAnswer() === InquiryAnswer::Offer) { app(SendOffer::class)->handle($booking); } }), diff --git a/app/Process/Tester/Scenarios/ReturningGuest.php b/app/Process/Tester/Scenarios/ReturningGuest.php index 2486bd1..abedcef 100644 --- a/app/Process/Tester/Scenarios/ReturningGuest.php +++ b/app/Process/Tester/Scenarios/ReturningGuest.php @@ -4,6 +4,7 @@ use App\Actions\SendOffer; use App\Enums\BookingStatus; +use App\Enums\InquiryAnswer; use App\Enums\IntakeKind; use App\Models\Booking; use App\Models\Guest; @@ -55,7 +56,7 @@ public function events(array $inputs): array new ScenarioEvent('Gast fragt mit allen Angaben an', fn (SandboxContext $context) => $context->request(['street' => 'Teststraße 1', 'postal_code' => '18225', 'city' => 'Kühlungsborn', 'country' => 'DE'])), new ScenarioEvent('Sie senden das Angebot (falls es nicht automatisch ging)', function (SandboxContext $context): void { $booking = $context->booking->fresh(); - if ($booking->status === BookingStatus::Reserved && $booking->offer_version === 0 && $booking->process()->preReservation()) { + if ($booking->status === BookingStatus::Reserved && $booking->offer_version === 0 && $booking->process()->inquiryAnswer() === InquiryAnswer::Offer) { app(SendOffer::class)->handle($booking); } }), diff --git a/config/process.php b/config/process.php index eea93aa..745baec 100644 --- a/config/process.php +++ b/config/process.php @@ -75,6 +75,7 @@ 'a6.internal' => [1 => Models\A6InternalModel::class], // Base process with slots for function templates; A3–A5 above are its presets (compatibility). 'external.booking' => [1 => Models\ExternalBookingModel::class], + 'inquiry.request' => [1 => Models\InquiryRequestModel::class], ], /* @@ -86,5 +87,9 @@ 'collection.portal' => [1 => Templates\PortalCollection::class], 'contract_docs.own' => [1 => Templates\OwnContractDocumentation::class], 'contract_docs.external' => [1 => Templates\ExternalContractDocuments::class], + 'inquiry.information' => [1 => Templates\InformationAnswer::class], + 'inquiry.binding_offer' => [1 => Templates\OfferAnswer::class], + 'guest_comm.own' => [1 => Templates\OwnGuestCommunication::class], + 'guest_comm.portal' => [1 => Templates\PortalGuestCommunication::class], ], ]; diff --git a/tests/Feature/Process/ChannelProcessConfiguratorTest.php b/tests/Feature/Process/ChannelProcessConfiguratorTest.php index a1262e1..4432cec 100644 --- a/tests/Feature/Process/ChannelProcessConfiguratorTest.php +++ b/tests/Feature/Process/ChannelProcessConfiguratorTest.php @@ -71,12 +71,12 @@ public function test_only_admissible_models_per_channel_and_intake_are_offered() $listing = $this->channel('Ostseeklar', 'inquiry'); $website = Channel::websiteOf($this->property); - $this->assertSame(['a2.offer', 'a2.information'], array_keys($configuration->admissibleModels($fewo, IntakeKind::Inquiry))); + $this->assertSame(['a2.offer', 'a2.information', 'inquiry.request'], array_keys($configuration->admissibleModels($fewo, IntakeKind::Inquiry))); $this->assertSame(['a4.portal_booking', 'external.booking'], array_keys($configuration->admissibleModels($fewo, IntakeKind::Booking)), 'O2: of the archetypes only A4 fits FeWo-direkt; the base process is open and restricts per template'); $this->assertSame(['a3.portal_booking', 'external.booking'], array_keys($configuration->admissibleModels($ds, IntakeKind::Booking))); $this->assertSame([IntakeKind::Booking], $configuration->intakes($ds)); - $this->assertSame(['a2.offer', 'a2.information'], array_keys($configuration->admissibleModels($listing, IntakeKind::Inquiry))); - $this->assertSame(['a1.offer', 'a1.information'], array_keys($configuration->admissibleModels($website, IntakeKind::Inquiry))); + $this->assertSame(['a2.offer', 'a2.information', 'inquiry.request'], array_keys($configuration->admissibleModels($listing, IntakeKind::Inquiry))); + $this->assertSame(['a1.offer', 'a1.information', 'inquiry.request'], array_keys($configuration->admissibleModels($website, IntakeKind::Inquiry))); // The restriction lives in the channel profile, not in the process core: a changed profile releases more models. $fewo->update(['settings' => [...(array) $fewo->settings, 'portal_profile' => 'generic']]); diff --git a/tests/Feature/Process/ExtensionAndIndependentStepsTest.php b/tests/Feature/Process/ExtensionAndIndependentStepsTest.php index 8ce0acf..dda9fb2 100644 --- a/tests/Feature/Process/ExtensionAndIndependentStepsTest.php +++ b/tests/Feature/Process/ExtensionAndIndependentStepsTest.php @@ -45,7 +45,7 @@ public function test_case_h_an_optional_address_check_is_added_at_an_extension_p $catalogue = app(ProcessCatalogue::class); $using = array_keys(array_filter($catalogue->models(), fn ($model): bool => collect($model->variants())->contains(fn ($variant): bool => in_array('guest.address_check', $model->modules($variant->key), true)))); - $this->assertSame(['a1.offer'], $using); + $this->assertSame(['a1.offer', 'inquiry.request'], $using, 'the former offer model and the request base process that replaces it'); $this->assertSame([], $catalogue->problems()); foreach ($catalogue->models() as $key => $model) { $this->assertNotContains('guest.address_check', $model->modules('standard'), "{$key}: standard course unchanged"); diff --git a/tests/Feature/Process/LoyaltyArchitectureProofTest.php b/tests/Feature/Process/LoyaltyArchitectureProofTest.php index 0d2d065..3a59c96 100644 --- a/tests/Feature/Process/LoyaltyArchitectureProofTest.php +++ b/tests/Feature/Process/LoyaltyArchitectureProofTest.php @@ -119,7 +119,7 @@ public function test_loyalty_cannot_reach_a_real_case_and_leaves_the_other_model $catalogue = app(ProcessCatalogue::class); $using = array_keys(array_filter($catalogue->models(), fn ($model): bool => collect($model->variants())->contains(fn ($variant): bool => in_array('pricing.loyalty_discount', $model->modules($variant->key), true)))); - $this->assertSame(['a1.offer'], $using, 'only the A1 offer model has the variant'); + $this->assertSame(['a1.offer', 'inquiry.request'], $using, 'only the A1 offer model and the request base process have the variant'); $this->assertSame([], $catalogue->problems()); foreach ($catalogue->models() as $key => $model) { $this->assertNotContains('guest.loyalty_status', $model->modules('standard'), "{$key}: standard course unchanged"); diff --git a/tests/Feature/Process/TemplateCompositionTest.php b/tests/Feature/Process/TemplateCompositionTest.php index 8868973..efa94a6 100644 --- a/tests/Feature/Process/TemplateCompositionTest.php +++ b/tests/Feature/Process/TemplateCompositionTest.php @@ -100,7 +100,7 @@ public function test_every_combination_is_composed_into_a_valid_versioned_plan(s $plan = ProcessPlan::of($booking); $this->assertSame(['external.booking', 1], [$plan->model, $plan->modelVersion]); - $this->assertEquals(['collection' => $collection.'@1', 'contract_documents' => $documents.'@1'], $plan->templates); + $this->assertEquals(['collection' => $collection.'@1', 'contract_documents' => $documents.'@1', 'guest_communication' => 'guest_comm.own@1'], $plan->templates); $this->assertSame($payout, array_key_exists('portal.payout', $plan->modules)); $this->assertArrayHasKey('payments.monitor', $plan->modules); $this->assertArrayHasKey('documents.send', $plan->modules); @@ -263,7 +263,7 @@ public function test_the_base_process_cannot_be_saved_with_templates_the_portal_ $this->assertNull(($channel->fresh()->process_overrides ?? [])['booking'] ?? null, 'nothing saved'); $configure->handle($channel, IntakeKind::Booking, [...$draft, 'templates' => ['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.own']]); - $this->assertEquals(['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.own'], $channel->fresh()->process_overrides['booking']['templates']); + $this->assertEquals(['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.own', 'guest_communication' => 'guest_comm.own'], $channel->fresh()->process_overrides['booking']['templates']); } /** diff --git a/tests/Feature/Process/TemplateConfiguratorTest.php b/tests/Feature/Process/TemplateConfiguratorTest.php index 8eddfb8..425e24c 100644 --- a/tests/Feature/Process/TemplateConfiguratorTest.php +++ b/tests/Feature/Process/TemplateConfiguratorTest.php @@ -87,10 +87,10 @@ public function test_an_archetype_moves_to_the_base_process_with_the_same_combin $page->call('save')->assertNotified('Ablauf gespeichert'); $this->assertSame('external.booking', $fewo->fresh()->process_overrides['booking']['model']); - $this->assertEquals(['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.own'], $fewo->fresh()->process_overrides['booking']['templates']); + $this->assertEquals(['collection' => 'collection.portal', 'contract_documents' => 'contract_docs.own', 'guest_communication' => 'guest_comm.own'], $fewo->fresh()->process_overrides['booking']['templates']); $booking = $this->takeOver($fewo->fresh(), 'FD-1'); - $this->assertEquals(['collection' => 'collection.portal@1', 'contract_documents' => 'contract_docs.own@1'], ProcessPlan::of($booking)->templates); + $this->assertEquals(['collection' => 'collection.portal@1', 'contract_documents' => 'contract_docs.own@1', 'guest_communication' => 'guest_comm.own@1'], ProcessPlan::of($booking)->templates); $this->assertSame('A4', strtoupper($booking->case_type->value)); } @@ -146,7 +146,7 @@ public function test_switching_the_collection_template_shows_every_consequence_a $this->assertSame('manual', $saved['contract_delivery'], 'parameters of the kept modules survive'); $this->assertSame(['review.request' => ['on' => false]], $saved['steps'], 'so does a switched-off optional step'); $this->assertStringContainsString('Bisher eingestellt', $ds->fresh()->settings['process_history'][0]['removed_settings'][0]); - $this->assertEquals(['collection' => 'collection.own', 'contract_documents' => 'contract_docs.own'], $saved['templates']); + $this->assertEquals(['collection' => 'collection.own', 'contract_documents' => 'contract_docs.own', 'guest_communication' => 'guest_comm.own'], $saved['templates']); } public function test_the_impact_of_a_template_change_names_modules_responsibility_and_open_ends(): void diff --git a/tests/Feature/Process/TemplateProcessTesterTest.php b/tests/Feature/Process/TemplateProcessTesterTest.php index 1f81cc4..241e853 100644 --- a/tests/Feature/Process/TemplateProcessTesterTest.php +++ b/tests/Feature/Process/TemplateProcessTesterTest.php @@ -71,10 +71,12 @@ public function test_every_combination_runs_in_the_tester_and_differs_as_its_tem $this->assertNull($report['aborted'] ?? null, json_encode($report)); $this->assertSame([], $report['violations']); $this->assertSame(['external.booking', 1], [$report['plan']['model'], $report['plan']['version']]); - $this->assertEqualsCanonicalizing([$collection.'@1', $documents.'@1'], array_column($report['plan']['templates'], 'reference'), 'the report names the templates used'); + $this->assertEqualsCanonicalizing([$collection.'@1', $documents.'@1', 'guest_comm.own@1'], array_column($report['plan']['templates'], 'reference'), 'the report names the templates used'); foreach ($report['plan']['templates'] as $template) { $this->assertNotEmpty($template['modules']); - $this->assertFalse($template['capabilities'][0]['confirmed'], 'a capability nobody confirmed is not shown as proven'); + foreach ($template['capabilities'] as $capability) { + $this->assertFalse($capability['confirmed'], 'a capability nobody confirmed is not shown as proven'); + } } [$known, , $confirmed] = $report['timeline'];