@paykka/card-checkout-ui 0.7.0 → 0.9.2

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

@@ -1,11 +1,10 @@
 import { w, h, A, F, y, q, u } from "../../core.js";
 import { isTimeoutError } from "../../api/http.js";
 import { getAliPayInfo, aliPay } from "../../api/modules/ali-pay/index.js";
-import { isUndefined } from "../../utils/is.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import { formatAmount } from "../../utils/format.js";
-import { PaymentType } from "../../constant.js";
+import { cssVarPrefix, normalizedClass, formatAmount } from "../../utils/format.js";
+import { COMMON_CLASS_NAME, PaymentType } from "../../constant.js";
 import { CoreContext } from "../../core/context.js";
 import { PayKKaError } from "../../core/error.js";
 import { createAddressCore } from "../../core/Address.js";
@@ -23,9 +22,10 @@ import { RecurringTip } from "../RecurringTip/index.js";
 import { SubmitButton } from "../SubmitButton/index.js";
 const { bem } = useBEM("ali-pay");
 const AliPay = w((props, ref) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const { session } = props;
-  let addressState = createAddressCore();
-  let emailState = createEmailCore();
+  const addressState = createAddressCore();
+  const emailState = createEmailCore();
   const { setErrorMsg, i18n, errorMsg, sessionReady } = usePayState(session);
   const [submitButtonStatus, setSubmitButtonStatus] = h("unSubmit");
   const formRef = A(null);
@@ -56,19 +56,19 @@ const AliPay = w((props, ref) => {
       startReFetchPayInfo({ timeout });
     },
     updateAddress: () => {
-      var _a;
+      var _a2;
       setForm(Object.assign(form, { address: addressState.getAddressState() }));
-      (_a = addressFieldRef.current) == null ? void 0 : _a.update(addressState.getAddressState());
+      (_a2 = addressFieldRef.current) == null ? void 0 : _a2.update(addressState.getAddressState());
     },
     updateEmail: () => {
-      var _a;
+      var _a2;
       setForm(Object.assign(form, { email: emailState.email }));
-      (_a = emailFieldRef.current) == null ? void 0 : _a.update(emailState.email);
+      (_a2 = emailFieldRef.current) == null ? void 0 : _a2.update(emailState.email);
     }
   }));
   function validateForm() {
-    var _a;
-    (_a = formRef.current) == null ? void 0 : _a.validate(void 0, false).then(() => {
+    var _a2;
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(void 0, false).then(() => {
       setValidated(true);
     }).catch(() => {
       setValidated(false);
@@ -78,11 +78,11 @@ const AliPay = w((props, ref) => {
     validateForm();
   }, [form]);
   y(() => {
-    var _a;
+    var _a2;
     if (sessionReady) {
       if ((session == null ? void 0 : session.checkout.status) === "SUCCESS") {
         setSubmitButtonStatus("success");
-        (_a = props.onSuccess) == null ? void 0 : _a.call(props);
+        (_a2 = props.onSuccess) == null ? void 0 : _a2.call(props);
       }
       form.email = (session == null ? void 0 : session.checkout.bill.email) ?? "";
       disabledEmail.current = !!(session == null ? void 0 : session.checkout.bill.email);
@@ -92,12 +92,15 @@ const AliPay = w((props, ref) => {
       }, 100);
     }
   }, [sessionReady]);
-  const onTimeout = q((message) => {
-    var _a;
-    setErrorMsg(message || i18n.get("common.payTimeout"));
-    setSubmitButtonStatus("unSubmit");
-    (_a = props.onTimeout) == null ? void 0 : _a.call(props, "retry");
-  }, [i18n, props.onTimeout]);
+  const onTimeout = q(
+    (message) => {
+      var _a2;
+      setErrorMsg(message || i18n.get("common.payTimeout"));
+      setSubmitButtonStatus("unSubmit");
+      (_a2 = props.onTimeout) == null ? void 0 : _a2.call(props, "retry");
+    },
+    [i18n, props.onTimeout]
+  );
   const { start: startReFetchPayInfo, stop: stopReFetchPayInfo } = useRetry(
     (timeout) => pay(true, timeout),
     {
@@ -105,7 +108,7 @@ const AliPay = w((props, ref) => {
     }
   );
   async function pay(search = false, timeout) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     try {
       const res = search ? await getAliPayInfo(
         {
@@ -129,56 +132,43 @@ const AliPay = w((props, ref) => {
             email: form.email
           }
         },
+        props.core,
         { locale: i18n.locale, timeout }
       );
       const { status, orderStatus, errorMessage, errorCode } = res;
-      !search && ((_a = props.onSubmitResponse) == null ? void 0 : _a.call(props, res));
+      !search && ((_a2 = props.onSubmitResponse) == null ? void 0 : _a2.call(props, res));
       if (status === "PROCESSING") {
         if (!orderStatus) {
           setSubmitButtonStatus("unSubmit");
+          return { end: true };
         } else if (orderStatus === "SUCCESS") {
           setSubmitButtonStatus("success");
-          (_b = props.onSuccess) == null ? void 0 : _b.call(props);
-          return {
-            end: true
-          };
+          (_b2 = props.onSuccess) == null ? void 0 : _b2.call(props);
+          return { end: true };
         } else if (orderStatus === "FAILURE") {
           setErrorMsg(errorMessage);
           setSubmitButtonStatus("unSubmit");
-          (_c = props.onError) == null ? void 0 : _c.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
-          return {
-            end: true
-          };
+          (_c2 = props.onError) == null ? void 0 : _c2.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
+          return { end: true };
         } else if (orderStatus === "PROCESSING") {
           !search && startReFetchPayInfo();
-          return {
-            end: false
-          };
+          return { end: false };
         } else if (orderStatus === "CANCELED") {
           setSubmitButtonStatus("unSubmit");
-          (_d = props.onTimeout) == null ? void 0 : _d.call(props, "channel");
-          return {
-            end: true
-          };
+          (_d2 = props.onTimeout) == null ? void 0 : _d2.call(props, "channel");
+          return { end: true };
         }
       } else if (status === "SUCCESS") {
         setSubmitButtonStatus("success");
-        (_e = props.onSuccess) == null ? void 0 : _e.call(props);
-        return {
-          end: true
-        };
+        (_e2 = props.onSuccess) == null ? void 0 : _e2.call(props);
+        return { end: true };
       } else if (status === "EXPIRED") {
         setSubmitButtonStatus("unSubmit");
-        (_f = props.onExpired) == null ? void 0 : _f.call(props);
-        return {
-          end: true
-        };
+        (_f2 = props.onExpired) == null ? void 0 : _f2.call(props);
+        return { end: true };
       }
       setSubmitButtonStatus("unSubmit");
-      (_g = props.onSuccess) == null ? void 0 : _g.call(props);
-      return {
-        end: true
-      };
+      return { end: true };
     } catch (error) {
       if (isTimeoutError(error)) {
         if (search) {
@@ -190,19 +180,19 @@ const AliPay = w((props, ref) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_h = props.onError) == null ? void 0 : _h.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
+        (_g2 = props.onError) == null ? void 0 : _g2.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         setSubmitButtonStatus("unSubmit");
         return { end: true };
       }
     }
   }
   async function onSubmit() {
-    var _a;
+    var _a2;
     setErrorMsg("");
-    (_a = formRef.current) == null ? void 0 : _a.validate(async (errors) => {
-      var _a2;
+    (_a2 = formRef.current) == null ? void 0 : _a2.validate(async (errors) => {
+      var _a3;
       requiredBill && addressState.setValidateAllFields(true);
-      (_a2 = props.onSubmit) == null ? void 0 : _a2.call(props, errors);
+      (_a3 = props.onSubmit) == null ? void 0 : _a3.call(props, errors);
       if (errors) {
         setSubmitButtonStatus("unSubmit");
         return;
@@ -213,11 +203,11 @@ const AliPay = w((props, ref) => {
     });
   }
   const Button = () => {
-    const { transAmount } = (session == null ? void 0 : session.checkout) ?? {};
-    let { symbol = "", amount = "", digits } = transAmount ?? {};
-    if (amount && !isUndefined(digits))
-      amount = formatAmount(+amount, digits);
-    const text = i18n.get("common.pay") + (Number(amount) ? ` ${symbol}${amount}` : "");
+    const { transAmount, channelParams = {} } = (session == null ? void 0 : session.checkout) ?? {};
+    const { totalAmount } = channelParams.aliPay ?? {};
+    const amountObj = ((totalAmount == null ? void 0 : totalAmount.amount) ? totalAmount : transAmount) || {};
+    const amountText = (amountObj == null ? void 0 : amountObj.amount) ? formatAmount(amountObj).jointSymbol() : "";
+    const text = i18n.get("common.pay") + (amountText ? ` ${amountText}` : "");
     return /* @__PURE__ */ u(
       SubmitButton,
       {
@@ -235,6 +225,13 @@ const AliPay = w((props, ref) => {
     formRef.current = dom;
     dom && validateForm();
   };
+  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
+  };
   return /* @__PURE__ */ u(
     CoreContext.Provider,
     {
@@ -242,7 +239,7 @@ const AliPay = w((props, ref) => {
         i18n,
         session
       },
-      children: sessionReady && i18n.ready.value && /* @__PURE__ */ u(Form, { form, ref: setFormRef, onFormChange: (form2) => setForm(form2), children: [
+      children: sessionReady && 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(
           EmailField,
           {
@@ -257,13 +254,14 @@ const AliPay = w((props, ref) => {
           {
             ref: addressFieldRef,
             value: form.address,
+            country: ((_g = session == null ? void 0 : session.checkout) == null ? void 0 : _g.country) || ((_h = session == null ? void 0 : session.checkout) == null ? void 0 : _h.bill.country),
             onAddressChange: (value) => setForm(Object.assign(form, { address: value }))
           }
         ),
         (session == null ? void 0 : session.checkout.paymentType) === PaymentType.RECURRING && RecurringTip(),
         !!errorMsg && /* @__PURE__ */ u(Info, { className: bem("error"), content: errorMsg }),
         Button()
-      ] })
+      ] }) })
     }
   );
 });

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

@@ -1,13 +1,13 @@
 import { w, h, y, q, u, b } from "../../core.js";
 import { isTimeoutError } from "../../api/http.js";
-import { PaymentMethod } from "../../constant.js";
+import { SessionMode, PaymentMethod } from "../../constant.js";
+import "../../utils/card-brand/brands.js";
+import "../../utils/system-info/get-browser-info.js";
+import { parseE164, underscoreToUpperCamelCase } from "../../utils/format.js";
 import { getBrowserParams } from "../../api/modules/get-browser-params.js";
 import { getApplePayInfo, applePay, getMerchantSession } from "../../api/modules/apple-pay/index.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import "../../core/context.js";
-import "../../utils/card-brand/brands.js";
-import "../../utils/system-info/get-browser-info.js";
-import { parseE164, underscoreToUpperCamelCase } from "../../utils/format.js";
 import { PayKKaError } from "../../core/error.js";
 import { usePayState } from "../../hooks/usePayState.js";
 import { useRetry } from "../../hooks/useRetry.js";
@@ -43,7 +43,7 @@ async function applePayEnv(id) {
 }
 const { bem } = useBEM("apple-pay");
 const ApplePay = w((props) => {
-  const { session } = props;
+  const { session, isDropIn } = props;
   let applePaySession;
   const { i18n, sessionReady, fraudDetection } = usePayState(session);
   const [errorMsg, setErrorMsg] = h("");
@@ -52,19 +52,26 @@ const ApplePay = w((props) => {
     returnUrl: session == null ? void 0 : session.checkout.returnUrl
   });
   y(() => {
-    var _a;
+    var _a, _b, _c;
     if (!sessionReady) {
       return;
     }
-    const { status, paymentMethod = [] } = (session == null ? void 0 : session.checkout) || {};
+    const { status, paymentMethod = [], sessionMode } = (session == null ? void 0 : session.checkout) || {};
+    if (sessionMode === SessionMode.DROP_IN && !isDropIn) {
+      (_b = (_a = props.core.config).onInitError) == null ? void 0 : _b.call(
+        _a,
+        new PayKKaError("ERROR", "Please send the correct session when creating the checkout")
+      );
+      return;
+    }
     if (!paymentMethod.includes(PaymentMethod.APPLE_PAY)) {
       return;
     }
     loadApplePayJS(
       async () => {
-        var _a2, _b, _c, _d;
+        var _a2, _b2, _c2, _d;
         const envSupported = await applePayEnv(
-          (_c = (_b = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.channelParams) == null ? void 0 : _b.applePay) == null ? void 0 : _c.merchantIdentifier
+          (_c2 = (_b2 = (_a2 = session == null ? void 0 : session.checkout) == null ? void 0 : _a2.channelParams) == null ? void 0 : _b2.applePay) == null ? void 0 : _c2.merchantIdentifier
         );
         if (!envSupported) {
           return;
@@ -79,7 +86,7 @@ const ApplePay = w((props) => {
       }
     );
     if (status === "SUCCESS") {
-      (_a = props.onSuccess) == null ? void 0 : _a.call(props, getPaymentSuccessData());
+      (_c = props.onSuccess) == null ? void 0 : _c.call(props, getPaymentSuccessData());
     }
   }, [sessionReady]);
   const onTimeout = q(
@@ -135,24 +142,19 @@ const ApplePay = w((props) => {
               fraudDetectionId: fraudDetection == null ? void 0 : fraudDetection.fraudDetectionID
             })
           },
+          props.core,
           { locale: i18n.locale }
         );
       }());
       const { status, orderStatus, errorMessage, errorCode } = res;
       if (status === "PROCESSING") {
         if (orderStatus === "SUCCESS") {
-          applePaySession.completePayment({
-            status: 0
-          });
+          applePaySession.completePayment({ status: 0 });
           (_a = props.onSuccess) == null ? void 0 : _a.call(props, getPaymentSuccessData());
-          return {
-            end: true
-          };
+          return { end: true };
         } else if (orderStatus === "PROCESSING") {
           !search && await startReFetchPayInfo();
-          return {
-            end: !search
-          };
+          return { end: !search };
         } else if (orderStatus === "FAILURE") {
           setErrorMsg(errorMessage);
           (_b = props.onError) == null ? void 0 : _b.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
@@ -160,45 +162,29 @@ const ApplePay = w((props) => {
             status: 1,
             errors: [new ApplePayError("unknown", void 0, errorMessage)]
           });
-          return {
-            end: true
-          };
+          return { end: true };
         } else if (orderStatus === "AUTHORIZED") {
-          applePaySession.completePayment({
-            status: 0
-          });
+          applePaySession.completePayment({ status: 0 });
           (_c = props.onAuthorized) == null ? void 0 : _c.call(props);
-          return {
-            end: true
-          };
+          return { end: true };
         } else if (!orderStatus) {
           applePaySession.completePayment({
             status: 1,
             errors: [new ApplePayError("unknown", void 0, "")]
           });
-          return {
-            end: true
-          };
+          return { end: true };
         }
       } else if (status === "SUCCESS") {
         (_d = props.onSuccess) == null ? void 0 : _d.call(props, getPaymentSuccessData());
-        applePaySession.completePayment({
-          status: 0
-        });
-        return {
-          end: true
-        };
+        applePaySession.completePayment({ status: 0 });
+        return { end: true };
       } else if (status === "EXPIRED") {
         (_e = props.onExpired) == null ? void 0 : _e.call(props);
         applePaySession.abort();
-        return {
-          end: true
-        };
+        return { end: true };
       }
       (_f = props.onSuccess) == null ? void 0 : _f.call(props, getPaymentSuccessData());
-      return {
-        end: true
-      };
+      return { end: true };
     } catch (error) {
       if (isTimeoutError(error)) {
         if (search) {