@wix/himalaya-cli 0.1538.0 → 0.1540.0

package/templates/branded-lite/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/branded-lite/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/branded-lite/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/branded-lite/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/branded-lite/tier5-src/_shared/store-order-presentation.ts

@@ -0,0 +1,56 @@
+// Display-only fields from the ecom Order wire shape. No additional endpoints or grants.
+// The generated minimal WixOrder intentionally omits these optional fields.
+import type { WixOrder, WixOrderLineItem, WixOrderLineItemDescriptionLine } from "@himalaya/wix-ecom";
+import { copyParam } from "./himi-copy.js";
+interface Address {
+  addressLine?: string;
+  addressLine2?: string;
+  streetAddress?: { number?: string; name?: string };
+  city?: string;
+  subdivision?: string;
+  subdivisionFullname?: string;
+  postalCode?: string;
+  country?: string;
+  countryFullname?: string;
+}
+export interface DisplayOrderLine extends WixOrderLineItem {
+  descriptionLines?: WixOrderLineItemDescriptionLine[];
+}
+export interface DisplayOrder extends WixOrder {
+  shippingInfo?: {
+    title?: string;
+    logistics?: {
+      shippingDestination?: { address?: Address; contactDetails?: { firstName?: string; lastName?: string } };
+      pickupDetails?: { address?: Address };
+      deliveryTime?: string;
+      instructions?: string;
+    };
+  };
+}
+export function orderDelivery(order: DisplayOrder): { deliveryTitle: string; deliveryLines: string; deliveryMethod: string; deliveryAddress: string } {
+  const info = order.shippingInfo;
+  const logistics = info?.logistics;
+  const pickup = logistics?.pickupDetails;
+  const destination = logistics?.shippingDestination;
+  const address = pickup?.address ?? destination?.address;
+  const name = pickup ? "" : [destination?.contactDetails?.firstName, destination?.contactDetails?.lastName].filter(Boolean).join(" ");
+  const street = address?.addressLine || [address?.streetAddress?.number, address?.streetAddress?.name].filter(Boolean).join(" ");
+  const addressLines = [name, street, address?.addressLine2,
+    [address?.city, address?.subdivisionFullname || address?.subdivision, address?.postalCode].filter(Boolean).join(", "),
+    address?.countryFullname || address?.country,
+  ].filter(Boolean);
+  const methodLines = [info?.title, logistics?.deliveryTime, logistics?.instructions].filter(Boolean);
+  return {
+    deliveryTitle: pickup ? copyParam("order.pickupTitle", "Pickup") : copyParam("order.deliveryTitle", "Delivery"),
+    deliveryLines: [info?.title, ...addressLines, logistics?.deliveryTime, logistics?.instructions].filter(Boolean).join("\n"),
+    deliveryMethod: methodLines.join("\n"),
+    deliveryAddress: addressLines.join("\n"),
+  };
+}
+export function orderOptions(line: DisplayOrderLine): string {
+  return (line.descriptionLines ?? []).map(option => {
+    const name = option.name?.translated || option.name?.original;
+    const value = option.plainText?.translated || option.plainText?.original;
+    return value ? [name, value].filter(Boolean).join(": ") : "";
+  }).filter(Boolean).join(" · ");
+}

package/templates/branded-lite/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}`;
   }

package/templates/branded-lite/tier5-src/himi-branded-lite-category/index.ts

@@ -0,0 +1,196 @@
+// A category-scoped Shop gallery. Reuses Shop's card projection, filters, saved
+// products, view preferences and App Store price presentation; the route remains
+// himi_collection { id }. Never substitute the full catalog for a missing category.
+import { getCollection, getStoreCategory, categoryCount } from "@himalaya/wix-stores-collections";
+import { searchStoreProducts, type StoreProduct } from "../_shared/himi-store.js";
+import { createCollectionQuery } from "../_shared/collection-query.js";
+import { detailInputId, presence, presenceAfterError, type PresenceFlags } from "../_shared/detail-presence.js";
+import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { FACETS_BOOT, PAGE_SIZE, applyFacets, currencyOf, facetActions, idOf, readViewPrefs, toRows, toggleSaved, type FacetState } from "../_shared/himi-store-facets.js";
+import { withIapPresentation } from "../_shared/iap-presentation.js";
+
+interface State extends FacetState, PresenceFlags {
+  name: string;
+  subtitle: string;
+  description: string;
+  query: string;
+  loadId: number;
+  countLabel: string;
+  noEmpty: boolean;
+  emptyText: string;
+  notLoading: boolean;
+  isLoading: boolean;
+  notErrored: boolean;
+  noPageError: boolean;
+  pendingProducts: boolean;
+  noRefreshError: boolean;
+  hasLoadedProducts: boolean;
+}
+let categoryId = "";
+let loadVersion = 0;
+let refreshFailed = false;
+let scanning = false;
+const products = createCollectionQuery<StoreProduct>({
+  id: p => p.id ?? "",
+  async fetch(_criteria, cursor) {
+    const version = loadVersion;
+    try {
+      const response = await searchStoreProducts({ categoryId, limit: 100, cursor: cursor || undefined });
+      return { items: (response.products ?? []).filter(p => !!p.id), nextCursor: response.pagingMetadata?.cursors?.next ?? "", total: response.pagingMetadata?.total };
+    } catch (error) {
+      if (version === loadVersion) refreshFailed = true;
+      throw error;
+    }
+  },
+}, () => { void svc.productsChanged(); });
+
+function derive(s: State): State {
+  const page = products.getState();
+  const source = s.found ? page.items : [];
+  const query = s.query.trim().toLowerCase();
+  const rows = toRows(source);
+  const next = applyFacets(s, query ? rows.filter(row => row.name.includes(query)) : rows, source.map(currencyOf).find(Boolean));
+  const pending = s.found && (page.status === "idle" || page.status === "loading" || page.loadingMore || (!!page.nextCursor && !page.pageError));
+  const firstError = s.found && page.status === "error";
+  const loaded = s.hasLoadedProducts || page.status === "ready";
+  return { ...next,
+    results: next.results.map(card => {
+      const product = source.find(p => p.id === card.id);
+      return { ...card, productNote: [
+        product?.inventory?.availabilityStatus === "OUT_OF_STOCK" ? copyParam("collection.outOfStock", "Out of stock")
+          : product?.inventory?.availabilityStatus === "PARTIALLY_OUT_OF_STOCK" ? copyParam("collection.someUnavailable", "Some options unavailable") : "",
+        product?.productType?.toLowerCase() === "digital" ? copyParam("collection.digitalLabel", "Digital product") : "",
+      ].filter(Boolean).join(" · ") };
+    }),
+    priceChips: next.priceChips.map(c => ({ ...c, selected: next.priceSelected.includes(c.id) })),
+    opt1Chips: next.opt1Chips.map(c => ({ ...c, selected: next.opt1Selected.includes(c.id) })),
+    opt2Chips: next.opt2Chips.map(c => ({ ...c, selected: next.opt2Selected.includes(c.id) })),
+    opt3Chips: next.opt3Chips.map(c => ({ ...c, selected: next.opt3Selected.includes(c.id) })),
+    countLabel: s.found && page.status === "ready" ? copyTemplate("collection.resultCount", "{count} products", { count: next.matched }) : "",
+    // Searching a partially loaded category must not replace its content with
+    // a first-load skeleton just because the current pages have no match yet.
+    hasLoadedProducts: loaded,
+    isLoading: pending && !loaded,
+    notLoading: !(pending && !loaded),
+    nextCursor: next.nextCursor || (!scanning && !page.pageError ? page.nextCursor : ""),
+    noMore: next.noMore && (scanning || !page.nextCursor || page.pageError),
+    pendingProducts: pending,
+    notErrored: !firstError,
+    noPageError: !s.found || !page.pageError,
+    noRefreshError: !refreshFailed || !s.found || !loaded || page.pageError,
+    // A filtered first page isn't proof of no matches while later pages load.
+    noEmpty: !s.found || pending || firstError || page.pageError || next.results.length > 0,
+    emptyText: copyParam("collection.productsEmptyBody", "Try another search or browse a different category."),
+  };
+}
+
+async function readRemaining(version: number): Promise<void> {
+  scanning = true;
+  let pages = 0;
+  try {
+    while (version === loadVersion) {
+      const page = products.getState();
+      if (page.status !== "ready" || page.pageError || !page.nextCursor) return;
+      // Leave further pages reachable through the real paging action.
+      if (++pages > 100) return;
+      await products.loadMore();
+    }
+  } finally {
+    scanning = false;
+    if (version === loadVersion) void svc.productsChanged();
+  }
+}
+const initial: State = { ...FACETS_BOOT, ...readViewPrefs(), ...presence("loading"),
+  name: "", subtitle: "", description: "", query: "", loadId: 0,
+  countLabel: "", noEmpty: true, emptyText: "", notLoading: true, isLoading: false, notErrored: true, noPageError: true, pendingProducts: false, noRefreshError: true, hasLoadedProducts: false,
+};
+const facets = facetActions<State>(derive);
+const actions = {
+  load: async (s: State, arg?: unknown): Promise<State | undefined> => {
+    stashCopy(arg);
+    const version = ++loadVersion;
+    const id = detailInputId();
+    if (!id) return derive({ ...s, ...presence("missing"), loadId: version });
+    let header: { name: string; subtitle: string; description: string };
+    try {
+      try {
+        const category = (await getStoreCategory(id)).category;
+        if (version !== loadVersion) return undefined;
+        if (!category?.id && !category?.name) return derive({ ...s, ...presence("missing"), loadId: version });
+        header = { name: category.name ?? "", subtitle: categoryCount(category), description: category.description ?? "" };
+      } catch {
+        const category = (await getCollection(id)).collection;
+        if (version !== loadVersion) return undefined;
+        if (!category) return derive({ ...s, ...presence("missing"), loadId: version });
+        header = { name: category.name ?? "", subtitle: "", description: category.description ?? "" };
+      }
+    } catch (error) {
+      if (version !== loadVersion) return undefined;
+      const current = svc.getState() as State;
+      // A failed refresh does not establish that an already loaded category is
+      // gone. Retain its current search and products, but never carry them to a
+      // different route. Successful missing-entity reads above still clear it.
+      if (categoryId === id && current.found) {
+        refreshFailed = true;
+        return derive({ ...current, loadId: version });
+      }
+      return derive({ ...s, ...presenceAfterError(error), loadId: version });
+    }
+    if (version !== loadVersion) return undefined;
+    const changed = categoryId !== id;
+    categoryId = id;
+    refreshFailed = false;
+    // Settle the first page in THIS load action. Native worker schedulers may
+    // defer sidecar reducers until it returns, so a detached first-page fetch
+    // cannot be the only path that clears this action's loading snapshot.
+    await products.query({ filter: categoryId }, false, true);
+    if (version !== loadVersion) return undefined;
+    void readRemaining(version);
+    return derive({ ...(svc.getState() as State), ...header, ...presence("found"), loadId: version,
+      ...(changed ? { ...FACETS_BOOT, ...readViewPrefs(), query: "", hasLoadedProducts: false } : {}),
+    });
+  },
+  productsChanged: (s: State) => s.loadId === loadVersion ? derive(s) : undefined,
+  search: (s: State, arg?: { value?: string }) => derive({ ...s, query: (arg?.value ?? "").slice(0, 256), visible: PAGE_SIZE, cursorEpoch: s.cursorEpoch + 1 }),
+  toggleSave: (s: State, arg?: unknown) => { try { toggleSaved(s.results, idOf(arg)); } catch { return s; } return derive(s); },
+  ...facets,
+  clearSearch: (s: State) => derive({ ...s, query: "", priceSelected: [], opt1Selected: [], opt2Selected: [], opt3Selected: [], visible: PAGE_SIZE, cursorEpoch: s.cursorEpoch + 1 }),
+  toggleFacet: (s: State, arg?: { facet?: string; id?: string }) => {
+    const key = arg?.facet;
+    if (key !== "price" && key !== "opt1" && key !== "opt2" && key !== "opt3") return s;
+    const id = arg?.id;
+    if (!id || !s[`${key}Chips`].some(option => option.id === id)) return s;
+    const selected = s[`${key}Selected`];
+    return derive({ ...s, [`${key}Selected`]: selected.includes(id) ? selected.filter(value => value !== id) : [...selected, id], visible: PAGE_SIZE, cursorEpoch: s.cursorEpoch + 1 });
+  },
+  loadMore: async (s: State) => {
+    if (s.visible < s.matched) return facets.showMore(s);
+    await products.loadMore();
+    return undefined;
+  },
+  showMore: async (s: State) => {
+    if (s.visible < s.matched) return facets.showMore(s);
+    await products.loadMore();
+    return undefined;
+  },
+  retry: async () => { refreshFailed = false; await products.retry(); await readRemaining(loadVersion); return undefined; },
+};
+const register = withIapPresentation<State>({
+  prefix: "category",
+  transientKeys: Object.keys(initial) as (keyof State & string)[],
+  contentActions: Object.keys(actions),
+  items: s => s.results.map(row => ({ reference: { kind: "storesProduct", id: row.id }, commerceDisplayPrice: row.commercePrice })),
+  present: (s, price, _allowed, apple) => ({ ...s, results: s.results.map(row => {
+    const stored = row as typeof row & { commerceWasPrice?: string; commerceOnSale?: boolean };
+    const wasPrice = stored.commerceWasPrice ?? row.wasPrice;
+    const onSale = stored.commerceOnSale ?? row.onSale;
+    return { ...row, price: price(row.id, row.commercePrice) || row.price,
+      commerceWasPrice: wasPrice, commerceOnSale: onSale,
+      ...(apple(row.id) ? { wasPrice: "", onSale: false, notOnSale: true, noTagRow: row.noSwatches }
+        : { wasPrice, onSale, notOnSale: !onSale, noTagRow: !onSale && row.noSwatches }),
+    };
+  }) }),
+});
+const svc = register<State, Record<string, (s: State, arg?: any) => State | undefined | Promise<State | undefined>>>("himiBrandedCategory", { state: initial, actions });
+svc.load();
+export { svc };

package/templates/branded-lite/tier5-src/himi-branded-lite-order/index.ts

@@ -1,3 +1,4 @@
+import { orderDelivery, orderOptions } from "../_shared/store-order-presentation.js";
 import { withOnlineWrites } from "../_shared/online-actions.js";
 import { createIapCommerce, classifyCart } from "@himalaya/iap-checkout";
 import { getStoreProduct } from "../_shared/himi-store.js";
@@ -32,6 +33,7 @@ interface LineRow {
   title: string;
   name: string;
   quantity: string;
+  options: string;
   /** Formatted per-line price (fetched with the order; previously discarded). */
   price: string;
   image: string;
@@ -50,11 +52,21 @@ interface ReorderRef {
 
 interface State extends LiveSessionFields {
   status: "loading" | "ready" | "error";
+  permissionDenied?: boolean;
+  hideLoadError?: boolean;
+  hidePermissionError?: boolean;
   /** The order this screen is about. Added for #2050: a followed session has to name
    *  its record, and until now the id lived only in `load`'s local scope. */
   id: string;
   title: string;
   placedAt: string;
+  deliveryTitle: string;
+  deliveryLines: string;
+  deliveryMethod: string;
+  deliveryAddress: string;
+  noDeliveryMethod?: boolean;
+  noDeliveryAddress?: boolean;
+  noDelivery: boolean;
   fulfillmentStatus: string;
   paymentStatus: string;
   subtotal: string;
@@ -143,10 +155,9 @@ function linePrice(value: unknown): string {
     totalPriceAfterTax?: { formattedAmount?: string };
     totalPriceBeforeTax?: { formattedAmount?: string };
   } | undefined;
-  return item?.price?.formattedAmount
-    ?? item?.totalPriceAfterTax?.formattedAmount
+  return item?.totalPriceAfterTax?.formattedAmount
     ?? item?.totalPriceBeforeTax?.formattedAmount
-    ?? "";
+    ?? (item?.price?.formattedAmount ? copyTemplate("order.unitPrice", "{price} each", { price: item.price.formattedAmount }) : "");
 }
 
 function lineRows(order: WixOrder): LineRow[] {
@@ -159,6 +170,7 @@ function lineRows(order: WixOrder): LineRow[] {
       name,
       quantity: copyTemplate("order.quantityLine", "Qty {quantity}", { quantity: item.quantity || 1 }),
       price: linePrice(item),
+      options: orderOptions(item),
       image,
       initial: (name.trim()[0] || "O").toUpperCase(),
       hasImage: Boolean(image),
@@ -187,11 +199,16 @@ function derive(state: State): State {
     cannotReorder: !canReorder,
     isLoading: state.status === "loading",
     notLoading: state.status !== "loading",
+    hideLoadError: state.status !== "error" || state.permissionDenied === true || state.needsSignIn,
+    hidePermissionError: state.status !== "error" || state.permissionDenied !== true || state.needsSignIn,
     isErrored: state.status === "error",
     notErrored: state.status !== "error",
-    noEmpty: state.status !== "ready" || hasContent,
+    noEmpty: state.status !== "ready" || hasContent || state.needsSignIn,
     noSignIn: !state.needsSignIn,
     hideContent: !hasContent,
+    noDelivery: !state.deliveryLines,
+    noDeliveryMethod: !state.deliveryMethod,
+    noDeliveryAddress: !state.deliveryAddress,
     hasShipping: !!state.shipping,
     noShipping: !state.shipping,
     hasTax: !!state.tax,
@@ -244,6 +261,7 @@ async function findOwnedOrder(id: string, email: string): Promise<WixOrder | und
 
 function orderState(order: WixOrder): Partial<State> {
   return {
+      ...orderDelivery(order),
       title: copyTemplate("order.orderTitle", "Order #{number}", { number: order.number || order.id || "" }),
       placedAt: formatDate(order.createdDate),
       fulfillmentStatus: titleCase(order.fulfillmentStatus) || copyParam("order.statusFallback", "Order placed"),
@@ -260,7 +278,7 @@ function orderState(order: WixOrder): Partial<State> {
 let loadVersion = 0;
 let loadedMember: OrderMember | undefined;
 function clearOrder(state: State): State {
-  return derive({ ...state, title: "", placedAt: "", fulfillmentStatus: "", paymentStatus: "", subtotal: "", shipping: "", tax: "", discount: "", total: "", rows: [], reorderRefs: [], reorderMessage: "", emptyText: "", needsSignIn: false });
+  return derive({ ...state, title: "", placedAt: "", deliveryTitle: "", deliveryLines: "", deliveryMethod: "", deliveryAddress: "", fulfillmentStatus: "", paymentStatus: "", subtotal: "", shipping: "", tax: "", discount: "", total: "", rows: [], reorderRefs: [], reorderMessage: "", emptyText: "", needsSignIn: false, permissionDenied: false });
 }
 async function load(state: State, arg?: unknown): Promise<State | undefined> {
   const version = ++loadVersion;
@@ -296,7 +314,7 @@ async function load(state: State, arg?: unknown): Promise<State | undefined> {
         total: String(cached.subtitle ?? ""), emptyText: copyParam("order.cachedText", "Saved order summary. Connect to refresh details."),
       });
     }
-    return finish({ ...state, status: "error", emptyText: orderAccessDenied(error)
+    return finish({ ...state, status: "error", permissionDenied: orderAccessDenied(error), emptyText: orderAccessDenied(error)
       ? copyParam("order.accessErrorText", "Order details are unavailable for this account.")
       : copyParam("order.loadErrorText", "Order details could not be loaded.") });
   }
@@ -327,6 +345,11 @@ const svc = defineService<State, {
     status: "loading",
     title: "",
     placedAt: "",
+    deliveryTitle: "",
+    deliveryLines: "",
+    deliveryMethod: "",
+    deliveryAddress: "",
+    noDelivery: true,
     fulfillmentStatus: "",
     paymentStatus: "",
     subtotal: "",