Vorgang: Schritte im Ablauf anklickbar – was geschah, Herkunft der Angaben, korrigieren
Deploy FeWo mit PipelineManager / deploy (push) Successful in 5m13s
Deploy FeWo mit PipelineManager / deploy (push) Successful in 5m13s
- Ein Klick auf einen Schritt im „Ablauf“ öffnet seine Einzelheiten: die Verlaufseinträge dieses Schritts und bei den Gastangaben jede Angabe mit Wert, Herkunft (Webseite, Link, E-Mail, KI, Sie), Zeitpunkt, Belegstelle, Sicherheit und offenen Abweichungen. - „Angaben korrigieren“ öffnet den Eintragsdialog: Ihre Eingabe gilt, der vorherige Wert bleibt im Nachweis; „Diesen Schritt ausführen“ führt direkt zur Aktion des Schritts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ad63db78f3
commit
7e4e208d18
5 files changed
+219
-2
No files matched your search
@@ -15,6 +15,7 @@
|
||||
use App\Actions\SetBookingStatus;
|
||||
use App\Documents\OfferTerms;
|
||||
use App\Documents\RentalContract;
|
||||
use App\Enums\ActivityState;
|
||||
use App\Enums\AdminMode;
|
||||
use App\Enums\AmountKind;
|
||||
use App\Enums\BookingStatus;
|
||||
@@ -43,6 +44,8 @@
|
||||
use App\Models\User;
|
||||
use App\Pricing\PrivateStayPrice;
|
||||
use App\Pricing\QuoteException;
|
||||
use App\Process\Activity;
|
||||
use App\Process\ActivityDetails;
|
||||
use App\Process\CaseActivities;
|
||||
use App\Process\CaseAutomation;
|
||||
use App\Process\CaseLog;
|
||||
@@ -354,6 +357,37 @@ private function openFactConflicts(): string
|
||||
return $notes === [] ? '' : ' Abweichende Angaben des Gastes – bitte den richtigen Wert eintragen: '.implode(' · ', $notes);
|
||||
}
|
||||
|
||||
/**
|
||||
* What lies behind one step of the progress list (clicked in "Ablauf"): its history entries and – for the guest's
|
||||
* details – each detail with source, time, evidence and certainty, with the way to correct it or to do the step.
|
||||
*/
|
||||
public function activityDetailsAction(): Action
|
||||
{
|
||||
return Action::make('activityDetails')
|
||||
->modalHeading(fn (array $arguments): string => ActivityDetails::activity($this->record, (string) ($arguments['key'] ?? ''))?->label ?? 'Schritt')
|
||||
->modalWidth('4xl')
|
||||
->modalSubmitAction(false)
|
||||
->modalCancelActionLabel('Schließen')
|
||||
->modalContent(function (array $arguments): \Illuminate\Contracts\View\View {
|
||||
$key = (string) ($arguments['key'] ?? '');
|
||||
$activity = ActivityDetails::activity($this->record, $key);
|
||||
|
||||
return view('filament.activity-details', [
|
||||
'activity' => $activity ?? new Activity($key, 'Schritt', ActivityState::NotApplicable),
|
||||
'events' => ActivityDetails::events($this->record, $key),
|
||||
'facts' => ActivityDetails::showsFacts($key) ? ActivityDetails::facts($this->record->loadMissing('guest')) : null,
|
||||
]);
|
||||
})
|
||||
->extraModalFooterActions(fn (array $arguments): array => array_values(array_filter([
|
||||
ActivityDetails::showsFacts((string) ($arguments['key'] ?? '')) && $this->record->internal_kind !== InternalKind::Block
|
||||
? Action::make('correctFacts')->label('Angaben korrigieren')->color('primary')->action(fn () => $this->replaceMountedAction('provideContact'))
|
||||
: null,
|
||||
($step = ActivityDetails::activity($this->record, (string) ($arguments['key'] ?? ''))?->action) !== null && $step !== 'provideContact'
|
||||
? Action::make('doStep')->label('Diesen Schritt ausführen')->action(fn () => $this->replaceMountedAction($step))
|
||||
: null,
|
||||
])));
|
||||
}
|
||||
|
||||
/**
|
||||
* v0.11 data request: send the prepared question (or ask now although the case is set to asking by hand).
|
||||
*/
|
||||
|
||||
@@ -50,7 +50,7 @@ public static function configure(Schema $schema): Schema
|
||||
->columnSpan(2)
|
||||
->schema([
|
||||
Section::make('Ablauf')
|
||||
->description('Was erledigt ist, was wartet und was noch kommt.')
|
||||
->description('Was erledigt ist, was wartet und was noch kommt. Ein Klick auf einen Schritt zeigt, was dort geschah und woher die Angaben stammen.')
|
||||
->schema([TextEntry::make('activities')->hiddenLabel()->state(fn (Booking $record): HtmlString => self::activities($record))->html()]),
|
||||
Section::make('Preis und Zahlungen')
|
||||
->schema([
|
||||
@@ -217,7 +217,8 @@ private static function activities(Booking $booking): HtmlString
|
||||
$color = $colors[$activity->state->getColor()];
|
||||
$strong = $activity->state->needsAction() ? 'font-weight:700' : '';
|
||||
|
||||
return '<li style="display:flex;gap:.75rem;padding:.45rem 0;border-bottom:1px solid rgba(128,128,128,.2)">'
|
||||
// A click opens what lies behind the step (ViewBooking::activityDetailsAction).
|
||||
return '<li style="display:flex;gap:.75rem;padding:.45rem 0;border-bottom:1px solid rgba(128,128,128,.2);cursor:pointer" title="Einzelheiten ansehen" wire:click="mountAction('activityDetails', { key: ''.e($activity->key).'' })">'
|
||||
.'<span style="width:1.4rem;text-align:center;font-weight:700;color:'.$color.'">'.$activity->state->icon().'</span>'
|
||||
.'<span style="flex:1;'.$strong.'">'.e($activity->label)
|
||||
.($activity->detail ? ' <span style="font-weight:400;color:#6b7280">· '.e($activity->detail).'</span>' : '')
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
<?php
|
||||
|
||||
namespace App\Process;
|
||||
|
||||
use App\Enums\FactSource;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingEvent;
|
||||
use App\Models\CaseFact;
|
||||
use Illuminate\Support\Collection;
|
||||
|
||||
/**
|
||||
* What lies behind one step of the case's progress list: the history entries that belong to it and – for the guest's
|
||||
* details – every detail with its source, time, evidence and certainty (v0.11, S5), so the landlord can see where a
|
||||
* value came from and correct it.
|
||||
*/
|
||||
final class ActivityDetails
|
||||
{
|
||||
/** History types per step (the step's own key or its prefix). */
|
||||
private const EVENT_TYPES = [
|
||||
'intake' => ['created', 'intake', 'profile', 'hold', 'mode'],
|
||||
'contact' => ['facts', 'fact', 'guest', 'data_request', 'mail_in'],
|
||||
'data_request' => ['data_request', 'mail_in', 'facts', 'fact'],
|
||||
'information' => ['information', 'mail', 'hold'],
|
||||
'wish' => ['wish'],
|
||||
'wish_check' => ['wish', 'status'],
|
||||
'offer' => ['offer', 'hold', 'mail', 'status'],
|
||||
'acceptance' => ['offer', 'status'],
|
||||
'binding' => ['status', 'portal_signal'],
|
||||
'price' => ['price', 'amount'],
|
||||
'documents' => ['document', 'mail'],
|
||||
'arrival_info' => ['document', 'mail'],
|
||||
'review' => ['mail'],
|
||||
'payment' => ['payment', 'amount'],
|
||||
'deposit' => ['payment'],
|
||||
'balance' => ['payment'],
|
||||
'payout' => ['payment', 'amount'],
|
||||
'change_proposed' => ['change'],
|
||||
'arrival_details' => ['task', 'services'],
|
||||
'stay' => ['task', 'services', 'status'],
|
||||
'closure' => ['task', 'status', 'settled'],
|
||||
'settlement' => ['settled'],
|
||||
'task_' => ['task'],
|
||||
];
|
||||
|
||||
public static function activity(Booking $booking, string $key): ?Activity
|
||||
{
|
||||
return collect(CaseActivities::for($booking))->first(fn (Activity $activity): bool => $activity->key === $key);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, BookingEvent>
|
||||
*/
|
||||
public static function events(Booking $booking, string $key): Collection
|
||||
{
|
||||
$types = self::EVENT_TYPES[$key] ?? (str_starts_with($key, 'task_') ? self::EVENT_TYPES['task_'] : []);
|
||||
|
||||
return $types === [] ? collect() : $booking->events()->whereIn('type', $types)->reorder()->latest('occurred_at')->latest('id')->limit(50)->get();
|
||||
}
|
||||
|
||||
public static function showsFacts(string $key): bool
|
||||
{
|
||||
return in_array($key, ['contact', 'data_request', 'intake'], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Every detail of the guest and the stay with its current value and where it came from (latest decisive fact).
|
||||
*
|
||||
* @return list<array{field: string, label: string, value: ?string, source: ?string, actor: ?string, at: ?string, evidence: ?string, confidence: ?float, open: list<string>}>
|
||||
*/
|
||||
public static function facts(Booking $booking): array
|
||||
{
|
||||
$facts = CaseFact::query()->where('booking_id', $booking->id)->orderBy('id')->get()->groupBy('field');
|
||||
$rows = [];
|
||||
|
||||
foreach ([...CaseRequirements::FIELDS, ...CaseRequirements::OPTIONAL_FIELDS] as $field => $label) {
|
||||
$value = CaseRequirements::value($booking, $field);
|
||||
/** @var Collection<int, CaseFact> $history */
|
||||
$history = $facts->get($field, collect());
|
||||
$decisive = $history->reverse()->first(fn (CaseFact $fact): bool => in_array($fact->outcome, [CaseFact::APPLIED, CaseFact::CONFIRMED], true));
|
||||
$open = $history->filter(fn (CaseFact $fact): bool => in_array($fact->outcome, [CaseFact::CONFLICT, CaseFact::CHANGE_REQUEST], true) && $fact->created_at->greaterThanOrEqualTo($decisive?->created_at ?? $fact->created_at))
|
||||
->map(fn (CaseFact $fact): string => '„'.$fact->value.'“ laut '.$fact->source->getLabel().' – '.$fact->outcomeLabel())->values()->all();
|
||||
|
||||
if (blank($value) && $history->isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$rows[] = [
|
||||
'field' => $field,
|
||||
'label' => $label,
|
||||
'value' => filled($value) ? (string) $value : null,
|
||||
'source' => $decisive?->source instanceof FactSource ? $decisive->source->getLabel() : (filled($value) ? 'vor der Herkunftsaufzeichnung erfasst' : null),
|
||||
'actor' => $decisive?->actor,
|
||||
'at' => $decisive?->created_at?->format('d.m.Y, H:i'),
|
||||
'evidence' => $decisive?->evidence,
|
||||
'confidence' => $decisive?->confidence,
|
||||
'open' => $open,
|
||||
];
|
||||
}
|
||||
|
||||
return $rows;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
<div style="display:flex;flex-direction:column;gap:1rem;font-size:.9rem">
|
||||
<div>
|
||||
<strong>{{ $activity->state->getLabel() }}</strong>@if ($activity->detail) · {{ $activity->detail }}@endif
|
||||
</div>
|
||||
|
||||
@if ($facts !== null)
|
||||
<div>
|
||||
<div style="font-weight:600;margin-bottom:.35rem">Angaben und ihre Herkunft</div>
|
||||
@if ($facts === [])
|
||||
<p style="color:#6b7280">Noch keine Angaben.</p>
|
||||
@else
|
||||
<table style="width:100%;border-collapse:collapse">
|
||||
<thead>
|
||||
<tr style="text-align:left;color:#6b7280;border-bottom:1px solid rgba(128,128,128,.3)">
|
||||
<th style="padding:.3rem .4rem">Angabe</th><th style="padding:.3rem .4rem">Wert</th><th style="padding:.3rem .4rem">Herkunft</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($facts as $row)
|
||||
<tr style="border-bottom:1px solid rgba(128,128,128,.2);vertical-align:top">
|
||||
<td style="padding:.3rem .4rem">{{ $row['label'] }}</td>
|
||||
<td style="padding:.3rem .4rem">{{ $row['value'] ?? '–' }}</td>
|
||||
<td style="padding:.3rem .4rem">
|
||||
{{ $row['source'] ?? '–' }}@if ($row['at']) · {{ $row['at'] }}@endif
|
||||
@if ($row['confidence'] !== null)<span style="color:#6b7280"> · Sicherheit {{ number_format($row['confidence'] * 100, 0) }} %</span>@endif
|
||||
@if ($row['evidence'])<div style="color:#6b7280">Beleg: „{{ \Illuminate\Support\Str::limit($row['evidence'], 160) }}“</div>@endif
|
||||
@foreach ($row['open'] as $open)<div style="color:#b45309">Offen: {{ $open }}</div>@endforeach
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<p style="color:#6b7280;margin-top:.35rem">Stimmt etwas nicht, korrigieren Sie es mit „Angaben korrigieren“. Ihre Eingabe gilt, der vorherige Wert bleibt im Nachweis erhalten.</p>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div>
|
||||
<div style="font-weight:600;margin-bottom:.35rem">Was dazu geschah</div>
|
||||
@if ($events->isEmpty())
|
||||
<p style="color:#6b7280">Keine Einträge zu diesem Schritt. Der vollständige Verlauf steht im Bereich „Verlauf“.</p>
|
||||
@else
|
||||
<ul style="list-style:none;padding:0;margin:0">
|
||||
@foreach ($events as $event)
|
||||
<li style="margin:.25rem 0"><span style="color:#6b7280">{{ $event->occurred_at->format('d.m.Y H:i') }}</span> · {{ $event->summary }}@if ($event->actor) <span style="color:#6b7280">({{ $event->actor }})</span>@endif
|
||||
@if ($event->reason)<div style="color:#6b7280;margin-left:1rem">Grund: {{ $event->reason }}</div>@endif
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@@ -5,6 +5,7 @@
|
||||
use App\Actions\ContributeCaseFacts;
|
||||
use App\Actions\CreateReservation;
|
||||
use App\Actions\DecideBookingWish;
|
||||
use App\Actions\ProvideGuestContact;
|
||||
use App\Actions\SendInformation;
|
||||
use App\Actions\SendOffer;
|
||||
use App\Actions\SubmitBookingWish;
|
||||
@@ -15,23 +16,28 @@
|
||||
use App\Enums\DocumentKind;
|
||||
use App\Enums\FactSource;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Filament\Resources\Bookings\Pages\ViewBooking;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingTask;
|
||||
use App\Models\CaseFact;
|
||||
use App\Models\Channel;
|
||||
use App\Models\Guest;
|
||||
use App\Models\Property;
|
||||
use App\Models\User;
|
||||
use App\Pricing\StayRequest;
|
||||
use App\Process\ActivityDetails;
|
||||
use App\Process\CaseRequirements;
|
||||
use App\Support\Content;
|
||||
use App\Support\Settings;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Database\Seeders\PropertySeeder;
|
||||
use Database\Seeders\SiteSeeder;
|
||||
use Filament\Actions\Testing\TestAction;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Livewire\Livewire;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
@@ -206,6 +212,28 @@ public function test_completing_the_address_continues_an_automatic_case(): void
|
||||
$this->assertSame(BookingStatus::OfferSent, $booking->fresh()->status);
|
||||
}
|
||||
|
||||
/** A step of the progress list shows where each detail came from and lets the landlord correct it. */
|
||||
public function test_the_progress_list_shows_the_source_of_each_detail_and_the_landlord_corrects_it(): void
|
||||
{
|
||||
$this->actingAs(User::factory()->create());
|
||||
$booking = $this->request();
|
||||
app(ContributeCaseFacts::class)->handle($booking, ['guest.street' => 'Lindenallee 12'], FactSource::Extraction, ['reference' => 'message:1', 'evidence' => ['guest.street' => 'unsere Anschrift: Lindenallee 12'], 'confidence' => ['guest.street' => 0.9]]);
|
||||
|
||||
Livewire::test(ViewBooking::class, ['record' => $booking->getRouteKey()])
|
||||
->assertSeeHtml('mountAction('activityDetails', { key: 'contact' })')
|
||||
->mountAction(TestAction::make('activityDetails')->arguments(['key' => 'contact']))
|
||||
->assertActionMounted('activityDetails')
|
||||
->assertMountedActionModalSee(['Angaben und ihre Herkunft', 'Lindenallee 12', 'aus einer Nachricht erkannt (KI)', 'Sicherheit 90 %', 'unsere Anschrift: Lindenallee 12', 'Anfrageformular der Webseite']);
|
||||
|
||||
Livewire::test(ViewBooking::class, ['record' => $booking->getRouteKey()])
|
||||
->callAction(TestAction::make('provideContact')->arguments([]), ['guest' => ['first_name' => 'Gesa', 'last_name' => 'Gast', 'email' => 'gesa@example.org', 'street' => 'Lindenallee 21'], 'process' => ProvideGuestContact::MANUAL, 'guest_confirmed' => false]);
|
||||
|
||||
$this->assertSame('Lindenallee 21', $booking->guest->fresh()->street);
|
||||
$row = collect(ActivityDetails::facts($booking->fresh()))->firstWhere('field', 'guest.street');
|
||||
$this->assertSame(['Lindenallee 21', 'von Ihnen eingetragen'], [$row['value'], $row['source']]);
|
||||
$this->assertSame('Lindenallee 12', CaseFact::query()->where('field', 'guest.street')->where('source', FactSource::Landlord)->sole()->previous_value, 'the corrected value stays in the evidence');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, ?string> $address
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user