@paykka/card-checkout-ui 0.11.6 → 0.13.1

package/dist/es/components/NinePay/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 { 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";
@@ -34,7 +33,8 @@ const NinePay = w((props, ref) => {
     redirectMode = "auto",
     core,
     autoQuery,
-    showGuideCard = true
+    showGuideCard = true,
+    hidePaymentButton = false
   } = props;
   F(ref, () => ({
     stopRetry: () => {
@@ -49,15 +49,17 @@ const NinePay = 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 NinePay = 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 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,17 +102,27 @@ const NinePay = 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.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();
@@ -144,34 +156,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 _a2, _b2, _c2, _d2, _e2, _f2, _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 = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.NINE_PAY);
+        res = await getNinePayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.NINE_PAY
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.NINE_PAY);
+        res = await ninePay(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 NinePay = 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 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 };
@@ -235,7 +261,7 @@ const NinePay = 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 NinePay = w((props, ref) => {
     {
       value: {
         i18n,
-        session
+        session,
+        core
       },
       children: isCheckoutEnabled && i18n.ready.value && /* @__PURE__ */ u(b, { children: [
         showGuideCard && /* @__PURE__ */ u(GuideCard, { type: PaymentCategory.NINE_PAY }),

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";
@@ -144,7 +144,8 @@ const SecuredFieldsProvider = w((props, ref) => {
       action: MessageAction.INIT,
       hidden: true,
       apiUrl,
-      cdnUrl
+      cdnUrl,
+      apiPrefix
     };
     iframeEl.addEventListener("load", () => {
       postMessageToIframe(data, hiddenIframe.current.contentWindow, cdnOrigin);

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

@@ -4,7 +4,7 @@ import { EFieldType } from "../SecuredFieldsProvider/index.js";
 import { getSupportedCardBrands, getSupportedCardBrandsLengths, findCardBrand } from "../../utils/card-brand/index.js";
 import { limitedToNumber, trimAll } from "../../utils/format.js";
 import { isUndefined, isNil } from "../../utils/is.js";
-import { cdnOrigin, setApiUrl, setCDNUrl } from "../../config.js";
+import { cdnOrigin, setApiUrl, setCDNUrl, setApiPrefix } from "../../config.js";
 import { MessageAction } from "../../types/message.js";
 import { generateClassNameMap, style2String, createPlaceholderStyle, loadStyle } from "../../utils/style.js";
 import { postMessageToIframe } from "../../utils/iframe.js";
@@ -371,7 +371,6 @@ const FieldIframe = (props) => {
       value: value.current,
       fieldType: props.fieldType
     };
-    console.log(hiddenIframe, props.hiddenIframeName);
     postMessageToIframe(validWithValueData, hiddenIframe, cdnOrigin);
   };
   const sendActivatedMessage = () => {
@@ -583,6 +582,9 @@ const SecuredIframe = () => {
       if (feedbackData.cdnUrl) {
         setCDNUrl(feedbackData.cdnUrl);
       }
+      if (feedbackData.apiPrefix) {
+        setApiPrefix(feedbackData.apiPrefix);
+      }
       window.removeEventListener("message", onReceiveMessage);
       setHasInit(true);
     }

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

@@ -1,13 +1,13 @@
 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 "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { cssVarPrefix, normalizedClass, formatAmount, trimAll } from "../../utils/format.js";
+import { formatPaymentResult } from "../../utils/payment.js";
 import { isTimeoutError } from "../../api/http.js";
-import { COMMON_CLASS_NAME } from "../../constant.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
+import { COMMON_CLASS_NAME, PaymentMethod } from "../../constant.js";
 import { getSepaPayInfo, sepaPay } from "../../api/modules/sepa/index.js";
 import { PayKKaError } from "../../core/error.js";
 import { usePayState } from "../../hooks/usePayState.js";
@@ -26,8 +26,8 @@ const { bem } = useBEM("sepa");
 const fieldClassNames = bem("field");
 const Sepa = w((props, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
-  const { session } = props;
-  let addressState = createAddressCore();
+  const { session, core } = props;
+  const addressCore = core.getAddressCore();
   let emailState = createEmailCore();
   const { i18n, sessionReady } = usePayState(session, props.core);
   const addressFieldRef = A(null);
@@ -38,13 +38,13 @@ const Sepa = w((props, ref) => {
     iban: "",
     holderName: "",
     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);
@@ -65,24 +65,35 @@ const Sepa = w((props, ref) => {
       var _a2;
       if (!requiredBill)
         return;
-      setForm(Object.assign(form, { address: addressState.getAddressState() }));
-      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressState.getAddressState());
+      setForm(Object.assign(form, { address: addressCore.getAddressState() }));
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressCore.getAddressState());
     },
     updateEmail: () => {
       var _a2;
       setForm(Object.assign(form, { email: emailState.email }));
+      form.email = emailState.email;
       (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
+      validateForm();
     }
   }));
+  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(() => {
     session.ready().then(() => {
       setIsCheckoutEnabled(true);
-      const { bill, status } = session.checkout;
+      const { bill, status, country } = session.checkout;
+      country && addressCore.setCountry(country);
       form.email = bill.email ?? "";
+      form.address.country = country;
       disabledEmail.current = !!bill.email;
       setRequiredBill(bill.billingAddressCollection === "REQUIRED");
       if (status === "SUCCESS") {
-        setSubmitButtonStatus("success");
         processOnSuccess();
       }
     });
@@ -125,7 +136,7 @@ const Sepa = w((props, ref) => {
     setErrorMsg("");
     (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
       var _a3;
-      requiredBill && addressState.setValidateAllFields(true);
+      requiredBill && addressCore.setValidateAllFields(true);
       (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
@@ -154,14 +165,19 @@ const Sepa = w((props, ref) => {
       sessionId: session.sessionId,
       clientKey: session.clientKey,
       payment: {
+        paymentMethod: PaymentMethod.SEPA_DEBIT,
         holderName: form.holderName,
         iban: trimAll(form.iban)
       },
       bill: requiredBill ? {
         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
       } : {
         email: form.email
       },
@@ -169,14 +185,25 @@ const Sepa = w((props, ref) => {
     };
   };
   async function pay(search = false, timeout) {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2;
     try {
-      const paymentParams = await getPaymentParams();
-      const options = { locale: i18n.locale, timeout };
-      const res = search ? await getSepaPayInfo(
-        { sessionId: session.sessionId, clientKey: session.clientKey },
-        options
-      ) : await sepaPay(paymentParams, props.core, options);
+      const requestOptions = { locale: i18n.locale, timeout };
+      let res = null;
+      if (search) {
+        const extraParams = (_b2 = (_a2 = core.config)._getExtraParams) == null ? void 0 : _b2.call(_a2, "query", PaymentMethod.SEPA_DEBIT);
+        res = await getSepaPayInfo(
+          {
+            sessionId: session.sessionId,
+            clientKey: session.clientKey,
+            paymentMethod: PaymentMethod.SEPA_DEBIT
+          },
+          extraParams,
+          requestOptions
+        );
+      } else {
+        const extraParams = (_d2 = (_c2 = core.config)._getExtraParams) == null ? void 0 : _d2.call(_c2, "payment", PaymentMethod.SEPA_DEBIT);
+        res = await sepaPay(await getPaymentParams(), extraParams, requestOptions);
+      }
       return processAfterPayment(res, search);
     } catch (error) {
       if (isTimeoutError(error)) {
@@ -189,7 +216,7 @@ const Sepa = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_e2 = props.onError) == null ? void 0 : _e2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         return { end: true };
       }
@@ -197,23 +224,23 @@ const Sepa = w((props, ref) => {
   }
   const processAfterPayment = (res, search = false) => {
     var _a2, _b2, _c2;
-    const { status, orderStatus, errorMessage, errorCode } = res;
+    const { status, orderStatus, errorMessage, errorCode, sessionId } = res;
+    sessionId && (session.sessionId = sessionId);
     if (status === "PROCESSING") {
       if (!orderStatus) {
         setSubmitButtonStatus("unSubmit");
         return { end: true };
       } else if (orderStatus === "SUCCESS") {
-        setSubmitButtonStatus("success");
-        processOnSuccess();
+        processOnSuccess(res);
       } else if (orderStatus === "PROCESSING") {
         if (search) {
-          processOnSuccess();
+          processOnSuccess(res);
         } else {
           startReFetchPayInfo();
         }
         return { end: search };
       } else if (orderStatus === "FAILURE") {
-        setErrorMsg(errorMessage);
+        errorMessage && setErrorMsg(errorMessage);
         setSubmitButtonStatus("unSubmit");
         (_a2 = props.onError) == null ? void 0 : _a2.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
       } else if (orderStatus === "AUTHORIZED") {
@@ -222,8 +249,7 @@ const Sepa = w((props, ref) => {
       }
       return { end: true };
     } else if (status === "SUCCESS") {
-      setSubmitButtonStatus("success");
-      processOnSuccess();
+      processOnSuccess(res);
       return { end: true };
     } else if (status === "EXPIRED") {
       setSubmitButtonStatus("unSubmit");
@@ -233,16 +259,13 @@ const Sepa = w((props, ref) => {
     setSubmitButtonStatus("unSubmit");
     return { end: true };
   };
-  const processOnSuccess = () => {
-    var _a2, _b2;
-    (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props, (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.returnUrl);
-  };
   return /* @__PURE__ */ u(
     CoreContext.Provider,
     {
       value: {
         i18n,
-        session
+        session,
+        core
       },
       children: sessionReady && isCheckoutEnabled && i18n.ready.value && /* @__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("div", { className: fieldClassNames, children: /* @__PURE__ */ u(