diff --git a/app/Actions/ConfigureChannelProcess.php b/app/Actions/ConfigureChannelProcess.php index b4930d5..b26c80d 100644 --- a/app/Actions/ConfigureChannelProcess.php +++ b/app/Actions/ConfigureChannelProcess.php @@ -5,40 +5,59 @@ use App\Enums\IntakeKind; use App\Enums\ProcessSetting; use App\Models\Channel; +use App\Process\ChannelCapabilities; use App\Process\ChannelProcessConfiguration; use Illuminate\Support\Facades\DB; use Illuminate\Validation\ValidationException; /** - * Saves the process of a channel for one intake kind (Kanal › Ablauf, docs/Prozessarchitektur/Architektur/03): the - * chosen model and variant, the step switches and the step settings – in channels.process_overrides[intake], next to - * the existing settings, so their inheritance stays as it is. Refuses everything the configuration does not admit - * (mandatory steps off, responsibilities the model does not allow, tester-only variants). Changes apply to new cases - * only (decision E3): running cases keep their frozen plan. + * Saves the process of a channel for one intake kind (Kanal › Ablauf, docs/Prozessarchitektur/Architektur/03 and V2.1/02): + * the confirmed capabilities of the portal, the chosen model and variant, the step switches and the step settings – in + * channels.settings and channels.process_overrides[intake], next to the existing settings, so their inheritance stays + * as it is. Refuses everything the configuration does not admit (mandatory steps off, responsibilities the model does not + * allow, a model the capabilities do not fit, tester-only variants). Stored settings that the chosen model overrides are + * removed only after the landlord confirmed that, and the change is kept in the channel's history. Changes apply to new + * cases only (decision E3): running cases keep their frozen plan. */ class ConfigureChannelProcess { - public function __construct(private ChannelProcessConfiguration $configuration) {} + public const HISTORY_LIMIT = 20; + + public function __construct(private ChannelProcessConfiguration $configuration, private ChannelCapabilities $capabilities) {} /** - * @param array{model: string, variant?: string, steps?: array, settings?: array} $draft + * @param array{model: string, variant?: string, steps?: array, settings?: array, capabilities?: array} $draft + * @param bool $acknowledgeConflicts the landlord confirmed that stored settings the model overrides are removed * * @throws ValidationException */ - public function handle(Channel $channel, IntakeKind $intake, array $draft, ?string $by = null): Channel + public function handle(Channel $channel, IntakeKind $intake, array $draft, ?string $by = null, bool $acknowledgeConflicts = false): Channel { $problems = $this->configuration->problems($channel, $intake, $draft); if ($problems !== []) { throw ValidationException::withMessages(['process' => $problems]); } - return DB::transaction(function () use ($channel, $intake, $draft, $by): Channel { + $conflicts = $this->configuration->conflicts($channel, $intake, (string) $draft['model']); + if ($conflicts !== [] && ! $acknowledgeConflicts) { + throw ValidationException::withMessages(['process' => [ + 'Bisherige Einstellungen widersprechen dem gewählten Modell und würden still überstimmt. Bitte ausdrücklich bestätigen, dass sie entfernt werden:', + ...array_column($conflicts, 'text'), + ]]); + } + + return DB::transaction(function () use ($channel, $intake, $draft, $by, $conflicts): Channel { $channel = Channel::query()->lockForUpdate()->findOrFail($channel->id); + $by ??= auth()->user()?->name; $overrides = (array) ($channel->process_overrides ?? []); $current = (array) ($overrides[$intake->value] ?? []); + $removed = array_map(fn (array $conflict): string => $conflict['setting']->value, $conflicts); $settings = []; foreach (ProcessSetting::cases() as $setting) { + if (in_array($setting->value, $removed, true)) { + continue; + } $value = array_key_exists($setting->value, (array) ($draft['settings'] ?? [])) ? $setting->normalize($draft['settings'][$setting->value]) : $setting->normalize($current[$setting->value] ?? null); if ($value !== null && in_array($intake, $setting->channelIntakes(), true)) { $settings[$setting->value] = $value; @@ -58,9 +77,22 @@ public function handle(Channel $channel, IntakeKind $intake, array $draft, ?stri 'variant' => $draft['variant'] ?? 'standard', 'steps' => $steps, 'configured_at' => now()->toIso8601String(), - 'configured_by' => $by ?? auth()->user()?->name, + 'configured_by' => $by, ]; - $channel->update(['process_overrides' => $overrides]); + + $channelSettings = (array) ($channel->settings ?? []); + $changes = []; + if (! $channel->isWebsite() && filled($draft['capabilities'] ?? null)) { + $confirmed = $this->capabilities->confirm($channel, (array) $draft['capabilities'], $by); + $channelSettings['capabilities'] = $confirmed['capabilities']; + $changes = $confirmed['changes']; + } + $channelSettings['process_history'] = array_slice([...(array) ($channelSettings['process_history'] ?? []), [ + 'at' => now()->toIso8601String(), 'by' => $by, 'intake' => $intake->value, 'model' => $draft['model'], 'variant' => $draft['variant'] ?? 'standard', + 'capabilities' => $changes, 'removed_settings' => array_map(fn (array $conflict): string => $conflict['text'], $conflicts), + ]], -self::HISTORY_LIMIT); + + $channel->update(['process_overrides' => $overrides, 'settings' => $channelSettings]); return $channel; }); diff --git a/app/Actions/ProcessPortalMail.php b/app/Actions/ProcessPortalMail.php index 333ccb0..75efde9 100644 --- a/app/Actions/ProcessPortalMail.php +++ b/app/Actions/ProcessPortalMail.php @@ -12,9 +12,11 @@ use App\Enums\TenantServiceKey; use App\Mail\PortalMailNotification; use App\Models\BlockedPeriod; +use App\Models\Booking; use App\Models\Channel; use App\Models\IntakeObservation; use App\Models\PortalEmail; +use App\Process\ProcessRunner; use App\Support\Settings; use App\Tenancy\TenantFeatures; use Carbon\CarbonInterface; @@ -79,6 +81,7 @@ public function handle(PortalMail $mail): ?PortalEmail // One intake for all channels (package 4): bookings, requests and cancellations reach their case. rescue(fn () => $this->intake($channel, $parsed, $record)); + rescue(fn () => $this->resume($channel, $parsed, $record)); if (in_array($record->status, [PortalEmailStatus::Blocked, PortalEmailStatus::Released, PortalEmailStatus::NeedsReview], true)) { rescue(fn () => Mail::to(Settings::notificationRecipients())->send(new PortalMailNotification($record))); @@ -91,6 +94,22 @@ public function handle(PortalMail $mail): ?PortalEmail return $record; } + /** + * A booking mail of the portal can be the confirmation a case waits for (V2.1, docs/Prozessarchitektur/V2.1/02 §5): the + * case is evaluated again. Only cases whose channel makes them wait are touched – everything else stays as it was. + */ + private function resume(Channel $channel, ParsedPortalMail $parsed, PortalEmail $record): void + { + if ($parsed->type !== PortalEmailType::Booking) { + return; + } + $case = $record->blocked_period_id !== null ? Booking::query()->find(BlockedPeriod::withTrashed()->whereKey($record->blocked_period_id)->value('linked_booking_id')) : null; + $case ??= $parsed->reference !== null ? app(PortalIntake::class)->caseByReference($channel, $parsed->reference) : null; + if ($case !== null && $case->isBinding() && $case->process()->awaitsPortalConfirmation()) { + app(ProcessRunner::class)->advance($case, 'portal.mail'); + } + } + private function intake(Channel $channel, ParsedPortalMail $parsed, PortalEmail $record): void { $intake = app(PortalIntake::class); diff --git a/app/Actions/SendBookingDocuments.php b/app/Actions/SendBookingDocuments.php index fc28933..32a881e 100644 --- a/app/Actions/SendBookingDocuments.php +++ b/app/Actions/SendBookingDocuments.php @@ -49,6 +49,41 @@ public function automatically(Booking $booking): array return $this->send($booking, $composition, acknowledged: false, automatic: true) ? [] : ['Die Unterlagen konnten nicht versendet werden (siehe Postfach).']; } + /** + * Creates the contract document and files it internally – without sending anything to the guest (delivery „internal“, + * docs/Prozessarchitektur/V2.1/02 §4). Same gate as the automatic dispatch: the composition must be clean. + * + * @return list reasons why it was not created (empty: filed or already there) + */ + public function storeInternally(Booking $booking): array + { + if ($booking->contract_path !== null) { + return []; + } + + $composition = $this->compose($booking); + if (! $composition->canSendAutomatically()) { + return [...$composition->blockers(), ...array_map(fn (string $point): string => 'Bitte prüfen: '.$point, $composition->toConfirm())]; + } + + $lock = Cache::lock('booking-documents-'.$booking->id, 120); + if (! $lock->get()) { + return ['Die Unterlagen werden gerade bearbeitet.']; + } + + try { + $booking->refresh(); + if (! $composition->termsFrozen && $composition->terms !== null) { + $booking->update(['offer_terms' => $composition->terms]); + } + + return CaseLog::context(fn (): bool => $this->confirm->deliver($booking, notifyGuest: false, kind: $composition->kind), actor: CaseLog::SYSTEM.' (automatisch)') + ? [] : ['Das Vertragsdokument konnte nicht erstellt werden (siehe Postfach).']; + } finally { + $lock->release(); + } + } + /** * Sending by hand after the landlord saw the composition. * diff --git a/app/Actions/SendBookingNotice.php b/app/Actions/SendBookingNotice.php new file mode 100644 index 0000000..1a6b1f8 --- /dev/null +++ b/app/Actions/SendBookingNotice.php @@ -0,0 +1,74 @@ +events()->where('type', self::EVENT)->where('summary', 'not like', 'Keine eigene%')->exists(); + } + + /** + * Why no own notice is needed, or null when it is. + */ + public static function suppression(Booking $booking): ?string + { + if ($booking->process()->bookingNotice() !== BookingNoticeMode::AutomaticUnlessPortalConfirmed) { + return null; + } + $channel = $booking->processChannel(); + if ($channel === null || app(ChannelCapabilities::class)->value($channel, ChannelCapabilities::MESSAGES_GUEST) !== true) { + return null; + } + $evidence = PortalConfirmation::evidence($booking); + + return $evidence === null ? null : 'Das Portal informiert den Gast selbst und hat die Buchung bestätigt ('.$evidence['label'].').'; + } + + /** + * @throws ReservationException + */ + public function handle(Booking $booking, bool $automatic = false): bool + { + $booking->loadMissing(['guest', 'property']); + if (! $booking->isBinding()) { + throw ReservationException::invalidTransition($booking->status->getLabel(), 'mit einer Buchungsinformation bedacht'); + } + if (self::sent($booking)) { + return true; + } + if (blank($booking->guest?->email)) { + throw new ReservationException('Vor dem Versand bitte die E-Mail-Adresse des Gastes ergänzen.'); + } + if ($automatic && ($reason = self::suppression($booking)) !== null) { + if (! $booking->events()->where('type', self::EVENT)->exists()) { + CaseLog::record($booking, self::EVENT, 'Keine eigene Buchungsinformation nötig', reason: $reason, data: ['level' => 'stated_by_portal']); + } + + return false; + } + + Mail::to($booking->guest->email, $booking->guest->full_name)->send(new BookingNotice($booking)); + CaseLog::record($booking, self::EVENT, 'Buchungsinformation an den Gast gesendet', actor: $automatic ? CaseLog::SYSTEM.' (automatisch)' : null); + + return true; + } +} diff --git a/app/Console/Commands/AdvanceWaitingCases.php b/app/Console/Commands/AdvanceWaitingCases.php new file mode 100644 index 0000000..63232ab --- /dev/null +++ b/app/Console/Commands/AdvanceWaitingCases.php @@ -0,0 +1,47 @@ +each(function (Tenant $tenant) use ($runner): void { + $evaluated = 0; + Booking::query()->occupying()->where('intake', 'booking')->where('created_at', '>', now()->subDays(90)) + ->with(['property', 'guest', 'importChannel', 'originChannel']) + ->each(function (Booking $booking) use ($runner, &$evaluated): void { + if (! $booking->process()->awaitsPortalConfirmation()) { + return; + } + try { + $runner->advance($booking, 'schedule:waiting'); + $evaluated++; + } catch (Throwable $exception) { + report($exception); + } + }); + + $this->info("{$tenant->name}: {$evaluated} wartende Vorgang/Vorgänge bewertet."); + }); + + return self::SUCCESS; + } +} diff --git a/app/Enums/BookingNoticeMode.php b/app/Enums/BookingNoticeMode.php new file mode 100644 index 0000000..9d87216 --- /dev/null +++ b/app/Enums/BookingNoticeMode.php @@ -0,0 +1,32 @@ + 'keine eigene Buchungsinformation', + self::Automatic => 'automatisch senden', + self::AutomaticUnlessPortalConfirmed => 'automatisch senden – außer das Portal hat nachweislich bestätigt', + self::Manual => 'von Hand senden', + }; + } + + public function isAutomatic(): bool + { + return in_array($this, [self::Automatic, self::AutomaticUnlessPortalConfirmed], true); + } +} diff --git a/app/Enums/BookingTaskKind.php b/app/Enums/BookingTaskKind.php index 5009c08..18cbbb5 100644 --- a/app/Enums/BookingTaskKind.php +++ b/app/Enums/BookingTaskKind.php @@ -23,6 +23,7 @@ enum BookingTaskKind: string implements HasLabel case PortalCancellation = 'portal_cancellation'; case PortalCancellationReported = 'portal_cancel_reported'; case PortalChangeReported = 'portal_change_reported'; + case PortalConfirmationMissing = 'portal_confirmation_missing'; case RefundCheck = 'refund_check'; case BookingWish = 'booking_wish'; case ArrivalDetails = 'arrival_details'; @@ -47,6 +48,7 @@ public function getLabel(): string self::PortalCancellation => 'Stornierung im Portal veranlassen bzw. prüfen', self::PortalCancellationReported => 'Das Portal meldet eine Stornierung – bitte prüfen', self::PortalChangeReported => 'Das Portal meldet eine Änderung – bitte prüfen', + self::PortalConfirmationMissing => 'Bestätigungsmail des Portals fehlt – bitte beim Portal prüfen', self::RefundCheck => 'Erstattung an den Gast prüfen', self::BookingWish => 'Buchungswunsch bestätigen?', self::ArrivalDetails => 'Anreisedaten beim Gast erfragen', diff --git a/app/Enums/ContractDelivery.php b/app/Enums/ContractDelivery.php new file mode 100644 index 0000000..646d953 --- /dev/null +++ b/app/Enums/ContractDelivery.php @@ -0,0 +1,38 @@ + 'wie die übrige Bearbeitung', + self::Automatic => 'automatisch erstellen und an den Gast senden', + self::Manual => 'von Hand prüfen und senden', + self::Internal => 'erstellen und nur intern ablegen (nicht senden)', + }; + } + + /** The mode as the document step sees it: automatic when the case is processed automatically or the delivery says so. */ + public function sendsAutomatically(ProcessingMode $processing): bool + { + return match ($this) { + self::Follow => $processing === ProcessingMode::Automatic, + self::Automatic => true, + self::Manual, self::Internal => false, + }; + } +} diff --git a/app/Enums/Execution.php b/app/Enums/Execution.php new file mode 100644 index 0000000..e646660 --- /dev/null +++ b/app/Enums/Execution.php @@ -0,0 +1,34 @@ + 'automatisch durch FewoPortal', + self::Approval => 'vorbereitet, nach Ihrer Freigabe', + self::Manual => 'von Ihnen von Hand', + self::Portal => 'durch das Portal', + self::ServiceProvider => 'durch einen Dienstleister', + self::External => 'bereits extern erledigt (mit Nachweis)', + self::NotRequired => 'nicht erforderlich', + }; + } +} diff --git a/app/Enums/ProcessSetting.php b/app/Enums/ProcessSetting.php index 3ea70c5..50bf87b 100644 --- a/app/Enums/ProcessSetting.php +++ b/app/Enums/ProcessSetting.php @@ -25,6 +25,10 @@ enum ProcessSetting: string case DataRequestReminderHours = 'data_request_reminder_hours'; case GuestLinkValidDays = 'guest_link_valid_days'; case FormRequiresAddress = 'form_requires_address'; + case ContractDelivery = 'contract_delivery'; + case BookingNotice = 'booking_notice'; + case AwaitPortalConfirmation = 'await_portal_confirmation'; + case PortalConfirmationWaitHours = 'portal_confirmation_wait_hours'; /** * Built-in default (the behaviour before any landlord setting existed). @@ -46,6 +50,10 @@ public function default(): string|int|bool|null self::DataRequestReminderHours => 24, self::GuestLinkValidDays => 14, self::FormRequiresAddress => false, + self::ContractDelivery => ContractDelivery::Follow->value, + self::BookingNotice => BookingNoticeMode::Off->value, + self::AwaitPortalConfirmation => false, + self::PortalConfirmationWaitHours => 48, }; } @@ -71,6 +79,10 @@ public function question(): string self::DataRequestReminderHours => 'Nach wie vielen Stunden ohne Antwort wird erinnert?', self::GuestLinkValidDays => 'Wie lange gilt der Link, über den der Gast Angaben ergänzt?', self::FormRequiresAddress => 'Muss die vollständige Anschrift schon im Anfrageformular der Webseite angegeben werden?', + self::ContractDelivery => 'Was geschieht mit dem Vertragsdokument einer verbindlichen Buchung?', + 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?', }; } @@ -84,7 +96,7 @@ public function channelIntakes(): array return match ($this) { self::Processing, self::Payments, self::GuestMessages, self::ContractTemplate => [IntakeKind::Inquiry, IntakeKind::Booking], self::PreReservation, self::HoldHours => [IntakeKind::Inquiry], - self::Documents => [IntakeKind::Booking], + self::Documents, self::ContractDelivery, self::BookingNotice, self::AwaitPortalConfirmation, self::PortalConfirmationWaitHours => [IntakeKind::Booking], self::ArrivalInfoDaysBefore, self::GuestLinkValidDays => [], self::ClarificationHoldAutoMinutes, self::ClarificationHoldManualMinutes, self::FormRequiresAddress => [IntakeKind::Inquiry], self::DataRequest, self::DataRequestRemindersMax, self::DataRequestFollowupsMax, self::DataRequestReminderHours => [IntakeKind::Inquiry, IntakeKind::Booking], @@ -111,12 +123,14 @@ 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::PreReservation, self::FormRequiresAddress => is_bool($value) ? $value : filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE), + 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, + self::ContractDelivery => ($value instanceof ContractDelivery ? $value : ContractDelivery::tryFrom((string) $value))?->value, + self::BookingNotice => ($value instanceof BookingNoticeMode ? $value : BookingNoticeMode::tryFrom((string) $value))?->value, // 0 is a value of its own: no clarification hold, no reminder, no follow-up question. self::ClarificationHoldAutoMinutes, self::ClarificationHoldManualMinutes, self::DataRequestRemindersMax, self::DataRequestFollowupsMax => is_numeric($value) ? max(0, (int) $value) : null, - self::DataRequestReminderHours, self::GuestLinkValidDays => is_numeric($value) ? max(1, (int) $value) : null, + self::DataRequestReminderHours, self::GuestLinkValidDays, self::PortalConfirmationWaitHours => is_numeric($value) ? max(1, (int) $value) : null, }; } @@ -139,6 +153,10 @@ public function describe(string|int|bool|null $value): string self::DataRequestReminderHours => 'nach '.$value.' Stunden', self::GuestLinkValidDays => $value.' Tage', self::FormRequiresAddress => $value ? 'ja, Pflichtangabe' : 'nein, kann nachgefragt werden', + self::ContractDelivery => ContractDelivery::tryFrom((string) $value)?->getLabel() ?? '–', + self::BookingNotice => BookingNoticeMode::tryFrom((string) $value)?->getLabel() ?? '–', + self::AwaitPortalConfirmation => $value ? 'ja, erst nach der Bestätigungsmail' : 'nein', + self::PortalConfirmationWaitHours => $value.' Stunden', }; } } diff --git a/app/Filament/Forms/ProcessSettingFields.php b/app/Filament/Forms/ProcessSettingFields.php index f4cc957..1403be4 100644 --- a/app/Filament/Forms/ProcessSettingFields.php +++ b/app/Filament/Forms/ProcessSettingFields.php @@ -2,6 +2,8 @@ namespace App\Filament\Forms; +use App\Enums\BookingNoticeMode; +use App\Enums\ContractDelivery; use App\Enums\DataRequestMode; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; @@ -49,6 +51,13 @@ public static function field(string $name, ProcessSetting $setting, string $inhe ProcessSetting::DataRequestRemindersMax, ProcessSetting::DataRequestFollowupsMax => TextInput::make($name)->integer()->minValue(0)->maxValue(5)->placeholder($placeholder), ProcessSetting::DataRequestReminderHours => TextInput::make($name)->integer()->minValue(1)->maxValue(336)->suffix('Stunden')->placeholder($placeholder), ProcessSetting::GuestLinkValidDays => TextInput::make($name)->integer()->minValue(1)->maxValue(60)->suffix('Tage')->placeholder($placeholder), + ProcessSetting::ContractDelivery => Select::make($name)->options(ContractDelivery::class)->placeholder($placeholder) + ->helperText('Erstellen und Ablegen sind vom Versand getrennt. Ein nur intern abgelegter Vertrag gilt nicht als gesendet. Gilt für extern verbindliche Buchungen, bei denen wir die Vertragsunterlagen übernehmen.'), + ProcessSetting::BookingNotice => Select::make($name)->options(BookingNoticeMode::class)->placeholder($placeholder) + ->helperText('Eine kurze Information über die Buchung – unabhängig vom Vertrag. Das Portal bleibt für seine eigenen Nachrichten zuständig.'), + ProcessSetting::AwaitPortalConfirmation => Select::make($name)->options(['1' => 'Ja – Unterlagen und Nachrichten warten auf die Bestätigungsmail des Portals', '0' => 'Nein – sofort bearbeiten'])->placeholder($placeholder) + ->helperText('Die Belegung ist von Anfang an gesichert; es wartet nur, was Sie hier einstellen. Bleibt die Mail aus, erhalten Sie eine Aufgabe.'), + ProcessSetting::PortalConfirmationWaitHours => TextInput::make($name)->integer()->minValue(1)->maxValue(720)->suffix('Stunden')->placeholder($placeholder), ProcessSetting::FormRequiresAddress => Select::make($name)->options(['1' => 'Ja – ohne vollständige Anschrift kann nicht angefragt werden', '0' => 'Nein – fehlt sie, wird beim Gast nachgefragt'])->placeholder($placeholder), })->label($setting->question()); } diff --git a/app/Filament/Resources/Bookings/Pages/ViewBooking.php b/app/Filament/Resources/Bookings/Pages/ViewBooking.php index 6a51020..be0748b 100644 --- a/app/Filament/Resources/Bookings/Pages/ViewBooking.php +++ b/app/Filament/Resources/Bookings/Pages/ViewBooking.php @@ -11,6 +11,7 @@ use App\Actions\RecordPortalAmounts; use App\Actions\RequestCaseData; use App\Actions\SendBookingDocuments; +use App\Actions\SendBookingNotice; use App\Actions\SendOffer; use App\Actions\SetBookingStatus; use App\Documents\OfferTerms; @@ -18,6 +19,7 @@ use App\Enums\ActivityState; use App\Enums\AdminMode; use App\Enums\AmountKind; +use App\Enums\BookingNoticeMode; use App\Enums\BookingStatus; use App\Enums\BookingTaskKind; use App\Enums\BookingTaskStatus; @@ -50,6 +52,8 @@ use App\Process\CaseAutomation; use App\Process\CaseLog; use App\Process\CaseRequirements; +use App\Process\PortalConfirmation; +use App\Process\ProcessRunner; use App\Support\Countries; use App\Support\Money; use Carbon\CarbonImmutable; @@ -141,6 +145,8 @@ protected function getHeaderActions(): array $this->confirmAction(), $this->sendDocumentsAction(), $this->resendConfirmationAction(), + $this->confirmPortalAction(), + $this->sendBookingNoticeAction(), $this->portalPriceAction(), $this->changeAction(), $this->confirmPortalCancellationAction(), @@ -492,6 +498,50 @@ private function confirmAction(): Action }); } + /** + * V2.1: the landlord states that the portal confirmed the booking (e.g. seen in the portal's own interface). The steps that + * wait for it go on; the booking itself was binding from the start. + */ + private function confirmPortalAction(): Action + { + return Action::make('confirmPortal') + ->label('Bestätigung des Portals festhalten') + ->icon(Heroicon::OutlinedCheckBadge) + ->visible(fn (): bool => $this->record->isBinding() && $this->record->process()->awaitsPortalConfirmation() && PortalConfirmation::evidence($this->record) === null) + ->modalDescription('Das Portal hat die Buchung bestätigt (z. B. in seiner Oberfläche gesehen). Unterlagen und Nachrichten, die darauf warten, gehen dann weiter. Die Buchung bleibt wie sie ist.') + ->schema([Textarea::make('note')->label('Woran haben Sie das gesehen?')->rows(2)->maxLength(500)]) + ->action(function (array $data): void { + PortalConfirmation::confirm($this->record, CaseLog::actor(), $data['note'] ?? null); + app(ProcessRunner::class)->advance($this->record->fresh(), 'portal.mail'); + $this->record->refresh(); + Notification::make()->title('Bestätigung festgehalten')->success()->send(); + }); + } + + /** + * V2.1: the short booking information to the guest, sent by hand (also where the automatic dispatch is off). + */ + private function sendBookingNoticeAction(): Action + { + return Action::make('sendBookingNotice') + ->label('Buchungsinformation an den Gast senden') + ->icon(Heroicon::OutlinedEnvelope) + ->visible(fn (): bool => $this->record->isBinding() && $this->record->process()->bookingNotice() !== BookingNoticeMode::Off && ! SendBookingNotice::sent($this->record) && filled($this->record->guest?->email)) + ->requiresConfirmation() + ->modalDescription('Der Gast erhält eine kurze Information über seine Buchung – ohne Vertrag.') + ->action(function (SendBookingNotice $notice): void { + try { + $notice->handle($this->record->fresh()); + } catch (ReservationException $exception) { + Notification::make()->title('Nicht gesendet')->body($exception->getMessage())->danger()->send(); + + return; + } + $this->record->refresh(); + Notification::make()->title('Buchungsinformation gesendet')->success()->send(); + }); + } + private function resendConfirmationAction(): Action { return Action::make('resendConfirmation') diff --git a/app/Filament/Resources/Channels/Pages/ChannelProcess.php b/app/Filament/Resources/Channels/Pages/ChannelProcess.php index 1b8f209..31b99e9 100644 --- a/app/Filament/Resources/Channels/Pages/ChannelProcess.php +++ b/app/Filament/Resources/Channels/Pages/ChannelProcess.php @@ -10,11 +10,14 @@ use App\Models\Booking; use App\Models\Channel; use App\Models\User; +use App\Process\Capability; +use App\Process\ChannelCapabilities; use App\Process\ChannelProcessConfiguration; use App\Process\Models\ProcessModel; use App\Process\ProcessCatalogue; use App\Process\ProcessProfile; use App\Process\ProcessSettings; +use App\Process\Restriction; use Filament\Actions\Action; use Filament\Notifications\Notification; use Filament\Resources\Pages\Concerns\InteractsWithRecord; @@ -44,6 +47,12 @@ class ChannelProcess extends Page /** @var array, settings: array}> */ public array $drafts = []; + /** @var array capability key => '1' | '0' | '' (unknown); saving confirms what is shown */ + public array $capabilityDraft = []; + + /** The landlord confirmed that stored settings the chosen model overrides are removed. */ + public bool $acknowledge = false; + public function mount(int|string $record): void { $this->record = $this->resolveRecord($record); @@ -51,8 +60,9 @@ public function mount(int|string $record): void foreach ($configuration->intakes($this->record) as $intake) { $current = $configuration->current($this->record, $intake); $stored = (array) (($this->record->process_overrides ?? [])[$intake->value] ?? []); - $models = $configuration->admissibleModels($this->record, $intake); - $model = array_key_exists($current['model'], $models) || $models === [] ? $current['model'] : (string) array_key_first($models); + // The current (saved or derived) model stays selected even if it is not admissible: the page explains why instead of + // switching silently to another one. + $model = $current['model']; $this->drafts[$intake->value] = [ 'model' => $model, 'variant' => $current['variant'], @@ -62,6 +72,26 @@ public function mount(int|string $record): void ]; } $this->intake = (string) array_key_first($this->drafts); + $this->capabilityDraft = $this->record->isWebsite() ? [] : collect(app(ChannelCapabilities::class)->resolve($this->record)) + ->map(fn (Capability $capability): string => $capability->value === null ? '' : ($capability->value ? '1' : '0'))->all(); + } + + /** + * The draft of the current intake kind including the capabilities shown (they decide which models fit). + * + * @return array + */ + private function draft(): array + { + return [...$this->drafts[$this->intake], 'capabilities' => $this->capabilityDraft]; + } + + /** + * @return array + */ + public function capabilities(): array + { + return app(ChannelCapabilities::class)->resolve($this->record, $this->capabilityDraft); } public function getTitle(): string @@ -92,15 +122,31 @@ public function question(): string } /** - * @return array + * Every model of this intake kind with whether the channel fits it and why not. + * + * @return array, hints: list}> */ public function models(): array { - return app(ChannelProcessConfiguration::class)->admissibleModels($this->record, IntakeKind::from($this->intake)); + return app(ChannelProcessConfiguration::class)->modelOptions($this->record, IntakeKind::from($this->intake), $this->capabilityDraft); + } + + /** + * Stored settings the chosen model would silently override. + * + * @return list + */ + public function conflicts(): array + { + return app(ChannelProcessConfiguration::class)->conflicts($this->record, IntakeKind::from($this->intake), $this->drafts[$this->intake]['model']); } public function chooseModel(string $model): void { + if (! ($this->models()[$model]['admissible'] ?? false)) { + return; + } + $this->acknowledge = false; $this->drafts[$this->intake]['model'] = $model; $this->drafts[$this->intake]['variant'] = 'standard'; $this->drafts[$this->intake]['steps'] = []; @@ -113,7 +159,7 @@ public function model(): ProcessModel public function profile(): ProcessProfile { - return app(ChannelProcessConfiguration::class)->profileWith($this->record, IntakeKind::from($this->intake), $this->drafts[$this->intake]); + return app(ChannelProcessConfiguration::class)->profileWith($this->record, IntakeKind::from($this->intake), $this->draft()); } /** @@ -145,7 +191,7 @@ public function steps(): array 'performer_options' => $configuration->performerOptions($model, $row['module']), 'parameters' => array_map(fn (ProcessSetting $setting): array => $this->setting($setting, $profile), $parameters), ]; - }, $configuration->preview($this->record, IntakeKind::from($this->intake), $draft)); + }, $configuration->preview($this->record, IntakeKind::from($this->intake), $this->draft())); } /** @@ -182,7 +228,7 @@ public function toggleStep(string $module): void */ public function problems(): array { - return app(ChannelProcessConfiguration::class)->problems($this->record, IntakeKind::from($this->intake), $this->drafts[$this->intake]); + return app(ChannelProcessConfiguration::class)->problems($this->record, IntakeKind::from($this->intake), $this->draft()); } /** @@ -200,13 +246,17 @@ public function runningCases(): int public function save(): void { try { - $this->record = app(ConfigureChannelProcess::class)->handle($this->record, IntakeKind::from($this->intake), $this->drafts[$this->intake]); + $this->record = app(ConfigureChannelProcess::class)->handle($this->record, IntakeKind::from($this->intake), $this->draft(), acknowledgeConflicts: $this->acknowledge); } catch (ValidationException $exception) { Notification::make()->title('Nicht gespeichert')->body(collect($exception->errors())->flatten()->implode(' '))->danger()->persistent()->send(); return; } $this->drafts[$this->intake]['derived'] = false; + $this->acknowledge = false; + $intake = $this->intake; + $this->mount($this->record->getKey()); + $this->intake = $intake; $running = $this->runningCases(); Notification::make()->title('Ablauf gespeichert')->body('Gilt für neue Vorgänge.'.($running > 0 ? ' '.$running.' laufende Vorgänge behalten ihren bisherigen Ablauf.' : ''))->success()->send(); } @@ -216,7 +266,7 @@ public function save(): void */ public function test(): void { - session()->put('process-tester.draft.'.$this->record->id.'.'.$this->intake, $this->drafts[$this->intake]); + session()->put('process-tester.draft.'.$this->record->id.'.'.$this->intake, $this->draft()); $this->redirect(ChannelResource::getUrl('test', ['record' => $this->record, 'intake' => $this->intake])); } diff --git a/app/Mail/BookingNotice.php b/app/Mail/BookingNotice.php new file mode 100644 index 0000000..f211c3d --- /dev/null +++ b/app/Mail/BookingNotice.php @@ -0,0 +1,36 @@ +booking->portal_reference ?? $this->booking->reference), + replyTo: [new Address(config('fewo.owner.email'), config('fewo.owner.name'))], + ); + } + + public function content(): Content + { + return new Content(markdown: 'mail.booking-notice'); + } +} diff --git a/app/Process/ActivityDetails.php b/app/Process/ActivityDetails.php index d237c48..31e9358 100644 --- a/app/Process/ActivityDetails.php +++ b/app/Process/ActivityDetails.php @@ -28,6 +28,8 @@ final class ActivityDetails 'binding' => ['status', 'portal_signal'], 'price' => ['price', 'amount'], 'documents' => ['document', 'mail'], + 'booking_notice' => ['booking_notice', 'mail'], + 'portal_confirmation' => ['portal_confirmation', 'evidence', 'task', 'mail'], 'arrival_info' => ['document', 'mail'], 'review' => ['mail'], 'payment' => ['payment', 'amount'], diff --git a/app/Process/Capability.php b/app/Process/Capability.php new file mode 100644 index 0000000..8d68dcd --- /dev/null +++ b/app/Process/Capability.php @@ -0,0 +1,41 @@ +value !== null; + } + + public function sourceLabel(): string + { + return match ($this->source) { + self::CONFIRMED => 'bestätigt'.($this->confirmedBy ? ' von '.$this->confirmedBy : '').($this->confirmedAt ? ' am '.substr($this->confirmedAt, 8, 2).'.'.substr($this->confirmedAt, 5, 2).'.'.substr($this->confirmedAt, 0, 4) : ''), + self::DERIVED => 'abgeleitet aus Ihrer bisherigen Einstellung'.($this->note ? ' („'.$this->note.'“)' : '').' – bitte bestätigen oder korrigieren', + self::SUGGESTED => 'Vorschlag des Kanalprofils – bitte bestätigen', + default => 'noch nicht bekannt – bitte bestätigen', + }; + } +} diff --git a/app/Process/ChannelCapabilities.php b/app/Process/ChannelCapabilities.php new file mode 100644 index 0000000..c61a322 --- /dev/null +++ b/app/Process/ChannelCapabilities.php @@ -0,0 +1,118 @@ + [setting, value that means yes, value that means no]. */ + private const LEGACY = [ + self::COLLECTS_PAYMENT => ['payments', 'portal', 'landlord'], + self::PROVIDES_CONTRACT_DOCUMENTS => ['documents', 'portal', 'landlord'], + self::MESSAGES_GUEST => ['guest_messages', 'portal', 'landlord'], + ]; + + /** + * @return array + */ + public static function definitions(): array + { + return [ + self::COLLECTS_PAYMENT => ['label' => 'Inkasso', 'question' => 'Zieht das Portal das Geld des Gastes ein?'], + self::PROVIDES_CONTRACT_DOCUMENTS => ['label' => 'Vertragsunterlagen', 'question' => 'Stellt das Portal dem Gast die verbindlichen Vertragsunterlagen bereit?'], + self::MESSAGES_GUEST => ['label' => 'Gastkommunikation', 'question' => 'Schreibt das Portal den Gast an (Anreise-Information, Erinnerungen)?'], + self::SENDS_CONFIRMATION_MAIL => ['label' => 'Bestätigungsmail', 'question' => 'Schickt das Portal Ihnen eine Buchungsbestätigung per E-Mail?'], + ]; + } + + /** + * The capabilities of a channel; a draft (key => bool|null) overrides what is stored, to show what a change would do. + * + * @param array|null $draft + * @return array + */ + public function resolve(Channel $channel, ?array $draft = null): array + { + $stored = (array) (($channel->settings ?? [])['capabilities'] ?? []); + $legacy = (array) (($channel->process_overrides ?? [])['booking'] ?? []); + $suggested = (array) (config('channels.portal_profiles.'.app(ChannelProcessConfiguration::class)->profileKey($channel).'.capabilities') ?? []); + $result = []; + + foreach (array_keys(self::definitions()) as $key) { + if ($draft !== null && array_key_exists($key, $draft) && $draft[$key] !== null && $draft[$key] !== '') { + // A value the landlord only left as shown keeps its origin; a changed one is a pending confirmation. + $value = filter_var($draft[$key], FILTER_VALIDATE_BOOLEAN); + $base = $this->resolve($channel)[$key]; + if ($base->value !== $value) { + $result[$key] = new Capability($key, $value, Capability::CONFIRMED, null, now()->toIso8601String(), auth()->user()?->name); + + continue; + } + } + if (isset($stored[$key]['value'])) { + $result[$key] = new Capability($key, (bool) $stored[$key]['value'], Capability::CONFIRMED, null, $stored[$key]['at'] ?? null, $stored[$key]['by'] ?? null); + + continue; + } + if (isset(self::LEGACY[$key]) && filled($legacy[self::LEGACY[$key][0]] ?? null)) { + [$setting, $yes, $no] = self::LEGACY[$key]; + $value = (string) $legacy[$setting]; + if (in_array($value, [$yes, $no], true)) { + $result[$key] = new Capability($key, $value === $yes, Capability::DERIVED, $value === $yes ? 'Portal' : 'wir'); + + continue; + } + } + $result[$key] = array_key_exists($key, $suggested) && $suggested[$key] !== null + ? new Capability($key, (bool) $suggested[$key], Capability::SUGGESTED) + : new Capability($key, null, Capability::UNKNOWN); + } + + return $result; + } + + public function value(Channel $channel, string $key): ?bool + { + return $this->resolve($channel)[$key]->value; + } + + /** + * What is stored to confirm the capabilities of a draft, and the readable list of what changed. + * + * @param array $draft + * @return array{capabilities: array, changes: list} + */ + public function confirm(Channel $channel, array $draft, ?string $by): array + { + $stored = (array) (($channel->settings ?? [])['capabilities'] ?? []); + $changes = []; + foreach (self::definitions() as $key => $definition) { + if (! array_key_exists($key, $draft) || $draft[$key] === null || $draft[$key] === '') { + continue; + } + $value = filter_var($draft[$key], FILTER_VALIDATE_BOOLEAN); + if (isset($stored[$key]['value']) && (bool) $stored[$key]['value'] === $value) { + continue; + } + $changes[] = $definition['label'].': '.(isset($stored[$key]['value']) ? ($stored[$key]['value'] ? 'ja' : 'nein').' → ' : '').($value ? 'ja' : 'nein'); + $stored[$key] = ['value' => $value, 'at' => now()->toIso8601String(), 'by' => $by]; + } + + return ['capabilities' => $stored, 'changes' => $changes]; + } +} diff --git a/app/Process/ChannelProcessConfiguration.php b/app/Process/ChannelProcessConfiguration.php index 89b8f45..b2b0e54 100644 --- a/app/Process/ChannelProcessConfiguration.php +++ b/app/Process/ChannelProcessConfiguration.php @@ -79,15 +79,82 @@ public function profileKey(Channel $channel): string } /** - * The models the landlord may choose for this channel and intake kind. + * Every model of the intake kind with whether this channel fits it and – if not – why and what to do (decision + * E2/O2 and V2.1 §3.2: the capabilities of the channel decide, not a fixed list of portals). * + * @param array|null $capabilityDraft unsaved capability values of the configurator + * @return array, hints: list}> + */ + public function modelOptions(Channel $channel, IntakeKind $intake, ?array $capabilityDraft = null): array + { + $capabilities = app(ChannelCapabilities::class)->resolve($channel, $capabilityDraft); + $options = []; + foreach ($this->catalogue->admissible($intake) as $key => $model) { + if ($channel->isWebsite() !== str_starts_with($key, 'a1.')) { + continue; + } + $restrictions = []; + $hints = []; + foreach ($model::capabilityRequirements() as $capability => $required) { + $actual = $capabilities[$capability] ?? null; + $definition = ChannelCapabilities::definitions()[$capability]; + if ($actual === null || ! $actual->isKnown()) { + $hints[] = $definition['label'].' ist noch nicht bekannt – bitte bestätigen.'; + + continue; + } + if ($actual->value !== $required) { + $fits = collect($this->catalogue->admissible($intake))->first(fn (ProcessModel $other): bool => $other::key() !== $key && collect($other::capabilityRequirements())->every(fn (bool $value, string $name): bool => ($capabilities[$name] ?? null)?->value === $value)); + $restrictions[] = new Restriction( + Restriction::CAPABILITY, + $model::label().' setzt voraus: „'.$definition['question'].'“ – '.($required ? 'ja' : 'nein').'. Für diesen Kanal gilt aber '.($actual->value ? 'ja' : 'nein').' ('.$actual->sourceLabel().').', + $fits ? $fits::label() : null, + 'Wenn das nicht stimmt: oben bei „Was kann dieses Portal?“ „'.$definition['label'].'“ auf '.($required ? 'ja' : 'nein').' stellen und bestätigen.', + ); + } + } + $options[$key] = ['model' => $model, 'admissible' => $restrictions === [], 'restrictions' => $restrictions, 'hints' => $hints]; + } + + return $options; + } + + /** + * The models the landlord may choose now. + * + * @param array|null $capabilityDraft * @return array */ - public function admissibleModels(Channel $channel, IntakeKind $intake): array + public function admissibleModels(Channel $channel, IntakeKind $intake, ?array $capabilityDraft = null): array { - $allowed = (array) (config('channels.portal_profiles.'.$this->profileKey($channel))[$intake->value] ?? []); + return array_map(fn (array $option): ProcessModel => $option['model'], array_filter($this->modelOptions($channel, $intake, $capabilityDraft), fn (array $option): bool => $option['admissible'])); + } - return array_filter($this->catalogue->admissible($intake), fn (ProcessModel $model): bool => in_array($model::key(), $allowed, true)); + /** + * Stored settings of the channel that the chosen model fixes differently: saving the model would silently override + * them (they would stay stored but not take effect). They are listed so that the landlord confirms their removal. + * + * @return list + */ + public function conflicts(Channel $channel, IntakeKind $intake, string $modelKey): array + { + if (! $this->catalogue->hasModel($modelKey)) { + return []; + } + $stored = (array) (($channel->process_overrides ?? [])[$intake->value] ?? []); + $conflicts = []; + foreach ($this->catalogue->model($modelKey)::fixes() as $key => $fixed) { + $setting = ProcessSetting::tryFrom($key); + $value = $setting?->normalize($stored[$key] ?? null); + $fixedValue = $setting?->normalize($fixed) ?? $fixed; + if ($setting === null || $value === null || (string) $value === (string) $fixedValue) { + continue; + } + $conflicts[] = ['setting' => $setting, 'stored' => $setting->describe($value), 'fixed' => $setting->describe($fixedValue), + 'text' => $setting->question().' Bisher eingestellt: „'.$setting->describe($value).'“. Das Modell „'.$modelKey.'“ legt fest: „'.$setting->describe($fixedValue).'“.']; + } + + return $conflicts; } /** @@ -195,11 +262,14 @@ public function problems(Channel $channel, IntakeKind $intake, array $draft, boo $problems[] = 'Dieser Kanal liefert keine '.($intake === IntakeKind::Booking ? 'festen Buchungen' : 'Anfragen').'.'; } $key = (string) ($draft['model'] ?? ''); - $models = $this->admissibleModels($channel, $intake); - if ($key === '' || ! array_key_exists($key, $models)) { - return [...$problems, 'Das Ablaufmodell „'.$key.'“ ist für diesen Kanal nicht zulässig. Zulässig: '.(implode(', ', array_map(fn (ProcessModel $model): string => $model::label(), $models)) ?: 'keines').'.']; + $options = $this->modelOptions($channel, $intake, (array) ($draft['capabilities'] ?? []) ?: null); + if ($key === '' || ! array_key_exists($key, $options)) { + return [...$problems, 'Das Ablaufmodell „'.$key.'“ gibt es für diese Eingangsart dieses Kanals nicht.']; } - $model = $models[$key]; + if (! $options[$key]['admissible']) { + return [...$problems, ...array_map(fn (Restriction $restriction): string => $restriction->text(), $options[$key]['restrictions'])]; + } + $model = $options[$key]['model']; $variant = $model->variant((string) ($draft['variant'] ?? 'standard')); if ($variant === null) { return [...$problems, 'Das Modell hat diese Variante nicht.']; diff --git a/app/Process/Models/A3PortalBookingModel.php b/app/Process/Models/A3PortalBookingModel.php index d988301..aeddf8a 100644 --- a/app/Process/Models/A3PortalBookingModel.php +++ b/app/Process/Models/A3PortalBookingModel.php @@ -8,7 +8,7 @@ /** * A3 – binding portal booking with our own handling (e.g. Destination Solutions, R08). */ -final class A3PortalBookingModel extends PortalBookingModel +class A3PortalBookingModel extends PortalBookingModel { public static function key(): string { @@ -17,7 +17,7 @@ public static function key(): string public static function version(): int { - return 1; + return 2; } public static function label(): string @@ -35,6 +35,11 @@ public static function caseTypes(): array return [CaseType::A3]; } + public static function capabilityRequirements(): array + { + return ['collects_payment' => false, 'provides_contract_documents' => false]; + } + public static function responsibilities(): Responsibilities { return Responsibilities::of( diff --git a/app/Process/Models/A3PortalBookingModelV1.php b/app/Process/Models/A3PortalBookingModelV1.php new file mode 100644 index 0000000..441feb9 --- /dev/null +++ b/app/Process/Models/A3PortalBookingModelV1.php @@ -0,0 +1,19 @@ +stepsOfVersion1(); + } +} diff --git a/app/Process/Models/A4PortalBookingModel.php b/app/Process/Models/A4PortalBookingModel.php index ae42984..33daf3f 100644 --- a/app/Process/Models/A4PortalBookingModel.php +++ b/app/Process/Models/A4PortalBookingModel.php @@ -8,7 +8,7 @@ /** * A4 – binding portal booking with shared handling: portal collection, our contract documentation (e.g. FeWo-direkt, R09). */ -final class A4PortalBookingModel extends PortalBookingModel +class A4PortalBookingModel extends PortalBookingModel { public static function key(): string { @@ -17,7 +17,7 @@ public static function key(): string public static function version(): int { - return 1; + return 2; } public static function label(): string @@ -35,6 +35,11 @@ public static function caseTypes(): array return [CaseType::A4]; } + public static function capabilityRequirements(): array + { + return ['collects_payment' => true, 'provides_contract_documents' => false]; + } + public static function responsibilities(): Responsibilities { return Responsibilities::of( diff --git a/app/Process/Models/A4PortalBookingModelV1.php b/app/Process/Models/A4PortalBookingModelV1.php new file mode 100644 index 0000000..42bb019 --- /dev/null +++ b/app/Process/Models/A4PortalBookingModelV1.php @@ -0,0 +1,19 @@ +stepsOfVersion1(); + } +} diff --git a/app/Process/Models/A5PortalBookingModel.php b/app/Process/Models/A5PortalBookingModel.php index 46ad106..8a7b410 100644 --- a/app/Process/Models/A5PortalBookingModel.php +++ b/app/Process/Models/A5PortalBookingModel.php @@ -8,7 +8,7 @@ /** * A5 – binding portal booking handled largely by the portal: collection and contract documentation at the portal. */ -final class A5PortalBookingModel extends PortalBookingModel +class A5PortalBookingModel extends PortalBookingModel { public static function key(): string { @@ -17,7 +17,7 @@ public static function key(): string public static function version(): int { - return 1; + return 2; } public static function label(): string @@ -35,6 +35,11 @@ public static function caseTypes(): array return [CaseType::A5]; } + public static function capabilityRequirements(): array + { + return ['collects_payment' => true, 'provides_contract_documents' => true]; + } + public static function responsibilities(): Responsibilities { return Responsibilities::of( diff --git a/app/Process/Models/A5PortalBookingModelV1.php b/app/Process/Models/A5PortalBookingModelV1.php new file mode 100644 index 0000000..c85f9c8 --- /dev/null +++ b/app/Process/Models/A5PortalBookingModelV1.php @@ -0,0 +1,19 @@ +stepsOfVersion1(); + } +} diff --git a/app/Process/Models/PortalBookingModel.php b/app/Process/Models/PortalBookingModel.php index ced270a..6b268d9 100644 --- a/app/Process/Models/PortalBookingModel.php +++ b/app/Process/Models/PortalBookingModel.php @@ -16,7 +16,37 @@ public static function intakes(): array return [IntakeKind::Booking]; } + /** + * Version 2 (V2.1): waits for the portal's confirmation where the channel says so (before the guest-facing steps; the + * occupation does not depend on it) and offers the booking information as a step of its own after the documents. + */ public function steps(): array + { + $course = []; + foreach (InquiryModel::bindingCourse() as $step) { + $course[] = $step; + if ($step->module === 'documents.send') { + $course[] = Step::module('documents.booking_notice'); + } + } + + return [ + Step::module('intake.record'), + Step::module('guest.details'), + Step::point(Point::AfterGuestIdentified), + Step::module('binding.portal'), + Step::module('portal.confirmation'), + Step::point(Point::AfterBinding), + ...$course, + ]; + } + + /** + * The course of version 1 (V2), kept for the cases that froze it. + * + * @return list + */ + protected function stepsOfVersion1(): array { return [ Step::module('intake.record'), diff --git a/app/Process/Models/ProcessModel.php b/app/Process/Models/ProcessModel.php index 2a88a03..fe4f129 100644 --- a/app/Process/Models/ProcessModel.php +++ b/app/Process/Models/ProcessModel.php @@ -33,6 +33,17 @@ abstract public static function responsibilities(): Responsibilities; /** @return list */ abstract public function steps(): array; + /** + * What a channel must be able to do (and not do) for this model to fit: capability key => required value. Empty: + * the model fits every channel that delivers its intake kind (docs/Prozessarchitektur/V2.1/02 §3.2). + * + * @return array + */ + public static function capabilityRequirements(): array + { + return []; + } + /** * Settings the model fixes for its cases (e.g. the pre-reservation of the offer model). * diff --git a/app/Process/Modules/Intake/AvailabilityCheck.php b/app/Process/Modules/Intake/AvailabilityCheck.php index 0253603..bcb2dbf 100644 --- a/app/Process/Modules/Intake/AvailabilityCheck.php +++ b/app/Process/Modules/Intake/AvailabilityCheck.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Intake; use App\Availability\AvailabilityChecker; +use App\Enums\Execution; use App\Process\CaseContext; use App\Process\Modules\Module; use App\Process\Modules\ModuleDefinition; @@ -25,6 +26,9 @@ public static function definition(): ModuleDefinition label: 'Verfügbarkeit', purpose: 'Prüft, ob der Zeitraum frei ist und die Kalender der Portale aktuell sind.', phase: 'P01', + executions: [Execution::Automatic], + condition: 'bei jeder Anfrage vor Angebot oder Bestätigung', + why: 'Doppelbuchungen sind nicht zu verantworten (E-027); die Verfügbarkeit wird immer geprüft.', effects: ['network'], triggers: ['intake', 'facts.applied'], ); diff --git a/app/Process/Modules/Intake/ChannelBlocks.php b/app/Process/Modules/Intake/ChannelBlocks.php index 3967b8f..cfc1252 100644 --- a/app/Process/Modules/Intake/ChannelBlocks.php +++ b/app/Process/Modules/Intake/ChannelBlocks.php @@ -4,6 +4,7 @@ use App\Enums\ActivityState; use App\Enums\ChannelTaskStatus; +use App\Enums\Execution; use App\Filament\Resources\ChannelTasks\ChannelTaskResource; use App\Models\ChannelTask; use App\Process\Activity; @@ -29,6 +30,9 @@ public static function definition(): ModuleDefinition label: 'Andere Kanäle sperren', purpose: 'Sperrt den Zeitraum in Portalen, die nicht automatisch abgleichen, und gibt ihn bei Ende wieder frei – mit Nachweis je Portal.', phase: 'P02', + executions: [Execution::Automatic, Execution::Manual], + condition: 'sobald ein Vorgang den Zeitraum belegt', + why: 'Die Belegung muss in anderen Portalen nachgezogen werden, sonst droht eine Doppelbuchung.', effects: ['channel_task', 'landlord_mail', 'network'], waits: ['landlord', 'portal'], triggers: ['booking.occupies', 'booking.released'], diff --git a/app/Process/Modules/Intake/GuestDataRequest.php b/app/Process/Modules/Intake/GuestDataRequest.php index 38d52da..08a0ced 100644 --- a/app/Process/Modules/Intake/GuestDataRequest.php +++ b/app/Process/Modules/Intake/GuestDataRequest.php @@ -4,6 +4,7 @@ use App\Actions\RequestCaseData; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\ProcessSetting; use App\Models\DataRequest; use App\Process\Activity; @@ -34,6 +35,8 @@ public static function definition(): ModuleDefinition label: 'Fehlende Angaben beim Gast anfragen', purpose: 'Fragt fehlende Pflichtangaben per Link beim Gast an, erinnert und übergibt an Sie, wenn der Gast nicht antwortet.', phase: 'P01', + executions: [Execution::Automatic, Execution::Approval, Execution::Manual, Execution::NotRequired], + condition: 'wenn Angaben für den nächsten Schritt fehlen und eine E-Mail-Adresse bekannt ist', requires: [Dependency::hard('intake.record')], effects: ['case_write', 'guest_mail'], waits: ['guest', 'landlord', 'time'], diff --git a/app/Process/Modules/Intake/GuestDetails.php b/app/Process/Modules/Intake/GuestDetails.php index 6f60963..72793a0 100644 --- a/app/Process/Modules/Intake/GuestDetails.php +++ b/app/Process/Modules/Intake/GuestDetails.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Intake; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Models\DataRequest; @@ -30,6 +31,9 @@ public static function definition(): ModuleDefinition label: 'Angaben des Gastes', purpose: 'Identifiziert den Gast, führt seine Angaben aus allen Quellen zusammen und prüft, ob alles für den nächsten Schritt da ist.', phase: 'P01', + executions: [Execution::Automatic, Execution::Manual], + condition: 'wenn wir selbst mit dem Gast schreiben (Anfrage, eigene Unterlagen, Nachrichten oder Zahlung)', + why: 'Ohne die Angaben des Gastes entsteht kein eigenes Angebot und keine Unterlage (G2a).', requires: [Dependency::hard('intake.record')], effects: ['case_write'], waits: ['guest', 'landlord'], diff --git a/app/Process/Modules/Intake/Hold.php b/app/Process/Modules/Intake/Hold.php index d09f05b..f0449c8 100644 --- a/app/Process/Modules/Intake/Hold.php +++ b/app/Process/Modules/Intake/Hold.php @@ -2,6 +2,7 @@ namespace App\Process\Modules\Intake; +use App\Enums\Execution; use App\Enums\ProcessSetting; use App\Models\Booking; use App\Process\CaseContext; @@ -29,6 +30,8 @@ public static function definition(): ModuleDefinition label: 'Reservierung des Zeitraums', purpose: 'Hält den Zeitraum während der Klärung bzw. der Angebotsfrist frei und gibt ihn nach Ablauf wieder frei.', phase: 'P01', + executions: [Execution::Automatic], + condition: 'bei einer Anfrage, die den Zeitraum reservieren soll', requires: [Dependency::hard('intake.record')], effects: ['calendar_hold'], waits: ['time'], diff --git a/app/Process/Modules/Intake/IntakeRecord.php b/app/Process/Modules/Intake/IntakeRecord.php index 929ec62..a4920fa 100644 --- a/app/Process/Modules/Intake/IntakeRecord.php +++ b/app/Process/Modules/Intake/IntakeRecord.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Intake; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Process\Activity; use App\Process\CaseContext; use App\Process\Modules\Module; @@ -25,6 +26,9 @@ public static function definition(): ModuleDefinition label: 'Eingang', purpose: 'Hält den Eingang der Anfrage, Buchung oder Eigenbelegung fest und friert den Ablauf ein.', phase: 'P01', + executions: [Execution::Automatic], + condition: 'immer, sobald ein Vorgang entsteht', + why: 'Ohne Eingang gibt es keinen Vorgang.', effects: ['case_write', 'calendar_hold'], triggers: ['intake'], events: ['created', 'intake', 'profile', 'hold', 'mode'], diff --git a/app/Process/Modules/Intake/PortalBinding.php b/app/Process/Modules/Intake/PortalBinding.php index e46bd4b..28f760a 100644 --- a/app/Process/Modules/Intake/PortalBinding.php +++ b/app/Process/Modules/Intake/PortalBinding.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Intake; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Process\Activity; use App\Process\CaseContext; use App\Process\Modules\Dependency; @@ -27,6 +28,9 @@ public static function definition(): ModuleDefinition label: 'Verbindlichkeit beim Portal', purpose: 'Stellt fest, dass die Buchung beim Portal verbindlich ist, und übernimmt den Gesamtpreis laut Portal.', phase: 'P02', + executions: [Execution::Portal, Execution::Manual], + condition: 'bei einer Buchung, die beim Portal schon verbindlich ist', + why: 'Die Buchung ist beim Portal verbindlich und bleibt es (E-036); der Gesamtpreis laut Portal wird übernommen.', requires: [Dependency::hard('intake.record')], effects: ['case_write'], waits: ['portal', 'landlord'], diff --git a/app/Process/Modules/Intake/PortalConfirmationStep.php b/app/Process/Modules/Intake/PortalConfirmationStep.php new file mode 100644 index 0000000..490fb40 --- /dev/null +++ b/app/Process/Modules/Intake/PortalConfirmationStep.php @@ -0,0 +1,127 @@ +inquiry && ! $case->closed && $case->profile->awaitsPortalConfirmation(); + } + + public function state(CaseContext $case): ?StepState + { + if (PortalConfirmation::evidence($case->booking) !== null) { + return StepState::Done; + } + + return PortalConfirmation::isOverdue($case->booking) ? StepState::Problem : StepState::Waiting; + } + + public function activities(CaseContext $case): array + { + $evidence = PortalConfirmation::evidence($case->booking); + $deadline = PortalConfirmation::deadline($case->booking); + + return [new Activity('portal_confirmation', 'Bestätigung des Portals abwarten', match (true) { + $evidence !== null => ActivityState::Done, + PortalConfirmation::isOverdue($case->booking) => ActivityState::Problem, + default => ActivityState::Waiting, + }, match (true) { + $evidence !== null => $evidence['label'], + PortalConfirmation::isOverdue($case->booking) => 'ausgeblieben seit '.$deadline->format('d.m.Y, H:i').' Uhr – bitte beim Portal prüfen; Unterlagen und Nachrichten warten weiter, bis Sie bestätigen oder von Hand senden', + default => 'erwartet bis '.$deadline->format('d.m.Y, H:i').' Uhr – Unterlagen und Nachrichten warten; die Belegung ist gesichert', + }, $evidence === null ? 'confirmPortal' : null)]; + } + + /** Due when the time ran out without the mail (escalate once), or when the mail arrived and the escalation is still open. */ + public function due(CaseContext $case): bool + { + $open = $this->openTask($case) !== null; + $evidence = PortalConfirmation::evidence($case->booking) !== null; + + return ($evidence && $open) || (! $evidence && ! $open && PortalConfirmation::isOverdue($case->booking)); + } + + public function blockers(CaseContext $case): array + { + return []; + } + + public function run(CaseContext $case): StepResult + { + $task = $this->openTask($case); + if (PortalConfirmation::evidence($case->booking) !== null) { + $task?->complete(CaseLog::SYSTEM, 'Die Bestätigung des Portals liegt jetzt vor.'); + + return StepResult::ran(); + } + + BookingTask::openOnce($case->booking, BookingTaskKind::PortalConfirmationMissing, 'portal-confirmation', [ + 'due_on' => today(), + 'note' => 'Die Bestätigungsmail des Portals ist bis '.PortalConfirmation::deadline($case->booking)->format('d.m.Y, H:i').' Uhr nicht eingegangen. Die Belegung ist gesichert. Bitte beim Portal prüfen und im Vorgang bestätigen – oder die Unterlagen von Hand senden.', + ]); + CaseLog::record($case->booking, 'task', 'Bestätigungsmail des Portals fehlt – Aufgabe angelegt', actor: CaseLog::SYSTEM); + + return StepResult::ran(); + } + + public function isOutward(): bool + { + return false; + } + + private function openTask(CaseContext $case): ?BookingTask + { + return BookingTask::query()->where('booking_id', $case->booking->id)->where('kind', BookingTaskKind::PortalConfirmationMissing)->where('status', BookingTaskStatus::Open)->first(); + } +} diff --git a/app/Process/Modules/ModuleDefinition.php b/app/Process/Modules/ModuleDefinition.php index 62bb629..880db5d 100644 --- a/app/Process/Modules/ModuleDefinition.php +++ b/app/Process/Modules/ModuleDefinition.php @@ -2,6 +2,7 @@ namespace App\Process\Modules; +use App\Enums\Execution; use App\Enums\ProcessSetting; /** @@ -41,6 +42,9 @@ * @param list $events history types that belong to the step (shown behind the step) * @param list $points extension points the module may be inserted at (checked; empty = fixed place in a model) * @param bool $readsContractData evaluates frozen contract data – needs an ongoing-case test (checked) + * @param list $executions the admissible ways to fulfil the task (V2.1; the model may narrow them) + * @param string|null $condition when the step applies, in plain words (DESCRIBES – the logic is `applies()`, never read from here) + * @param string|null $why why the task is mandatory, shown instead of a lock */ public function __construct( public string $label, @@ -58,6 +62,9 @@ public function __construct( public array $points = [], public bool $readsContractData = false, public string $availability = self::AVAILABILITY_PRODUCTION, + public array $executions = [], + public ?string $condition = null, + public ?string $why = null, ) {} public function isOptional(): bool diff --git a/app/Process/Modules/Money/InternalPayment.php b/app/Process/Modules/Money/InternalPayment.php index cef9925..72f7814 100644 --- a/app/Process/Modules/Money/InternalPayment.php +++ b/app/Process/Modules/Money/InternalPayment.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Money; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Process\Activity; use App\Process\CaseContext; use App\Process\Modules\Module; @@ -25,6 +26,8 @@ public static function definition(): ModuleDefinition label: 'Zahlung (ohne Erinnerungen)', purpose: 'Hält fest, was bei einer Eigenbelegung oder privaten Überlassung bezahlt wurde – ohne Erinnerungen.', phase: 'P03', + executions: [Execution::Manual], + condition: 'bei einer Eigenbelegung mit Preis', effects: ['case_write'], toggle: ModuleDefinition::TOGGLE_CONDITIONAL, performers: ['landlord'], diff --git a/app/Process/Modules/Money/PaymentMonitoring.php b/app/Process/Modules/Money/PaymentMonitoring.php index 89f6785..8390cd5 100644 --- a/app/Process/Modules/Money/PaymentMonitoring.php +++ b/app/Process/Modules/Money/PaymentMonitoring.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Money; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Process\Activity; @@ -28,6 +29,9 @@ public static function definition(): ModuleDefinition label: 'Zahlungen des Gastes', purpose: 'Überwacht Anzahlung und Restzahlung und erinnert rechtzeitig – oder zeigt, was das Portal laut eigener Angabe eingezogen hat.', phase: 'P03', + executions: [Execution::Manual, Execution::Portal], + condition: 'bei jeder verbindlichen Buchung', + why: 'Zahlungen werden überwacht – von uns oder durch das Portal (nur „laut Portal“).', effects: ['case_write', 'guest_mail'], waits: ['guest', 'portal', 'time'], triggers: ['payment.recorded', 'portal.amounts', 'schedule:reminders'], diff --git a/app/Process/Modules/Money/PortalPayout.php b/app/Process/Modules/Money/PortalPayout.php index a2682d4..69b1490 100644 --- a/app/Process/Modules/Money/PortalPayout.php +++ b/app/Process/Modules/Money/PortalPayout.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Money; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\Responsibility; use App\Pricing\CaseMoney; use App\Process\Activity; @@ -28,6 +29,9 @@ public static function definition(): ModuleDefinition label: 'Auszahlung des Portals', purpose: 'Prüft, ob die Auszahlung des Portals tatsächlich auf unserem Konto eingegangen ist und zu den Angaben passt.', phase: 'P03', + executions: [Execution::Manual], + condition: 'wenn das Portal das Geld einzieht', + why: 'Die Auszahlung muss tatsächlich auf unserem Konto eingehen (O5).', effects: ['case_write'], waits: ['portal', 'landlord', 'time'], triggers: ['portal.amounts', 'payment.recorded'], diff --git a/app/Process/Modules/Offer/BindingOffer.php b/app/Process/Modules/Offer/BindingOffer.php index f621e6d..747c3bc 100644 --- a/app/Process/Modules/Offer/BindingOffer.php +++ b/app/Process/Modules/Offer/BindingOffer.php @@ -5,6 +5,7 @@ use App\Availability\AvailabilityChecker; use App\Enums\ActivityState; use App\Enums\BookingStatus; +use App\Enums\Execution; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; use App\Process\Activity; @@ -41,6 +42,9 @@ public static function definition(): ModuleDefinition label: 'Verbindliches Angebot', purpose: 'Erstellt das verbindliche Angebot mit Vertragsentwurf und sendet es dem Gast; der Zeitraum ist für die Haltefrist reserviert.', phase: 'P02', + executions: [Execution::Automatic, Execution::Manual], + condition: 'bei einer Anfrage mit Reservierung', + why: 'Ohne verbindliches Angebot gibt es auf eigenem Weg keinen Vertrag (E-003).', requires: [Dependency::hard('guest.details'), Dependency::hard('availability.check'), Dependency::soft('guest.data_request')], effects: ['case_write', 'guest_mail', 'landlord_mail', 'document', 'calendar_hold', 'network'], waits: ['guest', 'landlord'], diff --git a/app/Process/Modules/Offer/Information.php b/app/Process/Modules/Offer/Information.php index d77861e..adf0fe6 100644 --- a/app/Process/Modules/Offer/Information.php +++ b/app/Process/Modules/Offer/Information.php @@ -4,6 +4,7 @@ use App\Enums\ActivityState; use App\Enums\BookingStatus; +use App\Enums\Execution; use App\Enums\ProcessingMode; use App\Enums\ProcessSetting; use App\Process\Activity; @@ -32,6 +33,8 @@ public static function definition(): ModuleDefinition label: 'Unverbindliche Auskunft und Buchungswunsch', purpose: 'Beantwortet die Anfrage mit einer unverbindlichen Auskunft ohne Reservierung; fragt der Gast die Buchung an, wird erneut geprüft und verbindlich bestätigt.', phase: 'P02', + executions: [Execution::Automatic, Execution::Manual], + condition: 'bei einer Anfrage ohne Reservierung', requires: [Dependency::hard('intake.record'), Dependency::soft('guest.data_request')], effects: ['case_write', 'guest_mail', 'landlord_mail', 'document'], waits: ['guest', 'landlord'], diff --git a/app/Process/Modules/Offer/OfferAcceptance.php b/app/Process/Modules/Offer/OfferAcceptance.php index 09ec2dd..cd2e31a 100644 --- a/app/Process/Modules/Offer/OfferAcceptance.php +++ b/app/Process/Modules/Offer/OfferAcceptance.php @@ -27,6 +27,9 @@ public static function definition(): ModuleDefinition label: 'Annahme durch den Gast', purpose: 'Der Gast nimmt das Angebot an oder lehnt es ab; mit der Annahme wird die Buchung verbindlich.', phase: 'P02', + executions: [], + condition: 'nach einem verbindlichen Angebot', + why: 'Der Gast nimmt an – ohne Annahme kommt kein Vertrag zustande (E-003). Eine zweite Freigabe ist nicht nötig.', requires: [Dependency::hard('offer.binding')], effects: ['case_write', 'guest_mail', 'landlord_mail', 'document'], waits: ['guest', 'time'], diff --git a/app/Process/Modules/Settlement/BookingDocuments.php b/app/Process/Modules/Settlement/BookingDocuments.php index 25f3a22..cadd52e 100644 --- a/app/Process/Modules/Settlement/BookingDocuments.php +++ b/app/Process/Modules/Settlement/BookingDocuments.php @@ -4,7 +4,8 @@ use App\Actions\SendBookingDocuments; use App\Enums\ActivityState; -use App\Enums\ProcessingMode; +use App\Enums\ContractDelivery; +use App\Enums\Execution; use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Process\Activity; @@ -14,6 +15,7 @@ use App\Process\Modules\Module; use App\Process\Modules\ModuleDefinition; use App\Process\Modules\RunsAutomatically; +use App\Process\PortalConfirmation; use App\Process\StepResult; /** @@ -28,17 +30,27 @@ public static function key(): string return 'documents.send'; } + public static function version(): int + { + // 2: the contract document is created and filed separately from sending it (contract_delivery); waits for the portal's + // confirmation where the channel says so. Default behaviour is the one of version 1. + return 2; + } + public static function definition(): ModuleDefinition { return new ModuleDefinition( label: 'Buchungsunterlagen (Vertragsdokumentation)', purpose: 'Sendet dem Gast die verbindliche Buchungsbestätigung mit Vertrag bzw. die Unterlagen der Portalbuchung.', phase: 'P03', - requires: [Dependency::hard('guest.details')], + executions: [Execution::Automatic, Execution::Approval, Execution::Manual, Execution::Portal], + condition: 'bei jeder verbindlichen Buchung, für die wir die Unterlagen verantworten', + why: 'Die verbindliche Vertragsdokumentation muss den Gast erreichen – von uns oder vom Portal (O1). Wie, ist einstellbar.', + requires: [Dependency::hard('guest.details'), Dependency::hard('portal.confirmation')], effects: ['case_write', 'guest_mail', 'document'], waits: ['landlord', 'portal'], - triggers: ['automation', 'booking.taken_over'], - parameters: [ProcessSetting::Documents, ProcessSetting::Processing, ProcessSetting::ContractTemplate], + triggers: ['automation', 'booking.taken_over', 'portal.mail', 'schedule:waiting'], + parameters: [ProcessSetting::Documents, ProcessSetting::Processing, ProcessSetting::ContractDelivery, ProcessSetting::ContractTemplate], performers: ['system', 'landlord', 'portal'], modes: ['automatic', 'manual'], events: ['document', 'mail'], @@ -59,8 +71,14 @@ public function activities(CaseContext $case): array } $binding = $case->binding; + $delivery = $case->profile->contractDelivery(); + $internal = $delivery === ContractDelivery::Internal; + $stored = $booking->contract_path !== null; + $awaiting = $binding && ! $case->inquiry && $case->profile->awaitsPortalConfirmation() && PortalConfirmation::evidence($booking) === null; $state = match (true) { $booking->confirmation_sent_at !== null => ActivityState::Done, + // Created and filed internally is how the landlord chose to fulfil the step; sending stays possible by hand. + $internal && $stored => ActivityState::Done, ! $binding => ActivityState::Later, $booking->confirmation_failed_at !== null => ActivityState::Problem, default => ActivityState::Open, @@ -68,33 +86,42 @@ public function activities(CaseContext $case): array $missing = $binding && $state === ActivityState::Open ? app(CaseAutomation::class)->documentBlockers($booking) : []; // What the landlord still has to confirm (unreleased texts, terms not shown to be agreed on the portal). $toConfirm = $binding && $state === ActivityState::Open && $missing === [] ? app(SendBookingDocuments::class)->compose($booking)->toConfirm() : []; + $waiting = $missing !== [] || ($awaiting && $state === ActivityState::Open); return [new Activity('documents', match (true) { + $internal && $state === ActivityState::Done && $booking->confirmation_sent_at === null => 'Vertrag intern abgelegt', + $internal && $state === ActivityState::Open => 'Vertrag erstellen und intern ablegen', $state !== ActivityState::Open => $case->inquiry ? 'Buchungsbestätigung mit Vertrag senden' : 'Buchungsunterlagen an den Gast senden', $case->inquiry => 'Buchungsbestätigung mit Vertrag prüfen und senden', default => 'Buchungsunterlagen prüfen und senden', - }, $case->later($missing !== [] ? ActivityState::Waiting : $state), + }, $case->later($waiting ? ActivityState::Waiting : $state), match (true) { $booking->confirmation_sent_at !== null => 'gesendet am '.$booking->confirmation_sent_at->format('d.m.Y'), + $internal && $state === ActivityState::Done => 'erstellt und intern abgelegt – nicht an den Gast gesendet (Einstellung des Kanals); Senden von Hand bleibt möglich', $state === ActivityState::Problem => 'Versand fehlgeschlagen', $missing !== [] => 'wartet: '.implode(' ', $missing), + $awaiting => 'wartet auf die Bestätigungsmail des Portals (die Belegung ist gesichert)', $toConfirm !== [] => 'vor dem Versand zu prüfen: '.implode(' ', $toConfirm), default => null, }, match (true) { $state === ActivityState::Problem => 'resendConfirmation', - $binding && $missing === [] && $booking->confirmation_sent_at === null => 'sendDocuments', + $binding && $missing === [] && $booking->confirmation_sent_at === null && ! ($internal && $stored) => 'sendDocuments', default => null, })]; } - /** The guest's e-mail and the price are what the documents need – not every detail of a request. */ + /** + * The guest's e-mail and the price are what the documents need – not every detail of a request. Due when they are + * to go out automatically (as the case is processed or as chosen for the delivery), or – delivery „internal“ – when the + * contract is still to be created and filed. + */ public function due(CaseContext $case): bool { $booking = $case->booking; + $delivery = $case->profile->contractDelivery(); + $mine = $case->binding && $booking->confirmation_sent_at === null && $case->profile->documents() === Responsibility::Landlord && $case->profile->origin !== 'migration'; - return $booking->processingMode() === ProcessingMode::Automatic - && $case->binding && $booking->confirmation_sent_at === null - && $case->profile->documents() === Responsibility::Landlord && $case->profile->origin !== 'migration'; + return $mine && ($delivery === ContractDelivery::Internal ? $booking->contract_path === null : $delivery->sendsAutomatically($booking->processingMode())); } public function blockers(CaseContext $case): array @@ -104,7 +131,8 @@ public function blockers(CaseContext $case): array public function run(CaseContext $case): StepResult { - $reasons = app(SendBookingDocuments::class)->automatically($case->booking); + $documents = app(SendBookingDocuments::class); + $reasons = $case->profile->contractDelivery() === ContractDelivery::Internal ? $documents->storeInternally($case->booking) : $documents->automatically($case->booking); return $reasons === [] ? StepResult::ran() : StepResult::blocked($reasons); } diff --git a/app/Process/Modules/Settlement/BookingNoticeStep.php b/app/Process/Modules/Settlement/BookingNoticeStep.php new file mode 100644 index 0000000..6a0e39b --- /dev/null +++ b/app/Process/Modules/Settlement/BookingNoticeStep.php @@ -0,0 +1,113 @@ +inquiry && $case->profile->bookingNotice() !== BookingNoticeMode::Off; + } + + public function activities(CaseContext $case): array + { + $booking = $case->booking; + $suppression = SendBookingNotice::suppression($booking); + $sent = SendBookingNotice::sent($booking); + $waitsForPortal = $case->profile->awaitsPortalConfirmation() && PortalConfirmation::evidence($booking) === null; + $label = 'Buchungsinformation an den Gast'.($case->profile->bookingNotice()->isAutomatic() ? ' (automatisch)' : ''); + + return [new Activity('booking_notice', $label, $case->later(match (true) { + $sent => ActivityState::Done, + $suppression !== null => ActivityState::NotApplicable, + ! $case->binding => ActivityState::Later, + $waitsForPortal => ActivityState::Waiting, + blank($booking->guest?->email) => ActivityState::Waiting, + default => ActivityState::Open, + }), match (true) { + $sent => 'gesendet', + $suppression !== null => 'nicht nötig: '.$suppression, + $waitsForPortal => 'wartet auf die Bestätigungsmail des Portals', + blank($booking->guest?->email) => 'wartet: Die E-Mail-Adresse des Gastes fehlt.', + default => null, + }, ! $sent && $suppression === null && $case->binding && filled($booking->guest?->email) ? 'sendBookingNotice' : null)]; + } + + public function state(CaseContext $case): ?StepState + { + $booking = $case->booking; + + return match (true) { + SendBookingNotice::sent($booking) => StepState::Done, + SendBookingNotice::suppression($booking) !== null => StepState::NotApplicable, + ! $case->binding => StepState::Later, + default => StepState::Open, + }; + } + + public function due(CaseContext $case): bool + { + return $case->profile->bookingNotice()->isAutomatic() && $case->binding && ! $case->closed + && ! SendBookingNotice::sent($case->booking) && SendBookingNotice::suppression($case->booking) === null && $case->profile->origin !== 'migration'; + } + + public function blockers(CaseContext $case): array + { + return filled($case->booking->guest?->email) ? [] : ['Die E-Mail-Adresse des Gastes fehlt.']; + } + + public function run(CaseContext $case): StepResult + { + return app(SendBookingNotice::class)->handle($case->booking, automatic: true) ? StepResult::ran() : StepResult::blocked([SendBookingNotice::suppression($case->booking) ?? 'Nicht gesendet.']); + } + + public function isOutward(): bool + { + return true; + } +} diff --git a/app/Process/Modules/Settlement/CaseTasks.php b/app/Process/Modules/Settlement/CaseTasks.php index 6ab65fd..f47bb86 100644 --- a/app/Process/Modules/Settlement/CaseTasks.php +++ b/app/Process/Modules/Settlement/CaseTasks.php @@ -33,6 +33,8 @@ public static function definition(): ModuleDefinition label: 'Aufgaben und Meldungen', purpose: 'Zeigt offene Aufgaben des Vorgangs – Meldungen der Portale, Entscheidungen, Zahlungs- und Leistungsaufgaben.', phase: 'P03', + executions: [], + condition: 'wenn eine Aufgabe oder Meldung vorliegt', effects: ['case_write'], waits: ['landlord'], triggers: ['task.created', 'portal.report'], diff --git a/app/Process/Modules/Settlement/ChangeProposal.php b/app/Process/Modules/Settlement/ChangeProposal.php index 717fcf7..78bbf6f 100644 --- a/app/Process/Modules/Settlement/ChangeProposal.php +++ b/app/Process/Modules/Settlement/ChangeProposal.php @@ -26,6 +26,8 @@ public static function definition(): ModuleDefinition label: 'Änderungsvorschlag', purpose: 'Zeigt einen Änderungsvorschlag, der beim Gast liegt.', phase: 'P03', + executions: [], + condition: 'wenn ein Änderungsvorschlag beim Gast liegt', effects: ['case_write', 'guest_mail'], waits: ['guest', 'time'], triggers: ['change.proposed'], diff --git a/app/Process/Modules/Settlement/CommercialSettlement.php b/app/Process/Modules/Settlement/CommercialSettlement.php index bb81249..4dffa42 100644 --- a/app/Process/Modules/Settlement/CommercialSettlement.php +++ b/app/Process/Modules/Settlement/CommercialSettlement.php @@ -4,6 +4,7 @@ use App\Enums\ActivityState; use App\Enums\BookingStatus; +use App\Enums\Execution; use App\Process\Activity; use App\Process\CaseClosure; use App\Process\CaseContext; @@ -28,6 +29,9 @@ public static function definition(): ModuleDefinition label: 'Kaufmännisch abschließen', purpose: 'Schließt den Vorgang kaufmännisch ab, wenn Zahlungen, Erstattungen und Auszahlungen geklärt sind.', phase: 'P05', + executions: [Execution::Manual], + condition: 'nach dem Aufenthalt', + why: 'Zahlungen, Erstattungen und Auszahlungen müssen geklärt sein; eine Portalmeldung ersetzt den Nachweis nicht (O5).', requires: [Dependency::soft('case.closure')], effects: ['case_write'], waits: ['landlord', 'portal'], diff --git a/app/Process/Modules/Settlement/StayClosure.php b/app/Process/Modules/Settlement/StayClosure.php index 3a6ec89..ba43c8e 100644 --- a/app/Process/Modules/Settlement/StayClosure.php +++ b/app/Process/Modules/Settlement/StayClosure.php @@ -4,6 +4,7 @@ use App\Enums\ActivityState; use App\Enums\BookingStatus; +use App\Enums\Execution; use App\Enums\InternalKind; use App\Models\BookingTask; use App\Process\Activity; @@ -28,6 +29,9 @@ public static function definition(): ModuleDefinition label: 'Aufenthalt abschließen', purpose: 'Schließt den Aufenthalt ab, sobald nach der Abreise nichts mehr für ihn offen ist.', phase: 'P05', + executions: [Execution::Automatic, Execution::Manual], + condition: 'nach der Abreise', + why: 'Ein Aufenthalt wird immer abgeschlossen, damit nichts offen bleibt (E-010).', effects: ['case_write'], waits: ['time', 'landlord'], triggers: ['schedule:daily'], diff --git a/app/Process/Modules/Settlement/StayConfirmation.php b/app/Process/Modules/Settlement/StayConfirmation.php index 23eae1c..4a52451 100644 --- a/app/Process/Modules/Settlement/StayConfirmation.php +++ b/app/Process/Modules/Settlement/StayConfirmation.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Settlement; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\InternalKind; use App\Process\Activity; use App\Process\CaseContext; @@ -25,6 +26,8 @@ public static function definition(): ModuleDefinition label: 'Aufenthaltsbestätigung', purpose: 'Bestätigt den Gästen einer Eigenbelegung oder privaten Überlassung den Aufenthalt – nur bei Bedarf.', phase: 'P03', + executions: [Execution::Manual, Execution::NotRequired], + condition: 'bei einer privaten Überlassung mit Gästen', effects: ['guest_mail', 'document'], toggle: ModuleDefinition::TOGGLE_OPTIONAL, performers: ['landlord'], diff --git a/app/Process/Modules/Stay/ArrivalDetails.php b/app/Process/Modules/Stay/ArrivalDetails.php index 18cfc73..5589592 100644 --- a/app/Process/Modules/Stay/ArrivalDetails.php +++ b/app/Process/Modules/Stay/ArrivalDetails.php @@ -6,6 +6,7 @@ use App\Enums\ActivityState; use App\Enums\BookingTaskKind; use App\Enums\BookingTaskStatus; +use App\Enums\Execution; use App\Models\BookingTask; use App\Process\Activity; use App\Process\CaseContext; @@ -28,6 +29,8 @@ public static function definition(): ModuleDefinition label: 'Anreisedaten', purpose: 'Sammelt Telefon und Anreisezeit für die Übergabe und meldet rechtzeitig, was fehlt.', phase: 'P04', + executions: [Execution::Manual, Execution::ServiceProvider, Execution::NotRequired], + condition: 'bei verbindlichen Buchungen', effects: ['case_write'], waits: ['guest', 'landlord', 'time'], triggers: ['schedule:prepare-stays'], diff --git a/app/Process/Modules/Stay/ArrivalInformation.php b/app/Process/Modules/Stay/ArrivalInformation.php index 2a25837..252e2f8 100644 --- a/app/Process/Modules/Stay/ArrivalInformation.php +++ b/app/Process/Modules/Stay/ArrivalInformation.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Stay; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\ProcessSetting; use App\Enums\Responsibility; use App\Process\Activity; @@ -27,6 +28,8 @@ public static function definition(): ModuleDefinition label: 'Anreise-Informationen', purpose: 'Wegbeschreibung, Schlüssel und Kontakt vor Ort rechtzeitig vor der Anreise.', phase: 'P04', + executions: [Execution::Automatic, Execution::Portal, Execution::ServiceProvider, Execution::NotRequired], + condition: 'bei verbindlichen Buchungen', effects: ['guest_mail'], waits: ['time', 'portal'], triggers: ['schedule:reminders'], diff --git a/app/Process/Modules/Stay/ReviewRequest.php b/app/Process/Modules/Stay/ReviewRequest.php index 9f84ae5..f33376b 100644 --- a/app/Process/Modules/Stay/ReviewRequest.php +++ b/app/Process/Modules/Stay/ReviewRequest.php @@ -3,6 +3,7 @@ namespace App\Process\Modules\Stay; use App\Enums\ActivityState; +use App\Enums\Execution; use App\Enums\Responsibility; use App\Process\Activity; use App\Process\CaseContext; @@ -27,6 +28,8 @@ public static function definition(): ModuleDefinition label: 'Bitte um eine Bewertung', purpose: 'Bittet den Gast nach dem Aufenthalt um eine Bewertung.', phase: 'P05', + executions: [Execution::Automatic, Execution::Portal, Execution::NotRequired], + condition: 'nach dem Aufenthalt, wenn wir dem Gast schreiben', requires: [Dependency::hard('stay')], effects: ['guest_mail'], waits: ['time'], diff --git a/app/Process/Modules/Stay/Stay.php b/app/Process/Modules/Stay/Stay.php index 3b6b56e..b2c6961 100644 --- a/app/Process/Modules/Stay/Stay.php +++ b/app/Process/Modules/Stay/Stay.php @@ -25,6 +25,8 @@ public static function definition(): ModuleDefinition label: 'Aufenthalt', purpose: 'Der Aufenthalt vom Anreise- bis zum Abreisetag.', phase: 'P04', + executions: [], + condition: 'immer', waits: ['time'], triggers: ['schedule:daily'], performers: ['guest', 'landlord'], diff --git a/app/Process/PortalConfirmation.php b/app/Process/PortalConfirmation.php new file mode 100644 index 0000000..02e2059 --- /dev/null +++ b/app/Process/PortalConfirmation.php @@ -0,0 +1,68 @@ +events()->where('type', self::EVENT)->orderBy('occurred_at')->first(); + if ($landlord !== null) { + return ['source' => 'landlord', 'at' => CarbonImmutable::parse($landlord->occurred_at), 'label' => 'vom Vermieter bestätigt ('.$landlord->actor.')']; + } + + $channelId = $booking->processChannel()?->id; + if ($channelId === null) { + return null; + } + + $mail = PortalEmail::query()->where('channel_id', $channelId)->where('type', PortalEmailType::Booking) + ->where(fn ($query) => $query + ->when(filled($booking->portal_reference), fn ($by) => $by->orWhere('reference', $booking->portal_reference)) + ->orWhereHas('blockedPeriod', fn ($block) => $block->withTrashed()->where('linked_booking_id', $booking->id))) + ->orderBy('received_at')->first(); + + return $mail === null ? null : ['source' => 'mail', 'at' => CarbonImmutable::parse($mail->received_at), 'label' => 'Bestätigungsmail des Portals vom '.CarbonImmutable::parse($mail->received_at)->format('d.m.Y, H:i').' Uhr (laut Portal)']; + } + + /** + * Until when the confirmation is awaited (counted from the case's arrival in the system). + */ + public static function deadline(Booking $booking): CarbonImmutable + { + return CarbonImmutable::parse($booking->created_at)->addHours($booking->process()->portalConfirmationWaitHours()); + } + + public static function isOverdue(Booking $booking): bool + { + return self::deadline($booking)->isPast(); + } + + /** + * The landlord states that the portal confirmed (e.g. checked in the portal's own interface). Recorded once. + */ + public static function confirm(Booking $booking, string $by, ?string $note = null): void + { + if ($booking->events()->where('type', self::EVENT)->exists()) { + return; + } + CaseLog::record($booking, self::EVENT, 'Bestätigung des Portals vom Vermieter festgehalten', reason: $note, data: ['module' => 'portal.confirmation', 'level' => 'confirmed_by_landlord'], actor: $by); + } +} diff --git a/app/Process/ProcessProfile.php b/app/Process/ProcessProfile.php index 9442b03..8e7ee69 100644 --- a/app/Process/ProcessProfile.php +++ b/app/Process/ProcessProfile.php @@ -2,7 +2,9 @@ namespace App\Process; +use App\Enums\BookingNoticeMode; use App\Enums\CaseType; +use App\Enums\ContractDelivery; use App\Enums\DataRequestMode; use App\Enums\IntakeKind; use App\Enums\ProcessingMode; @@ -147,6 +149,26 @@ public function guestLinkValidDays(): int return max(1, (int) $this->value(ProcessSetting::GuestLinkValidDays)); } + public function contractDelivery(): ContractDelivery + { + return ContractDelivery::tryFrom((string) $this->value(ProcessSetting::ContractDelivery)) ?? ContractDelivery::Follow; + } + + public function bookingNotice(): BookingNoticeMode + { + return BookingNoticeMode::tryFrom((string) $this->value(ProcessSetting::BookingNotice)) ?? BookingNoticeMode::Off; + } + + public function awaitsPortalConfirmation(): bool + { + return (bool) $this->value(ProcessSetting::AwaitPortalConfirmation); + } + + public function portalConfirmationWaitHours(): int + { + return max(1, (int) $this->value(ProcessSetting::PortalConfirmationWaitHours)); + } + public function formRequiresAddress(): bool { return (bool) $this->value(ProcessSetting::FormRequiresAddress); diff --git a/app/Process/Restriction.php b/app/Process/Restriction.php new file mode 100644 index 0000000..01ee20b --- /dev/null +++ b/app/Process/Restriction.php @@ -0,0 +1,28 @@ +reason.($this->alternative ? ' Zulässig ist stattdessen: '.$this->alternative.'.' : '').($this->change ? ' Änderung: '.$this->change.'.' : '')); + } +} diff --git a/config/channels.php b/config/channels.php index 63eeaa5..21124b3 100644 --- a/config/channels.php +++ b/config/channels.php @@ -26,17 +26,19 @@ 'uid_suffix' => '@fewo-stommer', /* - | Business and integration capabilities per kind of channel (decision E2/O2): which process models may be chosen for - | requests and for bookings that are binding at the portal. A channel names its profile in settings.portal_profile - | (Kanal › Ablauf); without one it is recognised by its name, else "generic". Further models are released here after - | a business review – never as a special rule in the process core. + | Channel profiles (decision E2/O2, V2.1): a profile only SUGGESTS what a portal does for the landlord's account – it is + | recognised by name or named in settings.portal_profile. The suggested capabilities are no gate: the administrator + | confirms or corrects them per channel (Kanal › Ablauf), and the admissible process models follow from the confirmed + | values (App\Process\ChannelCapabilities). null = unknown (blocks nothing, shown as "please confirm"). + | FeWo-direkt: R09 (the portal collects, our own contract documents). Destination Solutions: E-016 / R08 – "für den + | beschriebenen Vermieterzugang": we collect and document; the account may change. */ 'portal_profiles' => [ - 'website' => ['label' => 'Eigene Webseite', 'inquiry' => ['a1.offer', 'a1.information'], 'booking' => []], - 'fewo_direkt' => ['label' => 'FeWo-direkt (Vrbo)', 'match' => ['fewo-direkt', 'fewo direkt', 'vrbo'], 'inquiry' => ['a2.offer', 'a2.information'], 'booking' => ['a4.portal_booking']], - 'destination_solutions' => ['label' => 'Destination Solutions', 'match' => ['destination solution'], 'inquiry' => [], 'booking' => ['a3.portal_booking']], - 'inquiry_listing' => ['label' => 'Inserat mit Anfragen (z. B. ferienundwohnen.de, Ostseeklar)', 'match' => ['ferienundwohnen', 'ostseeklar', 'strandurlaub', 'ferienunterkunft'], 'inquiry' => ['a2.offer', 'a2.information'], 'booking' => []], - 'generic' => ['label' => 'Sonstiges Portal', 'inquiry' => ['a2.offer', 'a2.information'], 'booking' => ['a3.portal_booking', 'a4.portal_booking', 'a5.portal_booking']], + 'website' => ['label' => 'Eigene Webseite', 'capabilities' => []], + 'fewo_direkt' => ['label' => 'FeWo-direkt (Vrbo)', 'match' => ['fewo-direkt', 'fewo direkt', 'vrbo'], 'capabilities' => ['collects_payment' => true, 'provides_contract_documents' => false, 'messages_guest' => true, 'sends_confirmation_mail' => null]], + 'destination_solutions' => ['label' => 'Destination Solutions', 'match' => ['destination solution'], 'capabilities' => ['collects_payment' => false, 'provides_contract_documents' => false, 'messages_guest' => false, 'sends_confirmation_mail' => null]], + 'inquiry_listing' => ['label' => 'Inserat mit Anfragen (z. B. ferienundwohnen.de, Ostseeklar)', 'match' => ['ferienundwohnen', 'ostseeklar', 'strandurlaub', 'ferienunterkunft'], 'capabilities' => []], + 'generic' => ['label' => 'Sonstiges Portal', 'capabilities' => []], ], 'removal_confirmation_runs' => 2, diff --git a/config/process.php b/config/process.php index 4bfefaa..6685d56 100644 --- a/config/process.php +++ b/config/process.php @@ -28,10 +28,12 @@ Intake\AvailabilityCheck::class, Intake\PortalBinding::class, Intake\ChannelBlocks::class, + Intake\PortalConfirmationStep::class, Offer\Information::class, Offer\BindingOffer::class, Offer\OfferAcceptance::class, Settlement\BookingDocuments::class, + Settlement\BookingNoticeStep::class, Settlement\StayConfirmation::class, Settlement\CaseTasks::class, Settlement\ChangeProposal::class, @@ -55,6 +57,8 @@ */ 'compatible' => [ 'offer.binding' => [1], + // V2.1: contract_delivery / portal confirmation were added; with the defaults the step behaves as in version 1. + 'documents.send' => [1], ], 'models' => [ @@ -62,9 +66,9 @@ 'a1.information' => [1 => Models\A1InformationModel::class], 'a2.offer' => [1 => Models\A2OfferModel::class], 'a2.information' => [1 => Models\A2InformationModel::class], - 'a3.portal_booking' => [1 => Models\A3PortalBookingModel::class], - 'a4.portal_booking' => [1 => Models\A4PortalBookingModel::class], - 'a5.portal_booking' => [1 => Models\A5PortalBookingModel::class], + 'a3.portal_booking' => [1 => Models\A3PortalBookingModelV1::class, 2 => Models\A3PortalBookingModel::class], + 'a4.portal_booking' => [1 => Models\A4PortalBookingModelV1::class, 2 => Models\A4PortalBookingModel::class], + 'a5.portal_booking' => [1 => Models\A5PortalBookingModelV1::class, 2 => Models\A5PortalBookingModel::class], 'a6.internal' => [1 => Models\A6InternalModel::class], ], ]; diff --git a/resources/views/filament/resources/channels/channel-process.blade.php b/resources/views/filament/resources/channels/channel-process.blade.php index fee9bda..20670c2 100644 --- a/resources/views/filament/resources/channels/channel-process.blade.php +++ b/resources/views/filament/resources/channels/channel-process.blade.php @@ -20,21 +20,53 @@ @endif + @if (! $this->record->isWebsite()) + @php($capabilities = $this->capabilities()) + +
+ @foreach ($capabilities as $key => $capability) + + @endforeach +
+
+ @endif + @if ($models === []) -

Für diesen Kanal ist für diese Eingangsart kein Ablaufmodell freigegeben (Kanalprofil). Vorgänge folgen weiter dem aus den Einstellungen abgeleiteten Ablauf.

+

Für diese Eingangsart gibt es keine Ablaufmodelle.

@endif -
- @foreach ($models as $key => $candidate) - +
+ @foreach ($models as $key => $option) + @php($candidate = $option['model']) +
+ + @foreach ($option['restrictions'] as $restriction) +

Passt gerade nicht ({{ $restriction->kind }}): {{ $restriction->reason }}@if ($restriction->alternative)
Zulässig ist stattdessen: {{ $restriction->alternative }}.@endif @if ($restriction->change)
{{ $restriction->change }}.@endif

+ @endforeach + @foreach ($option['hints'] as $hint)

{{ $hint }}

@endforeach + @if ($draft['model'] === $key && ! $option['admissible'])

Dies ist Ihr bisheriger Ablauf. Er bleibt wirksam, bis Sie ein passendes Modell wählen oder die Fähigkeit oben ändern.

@endif +
@endforeach
+ @if ($conflicts = $this->conflicts()) +
+ Bisherige Einstellungen widersprechen diesem Modell +
    @foreach ($conflicts as $conflict)
  • {{ $conflict['text'] }}
  • @endforeach
+ +
+ @endif + @if (count($model->variants()) > 1)