@ketvietlab/ketsuite 0.1.2 → 0.1.5

package/dist/modules/hospitality_core/routes.js

@@ -1,26 +1,11 @@
 import { randomUUID } from 'node:crypto';
-import { text } from '@ketvietlab/ketjs';
-import { viewerOf } from '../backend/routes.js';
-import { backendPage } from '../../ui/index.js';
+import { dateTimeFormatter, text } from '@ketvietlab/ketjs';
 import { readForm, seeOther } from '../backend/forms.js';
 import { receiveAttachment } from '../storage/routes.js';
-import { amenitiesScreen, buildingDetailScreen, cleaningTaskDetailScreen, cleaningTasksScreen, folioDetailScreen, foliosScreen, floorDetailScreen, frontDeskScreen, housekeepingRoomDetailScreen, housekeepingRoomsScreen, newPropertyScreen, newRoomScreen, newRoomTypeScreen, policiesScreen, propertiesScreen, propertyDetailScreen, ratePlansScreen, reservationDetailScreen, reservationsScreen, inventoryScreen, roomsScreen, roomDetailScreen, roomTypeDetailScreen, roomTypesScreen, stayDetailScreen, staysScreen, tapeChartScreen, contentScreen, servicesScreen, nightAuditScreen, stayNoticesScreen, } from './screens.js';
+import { amenitiesScreen, buildingDetailScreen, cleaningTaskDetailScreen, cleaningTasksScreen, folioDetailScreen, foliosScreen, floorDetailScreen, frontDeskScreen, housekeepingRoomDetailScreen, housekeepingRoomsScreen, newPropertyScreen, newRoomScreen, newRoomTypeScreen, policiesScreen, propertiesScreen, propertyDetailScreen, ratePlansScreen, checkOutPrepScreen, reservationDetailScreen, reservationsScreen, inventoryScreen, roomsScreen, roomDetailScreen, roomTypeDetailScreen, roomTypesScreen, stayDetailScreen, staysScreen, tapeChartScreen, contentScreen, servicesScreen, nightAuditScreen, stayNoticesScreen, } from './screens/index.js';
 import { addCalendarDays, calendarRange, dateKeyIn, zonedDateTime } from './calendar.js';
 import { CLEANING_TASK_STATES, ROOM_STATUSES, STAY_NOTICE_STATES } from './types.js';
-const frame = async (ctx, url, req) => ({
-    navigation: req.headers['x-ket-navigation'] === 'fragment-v1',
-    viewer: await viewerOf(ctx, url, req),
-    menu: await ctx.menu(url, req),
-    menuFilter: url.searchParams.get('menu')?.trim() || null,
-    extras: {
-        'nav.items': await ctx.joint(url, req, 'backend:nav.items', { active: url.pathname }),
-        'topbar.end': await ctx.joint(url, req, 'backend:topbar.end'),
-    },
-});
-const document = async (ctx, url, req, title, body) => {
-    const lang = ctx.localeOf(url, req);
-    return backendPage(ctx, req, { lang, title, body });
-};
+import { adminPage } from '../backend/screen.js';
 const operationErrors = (ctx, url, req, result) => {
     const _ = ctx.translate(ctx.localeOf(url, req));
     const errors = result.errors ?? [];
@@ -38,12 +23,24 @@ const renderReservationDetail = async (ctx, url, req, id, errors = [], attempted
     const reservation = (await ctx.call('hospitality_core.getReservation', { id }, url, req));
     if (!reservation)
         return text('Not found', { status: 404 });
-    if (reservation.stayId) {
+    if (url.searchParams.get('action') === 'check-out' && reservation.stayId)
+        return renderCheckOutPrep(ctx, url, req, reservation, errors);
+    const permissions = {
+        amend: await ctx.allows('hospitality_core.amendReservation', url, req),
+        checkIn: await ctx.allows('hospitality_core.checkIn', url, req),
+        holdRoom: await ctx.allows('hospitality_core.holdRoom', url, req),
+        adjustDeparture: await ctx.allows('hospitality_core.adjustStayDeparture', url, req),
+        checkOut: await ctx.allows('hospitality_core.checkOut', url, req),
+        cancel: await ctx.allows('hospitality_core.cancelReservation', url, req),
+        noShow: await ctx.allows('hospitality_core.markNoShow', url, req),
+        readStay: await ctx.allows('hospitality_core.getStay', url, req),
+    };
+    if (reservation.stayId && permissions.readStay) {
         reservation.stay = (await ctx.call('hospitality_core.getStay', { id: reservation.stayId }, url, req));
     }
     const timezone = await propertyTimezone(ctx, reservation.propertyId, url, req);
     const [allRooms, roomTypes, partners] = (await Promise.all([
-        reservation.state === 'confirmed'
+        reservation.state === 'confirmed' && permissions.checkIn
             ? ctx.call('hospitality_core.listRooms', { propertyId: reservation.propertyId, status: 'available' }, url, req)
             : Promise.resolve([]),
         ctx.call('hospitality_core.listRoomTypes', { propertyId: reservation.propertyId }, url, req),
@@ -61,7 +58,31 @@ const renderReservationDetail = async (ctx, url, req, id, errors = [], attempted
         children: attempted?.children ?? reservation.children,
         rate: attempted?.rate ?? String(reservation.rate),
     };
-    return document(ctx, url, req, _('hospitality_core.reservation.detail.title', { code: reservation.code }), reservationDetailScreen(_, reservation, rooms, roomTypes, partners, amendment, attemptedDeparture ?? localDateTime(new Date(reservation.checkOut), timezone), lang, timezone, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: _('hospitality_core.reservation.detail.title', { code: reservation.code }),
+        translate: false,
+        body: (_, frame) => reservationDetailScreen(_, reservation, rooms, roomTypes, partners, amendment, attemptedDeparture ?? localDateTime(new Date(reservation.checkOut), timezone), lang, timezone, frame, url.searchParams.get('status'), errors, permissions),
+    });
+};
+/**
+ * The read the desk used to do by hand across four screens, before a departure.
+ *
+ * It hangs off the reservation rather than getting a route of its own, because
+ * that is where the desk already is and where the command it leads to lives.
+ */
+const renderCheckOutPrep = async (ctx, url, req, reservation, errors = []) => {
+    const readiness = (await ctx.call('hospitality_core.checkOutReadiness', { stayId: reservation.stayId }, url, req));
+    if (!readiness)
+        return text('Not found', { status: 404 });
+    const timezone = await propertyTimezone(ctx, reservation.propertyId, url, req);
+    const lang = ctx.localeOf(url, req);
+    const _ = ctx.translate(lang);
+    const permitted = await ctx.allows('hospitality_core.checkOut', url, req);
+    return adminPage(ctx, url, req, {
+        title: _('hospitality_core.checkOutPrep.title', { code: reservation.code }),
+        translate: false,
+        body: (_, frame) => checkOutPrepScreen(_, readiness, { id: reservation.id, code: reservation.code }, lang, timezone, frame, permitted, errors),
+    });
 };
 const renderStayDetail = async (ctx, url, req, id, errors = []) => {
     const stay = (await ctx.call('hospitality_core.getStay', { id }, url, req));
@@ -75,7 +96,11 @@ const renderStayDetail = async (ctx, url, req, id, errors = []) => {
     const timezone = await propertyTimezone(ctx, stay.propertyId, url, req);
     const lang = ctx.localeOf(url, req);
     const _ = ctx.translate(lang);
-    return document(ctx, url, req, _('hospitality_core.stay.detail.title', { code: stay.code }), stayDetailScreen(_, stay, rooms, partners, documents, randomUUID(), lang, timezone, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: _('hospitality_core.stay.detail.title', { code: stay.code }),
+        translate: false,
+        body: (_, frame) => stayDetailScreen(_, stay, rooms, partners, documents, randomUUID(), lang, timezone, frame, url.searchParams.get('status'), errors),
+    });
 };
 const renderFolioDetail = async (ctx, url, req, id, errors = []) => {
     const folio = (await ctx.call('hospitality_core.getFolio', { id }, url, req));
@@ -84,7 +109,11 @@ const renderFolioDetail = async (ctx, url, req, id, errors = []) => {
     const timezone = await propertyTimezone(ctx, folio.propertyId, url, req);
     const lang = ctx.localeOf(url, req);
     const _ = ctx.translate(lang);
-    return document(ctx, url, req, _('hospitality_core.folio.detail.title', { code: folio.code }), folioDetailScreen(_, folio, lang, timezone, await frame(ctx, url, req), randomUUID(), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: _('hospitality_core.folio.detail.title', { code: folio.code }),
+        translate: false,
+        body: (_, frame) => folioDetailScreen(_, folio, lang, timezone, frame, randomUUID(), url.searchParams.get('status'), errors),
+    });
 };
 const renderCleaningTaskDetail = async (ctx, url, req, id, errors = []) => {
     const task = (await ctx.call('hospitality_core.getCleaningTask', { id }, url, req));
@@ -93,7 +122,16 @@ const renderCleaningTaskDetail = async (ctx, url, req, id, errors = []) => {
     const timezone = await propertyTimezone(ctx, task.propertyId, url, req);
     const lang = ctx.localeOf(url, req);
     const _ = ctx.translate(lang);
-    return document(ctx, url, req, _('hospitality_core.housekeeping.detail.title', { code: task.code }), cleaningTaskDetailScreen(_, task, lang, timezone, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    const permissions = {
+        start: await ctx.allows('hospitality_core.startCleaningTask', url, req),
+        complete: await ctx.allows('hospitality_core.completeCleaningTask', url, req),
+        cancel: await ctx.allows('hospitality_core.cancelCleaningTask', url, req),
+    };
+    return adminPage(ctx, url, req, {
+        title: _('hospitality_core.housekeeping.detail.title', { code: task.code }),
+        translate: false,
+        body: (_, frame) => cleaningTaskDetailScreen(_, task, lang, timezone, frame, url.searchParams.get('status'), errors, permissions),
+    });
 };
 const renderHousekeepingRoomDetail = async (ctx, url, req, id, errors = []) => {
     const room = (await ctx.call('hospitality_core.getHousekeepingRoom', { id }, url, req));
@@ -103,7 +141,11 @@ const renderHousekeepingRoomDetail = async (ctx, url, req, id, errors = []) => {
     const timezone = await propertyTimezone(ctx, room.propertyId, url, req);
     const lang = ctx.localeOf(url, req);
     const _ = ctx.translate(lang);
-    return document(ctx, url, req, _('hospitality_core.housekeeping.rooms.detail.title', { code: room.code }), housekeepingRoomDetailScreen(_, room, tasks, lang, timezone, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: _('hospitality_core.housekeeping.rooms.detail.title', { code: room.code }),
+        translate: false,
+        body: (_, frame) => housekeepingRoomDetailScreen(_, room, tasks, lang, timezone, frame, url.searchParams.get('status'), errors),
+    });
 };
 const selectedProperty = async (ctx, url, req) => {
     const selected = url.searchParams.get('property')?.trim();
@@ -123,13 +165,52 @@ const redirected = (url, state, values = {}) => {
     }
     return seeOther(`${url.pathname}?${params.toString()}`);
 };
+const modalHref = (url, open, remove = []) => {
+    const params = new URLSearchParams(url.searchParams);
+    if (open)
+        params.set('create', '1');
+    else
+        params.delete('create');
+    params.delete('status');
+    if (!open)
+        params.delete('preview');
+    for (const key of remove)
+        params.delete(key);
+    const query = params.toString();
+    return `${url.pathname}${query ? `?${query}` : ''}`;
+};
+const modalAction = (url) => {
+    const params = new URLSearchParams(url.searchParams);
+    params.set('create', '1');
+    return `${url.pathname}?${params.toString()}`;
+};
+const modalErrors = (url, _) => url.searchParams.get('status') === 'invalid' ? [_('hospitality_core.feedback.invalid')] : undefined;
+const modalValues = (url, keys) => Object.fromEntries(keys.flatMap((key) => (url.searchParams.has(key) ? [[key, url.searchParams.get(key)]] : [])));
+const modalResultRedirect = (url, ok, success, values = {}, removeOnSuccess = []) => {
+    const params = new URLSearchParams(url.searchParams);
+    if (ok)
+        params.delete('create');
+    else
+        params.set('create', '1');
+    params.set('status', ok ? success : 'invalid');
+    for (const [key, value] of Object.entries(values)) {
+        if (value)
+            params.set(key, value);
+        else
+            params.delete(key);
+    }
+    if (ok)
+        for (const key of removeOnSuccess)
+            params.delete(key);
+    return seeOther(`${url.pathname}?${params.toString()}`);
+};
 const integer = (value, fallback = 0) => {
     const parsed = Number(value ?? fallback);
     return Number.isInteger(parsed) ? parsed : -1;
 };
 const optionalInteger = (value) => value ? integer(value) : undefined;
 const localDateTime = (value, timezone) => {
-    const parts = Object.fromEntries(new Intl.DateTimeFormat('en', {
+    const parts = Object.fromEntries(dateTimeFormatter('en', {
         timeZone: timezone,
         hourCycle: 'h23',
         hour: '2-digit',
@@ -206,6 +287,9 @@ const defaultPropertyValues = (id) => ({
     defaultCheckIn: '14:00',
     defaultCheckOut: '12:00',
     enforceTimes: true,
+    allowHourly: true,
+    allowWeekly: false,
+    allowMonthly: false,
     longStayBillOnCheckIn: true,
     starRating: 0,
     description: null,
@@ -225,6 +309,9 @@ const propertyFormValues = (id, form, current = null) => ({
     defaultCheckIn: form.defaultCheckIn?.trim() ?? current?.defaultCheckIn ?? '14:00',
     defaultCheckOut: form.defaultCheckOut?.trim() ?? current?.defaultCheckOut ?? '12:00',
     enforceTimes: form.enforceTimes === '1',
+    allowHourly: form.allowHourly === '1',
+    allowWeekly: form.allowWeekly === '1',
+    allowMonthly: form.allowMonthly === '1',
     longStayBillOnCheckIn: form.longStayBillOnCheckIn === '1',
     starRating: integer(form.starRating, current?.starRating ?? 0),
     description: form.description?.trim() || null,
@@ -257,7 +344,11 @@ const renderPropertyDetail = async (ctx, url, req, id, errors = [], attempted) =
     if (!property)
         return text('Not found', { status: 404 });
     const lang = ctx.localeOf(url, req);
-    return document(ctx, url, req, property.name, propertyDetailScreen(ctx.translate(lang), property, policies, branches, lang, await frame(ctx, url, req), url.searchParams.get('status'), errors, attempted));
+    return adminPage(ctx, url, req, {
+        title: property.name,
+        translate: false,
+        body: (_, frame) => propertyDetailScreen(ctx.translate(lang), property, policies, branches, lang, frame, url.searchParams.get('status'), errors, attempted),
+    });
 };
 const defaultRoomTypeValues = (id, propertyId) => ({
     id,
@@ -274,6 +365,10 @@ const defaultRoomTypeValues = (id, propertyId) => ({
     sizeSqm: null,
     viewType: null,
     sharedBathroom: false,
+    allowHourly: true,
+    allowWeekly: false,
+    allowMonthly: false,
+    minHourlyHours: 2,
     baseRate: '0',
     color: '#2563eb',
     cancellationPolicyId: null,
@@ -294,6 +389,10 @@ const roomTypeFormValues = (id, form, current = null) => ({
     sizeSqm: form.sizeSqm?.trim() || null,
     viewType: form.viewType?.trim() || null,
     sharedBathroom: form.sharedBathroom === '1',
+    allowHourly: form.allowHourly === '1',
+    allowWeekly: form.allowWeekly === '1',
+    allowMonthly: form.allowMonthly === '1',
+    minHourlyHours: integer(form.minHourlyHours, current?.minHourlyHours ?? 2),
     baseRate: form.baseRate?.trim() ?? String(current?.baseRate ?? '0'),
     color: form.color?.trim() || null,
     cancellationPolicyId: form.cancellationPolicyId?.trim() || null,
@@ -315,7 +414,11 @@ const renderRoomTypeDetail = async (ctx, url, req, id, errors = [], attempted) =
         return text('Not found', { status: 404 });
     const lang = ctx.localeOf(url, req);
     const _ = ctx.translate(lang);
-    return document(ctx, url, req, roomType.name, roomTypeDetailScreen(_, roomType, properties, policies, lang, await frame(ctx, url, req), url.searchParams.get('status'), errors, attempted));
+    return adminPage(ctx, url, req, {
+        title: roomType.name,
+        translate: false,
+        body: (_, frame) => roomTypeDetailScreen(_, roomType, properties, policies, lang, frame, url.searchParams.get('status'), errors, attempted),
+    });
 };
 const buildingFormValues = (id, form, current = null) => ({
     id,
@@ -329,7 +432,11 @@ const renderBuildingDetail = async (ctx, url, req, id, errors = [], attempted) =
     if (!building)
         return text('Not found', { status: 404 });
     const lang = ctx.localeOf(url, req);
-    return document(ctx, url, req, building.name, buildingDetailScreen(ctx.translate(lang), building, attempted ?? building, lang, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: building.name,
+        translate: false,
+        body: (_, frame) => buildingDetailScreen(ctx.translate(lang), building, attempted ?? building, lang, frame, url.searchParams.get('status'), errors),
+    });
 };
 const floorFormValues = (id, form, current = null) => ({
     id,
@@ -344,7 +451,11 @@ const renderFloorDetail = async (ctx, url, req, id, errors = [], attempted) => {
     if (!floor)
         return text('Not found', { status: 404 });
     const lang = ctx.localeOf(url, req);
-    return document(ctx, url, req, floor.name, floorDetailScreen(ctx.translate(lang), floor, attempted ?? floor, lang, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: floor.name,
+        translate: false,
+        body: (_, frame) => floorDetailScreen(ctx.translate(lang), floor, attempted ?? floor, lang, frame, url.searchParams.get('status'), errors),
+    });
 };
 const roomFormValues = (id, form, current = null) => ({
     id,
@@ -390,7 +501,10 @@ const renderRooms = async (ctx, url, req, errors = []) => {
         : [[], [], []];
     const lang = ctx.localeOf(url, req);
     const _ = ctx.translate(lang);
-    return document(ctx, url, req, _('hospitality_core.screen.rooms.title'), roomsScreen(_, { rows, ...options, buildings, floors }, lang, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: 'hospitality_core.screen.rooms.title',
+        body: (_, frame) => roomsScreen(_, { rows, ...options, buildings, floors }, lang, frame, url.searchParams.get('status'), errors),
+    });
 };
 const renderRoomDetail = async (ctx, url, req, id, errors = [], attempted) => {
     const room = (await ctx.call('hospitality_core.getRoom', { id }, url, req));
@@ -398,7 +512,11 @@ const renderRoomDetail = async (ctx, url, req, id, errors = [], attempted) => {
         return text('Not found', { status: 404 });
     const options = await roomOptions(ctx, url, req, room.propertyId, true);
     const lang = ctx.localeOf(url, req);
-    return document(ctx, url, req, room.name, roomDetailScreen(ctx.translate(lang), room, attempted ?? room, options.properties, options.roomTypes, options.buildings, options.floors, lang, await frame(ctx, url, req), url.searchParams.get('status'), errors));
+    return adminPage(ctx, url, req, {
+        title: room.name,
+        translate: false,
+        body: (_, frame) => roomDetailScreen(ctx.translate(lang), room, attempted ?? room, options.properties, options.roomTypes, options.buildings, options.floors, lang, frame, url.searchParams.get('status'), errors),
+    });
 };
 export const routes = {
     '/admin/hospitality/front-desk': (ctx) => async (url, req) => {
@@ -406,25 +524,47 @@ export const routes = {
         const _ = ctx.translate(lang);
         const propertyId = await selectedProperty(ctx, url, req);
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
-        const range = calendarRange(url.searchParams.get('date'), 1, timezone);
-        const [stays, inHouseStays, openFolios] = (await Promise.all([
+        const requested = url.searchParams.get('date')?.slice(0, 10);
+        const day = requested && /^\d{4}-\d{2}-\d{2}$/u.test(requested) ? requested : dateKeyIn(new Date(), timezone);
+        const range = calendarRange(day, 1, timezone);
+        // The landing screen is where a new deployment starts. Five zeroes and
+        // "nothing needs attention" is a true statement and useless advice when
+        // the property itself has not been created yet.
+        const configured = (await ctx.call('hospitality_core.listProperties', {}, url, req))
+            .length;
+        const [stays, inHouseStays] = (await Promise.all([
             ctx.call('hospitality_core.listStays', { propertyId, from: range.from, to: range.to }, url, req),
             ctx.call('hospitality_core.listStays', { propertyId, state: 'checked_in' }, url, req),
-            ctx.call('hospitality_core.listFolios', { propertyId, state: 'open' }, url, req),
         ]));
+        // An auditor and a night auditor read this screen without doing desk
+        // work; the row action is for the people who do it.
+        const may = {
+            checkIn: await ctx.allows('hospitality_core.checkIn', url, req),
+            checkOut: await ctx.allows('hospitality_core.checkOut', url, req),
+        };
         const inRange = (value) => value >= range.from && value < range.to;
         const now = new Date().toISOString();
         const overdue = inHouseStays
             .filter((stay) => stay.checkOut < now)
             .sort((left, right) => left.checkOut.localeCompare(right.checkOut));
         const overdueIds = new Set(overdue.map((stay) => stay.id));
-        return document(ctx, url, req, _('hospitality_core.screen.frontDesk.title'), frontDeskScreen(_, stays.filter((stay) => !overdueIds.has(stay.id)), overdue, {
-            arrivals: stays.filter((stay) => stay.state === 'draft' && inRange(stay.checkIn)).length,
-            inHouse: inHouseStays.length,
-            departures: stays.filter((stay) => stay.state === 'checked_in' && inRange(stay.checkOut)).length,
-            overdue: overdue.length,
-            openFolios: openFolios.length,
-        }, lang, timezone, await frame(ctx, url, req)));
+        // The desk works two queues today: who is coming in, and who is going
+        // out. A guest already late is in neither — they are the first thing the
+        // screen says, above both.
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.frontDesk.title',
+            body: (_, frame) => frontDeskScreen(_, {
+                day,
+                arrivals: stays
+                    .filter((stay) => stay.state === 'draft' && inRange(stay.checkIn))
+                    .sort((left, right) => left.checkIn.localeCompare(right.checkIn)),
+                departures: stays
+                    .filter((stay) => stay.state === 'checked_in' && inRange(stay.checkOut) && !overdueIds.has(stay.id))
+                    .sort((left, right) => left.checkOut.localeCompare(right.checkOut)),
+                overdue,
+                inHouse: inHouseStays,
+            }, may, lang, timezone, frame, configured > 0),
+        });
     },
     '/admin/hospitality/reservations': (ctx) => async (url, req) => {
         if (req.method === 'POST') {
@@ -440,6 +580,7 @@ export const routes = {
             const checkOut = instantFromLocal(form.checkOut, timezone);
             const values = {
                 lang: form.lang,
+                create: '1',
                 property: propertyId,
                 preview: '1',
                 id: form.id,
@@ -482,9 +623,18 @@ export const routes = {
                 children: integer(form.children),
                 rate: form.rate || undefined,
             }, url, req));
-            return result.ok
-                ? redirected(url, 'saved', { lang: form.lang, property: propertyId })
-                : redirected(url, 'invalid', values);
+            return modalResultRedirect(url, Boolean(result.ok), 'saved', result.ok ? { lang: form.lang, property: propertyId, preview: undefined } : values, [
+                'id',
+                'code',
+                'partnerId',
+                'roomTypeId',
+                'bookingType',
+                'checkIn',
+                'checkOut',
+                'adults',
+                'children',
+                'rate',
+            ]);
         }
         if (req.method !== 'GET')
             return text('GET or POST', { status: 405 });
@@ -548,7 +698,38 @@ export const routes = {
                         errors: [{ messageKey: 'hospitality_core.validation.datetime' }],
                     };
         }
-        return document(ctx, url, req, _('hospitality_core.screen.reservations.title'), reservationsScreen(_, { rows, properties, roomTypes, partners, values, quote }, lang, timezone, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.reservations.title',
+            body: (_, frame) => reservationsScreen(_, { rows, properties, roomTypes, partners, values, quote }, lang, timezone, frame, url.searchParams.get('status'), {
+                open: url.searchParams.get('create') === '1',
+                createHref: modalHref(url, true, [
+                    'preview',
+                    'id',
+                    'code',
+                    'partnerId',
+                    'roomTypeId',
+                    'bookingType',
+                    'checkIn',
+                    'checkOut',
+                    'adults',
+                    'children',
+                    'rate',
+                ]),
+                closeHref: modalHref(url, false, [
+                    'id',
+                    'code',
+                    'partnerId',
+                    'roomTypeId',
+                    'bookingType',
+                    'checkIn',
+                    'checkOut',
+                    'adults',
+                    'children',
+                    'rate',
+                ]),
+                action: modalAction(url),
+            }),
+        });
     },
     '/admin/hospitality/reservations/{id}': (ctx) => async (url, req, params) => {
         if (req.method === 'GET')
@@ -598,6 +779,22 @@ export const routes = {
             result = (await ctx.call('hospitality_core.checkIn', { stayId: reservation.stayId, roomId: form.roomId }, url, req));
             status = 'checked-in';
         }
+        else if (form.operation === 'hold-room') {
+            if (!reservation.stayId || !form.roomId)
+                return renderReservationDetail(ctx, url, req, params.id, [
+                    ctx.translate(ctx.localeOf(url, req))('hospitality_core.validation.no_available_room'),
+                ]);
+            result = (await ctx.call('hospitality_core.holdRoom', { stayId: reservation.stayId, roomId: form.roomId }, url, req));
+            status = 'room-held';
+        }
+        else if (form.operation === 'release-room-hold') {
+            if (!reservation.stayId)
+                return renderReservationDetail(ctx, url, req, params.id, [
+                    ctx.translate(ctx.localeOf(url, req))('hospitality_core.validation.stay_missing'),
+                ]);
+            result = (await ctx.call('hospitality_core.releaseRoomHold', { stayId: reservation.stayId }, url, req));
+            status = 'room-hold-released';
+        }
         else if (form.operation === 'adjust-departure') {
             if (!reservation.stayId)
                 return renderReservationDetail(ctx, url, req, params.id, [
@@ -618,7 +815,7 @@ export const routes = {
                 return renderReservationDetail(ctx, url, req, params.id, [
                     ctx.translate(ctx.localeOf(url, req))('hospitality_core.validation.stay_missing'),
                 ]);
-            result = (await ctx.call('hospitality_core.checkOut', { stayId: reservation.stayId }, url, req));
+            result = (await ctx.call('hospitality_core.checkOut', { stayId: reservation.stayId, lateReason: form.lateReason?.trim() || undefined }, url, req));
             status = Number(result.inventoryReleased ?? 0) > 0 ? 'checked-out-early' : 'checked-out';
         }
         else if (form.operation === 'cancel') {
@@ -646,7 +843,10 @@ export const routes = {
         const propertyId = await selectedProperty(ctx, url, req);
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
         const rows = (await ctx.call('hospitality_core.listStays', { propertyId, state: url.searchParams.get('state') || undefined }, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.stays.title'), staysScreen(_, rows, lang, timezone, await frame(ctx, url, req)));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.stays.title',
+            body: (_, frame) => staysScreen(_, rows, lang, timezone, frame),
+        });
     },
     '/admin/hospitality/stays/{id}': (ctx) => async (url, req, params) => {
         if (req.method === 'GET')
@@ -716,7 +916,10 @@ export const routes = {
         const propertyId = await selectedProperty(ctx, url, req);
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
         const rows = (await ctx.call('hospitality_core.listFolios', { propertyId, state: url.searchParams.get('state') || undefined }, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.folios.title'), foliosScreen(_, rows, lang, timezone, await frame(ctx, url, req)));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.folios.title',
+            body: (_, frame) => foliosScreen(_, rows, lang, timezone, frame),
+        });
     },
     '/admin/hospitality/folios/{id}': (ctx) => async (url, req, params) => {
         if (req.method === 'GET')
@@ -766,7 +969,13 @@ export const routes = {
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
         const range = calendarRange(url.searchParams.get('from'), 7, timezone);
         const chart = (await ctx.call('hospitality_core.getTapeChart', { propertyId: propertyId ?? '__none__', from: range.from, to: range.to }, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.tapeChart.title'), tapeChartScreen(_, chart, lang, await frame(ctx, url, req)));
+        // The board is for looking at; the one thing it offers to start is a
+        // booking, and only to somebody who may make one.
+        const may = { book: await ctx.allows('hospitality_core.createReservation', url, req) };
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.tapeChart.title',
+            body: (_, frame) => tapeChartScreen(_, chart, may, lang, frame),
+        });
     },
     '/admin/hospitality/properties': (ctx) => async (url, req) => {
         if (req.method !== 'GET')
@@ -774,11 +983,14 @@ export const routes = {
         const lang = ctx.localeOf(url, req);
         const _ = ctx.translate(lang);
         const properties = (await ctx.call('hospitality_core.listProperties', {}, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.properties.title'), propertiesScreen(_, properties, {
-            rooms: properties.reduce((sum, property) => sum + property.rooms, 0),
-            available: properties.reduce((sum, property) => sum + property.availableRooms, 0),
-            attention: properties.reduce((sum, property) => sum + property.attentionRooms, 0),
-        }, lang, await frame(ctx, url, req)));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.properties.title',
+            body: (_, frame) => propertiesScreen(_, properties, {
+                rooms: properties.reduce((sum, property) => sum + property.rooms, 0),
+                available: properties.reduce((sum, property) => sum + property.availableRooms, 0),
+                attention: properties.reduce((sum, property) => sum + property.attentionRooms, 0),
+            }, lang, frame),
+        });
     },
     '/admin/hospitality/properties/new': (ctx) => async (url, req) => {
         const lang = ctx.localeOf(url, req);
@@ -790,7 +1002,10 @@ export const routes = {
             : [];
         if (req.method === 'GET') {
             const values = defaultPropertyValues(randomUUID());
-            return document(ctx, url, req, _('hospitality_core.property.create.title'), newPropertyScreen(_, values, policies, branches, lang, await frame(ctx, url, req)));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.property.create.title',
+                body: (_, frame) => newPropertyScreen(_, values, policies, branches, lang, frame),
+            });
         }
         if (req.method !== 'POST')
             return text('GET or POST', { status: 405 });
@@ -798,7 +1013,10 @@ export const routes = {
         const values = propertyFormValues(randomUUID(), form);
         const result = (await ctx.call('hospitality_core.saveProperty', propertySaveInput(values), url, req));
         if (!result.ok)
-            return document(ctx, url, req, _('hospitality_core.property.create.title'), newPropertyScreen(_, values, policies, branches, lang, await frame(ctx, url, req), operationErrors(ctx, url, req, result)));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.property.create.title',
+                body: (_, frame) => newPropertyScreen(_, values, policies, branches, lang, frame, operationErrors(ctx, url, req, result)),
+            });
         const query = new URLSearchParams({ status: 'created', lang });
         return seeOther(`/admin/hospitality/properties/${encodeURIComponent(values.id)}?${query.toString()}`);
     },
@@ -923,7 +1141,10 @@ export const routes = {
             return seeOther(`/admin/hospitality/rooms?lang=${encodeURIComponent(lang)}`);
         if (req.method === 'GET') {
             const values = defaultRoomValues(randomUUID(), initial.propertyId, initial.roomTypes[0].id);
-            return document(ctx, url, req, _('hospitality_core.room.create.title'), newRoomScreen(_, values, initial.properties, initial.roomTypes, initial.buildings, initial.floors, lang, await frame(ctx, url, req)));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.room.create.title',
+                body: (_, frame) => newRoomScreen(_, values, initial.properties, initial.roomTypes, initial.buildings, initial.floors, lang, frame),
+            });
         }
         if (req.method !== 'POST')
             return text('GET or POST', { status: 405 });
@@ -932,7 +1153,10 @@ export const routes = {
         const options = await roomOptions(ctx, url, req, values.propertyId);
         const result = (await ctx.call('hospitality_core.saveRoom', values, url, req));
         if (!result.ok)
-            return document(ctx, url, req, _('hospitality_core.room.create.title'), newRoomScreen(_, values, options.properties, options.roomTypes, options.buildings, options.floors, lang, await frame(ctx, url, req), operationErrors(ctx, url, req, result)));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.room.create.title',
+                body: (_, frame) => newRoomScreen(_, values, options.properties, options.roomTypes, options.buildings, options.floors, lang, frame, operationErrors(ctx, url, req, result)),
+            });
         const query = new URLSearchParams({ status: 'created', lang });
         return seeOther(`/admin/hospitality/rooms/${encodeURIComponent(values.id)}?${query.toString()}`);
     },
@@ -977,7 +1201,10 @@ export const routes = {
             ? requestedProperty
             : properties[0]?.id;
         const rows = (await ctx.call('hospitality_core.listRoomTypes', { propertyId }, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.roomTypes.title'), roomTypesScreen(_, rows, properties, propertyId, lang, await frame(ctx, url, req)));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.roomTypes.title',
+            body: (_, frame) => roomTypesScreen(_, rows, properties, propertyId, lang, frame),
+        });
     },
     '/admin/hospitality/room-types/new': (ctx) => async (url, req) => {
         const lang = ctx.localeOf(url, req);
@@ -990,7 +1217,10 @@ export const routes = {
         const propertyId = properties.find((row) => row.id === requestedProperty)?.id ?? properties[0]?.id ?? '';
         if (req.method === 'GET') {
             const values = defaultRoomTypeValues(randomUUID(), propertyId);
-            return document(ctx, url, req, _('hospitality_core.roomType.create.title'), newRoomTypeScreen(_, values, properties, policies, lang, await frame(ctx, url, req)));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.roomType.create.title',
+                body: (_, frame) => newRoomTypeScreen(_, values, properties, policies, lang, frame),
+            });
         }
         if (req.method !== 'POST')
             return text('GET or POST', { status: 405 });
@@ -998,10 +1228,16 @@ export const routes = {
         const values = roomTypeFormValues(randomUUID(), form);
         const inputErrors = roomTypeInputErrors(ctx, url, req, values);
         if (inputErrors.length)
-            return document(ctx, url, req, _('hospitality_core.roomType.create.title'), newRoomTypeScreen(_, values, properties, policies, lang, await frame(ctx, url, req), inputErrors));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.roomType.create.title',
+                body: (_, frame) => newRoomTypeScreen(_, values, properties, policies, lang, frame, inputErrors),
+            });
         const result = (await ctx.call('hospitality_core.saveRoomType', values, url, req));
         if (!result.ok)
-            return document(ctx, url, req, _('hospitality_core.roomType.create.title'), newRoomTypeScreen(_, values, properties, policies, lang, await frame(ctx, url, req), operationErrors(ctx, url, req, result)));
+            return adminPage(ctx, url, req, {
+                title: 'hospitality_core.roomType.create.title',
+                body: (_, frame) => newRoomTypeScreen(_, values, properties, policies, lang, frame, operationErrors(ctx, url, req, result)),
+            });
         const query = new URLSearchParams({ status: 'created', lang });
         return seeOther(`/admin/hospitality/room-types/${encodeURIComponent(values.id)}?${query.toString()}`);
     },
@@ -1043,7 +1279,20 @@ export const routes = {
                 isDefault: form.isDefault === '1',
                 active: form.active === '1',
             }, url, req));
-            return redirected(url, result.ok ? 'saved' : 'invalid', { property: form.propertyId });
+            const values = {
+                property: form.propertyId,
+                roomTypeId: form.roomTypeId,
+                code: form.code,
+                name: form.name,
+                rateType: form.rateType,
+                amount: form.amount,
+                mealPlan: form.mealPlan,
+                minStay: form.minStay,
+                maxStay: form.maxStay,
+                isDefault: form.isDefault,
+                active: form.active,
+            };
+            return modalResultRedirect(url, Boolean(result.ok), 'saved', values, Object.keys(values).filter((key) => key !== 'property'));
         }
         if (req.method !== 'GET')
             return text('GET or POST', { status: 405 });
@@ -1058,7 +1307,50 @@ export const routes = {
             ctx.call('hospitality_core.listRatePlans', { propertyId }, url, req),
             ctx.call('hospitality_core.listRoomTypes', { propertyId }, url, req),
         ]));
-        return document(ctx, url, req, _('hospitality_core.screen.ratePlans.title'), ratePlansScreen(_, rows, properties, roomTypes, propertyId, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.ratePlans.title',
+            body: (_, frame) => ratePlansScreen(_, rows, properties, roomTypes, propertyId, frame, url.searchParams.get('status'), {
+                open: url.searchParams.get('create') === '1',
+                createHref: modalHref(url, true, [
+                    'roomTypeId',
+                    'code',
+                    'name',
+                    'rateType',
+                    'amount',
+                    'mealPlan',
+                    'minStay',
+                    'maxStay',
+                    'isDefault',
+                    'active',
+                ]),
+                closeHref: modalHref(url, false, [
+                    'roomTypeId',
+                    'code',
+                    'name',
+                    'rateType',
+                    'amount',
+                    'mealPlan',
+                    'minStay',
+                    'maxStay',
+                    'isDefault',
+                    'active',
+                ]),
+                action: modalAction(url),
+                errors: modalErrors(url, _),
+                values: modalValues(url, [
+                    'roomTypeId',
+                    'code',
+                    'name',
+                    'rateType',
+                    'amount',
+                    'mealPlan',
+                    'minStay',
+                    'maxStay',
+                    'isDefault',
+                    'active',
+                ]),
+            }),
+        });
     },
     '/admin/hospitality/inventory': (ctx) => async (url, req) => {
         if (req.method === 'POST') {
@@ -1119,7 +1411,10 @@ export const routes = {
         const rows = roomTypeId
             ? (await ctx.call('hospitality_core.listInventory', { propertyId, roomTypeId, from, to }, url, req))
             : [];
-        return document(ctx, url, req, _('hospitality_core.screen.inventory.title'), inventoryScreen(_, rows, properties, roomTypes, { propertyId, roomTypeId, from, to }, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.inventory.title',
+            body: (_, frame) => inventoryScreen(_, rows, properties, roomTypes, { propertyId, roomTypeId, from, to }, frame, url.searchParams.get('status')),
+        });
     },
     '/admin/hospitality/services': (ctx) => async (url, req) => {
         if (req.method === 'POST') {
@@ -1201,16 +1496,19 @@ export const routes = {
             })),
         ];
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
-        return document(ctx, url, req, _('hospitality_core.screen.services.title'), servicesScreen(_, {
-            properties,
-            propertyId,
-            products,
-            targets,
-            propertyCharges,
-            extraLines,
-            charges,
-            ids: { propertyCharge: randomUUID(), extraLine: randomUUID(), requestKey: randomUUID() },
-        }, lang, timezone, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.services.title',
+            body: (_, frame) => servicesScreen(_, {
+                properties,
+                propertyId,
+                products,
+                targets,
+                propertyCharges,
+                extraLines,
+                charges,
+                ids: { propertyCharge: randomUUID(), extraLine: randomUUID(), requestKey: randomUUID() },
+            }, lang, timezone, frame, url.searchParams.get('status')),
+        });
     },
     '/admin/hospitality/night-audit': (ctx) => async (url, req) => {
         if (req.method === 'POST') {
@@ -1242,7 +1540,10 @@ export const routes = {
                 ctx.call('hospitality_core.listNightAudits', { propertyId, limit: 30 }, url, req),
             ]))
             : [undefined, []];
-        return document(ctx, url, req, _('hospitality_core.screen.nightAudit.title'), nightAuditScreen(_, { properties, propertyId, auditDate, today, preview, runs }, lang, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.nightAudit.title',
+            body: (_, frame) => nightAuditScreen(_, { properties, propertyId, auditDate, today, preview, runs }, lang, frame, url.searchParams.get('status')),
+        });
     },
     '/admin/hospitality/stay-notices': (ctx) => async (url, req) => {
         if (req.method === 'POST') {
@@ -1292,7 +1593,10 @@ export const routes = {
         const selectedId = url.searchParams.get('notice')?.trim();
         const selected = rows.find((row) => row.id === selectedId);
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
-        return document(ctx, url, req, _('hospitality_core.screen.stayNotices.title'), stayNoticesScreen(_, { properties, propertyId, state, rows, selected }, lang, timezone, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.stayNotices.title',
+            body: (_, frame) => stayNoticesScreen(_, { properties, propertyId, state, rows, selected }, lang, timezone, frame, url.searchParams.get('status')),
+        });
     },
     '/admin/hospitality/housekeeping': (ctx) => async (url, req) => {
         if (req.method === 'POST') {
@@ -1309,11 +1613,17 @@ export const routes = {
                 assigneeId: form.assigneeId?.trim() || undefined,
                 notes: form.notes?.trim() || undefined,
             }, url, req));
-            return redirected(url, result.ok ? 'created' : 'invalid', {
+            return modalResultRedirect(url, Boolean(result.ok), 'created', {
                 property: form.propertyId,
                 state: form.state === 'all' ? undefined : form.state,
                 lang: form.lang,
-            });
+                room: result.ok ? undefined : form.roomId,
+                roomId: form.roomId,
+                taskType: form.taskType,
+                priority: form.priority,
+                assigneeId: form.assigneeId,
+                notes: form.notes,
+            }, ['roomId', 'taskType', 'priority', 'assigneeId', 'notes']);
         }
         if (req.method !== 'GET')
             return text('GET or POST', { status: 405 });
@@ -1328,28 +1638,43 @@ export const routes = {
         const state = CLEANING_TASK_STATES.includes(requestedState)
             ? requestedState
             : 'all';
+        const canCreate = await ctx.allows('hospitality_core.createCleaningTask', url, req);
         const [rows, rooms, summary] = propertyId
             ? (await Promise.all([
                 ctx.call('hospitality_core.listCleaningTasks', { propertyId, state: state === 'all' ? undefined : state, limit: 500 }, url, req),
-                ctx.call('hospitality_core.listRooms', { propertyId }, url, req),
+                canCreate
+                    ? ctx.call('hospitality_core.listRooms', { propertyId }, url, req)
+                    : Promise.resolve([]),
                 ctx.call('hospitality_core.cleaningTaskSummary', { propertyId }, url, req),
             ]))
             : [[], [], { todo: 0, inProgress: 0, done: 0, cancelled: 0 }];
         const timezone = await propertyTimezone(ctx, propertyId, url, req);
         const taskId = randomUUID();
-        return document(ctx, url, req, _('hospitality_core.screen.cleaningTasks.title'), cleaningTasksScreen(_, {
-            rows,
-            properties,
-            propertyId,
-            state,
-            rooms,
-            summary,
-            id: taskId,
-            code: `HK-${taskId.slice(0, 12).toUpperCase()}`,
-            selectedRoomId: rooms.some((room) => room.id === url.searchParams.get('room'))
-                ? url.searchParams.get('room')
-                : undefined,
-        }, lang, timezone, await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.cleaningTasks.title',
+            body: (_, frame) => cleaningTasksScreen(_, {
+                rows,
+                properties,
+                propertyId,
+                state,
+                rooms,
+                summary,
+                id: taskId,
+                code: `HK-${taskId.slice(0, 12).toUpperCase()}`,
+                selectedRoomId: rooms.some((room) => room.id === url.searchParams.get('room'))
+                    ? url.searchParams.get('room')
+                    : undefined,
+            }, lang, timezone, frame, url.searchParams.get('status'), canCreate
+                ? {
+                    open: url.searchParams.get('create') === '1',
+                    createHref: modalHref(url, true),
+                    closeHref: modalHref(url, false, ['room']),
+                    action: modalAction(url),
+                    errors: modalErrors(url, _),
+                    values: modalValues(url, ['roomId', 'taskType', 'priority', 'assigneeId', 'notes']),
+                }
+                : undefined, canCreate),
+        });
     },
     '/admin/hospitality/housekeeping/tasks/{id}': (ctx) => async (url, req, params) => {
         if (req.method === 'GET')
@@ -1401,7 +1726,10 @@ export const routes = {
                 ctx.call('hospitality_core.roomStatusSummary', { propertyId }, url, req),
             ]))
             : [[], { available: 0, occupied: 0, dirty: 0, cleaning: 0, maintenance: 0, outOfOrder: 0 }];
-        return document(ctx, url, req, _('hospitality_core.screen.housekeepingRooms.title'), housekeepingRoomsScreen(_, { rows, properties, propertyId, state, summary }, lang, await frame(ctx, url, req)));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.housekeepingRooms.title',
+            body: (_, frame) => housekeepingRoomsScreen(_, { rows, properties, propertyId, state, summary }, lang, frame),
+        });
     },
     '/admin/hospitality/housekeeping/rooms/{id}': (ctx) => async (url, req, params) => {
         if (req.method === 'GET')
@@ -1452,11 +1780,14 @@ export const routes = {
                 images.length > 0,
             ];
         const completed = checks.filter(Boolean).length;
-        return document(ctx, url, req, _('hospitality_core.screen.content.title'), contentScreen(_, selection.properties, selection.roomTypes, selection.propertyId, selection.target, images, {
-            completed,
-            total: checks.length,
-            percent: checks.length ? Math.round((completed / checks.length) * 100) : 0,
-        }, lang, contentQuery(url, selection), await frame(ctx, url, req), url.searchParams.get('status')));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.content.title',
+            body: (_, frame) => contentScreen(_, selection.properties, selection.roomTypes, selection.propertyId, selection.target, images, {
+                completed,
+                total: checks.length,
+                percent: checks.length ? Math.round((completed / checks.length) * 100) : 0,
+            }, lang, contentQuery(url, selection), frame, url.searchParams.get('status')),
+        });
     },
     '/admin/hospitality/content/upload': (ctx) => async (url, req) => {
         if (req.method !== 'POST')
@@ -1530,16 +1861,104 @@ export const routes = {
     '/admin/hospitality/content/images/{id}/move-up': (ctx) => async (url, req, params) => moveContentImage(ctx, url, req, params.id, -1),
     '/admin/hospitality/content/images/{id}/move-down': (ctx) => async (url, req, params) => moveContentImage(ctx, url, req, params.id, 1),
     '/admin/hospitality/amenities': (ctx) => async (url, req) => {
-        const lang = ctx.localeOf(url, req);
-        const _ = ctx.translate(lang);
-        const rows = (await ctx.call('hospitality_core.listAmenities', {}, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.amenities.title'), amenitiesScreen(_, rows, await frame(ctx, url, req)));
+        if (req.method === 'POST') {
+            const form = await readForm(req);
+            if (form.operation !== 'save-amenity')
+                return text('unknown action', { status: 400 });
+            const result = (await ctx.call('hospitality_core.saveAmenity', {
+                id: randomUUID(),
+                code: form.code ?? '',
+                name: form.name ?? '',
+                scope: form.scope ?? 'property',
+                categoryId: form.categoryId || undefined,
+                sequence: integer(form.sequence),
+            }, url, req));
+            const values = {
+                code: form.code,
+                name: form.name,
+                scope: form.scope,
+                categoryId: form.categoryId,
+                sequence: form.sequence,
+            };
+            return modalResultRedirect(url, Boolean(result.ok), 'saved', values, Object.keys(values));
+        }
+        if (req.method !== 'GET')
+            return text('GET or POST', { status: 405 });
+        const [rows, categories] = (await Promise.all([
+            ctx.call('hospitality_core.listAmenities', {}, url, req),
+            ctx.call('hospitality_core.listAmenityCategories', {}, url, req),
+        ]));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.amenities.title',
+            body: (_, frame) => amenitiesScreen(_, rows, categories, frame, url.searchParams.get('status'), {
+                open: url.searchParams.get('create') === '1',
+                createHref: modalHref(url, true, ['code', 'name', 'scope', 'categoryId', 'sequence']),
+                closeHref: modalHref(url, false, ['code', 'name', 'scope', 'categoryId', 'sequence']),
+                action: modalAction(url),
+                errors: modalErrors(url, _),
+                values: modalValues(url, ['code', 'name', 'scope', 'categoryId', 'sequence']),
+            }),
+        });
     },
     '/admin/hospitality/policies': (ctx) => async (url, req) => {
-        const lang = ctx.localeOf(url, req);
-        const _ = ctx.translate(lang);
+        if (req.method === 'POST') {
+            const form = await readForm(req);
+            if (form.operation !== 'save-policy')
+                return text('unknown action', { status: 400 });
+            const result = (await ctx.call('hospitality_core.saveCancellationPolicy', {
+                id: randomUUID(),
+                code: form.code ?? '',
+                name: form.name ?? '',
+                type: form.type ?? 'flexible',
+                description: form.description || undefined,
+                freeCancellationHours: integer(form.freeCancellationHours),
+                penaltyPercent: form.penaltyPercent ?? '0',
+            }, url, req));
+            const values = {
+                code: form.code,
+                name: form.name,
+                type: form.type,
+                description: form.description,
+                freeCancellationHours: form.freeCancellationHours,
+                penaltyPercent: form.penaltyPercent,
+            };
+            return modalResultRedirect(url, Boolean(result.ok), 'saved', values, Object.keys(values));
+        }
+        if (req.method !== 'GET')
+            return text('GET or POST', { status: 405 });
         const rows = (await ctx.call('hospitality_core.listCancellationPolicies', {}, url, req));
-        return document(ctx, url, req, _('hospitality_core.screen.policies.title'), policiesScreen(_, rows, await frame(ctx, url, req)));
+        return adminPage(ctx, url, req, {
+            title: 'hospitality_core.screen.policies.title',
+            body: (_, frame) => policiesScreen(_, rows, frame, url.searchParams.get('status'), {
+                open: url.searchParams.get('create') === '1',
+                createHref: modalHref(url, true, [
+                    'code',
+                    'name',
+                    'type',
+                    'description',
+                    'freeCancellationHours',
+                    'penaltyPercent',
+                ]),
+                closeHref: modalHref(url, false, [
+                    'code',
+                    'name',
+                    'type',
+                    'description',
+                    'freeCancellationHours',
+                    'penaltyPercent',
+                ]),
+                action: modalAction(url),
+                errors: modalErrors(url, _),
+                values: modalValues(url, [
+                    'code',
+                    'name',
+                    'type',
+                    'description',
+                    'freeCancellationHours',
+                    'penaltyPercent',
+                ]),
+            }),
+        });
     },
 };
 const moveContentImage = async (ctx, url, req, imageId, delta) => {