@wix/himalaya-cli 0.1557.0 → 0.1559.0

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

@@ -9,7 +9,7 @@ import { withOnlineWrites } from "../_shared/online-actions.js";
 // error card.
 //
 // Phase 2d — enrolling is NATIVE. `joinProgram` covers all three program kinds in
-// one call and the outcome is read off `participant.state`, not assumed:
+// the Join Applications API; its compatibility result exposes only confirmed outcomes:
 // a free/open program comes back JOINED with nothing to pay, a paid one comes back
 // PAYMENT_PENDING and settles on the shared in-app pay rail, and a private one comes
 // back APPROVAL_PENDING (the owner approves; there is nothing to charge). Any failure
@@ -21,6 +21,8 @@ import { withOnlineWrites } from "../_shared/online-actions.js";
 // offers Get access in place of Enrol and sells only through the shared checkout, never through the
 // Wix payment rail.
 import { defineService as registerService } from "@himalaya/state";
+import { programImage } from "../_shared/himi-media.js";
+import { WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import {
   getProgram,
   joinProgram,
@@ -122,14 +124,6 @@ function detailsOf(p: WixProgram): string {
     .trim();
 }
 
-function imageOf(p: WixProgram): string {
-  const desc = (p as { description?: unknown }).description;
-  const nested = desc && typeof desc === "object" ? (desc as { image?: { url?: string } }).image?.url : undefined;
-  const cover = (p as { coverImage?: unknown }).coverImage;
-  const coverUrl = typeof cover === "string" ? cover : (cover as { url?: string } | undefined)?.url;
-  return (coverUrl || p.image || nested || "").trim();
-}
-
 function metaOf(p: WixProgram): string {
   const summary = (p as { contentSummary?: { stepCount?: number; sectionCount?: number } }).contentSummary;
   const bits: string[] = [];
@@ -160,7 +154,7 @@ function ready(state: State, p: WixProgram | undefined): State {
     return derive({ ...state, status: "ready", name: "", description: "", meta: "", priceLine: "", image: "", initial: "", emptyText: copyParam("program.emptyText", "This program is no longer available.") });
   }
   const name = titleOf(p);
-  const image = imageOf(p);
+  const image = programImage(p, WIX_DETAIL_IMAGE);
   return derive({
     ...state,
     status: "ready",
@@ -196,18 +190,26 @@ interface CommerceGuards {
 async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<string> {
   const blocked = () => iapPriceCopy("program").purchaseUnavailable;
   if (!guards.mayStart()) return blocked();
+  let preparationWithdrawn = false;
   try {
-    const joined = await joinProgram(inputId());
+    const joined = await joinProgram(inputId(), { mayPreparePayment: () => {
+      if (!guards.mayContinue()) preparationWithdrawn = true;
+      return !preparationWithdrawn;
+    } });
     const participant = joined.participant;
     const programState = (participant?.state ?? "").toUpperCase();
     if (programState === "APPROVAL_PENDING") {
       return copyParam("program.approvalPendingMessage", "Request sent — the host will approve your place.");
     }
+    if (programState === "ENROLLMENT_PENDING") {
+      return copyParam("program.enrollmentPendingMessage", "Your enrollment is processing — check back shortly.");
+    }
     const payable = payableIdOf(participant);
-    if (!payable) {
-      // Free / open program (or one already settled) ⇒ nothing to charge.
+    if (programState === "JOINED") {
+      // Only a confirmed participant is enrolled; absent payment data is not success.
       return copyTemplate("program.joinedMessage", "You're enrolled in {name}.", { name });
     }
+    if (programState !== "PAYMENT_PENDING" || !payable) throw new Error("Program enrollment is not ready");
     const msid = await wixPlatformSession.signedInstanceStatus().then((s) => s.msid ?? "").catch(() => "");
     // Re-read before each step that commits money: a route that settles meanwhile wins.
     let withdrawn = false;
@@ -227,12 +229,8 @@ async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<
       // which is precisely the dead-end the two-rail design exists to prevent
       // (and which the cart/plans/events flows each guard with a test).
       //
-      // There is no `programsCheckout` redirect intent. `ecomOrderPaymentRequest`
-      // is the only payment-request-shaped one, and a program's `purchaseFlowId`
-      // is a payment-request handle, so that is what we hand it. If that mapping
-      // is ever wrong the call throws, we degrade to the same site-directing
-      // message as before, and nothing regresses — but when it is right, a
-      // wallet-less site can actually sell the program IN-APP.
+      // Join Applications returns a Wix Payments order id; the payment-request
+      // redirect uses that same order handle on the hosted rail.
       cashierUrl: async () => {
         if (!stillAllowed()) return undefined;
         const redirect = await createRedirectSession({
@@ -243,10 +241,13 @@ async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<
       },
     });
     if (withdrawn) return blocked();
-    if (pay.kind === "paid") return copyTemplate("program.joinedMessage", "You're enrolled in {name}.", { name });
+    if (pay.kind === "paid") return pay.pending
+      ? copyParam("program.paymentPendingMessage", "Payment is processing — enrollment will be confirmed after payment.")
+      : 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 (preparationWithdrawn) return blocked();
     // 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

@@ -14,7 +14,7 @@ import { decorateCollection } from "../_shared/collection-service.js";
 import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
 import { iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
 import { createIapCommerce } from "@himalaya/iap-checkout";
-import { wixMediaUrl } from "@himalaya/wix-media";
+import { programImage } from "../_shared/himi-media.js";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
 import { iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
@@ -86,14 +86,6 @@ function programDetails(p: WixProgram): string {
   return raw.length > 140 ? `${raw.slice(0, 139).trimEnd()}…` : raw;
 }
 
-function programImage(p: WixProgram): string {
-  const desc = (p as { description?: unknown }).description;
-  const nested = desc && typeof desc === "object" ? (desc as { image?: { url?: string } }).image?.url : undefined;
-  const cover = (p as { coverImage?: unknown }).coverImage;
-  const coverUrl = typeof cover === "string" ? cover : (cover as { url?: string } | undefined)?.url;
-  return wixMediaUrl(coverUrl || p.image || nested);
-}
-
 function programMeta(p: WixProgram): string {
   const summary = (p as { contentSummary?: { stepCount?: number; sectionCount?: number } }).contentSummary;
   const bits: string[] = [];