@paykka/card-checkout-ui 0.13.16 → 0.14.0

package/dist/es/components/wallets/Zalopay/Zalopay.js

@@ -1,323 +1,155 @@
-import { w, F, A, h, y, q, u, b } from "../../../core.js";
+import { w, F, A, h, y, 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 { isMobile } from "../../../utils/system-info/get-system-info.js";
 import { normalizedClass, formatAmount } from "../../../utils/format.js";
-import { redirectToPayment } from "../../../utils/redirect.js";
-import { processPaymentStatus } from "../../../utils/payment.js";
-import { isTimeoutError } from "../../../api/http.js";
-import { getBrowserParams } from "../../../api/modules/get-browser-params.js";
-import { PaymentCategory, COMMON_CLASS_NAME, PaymentMethod, SessionMode } from "../../../constant.js";
-import { getZalopayPayInfo, zalopayPay } from "../../../api/modules/zalopay/index.js";
-import { PayKKaError } from "../../../core/error.js";
+import { PaymentMethod, PaymentCategory, COMMON_CLASS_NAME } from "../../../constant.js";
 import "../../../out/worldpay-jsc-origin.js";
 import { usePayState } from "../../../hooks/usePayState.js";
-import { useRetry } from "../../../hooks/useRetry.js";
-import { usePaymentStatus } from "../../../hooks/usePayment.js";
+import { useBaseWallet } from "../../../hooks/useBaseWallet.js";
 import { createEmailCore, EmailField } from "../../EmailField/EmailField.js";
-import { SubmitButton } from "../../SubmitButton/index.js";
 import { GuideCard } from "../../GuideCard/index.js";
-import { AddressField } from "../../AddressField/index.js";
+import { DEFAULT_ADDRESS, AddressField } from "../../AddressField/index.js";
 import { Info } from "../../internal/Info/Info.js";
 import "../../internal/Form/type.js";
 import "../../internal/Form/context.js";
 import "../../internal/Form/FormItem.js";
 import { Form } from "../../internal/Form/Form.js";
 import { QRCodeModal } from "../../business/QRCodeModal/QRCodeModal.js";
+import "../../internal/Input/Input.js";
+import "../../internal/Input/type.js";
+import "../../internal/Select/Select.js";
+import "../../business/PhoneField/config.js";
+import "../../business/PhoneField/phone-field.js";
 import { IconZalopayComplete } from "../../internal/icons/IconZalopayComplete.js";
+import "../../business/Tooltip/tooltip2.js";
+import "../../business/BlikCodeField/blik-code-field.js";
+import "../../internal/Button/button2.js";
+import "../../internal/Modal/Modal.js";
+import "../../business/BlikConfirmModal/blik-confirm-modal.js";
+import "../../internal/LoadingCheck/loading-check.js";
 import "./zalopay2.js";
+import { PaymentButton } from "../../PaymentButton/index.js";
 const { bem } = useBEM("zalopay");
 const fieldClassNames = bem("field");
+const CURR_PAYMENT_METHOD = PaymentMethod.ZALOPAY;
 const Zalopay = w((props, ref) => {
   var _a;
   const {
     session,
-    showEmail = false,
-    showAddress = false,
     core,
-    redirectMode = "auto",
-    autoQuery = true,
     showGuideCard = true,
-    enableQRCodeModal = true,
     hidePaymentButton = false
   } = props;
   F(ref, () => ({
-    stopRetry: () => {
-      setPaymentButtonStatus("unSubmit");
-      stopReFetchPayInfo();
-    },
-    startRetry: (timeout) => {
-      setPaymentButtonStatus("loading");
-      startReFetchPayInfo({ timeout });
-    },
+    stopRetry: () => stopRetry(),
+    startRetry: (timeout) => startRetry(timeout),
     updateAddress: () => {
       var _a2;
       if (!(fieldStatus == null ? void 0 : fieldStatus.address.show))
         return;
-      const newForm = Object.assign(form, { address: addressCore.getAddressState() });
-      setForm(newForm);
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
-      validateForm();
+      const address = addressCore.getAddressState();
+      form.address = address;
+      setForm(form);
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(address);
+      validateFormSilently();
     },
     updateEmail: () => {
       var _a2;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
-      const newForm = Object.assign(form, { email: emailState.email });
-      setForm(newForm);
+      form.email = emailState.email;
+      setForm(form);
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
-      validateForm();
+      validateFormSilently();
     },
     payment: () => {
       hidePaymentButton && onSubmit();
     }
   }));
+  const {
+    isEnabled,
+    fieldStatus,
+    paymentButtonStatus,
+    setPaymentButtonStatus,
+    errorMessage,
+    setErrorMessage,
+    payment,
+    startRetry,
+    stopRetry,
+    showQRCodeModal,
+    qrCodeInfo,
+    processCloseQRCodeModal,
+    getPaymentMethodContext
+  } = useBaseWallet(CURR_PAYMENT_METHOD, props, {
+    retryTimeout: 10 * 60 * 1e3,
+    supportQRCodeModal: true,
+    getFormData: () => {
+      return {
+        ...form
+      };
+    }
+  });
   const addressCore = core.getAddressCore();
   const emailState = createEmailCore();
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
-  const [isCheckoutEnabled, setIsCheckoutEnabled] = h(false);
-  const { i18n, fraudDetection, sessionReady } = usePayState(session);
-  const { errorMsg, setErrorMsg, paymentButtonStatus, setPaymentButtonStatus } = usePaymentStatus();
+  const { i18n, sessionReady, disabled } = usePayState(session, props.core);
   const formRef = A(null);
   const [form, setForm] = h({
     email: "",
-    address: {
-      country: void 0,
-      province: void 0,
-      city: void 0,
-      area: void 0,
-      postCode: void 0,
-      address1: void 0,
-      address2: void 0
-    }
+    address: { ...DEFAULT_ADDRESS }
   });
   const [validated, setValidated] = h(false);
-  const [fieldStatus, setFieldStatus] = h();
-  const [showQRCodeModal, setShowQRCodeModal] = h(false);
-  const [qrCodeInfo, setQrCodeInfo] = 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 = {}, supportMethods = [], country } = (session == null ? void 0 : session.checkout) || {};
-    if (!supportMethods.includes(PaymentMethod.ZALOPAY)) {
+    if (!sessionReady)
       return;
-    }
-    initFieldStatus();
-    setIsCheckoutEnabled(true);
+    const { bill = {}, country } = (session == null ? void 0 : session.checkout) || {};
     country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
     form.address.country = country;
-    if (autoQuery && core.processingPaymentMethod === PaymentMethod.ZALOPAY) {
-      setPaymentButtonStatus("loading");
-      startReFetchPayInfo();
-    }
   }, [sessionReady]);
-  const processOnError = (error) => {
+  const validateFormSilently = () => {
     var _a2;
-    setShowQRCodeModal(false);
-    (_a2 = props.onError) == null ? void 0 : _a2.call(props, error);
-    core.resetEnablePaymentMethod();
-  };
-  const onTimeout = q(
-    (message) => {
-      var _a2;
-      setShowQRCodeModal(false);
-      setErrorMsg(message || i18n.get("common.payTimeout"));
-      setPaymentButtonStatus("unSubmit");
-      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props, "retry");
-      core.resetEnablePaymentMethod();
-    },
-    [i18n, props.onTimeout]
-  );
-  const { start: startReFetchPayInfo, stop: stopReFetchPayInfo } = useRetry(
-    (timeout) => pay(true, timeout),
-    {
-      timeout: 10 * 60 * 1e3,
-      onTimeout: () => onTimeout(i18n.get("common.queryTimeout"))
-    }
-  );
-  const getPaymentParams = async () => {
-    return {
-      sessionId: session.sessionId,
-      clientKey: session.clientKey,
-      payment: {
-        paymentMethod: PaymentMethod.ZALOPAY
-      },
-      bill: {
-        email: form.email,
-        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({
-        fraudDetectionId: await (fraudDetection == null ? void 0 : fraudDetection.getFraudDetectionId())
-      })
-    };
-  };
-  const pay = async (search = false, timeout) => {
-    var _a2, _b, _c, _d, _e;
-    try {
-      const requestOptions = { locale: i18n.locale, timeout };
-      let res = null;
-      if (search) {
-        const extraParams = (_b = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b.call(_a2, "query", PaymentMethod.ZALOPAY);
-        res = await getZalopayPayInfo(
-          {
-            sessionId: session.sessionId,
-            clientKey: session.clientKey,
-            paymentMethod: PaymentMethod.ZALOPAY
-          },
-          extraParams,
-          requestOptions
-        );
-      } else {
-        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.ZALOPAY);
-        res = await zalopayPay(await getPaymentParams(), extraParams, requestOptions);
-      }
-      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res));
-      const { errorMessage, errorCode, payInfo = {}, sessionId } = res;
-      sessionId && (session.sessionId = sessionId);
-      const { paymentExpiredAt } = payInfo;
-      let end = true;
-      processPaymentStatus(res, {
-        onProcessing: () => {
-          if (!search && payInfo) {
-            if (isMobile()) {
-              if (redirectMode === "auto") {
-                redirectToPayment(payInfo);
-                return;
-              }
-            } else {
-              if (enableQRCodeModal) {
-                setShowQRCodeModal(true);
-                setQrCodeInfo({
-                  qrCode: payInfo.qr_code || payInfo.request_url,
-                  expiredTime: paymentExpiredAt
-                });
-              }
-              startReFetchPayInfo();
-            }
-          }
-          end = false;
-        },
-        onSuccess: () => {
-          var _a3;
-          setShowQRCodeModal(false);
-          setPaymentButtonStatus("success");
-          (_a3 = props.onSuccess) == null ? void 0 : _a3.call(props, res);
-        },
-        onFailure: () => {
-          errorMessage && setErrorMsg(errorMessage);
-          setPaymentButtonStatus("unSubmit");
-          processOnError(new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
-        },
-        onCanceled: () => {
-          var _a3;
-          core.resetEnablePaymentMethod();
-          setPaymentButtonStatus("unSubmit");
-          (_a3 = props.onTimeout) == null ? void 0 : _a3.call(props, "channel");
-        },
-        onExpired: () => {
-          var _a3;
-          setShowQRCodeModal(false);
-          setPaymentButtonStatus("unSubmit");
-          (_a3 = props.onExpired) == null ? void 0 : _a3.call(props);
-        },
-        onDefault: () => {
-          setPaymentButtonStatus("unSubmit");
-        }
-      });
-      return { end };
-    } 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;
-        message && setErrorMsg(message);
-        processOnError(new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
-        setPaymentButtonStatus("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);
-    });
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => setValidated(true)).catch(() => setValidated(false));
   };
   y(() => {
-    validateForm();
+    validateFormSilently();
   }, [form]);
   const onSubmit = async () => {
     var _a2;
-    setErrorMsg("");
+    setErrorMessage("");
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
       (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
-      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
+      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors, getPaymentMethodContext());
       if (errors) {
         setPaymentButtonStatus("unSubmit");
         return;
       }
-      setErrorMsg("");
       setPaymentButtonStatus("loading");
-      await pay();
+      await payment();
     });
   };
-  const handleCloseQRCodeModal = () => {
-    var _a2;
-    setPaymentButtonStatus("unSubmit");
-    stopReFetchPayInfo();
-    setShowQRCodeModal(false);
-    setQrCodeInfo(void 0);
-    (_a2 = props.onCloseModal) == null ? void 0 : _a2.call(props);
-  };
   const setFormRef = (dom) => {
     formRef.current = dom;
-    dom && validateForm();
+    dom && validateFormSilently();
   };
-  const PaymentButton = () => {
+  const WalletButton = () => {
     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,
+      PaymentButton,
       {
         className: bem("button"),
+        disabled,
         status: paymentButtonStatus,
-        text,
         onClick: onSubmit,
-        verified: validated
+        verified: validated,
+        children: text
       }
     );
   };
@@ -327,22 +159,21 @@ const Zalopay = w((props, ref) => {
       {
         ref: emailFieldRef,
         value: form.email,
-        disabled: fieldStatus == null ? void 0 : fieldStatus.email.disabled
+        disabled: (fieldStatus == null ? void 0 : fieldStatus.email.disabled) || disabled
       }
     ) }) });
   };
   const ErrorMessage = () => {
-    return /* @__PURE__ */ u(b, { children: !!errorMsg && /* @__PURE__ */ u(Info, { content: errorMsg }) });
+    return /* @__PURE__ */ u(b, { children: !!errorMessage && /* @__PURE__ */ u(Info, { content: errorMessage }) });
   };
   const Address = () => {
-    var _a2, _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) || ((_b = session == null ? void 0 : session.checkout) == null ? void 0 : _b.bill.country),
-        onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
+        onChange: (value) => setForm(Object.assign(form, { address: value })),
+        disabled
       }
     ) }) });
   };
@@ -354,14 +185,14 @@ const Zalopay = w((props, ref) => {
         session,
         core
       },
-      children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
+      children: isEnabled && i18n.ready.value && /* @__PURE__ */ u("div", { className: core.theme.className, children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.ZALOPAY }),
         /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: /* @__PURE__ */ u("div", { className: normalizedClass(COMMON_CLASS_NAME, bem()), children: [
           Email(),
           Address(),
           /* @__PURE__ */ u("div", { className: bem("footer-wrapper"), children: [
             ErrorMessage(),
-            !hidePaymentButton && PaymentButton()
+            !hidePaymentButton && WalletButton()
           ] })
         ] }) }),
         showQRCodeModal && /* @__PURE__ */ u(
@@ -373,7 +204,7 @@ const Zalopay = w((props, ref) => {
             amount: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.transAmount,
             expiredTime: qrCodeInfo.expiredTime,
             borderColor: "#00CF6A",
-            onClose: handleCloseQRCodeModal
+            onClose: processCloseQRCodeModal
           }
         )
       ] })

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

@@ -1,3 +1,10 @@
+import "./Boost/Boost.js";
+import "./GrabPay/GrabPay.js";
+import "./LinePay/LinePay.js";
+import "./NinePay/NinePay.js";
+import "./MayBankQRPay/MayBankQRPay.js";
+import "./ShopeePay/ShopeePay.js";
+import "./TNGWallet/TNGWallet.js";
 import "./GCash/GCash.js";
 import "./Paymaya/Paymaya.js";
 import "./Zalopay/Zalopay.js";
@@ -6,3 +13,10 @@ import "./Pix/Pix.js";
 import "./PicPay/PicPay.js";
 import "./PagaWallet/PagaWallet.js";
 import "./OpayWallet/OpayWallet.js";
+import "./OVO/OVO.js";
+import "./Bancontact/Bancontact.js";
+import "./Blik/Blik.js";
+import "./IDeal/IDeal.js";
+import "./Skrill/Skrill.js";
+import "./P24/P24.js";
+import "./Trustly/Trustly.js";

package/dist/es/constant.js

@@ -30,6 +30,13 @@ var PaymentMethod = /* @__PURE__ */ ((PaymentMethod2) => {
   PaymentMethod2["PIC_PAY"] = "PIC_PAY";
   PaymentMethod2["OPAY_WALLET"] = "OPAY_WALLET";
   PaymentMethod2["PAGA_WALLET"] = "PAGA_WALLET";
+  PaymentMethod2["BANCONTACT"] = "BANCONTACT";
+  PaymentMethod2["IDEAL"] = "IDEAL";
+  PaymentMethod2["BLIK"] = "BLIK";
+  PaymentMethod2["OVO"] = "OVO";
+  PaymentMethod2["SKRILL"] = "SKRILL";
+  PaymentMethod2["TRUSTLY"] = "TRUSTLY";
+  PaymentMethod2["P24"] = "P24";
   PaymentMethod2["SEPA_DEBIT"] = "SEPA_DEBIT";
   return PaymentMethod2;
 })(PaymentMethod || {});
@@ -55,9 +62,20 @@ var PaymentCategory = /* @__PURE__ */ ((PaymentCategory2) => {
   PaymentCategory2["PIC_PAY"] = "picPay";
   PaymentCategory2["OPAY_WALLET"] = "opayWallet";
   PaymentCategory2["PAGA_WALLET"] = "pagaWallet";
+  PaymentCategory2["BANCONTACT"] = "bancontact";
+  PaymentCategory2["IDEAL"] = "ideal";
+  PaymentCategory2["BLIK"] = "blik";
+  PaymentCategory2["OVO"] = "ovo";
+  PaymentCategory2["SKRILL"] = "skrill";
+  PaymentCategory2["TRUSTLY"] = "trustly";
+  PaymentCategory2["P24"] = "p24";
   return PaymentCategory2;
 })(PaymentCategory || {});
 const PaymentMethod2CategoryMap = {
+  [
+    "BANKCARD"
+    /* BANKCARD */
+  ]: "card",
   [
     "APPLE_PAY"
     /* APPLE_PAY */
@@ -137,8 +155,36 @@ const PaymentMethod2CategoryMap = {
   [
     "PAGA_WALLET"
     /* PAGA_WALLET */
-  ]: "pagaWallet"
-  /* PAGA_WALLET */
+  ]: "pagaWallet",
+  [
+    "BANCONTACT"
+    /* BANCONTACT */
+  ]: "bancontact",
+  [
+    "IDEAL"
+    /* IDEAL */
+  ]: "ideal",
+  [
+    "BLIK"
+    /* BLIK */
+  ]: "blik",
+  [
+    "OVO"
+    /* OVO */
+  ]: "ovo",
+  [
+    "SKRILL"
+    /* SKRILL */
+  ]: "skrill",
+  [
+    "TRUSTLY"
+    /* TRUSTLY */
+  ]: "trustly",
+  [
+    "P24"
+    /* P24 */
+  ]: "p24"
+  /* P24 */
 };
 const CardPaymentMethods = [
   "VISA",

package/dist/es/core/address.js

@@ -36,7 +36,7 @@ class AddressCore {
     __publicField(this, "provinceOptions");
     __publicField(this, "cityOptions");
     __publicField(this, "addressState");
-    __publicField(this, "i18n");
+    __publicField(this, "locale");
     __publicField(this, "addressFormat");
     __publicField(this, "validateAllFields", false);
     this.addressState = {
@@ -50,16 +50,17 @@ class AddressCore {
     };
     this.countryOptions = [];
   }
-  setI18n({ i18n }) {
-    this.i18n = i18n;
+  setLocale(locale) {
+    this.locale = locale;
   }
+  /* 请求国家列表，这里做了一个缓存，避免重复请求 */
   async requestCountryOption() {
     var _a, _b;
-    if (this.countryOptions.length !== 0 || ((_a = __privateGet(this, _countryOptionsReadyPromise)) == null ? void 0 : _a.isPending))
+    if (this.countryOptions.length || ((_a = __privateGet(this, _countryOptionsReadyPromise)) == null ? void 0 : _a.isPending))
       return;
     try {
       __privateSet(this, _countryOptionsReadyPromise, createPromise());
-      this.countryOptions = await getCountry({ locale: this.i18n.locale });
+      this.countryOptions = await getCountry({ locale: this.locale });
       __privateGet(this, _countryOptionsReadyPromise).resolve(true);
     } catch (error) {
       (_b = __privateGet(this, _countryOptionsReadyPromise)) == null ? void 0 : _b.resolve(false);
@@ -72,7 +73,7 @@ class AddressCore {
     return this.countryOptions;
   }
   async requestProvinceOption(value) {
-    this.provinceOptions = await mergedGetProvince(value, { locale: this.i18n.locale });
+    this.provinceOptions = await mergedGetProvince(value, { locale: this.locale });
     return this.provinceOptions;
   }
   getProvinceOption() {