From ee4953277472a0b1f5b4c9adf0a5ac3f722841ec Mon Sep 17 00:00:00 2001 From: Stephen Adamson Date: Thu, 20 Aug 2026 16:38:14 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20frontend=2012h=20time=20display=20?= =?UTF-8?q?=E2=80=94=20add=20hour12:=20true=20to=20schedule,=20GDPR=20expo?= =?UTF-8?q?rt,=20reschedule=20modal,=20booking=20create?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- .../account/UserBookingModal.svelte | 36 ++--- .../admin/BookingCreateModal.svelte | 3 +- .../lib/components/admin/BookingModal.svelte | 6 +- .../lib/components/admin/TillPurchases.svelte | 8 +- frontend/src/lib/components/ui/map/Map.svelte | 3 + frontend/src/routes/+layout.svelte | 1 + .../routes/cancellation-policy/+page.svelte | 39 +++--- frontend/src/routes/gdpr/+page.svelte | 3 +- .../src/routes/gift-card-terms/+page.svelte | 6 +- .../src/routes/privacy-policy/+page.svelte | 124 +++++++++--------- frontend/src/routes/schedule/+page.svelte | 5 +- frontend/src/routes/terms/+page.svelte | 16 ++- 12 files changed, 128 insertions(+), 122 deletions(-) diff --git a/frontend/src/lib/components/account/UserBookingModal.svelte b/frontend/src/lib/components/account/UserBookingModal.svelte index f65fe7c..f4afb6e 100644 --- a/frontend/src/lib/components/account/UserBookingModal.svelte +++ b/frontend/src/lib/components/account/UserBookingModal.svelte @@ -763,23 +763,25 @@ ${hasVAT ? `

VAT is included at ${biz?.default_vat_rate ?? 20}

Awaiting admin approval

- {#if timeChanged} - Reschedule requested from {parseWallClockDate( - pendingEditRequest.original.start_time! - ).toLocaleString('en-GB', { - day: 'numeric', - month: 'short', - hour: '2-digit', - minute: '2-digit' - })} to {parseWallClockDate( - pendingEditRequest.proposed.start_time! - ).toLocaleString('en-GB', { - day: 'numeric', - month: 'short', - hour: '2-digit', - minute: '2-digit' - })} - {/if} + {#if timeChanged} + Reschedule requested from {parseWallClockDate( + pendingEditRequest.original.start_time! + ).toLocaleString('en-GB', { + day: 'numeric', + month: 'short', + hour: '2-digit', + minute: '2-digit', + hour12: true + })} to {parseWallClockDate( + pendingEditRequest.proposed.start_time! + ).toLocaleString('en-GB', { + day: 'numeric', + month: 'short', + hour: '2-digit', + minute: '2-digit', + hour12: true + })} + {/if}

{#if addedServices.length > 0}

diff --git a/frontend/src/lib/components/admin/BookingCreateModal.svelte b/frontend/src/lib/components/admin/BookingCreateModal.svelte index ee9320c..9c3d19d 100644 --- a/frontend/src/lib/components/admin/BookingCreateModal.svelte +++ b/frontend/src/lib/components/admin/BookingCreateModal.svelte @@ -1658,7 +1658,8 @@ reservationExpiresAt.toISOString() ).toLocaleTimeString([], { hour: '2-digit', - minute: '2-digit' + minute: '2-digit', + hour12: true })}

diff --git a/frontend/src/lib/components/admin/BookingModal.svelte b/frontend/src/lib/components/admin/BookingModal.svelte index c1652d0..f6bad00 100644 --- a/frontend/src/lib/components/admin/BookingModal.svelte +++ b/frontend/src/lib/components/admin/BookingModal.svelte @@ -794,9 +794,9 @@ {#if selectedBooking.status === 'in_progress'}