diff --git a/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php b/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php index defcf01..4d765a0 100644 --- a/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php +++ b/app/Filament/Resources/Appearances/Schemas/AppearanceForm.php @@ -45,7 +45,7 @@ public static function configure(Schema $schema): Schema Text::make(fn (?Appearance $record): string => self::photoSummary($record)), ]), Section::make('Texte') - ->description('Leer lassen = Text der Seite bzw. kein Banner.') + ->description('Leer lassen = Text der Seite. Banner pflegen Sie unter Webseite › Banner & Hinweise – dort auch nur für dieses Erscheinungsbild.') ->columns(2) ->collapsible() ->schema(collect(Appearance::OVERRIDABLE) diff --git a/app/Filament/Resources/Notices/NoticeResource.php b/app/Filament/Resources/Notices/NoticeResource.php index 39d6e03..f430633 100644 --- a/app/Filament/Resources/Notices/NoticeResource.php +++ b/app/Filament/Resources/Notices/NoticeResource.php @@ -9,6 +9,10 @@ use App\Filament\Resources\Notices\Schemas\NoticeForm; use App\Filament\Resources\Notices\Tables\NoticesTable; use App\Models\Notice; +use App\Models\Site; +use App\Tenancy\TenantContext; +use App\Themes\Banner; +use App\Themes\ThemeFactory; use BackedEnum; use Filament\Resources\Resource; use Filament\Schemas\Schema; @@ -26,9 +30,9 @@ class NoticeResource extends Resource protected static string|UnitEnum|null $navigationGroup = 'Webseite'; - protected static ?string $modelLabel = 'Hinweis'; + protected static ?string $modelLabel = 'Banner'; - protected static ?string $pluralModelLabel = 'Hinweis-Banner'; + protected static ?string $pluralModelLabel = 'Banner & Hinweise'; protected static ?int $navigationSort = 6; @@ -49,6 +53,31 @@ public static function getRelations(): array ]; } + /** + * The banner each website shows today (none = null), with the website. + * + * @return list + */ + public static function bannersToday(): array + { + $tenantId = app(TenantContext::class)->id(); + + // once() keys its cache by the variables the closure uses, so each landlord gets its own entry. + return once(function () use ($tenantId): array { + return Site::query()->when($tenantId, fn ($query) => $query->where('tenant_id', $tenantId))->orderBy('name')->get() + ->map(fn (Site $site): array => ['site' => $site, 'banner' => app(ThemeFactory::class)->forSite($site)->banner()]) + ->all(); + }); + } + + /** + * @return list + */ + public static function noticeIdsShownToday(): array + { + return collect(self::bannersToday())->pluck('banner')->filter()->map(fn (Banner $banner): int => $banner->notice->id)->unique()->values()->all(); + } + public static function getPages(): array { return [ diff --git a/app/Filament/Resources/Notices/Pages/ListNotices.php b/app/Filament/Resources/Notices/Pages/ListNotices.php index b2870e2..5899295 100644 --- a/app/Filament/Resources/Notices/Pages/ListNotices.php +++ b/app/Filament/Resources/Notices/Pages/ListNotices.php @@ -10,6 +10,23 @@ class ListNotices extends ListRecords { protected static string $resource = NoticeResource::class; + /** + * Which banner the website shows today – the answer to "why do I see this banner?". + */ + public function getSubheading(): ?string + { + $today = NoticeResource::bannersToday(); + if ($today === []) { + return null; + } + + return collect($today)->map(function (array $entry) use ($today): string { + $prefix = count($today) > 1 ? $entry['site']->name.': ' : ''; + + return $prefix.($entry['banner'] ? 'Heute sichtbar: „'.$entry['banner']->text.'“' : 'Heute ist kein Banner sichtbar.'); + })->implode(' · '); + } + protected function getHeaderActions(): array { return [ diff --git a/app/Filament/Resources/Notices/Schemas/NoticeForm.php b/app/Filament/Resources/Notices/Schemas/NoticeForm.php index 650e885..9bbb7ab 100644 --- a/app/Filament/Resources/Notices/Schemas/NoticeForm.php +++ b/app/Filament/Resources/Notices/Schemas/NoticeForm.php @@ -3,10 +3,17 @@ namespace App\Filament\Resources\Notices\Schemas; use App\Enums\NoticeTone; +use App\Filament\Resources\Photos\Schemas\PhotoForm; +use App\Models\Appearance; +use App\Models\Property; +use App\Models\Site; +use App\Models\SpecialOffer; use Filament\Forms\Components\DatePicker; use Filament\Forms\Components\Select; use Filament\Forms\Components\TextInput; use Filament\Forms\Components\Toggle; +use Filament\Schemas\Components\Section; +use Filament\Schemas\Components\Utilities\Get; use Filament\Schemas\Schema; class NoticeForm @@ -14,36 +21,87 @@ class NoticeForm public static function configure(Schema $schema): Schema { return $schema - ->columns(2) ->components([ - TextInput::make('text') - ->label('Hinweistext') - ->placeholder('z. B. Kurzfristig frei: 12.–15.11. mit 15 % Rabatt') - ->required() - ->maxLength(255) - ->columnSpanFull(), - Select::make('tone') - ->label('Art') - ->options(NoticeTone::class) - ->default(NoticeTone::Info) - ->required(), - Toggle::make('is_active') - ->label('Aktiv') - ->default(true) - ->inline(false), - DatePicker::make('starts_on') - ->label('Anzeigen ab (optional)'), - DatePicker::make('ends_on') - ->label('Anzeigen bis (optional)') - ->afterOrEqual('starts_on'), - TextInput::make('link_label') - ->label('Link-Text (optional)') - ->placeholder('z. B. Jetzt anfragen') - ->maxLength(100), - TextInput::make('link_url') - ->label('Link-Ziel (optional)') - ->placeholder('/buchen') - ->maxLength(255), + Section::make('Inhalt') + ->columns(2) + ->schema([ + Select::make('special_offer_id') + ->label('Sonderangebot bewerben (optional)') + ->options(fn (): array => self::offerOptions()) + ->placeholder('– kein Angebot –') + ->searchable() + ->live() + ->helperText('Mit Angebot kommen Text, Termin und Link aus dem Angebot, und das Banner erscheint nur, solange die Website das Angebot bewirbt – bei festen Terminen also nur, solange sie frei sind.') + ->columnSpanFull(), + TextInput::make('text') + ->label('Text') + ->placeholder(fn (Get $get): string => filled($get('special_offer_id')) ? 'leer = Text aus dem Angebot' : 'z. B. Kurzfristig frei: 12.–15.11. mit 15 % Rabatt') + ->required(fn (Get $get): bool => blank($get('special_offer_id'))) + ->maxLength(255) + ->columnSpanFull(), + TextInput::make('link_label') + ->label('Link-Text (optional)') + ->placeholder(fn (Get $get): string => filled($get('special_offer_id')) ? 'Zum Angebot' : 'z. B. Jetzt anfragen') + ->maxLength(100), + TextInput::make('link_url') + ->label('Link-Ziel (optional)') + ->placeholder(fn (Get $get): string => filled($get('special_offer_id')) ? 'Buchung mit den Angebotsterminen' : '/buchen') + ->maxLength(255), + Select::make('tone') + ->label('Art') + ->options(NoticeTone::class) + ->default(NoticeTone::Info) + ->required(), + ]), + Section::make('Wann und wo') + ->description('Es erscheint immer nur ein Banner: Gelten mehrere gleichzeitig, gewinnt die höchste Priorität, bei Gleichstand das neueste.') + ->columns(2) + ->schema([ + Select::make('site_id') + ->label('Website') + ->options(fn (): array => Site::query()->pluck('name', 'id')->all()) + ->placeholder('alle Websites') + ->visible(fn (): bool => Site::query()->count() > 1), + Select::make('appearance_ids') + ->label('Nur in Erscheinungsbildern') + ->multiple() + ->options(fn (): array => Appearance::photoOptions()) + ->placeholder('immer') + ->helperText('Leer = in jedem Erscheinungsbild, z. B. Weihnachten und Silvester für ein Festtagsbanner.') + ->dehydrateStateUsing(fn (?array $state): ?array => PhotoForm::appearanceIds($state)), + DatePicker::make('starts_on') + ->label('Anzeigen ab (optional)'), + DatePicker::make('ends_on') + ->label('Anzeigen bis (optional)') + ->afterOrEqual('starts_on'), + TextInput::make('priority') + ->label('Priorität') + ->integer() + ->minValue(0) + ->maxValue(999) + ->default(10) + ->required(), + Toggle::make('is_active') + ->label('Aktiv') + ->default(true) + ->inline(false), + ]), ]); } + + /** + * Offers the website can advertise (public, without a code), named with their apartment when there are several. + * + * @return array + */ + public static function offerOptions(): array + { + $severalProperties = Property::query()->count() > 1; + + return SpecialOffer::query()->with('property')->where('is_public', true)->whereNull('code')->orderBy('name')->get() + ->mapWithKeys(fn (SpecialOffer $offer): array => [$offer->id => $offer->name + .($severalProperties ? ' · '.$offer->property?->name : '') + .($offer->is_active ? '' : ' (inaktiv)')]) + ->all(); + } } diff --git a/app/Filament/Resources/Notices/Tables/NoticesTable.php b/app/Filament/Resources/Notices/Tables/NoticesTable.php index c0467bf..cec3464 100644 --- a/app/Filament/Resources/Notices/Tables/NoticesTable.php +++ b/app/Filament/Resources/Notices/Tables/NoticesTable.php @@ -2,8 +2,11 @@ namespace App\Filament\Resources\Notices\Tables; +use App\Filament\Resources\Notices\NoticeResource; +use App\Models\Notice; use Filament\Actions\DeleteAction; use Filament\Actions\EditAction; +use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Columns\ToggleColumn; use Filament\Tables\Table; @@ -13,14 +16,33 @@ class NoticesTable public static function configure(Table $table): Table { return $table - ->defaultSort('starts_on', 'desc') + ->defaultSort('priority', 'desc') ->columns([ - TextColumn::make('text')->label('Hinweis')->wrap()->searchable(), - TextColumn::make('tone')->label('Art')->badge(), + IconColumn::make('shown_today') + ->label('Heute') + ->state(fn (Notice $record): bool => in_array($record->id, NoticeResource::noticeIdsShownToday(), true)) + ->boolean() + ->trueIcon('heroicon-s-eye') + ->falseIcon('heroicon-o-minus') + ->tooltip(fn (bool $state): string => $state ? 'Wird heute auf der Website gezeigt' : 'Heute nicht sichtbar'), + TextColumn::make('text') + ->label('Banner') + ->state(fn (Notice $record): string => filled($record->text) ? $record->text : 'Text aus dem Angebot') + ->description(fn (Notice $record): ?string => $record->specialOffer ? 'Angebot: '.$record->specialOffer->name : null) + ->wrap() + ->searchable(), + TextColumn::make('appearance_ids') + ->label('Erscheinungsbilder') + ->state(fn (Notice $record): array => $record->appearanceNames()) + ->badge() + ->placeholder('immer'), + TextColumn::make('site.name')->label('Website')->placeholder('alle')->toggleable(isToggledHiddenByDefault: true), TextColumn::make('starts_on')->label('Ab')->date('d.m.Y')->placeholder('sofort'), TextColumn::make('ends_on')->label('Bis')->date('d.m.Y')->placeholder('unbegrenzt'), + TextColumn::make('priority')->label('Priorität')->sortable(), ToggleColumn::make('is_active')->label('Aktiv'), ]) + ->modifyQueryUsing(fn ($query) => $query->with(['specialOffer', 'site'])) ->recordActions([ EditAction::make(), DeleteAction::make(), diff --git a/app/Filament/Resources/Properties/RelationManagers/SpecialOffersRelationManager.php b/app/Filament/Resources/Properties/RelationManagers/SpecialOffersRelationManager.php index e45b7d0..22e61ef 100644 --- a/app/Filament/Resources/Properties/RelationManagers/SpecialOffersRelationManager.php +++ b/app/Filament/Resources/Properties/RelationManagers/SpecialOffersRelationManager.php @@ -3,8 +3,12 @@ namespace App\Filament\Resources\Properties\RelationManagers; use App\Enums\DiscountType; +use App\Enums\NoticeTone; use App\Enums\OfferKind; +use App\Filament\Resources\Notices\NoticeResource; +use App\Models\Notice; use App\Models\SpecialOffer; +use Filament\Actions\Action; use Filament\Actions\CreateAction; use Filament\Actions\DeleteAction; use Filament\Actions\EditAction; @@ -21,9 +25,11 @@ use Filament\Schemas\Components\Utilities\Get; use Filament\Schemas\Components\Utilities\Set; use Filament\Schemas\Schema; +use Filament\Support\Icons\Heroicon; use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; +use Illuminate\Support\Facades\Gate; class SpecialOffersRelationManager extends RelationManager { @@ -218,6 +224,21 @@ public function table(Table $table): Table ]) ->recordActions([ EditAction::make(), + Action::make('banner') + ->label('Als Banner zeigen') + ->icon(Heroicon::OutlinedMegaphone) + ->visible(fn (SpecialOffer $record): bool => $record->is_public && blank($record->code) && Gate::allows('create', Notice::class)) + ->action(function (SpecialOffer $record) { + $notice = Notice::query()->create([ + 'site_id' => $record->property?->site_id, + 'special_offer_id' => $record->id, + 'tone' => NoticeTone::Offer, + 'priority' => 30, + 'is_active' => true, + ]); + + return redirect(NoticeResource::getUrl('edit', ['record' => $notice])); + }), ReplicateAction::make()->label('Duplizieren')->schema(fn (Schema $schema): Schema => $this->form($schema)), DeleteAction::make(), ]); diff --git a/app/Models/Appearance.php b/app/Models/Appearance.php index 247313c..6cbc520 100644 --- a/app/Models/Appearance.php +++ b/app/Models/Appearance.php @@ -12,8 +12,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * A seasonal look of a site (e.g. summer, winter, Christmas, New Year's Eve): colour tokens, texts and banner - * change, photos made for it (Photo::appearance_ids) are shown – the page structure does not (sections may be limited to + * A seasonal look of a site (e.g. summer, winter, Christmas, New Year's Eve): colour tokens and texts change, + * photos and banners made for it (appearance_ids) are shown – the page structure does not (sections may be limited to * appearances, see SectionRegistry). Offers are advertised by their own rules (OfferShowcase). The period recurs every year ("MM-DD" to "MM-DD", * inclusive; a period may run over the turn of the year). The default appearance applies when none matches. */ @@ -27,9 +27,6 @@ class Appearance extends Model * Texts an appearance can replace, with their admin labels. Sections read them through Theme::text(). */ public const OVERRIDABLE = [ - 'banner.text' => 'Banner: Text', - 'banner.link_label' => 'Banner: Link-Text', - 'banner.link_url' => 'Banner: Link-Ziel', 'hero.eyebrow' => 'Titelbereich: kleine Überschrift', 'hero.title' => 'Titelbereich: Überschrift', 'hero.text' => 'Titelbereich: Text', @@ -67,12 +64,10 @@ public function site(): BelongsTo */ public static function names(): array { - // once() keys its cache by the closure's bound variables, so each landlord gets its own entry. $tenantId = app(TenantContext::class)->id(); - return once(function (): array { - return self::query()->pluck('name', 'id')->all(); - }); + // once() keys its cache by the variables the closure uses, so each landlord gets its own entry. + return once(fn (): array => self::query()->when($tenantId, fn ($query) => $query->where('tenant_id', $tenantId))->pluck('name', 'id')->all()); } /** diff --git a/app/Models/Concerns/BelongsToAppearances.php b/app/Models/Concerns/BelongsToAppearances.php new file mode 100644 index 0000000..a87109a --- /dev/null +++ b/app/Models/Concerns/BelongsToAppearances.php @@ -0,0 +1,48 @@ + + */ + public function appearanceIds(): array + { + return array_values(array_unique(array_map('intval', array_filter((array) $this->appearance_ids)))); + } + + /** + * Whether the record may be shown while this appearance is in effect: all-year ones always, seasonal ones in their seasons. + */ + public function fitsSeason(?Appearance $appearance): bool + { + return $this->appearanceIds() === [] || $this->isMadeFor($appearance); + } + + /** + * Whether the record was chosen for this appearance. + */ + public function isMadeFor(?Appearance $appearance): bool + { + return $appearance !== null && in_array($appearance->id, $this->appearanceIds(), true); + } + + /** + * Names of the appearances the record is made for (empty = all year). + * + * @return list + */ + public function appearanceNames(): array + { + return array_values(array_intersect_key(Appearance::names(), array_flip($this->appearanceIds()))); + } +} diff --git a/app/Models/Notice.php b/app/Models/Notice.php index 4f200a1..0a3775f 100644 --- a/app/Models/Notice.php +++ b/app/Models/Notice.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Enums\NoticeTone; +use App\Models\Concerns\BelongsToAppearances; use App\Models\Concerns\BelongsToTenant; use Database\Factories\NoticeFactory; use Illuminate\Database\Eloquent\Attributes\Fillable; @@ -10,15 +11,18 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * A banner shown on the website, optionally limited to a date range. + * A banner at the top of the website: for one website or all, optionally only in some appearances (seasons) + * and within a date range. It may advertise a special offer – then text, dates and link come from the offer + * and the banner only shows while the website advertises that offer. The highest priority wins (BannerResolver). */ -#[Fillable(['text', 'tone', 'link_url', 'link_label', 'starts_on', 'ends_on', 'is_active'])] +#[Fillable(['site_id', 'special_offer_id', 'appearance_ids', 'priority', 'text', 'tone', 'link_url', 'link_label', 'starts_on', 'ends_on', 'is_active'])] class Notice extends Model { /** @use HasFactory */ - use BelongsToTenant, HasFactory; + use BelongsToAppearances, BelongsToTenant, HasFactory; /** * Get the attributes that should be cast. @@ -29,12 +33,30 @@ protected function casts(): array { return [ 'tone' => NoticeTone::class, + 'appearance_ids' => 'array', + 'priority' => 'integer', 'starts_on' => 'immutable_date', 'ends_on' => 'immutable_date', 'is_active' => 'boolean', ]; } + /** + * @return BelongsTo + */ + public function site(): BelongsTo + { + return $this->belongsTo(Site::class); + } + + /** + * @return BelongsTo + */ + public function specialOffer(): BelongsTo + { + return $this->belongsTo(SpecialOffer::class); + } + /** * Active notices whose date range includes today. * diff --git a/app/Models/Photo.php b/app/Models/Photo.php index 70cc159..5982db4 100644 --- a/app/Models/Photo.php +++ b/app/Models/Photo.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Enums\PhotoCategory; +use App\Models\Concerns\BelongsToAppearances; use App\Models\Concerns\BelongsToTenant; use Database\Factories\PhotoFactory; use Illuminate\Database\Eloquent\Attributes\Fillable; @@ -26,7 +27,7 @@ class Photo extends Model implements HasMedia { /** @use HasFactory */ - use BelongsToTenant, HasFactory, InteractsWithMedia; + use BelongsToAppearances, BelongsToTenant, HasFactory, InteractsWithMedia; public const COLLECTION = 'image'; @@ -127,42 +128,6 @@ public static function automatic(?Property $property, ?Appearance $appearance, ? ->values(); } - /** - * Appearance ids as integers (the form may deliver strings). - * - * @return list - */ - public function appearanceIds(): array - { - return array_values(array_unique(array_map('intval', array_filter((array) $this->appearance_ids)))); - } - - /** - * Whether the photo may be shown while this appearance is in effect: all-year photos always, seasonal ones in their seasons. - */ - public function fitsSeason(?Appearance $appearance): bool - { - return $this->appearanceIds() === [] || $this->isMadeFor($appearance); - } - - /** - * Whether the photo was chosen for this appearance (seasonal photos come first while it is in effect). - */ - public function isMadeFor(?Appearance $appearance): bool - { - return $appearance !== null && in_array($appearance->id, $this->appearanceIds(), true); - } - - /** - * Names of the appearances the photo is made for (empty = all year). - * - * @return list - */ - public function appearanceNames(): array - { - return array_values(array_intersect_key(Appearance::names(), array_flip($this->appearanceIds()))); - } - public function url(string $size = 'md'): string { return $this->getFirstMediaUrl(self::COLLECTION, $size); diff --git a/app/Themes/Banner.php b/app/Themes/Banner.php new file mode 100644 index 0000000..99476eb --- /dev/null +++ b/app/Themes/Banner.php @@ -0,0 +1,20 @@ +candidates($site, $appearance) as $notice) { + $banner = $this->banner($notice); + if ($banner !== null) { + return $banner; + } + } + + return null; + } + + /** + * Visible notices for the website and the appearance, in the order they compete. + * + * @return Collection + */ + public function candidates(Site $site, ?Appearance $appearance): Collection + { + return Notice::query()->visible() + ->where(fn ($query) => $query->whereNull('site_id')->when($site->exists, fn ($query) => $query->orWhere('site_id', $site->id))) + ->with('specialOffer.property') + ->orderByDesc('priority') + ->latest() + ->orderByDesc('id') + ->get() + ->filter(fn (Notice $notice): bool => $notice->fitsSeason($appearance)) + ->values(); + } + + private function banner(Notice $notice): ?Banner + { + if ($notice->special_offer_id === null) { + return filled($notice->text) + ? new Banner($notice, (string) $notice->text, $notice->link_label, $notice->link_label ? ($notice->link_url ?: route('booking.create')) : null, $notice->tone) + : null; + } + + $offer = $notice->specialOffer; + $advertised = $offer?->property + ? $this->showcase->current($offer->property)->first(fn (AdvertisedOffer $advertised): bool => $advertised->offer->is($offer)) + : null; + if ($advertised === null) { + return null; + } + + return new Banner( + $notice, + filled($notice->text) ? (string) $notice->text : self::offerText($advertised), + $notice->link_label ?: 'Zum Angebot', + $notice->link_url ?: $advertised->bookingUrl(), + $notice->tone, + ); + } + + /** + * "Kurzfristig frei: 12.11.–15.11. · 15 % günstiger". + */ + public static function offerText(AdvertisedOffer $advertised): string + { + $dates = $advertised->arrival && $advertised->departure + ? ': '.$advertised->arrival->format('d.m.').'–'.$advertised->departure->format('d.m.') + : ''; + + return $advertised->title.$dates.' · '.$advertised->advantage; + } +} diff --git a/app/Themes/Theme.php b/app/Themes/Theme.php index 20c30b6..7bcfe53 100644 --- a/app/Themes/Theme.php +++ b/app/Themes/Theme.php @@ -23,6 +23,10 @@ class Theme private bool $propertyResolved = false; + private ?Banner $banner = null; + + private bool $bannerResolved = false; + /** @var array> */ private array $menus = []; @@ -115,6 +119,19 @@ public function sharePhoto(array $sections = []): ?Photo return $first ?? Photo::automatic($this->property(), $this->appearance)->first(); } + /** + * The banner at the top of the website right now (Admin › Webseite › Banner & Hinweise), or null. + */ + public function banner(): ?Banner + { + if (! $this->bannerResolved) { + $this->banner = app(BannerResolver::class)->for($this->site, $this->appearance); + $this->bannerResolved = true; + } + + return $this->banner; + } + public function appearanceKey(): string { return $this->appearance ? str($this->appearance->name)->slug()->toString() : 'standard'; diff --git a/database/migrations/2026_10_29_185454_turn_notices_into_banners.php b/database/migrations/2026_10_29_185454_turn_notices_into_banners.php new file mode 100644 index 0000000..69481c5 --- /dev/null +++ b/database/migrations/2026_10_29_185454_turn_notices_into_banners.php @@ -0,0 +1,60 @@ +string('text')->nullable()->change(); + $table->foreignId('site_id')->nullable()->after('tenant_id')->constrained()->cascadeOnDelete(); + $table->foreignId('special_offer_id')->nullable()->after('site_id')->constrained()->cascadeOnDelete(); + $table->json('appearance_ids')->nullable()->after('special_offer_id'); + $table->unsignedSmallInteger('priority')->default(10)->after('appearance_ids'); + }); + + foreach (DB::table('appearances')->get() as $appearance) { + $overrides = json_decode((string) $appearance->overrides, true) ?: []; + $banner = $overrides['banner'] ?? []; + if (filled($banner['text'] ?? null)) { + DB::table('notices')->insert([ + 'tenant_id' => $appearance->tenant_id, + 'site_id' => $appearance->site_id, + 'appearance_ids' => json_encode([$appearance->id]), + 'priority' => 20 + (int) $appearance->priority, + 'text' => $banner['text'], + 'tone' => 'info', + 'link_label' => $banner['link_label'] ?? null, + 'link_url' => $banner['link_url'] ?? null, + 'is_active' => $appearance->is_active, + 'created_at' => now(), + 'updated_at' => now(), + ]); + } + + if (array_key_exists('banner', $overrides)) { + unset($overrides['banner']); + DB::table('appearances')->where('id', $appearance->id)->update(['overrides' => json_encode($overrides)]); + } + } + } + + public function down(): void + { + Schema::table('notices', function (Blueprint $table) { + $table->dropConstrainedForeignId('special_offer_id'); + $table->dropConstrainedForeignId('site_id'); + $table->dropColumn(['appearance_ids', 'priority']); + }); + } +}; diff --git a/database/seeders/SiteSeeder.php b/database/seeders/SiteSeeder.php index 7fbb24c..00f87ba 100644 --- a/database/seeders/SiteSeeder.php +++ b/database/seeders/SiteSeeder.php @@ -2,6 +2,7 @@ namespace Database\Seeders; +use App\Models\Notice; use App\Models\Page; use App\Models\Property; use App\Models\Site; @@ -39,7 +40,13 @@ public function run(): void } foreach ($this->appearances() as $appearance) { - $site->appearances()->create([...$appearance, 'overrides' => Arr::undot($appearance['overrides'] ?? [])]); + $banner = Arr::pull($appearance, 'banner'); + $created = $site->appearances()->create([...$appearance, 'overrides' => Arr::undot($appearance['overrides'] ?? [])]); + + // Seasonal banners: shown only while their appearance is in effect, ahead of all-year notices. + if ($banner !== null) { + Notice::query()->create([...$banner, 'site_id' => $site->id, 'appearance_ids' => [$created->id], 'priority' => 20 + $created->priority]); + } } } @@ -139,9 +146,8 @@ private function appearances(): array [ 'name' => 'Sommer', 'starts_md' => '06-01', 'ends_md' => '08-31', 'priority' => 10, + 'banner' => ['text' => 'Sommer an der Ostsee – jetzt freie Termine prüfen.', 'link_label' => 'Termine ansehen'], 'overrides' => [ - 'banner.text' => 'Sommer an der Ostsee – jetzt freie Termine prüfen.', - 'banner.link_label' => 'Termine ansehen', 'hero.eyebrow' => 'Sommer in Kühlungsborn', 'hero.text' => '53 m² im Erdgeschoss, eigene Terrasse mit Blick auf Teich und Garten – ein paar Schritte, und Sie stehen im Sand.', 'cta.title' => 'Ihr Sommertermin ist frei?', @@ -162,9 +168,8 @@ private function appearances(): array 'name' => 'Weihnachten', 'starts_md' => '12-01', 'ends_md' => '12-25', 'priority' => 20, 'tokens' => ['ground' => '#F7F1EA', 'line' => '#E6D8C8', 'accent' => '#8C2F39', 'band' => '#3A2424', 'band-ink' => '#F7F1EA', 'band-muted' => '#E3D3C2', 'banner' => '#8C2F39'], + 'banner' => ['text' => 'Weihnachten an der Ostsee: 19.–26.12. · Mindestaufenthalt 4 Nächte.', 'link_label' => 'Verfügbarkeit prüfen'], 'overrides' => [ - 'banner.text' => 'Weihnachten an der Ostsee: 19.–26.12. · Mindestaufenthalt 4 Nächte.', - 'banner.link_label' => 'Verfügbarkeit prüfen', 'hero.eyebrow' => 'Weihnachten in Kühlungsborn', 'hero.title' => 'Besinnliche Tage *am Meer*', 'hero.text' => 'Kerzenlicht, ein Spaziergang am Winterstrand und Zeit für die Familie – Weihnachten ganz ohne Trubel.', @@ -176,9 +181,8 @@ private function appearances(): array 'name' => 'Silvester', 'starts_md' => '12-26', 'ends_md' => '01-03', 'priority' => 20, 'tokens' => ['ground' => '#141B24', 'surface' => '#1D2633', 'ink' => '#F2EEE6', 'muted' => '#B9C0C8', 'line' => '#2E3A49', 'accent' => '#C9A227', 'accent-ink' => '#141B24', 'band' => '#0D1219', 'band-ink' => '#F2EEE6', 'band-muted' => '#AEB6BF', 'banner' => '#C9A227', 'banner-ink' => '#141B24'], + 'banner' => ['text' => 'Silvester & Neujahr: 26.12.–03.01. · Mindestaufenthalt 6 Nächte.', 'link_label' => 'Noch frei?'], 'overrides' => [ - 'banner.text' => 'Silvester & Neujahr: 26.12.–03.01. · Mindestaufenthalt 6 Nächte.', - 'banner.link_label' => 'Noch frei?', 'hero.eyebrow' => 'Silvester in Kühlungsborn', 'hero.title' => 'Ins neue Jahr *mit Meerblick*', 'hero.text' => 'Feuerwerk über der Ostsee, Neujahrsspaziergang an der Promenade – und eine Wohnung, in der Sie danach ausschlafen.', diff --git a/docs/THEMES.md b/docs/THEMES.md index 3d2e428..f5b196a 100644 --- a/docs/THEMES.md +++ b/docs/THEMES.md @@ -85,6 +85,7 @@ ## 4. Was Layout und Vorlagen zur Verfügung haben | `$theme->isPreview` | Vorschau-Modus (Layout setzt `noindex` und zeigt einen Hinweis) | | `$theme->appearanceKey()` | z. B. `weihnachten` – steht als `data-appearance` am ``; für saisonale CSS-Details nutzbar: `[data-appearance=silvester] .hero {…}` | | `$theme->text($key, $fallback)` | Text des Erscheinungsbilds oder Fallback (Schlüssel: `Appearance::OVERRIDABLE`) | +| `$theme->banner()` | Das heute gezeigte Banner (`App\Themes\Banner`: `text`, `linkLabel`, `linkUrl`, `tone`) oder null | | `$theme->sharePhoto($sections)` | Vorschaubild beim Teilen und für Suchmaschinen: erstes zur Saison passendes Titelbild der Seite, sonst ein automatisches Foto der Wohnung | | `$theme->property()` | Hauptwohnung der Site | | `$theme->menu('main' \| 'footer')` | veröffentlichte Seiten des Menüs (`->url()`, `->label()`) | @@ -125,11 +126,11 @@ ## 5. Bausteinkatalog – Vertrag der Vorlagen ## 6. Erscheinungsbilder -- Felder: Name, Zeitraum `TT.MM.`–`TT.MM.` (jährlich, darf über Silvester laufen), Priorität, Standard, aktiv, Texte (`banner.text`, `banner.link_label`, `banner.link_url`, `hero.eyebrow`, `hero.title`, `hero.text`, `cta.title`, `cta.text`), Farben. +- Felder: Name, Zeitraum `TT.MM.`–`TT.MM.` (jährlich, darf über Silvester laufen), Priorität, Standard, aktiv, Texte (`hero.eyebrow`, `hero.title`, `hero.text`, `cta.title`, `cta.text`), Farben. - Startset (Seeder): Standard · Sommer 01.06.–31.08. · Winter 01.11.–31.03. · Weihnachten 01.12.–25.12. (Prio 20) · Silvester 26.12.–03.01. (Prio 20). - **Fotos:** nicht mehr am Erscheinungsbild, sondern am Foto (Webseite › Fotos › „Zeigen in“, auch als Sammelaktion). Das Erscheinungsbild zeigt nur, wie viele Fotos ihm zugeordnet sind. Umstellung 29.10.2026: Titelbild und „Bilder je Baustein“ wurden in die Bausteine übernommen (Migration `give_photos_their_seasons`). - **Vorschau:** Admin › Erscheinungsbilder › „Vorschau“ = signierter Link (24 h), `noindex` – zeigt auch die Saisonfotos. -- Ohne Erscheinungsbild-Banner wird der neueste aktive Hinweis (Admin › Hinweis-Banner) gezeigt. +- **Banner** (Admin › Webseite › Banner & Hinweise, Modell `Notice`, Auswahl `App\Themes\BannerResolver`): je Website oder für alle, optional nur in bestimmten Erscheinungsbildern (`appearance_ids`, mehrere), Zeitraum, Priorität. Es erscheint genau eines: höchste Priorität, dann das neueste. Ein Banner kann ein Sonderangebot bewerben (`special_offer_id`): Text, Termin und Link kommen dann aus dem Angebot, und es erscheint nur, solange `OfferShowcase` das Angebot bewirbt. Bei den Sonderangeboten erzeugt „Als Banner zeigen“ so ein Banner. Die Liste nennt das heute sichtbare Banner. Umstellung 29.10.2026: Banner-Texte der Erscheinungsbilder wurden zu Bannern, die auf ihr Erscheinungsbild beschränkt sind. ## 7. Assets, Schriften, Build diff --git a/docs/ZUSAMMENARBEIT.md b/docs/ZUSAMMENARBEIT.md index 125d2bc..afbf24f 100644 --- a/docs/ZUSAMMENARBEIT.md +++ b/docs/ZUSAMMENARBEIT.md @@ -84,6 +84,7 @@ ## 6. Änderungsprotokoll Vorlagen-Vertrag | Datum | Änderung | Betrifft | |---|---|---| +| 29.10.2026 | **Banner:** `partials/banner` liest `$theme->banner()` (`text`, `linkLabel`, `linkUrl`, `tone` → `data-tone`) statt `Notice::visible()` und `$theme->text('banner.*')`; die Schlüssel `banner.*` gibt es am Erscheinungsbild nicht mehr. Beide Themes angepasst. | partials/banner | | 29.10.2026 | **Fotos und Saisons:** Variablen der Vorlagen unverändert (`$photo`, `$photos`). Entfallen: `$theme->heroPhoto()`, `sectionPhotoIds()`, `sectionPhotoMode()`, `Section::photoSlots()` und die Saison-Helfer `seasonalPhoto(s)`/`withSeasonalPhotos`; neu `$theme->sharePhoto($sections)`, `chosenPhotos()`, `automaticPhotos()`, `sourcedPhotos()`. Titelbereich/Abschluss: `data.photo_ids` statt `photo_id`. Neue Fotokategorie `plan` erscheint nie automatisch. | nur Bausteinklassen; Vorlagen nicht betroffen | | 26.10.2026 | **Mandantenabschluss:** Beide Themes beziehen Logo und Favicon ausschließlich aus der Website-Marke; ohne Marke bleibt die Darstellung neutral. Dekoration und Bild-Platzhalter kommen aus Bildwelt-Plätzen. `partials/brand` bleibt als kompatible Platz-Zuordnung erhalten; Seebads `partials/motif` nutzt die Bildwelt-API. Bestehende Stommer-Marken werden vor Aktivierung ausdrücklich für diese Website importiert. | layouts/app, partials/brand, partials/logo, partials/motif, partials/image, header | | 22.10.2026 | `theme-base.css` (Schriften, Token-Mapping, Basis-Klassen) von `theme.css` getrennt – Child-Themes importieren `theme-base.css` | theme.css | diff --git a/docs/architecture/webseite.md b/docs/architecture/webseite.md index e9fcc3a..f795df7 100644 --- a/docs/architecture/webseite.md +++ b/docs/architecture/webseite.md @@ -43,7 +43,7 @@ ### Gestaltung, Marke und Saisons Eine Website wählt ein installiertes Theme. Vorhanden sind „Ostsee-Licht“ und „Seebad“. Der Vermieter kann das Theme auswählen, aber keine ausführbaren Gestaltungspakete hochladen. Vorschau-Links ermöglichen die Sichtung einer Gestaltung vor der Aktivierung. -Erscheinungsbilder ändern saisonal Texte, Farben und Banner. Fotos gehören zu einem, mehreren oder keinem Erscheinungsbild (dann ganzjährig); passende Saisonfotos erscheinen zuerst, fremde gar nicht. Grundrisse und Pläne haben eine eigene Kategorie, die keine Galerie zeigt. Der Seitenaufbau bleibt davon grundsätzlich unabhängig. Einzelne Bausteine können auf bestimmte Erscheinungsbilder begrenzt werden. Zeiträume können jährlich wiederkehren; Prioritäten und ein Standard regeln die Auswahl. Vorbereitet sind unter anderem Sommer, Winter, Weihnachten und Silvester. +Erscheinungsbilder ändern saisonal Texte und Farben. Banner werden zentral gepflegt: je Website, optional nur in bestimmten Erscheinungsbildern und Zeiträumen, mit Priorität; ein Banner kann ein Sonderangebot bewerben und verschwindet dann mit dem Angebot. Fotos gehören zu einem, mehreren oder keinem Erscheinungsbild (dann ganzjährig); passende Saisonfotos erscheinen zuerst, fremde gar nicht. Grundrisse und Pläne haben eine eigene Kategorie, die keine Galerie zeigt. Der Seitenaufbau bleibt davon grundsätzlich unabhängig. Einzelne Bausteine können auf bestimmte Erscheinungsbilder begrenzt werden. Zeiträume können jährlich wiederkehren; Prioritäten und ein Standard regeln die Auswahl. Vorbereitet sind unter anderem Sommer, Winter, Weihnachten und Silvester. Zur Website gehören Logo, Favicon und eine eigene Grafik für E-Mails beziehungsweise Vertragsunterlagen. Eine Bildwelt liefert passende Dekoration unabhängig vom Theme; eine Wohnung kann eine andere Bildwelt als ihre Website wählen. Damit können etwa eine Ostsee- und eine Bergwohnung unter derselben Grundgestaltung erscheinen. diff --git a/resources/themes/ostsee-licht/views/partials/banner.blade.php b/resources/themes/ostsee-licht/views/partials/banner.blade.php index c38c961..0977420 100644 --- a/resources/themes/ostsee-licht/views/partials/banner.blade.php +++ b/resources/themes/ostsee-licht/views/partials/banner.blade.php @@ -1,10 +1,10 @@ -@php($bannerText = $theme->text('banner.text', \App\Models\Notice::query()->visible()->latest()->value('text'))) -@if ($bannerText) -
+@php($banner = $theme->banner()) +@if ($banner) +
- {{ $bannerText }} - @if ($theme->text('banner.link_label')) - {{ $theme->text('banner.link_label') }} + {{ $banner->text }} + @if ($banner->linkLabel && $banner->linkUrl) + {{ $banner->linkLabel }} @endif
diff --git a/resources/themes/seebad/views/partials/banner.blade.php b/resources/themes/seebad/views/partials/banner.blade.php index 0fef749..f325fdb 100644 --- a/resources/themes/seebad/views/partials/banner.blade.php +++ b/resources/themes/seebad/views/partials/banner.blade.php @@ -1,11 +1,11 @@ -@php($bannerText = $theme->text('banner.text', \App\Models\Notice::query()->visible()->latest()->value('text'))) -@if ($bannerText) -
+@php($banner = $theme->banner()) +@if ($banner) +
@include('theme::partials.motif', ['slot' => 'gulls', 'class' => 'hidden h-5 w-auto opacity-80 sm:block']) - {{ $bannerText }} - @if ($theme->text('banner.link_label')) - {{ $theme->text('banner.link_label') }} + {{ $banner->text }} + @if ($banner->linkLabel && $banner->linkUrl) + {{ $banner->linkLabel }} @endif
diff --git a/tests/Feature/BannerTest.php b/tests/Feature/BannerTest.php new file mode 100644 index 0000000..74f3d92 --- /dev/null +++ b/tests/Feature/BannerTest.php @@ -0,0 +1,144 @@ +travelTo(CarbonImmutable::parse('2026-10-22 10:00')); + $this->seed([PropertySeeder::class, WebsiteContentSeeder::class, SiteSeeder::class]); + $this->withoutVite(); + $this->site = Site::sole(); + $this->property = Property::sole(); + Notice::query()->delete(); + } + + public function test_the_highest_priority_wins_and_seasonal_banners_show_only_in_their_appearances(): void + { + $christmas = $this->appearance('Weihnachten'); + $silvester = $this->appearance('Silvester'); + Notice::factory()->create(['text' => 'Ganzjährig geöffnet', 'priority' => 10]); + Notice::factory()->create(['text' => 'Festtage am Meer', 'priority' => 20, 'appearance_ids' => [$christmas->id, $silvester->id]]); + Notice::factory()->create(['text' => 'Andere Website', 'priority' => 99, 'site_id' => Site::factory()->create()->id]); + + $this->get('/')->assertOk()->assertSee('Ganzjährig geöffnet')->assertDontSee('Festtage am Meer')->assertDontSee('Andere Website'); + + $this->travelTo(CarbonImmutable::parse('2026-12-20 10:00')); + $this->get('/')->assertOk()->assertSee('Festtage am Meer')->assertDontSee('Ganzjährig geöffnet'); + + $this->travelTo(CarbonImmutable::parse('2026-12-30 10:00')); + $this->get('/')->assertOk()->assertSee('Festtage am Meer'); + } + + public function test_a_banner_for_an_offer_takes_text_and_link_from_the_offer_while_it_is_advertised(): void + { + $offer = SpecialOffer::factory()->for($this->property)->create(['name' => 'Herbstwochen', 'discount_value' => 15]); + Notice::factory()->create(['text' => 'Allgemeiner Hinweis', 'priority' => 10]); + Notice::factory()->create(['text' => null, 'special_offer_id' => $offer->id, 'priority' => 30, 'tone' => NoticeTone::Offer]); + + $this->get('/')->assertOk()->assertSee('Herbstwochen · −15 %', false)->assertSee('Zum Angebot')->assertDontSee('Allgemeiner Hinweis'); + + $offer->update(['is_active' => false]); + $this->get('/')->assertOk()->assertDontSee('Herbstwochen')->assertSee('Allgemeiner Hinweis'); + } + + public function test_offer_becomes_a_banner_with_one_click(): void + { + $this->actingAs(User::factory()->create()); + $offer = SpecialOffer::factory()->for($this->property)->create(['name' => 'Herbstwochen']); + + Livewire::test(SpecialOffersRelationManager::class, ['ownerRecord' => $this->property, 'pageClass' => EditProperty::class]) + ->callTableAction('banner', $offer); + + $notice = Notice::query()->sole(); + $this->assertSame($offer->id, $notice->special_offer_id); + $this->assertSame($this->site->id, $notice->site_id); + $this->assertSame(NoticeTone::Offer, $notice->tone); + $this->assertNull($notice->text); + } + + public function test_banner_list_names_the_banner_shown_today_and_a_text_banner_needs_a_text(): void + { + $this->actingAs(User::factory()->create()); + Notice::factory()->create(['text' => 'Neue Betten im Schlafzimmer', 'priority' => 10]); + Notice::factory()->create(['text' => 'Abgelaufen', 'ends_on' => '2026-10-01']); + + $this->get(NoticeResource::getUrl('index'))->assertOk()->assertSee('Heute sichtbar: „Neue Betten im Schlafzimmer“', false); + + Livewire::test(CreateNotice::class) + ->fillForm(['text' => null, 'special_offer_id' => null]) + ->call('create') + ->assertHasFormErrors(['text' => 'required']); + Livewire::test(ListNotices::class)->assertSuccessful(); + } + + public function test_banner_texts_of_appearances_become_seasonal_banners(): void + { + $migration = require database_path('migrations/2026_10_29_185454_turn_notices_into_banners.php'); + $migration->down(); + $summer = $this->appearance('Sommer'); + DB::table('appearances')->where('id', $summer->id)->update(['overrides' => json_encode([ + 'banner' => ['text' => 'Sommer an der Ostsee', 'link_label' => 'Termine ansehen', 'link_url' => null], + 'hero' => ['eyebrow' => 'Sommer in Kühlungsborn'], + ])]); + + $migration->up(); + + $notice = Notice::query()->sole(); + $this->assertSame('Sommer an der Ostsee', $notice->text); + $this->assertSame([$summer->id], $notice->appearance_ids); + $this->assertSame($this->site->id, $notice->site_id); + $this->assertSame(20 + $summer->priority, $notice->priority); + $this->assertSame(['hero' => ['eyebrow' => 'Sommer in Kühlungsborn']], $summer->fresh()->overrides); + + $this->travelTo(CarbonImmutable::parse('2026-07-10 10:00')); + $this->get('/')->assertOk()->assertSee('Sommer an der Ostsee')->assertSee('Termine ansehen'); + } + + public function test_appearance_names_are_kept_apart_per_landlord(): void + { + $this->assertContains('Winter', Appearance::names()); + $other = Tenant::factory()->create(); + + app(TenantContext::class)->run($other, function (): void { + $this->assertSame([], Appearance::names()); + }); + } + + private function appearance(string $name): Appearance + { + return $this->site->appearances()->where('name', $name)->sole(); + } +}