@paykka/card-checkout-ui 0.13.16 → 0.14.0

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

@@ -3,16 +3,15 @@ import { isTimeoutError } from "../../api/http.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { parseE164, underscoreToUpperCamelCase } from "../../utils/format.js";
-import { PaymentStatus } from "../../types/index.js";
+import { ApplePayEventType } from "../../types/event.js";
 import { deepMerge } from "../../utils/object.js";
-import { formatPaymentResult } from "../../utils/payment.js";
+import { processPaymentStatus, formatPaymentResult } from "../../utils/payment.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
-import { SessionMode, PaymentMethod } from "../../constant.js";
+import { PaymentMethod, SessionMode } from "../../constant.js";
 import { getApplePayInfo, applePay, getMerchantSession } from "../../api/modules/apple-pay/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
 import { PayKKaError } from "../../core/error.js";
-import { ApplePayEventType } from "../../types/event.js";
 import "../../out/worldpay-jsc-origin.js";
 import { usePayState } from "../../hooks/usePayState.js";
 import { useRetry } from "../../hooks/useRetry.js";
@@ -113,22 +112,28 @@ const useApplePaySession = () => {
     reportFailure2ApplePay
   };
 };
+const CURR_PAYMENT_METHOD = PaymentMethod.APPLE_PAY;
 const { bem } = useBEM("apple-pay");
 const ApplePay = w((props) => {
   const { session, isDropIn, core, config } = props;
   const { applePaySession, initApplePaySession, reportSuccess2ApplePay, reportFailure2ApplePay } = useApplePaySession();
-  const { i18n, sessionReady, fraudDetection } = usePayState(session, props.core);
+  const { i18n, sessionReady, fraudDetection, disabled } = usePayState(session, props.core);
   const [errorMsg, setErrorMsg] = h("");
   const [showApplePay, setShowApplePay] = h(false);
   const applePayConfig = deepMerge(DEFAULT_APPLE_PAY_CONFIG, config || {});
   const canUseApplePaySDK = isApplePaySDKAvailable();
+  const getPaymentMethodContext = () => {
+    return {
+      paymentMethod: CURR_PAYMENT_METHOD
+    };
+  };
   const processOnSuccess = (res) => {
     var _a, _b;
     const result = formatPaymentResult({
       ...res,
       returnUrl: (_a = session == null ? void 0 : session.checkout) == null ? void 0 : _a.returnUrl
     });
-    (_b = props.onSuccess) == null ? void 0 : _b.call(props, result);
+    (_b = props.onSuccess) == null ? void 0 : _b.call(props, result, getPaymentMethodContext());
   };
   y(() => {
     if (!sessionReady) {
@@ -142,7 +147,7 @@ const ApplePay = w((props) => {
       );
       return;
     }
-    if (!supportMethods.includes(PaymentMethod.APPLE_PAY)) {
+    if (!supportMethods.includes(CURR_PAYMENT_METHOD)) {
       return;
     }
     loadApplePayJS(
@@ -169,10 +174,11 @@ const ApplePay = w((props) => {
   const onTimeout = q(
     (message) => {
       var _a;
+      core.payment.resetCurrPaymentMethod();
       const timeoutMessage = message || i18n.get("common.payTimeout");
       reportFailure2ApplePay(timeoutMessage);
       setErrorMsg(timeoutMessage);
-      (_a = props.onTimeout) == null ? void 0 : _a.call(props, "retry");
+      (_a = props.onTimeout) == null ? void 0 : _a.call(props, "retry", getPaymentMethodContext());
     },
     [i18n, props.onTimeout]
   );
@@ -199,7 +205,7 @@ const ApplePay = w((props) => {
         country: billingContact == null ? void 0 : billingContact.countryCode
       },
       payment: {
-        paymentMethod: PaymentMethod.APPLE_PAY,
+        paymentMethod: CURR_PAYMENT_METHOD,
         tokenData: JSON.stringify({ token })
       },
       browser: await getBrowserParams({
@@ -208,65 +214,71 @@ const ApplePay = w((props) => {
     };
   };
   async function pay(search = false, timeout, token, billingContact, shippingContact) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f;
     setErrorMsg("");
     try {
+      core.payment.currPaymentMethod.value = CURR_PAYMENT_METHOD;
       const requestOptions = { locale: i18n.locale, timeout };
       let res = null;
       if (search) {
-        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", PaymentMethod.APPLE_PAY);
+        const extraParams = (_b = (_a = core.config)._getExtraParams) == null ? void 0 : _b.call(_a, "query", CURR_PAYMENT_METHOD);
         res = await getApplePayInfo(
           {
             sessionId: session.sessionId,
             clientKey: session.clientKey,
-            paymentMethod: PaymentMethod.APPLE_PAY
+            paymentMethod: CURR_PAYMENT_METHOD
           },
           extraParams,
           requestOptions
         );
       } else {
-        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", PaymentMethod.APPLE_PAY);
+        const extraParams = (_d = (_c = core.config)._getExtraParams) == null ? void 0 : _d.call(_c, "payment", CURR_PAYMENT_METHOD);
         res = await applePay(
           await getPaymentParams(token, billingContact, shippingContact),
           extraParams,
           requestOptions
         );
       }
-      const { status, orderStatus, errorMessage, errorCode, sessionId } = res;
+      const { errorMessage, errorCode, sessionId } = res;
       sessionId && (session.sessionId = sessionId);
-      if (status === PaymentStatus.PROCESSING) {
-        if (orderStatus === PaymentStatus.SUCCESS) {
+      !search && ((_e = props.onSubmitResponse) == null ? void 0 : _e.call(props, res, getPaymentMethodContext()));
+      let end = true;
+      await processPaymentStatus(res, {
+        onProcessing: async () => {
+          !search && await startReFetchPayInfo();
+          end = false;
+        },
+        onSuccess: () => {
           reportSuccess2ApplePay();
           processOnSuccess(res);
-          return { end: true };
-        } else if (orderStatus === PaymentStatus.PROCESSING) {
-          !search && await startReFetchPayInfo();
-          return { end: !search };
-        } else if (orderStatus === PaymentStatus.FAILURE) {
+        },
+        onFailure: () => {
+          var _a2;
           errorMessage && setErrorMsg(errorMessage);
-          (_e = props.onError) == null ? void 0 : _e.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          (_a2 = props.onError) == null ? void 0 : _a2.call(
+            props,
+            new PayKKaError("API_ERROR", errorMessage, { code: errorCode }),
+            getPaymentMethodContext()
+          );
+          core.payment.resetCurrPaymentMethod();
           reportFailure2ApplePay(errorMessage);
-          return { end: true };
-        } else if (orderStatus === PaymentStatus.AUTHORIZED) {
+        },
+        onAuthorized: () => {
+          var _a2;
           reportSuccess2ApplePay();
-          (_f = props.onAuthorized) == null ? void 0 : _f.call(props);
-          return { end: true };
-        } else {
+          (_a2 = props.onAuthorized) == null ? void 0 : _a2.call(props, getPaymentMethodContext());
+        },
+        onExpired: () => {
+          var _a2, _b2;
+          (_a2 = props.onExpired) == null ? void 0 : _a2.call(props, getPaymentMethodContext());
+          (_b2 = applePaySession.current) == null ? void 0 : _b2.abort();
+        },
+        onDefault: () => {
           reportFailure2ApplePay();
-          return { end: true };
+          core.payment.resetCurrPaymentMethod();
         }
-      } else if (status === PaymentStatus.SUCCESS) {
-        reportSuccess2ApplePay();
-        processOnSuccess(res);
-        return { end: true };
-      } else if (status === PaymentStatus.EXPIRED) {
-        (_g = props.onExpired) == null ? void 0 : _g.call(props);
-        (_h = applePaySession.current) == null ? void 0 : _h.abort();
-        return { end: true };
-      } else {
-        reportFailure2ApplePay();
-        return { end: true };
-      }
+      });
+      return { end };
     } catch (error) {
       if (isTimeoutError(error)) {
         if (search) {
@@ -278,8 +290,13 @@ const ApplePay = w((props) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         message && setErrorMsg(message);
-        (_i = props.onError) == null ? void 0 : _i.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_f = props.onError) == null ? void 0 : _f.call(
+          props,
+          new PayKKaError("API_ERROR", message, { code: error.code, cause: error }),
+          getPaymentMethodContext()
+        );
         reportFailure2ApplePay(message);
+        core.payment.resetCurrPaymentMethod();
         return { end: true };
       }
     }
@@ -329,7 +346,7 @@ const ApplePay = w((props) => {
       onAuthorized: async (event) => {
         var _a2;
         onEvent == null ? void 0 : onEvent(ApplePayEventType.APPLE_PAY_AUTHORIZED);
-        (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props);
+        (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, void 0, getPaymentMethodContext());
         const { token, billingContact, shippingContact } = (event == null ? void 0 : event.payment) || {};
         console.warn("ApplePay Res", event == null ? void 0 : event.payment);
         pay(false, void 0, token, billingContact, shippingContact);
@@ -337,6 +354,7 @@ const ApplePay = w((props) => {
       onCancel: () => {
         var _a2;
         onEvent == null ? void 0 : onEvent(ApplePayEventType.APPLE_PAY_CANCELLED);
+        core.payment.resetCurrPaymentMethod();
         (_a2 = props.onCancel) == null ? void 0 : _a2.call(props);
       }
     });
@@ -346,7 +364,7 @@ const ApplePay = w((props) => {
     var _a, _b;
     const buttonStyle = (_a = applePayConfig.button) == null ? void 0 : _a.buttonStyle;
     const buttonType = (_b = applePayConfig.button) == null ? void 0 : _b.buttonType;
-    return /* @__PURE__ */ u("div", { className: bem("button"), children: canUseApplePaySDK ? /* @__PURE__ */ u(b, { children: /* @__PURE__ */ u(
+    return /* @__PURE__ */ u("div", { className: bem("button", { disabled }), children: canUseApplePaySDK ? /* @__PURE__ */ u(b, { children: /* @__PURE__ */ u(
       "apple-pay-button",
       {
         buttonstyle: buttonStyle,

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

@@ -14,7 +14,7 @@ import { Input } from "../internal/Input/Input.js";
 import "../internal/Input/type.js";
 import { CNPJ_FULL_LENGTH, CPF_FULL_LENGTH, formatCPFOnInsert } from "../../utils/cpf.js";
 const CPFField = w((props, ref) => {
-  const { className, style, security } = props;
+  const { className, style, security, disabled } = props;
   const { i18n } = useI18n();
   const inputRef = A(null);
   const formItemRef = A(null);
@@ -71,6 +71,7 @@ const CPFField = w((props, ref) => {
         Input,
         {
           type: "text",
+          disabled,
           inputmode: "numeric",
           ref: inputRef,
           maxLength: CNPJ_FULL_LENGTH,