@code-collective/booking-widget 1.0.6 → 1.0.7

package/src/lib/CartOverviewButton.svelte

@@ -2,7 +2,6 @@
   import type { CheckoutCartDetailDto } from './client-types';
   import type { BookingApi } from './api';
   import { CartManager } from './cart-manager';
-  import { formatCurrency } from './currency';
   import { postMessage } from './messages';
   import { onDestroy } from 'svelte';
 
@@ -28,11 +27,13 @@
 
   // load() above only runs once on mount - without this, adding/editing/removing an item elsewhere on the
   // page (the configurator, or the checkout modal's own edit/remove) leaves this button showing a stale total.
+  // The event already carries the fresh cart (see TicketConfigurator/CheckoutModal's own posting sites), so
+  // this applies it directly rather than triggering a second, redundant getCart() call.
   function handleMessage(e: MessageEvent) {
     let d: Record<string, unknown>;
     try { d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data; }
     catch { return; }
-    if (d?.type === 'cart:updated') load();
+    if (d?.type === 'cart:updated' && 'cart' in d) cart = d.cart as CheckoutCartDetailDto | null;
   }
 
   $effect(() => {
@@ -53,13 +54,6 @@
   onDestroy(() => clearInterval(interval));
 
   let itemCount = $derived(cart?.items.length ?? 0);
-
-  let totalLabel = $derived(() => {
-    if (!cart || cart.items.length === 0) return '';
-    const currency = cart.items[0].currencyCode;
-    const total = cart.items.reduce((sum, i) => sum + i.amount, 0);
-    return formatCurrency(total, currency, 2, 0);
-  });
 </script>
 
 {#if cart && cart.items.length > 0}
@@ -69,8 +63,6 @@
       <path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"/>
     </svg>
     <span class="cart-badge">{itemCount}</span>
-    <span class="cart-total">{totalLabel()}</span>
-    <span class="cart-sep"></span>
     <span class="cart-timer">{remaining}</span>
   </button>
 {/if}
@@ -79,15 +71,14 @@
   .cart-overview-btn {
     display: flex;
     align-items: center;
-    gap: 10px;
+    justify-content: center;
+    gap: 14px;
     width: 100%;
-    padding: 12px 20px;
+    padding: 14px 24px;
     background: var(--bw-color-primary);
     color: white;
     border: none;
     border-radius: 999px;
-    font-size: 14px;
-    font-weight: 700;
     cursor: pointer;
     transition: background 0.15s;
   }
@@ -95,40 +86,27 @@
     background: var(--bw-color-primary-dark);
   }
   .cart-icon {
-    width: 18px;
-    height: 18px;
+    width: 22px;
+    height: 22px;
     flex-shrink: 0;
   }
   .cart-badge {
     display: flex;
     align-items: center;
     justify-content: center;
-    min-width: 22px;
-    height: 22px;
-    padding: 0 5px;
+    width: 26px;
+    height: 26px;
     background: white;
     color: var(--bw-color-primary);
-    border-radius: 5px;
-    font-size: 12px;
-    font-weight: 800;
-    flex-shrink: 0;
-  }
-  .cart-total {
-    flex: 1;
-    text-align: left;
+    border-radius: 50%;
     font-size: 14px;
-    font-weight: 700;
-  }
-  .cart-sep {
-    width: 1px;
-    height: 16px;
-    background: rgba(255,255,255,0.35);
+    font-weight: 800;
     flex-shrink: 0;
   }
   .cart-timer {
     font-variant-numeric: tabular-nums;
-    font-size: 13px;
-    opacity: 0.85;
+    font-size: 20px;
+    font-weight: 700;
     flex-shrink: 0;
   }
 </style>

package/src/lib/Checkout.svelte

@@ -28,6 +28,23 @@
   }
 
   load();
+
+  // In modal mode this is redundant - bw-checkout.svelte only mounts this component fresh each time the
+  // modal opens, so it already gets a current cart. Rendered permanently in-page instead (no is-modal), it
+  // would otherwise only ever see the cart as it was on first mount. The event already carries the fresh
+  // cart (see TicketConfigurator/CheckoutModal's own posting sites), so this applies it directly rather than
+  // triggering a second, redundant getCart() call or flashing the spinner over an already-visible cart.
+  function handleMessage(e: MessageEvent) {
+    let d: Record<string, unknown>;
+    try { d = typeof e.data === 'string' ? JSON.parse(e.data) : e.data; }
+    catch { return; }
+    if (d?.type === 'cart:updated' && 'cart' in d) cart = d.cart as CheckoutCartDetailDto | null;
+  }
+
+  $effect(() => {
+    window.addEventListener('message', handleMessage);
+    return () => window.removeEventListener('message', handleMessage);
+  });
 </script>
 
 <div class="bw-widget">

package/src/lib/CheckoutModal.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { CheckoutCartDetailDto, CheckoutCartItemDetailDto, CheckoutCartPaymentInitiationDto, CheckoutCartConfirmResultDto, CheckoutProductDto } from './client-types';
   import type { BookingApi } from './api';
+  import { ApiError } from './api';
   import type { WizardPages } from './config';
   import { formatCurrency } from './currency';
   import { postMessage } from './messages';
@@ -23,6 +24,12 @@
   }
   let { cart, api, wizardPages, editPages, autoSelectSingleTimeSlot = false, onClose, onOrderConfirmed }: Props = $props();
 
+  // Peach's webhook is typically near-instant, but is a genuinely separate async delivery from the card
+  // charge itself - 10 attempts 1.5s apart (~15s) comfortably covers ordinary delivery latency without
+  // making a shopper whose payment already succeeded wait an unreasonable time to see it confirmed.
+  const ConfirmMaxAttempts = 10;
+  const ConfirmRetryDelayMs = 1500;
+
   type View = 'cart' | 'contact' | 'edit' | 'payment' | 'result';
   let currentView = $state<View>('cart');
   let editingItem = $state<CheckoutCartItemDetailDto | null>(null);
@@ -34,6 +41,19 @@
   let privacyAccepted = $state(false);
   let marketingOptIn = $state(false);
   let hasAttemptedSubmit = $state(false);
+  let payError = $state<string | null>(null);
+  // Deliberately separate from isLoading above - that one gates the entire view switch below (spinner vs.
+  // cart/contact/payment/result), so reusing it here would unmount ContactForm for the duration of the
+  // payCart call and, on failure, remount it with its own $state reset to blank, forcing the shopper to
+  // retype everything before retrying. This only ever disables the Pay Now button itself.
+  let isPaying = $state(false);
+
+  // Owned here, not inside ContactForm, so the shopper's typed details survive navigating back to the cart
+  // and returning to checkout - see ContactForm's own doc comment on its bindable props for why.
+  let contactFirstName = $state('');
+  let contactLastName = $state('');
+  let contactEmail = $state('');
+  let contactPhone = $state('');
 
   let contactForm = $state<ContactForm | null>(null);
 
@@ -126,23 +146,25 @@
     const updated = await api.getCart();
     cart = updated;
     currentView = 'cart';
-    notifyCartUpdated();
+    notifyCartUpdated(updated);
   }
 
   async function removeItem(item: CheckoutCartItemDetailDto) {
     await api.removeCartItem(item.id);
     const updated = await api.getCart();
     cart = updated;
-    notifyCartUpdated();
+    notifyCartUpdated(updated);
     if (cart.items.length === 0) close();
   }
 
-  // A standalone postMessage - not the itemCount/cartItemId-shaped cart:change TicketConfigurator posts on
-  // add (which bw-configurator.svelte re-dispatches as the public bw:cart-change event and auto-opens
-  // checkout for). This is purely internal: CartBar/CartOverviewButton listen for it to refetch their own
-  // total after an edit or remove, which otherwise only ever fetch once on mount.
-  function notifyCartUpdated(): void {
-    postMessage({ type: 'cart:updated' });
+  // Not the itemCount/cartItemId-shaped cart:change TicketConfigurator posts on add (which
+  // bw-configurator.svelte re-dispatches as the public bw:cart-change event and auto-opens checkout for).
+  // This carries the cart itself: CartBar/CartOverviewButton/Checkout use it to update their own state after
+  // an edit or remove without a second independent fetch, and it's forwarded to consumers as the public
+  // bw:cart-updated event/onCartUpdated callback, so a consumer can build their own cart summary UI from
+  // item count/remaining time/item details without calling the API directly.
+  function notifyCartUpdated(updatedCart: CheckoutCartDetailDto): void {
+    postMessage({ type: 'cart:updated', cart: updatedCart });
   }
 
   async function onPayNow() {
@@ -151,12 +173,23 @@
 
     const contact = contactForm.getContact();
 
-    isLoading = true;
+    isPaying = true;
+    payError = null;
     try {
       paymentResult = await api.payCart(contact);
       currentView = 'payment';
+    } catch (e) {
+      // PayCheckoutCartCommandHandler's own error-mapping switch: 502 means Peach itself (or the network
+      // path to it) failed before a checkout could even be created - no charge was attempted, so this is
+      // always safe to retry. Every other status (400/409) reflects a cart/contact state the shopper can't
+      // fix by only retrying the same request, but there is no more specific action to suggest here either -
+      // either way, without this catch the rejection was previously unhandled and the shopper saw no
+      // indication anything had gone wrong at all.
+      payError = e instanceof ApiError && e.status === 502
+        ? 'Unable to start payment right now. Please try again.'
+        : 'Something went wrong starting your payment. Please try again.';
     } finally {
-      isLoading = false;
+      isPaying = false;
     }
   }
 
@@ -175,18 +208,30 @@
 
     isConfirming = true;
     currentView = 'result';
-    try {
-      confirmResult = await api.confirmCart();
-      const allOk = confirmResult.items.every((i) => i.statusCode >= 200 && i.statusCode < 300);
-      confirmFailed = !allOk;
-      isConfirming = false;
-      if (allOk) {
-        postMessage({ type: 'modal:close' });
-        onOrderConfirmed();
+
+    for (let attempt = 1; attempt <= ConfirmMaxAttempts; attempt++) {
+      try {
+        confirmResult = await api.confirmCart();
+        const allOk = confirmResult.items.every((i) => i.statusCode >= 200 && i.statusCode < 300);
+        confirmFailed = !allOk;
+        isConfirming = false;
+        if (allOk) {
+          postMessage({ type: 'modal:close' });
+          onOrderConfirmed();
+        }
+        return;
+      } catch (e) {
+        // 402 means the card charge already succeeded (that's why PaymentPage's onCompleted fired at all) but
+        // Peach's own webhook hasn't reached PeachWebhookEndpoints yet to move the cart to Paid server-side -
+        // a race with the webhook, not a real failure, so it's worth a few retries rather than failing outright.
+        const isAwaitingWebhook = e instanceof ApiError && e.status === 402;
+        if (!isAwaitingWebhook || attempt === ConfirmMaxAttempts) {
+          confirmFailed = true;
+          isConfirming = false;
+          return;
+        }
+        await new Promise((resolve) => setTimeout(resolve, ConfirmRetryDelayMs));
       }
-    } catch {
-      confirmFailed = true;
-      isConfirming = false;
     }
   }
 </script>
@@ -239,11 +284,21 @@
     </div>
 
     <div class="body">
+      {#if payError}
+        <p class="pay-error">{payError}</p>
+      {/if}
       <div class="contact-header">
         <span class="contact-title">Contact Details</span>
         <span class="required-hint">* Required Fields</span>
       </div>
-      <ContactForm bind:this={contactForm} {hasAttemptedSubmit} />
+      <ContactForm
+        bind:this={contactForm}
+        {hasAttemptedSubmit}
+        bind:firstName={contactFirstName}
+        bind:lastName={contactLastName}
+        bind:emailAddress={contactEmail}
+        bind:phoneNumber={contactPhone}
+      />
       <div style="margin-top:24px">
         <ConsentSection
           {privacyAccepted}
@@ -257,8 +312,8 @@
 
     <div class="pay-bar">
       <span class="pay-bar-total">{formattedTotal()}</span>
-      <button class="pay-bar-btn" onclick={onPayNow}>
-        Pay Now <span class="arrow">&rarr;</span>
+      <button class="pay-bar-btn" onclick={onPayNow} disabled={isPaying}>
+        {isPaying ? 'Paying…' : 'Pay Now'} <span class="arrow">&rarr;</span>
       </button>
     </div>
 
@@ -444,6 +499,14 @@
     font-weight: 800;
   }
   /* -- Contact view -- */
+  .pay-error {
+    margin: 0 0 16px;
+    padding: 12px 16px;
+    background: #fdecea;
+    color: #b3261e;
+    font-size: 14px;
+    border-radius: var(--bw-radius-md);
+  }
   .contact-header {
     display: flex;
     justify-content: space-between;
@@ -487,6 +550,10 @@
     font-size: 16px;
     font-weight: 700;
   }
+  .pay-bar-btn:disabled {
+    opacity: 0.7;
+    cursor: default;
+  }
   .pay-bar-btn .arrow {
     font-size: 20px;
   }

package/src/lib/ContactForm.svelte

@@ -3,13 +3,22 @@
 
   interface Props {
     hasAttemptedSubmit: boolean;
+    firstName: string;
+    lastName: string;
+    emailAddress: string;
+    phoneNumber: string;
   }
-  let { hasAttemptedSubmit }: Props = $props();
-
-  let firstName = $state('');
-  let lastName = $state('');
-  let emailAddress = $state('');
-  let phoneNumber = $state('');
+  // Bindable so the caller owns the actual values - CheckoutModal's own currentView switch unmounts this
+  // component entirely when navigating away from the contact view (a different arm of the same {#if/:else
+  // if} chain as the cart/edit/payment views), so state kept only here would reset to blank every time the
+  // shopper went back to the cart and returned. Binding lets it survive in the parent instead.
+  let {
+    hasAttemptedSubmit,
+    firstName = $bindable(''),
+    lastName = $bindable(''),
+    emailAddress = $bindable(''),
+    phoneNumber = $bindable(''),
+  }: Props = $props();
 
   export function isValid(): boolean {
     return firstName.trim() !== '' && emailAddress.trim() !== '' && phoneNumber.trim() !== '';

package/src/lib/EditBookingView.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { CartItem, CheckoutCartItemDetailDto, CheckoutProductDto } from './client-types';
   import type { BookingApi } from './api';
+  import { ApiError } from './api';
   import type { WizardPages } from './config';
   import { DEFAULT_WIZARD_PAGES } from './config';
   import { expandUnitItems } from './utils';
@@ -20,9 +21,11 @@
   let { cartItem, product, api, wizardPages, editPages, autoSelectSingleTimeSlot = false, onBack, onClose, onUpdated }: Props = $props();
 
   let isSaving = $state(false);
+  let errorMessage = $state<string | null>(null);
 
   async function onComplete(item: CartItem) {
     isSaving = true;
+    errorMessage = null;
     try {
       await api.updateCartItem(cartItem.id, {
         productId: item.productId,
@@ -36,6 +39,14 @@
         currencyPrecision: item.currencyPrecision,
       });
       onUpdated();
+    } catch (e) {
+      // 424 means the cart item itself was rolled back server-side (see CheckoutCartEndpoints.UpdateItemAsync) -
+      // the supplier rejected the change, so nothing was saved. Surface that instead of letting it vanish
+      // silently: WizardPage stays mounted (not swapped for a spinner) specifically so the user's in-progress
+      // selections aren't lost while they read this and decide what to try instead.
+      errorMessage = e instanceof ApiError && e.status === 424
+        ? 'This change could not be saved - the supplier rejected it. Please try different options.'
+        : 'Something went wrong saving your changes. Please try again.';
     } finally {
       isSaving = false;
     }
@@ -50,9 +61,11 @@
     <button class="icon-btn" onclick={onClose} aria-label="Close">&times;</button>
   </div>
 
-  {#if isSaving}
-    <div class="loading-center"><div class="spinner"></div></div>
-  {:else}
+  {#if errorMessage}
+    <p class="edit-error">{errorMessage}</p>
+  {/if}
+
+  <div class="edit-body" class:saving={isSaving}>
     <WizardPage
       {product}
       {api}
@@ -63,7 +76,10 @@
       {onComplete}
       onCancel={onBack}
     />
-  {/if}
+    {#if isSaving}
+      <div class="saving-overlay"><div class="spinner"></div></div>
+    {/if}
+  </div>
 </div>
 
 <style>
@@ -74,4 +90,33 @@
     max-height: 100%;
     overflow: hidden;
   }
+
+  .edit-error {
+    margin: 0;
+    padding: 12px 16px;
+    background: #fdecea;
+    color: #b3261e;
+    font-size: 14px;
+  }
+
+  .edit-body {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
+  }
+
+  .edit-body.saving {
+    pointer-events: none;
+  }
+
+  .saving-overlay {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(255, 255, 255, 0.7);
+  }
 </style>

package/src/lib/PaymentPage.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import { onMount, onDestroy } from 'svelte';
+  import { loadPeachSdk } from './peach-sdk';
 
   interface Props {
     checkoutId: string;
@@ -16,33 +17,37 @@
   let peachInstance: any = null;
 
   onMount(() => {
-    try {
-      const Checkout = (window as any).Checkout;
-      if (!Checkout) {
-        failed = true;
-        errorMessage = 'Payment SDK not loaded';
-        return;
-      }
+    (async () => {
+      try {
+        await loadPeachSdk();
 
-      peachInstance = Checkout.initiate({
-        checkoutId,
-        customisations: {
-          card: { submitButtonText: 'Pay Now' },
-          theme: { brand: { primary: '#E30613' } },
-        },
-        eventHandlers: {
-          onCompleted: () => { cleanup(); onPaymentComplete({ status: 'completed' }); },
-          onCancelled: () => { cleanup(); onPaymentComplete({ status: 'cancelled' }); },
-          onExpired: () => { cleanup(); onPaymentComplete({ status: 'expired' }); },
-          onError: () => { cleanup(); onPaymentComplete({ status: 'error' }); },
-        },
-      });
+        const Checkout = (window as any).Checkout;
+        if (!Checkout) {
+          failed = true;
+          errorMessage = 'Payment SDK not loaded';
+          return;
+        }
 
-      peachInstance.render('#peach-container');
-    } catch (e) {
-      failed = true;
-      errorMessage = String(e);
-    }
+        peachInstance = Checkout.initiate({
+          checkoutId,
+          customisations: {
+            card: { submitButtonText: 'Pay Now' },
+            theme: { brand: { primary: '#E30613' } },
+          },
+          eventHandlers: {
+            onCompleted: () => { cleanup(); onPaymentComplete({ status: 'completed' }); },
+            onCancelled: () => { cleanup(); onPaymentComplete({ status: 'cancelled' }); },
+            onExpired: () => { cleanup(); onPaymentComplete({ status: 'expired' }); },
+            onError: () => { cleanup(); onPaymentComplete({ status: 'error' }); },
+          },
+        });
+
+        peachInstance.render('#peach-container');
+      } catch (e) {
+        failed = true;
+        errorMessage = String(e);
+      }
+    })();
   });
 
   function cleanup() {

package/src/lib/TicketConfigurator.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import type { BookingApi } from './api';
+  import { ApiError } from './api';
   import type { WizardPages } from './config';
   import { DEFAULT_WIZARD_PAGES } from './config';
   import type { CartItem, CheckoutProductDto } from './client-types';
@@ -22,6 +23,7 @@
   let product = $state<CheckoutProductDto | null>(null);
   let isLoading = $state(true);
   let isAddingToCart = $state(false);
+  let addToCartError = $state<string | null>(null);
 
   async function load() {
     product = await api.getProduct(productId);
@@ -30,37 +32,61 @@
 
   load();
 
+  async function addItemToCart(item: CartItem): Promise<void> {
+    await cartManager.ensureCart();
+
+    const unitItems = expandUnitItems(item.units);
+    const added = await api.addCartItem({
+      productId: item.productId,
+      optionId: item.optionId,
+      unitItems,
+      availabilityId: item.availabilityId,
+      localDate: item.localDate,
+      pickupPointId: item.pickupPointId,
+      amount: item.totalPrice,
+      currencyCode: item.currency,
+      currencyPrecision: item.currencyPrecision,
+    });
+
+    const total = formatCurrency(item.totalPrice, item.currency, item.currencyPrecision, 2);
+    postMessage({
+      type: 'cart:change',
+      itemCount: unitItems.length,
+      cartItemId: added.id,
+      totalFormatted: total,
+      openCheckout: true,
+    });
+    // Separate from cart:change above - that one is per-item-added detail forwarded to consumers as the
+    // public bw:cart-change event. This one carries the fresh cart itself: CartBar/CartOverviewButton/Checkout
+    // use it to update their own state without each independently re-fetching, and it's forwarded to
+    // consumers as the public bw:cart-updated event/onCartUpdated callback - see this event's own doc comment
+    // in CheckoutModal (the other place it's posted from, after an edit/remove).
+    const cart = await api.getCart().catch(() => null);
+    postMessage({ type: 'cart:updated', cart });
+  }
+
   async function onAddToCart(item: CartItem) {
     isAddingToCart = true;
+    addToCartError = null;
 
     try {
-      await cartManager.ensureCart();
-
-      const unitItems = expandUnitItems(item.units);
-      const added = await api.addCartItem({
-        productId: item.productId,
-        optionId: item.optionId,
-        unitItems,
-        availabilityId: item.availabilityId,
-        localDate: item.localDate,
-        pickupPointId: item.pickupPointId,
-        amount: item.totalPrice,
-        currencyCode: item.currency,
-        currencyPrecision: item.currencyPrecision,
-      });
-
-      const total = formatCurrency(item.totalPrice, item.currency, item.currencyPrecision, 2);
-      postMessage({
-        type: 'cart:change',
-        itemCount: unitItems.length,
-        cartItemId: added.id,
-        totalFormatted: total,
-        openCheckout: true,
-      });
-      // Separate from cart:change above - that one is per-item-added detail forwarded to consumers as the
-      // public bw:cart-change event. This one just tells CartBar/CartOverviewButton to refetch their own
-      // total, same signal update/remove in CheckoutModal use - see this event's own doc comment there.
-      postMessage({ type: 'cart:updated' });
+      await addItemToCart(item);
+    } catch (e) {
+      // CartManager only knows a cart is expired from timestamps it saw at creation - it can't see the
+      // server's idle window sliding forward, so a cart that looks valid locally can still be rejected
+      // server-side. A 401/404 here means exactly that: drop the stale cart and retry once with a fresh one
+      // before giving up, rather than leaving the user stuck with no feedback and no way to proceed.
+      const isStaleCart = e instanceof ApiError && (e.status === 401 || e.status === 404);
+      if (isStaleCart) {
+        cartManager.reset();
+        try {
+          await addItemToCart(item);
+        } catch {
+          addToCartError = 'Something went wrong adding this to your cart. Please try again.';
+        }
+      } else {
+        addToCartError = 'Something went wrong adding this to your cart. Please try again.';
+      }
     } finally {
       isAddingToCart = false;
     }
@@ -73,6 +99,9 @@
       <div class="spinner"></div>
     </div>
   {:else if product}
+    {#if addToCartError}
+      <p class="add-to-cart-error">{addToCartError}</p>
+    {/if}
     <WizardPage
       {product}
       {api}
@@ -90,4 +119,12 @@
   .bw-widget {
     display: contents;
   }
+
+  .add-to-cart-error {
+    margin: 0;
+    padding: 12px 16px;
+    background: #fdecea;
+    color: #b3261e;
+    font-size: 14px;
+  }
 </style>