@tokenoftrust/storefront-runner 2.4.60 → 2.4.62

package/apps/storefront/src/lib/admin/services/orders.ts

@@ -204,7 +204,7 @@ function readSourcedEvidence(
   const asOfValue = verification[`${key}AsOf`];
   return {
     state,
-    source: typeof sourceValue === "string" && sourceValue.length > 0 ? sourceValue : "checkout-order",
+    source: typeof sourceValue === "string" && sourceValue.length > 0 ? sourceValue : "absent",
     asOf: typeof asOfValue === "string" ? asOfValue : null,
   };
 }
@@ -266,13 +266,14 @@ export function releaseOf(order: ScrappyOrderRecord): OrderRelease {
   return { state: ready ? "ready" : "held", ready, blocks };
 }
 
-function checkoutRecord(order: CheckoutOrderSummary): ScrappyOrderRecord {
+function checkoutRecord(order: CheckoutOrderSummary, scope: CommerceScope): ScrappyOrderRecord {
+  if (scope.tenantId.length === 0) throw new Error("checkout scope has no tenant");
   const payment: PaymentState = order.payment;
   return {
     id: order.id,
     placedAt: order.placedAt,
-    tenantId: "",
-    stage: "preview",
+    tenantId: scope.tenantId,
+    stage: scope.stage,
     currency: order.currency,
     payment: { state: payment, source: "checkout-order", asOf: order.placedAt },
     tax: readSourcedEvidence(order.verification, "tax"),
@@ -294,24 +295,16 @@ function checkoutRecord(order: CheckoutOrderSummary): ScrappyOrderRecord {
 }
 
 /** Checkout DTO assessment. `verification: null` reports UNKNOWN and held. */
-export function assessCheckoutOrder(order: CheckoutOrderSummary): CheckoutReadiness {
-  const record = checkoutRecord(order);
-  const release = order.verification == null
-    ? heldRelease(releaseOf(record))
-    : releaseOf(record);
+export function assessCheckoutOrder(order: CheckoutOrderSummary, scope: CommerceScope): CheckoutReadiness {
+  const record = checkoutRecord(order, scope);
   return {
     columns: readinessColumns(record),
     evidence: evidenceOf(record),
-    release,
+    release: releaseOf(record),
     riskLevel: deriveRisk(order.verification, order.blocker),
   };
 }
 
-function heldRelease(release: OrderRelease): OrderRelease {
-  if (release.state === "held") return release;
-  return { state: "held", ready: false, blocks: [...release.blocks, "evidence"] };
-}
-
 export function mapSummaryToRow(s: CheckoutOrderSummary): OrderRow {
   const verificationMissing = s.verification == null;
   const shipState: OrderShipState = verificationMissing ? "hold_review_required" : s.fulfillment;
@@ -346,8 +339,8 @@ function columnCheck(
   return { key: column.key, value: column.state, ...copy };
 }
 
-function deriveReadinessChecks(d: CheckoutOrderDetail): OrderReadinessCheck[] {
-  const report = assessCheckoutOrder(d);
+function deriveReadinessChecks(d: CheckoutOrderDetail, scope: CommerceScope): OrderReadinessCheck[] {
+  const report = assessCheckoutOrder(d, scope);
   const column = (key: OrderReadinessColumn["key"]) => report.columns.find((item) => item.key === key)!;
   const payment = column("payment");
   const tax = column("tax");
@@ -444,8 +437,8 @@ function deriveEvidenceTimeline(d: CheckoutOrderDetail): OrderEvidenceEvent[] {
   return events;
 }
 
-export function mapDetailToDetail(d: CheckoutOrderDetail, row: OrderRow): OrderDetail {
-  const report = assessCheckoutOrder(d);
+export function mapDetailToDetail(d: CheckoutOrderDetail, row: OrderRow, scope: CommerceScope): OrderDetail {
+  const report = assessCheckoutOrder(d, scope);
   return {
     ...row,
     lineItems: d.lineItems.map((li) => ({
@@ -457,7 +450,7 @@ export function mapDetailToDetail(d: CheckoutOrderDetail, row: OrderRow): OrderD
     shipping: d.totals.shipping,
     estimatedTax: d.totals.estimatedTax,
     taxesAndFees: d.totals.taxesAndFees,
-    readinessChecks: deriveReadinessChecks(d),
+    readinessChecks: deriveReadinessChecks(d, scope),
     evidenceTimeline: deriveEvidenceTimeline(d),
     columns: report.columns,
     release: report.release,
@@ -481,13 +474,14 @@ export function mapOrdersToViewModel(
   targetTenant: string,
   summaries: CheckoutOrderSummary[],
   details: Record<string, CheckoutOrderDetail>,
+  scope: CommerceScope,
 ): OrdersViewModel {
   const rows = summaries.map(mapSummaryToRow);
   const detailsById: Record<string, OrderDetail> = {};
   for (const row of rows) {
     const d = details[row.id];
     detailsById[row.id] = d
-      ? mapDetailToDetail(d, row)
+      ? mapDetailToDetail(d, row, scope)
       : {
           ...row,
           lineItems: [],
@@ -520,11 +514,25 @@ export function mapOrdersToViewModel(
 }
 
 export function emptyOrdersViewModel(targetTenant: string): OrdersViewModel {
-  return mapOrdersToViewModel(targetTenant, [], {});
+  const rows: OrderRow[] = [];
+  return {
+    targetTenant,
+    queues: buildQueues(rows),
+    rows,
+    detailsById: {},
+    today: {
+      grossSales: 0,
+      paidOrders: 0,
+      averageOrder: 0,
+      refunds: 0,
+      oldestOpenAt: null,
+    },
+  };
 }
 
 export interface GetOrdersViewModelOptions {
   targetTenant: string;
+  scope: CommerceScope;
   client: CheckoutOrderClient;
   filters?: Parameters<CheckoutOrderClient["listOrders"]>[0];
 }
@@ -569,7 +577,7 @@ export async function getOrdersViewModelResult(opts: GetOrdersViewModelOptions):
     );
     return {
       status: orders.length ? "loaded" : "empty",
-      vm: mapOrdersToViewModel(opts.targetTenant, orders, details),
+      vm: mapOrdersToViewModel(opts.targetTenant, orders, details, opts.scope),
       page,
     };
   } catch {

package/apps/storefront/src/pages/api/admin/orders/[id].ts

@@ -11,13 +11,13 @@ import { readEnv } from "@/lib/env";
 import { requireAdminApiEntry } from "@/lib/auth/adminApiGuard";
 import {
   commerceActorForAdmin,
-  commerceStageForCustomization,
   createCheckoutOrderClient,
   orderApiBaseUrl,
   OrderApiError,
   projectCheckoutOrder,
 } from "@/lib/admin/orderClient";
 import { assessCheckoutOrder } from "@/lib/admin/services/orders";
+import { commerceStageForEnv } from "@/lib/fulfillment/fulfillmentService";
 
 export const prerender = false;
 
@@ -46,25 +46,27 @@ export async function GET(context: APIContext): Promise<Response> {
   const bearer = await readEnv("FOXY_ORDER_API_KEY");
   if (!bearer) return jsonError("not_provisioned", 503);
 
+  const stage = commerceStageForEnv(customizationEnv);
+  if (!stage) return jsonError("stage-unknown", 409);
+  const tenantId = tenant.appDomain.trim();
+  if (!tenantId) return jsonError("not_provisioned", 503);
+
   const client = createCheckoutOrderClient({
     baseUrl: orderApiBaseUrl(customizationEnv),
-    appDomain: tenant.appDomain,
+    appDomain: tenantId,
     bearer,
   });
 
   try {
-    const stage = commerceStageForCustomization(customizationEnv);
+    const scope = { tenantId, stage };
     const actor = commerceActorForAdmin({
-      tenantId: tenant.appDomain,
+      tenantId,
       stage,
       owner: access.entry.isOwnerViewer,
       admitted: access.entry.admitted,
     });
-    const order = projectCheckoutOrder(await client.getOrder(orderId), actor, {
-      tenantId: tenant.appDomain,
-      stage,
-    });
-    const readiness = assessCheckoutOrder(order);
+    const order = projectCheckoutOrder(await client.getOrder(orderId), actor, scope);
+    const readiness = assessCheckoutOrder(order, scope);
     return new Response(JSON.stringify({ order, readiness }), { headers: JSON_HEADERS });
   } catch (err) {
     if (err instanceof OrderApiError) return jsonError(err.code, err.status);

package/apps/storefront/src/pages/api/admin/orders.ts

@@ -17,6 +17,7 @@ import {
   orderApiBaseUrl,
   OrderApiError,
 } from "@/lib/admin/orderClient";
+import { commerceStageForEnv } from "@/lib/fulfillment/fulfillmentService";
 import { assessCheckoutOrder, parseOrderFilters } from "@/lib/admin/services/orders";
 
 export const prerender = false;
@@ -49,21 +50,27 @@ export async function GET(context: APIContext): Promise<Response> {
     return jsonError("not_provisioned", 503);
   }
 
+  const stage = commerceStageForEnv(customizationEnv);
+  if (!stage) return jsonError("stage-unknown", 409);
+  const tenantId = tenant.appDomain.trim();
+  if (!tenantId) return jsonError("not_provisioned", 503);
+
   const url = new URL(context.request.url);
   // Tenant comes from the host, never from a query parameter.
   const filters = parseOrderFilters(url.searchParams);
 
   const client = createCheckoutOrderClient({
     baseUrl: orderApiBaseUrl(customizationEnv),
-    appDomain: tenant.appDomain,
+    appDomain: tenantId,
     bearer,
   });
 
   try {
     const data = await client.listOrders(filters);
+    const scope = { tenantId, stage };
     const orders = data.orders.map((order) => ({
       ...order,
-      readiness: assessCheckoutOrder(order),
+      readiness: assessCheckoutOrder(order, scope),
     }));
     return new Response(JSON.stringify({ ...data, orders }), { headers: JSON_HEADERS });
   } catch (err) {

package/apps/storefront/src/pages/products/[handle].astro

@@ -21,8 +21,7 @@ import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
 import ReviewList from "@/components/commerce/ReviewList.astro";
 import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
 import {
-  buildVariantCartPayload,
-  priceForPurchaseOption,
+  buildMemberSignedCartPayload,
   workerCartApiPath,
   normalizePurchaseOptions,
   visiblePurchaseOptions,
@@ -243,18 +242,13 @@ if (commerce) {
           async (v) => {
             const payloads = await Promise.all(
               purchaseOptions.map(async (purchaseOption) => {
-                const effective = priceForPurchaseOption(
-                  v.price,
-                  purchaseOption,
-                  pricingCtx,
-                );
                 return [
                   purchaseOption.id,
-                  await buildVariantCartPayload(product, v, {
+                  await buildMemberSignedCartPayload(product, v, {
                     mode: commerce.mode,
                     secret: signing.secret,
                     purchaseOption,
-                    signedPrice: effective.price,
+                    pricing: pricingCtx,
                     autopilotEnabled,
                     tenantId: tenant.tenant_id,
                   }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.4.60",
+  "version": "2.4.62",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",

package/packages/public-runtime/src/membership.ts

@@ -276,6 +276,8 @@ export interface MemberSignedCartPayloadOptions {
    * is off. Callers should still pre-filter with {@link visiblePurchaseOptions}.
    */
   autopilotEnabled: boolean;
+  /** Tenant id written onto the signed `tenant` field when present. */
+  tenantId?: string;
 }
 
 /**
@@ -309,6 +311,7 @@ export async function buildMemberSignedCartPayload(
     purchaseOption: opts.purchaseOption,
     signedPrice: effective.price,
     autopilotEnabled: opts.autopilotEnabled,
+    tenantId: opts.tenantId,
   });
 }