@paykka/card-checkout-ui 0.8.0 → 0.11.2

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

@@ -371,6 +371,7 @@ const FieldIframe = (props) => {
       value: value.current,
       fieldType: props.fieldType
     };
+    console.log(hiddenIframe, props.hiddenIframeName);
     postMessageToIframe(validWithValueData, hiddenIframe, cdnOrigin);
   };
   const sendActivatedMessage = () => {
@@ -409,6 +410,7 @@ const HiddenIframe = () => {
   const onReceiveMessage = async (event) => {
     const { data } = event;
     const parsedData = safeParse(data);
+    console.log(parsedData);
     if (!Reflect.has(parsedData, "action")) {
       return;
     }
@@ -417,22 +419,50 @@ const HiddenIframe = () => {
       switch (feedbackData.fieldType) {
         case EFieldType.CVV: {
           formData.cvv = feedbackData.value;
+          setMessageList([
+            ...messageList,
+            {
+              name: "CVV",
+              label: `收到值：${feedbackData.value}`
+            }
+          ]);
           break;
         }
         case EFieldType.CARD_NUMBER: {
           formData.cardNo = trimAll(feedbackData.value);
+          setMessageList([
+            ...messageList,
+            {
+              name: "卡号",
+              label: `收到值：${feedbackData.value}`
+            }
+          ]);
           break;
         }
         case EFieldType.EXPIRE_DATE: {
           const [expMonth, expYear] = feedbackData.value.split("/");
           formData.expMonth = expMonth;
           formData.expYear = `20${expYear}`;
+          setMessageList([
+            ...messageList,
+            {
+              name: "卡有效期",
+              label: `收到值：${feedbackData.value}`
+            }
+          ]);
           break;
         }
       }
     } else if (parsedData.action === MessageAction.PAYMENT) {
       const feedbackData = parsedData;
-      pay(feedbackData.formData, feedbackData.locale);
+      pay(feedbackData.formData, feedbackData.locale, feedbackData.extraParams);
+      setMessageList([
+        ...messageList,
+        {
+          name: "表单组件",
+          label: `进行支付，${JSON.stringify(formData || {})}`
+        }
+      ]);
     } else if (parsedData.action === MessageAction.ENCRYPT_CARD) {
       const feedbackData = parsedData;
       try {
@@ -442,10 +472,15 @@ const HiddenIframe = () => {
         console.log("error", error);
         sendCardEncryptionFailedMessage(error);
       }
+    } else if (parsedData.action === MessageAction.DEBUG_MODE) {
+      console.log("hidden iframe 开启测试模式");
     }
   };
-  window.addEventListener("message", onReceiveMessage);
-  const pay = (params, locale) => {
+  y(() => {
+    console.log("hidden iframe 加载完成");
+    window.addEventListener("message", onReceiveMessage);
+  }, []);
+  const pay = (params, locale, extraParams) => {
     cardPay(
       {
         ...params,
@@ -454,6 +489,7 @@ const HiddenIframe = () => {
           ...formData
         }
       },
+      extraParams,
       { locale }
     ).then(sendAfterPaymentMessage).catch((error) => {
       if (isTimeoutError(error)) {
@@ -509,7 +545,24 @@ const HiddenIframe = () => {
   y(() => {
     sendHiddenIframeReadyMessage();
   }, []);
-  return /* @__PURE__ */ u(b, {});
+  const [messageList, setMessageList] = h([]);
+  const messageListRef = A(null);
+  y(() => {
+    if (messageListRef.current) {
+      messageListRef.current.scrollTop = messageListRef.current.scrollHeight;
+    }
+  }, [messageList]);
+  return /* @__PURE__ */ u(b, { children: /* @__PURE__ */ u("div", { style: "width: 100%; height: 100%; overflow-y: auto", ref: messageListRef, children: messageList.map((message) => /* @__PURE__ */ u("div", { style: { fontSize: "18px", marginBottom: "4px" }, children: [
+    /* @__PURE__ */ u("span", { style: { color: "#4f43df" }, children: [
+      "[",
+      message.name,
+      "]"
+    ] }),
+    /* @__PURE__ */ u("span", { children: [
+      ": ",
+      message.label
+    ] })
+  ] })) }) });
 };
 const SecuredIframe = () => {
   const [fieldIframeConfig, setFieldIframeConfig] = h();

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

@@ -2,7 +2,6 @@ import { w, A, h, F, y, q, u } from "../../core.js";
 import { createAddressCore } from "../../core/Address.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { CoreContext } from "../../core/context.js";
-import { isUndefined } from "../../utils/is.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { cssVarPrefix, normalizedClass, formatAmount, trimAll } from "../../utils/format.js";
@@ -30,7 +29,7 @@ const Sepa = w((props, ref) => {
   const { session } = props;
   let addressState = createAddressCore();
   let emailState = createEmailCore();
-  const { i18n, sessionReady } = usePayState(session);
+  const { i18n, sessionReady } = usePayState(session, props.core);
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
   const formRef = A(null);
@@ -89,12 +88,10 @@ const Sepa = w((props, ref) => {
     });
   }, []);
   const Button = () => {
-    const { transAmount } = (session == null ? void 0 : session.checkout) ?? {};
-    let { symbol = "", amount = "", digits } = transAmount ?? {};
-    let amountStr = "";
-    if (amount && !isUndefined(digits))
-      amountStr = formatAmount(+amount, digits);
-    const text = i18n.get("common.pay") + (Number(amount) ? ` ${symbol}${amountStr}` : "");
+    var _a2;
+    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
+    const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
       SubmitButton,
       {
@@ -179,7 +176,7 @@ const Sepa = w((props, ref) => {
       const res = search ? await getSepaPayInfo(
         { sessionId: session.sessionId, clientKey: session.clientKey },
         options
-      ) : await sepaPay(paymentParams, options);
+      ) : await sepaPay(paymentParams, props.core, options);
       return processAfterPayment(res, search);
     } catch (error) {
       if (isTimeoutError(error)) {
@@ -204,6 +201,7 @@ const Sepa = w((props, ref) => {
     if (status === "PROCESSING") {
       if (!orderStatus) {
         setSubmitButtonStatus("unSubmit");
+        return { end: true };
       } else if (orderStatus === "SUCCESS") {
         setSubmitButtonStatus("success");
         processOnSuccess();
@@ -233,7 +231,6 @@ const Sepa = w((props, ref) => {
       return { end: true };
     }
     setSubmitButtonStatus("unSubmit");
-    processOnSuccess();
     return { end: true };
   };
   const processOnSuccess = () => {

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

@@ -0,0 +1,324 @@
+import { w, F, A, h, y, q, u, b } from "../../core.js";
+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 { redirectToPayment } from "../../utils/redirect.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 { getShopeePayInfo, shopeePay } from "../../api/modules/shopee-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";
+import "../internal/Form/FormItem.js";
+import { Form } from "../internal/Form/Form.js";
+import { AddressField } from "../AddressField/index.js";
+import { Info } from "../internal/Info/Info.js";
+import { GuideCard } from "../GuideCard/index.js";
+const { bem } = useBEM("shopee-pay");
+const fieldClassNames = bem("field");
+const ShopeePay = w((props, ref) => {
+  var _a, _b, _c, _d, _e, _f;
+  const {
+    session,
+    showEmail = false,
+    showAddress = false,
+    redirectMode = "auto",
+    core,
+    autoQuery = true,
+    showGuideCard = true
+  } = props;
+  F(ref, () => ({
+    stopRetry: () => {
+      setSubmitButtonStatus("unSubmit");
+      stopReFetchPayInfo();
+    },
+    startRetry: (timeout) => {
+      setSubmitButtonStatus("loading");
+      startReFetchPayInfo({ timeout });
+    },
+    updateAddress: () => {
+      var _a2;
+      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());
+    },
+    updateEmail: () => {
+      var _a2;
+      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);
+      validateForm();
+    },
+    payment: () => {
+      hidePaymentButton && onSubmit();
+    }
+  }));
+  const addressState = createAddressCore();
+  const emailState = createEmailCore();
+  const addressFieldRef = A(null);
+  const emailFieldRef = A(null);
+  const [isCheckoutEnabled, setIsCheckoutEnabled] = h(false);
+  const { setErrorMsg, i18n, errorMsg, sessionReady } = usePayState(session, props.core);
+  const [submitButtonStatus, setSubmitButtonStatus] = h("unSubmit");
+  const formRef = A(null);
+  const [form, setForm] = h({
+    email: "",
+    address: {
+      country: "",
+      province: "",
+      city: "",
+      area: "",
+      postCode: "",
+      address1: "",
+      address2: ""
+    }
+  });
+  const [validated, setValidated] = h(false);
+  const [fieldStatus, setFieldStatus] = h();
+  const initFieldStatus = () => {
+    const { field, sessionMode } = session.checkout;
+    const { email, address } = field;
+    if (sessionMode === SessionMode.COMPONENT) {
+      if (email.disabled) {
+        email.show = showEmail;
+      }
+      if (showAddress && !(address == null ? void 0 : address.show)) {
+        address.show = true;
+      }
+    }
+    setFieldStatus({ ...field });
+  };
+  y(() => {
+    if (!sessionReady) {
+      return;
+    }
+    const { bill = {}, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
+    if (!paymentMethod.includes(PaymentMethod.SHOPEE_PAY)) {
+      return;
+    }
+    initFieldStatus();
+    setIsCheckoutEnabled(true);
+    form.email = bill.email ?? "";
+    if (autoQuery && core.processingPaymentMethod === PaymentMethod.SHOPEE_PAY) {
+      setSubmitButtonStatus("loading");
+      startReFetchPayInfo();
+    }
+  }, [sessionReady]);
+  const processOnError = (error) => {
+    var _a2;
+    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
+    core.resetEnablePaymentMethod();
+  };
+  const onTimeout = q(
+    (message) => {
+      var _a2;
+      setErrorMsg(message || i18n.get("common.payTimeout"));
+      setSubmitButtonStatus("unSubmit");
+      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props);
+      core.resetEnablePaymentMethod();
+    },
+    [i18n, props.onTimeout]
+  );
+  const { start: startReFetchPayInfo, stop: stopReFetchPayInfo } = useRetry(
+    (timeout) => pay(true, timeout),
+    { onTimeout: () => onTimeout(i18n.get("common.queryTimeout")) }
+  );
+  const getPaymentParams = async () => {
+    return {
+      sessionId: session.sessionId,
+      clientKey: session.clientKey,
+      payment: {
+        paymentMethod: PaymentMethod.SHOPEE_PAY
+      },
+      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
+      },
+      browser: await getBrowserParams()
+    };
+  };
+  const pay = async (search = false, timeout) => {
+    var _a2, _b2, _c2, _d2, _e2;
+    try {
+      const paymentParams = await getPaymentParams();
+      const requestOptions = { locale: i18n.locale, timeout };
+      const res = search ? await getShopeePayInfo(
+        { sessionId: session.sessionId, clientKey: session.clientKey },
+        requestOptions
+      ) : await shopeePay(paymentParams, props.core, requestOptions);
+      !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res));
+      const { status, orderStatus, errorMessage, errorCode, payInfo } = res;
+      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);
+          return { end: true };
+        } else if (orderStatus === "FAILURE") {
+          setErrorMsg(errorMessage);
+          setSubmitButtonStatus("unSubmit");
+          processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          return { end: true };
+        } else if (orderStatus === "PROCESSING") {
+          if (!search) {
+            if (redirectMode === "auto" && payInfo) {
+              redirectToPayment(payInfo);
+              return { end: true };
+            } else {
+              startReFetchPayInfo();
+            }
+          }
+          return { end: false };
+        } else if (orderStatus === "CANCELED") {
+          setSubmitButtonStatus("unSubmit");
+          (_c2 = props.onTimeout) == null ? void 0 : _c2.call(props);
+          core.resetEnablePaymentMethod();
+          return { end: true };
+        }
+      } else if (status === "SUCCESS") {
+        setSubmitButtonStatus("success");
+        (_d2 = props.onSuccess) == null ? void 0 : _d2.call(props);
+        return { end: true };
+      } else if (status === "EXPIRED") {
+        setSubmitButtonStatus("unSubmit");
+        (_e2 = props.onExpired) == null ? void 0 : _e2.call(props);
+        return { end: true };
+      }
+      setSubmitButtonStatus("unSubmit");
+      return { end: true };
+    } catch (error) {
+      if (isTimeoutError(error)) {
+        if (search) {
+          return { end: false };
+        } else {
+          onTimeout();
+          return { end: true };
+        }
+      } else {
+        const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
+        setErrorMsg(message);
+        processOnError(new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        setSubmitButtonStatus("unSubmit");
+        return { end: true };
+      }
+    }
+  };
+  const validateForm = () => {
+    var _a2;
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
+      setValidated(true);
+    }).catch(() => {
+      setValidated(false);
+    });
+  };
+  y(() => {
+    validateForm();
+  }, [form]);
+  const onSubmit = async () => {
+    var _a2;
+    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);
+      if (errors) {
+        setSubmitButtonStatus("unSubmit");
+        return;
+      }
+      setErrorMsg("");
+      setSubmitButtonStatus("loading");
+      await pay();
+    });
+  };
+  const setFormRef = (dom) => {
+    formRef.current = dom;
+    dom && validateForm();
+  };
+  const Button = () => {
+    var _a2;
+    const transAmount = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.transAmount;
+    const amountText = (transAmount == null ? void 0 : transAmount.amount) ? formatAmount(transAmount).jointSymbol() : "";
+    const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
+    return /* @__PURE__ */ u(
+      SubmitButton,
+      {
+        className: bem("button"),
+        status: submitButtonStatus,
+        text,
+        loadingText: i18n.get("common.payProcessing"),
+        successText: i18n.get("common.paySuccess"),
+        onClick: onSubmit,
+        verified: validated
+      }
+    );
+  };
+  const Email = () => {
+    return /* @__PURE__ */ u(b, { children: (fieldStatus == null ? void 0 : fieldStatus.email.show) && /* @__PURE__ */ u("div", { className: fieldClassNames, children: /* @__PURE__ */ u(
+      EmailField,
+      {
+        ref: emailFieldRef,
+        value: form.email,
+        disabled: fieldStatus == null ? void 0 : fieldStatus.email.disabled
+      }
+    ) }) });
+  };
+  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" } }) });
+  };
+  const Address = () => {
+    var _a2, _b2;
+    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),
+        onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
+      }
+    ) }) });
+  };
+  return /* @__PURE__ */ u(
+    CoreContext.Provider,
+    {
+      value: {
+        i18n,
+        session
+      },
+      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
+        showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.SHOPEE_PAY }),
+        /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), style: formStyle, children: [
+          Email(),
+          Address(),
+          ErrorMessage(),
+          !hidePaymentButton && Button()
+        ] }) })
+      ] })
+    }
+  );
+});
+export {
+  ShopeePay
+};

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

@@ -4,12 +4,13 @@ import "../../core/context.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { normalizedClass } from "../../utils/format.js";
+import "../../api/http.js";
 import enGB from "../../i18n/locales/en-GB.js";
 import { Button } from "../internal/Button/Button.js";
 import { IconSafe } from "../internal/icons/IconSafe.js";
 import { LoadingCheck } from "../internal/LoadingCheck/LoadingCheck.js";
 const { bem } = useBEM("submit-button");
-function SubmitButton(props) {
+const SubmitButton = (props) => {
   const {
     text = enGB["common.pay"],
     loadingText = enGB["common.payProcessing"],
@@ -36,37 +37,23 @@ function SubmitButton(props) {
     );
   };
   y(() => {
-    if (status === "success") {
+    if (status === "success")
       return;
-    }
     setContent(status === "loading" ? loadingText : text);
-  }, [status]);
+  }, [status, text]);
   return /* @__PURE__ */ u(
     Button,
     {
       icon: Icon(),
       onClick,
-      className: normalizedClass(
-        bem({
-          success: status === "success"
-        }),
-        className
-      ),
+      className: normalizedClass(bem({ success: status === "success" }), className),
       style,
       loading: status === "loading",
       disabled: props.disabled || status === "success",
-      children: /* @__PURE__ */ u(
-        "span",
-        {
-          class: bem("text", {
-            "not-verified": !props.verified
-          }),
-          children: content
-        }
-      )
+      children: /* @__PURE__ */ u("span", { class: bem("text", { "not-verified": !props.verified }), children: content })
     }
   );
-}
+};
 export {
   SubmitButton
 };