@paykka/card-checkout-ui 0.11.6 → 0.13.1

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

@@ -5,16 +5,15 @@ 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 { 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 { 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";
@@ -34,7 +33,8 @@ const ShopeePay = w((props, ref) => {
     redirectMode = "auto",
     core,
     autoQuery = true,
-    showGuideCard = true
+    showGuideCard = true,
+    hidePaymentButton = false
   } = props;
   F(ref, () => ({
     stopRetry: () => {
@@ -49,15 +49,17 @@ const ShopeePay = w((props, ref) => {
       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());
+      const newForm = Object.assign(form, { address: addressCore.getAddressState() });
+      setForm(newForm);
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
+      validateForm();
     },
     updateEmail: () => {
       var _a2;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
-      setForm(Object.assign(form, { email: emailState.email }));
-      form.email = emailState.email;
+      const newForm = Object.assign(form, { email: emailState.email });
+      setForm(newForm);
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
       validateForm();
     },
@@ -65,7 +67,7 @@ const ShopeePay = w((props, ref) => {
       hidePaymentButton && onSubmit();
     }
   }));
-  const addressState = createAddressCore();
+  const addressCore = core.getAddressCore();
   const emailState = createEmailCore();
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
@@ -76,13 +78,13 @@ const ShopeePay = 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,17 +102,27 @@ const ShopeePay = w((props, ref) => {
     }
     setFieldStatus({ ...field });
   };
+  const processOnSuccess = (res) => {
+    var _a2, _b2;
+    setSubmitButtonStatus("success");
+    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, formatPaymentResult({
+      ...res,
+      returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+    }));
+  };
   y(() => {
     if (!sessionReady) {
       return;
     }
-    const { bill = {}, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
-    if (!paymentMethod.includes(PaymentMethod.SHOPEE_PAY)) {
+    const { bill = {}, supportMethods = [], country } = (session == null ? void 0 : session.checkout) || {};
+    if (!supportMethods.includes(PaymentMethod.SHOPEE_PAY)) {
       return;
     }
     initFieldStatus();
     setIsCheckoutEnabled(true);
+    country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
+    form.address.country = country;
     if (autoQuery && core.processingPaymentMethod === PaymentMethod.SHOPEE_PAY) {
       setSubmitButtonStatus("loading");
       startReFetchPayInfo();
@@ -144,34 +156,49 @@ const ShopeePay = 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 _a2, _b2, _c2, _d2, _e2, _f2, _g;
     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;
+      let res = null;
+      if (search) {
+        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.SHOPEE_PAY);
+        res = await getShopeePayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.SHOPEE_PAY
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.SHOPEE_PAY);
+        res = await shopeePay(await getPaymentParams(), extraParams, requestOptions);
+      }
+      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.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 +214,16 @@ const ShopeePay = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_c2 = props.onTimeout) == null ? void 0 : _c2.call(props);
+          (_f2 = props.onTimeout) == null ? void 0 : _f2.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 +238,7 @@ const ShopeePay = 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 };
@@ -235,7 +261,7 @@ const ShopeePay = w((props, ref) => {
     setErrorMsg("");
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
-      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressState.setValidateAllFields(true);
+      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
       (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
@@ -305,7 +331,8 @@ const ShopeePay = w((props, ref) => {
     {
       value: {
         i18n,
-        session
+        session,
+        core
       },
       children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.SHOPEE_PAY }),

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

@@ -1,20 +1,19 @@
 import { h, y, u } from "../../core.js";
 import { useBEM } from "../../hooks/useBEM.js";
-import "../../core/context.js";
+import { useI18n } from "../../hooks/useI18n.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");
 const SubmitButton = (props) => {
   const {
-    text = enGB["common.pay"],
-    loadingText = enGB["common.payProcessing"],
-    successText = enGB["common.paySuccess"],
+    text,
+    loadingText,
+    successText,
     status = "unSubmit",
     onClick,
     className,
@@ -22,6 +21,7 @@ const SubmitButton = (props) => {
     icon = IconSafe
   } = props;
   const [content, setContent] = h(text);
+  const { i18n } = useI18n();
   const Icon = () => {
     if (status === "unSubmit") {
       const Comp = icon;
@@ -32,14 +32,15 @@ const SubmitButton = (props) => {
       {
         checked: status === "success",
         size: 20,
-        onCheckShow: () => setContent(successText)
+        onCheckShow: () => setContent(successText || i18n.get("common.paySuccess"))
       }
     );
   };
   y(() => {
     if (status === "success")
       return;
-    setContent(status === "loading" ? loadingText : text);
+    const buttonText = status === "loading" ? loadingText || i18n.get("common.payProcessing") : text || i18n.get("common.pay");
+    setContent(buttonText);
   }, [status, text]);
   return /* @__PURE__ */ u(
     Button,

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

@@ -5,16 +5,15 @@ 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 { 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 { getTNGWalletPayInfo, tngWalletPay } from "../../api/modules/tng-wallet/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";
@@ -34,7 +33,8 @@ const TNGWallet = w((props, ref) => {
     redirectMode = "auto",
     core,
     autoQuery = true,
-    showGuideCard = true
+    showGuideCard = true,
+    hidePaymentButton = false
   } = props;
   F(ref, () => ({
     stopRetry: () => {
@@ -49,15 +49,17 @@ const TNGWallet = w((props, ref) => {
       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());
+      const newForm = Object.assign(form, { address: addressCore.getAddressState() });
+      setForm(newForm);
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
+      validateForm();
     },
     updateEmail: () => {
       var _a2;
       if (!(fieldStatus == null ? void 0 : fieldStatus.email.show))
         return;
-      setForm(Object.assign(form, { email: emailState.email }));
-      form.email = emailState.email;
+      const newForm = Object.assign(form, { email: emailState.email });
+      setForm(newForm);
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
       validateForm();
     },
@@ -65,7 +67,7 @@ const TNGWallet = w((props, ref) => {
       hidePaymentButton && onSubmit();
     }
   }));
-  const addressState = createAddressCore();
+  const addressCore = core.getAddressCore();
   const emailState = createEmailCore();
   const addressFieldRef = A(null);
   const emailFieldRef = A(null);
@@ -76,13 +78,13 @@ const TNGWallet = 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,17 +102,27 @@ const TNGWallet = w((props, ref) => {
     }
     setFieldStatus({ ...field });
   };
+  const processOnSuccess = (res) => {
+    var _a2, _b2;
+    setSubmitButtonStatus("success");
+    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, formatPaymentResult({
+      ...res,
+      returnUrl: (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl
+    }));
+  };
   y(() => {
     if (!sessionReady) {
       return;
     }
-    const { bill = {}, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
-    if (!paymentMethod.includes(PaymentMethod.TNG_WALLET)) {
+    const { bill = {}, supportMethods = [], country } = (session == null ? void 0 : session.checkout) || {};
+    if (!supportMethods.includes(PaymentMethod.TNG_WALLET)) {
       return;
     }
     initFieldStatus();
     setIsCheckoutEnabled(true);
+    country && addressCore.setCountry(country);
     form.email = bill.email ?? "";
+    form.address.country = country;
     if (autoQuery && core.processingPaymentMethod === PaymentMethod.TNG_WALLET) {
       setSubmitButtonStatus("loading");
       startReFetchPayInfo();
@@ -144,34 +156,49 @@ const TNGWallet = 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 _a2, _b2, _c2, _d2, _e2, _f2, _g;
     try {
-      const paymentParams = await getPaymentParams();
       const requestOptions = { locale: i18n.locale, timeout };
-      const res = search ? await getTNGWalletPayInfo(
-        { sessionId: session.sessionId, clientKey: session.clientKey },
-        requestOptions
-      ) : await tngWalletPay(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 = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.TNG_WALLET);
+        res = await getTNGWalletPayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.TNG_WALLET
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.TNG_WALLET);
+        res = await tngWalletPay(await getPaymentParams(), extraParams, requestOptions);
+      }
+      !search && ((_e2 = props.onSubmitResponse) == null ? void 0 : _e2.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 +214,16 @@ const TNGWallet = w((props, ref) => {
           return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_c2 = props.onTimeout) == null ? void 0 : _c2.call(props);
+          (_f2 = props.onTimeout) == null ? void 0 : _f2.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 +238,7 @@ const TNGWallet = 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 };
@@ -235,7 +261,7 @@ const TNGWallet = w((props, ref) => {
     setErrorMsg("");
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
-      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressState.setValidateAllFields(true);
+      (fieldStatus == null ? void 0 : fieldStatus.address.show) && addressCore.setValidateAllFields(true);
       (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
@@ -305,7 +331,8 @@ const TNGWallet = w((props, ref) => {
     {
       value: {
         i18n,
-        session
+        session,
+        core
       },
       children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.TNG_WALLET }),