@wix/himalaya-cli 0.1537.0 → 0.1539.0

package/templates/retail-store/tier5-src/himi-branded-lite-orders/index.ts

@@ -41,11 +41,20 @@ interface OrderRow {
   hasImage: boolean;
   noImage: boolean;
   detailScreenId: string;
+  dateLabel?: string;
+  itemSummary?: string;
+  cancelledLabel?: string;
+  notCancelled?: boolean;
 }
 
 interface State {
   status: "loading" | "ready" | "error";
+  permissionDenied?: boolean;
+  hideLoadError?: boolean;
+  hidePermissionError?: boolean;
   rows: OrderRow[];
+  displayRows?: Array<OrderRow & { dateHeading: string; noDateHeading: boolean }>;
+  filterOptions?: Array<{ id: string; label: string; selected: boolean }>;
   identityLine: string;
   emptyText: string;
   isLoading: boolean;
@@ -112,6 +121,9 @@ function orderRow(order: WixOrder): OrderRow {
   const firstName = order.lineItems?.[0]?.productName?.original || order.lineItems?.[0]?.productName?.translated || "";
   const title = copyTemplate("orders.orderTitle", "Order #{number}", { number: order.number || order.id || "" }).trim();
   const image = wixMediaUrl(mediaUrl(order.lineItems?.[0]));
+  const itemSummary = copyTemplate(count === 1 ? "orders.oneItem" : "orders.manyItems", count === 1 ? "{count} item" : "{count} items", { count });
+  const status = (order as WixOrder & { status?: string }).status;
+  const cancelled = status === "CANCELED" || status === "CANCELLED";
   return {
     id,
     title,
@@ -125,15 +137,42 @@ function orderRow(order: WixOrder): OrderRow {
     // WS-C — canonical param-less detail screenId; the descriptor row binds the
     // separate `id` field as a first-class nav param (no more baked suffixes).
     detailScreenId: "himi_order",
+    dateLabel: formatDate(order.createdDate),
+    itemSummary,
+    cancelledLabel: cancelled ? copyParam("orders.cancelled", "Cancelled") : "",
+    notCancelled: !cancelled,
   };
 }
 
 function derive(state: State): State {
   const hasRows = state.rows.length > 0;
+  const rows = state.rows.map(row => {
+    // Earlier ownership-tagged cache entries only stored the combined meta and
+    // display status. Split those fields without inventing a missing date or
+    // cancellation status; current rows keep their explicit structured values.
+    const parts = (row.meta ?? "").split(" · ");
+    const cancelled = row.notCancelled === false || row.status === "Canceled" || row.status === "Cancelled";
+    return { ...row,
+      dateLabel: row.dateLabel ?? (parts.length > 1 ? parts[0] : ""),
+      itemSummary: row.itemSummary ?? (parts.length > 1 ? parts.slice(1).join(" · ") : row.meta ?? ""),
+      notCancelled: row.notCancelled ?? !cancelled,
+      cancelledLabel: row.cancelledLabel ?? (cancelled ? copyParam("orders.cancelled", "Cancelled") : ""),
+    };
+  });
   return {
     ...state,
+    displayRows: rows.map((row, index, rows) => {
+      // Older owned cache rows retain their original date in meta. Group only
+      // adjacent days so pagination and an explicit backend sort remain authoritative.
+      const date = row.dateLabel;
+      const previous = rows[index - 1];
+      const previousDate = previous?.dateLabel;
+      return { ...row, dateHeading: date, noDateHeading: !date || date === previousDate };
+    }),
     isLoading: state.status === "loading",
     notLoading: state.status !== "loading",
+    hideLoadError: state.status !== "error" || state.permissionDenied === true,
+    hidePermissionError: state.status !== "error" || state.permissionDenied !== true,
     isErrored: state.status === "error",
     notErrored: state.status !== "error",
     // A guest gets the shared member gate, not the "Browse products" empty card.
@@ -152,6 +191,7 @@ function derive(state: State): State {
 const FULFILLMENT: Record<string, string> = {
   "Not fulfilled": "NOT_FULFILLED", "Partially fulfilled": "PARTIALLY_FULFILLED", "Fulfilled": "FULFILLED",
 };
+let lastReadDenied = false;
 let pageMember: OrderMember | undefined;
 let siteOpenInFlight = false;
 // Whose open failed: the hint belongs to that member and scope only, never to whoever signs in next.
@@ -165,10 +205,13 @@ const svc = defineBackendCollection("himiBrandedOrders", {
   source: {
     id: (row: OrderRow) => row.id,
     clearOnError: orderAccessDenied,
-    errorMessage: error => orderAccessDenied(error)
-      ? copyParam("orders.accessErrorText", "Orders are unavailable for this account. Try signing in again.")
-      : copyParam("orders.loadErrorText", "Orders could not be loaded."),
+    errorMessage: error => {
+      lastReadDenied = orderAccessDenied(error);
+      return lastReadDenied ? copyParam("orders.accessErrorText", "Orders are unavailable for this account. Try signing in again.")
+        : copyParam("orders.loadErrorText", "Orders could not be loaded.");
+    },
     async fetch(criteria, cursor) {
+      lastReadDenied = false;
       const member = await orderMember();
       if (cursor && (!pageMember || member.email !== pageMember.email || member.scope !== pageMember.scope)) throw orderAccessChanged();
       const narrowed = !!criteria.query.trim() || criteria.filter !== "all";
@@ -224,7 +267,8 @@ const svc = defineBackendCollection("himiBrandedOrders", {
     // Rows Wix does return still list here.
     const onSite = isHostedWorker() && !!member.email && status === "ready" && !page.items.length && !page.nextCursor
       && !page.pageError && page.metadata?.fromCache !== true;
-    return derive({ ...state, status, rows: page.items, nextCursor: page.nextCursor, complete: page.complete,
+    return derive({ ...state, permissionDenied: status === "error" && lastReadDenied, status, rows: page.items, nextCursor: page.nextCursor, complete: page.complete,
+      filterOptions: [{ id: "all", label: copyParam("collection.all", "All") }, ...Object.keys(FULFILLMENT).map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))].map(option => ({ ...option, selected: option.id === page.criteria.filter })),
       pageError: page.pageError, loadingMore: page.loadingMore, fromCache: page.metadata?.fromCache === true,
       needsSignIn: page.metadata?.needsSignIn === true,
       onSite,
@@ -233,10 +277,19 @@ const svc = defineBackendCollection("himiBrandedOrders", {
       identityLine: member.email ? copyTemplate("orders.identityLine", "Signed in as {email}", { email: member.email }) : "",
       emptyText: status === "error" ? page.error : !member.email ? copyParam("orders.signInEmptyText", "Sign in to see your orders.")
         : onSite ? copyParam("orders.onSiteText", "Your orders are on the site.")
-        : page.items.length ? "" : copyParam("orders.emptyText", "No orders for this member yet."),
+        : page.items.length ? "" : page.metadata?.narrowed ? copyParam("orders.noMatches", "No orders match your search or filter.") : copyParam("orders.emptyText", "No orders for this member yet."),
     });
   },
   actions: {
+    chooseFilter(_s: State, arg: unknown): undefined {
+      const id = (arg as { id?: string } | undefined)?.id;
+      if (id === "all" || (id?.startsWith("value:") && FULFILLMENT[id.slice(6)])) {
+        // Return before the queued collection reducer runs; awaiting a reducer
+        // of the same service would prevent it from executing in native workers.
+        void svc.collectionFilter({ selectedIds: [id] });
+      }
+      return undefined;
+    },
     // The site's My Orders page, opened by the host signed in as the lent member where it can (a visitor who
     // signs in on the site otherwise). Nothing is charged, so the guard only re-checks the member is unchanged.
     async openOnSite(s: State): Promise<State | undefined> {

package/templates/retail-store/tier5-src/wix-spaces-collections/index.ts

@@ -1,99 +1,48 @@
-// Tier-5 bundle: Wix Spaces clone — Shop collections / categories (site-scoped).
-// Prefer Catalog V3 Categories API (`queryStoreCategories`); V1 `queryCollections`
-// returns HTTP 428 on modern CATALOG_V3 sites (docs/wix-authentication.md).
+// Categories share the complete, site-ordered reader used by Home and Shop.
 import { defineService } from "@himalaya/state";
-import { withEmptyFlags } from "../_shared/empty-flags.js";
-import {
-  categoryCount,
-  queryCollections,
-  queryStoreCategories,
-  type StoreCategory,
-  type WixCollection,
-} from "@himalaya/wix-stores-collections";
-
-interface Row { id: string; name: string; subtitle: string }
-interface S {
+import { loadStoreCategories, type StoreCategoryCard } from "../_shared/himi-store-categories.js";
+import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+interface State {
   status: "loading" | "ready" | "error";
-  collections: Row[];
+  all: StoreCategoryCard[];
+  collections: StoreCategoryCard[];
+  query: string;
   emptyText: string;
-  error: string;
+  noCollections: boolean;
+  notLoading: boolean;
+  notErrored: boolean;
+  noEmpty: boolean;
 }
-
-function fromCategory(c: StoreCategory): Row {
-  return { id: c.id || "", name: c.name || "Category", subtitle: categoryCount(c) };
+function derive(s: State): State {
+  const query = s.query.trim().toLowerCase();
+  const collections = s.all.filter(row => row.name.toLowerCase().includes(query));
+  return { ...s, collections, noCollections: !collections.length, notLoading: s.status !== "loading",
+    notErrored: s.status !== "error", noEmpty: s.status !== "ready" || !!collections.length,
+    emptyText: query ? copyParam("collections.noMatches", "No categories match your search.") : copyParam("collections.empty", "No categories yet.") };
 }
-
-function fromCollection(c: WixCollection): Row {
-  const cc = c as unknown as { id?: string; name?: string; numberOfProducts?: number };
-  const n = cc.numberOfProducts;
-  return { id: cc.id || cc.name || "collection", name: cc.name || "Collection", subtitle: n != null && n > 0 ? `${n} ${n === 1 ? "product" : "products"}` : "" };
-}
-
-type Loaded = { ok: true; rows: Row[] } | { ok: false; error: string };
-
-async function loadCollections(): Promise<Loaded> {
-  try {
-    const r = await queryStoreCategories(50);
-    // A V3 SUCCESS with zero rows is an empty catalogue, not a reason to try V1, and this is the
-    // line that matters. Written as `if (rows.length) return rows`, a modern (stores-v3) site
-    // that simply has no categories fell through to the V1 call — which `himi sdk
-    // wix-stores-collections` documents as answering HTTP 428 on exactly those sites — and the
-    // catch below turned that 428 into an empty list. The screen then told the visitor "No
-    // categories yet" over a dead endpoint.
-    //
-    // Only a V3 THROW earns the fallback, because a legacy V1-catalogue site is the single case
-    // the fallback exists for.
-    //
-    // WHAT IS ESTABLISHED vs WHAT IS ASSUMED, because the two are not the same here and a
-    // reviewer was right to ask. Established: V1-on-V3 answers HTTP 428 — `himi sdk
-    // wix-stores-collections` documents it and names the message. ASSUMED, and not yet
-    // verified against a live legacy site: that the reverse — the V3 Categories API, a separate
-    // app-namespaced service, called on a Catalog-V1 site — THROWS rather than answering
-    // `200 {}`. If it answers 200-empty, a legacy site stops reaching the fallback and shows
-    // "No categories yet" instead of its collections: the same wrong-empty-state this change
-    // fixes, moved to the other site type.
-    //
-    // It is left as a throw-only fallback deliberately, because the alternative is worse:
-    // falling back on a V3 empty result sends every modern site with a genuinely empty
-    // catalogue into the 428 path, and the catch below now surfaces that as "Couldn't load
-    // categories" over a catalogue that is simply empty. Confirm against a Catalog-V1 site
-    // before changing this; five templates carry this file.
-    return { ok: true, rows: (r.categories ?? []).map(fromCategory).filter((row) => row.id) };
-  } catch { /* V3 unavailable — a legacy V1 site is what the fallback is for */ }
-  try {
-    // No `as never` here: `WixQueryCollectionsRequest.query` is `WixCollectionsQuery`, which
-    // declares `paging`, so this argument type-checks as written. Reach for a cast only when the
-    // types really cannot express the call — silencing them by habit hides the next real
-    // mismatch.
-    const r = await queryCollections({ query: { paging: { limit: 50 } } });
-    return { ok: true, rows: (((r as unknown as { collections?: WixCollection[] }).collections) ?? []).map(fromCollection) };
-  } catch (e) {
-    return { ok: false, error: e instanceof Error ? e.message : String(e) };
-  }
-}
-
-const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesCollections", withEmptyFlags({
-  state: { status: "loading", collections: [], emptyText: "", error: "" },
+let generation = 0;
+let currentQuery = "";
+const svc = defineService<State, {
+  load: (s: State, arg?: unknown) => Promise<State | undefined>;
+  search: (s: State, arg?: { value?: string }) => State;
+}>("spacesCollections", {
+  state: derive({ status: "loading", all: [], collections: [], query: "", emptyText: "", noCollections: true, notLoading: false, notErrored: true, noEmpty: true }),
   actions: {
-    load: async () => {
-      const res = await loadCollections();
-      if (!res.ok) {
-        // `emptyText` carries the honest line as well as `error`, deliberately: this screen's
-        // descriptor binds only `emptyText`, so writing the failure there is what stops the
-        // visitor being told the catalogue is empty when the call actually failed. `status` and
-        // `error` are what an error-state binding and `himi test` read — bind them when you add
-        // a dedicated error view.
-        const line = "Couldn't load categories. Pull to refresh.";
-        return { status: "error", collections: [], emptyText: line, error: res.error };
+    load: async (s, arg) => {
+      stashCopy(arg);
+      const run = ++generation;
+      try {
+        const all = await loadStoreCategories({ includeAllProducts: true });
+        return run === generation ? derive({ ...s, query: currentQuery, all, status: "ready" }) : undefined;
+      } catch {
+        return run === generation ? derive({ ...s, query: currentQuery, status: "error" }) : undefined;
       }
-      return {
-        status: "ready",
-        collections: res.rows,
-        emptyText: res.rows.length ? "" : "No categories yet",
-        error: "",
-      };
+    },
+    search: (s, arg) => {
+      currentQuery = (arg?.value ?? "").slice(0, 256);
+      return derive({ ...s, query: currentQuery });
     },
   },
-}, { collections: "noCollections" }));
+});
 svc.load();
 export { svc };

package/templates/retail-store-owner/tier5-src/_shared/collection-contract.ts

@@ -2,6 +2,8 @@ import { compareText, compareIso } from "./engine-intl.js";
 /** Shared OTA collection contract. No host APIs: used by workers and builders. */
 export interface CollectionConfig {
   rows: string;
+  /** Flat customer history rows, divided rather than boxed. */
+  rowStyle?: "flat";
   instanceInput?: string;
   title: string;
   subtitle?: string;
@@ -84,7 +86,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
-  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
+  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['status', 'meta'], rowStyle: 'flat', view: 'list', backendQuery: true,
     searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
   himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3', 'joinNote'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
@@ -139,7 +141,10 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
     density: s.density === 'compact' ? 'compact' : 'comfortable',
     sort: s.sort === 'az' || s.sort === 'za' ? s.sort : 'default',
     query: typeof s.query === 'string' ? s.query.slice(0, 256) : '',
-    filter: typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
+    // Flat collections no longer offer Saved. Migrate its persisted value before
+    // the first backend request so an invisible old filter cannot empty the list.
+    filter: config.rowStyle === 'flat' && s.filter === 'saved' ? 'all'
+      : typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
     savedIds: Array.isArray(s.savedIds) ? [...new Set(s.savedIds.filter((id): id is string => typeof id === 'string' && id.length > 0 && id.length <= 256))].slice(0, 500) : [],
     savedViews: Array.isArray(s.savedViews) ? s.savedViews.filter((v): v is SavedCollectionView => !!v && typeof v === 'object' && typeof v.name === 'string' && !!v.name.trim()).slice(0, 8).map((v, i) => ({
       id: `view-${i}`, name: v.name.trim().slice(0, 40),
@@ -147,7 +152,8 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
       density: v.density === 'compact' ? 'compact' : 'comfortable',
       sort: v.sort === 'az' || v.sort === 'za' ? v.sort : 'default',
       query: typeof v.query === 'string' ? v.query.slice(0, 256) : '',
-      filter: typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
+      filter: config.rowStyle === 'flat' && v.filter === 'saved' ? 'all'
+        : typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
     })) : [],
   };
 }

package/templates/retail-store-owner/tier5-src/_shared/collection-service.ts

@@ -95,7 +95,10 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       if (sort === 'default' || sort === 'az' || sort === 'za') { prefs.sort = sort; changed = true; }
     }
     if (Object.prototype.hasOwnProperty.call(input, 'collectionFilter')) {
-      const filter = String(input.collectionFilter ?? '');
+      const requestedFilter = String(input.collectionFilter ?? '');
+      // Old links to Saved must migrate with the stored preference when this
+      // collection no longer exposes that filter.
+      const filter = config.rowStyle === 'flat' && requestedFilter === 'saved' ? 'all' : requestedFilter;
       const configured = config.filterValues ?? [];
       const rows = Array.isArray(state[config.rows]) ? state[config.rows] as CollectionRow[] : [];
       const derived = config.filter ? rows.map(row => String(row[config.filter!] ?? '')).filter(Boolean) : [];
@@ -139,7 +142,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
         copyParam('collection.itemActionsFor', 'Actions for {title}'), copyParam('collection.itemActions', 'Item actions'));
     });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
-    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ id: 'saved', label: copyParam('collection.saved', 'Saved') }]),
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];
     const loading = s.status === 'loading' || s.isLoading === true;
     // Older domain reducers expose `errored` rather than `isErrored`; backend
@@ -220,7 +223,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
             ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
-      chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};

package/templates/retail-store-owner/tier5-src/_shared/engine-intl.ts

@@ -410,8 +410,11 @@ export function compareDateDesc(a: string, b: string): number {
 // kind of number. So: one money pattern, one clock, one range.
 
 // Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
-// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
-// "₪70 · ₪69.50".
+// ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
+// SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
+// "₪69.50"), the format the redesigned service screen and services list were approved with. It
+// must read the same on every screen that shows a service (the list, the service screen, the
+// time screen, Home, the agenda); do not put those back on natural decimals one screen at a time.
 
 const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));
 

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

@@ -12110,7 +12110,6 @@ const SCREENS = runtimeSetting({
                   "showGrabber": false,
                   "autoDismissMs": 8000,
                   "presentedPath": "$service:himiBookingBookings.resultOpen",
-                  "label": "$service:himiBookingBookings.resultText",
                   "onDismiss": {
                     "actionId": "tier5.himiBookingBookings.closeResult"
                   },
@@ -29402,7 +29401,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                   "modal": false,
                   "placement": "inline",
                   "showGrabber": false,
-                  "label": "$service:himiBookingTime.resultText",
                   "onDismiss": {
                     "actionId": "tier5.himiBookingTime.closeResult"
                   },
@@ -29532,7 +29530,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                   "placement": "inline",
                   "showGrabber": false,
                   "autoDismissMs": 8000,
-                  "label": "$service:himiBookingTime.resultText",
                   "onDismiss": {
                     "actionId": "tier5.himiBookingTime.closeResult"
                   },

package/templates/yoga-studio/tier5-src/_shared/collection-contract.ts

@@ -2,6 +2,8 @@ import { compareText, compareIso } from "./engine-intl.js";
 /** Shared OTA collection contract. No host APIs: used by workers and builders. */
 export interface CollectionConfig {
   rows: string;
+  /** Flat customer history rows, divided rather than boxed. */
+  rowStyle?: "flat";
   instanceInput?: string;
   title: string;
   subtitle?: string;
@@ -84,7 +86,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
-  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
+  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['status', 'meta'], rowStyle: 'flat', view: 'list', backendQuery: true,
     searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
   himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3', 'joinNote'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
@@ -139,7 +141,10 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
     density: s.density === 'compact' ? 'compact' : 'comfortable',
     sort: s.sort === 'az' || s.sort === 'za' ? s.sort : 'default',
     query: typeof s.query === 'string' ? s.query.slice(0, 256) : '',
-    filter: typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
+    // Flat collections no longer offer Saved. Migrate its persisted value before
+    // the first backend request so an invisible old filter cannot empty the list.
+    filter: config.rowStyle === 'flat' && s.filter === 'saved' ? 'all'
+      : typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
     savedIds: Array.isArray(s.savedIds) ? [...new Set(s.savedIds.filter((id): id is string => typeof id === 'string' && id.length > 0 && id.length <= 256))].slice(0, 500) : [],
     savedViews: Array.isArray(s.savedViews) ? s.savedViews.filter((v): v is SavedCollectionView => !!v && typeof v === 'object' && typeof v.name === 'string' && !!v.name.trim()).slice(0, 8).map((v, i) => ({
       id: `view-${i}`, name: v.name.trim().slice(0, 40),
@@ -147,7 +152,8 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
       density: v.density === 'compact' ? 'compact' : 'comfortable',
       sort: v.sort === 'az' || v.sort === 'za' ? v.sort : 'default',
       query: typeof v.query === 'string' ? v.query.slice(0, 256) : '',
-      filter: typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
+      filter: config.rowStyle === 'flat' && v.filter === 'saved' ? 'all'
+        : typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
     })) : [],
   };
 }

package/templates/yoga-studio/tier5-src/_shared/collection-service.ts

@@ -95,7 +95,10 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       if (sort === 'default' || sort === 'az' || sort === 'za') { prefs.sort = sort; changed = true; }
     }
     if (Object.prototype.hasOwnProperty.call(input, 'collectionFilter')) {
-      const filter = String(input.collectionFilter ?? '');
+      const requestedFilter = String(input.collectionFilter ?? '');
+      // Old links to Saved must migrate with the stored preference when this
+      // collection no longer exposes that filter.
+      const filter = config.rowStyle === 'flat' && requestedFilter === 'saved' ? 'all' : requestedFilter;
       const configured = config.filterValues ?? [];
       const rows = Array.isArray(state[config.rows]) ? state[config.rows] as CollectionRow[] : [];
       const derived = config.filter ? rows.map(row => String(row[config.filter!] ?? '')).filter(Boolean) : [];
@@ -139,7 +142,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
         copyParam('collection.itemActionsFor', 'Actions for {title}'), copyParam('collection.itemActions', 'Item actions'));
     });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
-    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ id: 'saved', label: copyParam('collection.saved', 'Saved') }]),
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];
     const loading = s.status === 'loading' || s.isLoading === true;
     // Older domain reducers expose `errored` rather than `isErrored`; backend
@@ -220,7 +223,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
             ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
-      chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};

package/templates/yoga-studio/tier5-src/_shared/engine-intl.ts

@@ -410,8 +410,11 @@ export function compareDateDesc(a: string, b: string): number {
 // kind of number. So: one money pattern, one clock, one range.
 
 // Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
-// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
-// "₪70 · ₪69.50".
+// ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
+// SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
+// "₪69.50"), the format the redesigned service screen and services list were approved with. It
+// must read the same on every screen that shows a service (the list, the service screen, the
+// time screen, Home, the agenda); do not put those back on natural decimals one screen at a time.
 
 const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));
 

package/templates/yoga-studio/tier5-src/_shared/himi-store-categories.ts

@@ -4,7 +4,7 @@
 // Catalog V3 Categories first, V1 collections only when V3 THROWS (a legacy V1 site):
 // a V3 success with zero rows is an empty catalogue, and V1 on a V3 site answers 428.
 // Same rule as wix-spaces-collections; see the reasoning there.
-import { categoryImage, queryCollections, queryStoreCategories, type StoreCategoriesResponse, type StoreCategory, type WixCollection } from "@himalaya/wix-stores-collections";
+import { categoryCount, categoryImage, queryCollections, queryStoreCategories, type StoreCategoriesResponse, type StoreCategory, type WixCollection } from "@himalaya/wix-stores-collections";
 import { wixMediaUrl } from "@himalaya/wix-media";
 
 export interface StoreCategoryCard {
@@ -13,6 +13,7 @@ export interface StoreCategoryCard {
   image: string;
   hasImage: boolean;
   noImage: boolean;
+  subtitle?: string;
 }
 
 /** "All Products" is a Wix system collection — every product is in it, so it is
@@ -20,12 +21,12 @@ export interface StoreCategoryCard {
 const SYSTEM_NAMES = ["all products"];
 const SYSTEM_COLLECTION_IDS = ["00000000-000000-000000-000000000001"];
 
-function card(id: string, name: string, image: string): StoreCategoryCard {
-  return { id, name, image, hasImage: !!image, noImage: !image };
+function card(id: string, name: string, image: string, subtitle = ""): StoreCategoryCard {
+  return { id, name, image, hasImage: !!image, noImage: !image, subtitle };
 }
 
 function fromCategory(c: StoreCategory): StoreCategoryCard {
-  return card(c.id ?? "", (c.name ?? "").trim(), categoryImage(c));
+  return card(c.id ?? "", (c.name ?? "").trim(), categoryImage(c), categoryCount(c));
 }
 
 function fromCollection(c: WixCollection): StoreCategoryCard {
@@ -34,19 +35,24 @@ function fromCollection(c: WixCollection): StoreCategoryCard {
   return card(raw.id ?? "", (raw.name ?? "").trim(), wixMediaUrl(media?.image?.url ?? media?.thumbnail?.url ?? ""));
 }
 
-function visible(rows: StoreCategoryCard[]): StoreCategoryCard[] {
+function visible(rows: StoreCategoryCard[], includeAllProducts = false): StoreCategoryCard[] {
   const seen = new Set<string>();
   return rows.filter((r) => {
-    if (!r.id || !r.name || SYSTEM_COLLECTION_IDS.includes(r.id) || SYSTEM_NAMES.includes(r.name.toLowerCase()) || seen.has(r.id)) return false;
+    if (!r.id || !r.name || (!includeAllProducts && (SYSTEM_COLLECTION_IDS.includes(r.id) || SYSTEM_NAMES.includes(r.name.toLowerCase()))) || seen.has(r.id)) return false;
     seen.add(r.id);
     return true;
+  }).map(row => {
+    // Counts belong to the directory opt-in; Home rails and Shop chips retain their
+    // established five-field card contract.
+    const { subtitle, ...card } = row;
+    return includeAllProducts ? row : card;
   });
 }
 
 const PAGE_SIZE = 50;
 const MAX_PAGES = 100;
 
-async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
+async function loadLegacyCategories(includeAllProducts: boolean): Promise<StoreCategoryCard[]> {
   const cards: StoreCategoryCard[] = [];
   const seen = new Set<string>();
   let offset = 0;
@@ -58,7 +64,7 @@ async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
     if (reportedTotal != null) total = Math.max(total ?? 0, reportedTotal);
     if (!rows.length) {
       if (total != null && seen.size < total) throw new Error("Category pagination is incomplete");
-      return visible(cards);
+      return visible(cards, includeAllProducts);
     }
     const priorCount = seen.size;
     rows.forEach(row => { if (row.id) seen.add(row.id); });
@@ -67,7 +73,7 @@ async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
     offset += rows.length;
     if (total != null ? offset >= total : rows.length < PAGE_SIZE) {
       if (total != null && seen.size < total) throw new Error("Category pagination is incomplete");
-      return visible(cards);
+      return visible(cards, includeAllProducts);
     }
   }
   throw new Error("Category pagination exceeded the page limit");
@@ -75,11 +81,11 @@ async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
 
 /** The store's browsable categories in site order. Rejects incomplete reads so callers
  *  can retain their last good catalog instead of invalidating a later category. */
-export async function loadStoreCategories(): Promise<StoreCategoryCard[]> {
+export async function loadStoreCategories({ includeAllProducts = false }: { includeAllProducts?: boolean } = {}): Promise<StoreCategoryCard[]> {
   let r: StoreCategoriesResponse;
   try {
     r = await queryStoreCategories(PAGE_SIZE);
-  } catch { return loadLegacyCategories(); /* Only the initial failure can identify a legacy V1 site. */ }
+  } catch { return loadLegacyCategories(includeAllProducts); /* Only the initial failure can identify a legacy V1 site. */ }
   const cards: StoreCategoryCard[] = [];
   const cursors = new Set<string>();
   const seen = new Set<string>();
@@ -92,7 +98,7 @@ export async function loadStoreCategories(): Promise<StoreCategoryCard[]> {
     const next = r.pagingMetadata?.cursors?.next;
     if (!next) {
       if (seen.size < total) throw new Error("Category pagination is incomplete");
-      return visible(cards);
+      return visible(cards, includeAllProducts);
     }
     if (cursors.has(next)) throw new Error("Category pagination repeated a cursor");
     cursors.add(next);

package/templates/yoga-studio/tier5-src/_shared/wix-service-price.ts

@@ -118,7 +118,7 @@ export function formatServiceMoney(money: unknown, fallbackCurrency = "USD"): st
 }
 
 /**
- * Format a Wix Bookings service's price for display, e.g. "₪111" / "$20".
+ * Format a Wix Bookings service's price for display, e.g. "₪111" / "$20" / "$19.50".
  *
  * Reads, in order of preference:
  *   1. Bookings v2 fixed price — `payment.fixed.price.{value,currency}` (the
@@ -137,7 +137,9 @@ export function formatServicePrice(service: unknown): string {
   if (amount == null) return "";
   const currency = serviceCurrency(service);
   try {
-    return formatCurrency(amount, currency, "en");
+    // A whole amount drops its cents ("₪70", not "₪70.00"), as formatServiceMoney and the service
+    // screen show it, so the same service reads the same price on every screen.
+    return formatCurrency(amount, currency, "en", Number.isInteger(amount) ? 0 : undefined);
   } catch {
     return `${amount}`;
   }