@wix/himalaya-cli 0.1522.0 → 0.1524.0

package/templates/beauty-salon/tier5-src/himi-branded-lite-cart/index.ts

@@ -2,9 +2,8 @@ import { getStoreProduct } from "../_shared/himi-store.js";
 import { iapPriceCopy } from "../_shared/iap-worker.js";
 import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { type IapCommerce, classifyCart } from "@himalaya/iap-checkout";
-import { addCouponToCurrentCart, calculateCurrentCart, createCheckoutFromCurrentCart, createOrder, getCurrentCart, removeCouponFromCurrentCart, removeLineItemsFromCurrentCart, updateLineItemsQuantity, type WixCartDetail, type WixCartLineItemDetail } from "@himalaya/wix-ecom";
+import { addCouponToCurrentCart, calculateCurrentCart, createCheckoutFromCurrentCart, getCurrentCart, removeCouponFromCurrentCart, removeLineItemsFromCurrentCart, updateLineItemsQuantity, type WixCartDetail, type WixCartLineItemDetail } from "@himalaya/wix-ecom";
 import { createRedirectSession } from "@himalaya/wix-redirects";
-import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { payCashierOrder } from "@himalaya/checkout";
 import { hostedCheckoutOpener, isHostedWorker } from "../_shared/hosted-checkout.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
@@ -14,16 +13,6 @@ import { formatCurrency } from "../_shared/engine-intl.js";
 const WIX_STORES_CATALOG_ID = "215238eb-22a5-4c36-9e7b-e7c08025e04e";
 const WIX_STORES_APP_ID = "1380b703-ce81-ff05-f115-39571d94dfcd";
 
-/** The site's metaSiteId for the cashier payment config. Best-effort — the native
- *  cashier can also resolve it from the app's signed Wix session, so "" is tolerated. */
-async function resolveMsid(): Promise<string> {
-  try {
-    const st = await wixPlatformSession.signedInstanceStatus();
-    return st.msid ?? "";
-  } catch {
-    return "";
-  }
-}
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { getAll, upsert, remove as dbRemove, type DbEntity } from "@himalaya/local-db";
 import { isOfflineFailure, writeMayHaveLanded } from "../_shared/owner-load-error.js";
@@ -387,30 +376,6 @@ function couponDetails(result: unknown): { id: string; code: string } {
   return { id: coupon?.coupon?.id ?? coupon?.id ?? "", code: coupon?.coupon?.code ?? coupon?.code ?? "" };
 }
 
-/** The state slice a SETTLED order leaves behind: the order consumed the cart, so the
- *  lines AND the subtotal go with it (`refresh` and the error path both clear the pair —
- *  leaving a stale subtotal in state is the class of defect #864 fixed on the render side).
- *
- *  `emptyText` is cleared deliberately: the empty card would otherwise nudge "Your cart is
- *  empty." underneath the confirmation, which is noise at the moment of a successful
- *  payment. The next `load` restores it.
- *
- *  This used to be written inline as `{ items: [], itemCount: 0, checkoutHint: ... }`.
- *  `itemCount` is not a field of `State` and never was — a write to nowhere, which is why
- *  the subtotal and emptyText resets were missing. It survived because nothing typechecks
- *  Tier-5 workers: esbuild erases types, and no tsconfig includes tier5-bundles-src.
- */
-function cartConsumedByOrder(): Pick<State, "items" | "subtotal" | "emptyText" | "checkoutHint" | "showPaidToast" | "promoCode" | "appliedCode" | "couponId" | "discount"> {
-  return {
-    items: [],
-    subtotal: "",
-    emptyText: "",
-    checkoutHint: copyParam("cart.checkoutPaidMessage", "Order placed. Thanks!"),
-    showPaidToast: true,
-    promoCode: "", appliedCode: "", couponId: "", discount: "",
-  };
-}
-
 let cartPricing: IapCommerce;
 const defineService = withIapPresentation<State>({
   onCreate: commerce => { cartPricing = commerce; },
@@ -544,13 +509,7 @@ const svc = defineService<State, {
         return derive({ ...state, checkoutHint: copyParam("cart.quantityFailedMessage", "Could not update the quantity.") });
       }
     },
-    // Phase 2a — cart checkout collects payment IN-APP through the shared pay rail
-    // (@wix/himalaya/checkout) instead of always bouncing to the hosted checkout:
-    //   createCheckoutFromCurrentCart → ecom.createOrder → payCashierOrder
-    // A wallet-equipped app settles with NO navigation at all; every other app hands
-    // off to the in-app Wix cashier (the previous behaviour), so nothing regresses.
-    // `createOrder` returning no paymentGatewayOrderId means there is nothing to
-    // charge (fully covered / zero total) — the order already stands.
+    // Physical checkout collects shipping before the site's checkout creates the order.
     checkout: async (state) => {
       let validatedLines: WixCartLineItemDetail[] = [];
       const signature = (lines: WixCartLineItemDetail[]) => JSON.stringify(lines.map(line => [line.id, line.quantity, (line as WixCartLineItemDetail & { catalogReference?: Row["catalogReference"] }).catalogReference]));
@@ -577,21 +536,11 @@ const svc = defineService<State, {
         if (!checkout.checkoutId) return derive({ ...state, checkoutHint: copyParam("cart.checkoutIdMissingMessage", "Wix did not return a checkout id.") });
         const checkoutId = checkout.checkoutId;
 
-        // Hosted (Spaces): the site's own checkout page creates the order (RN's
-        // route) — creating it here first fails on a site with no payment method set up, before the
-        // member ever reaches the checkout. The host opens the checkout as the lent member.
         const hosted = isHostedWorker();
-        const order = hosted ? { paymentGatewayOrderId: "" } : await createOrder(checkoutId);
-        const snapshotId = order.paymentGatewayOrderId ?? "";
-        if (!snapshotId && !hosted) {
-          await writeCachedItems([]);
-          return derive({ ...state, ...cartConsumedByOrder() });
-        }
-
         const pay = await payCashierOrder({
           appId: WIX_STORES_APP_ID,
-          snapshotId,
-          msid: await resolveMsid(),
+          snapshotId: "",
+          msid: "",
           mayCharge: async () => {
             const latest = await getCurrentCart();
             if (signature(latest.lineItems ?? []) !== signature(validatedLines)) return false;
@@ -611,19 +560,11 @@ const svc = defineService<State, {
             return redirect.redirectSession?.fullUrl;
           },
         });
-        if (pay.kind === "paid") {
-          // Settled in place — the cart is consumed by the order.
-          await writeCachedItems([]);
-          return derive({ ...state, ...cartConsumedByOrder() });
-        }
         if (pay.kind === "handoff") {
           // Do NOT clear the cart: payment completes in the cashier and the order is
           // only confirmed once it lands, so the cart must survive a bail-out.
           return derive({ ...state, checkoutHint: copyParam("cart.checkoutOpenedMessage", "Checkout opened.") });
         }
-        if (pay.kind === "cancelled") {
-          return derive({ ...state, checkoutHint: copyParam("cart.checkoutCancelledMessage", "Payment cancelled — your cart is still here.") });
-        }
         return derive({ ...state, checkoutHint: copyParam("cart.checkoutFailedMessage", "Checkout could not start.") });
       } catch {
         return derive({ ...state, checkoutHint: copyParam("cart.checkoutFailedMessage", "Checkout could not start.") });

package/templates/beauty-salon-owner/tier5-src/_shared/himi-copy.ts

@@ -54,3 +54,12 @@ export function copyTemplate(key: string, fallback: string, values: Record<strin
     name in values ? String(values[name]) : "",
   );
 }
+
+/** The small ICU plural form used by Bookings spot counts. The provisioned copy may
+ *  translate both branches without adding a second key for the singular. */
+export function copyPlural(key: string, fallback: string, count: number): string {
+  const pattern = copyParam(key, fallback);
+  const match = /^\{n, plural, one \{([^{}]*)\} other \{([^{}]*)\}\}$/.exec(pattern);
+  if (!match) return copyTemplate(key, fallback, { n: count });
+  return (count === 1 ? match[1] : match[2])!.replace(/#/g, String(count));
+}