@paykka/card-checkout-ui 0.11.6 → 0.13.2

package/dist/es/components/NinePay/index.js

@@ -3,18 +3,17 @@ import { useBEM } from "../../hooks/useBEM.js";
 import { CoreContext } from "../../core/context.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import { cssVarPrefix, normalizedClass, formatAmount } from "../../utils/format.js";
+import { normalizedClass, formatAmount } from "../../utils/format.js";
 import { redirectToPayment } from "../../utils/redirect.js";
+import { formatPaymentResult } from "../../utils/payment.js";
 import { isTimeoutError } from "../../api/http.js";
-import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../constant.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../constant.js";
 import { getNinePayInfo, ninePay } from "../../api/modules/nine-pay/index.js";
 import { PayKKaError } from "../../core/error.js";
-import { hidePaymentButton } from "../../config.js";
 import { usePayState } from "../../hooks/usePayState.js";
 import { useRetry } from "../../hooks/useRetry.js";
 import { createEmailCore, EmailField } from "../EmailField/EmailField.js";
-import { createAddressCore } from "../../core/Address.js";
 import { SubmitButton } from "../SubmitButton/index.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
@@ -26,7 +25,6 @@ import { GuideCard } from "../GuideCard/index.js";
 const { bem } = useBEM("nine-pay");
 const fieldClassNames = bem("field");
 const NinePay = w((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
   const {
     session,
     showEmail = false,
@@ -34,7 +32,8 @@ const NinePay = w((props, ref) => {
     redirectMode = "auto",
     core,
     autoQuery,
-    showGuideCard = true
+    showGuideCard = true,
+    hidePaymentButton = false
   } = props;
   F(ref, () => ({
     stopRetry: () => {
@@ -46,26 +45,28 @@ const NinePay = w((props, ref) => {
       startReFetchPayInfo({ timeout });
     },
     updateAddress: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.address.show))
         return;
-      setForm(Object.assign(form, { address: addressState.getAddressState() }));
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressState.getAddressState());
+      const newForm = Object.assign(form, { address: addressCore.getAddressState() });
+      setForm(newForm);
+      (_a = addressFieldRef.current) == null ? void 0 : _a.update(addressCore.getAddressState());
+      validateForm();
     },
     updateEmail: () => {
-      var _a2;
+      var _a;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
-      setForm(Object.assign(form, { email: emailState.email }));
-      form.email = emailState.email;
-      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      const newForm = Object.assign(form, { email: emailState.email });
+      setForm(newForm);
+      (_a = emailFieldRef.current) == null ? void 0 : _a.update(emailState.email);
       validateForm();
     },
     payment: () => {
       hidePaymentButton && onSubmit();
     }
   }));
-  const addressState = createAddressCore();
+  const addressCore = core.getAddressCore();
   const emailState = createEmailCore();
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
@@ -76,13 +77,13 @@ const NinePay = w((props, ref) => {
   const [form, setForm] = h({
     email: "",
     address: {
-      country: "",
-      province: "",
-      city: "",
-      area: "",
-      postCode: "",
-      address1: "",
-      address2: ""
+      country: void 0,
+      province: void 0,
+      city: void 0,
+      area: void 0,
+      postCode: void 0,
+      address1: void 0,
+      address2: void 0
     }
   });
   const [validated, setValidated] = h(false);
@@ -100,33 +101,43 @@ const NinePay = w((props, ref) => {
     }
     setFieldStatus({ ...field });
   };
+  const processOnSuccess = (res) => {
+    var _a, _b;
+    setSubmitButtonStatus("success");
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, formatPaymentResult({
+      ...res,
+      returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
+    }));
+  };
   y(() => {
     if (!sessionReady) {
       return;
     }
-    const { bill = {}, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
-    if (!paymentMethod.includes(PaymentMethod.NINE_PAY)) {
+    const { bill = {}, supportMethods = [], country } = (session == null ? void 0 : session.checkout) || {};
+    if (!supportMethods.includes(PaymentMethod.NINE_PAY)) {
       return;
     }
     setIsCheckoutEnabled(true);
     initFieldStatus();
+    country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
+    form.address.country = country;
     if (autoQuery && core.processingPaymentMethod === PaymentMethod.NINE_PAY) {
       setSubmitButtonStatus("loading");
       startReFetchPayInfo();
     }
   }, [sessionReady]);
   const processOnError = (error) => {
-    var _a2;
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    var _a;
+    (_a = props.onError) == null ? void 0 : _a.call(props, error);
     core.resetEnablePaymentMethod();
   };
   const onTimeout = q(
     (message) => {
-      var _a2;
+      var _a;
       setErrorMsg(message || i18n.get("common.payTimeout"));
       setSubmitButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      (_a = props.onTimeout) == null ? void 0 : _a.call(props);
       core.resetEnablePaymentMethod();
     },
     [i18n, props.onTimeout]
@@ -144,34 +155,49 @@ const NinePay = w((props, ref) => {
       },
       bill: {
         email: form.email,
-        ...form.address,
-        province: addressState.getLabel(form.address.province, addressState.getProvinceOption()) ?? form.address.province,
-        city: addressState.getLabel(form.address.city, addressState.getCityOptions()) ?? form.address.city
+        addressLine1: form.address.address1,
+        addressLine2: form.address.address2,
+        postalCode: form.address.postCode,
+        country: form.address.country,
+        district: form.address.area,
+        state: form.address.province ? addressCore.getLabel(form.address.province, addressCore.getProvinceOption()) ?? form.address.province : void 0,
+        city: form.address.city ? addressCore.getLabel(form.address.city, addressCore.getCityOptions()) ?? form.address.city : void 0
       },
       browser: await getBrowserParams()
     };
   };
   const pay = async (search = false, timeout) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
-      const paymentParams = await getPaymentParams();
       const requestOptions = { locale: i18n.locale, timeout };
-      const res = search ? await getNinePayInfo(
-        { sessionId: session.sessionId, clientKey: session.clientKey },
-        requestOptions
-      ) : await ninePay(paymentParams, props.core, requestOptions);
-      !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res));
-      const { status, orderStatus, errorMessage, errorCode, payInfo } = res;
+      let res = null;
+      if (search) {
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.NINE_PAY);
+        res = await getNinePayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.NINE_PAY
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.NINE_PAY);
+        res = await ninePay(await getPaymentParams(), extraParams, requestOptions);
+      }
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
+      const { status, orderStatus, errorMessage, errorCode, payInfo, sessionId } = res;
+      sessionId && (session.sessionId = sessionId);
       if (status === "PROCESSING") {
         if (!orderStatus) {
           setSubmitButtonStatus("unSubmit");
           return { end: true };
         } else if (orderStatus === "SUCCESS") {
-          setSubmitButtonStatus("success");
-          (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props);
+          processOnSuccess(res);
           return { end: true };
         } else if (orderStatus === "FAILURE") {
-          setErrorMsg(errorMessage);
+          errorMessage && setErrorMsg(errorMessage);
           setSubmitButtonStatus("unSubmit");
           processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           return { end: true };
@@ -187,17 +213,16 @@ const NinePay = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_c2 = props.onTimeout) == null ? void 0 : _c2.call(props);
+          (_f = props.onTimeout) == null ? void 0 : _f.call(props);
           core.resetEnablePaymentMethod();
           return { end: true };
         }
       } else if (status === "SUCCESS") {
-        setSubmitButtonStatus("success");
-        (_d2 = props.onSuccess) == null ? void 0 : _d2.call(props);
+        processOnSuccess(res);
         return { end: true };
       } else if (status === "EXPIRED") {
         setSubmitButtonStatus("unSubmit");
-        (_e2 = props.onExpired) == null ? void 0 : _e2.call(props);
+        (_g = props.onExpired) == null ? void 0 : _g.call(props);
         return { end: true };
       }
       setSubmitButtonStatus("unSubmit");
@@ -212,7 +237,7 @@ const NinePay = w((props, ref) => {
         }
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
-        setErrorMsg(message);
+        message && setErrorMsg(message);
         processOnError(new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         return { end: true };
@@ -220,8 +245,8 @@ const NinePay = w((props, ref) => {
     }
   };
   const validateForm = () => {
-    var _a2;
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
+    var _a;
+    (_a = formRef.current) == null ? void 0 : _a.validate(void 0, false).then(() => {
       setValidated(true);
     }).catch(() => {
       setValidated(false);
@@ -231,12 +256,12 @@ const NinePay = w((props, ref) => {
     validateForm();
   }, [form]);
   const onSubmit = async () => {
-    var _a2;
+    var _a;
     setErrorMsg("");
-    (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
-      var _a3;
-      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressState.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+    (_a = formRef.current) == null ? void 0 : _a.validate(async (errors) => {
+      var _a2;
+      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
+      (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -251,8 +276,8 @@ const NinePay = w((props, ref) => {
     dom && validateForm();
   };
   const Button = () => {
-    var _a2;
-    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    var _a;
+    const transAmount = (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount;
     const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
     const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
@@ -278,24 +303,17 @@ const NinePay = w((props, ref) => {
       }
     ) }) });
   };
-  const formStyle = {
-    [cssVarPrefix("button-bg-color")]: (_a = session == null ? void 0 : session.colors) == null ? void 0 : _a.primary,
-    [cssVarPrefix("button-bg-color-hover")]: (_b = session == null ? void 0 : session.colors) == null ? void 0 : _b.primaryHover,
-    [cssVarPrefix("button-bg-color-active")]: (_c = session == null ? void 0 : session.colors) == null ? void 0 : _c.primaryActive,
-    [cssVarPrefix("button-text-color")]: (_e = (_d = session == null ? void 0 : session.checkout) == null ? void 0 : _d.theme) == null ? void 0 : _e.payButtonTextColor,
-    [cssVarPrefix("input-color")]: (_f = session == null ? void 0 : session.colors) == null ? void 0 : _f.primary
-  };
   const ErrorMessage = () => {
-    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg, style: { marginTop: "12px" } }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
   };
   const Address = () => {
-    var _a2, _b2;
+    var _a, _b;
     return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.address.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
       AddressField,
       {
         ref: addressFieldRef,
         value: form.address,
-        country: ((_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.country) || ((_b2 = session == null ? void 0 : session.checkout) == null ? void 0 : _b2.bill.country),
+        country: ((_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.country) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
         onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
       }
     ) }) });
@@ -305,15 +323,18 @@ const NinePay = w((props, ref) => {
     {
       value: {
         i18n,
-        session
+        session,
+        core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.NINE_PAY }),
-        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
-          ErrorMessage(),
-          !hidePaymentButton && Button()
+          /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
+            ErrorMessage(),
+            !hidePaymentButton && Button()
+          ] })
         ] }) })
       ] })
     }

package/dist/es/components/SecuredFieldsProvider/index.js

@@ -8,7 +8,7 @@ import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { w, A, F, y, q, u } from "../../core.js";
 import { SessionMode } from "../../constant.js";
-import { cdnUrl, cdnOrigin, apiUrl } from "../../config.js";
+import { cdnUrl, cdnOrigin, apiUrl, apiPrefix } from "../../config.js";
 import { MessageAction } from "../../types/message.js";
 import { createIframe, postMessageToIframe } from "../../utils/iframe.js";
 import { safeParse } from "../../utils/index.js";
@@ -21,6 +21,8 @@ var EFieldType = /* @__PURE__ */ ((EFieldType2) => {
 const SECURED_FILED_ATTR = "data-sf";
 const SECURED_IFRAME_CLASS_NAME = "secured-iframe";
 const HIDDEN_IFRAME_NAME = "hidden-pay-iframe";
+const FIELD_IFRAME_NAME = "field-pay-iframe";
+const THREE_DS_IFRAME_NAME = "three-ds-iframe";
 const getFieldElements = (rootNode) => {
   return rootNode ? Array.prototype.slice.call(rootNode.querySelectorAll(`[${SECURED_FILED_ATTR}]`)) : [];
 };
@@ -35,11 +37,12 @@ class SecuredField {
   }
   /** 初始化表单区域iframe */
   init() {
-    const { iframeSrc, iframeClassName, fieldNode } = this.config;
+    const { iframeSrc, iframeClassName, fieldNode, iframeName } = this.config;
     const iframeEl = createIframe(iframeSrc);
     iframeEl.width = "100%";
     iframeEl.height = "100%";
     iframeEl.style.border = "none";
+    iframeEl.name = iframeName;
     fieldNode.appendChild(iframeEl);
     const iframe = fieldNode.querySelector(`.${iframeClassName}`);
     if (!iframe) {
@@ -51,10 +54,12 @@ class SecuredField {
   /** 表单区域iframe加载回调 */
   onFieldIframeLoad() {
     this.iframeWindow = this.iframe.contentWindow;
-    const { fieldType, placeholder, style, hiddenIframeName, supportedCardBrands } = this.config;
+    const { fieldType, placeholder, style, hiddenIframeName, supportedCardBrands, checkoutId } = this.config;
     const data = {
       action: MessageAction.INIT,
+      checkoutId,
       config: {
+        checkoutId,
         fieldType,
         placeholder,
         style,
@@ -68,12 +73,13 @@ class SecuredField {
   }
 }
 const SecuredFieldsProvider = w((props, ref) => {
-  const { sessionMode, i18n, targetElement } = props;
+  const { sessionMode, i18n, targetElement, checkoutId } = props;
   const rootNodeRef = A(null);
   const hiddenIframe = A(null);
   const payment = (formData, extraParams) => {
     const data = {
       action: MessageAction.PAYMENT,
+      checkoutId,
       formData,
       extraParams,
       locale: props.i18n.locale
@@ -102,7 +108,8 @@ const SecuredFieldsProvider = w((props, ref) => {
     validate: () => {
       Object.values(securedFieldMap.current).forEach((field) => {
         const data = {
-          action: MessageAction.VALIDATE
+          action: MessageAction.VALIDATE,
+          checkoutId
         };
         postMessageToIframe(data, field.iframe.contentWindow, cdnOrigin);
       });
@@ -135,7 +142,7 @@ const SecuredFieldsProvider = w((props, ref) => {
   };
   const initHiddenIframe = async () => {
     const iframeEl = createIframe(`${cdnUrl}/secured-iframe.html`);
-    iframeEl.name = `${HIDDEN_IFRAME_NAME}-${Date.now()}`;
+    iframeEl.name = `${HIDDEN_IFRAME_NAME}-${checkoutId}-${Date.now()}`;
     iframeEl.width = "0";
     iframeEl.height = "0";
     iframeEl.style.border = "none";
@@ -143,8 +150,10 @@ const SecuredFieldsProvider = w((props, ref) => {
     const data = {
       action: MessageAction.INIT,
       hidden: true,
+      checkoutId,
       apiUrl,
-      cdnUrl
+      cdnUrl,
+      apiPrefix
     };
     iframeEl.addEventListener("load", () => {
       postMessageToIframe(data, hiddenIframe.current.contentWindow, cdnOrigin);
@@ -160,6 +169,7 @@ const SecuredFieldsProvider = w((props, ref) => {
         hiddenIframeName: hiddenIframe.current.name,
         rootNode: rootNodeRef.current,
         iframeSrc: `${cdnUrl}/secured-iframe.html`,
+        iframeName: `${FIELD_IFRAME_NAME}-${checkoutId}-${Date.now()}`,
         iframeClassName: SECURED_IFRAME_CLASS_NAME,
         fieldType,
         placeholder: securedFieldPlaceholderMap[fieldType],
@@ -170,7 +180,8 @@ const SecuredFieldsProvider = w((props, ref) => {
         onAfterPayment: props.onAfterPayment,
         onPaymentError: props.onPaymentError,
         onPaymentTimeout: props.onPaymentTimeout,
-        onValidStatusChanged: props.onValidStatusChanged
+        onValidStatusChanged: props.onValidStatusChanged,
+        checkoutId
       });
     });
   };
@@ -184,6 +195,10 @@ const SecuredFieldsProvider = w((props, ref) => {
     if (!Reflect.has(feedbackData, "action")) {
       return;
     }
+    console.log(feedbackData, checkoutId);
+    if (feedbackData.checkoutId !== checkoutId) {
+      return;
+    }
     switch (feedbackData.action) {
       case MessageAction.FOCUS:
         (_a = props.onFocus) == null ? void 0 : _a.call(props, feedbackData);
@@ -227,8 +242,10 @@ const SecuredFieldsProvider = w((props, ref) => {
 });
 export {
   EFieldType,
+  FIELD_IFRAME_NAME,
   HIDDEN_IFRAME_NAME,
   SECURED_FILED_ATTR,
   SECURED_IFRAME_CLASS_NAME,
-  SecuredFieldsProvider
+  SecuredFieldsProvider,
+  THREE_DS_IFRAME_NAME
 };