@wix/himalaya-cli 0.1527.0 → 0.1529.0

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

@@ -17,6 +17,9 @@ import { copyParam, stashCopy } from "../_shared/himi-copy.js";
 /** One section with its shaped dishes (the source of truth `all` keeps). */
 interface MenuSection {
   id: string;
+  /** The menu that lists this section ("" for the flat fallback) — the dish detail orders
+   *  the dish under this menu + section, which is what Wix checkout validates. */
+  menuId: string;
   name: string;
   items: DishCard[];
 }
@@ -47,6 +50,9 @@ interface MenuRow {
   noLabel2: boolean;
   noLabel3: boolean;
   detailScreenId: string;
+  /** Where the dish is shown — passed to the detail as nav params ("" on header rows). */
+  menuId: string;
+  sectionId: string;
 }
 
 interface State {
@@ -87,10 +93,12 @@ function headerRow(section: MenuSection): MenuRow {
     noLabel2: true,
     noLabel3: true,
     detailScreenId: "",
+    menuId: "",
+    sectionId: "",
   };
 }
 
-function itemRow(item: DishCard): MenuRow {
+function itemRow(item: DishCard, section: MenuSection): MenuRow {
   return {
     id: item.id,
     isHeader: false,
@@ -112,6 +120,8 @@ function itemRow(item: DishCard): MenuRow {
     noLabel2: item.noLabel2,
     noLabel3: item.noLabel3,
     detailScreenId: item.detailScreenId,
+    menuId: section.menuId,
+    sectionId: section.id === "all" ? "" : section.id,
   };
 }
 
@@ -128,7 +138,7 @@ function apply(all: MenuSection[], query: string): MenuRow[] {
         }))
         .filter((section) => section.items.length > 0)
     : all;
-  return filtered.flatMap((section) => [headerRow(section), ...section.items.map(itemRow)]);
+  return filtered.flatMap((section) => [headerRow(section), ...section.items.map((item) => itemRow(item, section))]);
 }
 
 function derive(state: State): State {
@@ -163,9 +173,10 @@ export function composeSections(menus: WixMenu[], sections: WixSection[], dishes
   const sectionById = new Map(sections.filter((section) => section.id).map((section) => [section.id, section]));
   const orderedIds: string[] = [];
   const seen = new Set<string>();
+  const menuOf = new Map<string, string>();
   for (const menu of menus.filter((candidate) => candidate.visible !== false)) {
     for (const sectionId of menu.sectionIds ?? []) {
-      if (sectionId && !seen.has(sectionId)) { seen.add(sectionId); orderedIds.push(sectionId); }
+      if (sectionId && !seen.has(sectionId)) { seen.add(sectionId); orderedIds.push(sectionId); menuOf.set(sectionId, menu.id ?? ""); }
     }
   }
   // Menus query failed / carried no section links → every section, in order.
@@ -182,11 +193,11 @@ export function composeSections(menus: WixMenu[], sections: WixSection[], dishes
       return dish ? [dish] : [];
     });
     if (items.length === 0) return [];
-    return [{ id: section.id, name: cleanTitle(section.name) || copyParam("menu.sectionFallbackName", "Menu"), items }];
+    return [{ id: section.id, menuId: menuOf.get(section.id) ?? "", name: cleanTitle(section.name) || copyParam("menu.sectionFallbackName", "Menu"), items }];
   });
   if (composed.length > 0) return composed;
   // Sections unavailable (or none matched a dish) → flat single-section menu.
-  return dishes.length ? [{ id: "all", name: copyParam("menu.sectionFallbackName", "Menu"), items: dishes }] : [];
+  return dishes.length ? [{ id: "all", menuId: "", name: copyParam("menu.sectionFallbackName", "Menu"), items: dishes }] : [];
 }
 
 function strOf(arg: unknown): string {

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

@@ -7,7 +7,7 @@ import { withOnlineWrites } from "../_shared/online-actions.js";
 // INTERACTIVE: tapping an upcoming reservation cancels it — optimistic + best-effort
 // cancelReservation (no-op on sample rows).
 //
-// RFC 0052 consumer: the list is a `himalaya.Agenda` — chronological, grouped
+// The list is a `himalaya.Agenda` — chronological, grouped
 // by LOCAL day under sticky headers. A reservation list is a diary, and the
 // flat grid it replaced repeated "Fri, Aug 8 · 7:30 PM" on every card because
 // no row knew what day the row above it was on. `Agenda` owns the day headers

package/templates/branded-lite/tier5-src/wix-spaces-food-order-detail/index.ts

@@ -1,24 +1,86 @@
-// Tier-5 bundle: Wix Spaces clone — explicit secure-site handoff.
-// The owner-capable Restaurant Orders API must never be queried from a member device.
+// Tier-5 bundle: one placed restaurant order for the signed-in member.
+// Read through the member eCom orders search (filtered to the member's email and the order id),
+// the same path as the order list — never the owner-capable Restaurants Orders API. An order that
+// is not this member's, or has no Restaurants line, is "not found".
 import { defineService } from "@himalaya/state";
+import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { presence, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
+import { assertOrderMember, orderAccessDenied, orderMember } from "../_shared/member-orders.js";
+import { RESTAURANTS_ORDERS_APP_ID } from "../_shared/restaurant-ordering.js";
+import { formatDateMedium } from "../_shared/engine-intl.js";
+import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 
 interface S extends PresenceFlags { status: "loading" | "ready"; name: string; status_: string; total: string; items: string; message: string }
 
-const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesFoodOrderDetail", {
-  state: { status: "loading", name: "", status_: "", total: "", items: "", message: "", ...presence("loading") },
-  actions: {
-    // No order id → the shared not-found state; an id → the secure-site handoff.
-    load: async () => (!detailInputId() ? { status: "ready", name: "", status_: "", total: "", items: "", message: "", ...presence("missing") } : {
-      ...presence("found"),
+const EMPTY = { name: "", status_: "", total: "", items: "", message: "" };
+
+function statusLine(order: WixOrder): string {
+  const raw = order as WixOrder & { status?: string };
+  const status = raw.status === "CANCELED" ? copyParam("foodOrders.statusCanceled", "Canceled")
+    : order.fulfillmentStatus === "FULFILLED" ? copyParam("foodOrders.statusCompleted", "Completed")
+    : order.paymentStatus === "NOT_PAID" || order.paymentStatus === "PENDING" ? copyParam("foodOrders.statusAwaitingPayment", "Awaiting payment")
+    : copyParam("foodOrders.statusReceived", "Received");
+  const created = order.createdDate ? new Date(order.createdDate) : undefined;
+  return [status, created && !Number.isNaN(created.getTime()) ? formatDateMedium(created) : ""].filter(Boolean).join(" · ");
+}
+
+function fulfillmentLine(order: WixOrder): string {
+  const title = (order as WixOrder & { shippingInfo?: { title?: string } }).shippingInfo?.title ?? "";
+  return title ? copyTemplate("foodOrderDetail.fulfillment", "Fulfillment: {method}", { method: title }) : "";
+}
+
+/** Bumped by every load. The module-scope load and the screen's on-appear load overlap: only the
+ *  newest commits, so an older, slower answer never replaces a newer one. */
+let loadSeq = 0;
+/** The service's live state (set once the service exists). */
+let latestState: () => S = () => ({ status: "loading", ...EMPTY, ...presence("loading") });
+
+async function read(id: string): Promise<S> {
+  const member = await orderMember();
+  if (!member.email) {
+    return { status: "ready", ...EMPTY, ...presence("found"),
+      message: copyParam("foodOrderDetail.signIn", "Sign in to see this order.") };
+  }
+  try {
+    const response = await searchOrders({ search: {
+      filter: { "buyerInfo.email": { $eq: member.email }, id: { $eq: id } },
+      cursorPaging: { limit: 1 },
+    } });
+    await assertOrderMember(member);
+    const order = (response.orders ?? []).find((candidate) => candidate.id === id
+      && (candidate.buyerInfo?.email ?? "").trim().toLowerCase() === member.email
+      && (candidate.lineItems ?? []).some((line) =>
+        (line as { catalogReference?: { appId?: string } }).catalogReference?.appId === RESTAURANTS_ORDERS_APP_ID));
+    if (!order) return { status: "ready", ...EMPTY, ...presence("missing") };
+    return {
       status: "ready",
-      name: "",
-      status_: "",
-      total: "",
-      items: "",
-      message: "Live order details require a secure connection configured by this business.",
-    }),
+      ...presence("found"),
+      name: copyTemplate("foodOrders.orderTitle", "Order #{number}", { number: order.number || order.id }),
+      status_: statusLine(order),
+      total: order.priceSummary?.total?.formattedAmount ?? "",
+      items: (order.lineItems ?? [])
+        .map((line) => `${line.quantity || 1} × ${line.productName?.translated || line.productName?.original || ""}`.trim())
+        .join("\n"),
+      message: fulfillmentLine(order),
+    };
+  } catch (error) {
+    return { status: "ready", ...EMPTY, ...presence(orderAccessDenied(error) ? "missing" : "failed") };
+  }
+}
+
+const svc = defineService<S, { load: (s: S, arg?: unknown) => Promise<S> }>("spacesFoodOrderDetail", {
+  state: { status: "loading", ...EMPTY, ...presence("loading") },
+  actions: {
+    load: async (_state, arg) => {
+      stashCopy(arg);
+      const id = detailInputId();
+      if (!id) return { status: "ready", ...EMPTY, ...presence("missing") };
+      const seq = ++loadSeq;
+      const next = await read(id);
+      return seq === loadSeq ? next : latestState();
+    },
   },
 });
+latestState = () => svc.getState() as S;
 svc.load();
 export { svc };