@wix/himalaya-cli 0.1571.0 → 0.1573.0

package/templates/retail-store-owner/dev/index.ts

@@ -52741,8 +52741,7 @@ const SCREENS = runtimeSetting({
                   "params": {
                     "screenId": "himi_owner_lite_search",
                     "title": "Search records",
-                    "subtitle": "Across your business areas",
-                    "search": "drawer"
+                    "subtitle": "Across your business areas"
                   }
                 },
                 "pressFeedback": "scale",
@@ -54261,7 +54260,7 @@ const SCREENS = runtimeSetting({
           "actionId": "tier5.himiOwnerLiteSearch.search"
         },
         "debounceMs": 200,
-        "placement": "drawer"
+        "loadingPath": "$service:himiOwnerLiteSearch.anyLoading"
       }
     }
   },

package/templates/yoga-studio/tier5-src/_shared/iap-worker.ts

@@ -4,6 +4,7 @@
 // SDK; this only supplies the copy and the hydration reset.
 import { hostSessionFromGlobal, type IapPriceCopy } from "@himalaya/iap";
 import type { IapCommerce, IapPurchaseCopy, IapRestoreResult } from "@himalaya/iap-checkout";
+import { paymentSetupMessage } from "./payment-setup.js";
 import { copyParam, copyTemplate } from "./himi-copy.js";
 
 /** Price labels from the screen's copy pack (`<prefix>.priceLoadingText`, …). */
@@ -25,6 +26,7 @@ export function iapPurchaseCopy(prefix: string): IapPurchaseCopy {
     awaitingApproval: copyParam(`${prefix}.purchaseAwaitingApprovalText`, "Waiting for approval"),
     unavailable: copyParam(`${prefix}.purchaseTemporarilyUnavailableText`, "Purchasing is temporarily unavailable."),
     signInRequired: copyParam(`${prefix}.purchaseSignInText`, "Sign in to buy."),
+    sitePaymentUnavailable: paymentSetupMessage(prefix),
     retry: copyParam(`${prefix}.purchaseRetryText`, "Something went wrong. Try again."),
     priceChanged: copyParam(`${prefix}.purchasePriceChangedText`, "The price changed. Check it and try again."),
     support: copyParam(`${prefix}.purchaseSupportText`, "We couldn't finish this purchase. Contact support."),

package/templates/yoga-studio/tier5-src/_shared/payment-setup.ts

@@ -0,0 +1,6 @@
+import { copyParam } from "./himi-copy.js";
+
+/** No provider or country guess: Wix only established that online payment is unavailable. */
+export function paymentSetupMessage(prefix: string): string {
+  return copyParam(`${prefix}.paymentSetupUnavailable`, "This site is not accepting online payments. Go back or contact the business for other payment options.");
+}

package/templates/yoga-studio/tier5-src/himi-booking-time/index.ts

@@ -1,3 +1,4 @@
+import { paymentSetupMessage } from "../_shared/payment-setup.js";
 import { withOnlineWrites, offlineWritesEnabled } from "../_shared/online-actions.js";
 // Tier-5 bundle: himi-booking — availability and member booking.
 import { defineService as registerService, navigate } from "@himalaya/state";
@@ -9,7 +10,7 @@ import { dispatch } from "@himalaya/dispatch";
 import { bookSchedule, bookSlot, getService, queryServiceAvailability, registerToWaitlist, type WixBookingSlotFull, type WixSelectedPaymentOption, type WixService } from "@himalaya/wix-bookings";
 import { createCheckout, createOrder } from "@himalaya/wix-ecom";
 import { createRedirectSession, type WixSlot } from "@himalaya/wix-redirects";
-import { payCashierOrder } from "@himalaya/checkout";
+import { isPaymentSetupFailure, payCashierOrder } from "@himalaya/checkout";
 import { hostedCheckoutOpener, isHostedWorker } from "../_shared/hosted-checkout.js";
 import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { displayName, getMyData, type WixMyData } from "@himalaya/wix-users";
@@ -1587,10 +1588,12 @@ async function bookSelectedIn(s: S): Promise<S> {
           ? copyParam("time.coursePaymentCancelled", "Payment cancelled — your course booking wasn't confirmed. Try again.")
           : copyParam("time.paymentCancelled", "Payment cancelled — your booking wasn't confirmed. Pick a time to try again.") });
       }
+      if (isPaymentSetupFailure(pay)) return derive({ ...s, bookingInFlight: false, message: paymentSetupMessage("time") });
       return derive({ ...s, bookingInFlight: false, message: s.isCourse
         ? copyParam("time.coursePaymentFailed", "Payment couldn't be completed. Try again.")
         : copyParam("time.paymentFailed", "Payment couldn't be completed. Pick another time or try again.") });
-    } catch {
+    } catch (error) {
+      if (isPaymentSetupFailure(error)) return derive({ ...s, bookingInFlight: false, message: paymentSetupMessage("time") });
       return derive({ ...s, bookingInFlight: false, message: s.isCourse
         ? copyParam("time.courseCheckoutFailed", "Checkout could not start. Try again.")
         : copyParam("time.checkoutFailed", "Checkout could not start. Pick another time or try again.") });

package/templates/yoga-studio/tier5-src/himi-branded-lite-plans/index.ts

@@ -1,3 +1,4 @@
+import { paymentSetupMessage } from "../_shared/payment-setup.js";
 import { offlineWriteMessage, offlineWritesEnabled, withOnlineWrites } from "../_shared/online-actions.js";
 import { connectivity } from "@himalaya/state";
 import { defineService as registerService } from "../_shared/collection-service.js";
@@ -6,7 +7,7 @@ import { createRedirectSession } from "@himalaya/wix-redirects";
 import { open as openUrl } from "@himalaya/open-url";
 import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
-import { activePlanIds, entitlement, payCashierOrder } from "@himalaya/checkout";
+import { activePlanIds, entitlement, isPaymentSetupFailure, payCashierOrder } from "@himalaya/checkout";
 import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@himalaya/iap";
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
@@ -290,7 +291,9 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
     if (pay.kind === "cancelled") {
       return copyParam("plans.joinCancelledMessage", "Payment cancelled — you haven't joined.");
     }
-  } catch {
+    if (isPaymentSetupFailure(pay)) return paymentSetupMessage("plans");
+  } catch (error) {
+    if (isPaymentSetupFailure(error)) return paymentSetupMessage("plans");
   }
   return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
 }

package/templates/yoga-studio/tier5-src/himi-branded-lite-program/index.ts

@@ -1,3 +1,4 @@
+import { paymentSetupMessage } from "../_shared/payment-setup.js";
 import { dispatch } from "@himalaya/dispatch";
 import { memberAccess, assertMemberAccess } from "../_shared/member-access.js";
 import { offlineWriteMessage, withOnlineWrites } from "../_shared/online-actions.js";
@@ -42,7 +43,7 @@ import { getMyMember } from "@himalaya/wix-members";
 import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
-import { payCashierOrder } from "@himalaya/checkout";
+import { isPaymentSetupFailure, payCashierOrder } from "@himalaya/checkout";
 import { formatCurrency } from "../_shared/engine-intl.js";
 import { iapPriceFields, onlineProgramItem, type IapCatalogItem, type IapPollDirective, type IapPriceFields } from "@himalaya/iap";
 import { createIapCommerce, onlineProgramOrders, type IapPurchaseFields } from "@himalaya/iap-checkout";
@@ -251,9 +252,11 @@ async function enrollmentMessage(id: string, name: string, guards: CommerceGuard
       : copyTemplate("program.joinedMessage", "You're enrolled in {name}.", { name });
     if (pay.kind === "handoff") return "";
     if (pay.kind === "cancelled") return copyParam("program.joinCancelledMessage", "Payment cancelled — you haven't enrolled.");
-  } catch {
+    if (isPaymentSetupFailure(pay)) return paymentSetupMessage("program");
+  } catch (error) {
     if (!connectivity().online) return offlineWriteMessage;
     if (preparationWithdrawn) return blocked();
+    if (isPaymentSetupFailure(error)) return paymentSetupMessage("program");
     // fall through to the site-directing message
   }
   return copyTemplate("program.joinOnSiteMessage", "Enrolment happens on the website — visit the site to join {name}.", { name });

package/templates/yoga-studio/tier5-src/himi-branded-lite-programs/index.ts

@@ -112,13 +112,10 @@ function programFields(p: WixProgram): Omit<ProgramRow, "priceLine"> {
     initial: initials(name),
     hasImage: !!image,
     noImage: !image,
-    // The row also binds `id` as a nav param, which `currentInputId` prefers — but no
-    // shell threads that param into worker `input.id` yet, so a param-less target left
-    // the detail worker with no id and its Enrol CTA dead on arrival. Same fix (and same
-    // reasoning) as the events row: bake the id, which the app's own
-    // liveSeedRoute({ prefix: "himi_program_" }) already seeds and `currentInputId`
-    // resolves through its prefix path.
-    detailScreenId: `himi_program_${id}`,
+    // The canonical route is baked even offline. Hosts pass the row's `id` as
+    // worker input (WS-C); suffixed routes only exist for the preview seed's
+    // first 50 records and cannot open a complete live catalog in production.
+    detailScreenId: "himi_program",
   };
 }
 
@@ -157,9 +154,29 @@ function errored(state: State): State {
   };
 }
 
-async function fetchPrograms(): Promise<WixProgram[]> {
-  const response = await queryPrograms({ cursorPaging: { limit: 50 } });
-  return (response.programs ?? []).filter((p) => !isDraft(p));
+async function fetchPrograms(isCurrent: () => boolean): Promise<WixProgram[] | undefined> {
+  const programs = new Map<string, WixProgram>();
+  const seen = new Set<string>();
+  let cursor = "";
+  do {
+    // Wix cursors carry the initial sort/filter. Repeating either on a continuation
+    // is rejected with INVALID_CURSOR, even when their values have not changed.
+    const response = await queryPrograms(cursor
+      ? { cursorPaging: { limit: 50, cursor } }
+      : { cursorPaging: { limit: 50 }, sort: [{ fieldName: "createdDate", order: "DESC" }] });
+    if (!isCurrent()) return undefined;
+    for (const program of response.programs ?? []) {
+      if (program.id && !isDraft(program)) programs.set(program.id, program);
+    }
+    const paging = response.pagingMetadata;
+    const next = paging?.hasNext === false ? "" : paging?.cursors?.next ?? "";
+    if ((paging?.hasNext && !next) || (next && seen.has(next))) {
+      throw new Error("Invalid program catalog cursor");
+    }
+    if (next) seen.add(next);
+    cursor = next;
+  } while (cursor);
+  return [...programs.values()];
 }
 
 // ── Content and App Store prices ─────
@@ -180,7 +197,7 @@ let loadSeq = 0;
 async function load(_state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
   const seq = ++loadSeq;
-  const programs = await fetchPrograms().catch(() => undefined);
+  const programs = await fetchPrograms(() => seq === loadSeq).catch(() => undefined);
   if (seq !== loadSeq) return undefined;
   content = programs ? { status: "ready", programs: programs.map(programContent) } : { ...content, status: "error" };
   void svc.pricingPublish();

package/templates/yoga-studio/tier5-src/himi-events-detail/index.ts

@@ -1,3 +1,4 @@
+import { paymentSetupMessage } from "../_shared/payment-setup.js";
 // Tier-5 bundle: himi-events — event detail.
 import { calendarDay, formatClock, formatCurrency, formatWeekdayDateTime, formatWeekdayMonthDay, formatTimeZoneLabel } from "../_shared/engine-intl.js";
 import { defineService as registerService } from "@himalaya/state";
@@ -18,7 +19,7 @@ import {
   type WixEvent,
 } from "@himalaya/wix-events";
 import { session as wixPlatformSession } from "@himalaya/wix-platform";
-import { payCashierOrder } from "@himalaya/checkout";
+import { isPaymentSetupFailure, payCashierOrder } from "@himalaya/checkout";
 import { get, upsert, type DbEntity } from "@himalaya/local-db";
 import {
   currentInputId,
@@ -986,16 +987,18 @@ const svc: ReturnType<typeof defineService<S, DetailActions>> = defineService<S,
               if (pay.kind === "paid") result = { ...s, ticketSheetOpen: false, snackbarMessage: detailCopy("event.ticketIssued", "You're in — your ticket is confirmed.") };
               else if (pay.kind === "handoff") result = { ...s, ticketSheetOpen: false, snackbarMessage: detailCopy("event.checkoutOpened", "Complete checkout in the browser to get your tickets.") };
               else if (pay.kind === "cancelled") result = { ...s, snackbarMessage: detailCopy("event.ticketCancelled", "Payment cancelled — no ticket was issued.") };
+              else if (isPaymentSetupFailure(pay)) result = { ...s, snackbarMessage: paymentSetupMessage("event") };
               else throw new Error("Payment could not be completed");
             }
           }
         }
-      } catch {
+      } catch (error) {
+        if (isPaymentSetupFailure(error)) result = { ...s, snackbarMessage: paymentSetupMessage("event") };
         try {
           // A public event page is not pinned to this selection or price. Only
           // continue in hosted checkout when a reservation already holds it.
           const params = reservationId ? { reservationId } : undefined;
-          if (params) {
+          if (params && !result) {
             const redirect = await createRedirectSession({ eventsCheckout: params });
             const url = redirect.redirectSession?.fullUrl;
             if (url) {
@@ -1003,7 +1006,9 @@ const svc: ReturnType<typeof defineService<S, DetailActions>> = defineService<S,
               result = { ...s, ticketSheetOpen: false, snackbarMessage: opened.opened ? detailCopy("event.checkoutOpened", "Complete checkout in the browser to get your tickets.") : detailCopy("event.registrationOpenFailed", "Could not open the registration page.") };
             }
           }
-        } catch { /* report below */ }
+        } catch (error) {
+          if (isPaymentSetupFailure(error)) result = { ...s, snackbarMessage: paymentSetupMessage("event") };
+        }
         if (!result) result = { ...s, snackbarMessage: detailCopy("event.purchaseUnavailable", "Purchasing is temporarily unavailable.") };
       } finally { ticketCheckoutInFlight = false; }
       return derive(result!);

package/templates/yoga-studio-owner/dev/index.ts

@@ -52522,8 +52522,7 @@ const SCREENS = runtimeSetting({
                   "params": {
                     "screenId": "himi_owner_lite_search",
                     "title": "Search records",
-                    "subtitle": "Across your business areas",
-                    "search": "drawer"
+                    "subtitle": "Across your business areas"
                   }
                 },
                 "pressFeedback": "scale",
@@ -54042,7 +54041,7 @@ const SCREENS = runtimeSetting({
           "actionId": "tier5.himiOwnerLiteSearch.search"
         },
         "debounceMs": 200,
-        "placement": "drawer"
+        "loadingPath": "$service:himiOwnerLiteSearch.anyLoading"
       }
     }
   },