@blocklet/payment-react-headless 1.26.3 → 1.26.5

package/es/checkout/core/customerForm.js

@@ -77,7 +77,7 @@ export function createInitialValues(session, customer) {
     payment_method: "",
     payment_currency: session?.currency_id || "",
     billing_address: {
-      country: customer?.address?.country || "",
+      country: customer?.address?.country || "us",
       state: customer?.address?.state || "",
       city: customer?.address?.city || "",
       line1: customer?.address?.line1 || "",

package/es/checkout/core/index.d.ts

@@ -7,4 +7,4 @@ export { recalculatePromotionIfNeeded, adjustQuantity, performUpsell, performDow
 export { addCrossSellItem, removeCrossSellItem, fetchCrossSellItem } from './crossSell';
 export { parseBillingInterval, type BillingIntervalType, type BillingIntervalOption, type BillingIntervalInfo, } from './billingInterval';
 export { buildFields, createInitialValues, setNestedValue } from './customerForm';
-export { QUOTE_ERROR_CODES, RELAY_SOCKET_PREFIX, getAppId, getRelayChannel, getRelayProtocol, getSocketHost, buildSubmitPayload, isQuoteError, abortStripePayment, submitCheckout, confirmFastCheckout, updateSlippage, } from './submit';
+export { QUOTE_ERROR_CODES, RELAY_SOCKET_PREFIX, getAppId, getRelayChannel, getRelayProtocol, getSocketHost, buildSubmitPayload, isQuoteError, abortStripePayment, submitCheckout, confirmFastCheckout, skipPaymentMethod, updateSlippage, } from './submit';

package/es/checkout/core/index.js

@@ -51,5 +51,6 @@ export {
   abortStripePayment,
   submitCheckout,
   confirmFastCheckout,
+  skipPaymentMethod,
   updateSlippage
 } from "./submit.js";

package/es/checkout/core/submit.d.ts

@@ -34,6 +34,7 @@ export declare function isQuoteError(errorCode: string): boolean;
 export declare function abortStripePayment(sessionId: string): Promise<void>;
 export declare function submitCheckout(sessionId: string, isDonation: boolean, payload: Record<string, unknown>): Promise<Record<string, unknown>>;
 export declare function confirmFastCheckout(sessionId: string): Promise<Record<string, unknown>>;
+export declare function skipPaymentMethod(sessionId: string): Promise<Record<string, unknown>>;
 export declare function updateSlippage(sessionId: string, config: {
     mode: string;
     percent: number;

package/es/checkout/core/submit.js

@@ -58,6 +58,10 @@ export async function confirmFastCheckout(sessionId) {
   const { data } = await api.post(API.FAST_CHECKOUT_CONFIRM(sessionId), {});
   return data;
 }
+export async function skipPaymentMethod(sessionId) {
+  const { data } = await api.post(API.SKIP_PAYMENT_METHOD(sessionId), {});
+  return data;
+}
 export async function updateSlippage(sessionId, config) {
   const { data } = await api.put(API.SLIPPAGE(sessionId), {
     slippage_config: config

package/es/checkout/hooks/useSubmit.d.ts

@@ -29,6 +29,7 @@ export interface UseSubmitReturn {
     reset: () => void;
     stripeConfirm: () => Promise<void>;
     stripeCancel: () => Promise<void>;
+    stripeSkip: () => Promise<void>;
     vendorStatus: VendorOrderStatus | null;
     /** Whether the checkout config is locked (user clicked "Connect and Pay", pending login/submit) */
     locked: boolean;

package/es/checkout/hooks/useSubmit.js

@@ -15,7 +15,8 @@ import {
   isQuoteError,
   abortStripePayment,
   submitCheckout,
-  confirmFastCheckout
+  confirmFastCheckout,
+  skipPaymentMethod
 } from "../core/submit.js";
 export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDonation, formValues, validateForm, refreshSession, updateSessionData) {
   const session = sessionData?.checkoutSession;
@@ -177,7 +178,7 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
       if (clientSecret) {
         const intentType = stripeCtx?.intent_type || "payment_intent";
         setStatus("waiting_stripe");
-        setContext({ type: "stripe", clientSecret, intentType });
+        setContext({ type: "stripe", clientSecret, intentType, noPaymentRequired: !!data.noPaymentRequired });
         return;
       }
       if (data.noPaymentRequired) {
@@ -349,7 +350,11 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
   const execute = useMemoizedFn(async (force = false) => {
     if (!force && status !== "idle") return;
     if (!force) quoteRetryCountRef.current = 0;
-    if (!await validateForm()) return;
+    if (!await validateForm()) {
+      setStatus("failed");
+      setContext({ type: "error", message: "Please complete the required fields", code: "VALIDATION_FAILED" });
+      return;
+    }
     const user = session?.user;
     if (!user?.sourceAppPid) {
       const hasVendorConfig = session?.line_items?.some(
@@ -480,6 +485,24 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
     setStatus("idle");
     setContext(null);
   });
+  const stripeSkip = useMemoizedFn(async () => {
+    if (status !== "waiting_stripe") return;
+    try {
+      setStatus("submitting");
+      const data = await skipPaymentMethod(sessionId);
+      if (!mountedRef.current) return;
+      if (data.skipped || data.checkoutSession?.status === "complete") {
+        await handleCompletion();
+      } else {
+        setStatus("failed");
+        setContext({ type: "error", message: "Failed to skip payment method", code: "SKIP_FAILED" });
+      }
+    } catch (err) {
+      if (!mountedRef.current) return;
+      setStatus("failed");
+      setContext({ type: "error", message: err.message || "Failed to skip payment method", code: "SKIP_FAILED" });
+    }
+  });
   return {
     status,
     context,
@@ -491,6 +514,7 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
     reset,
     stripeConfirm,
     stripeCancel,
+    stripeSkip,
     vendorStatus,
     locked,
     lock

package/es/checkout/types.d.ts

@@ -16,6 +16,7 @@ export type SubmitContext = {
     type: 'stripe';
     clientSecret: string;
     intentType?: 'payment_intent' | 'setup_intent';
+    noPaymentRequired?: boolean;
 } | {
     type: 'did_connect';
     action: string;
@@ -212,6 +213,7 @@ export interface UseCheckoutReturn {
         reset: () => void;
         stripeConfirm: () => Promise<void>;
         stripeCancel: () => Promise<void>;
+        stripeSkip: () => Promise<void>;
         vendorStatus: {
             payment_status: string;
             session_status: string;

package/es/shared/api.d.ts

@@ -33,6 +33,7 @@ export declare const API: {
     readonly CHANGE_AMOUNT: (id: string) => string;
     readonly SLIPPAGE: (id: string) => string;
     readonly ABORT_STRIPE: (id: string) => string;
+    readonly SKIP_PAYMENT_METHOD: (id: string) => string;
     readonly RECALCULATE_PROMOTION_SESSION: (id: string) => string;
     readonly APPLY_PROMOTION: (id: string) => string;
     readonly REMOVE_PROMOTION: (id: string) => string;

package/es/shared/api.js

@@ -73,6 +73,7 @@ export const API = {
   CHANGE_AMOUNT: (id) => `/api/checkout-sessions/${id}/amount`,
   SLIPPAGE: (id) => `/api/checkout-sessions/${id}/slippage`,
   ABORT_STRIPE: (id) => `/api/checkout-sessions/${id}/abort-stripe`,
+  SKIP_PAYMENT_METHOD: (id) => `/api/checkout-sessions/${id}/skip-payment-method`,
   RECALCULATE_PROMOTION_SESSION: (id) => `/api/checkout-sessions/${id}/recalculate-promotion`,
   APPLY_PROMOTION: (id) => `/api/checkout-sessions/${id}/apply-promotion`,
   REMOVE_PROMOTION: (id) => `/api/checkout-sessions/${id}/remove-promotion`,

package/lib/checkout/core/customerForm.js

@@ -76,7 +76,7 @@ function createInitialValues(session, customer) {
     payment_method: "",
     payment_currency: session?.currency_id || "",
     billing_address: {
-      country: customer?.address?.country || "",
+      country: customer?.address?.country || "us",
       state: customer?.address?.state || "",
       city: customer?.address?.city || "",
       line1: customer?.address?.line1 || "",

package/lib/checkout/core/index.d.ts

@@ -7,4 +7,4 @@ export { recalculatePromotionIfNeeded, adjustQuantity, performUpsell, performDow
 export { addCrossSellItem, removeCrossSellItem, fetchCrossSellItem } from './crossSell';
 export { parseBillingInterval, type BillingIntervalType, type BillingIntervalOption, type BillingIntervalInfo, } from './billingInterval';
 export { buildFields, createInitialValues, setNestedValue } from './customerForm';
-export { QUOTE_ERROR_CODES, RELAY_SOCKET_PREFIX, getAppId, getRelayChannel, getRelayProtocol, getSocketHost, buildSubmitPayload, isQuoteError, abortStripePayment, submitCheckout, confirmFastCheckout, updateSlippage, } from './submit';
+export { QUOTE_ERROR_CODES, RELAY_SOCKET_PREFIX, getAppId, getRelayChannel, getRelayProtocol, getSocketHost, buildSubmitPayload, isQuoteError, abortStripePayment, submitCheckout, confirmFastCheckout, skipPaymentMethod, updateSlippage, } from './submit';

package/lib/checkout/core/index.js

@@ -273,6 +273,12 @@ Object.defineProperty(exports, "setNestedValue", {
     return _customerForm.setNestedValue;
   }
 });
+Object.defineProperty(exports, "skipPaymentMethod", {
+  enumerable: true,
+  get: function () {
+    return _submit.skipPaymentMethod;
+  }
+});
 Object.defineProperty(exports, "submitCheckout", {
   enumerable: true,
   get: function () {

package/lib/checkout/core/submit.d.ts

@@ -34,6 +34,7 @@ export declare function isQuoteError(errorCode: string): boolean;
 export declare function abortStripePayment(sessionId: string): Promise<void>;
 export declare function submitCheckout(sessionId: string, isDonation: boolean, payload: Record<string, unknown>): Promise<Record<string, unknown>>;
 export declare function confirmFastCheckout(sessionId: string): Promise<Record<string, unknown>>;
+export declare function skipPaymentMethod(sessionId: string): Promise<Record<string, unknown>>;
 export declare function updateSlippage(sessionId: string, config: {
     mode: string;
     percent: number;

package/lib/checkout/core/submit.js

@@ -13,6 +13,7 @@ exports.getRelayProtocol = getRelayProtocol;
 exports.getSessionFingerprint = getSessionFingerprint;
 exports.getSocketHost = getSocketHost;
 exports.isQuoteError = isQuoteError;
+exports.skipPaymentMethod = skipPaymentMethod;
 exports.submitCheckout = submitCheckout;
 exports.updateSlippage = updateSlippage;
 var _api = _interopRequireWildcard(require("../../shared/api"));
@@ -74,6 +75,12 @@ async function confirmFastCheckout(sessionId) {
   } = await _api.default.post(_api.API.FAST_CHECKOUT_CONFIRM(sessionId), {});
   return data;
 }
+async function skipPaymentMethod(sessionId) {
+  const {
+    data
+  } = await _api.default.post(_api.API.SKIP_PAYMENT_METHOD(sessionId), {});
+  return data;
+}
 async function updateSlippage(sessionId, config) {
   const {
     data

package/lib/checkout/hooks/useSubmit.d.ts

@@ -29,6 +29,7 @@ export interface UseSubmitReturn {
     reset: () => void;
     stripeConfirm: () => Promise<void>;
     stripeCancel: () => Promise<void>;
+    stripeSkip: () => Promise<void>;
     vendorStatus: VendorOrderStatus | null;
     /** Whether the checkout config is locked (user clicked "Connect and Pay", pending login/submit) */
     locked: boolean;

package/lib/checkout/hooks/useSubmit.js

@@ -178,7 +178,8 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
         setContext({
           type: "stripe",
           clientSecret,
-          intentType
+          intentType,
+          noPaymentRequired: !!data.noPaymentRequired
         });
         return;
       }
@@ -357,7 +358,15 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
   const execute = (0, _ahooks.useMemoizedFn)(async (force = false) => {
     if (!force && status !== "idle") return;
     if (!force) quoteRetryCountRef.current = 0;
-    if (!(await validateForm())) return;
+    if (!(await validateForm())) {
+      setStatus("failed");
+      setContext({
+        type: "error",
+        message: "Please complete the required fields",
+        code: "VALIDATION_FAILED"
+      });
+      return;
+    }
     const user = session?.user;
     if (!user?.sourceAppPid) {
       const hasVendorConfig = session?.line_items?.some(item => !!item?.price?.product?.vendor_config?.length);
@@ -493,6 +502,32 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
     setStatus("idle");
     setContext(null);
   });
+  const stripeSkip = (0, _ahooks.useMemoizedFn)(async () => {
+    if (status !== "waiting_stripe") return;
+    try {
+      setStatus("submitting");
+      const data = await (0, _submit.skipPaymentMethod)(sessionId);
+      if (!mountedRef.current) return;
+      if (data.skipped || data.checkoutSession?.status === "complete") {
+        await handleCompletion();
+      } else {
+        setStatus("failed");
+        setContext({
+          type: "error",
+          message: "Failed to skip payment method",
+          code: "SKIP_FAILED"
+        });
+      }
+    } catch (err) {
+      if (!mountedRef.current) return;
+      setStatus("failed");
+      setContext({
+        type: "error",
+        message: err.message || "Failed to skip payment method",
+        code: "SKIP_FAILED"
+      });
+    }
+  });
   return {
     status,
     context,
@@ -504,6 +539,7 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
     reset,
     stripeConfirm,
     stripeCancel,
+    stripeSkip,
     vendorStatus,
     locked,
     lock

package/lib/checkout/types.d.ts

@@ -16,6 +16,7 @@ export type SubmitContext = {
     type: 'stripe';
     clientSecret: string;
     intentType?: 'payment_intent' | 'setup_intent';
+    noPaymentRequired?: boolean;
 } | {
     type: 'did_connect';
     action: string;
@@ -212,6 +213,7 @@ export interface UseCheckoutReturn {
         reset: () => void;
         stripeConfirm: () => Promise<void>;
         stripeCancel: () => Promise<void>;
+        stripeSkip: () => Promise<void>;
         vendorStatus: {
             payment_status: string;
             session_status: string;

package/lib/shared/api.d.ts

@@ -33,6 +33,7 @@ export declare const API: {
     readonly CHANGE_AMOUNT: (id: string) => string;
     readonly SLIPPAGE: (id: string) => string;
     readonly ABORT_STRIPE: (id: string) => string;
+    readonly SKIP_PAYMENT_METHOD: (id: string) => string;
     readonly RECALCULATE_PROMOTION_SESSION: (id: string) => string;
     readonly APPLY_PROMOTION: (id: string) => string;
     readonly REMOVE_PROMOTION: (id: string) => string;

package/lib/shared/api.js

@@ -80,6 +80,7 @@ const API = exports.API = {
   CHANGE_AMOUNT: id => `/api/checkout-sessions/${id}/amount`,
   SLIPPAGE: id => `/api/checkout-sessions/${id}/slippage`,
   ABORT_STRIPE: id => `/api/checkout-sessions/${id}/abort-stripe`,
+  SKIP_PAYMENT_METHOD: id => `/api/checkout-sessions/${id}/skip-payment-method`,
   RECALCULATE_PROMOTION_SESSION: id => `/api/checkout-sessions/${id}/recalculate-promotion`,
   APPLY_PROMOTION: id => `/api/checkout-sessions/${id}/apply-promotion`,
   REMOVE_PROMOTION: id => `/api/checkout-sessions/${id}/remove-promotion`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react-headless",
-  "version": "1.26.3",
+  "version": "1.26.5",
   "description": "Headless React hooks for payment-kit checkout",
   "keywords": [
     "react",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@arcblock/ws": "^1.28.5",
     "@blocklet/js-sdk": "workspace:*",
-    "@blocklet/payment-types": "1.26.3",
+    "@blocklet/payment-types": "1.26.5",
     "@ocap/util": "^1.28.5",
     "ahooks": "^3.8.5",
     "google-libphonenumber": "^3.2.42",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "18c5d045139c572b52465e15c4c63b3e327efab5"
+  "gitHead": "2d208818d218494407989dd8cd460ab51d075952"
 }

package/src/checkout/core/customerForm.ts

@@ -92,7 +92,7 @@ export function createInitialValues(
     payment_method: '',
     payment_currency: session?.currency_id || '',
     billing_address: {
-      country: customer?.address?.country || '',
+      country: customer?.address?.country || 'us',
       state: customer?.address?.state || '',
       city: customer?.address?.city || '',
       line1: customer?.address?.line1 || '',

package/src/checkout/core/index.ts

@@ -56,5 +56,6 @@ export {
   abortStripePayment,
   submitCheckout,
   confirmFastCheckout,
+  skipPaymentMethod,
   updateSlippage,
 } from './submit';

package/src/checkout/core/submit.ts

@@ -98,6 +98,11 @@ export async function confirmFastCheckout(sessionId: string): Promise<Record<str
   return data;
 }
 
+export async function skipPaymentMethod(sessionId: string): Promise<Record<string, unknown>> {
+  const { data } = await api.post(API.SKIP_PAYMENT_METHOD(sessionId), {});
+  return data;
+}
+
 export async function updateSlippage(
   sessionId: string,
   config: { mode: string; percent: number }

package/src/checkout/hooks/useSubmit.ts

@@ -22,6 +22,7 @@ import {
   abortStripePayment,
   submitCheckout,
   confirmFastCheckout,
+  skipPaymentMethod,
 } from '../core/submit';
 
 export interface VendorStatus {
@@ -55,6 +56,7 @@ export interface UseSubmitReturn {
   reset: () => void;
   stripeConfirm: () => Promise<void>;
   stripeCancel: () => Promise<void>;
+  stripeSkip: () => Promise<void>;
   vendorStatus: VendorOrderStatus | null;
   /** Whether the checkout config is locked (user clicked "Connect and Pay", pending login/submit) */
   locked: boolean;
@@ -293,7 +295,7 @@ export function useSubmit(
       if (clientSecret) {
         const intentType = (stripeCtx?.intent_type || 'payment_intent') as 'payment_intent' | 'setup_intent';
         setStatus('waiting_stripe');
-        setContext({ type: 'stripe', clientSecret, intentType });
+        setContext({ type: 'stripe', clientSecret, intentType, noPaymentRequired: !!data.noPaymentRequired });
         return;
       }
 
@@ -510,7 +512,11 @@ export function useSubmit(
     // Reset quote retry counter on fresh user-initiated submit
     if (!force) quoteRetryCountRef.current = 0;
 
-    if (!(await validateForm())) return;
+    if (!(await validateForm())) {
+      setStatus('failed');
+      setContext({ type: 'error', message: 'Please complete the required fields', code: 'VALIDATION_FAILED' });
+      return;
+    }
 
     // Vendor account validation
     const user = (session as CheckoutSessionRuntime | undefined)?.user;
@@ -678,6 +684,26 @@ export function useSubmit(
     setContext(null);
   });
 
+  // Stripe skip — user chose "Skip, bind later" for $0 subscription
+  const stripeSkip = useMemoizedFn(async () => {
+    if (status !== 'waiting_stripe') return;
+    try {
+      setStatus('submitting');
+      const data = await skipPaymentMethod(sessionId);
+      if (!mountedRef.current) return;
+      if (data.skipped || (data.checkoutSession as Record<string, unknown> | undefined)?.status === 'complete') {
+        await handleCompletion();
+      } else {
+        setStatus('failed');
+        setContext({ type: 'error', message: 'Failed to skip payment method', code: 'SKIP_FAILED' });
+      }
+    } catch (err: any) {
+      if (!mountedRef.current) return;
+      setStatus('failed');
+      setContext({ type: 'error', message: err.message || 'Failed to skip payment method', code: 'SKIP_FAILED' });
+    }
+  });
+
   return {
     status,
     context,
@@ -689,6 +715,7 @@ export function useSubmit(
     reset,
     stripeConfirm,
     stripeCancel,
+    stripeSkip,
     vendorStatus,
     locked,
     lock,

package/src/checkout/types.ts

@@ -26,7 +26,12 @@ export type SubmitContext =
   | { type: 'price_change'; changePercent: number }
   | { type: 'fast_pay'; payType: 'balance' | 'delegation' | 'credit'; amount: string; payer: string }
   | { type: 'credit_insufficient'; available: string; required: string }
-  | { type: 'stripe'; clientSecret: string; intentType?: 'payment_intent' | 'setup_intent' }
+  | {
+      type: 'stripe';
+      clientSecret: string;
+      intentType?: 'payment_intent' | 'setup_intent';
+      noPaymentRequired?: boolean;
+    }
   | { type: 'did_connect'; action: string; checkpointId: string; extraParams: Record<string, unknown> }
   | { type: 'error'; message: string; code?: string }
   | { type: 'service_suspended' }
@@ -235,6 +240,7 @@ export interface UseCheckoutReturn {
     reset: () => void;
     stripeConfirm: () => Promise<void>;
     stripeCancel: () => Promise<void>;
+    stripeSkip: () => Promise<void>;
     vendorStatus: {
       payment_status: string;
       session_status: string;

package/src/shared/api.ts

@@ -110,6 +110,7 @@ export const API = {
   CHANGE_AMOUNT: (id: string) => `/api/checkout-sessions/${id}/amount`,
   SLIPPAGE: (id: string) => `/api/checkout-sessions/${id}/slippage`,
   ABORT_STRIPE: (id: string) => `/api/checkout-sessions/${id}/abort-stripe`,
+  SKIP_PAYMENT_METHOD: (id: string) => `/api/checkout-sessions/${id}/skip-payment-method`,
   RECALCULATE_PROMOTION_SESSION: (id: string) => `/api/checkout-sessions/${id}/recalculate-promotion`,
   APPLY_PROMOTION: (id: string) => `/api/checkout-sessions/${id}/apply-promotion`,
   REMOVE_PROMOTION: (id: string) => `/api/checkout-sessions/${id}/remove-promotion`,