@paykka/card-checkout-ui 0.6.0 → 0.7.0

package/dist/es/api/index.js

@@ -1,5 +1,3 @@
 import "../utils/card-brand/brands.js";
 import "../utils/system-info/get-browser-info.js";
-import "../i18n/util.js";
 import "../core.js";
-import "../i18n/locales/index.js";

package/dist/es/api/modules/checkout/index.js

@@ -12,23 +12,9 @@ async function queryCheckout({ sessionId, clientKey }, options) {
     options
   );
 }
-function getPaymentMethods({ sessionId, clientKey }, options) {
-  return http.post(
-    "/session/payment-methods",
-    {
-      session_id: sessionId,
-      client_key: clientKey
-    },
-    options
-  );
-}
 async function getCheckoutInfo({ sessionId, clientKey }, options) {
   const checkoutInfo = await queryCheckout({ sessionId, clientKey }, options);
-  let paymentMethods = {};
-  if (checkoutInfo) {
-    paymentMethods = await getPaymentMethods({ sessionId, clientKey }, options);
-  }
-  return checkoutMap({ ...checkoutInfo, ...paymentMethods });
+  return checkoutMap({ ...checkoutInfo, ...checkoutInfo == null ? void 0 : checkoutInfo.support_methods });
 }
 let getCheckoutInfoIns;
 async function onceGetCheckoutInfo({ sessionId, clientKey }, options) {

package/dist/es/api/modules/checkout/map.js

@@ -34,15 +34,17 @@ function formatPaymentMethodInfo(paymentMethods = []) {
 }
 function checkoutMap(res = {}) {
   var _a, _b, _c;
-  const { theme, bill, payment_methods } = res;
+  const { theme, bill, payment_methods, field } = res;
   const paymentMethodsInfo = formatPaymentMethodInfo(payment_methods);
+  const sessionMode = res.session_mode === "HOST" ? "HOSTED" : res.session_mode;
   return {
+    country: res.country,
     merchantId: res.merchant_id,
     sessionId: res.session_id,
     status: res.status,
     transAmount: amountMap(res.trans_amount),
     expireTime: res.expire_time,
-    sessionMode: res.session_mode,
+    sessionMode,
     merchantName: (_a = res.theme) == null ? void 0 : _a.merchant_name,
     returnUrl: res.return_url,
     locale: res.locale,
@@ -60,7 +62,8 @@ function checkoutMap(res = {}) {
       addressLine1: bill == null ? void 0 : bill.address_line1,
       addressLine2: bill == null ? void 0 : bill.address_line2,
       email: bill == null ? void 0 : bill.email,
-      descriptor: bill == null ? void 0 : bill.descriptor
+      descriptor: bill == null ? void 0 : bill.descriptor,
+      country: bill == null ? void 0 : bill.country
     },
     tokens: (_b = res.tokens) == null ? void 0 : _b.map((card) => ({
       token: card.token,
@@ -69,6 +72,20 @@ function checkoutMap(res = {}) {
       billingAddressFilled: card.billing_address_filled
     })),
     storePaymentMethod: (_c = res.payment) == null ? void 0 : _c.store_payment_method,
+    field: {
+      holderName: {
+        show: !!(field == null ? void 0 : field.holder_name_display),
+        required: !!(field == null ? void 0 : field.holder_name_required)
+      },
+      email: {
+        show: !!(field == null ? void 0 : field.bill_email_display),
+        required: !!(field == null ? void 0 : field.bill_email_required)
+      },
+      address: {
+        show: !!(field == null ? void 0 : field.bill_address_display),
+        required: !!(field == null ? void 0 : field.bill_address_required)
+      }
+    },
     ...paymentMethodsInfo
   };
 }

package/dist/es/api/modules/index.js

@@ -1,5 +1,3 @@
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import "../../i18n/util.js";
 import "../../core.js";
-import "../../i18n/locales/index.js";

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

@@ -2,9 +2,6 @@ import { u } from "../../core.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
 import { useI18n } from "../../hooks/useI18n.js";
-import "../../core/context.js";
-import "../../i18n/util.js";
-import "../../i18n/locales/index.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";

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

@@ -4,12 +4,9 @@ import { EAddressType } from "../../constant.js";
 import { createAddressCore } from "../../core/Address.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { useI18n } from "../../hooks/useI18n.js";
-import "../../core/context.js";
 import { isArray, isNil } from "../../utils/is.js";
 import "../../utils/card-brand/brands.js";
 import "../../utils/system-info/get-browser-info.js";
-import "../../i18n/util.js";
-import "../../i18n/locales/index.js";
 import "../internal/Form/type.js";
 import "../internal/Form/context.js";
 import { FormItem } from "../internal/Form/FormItem.js";
@@ -107,10 +104,8 @@ const AddressField = w((props, ref) => {
     });
   }
   async function getDefaultCountry() {
-    const language = navigator.language;
-    const areaCode = language.split("-");
-    const countryCode = (areaCode == null ? void 0 : areaCode[1]) ?? "US";
-    onSelectCountry(countryCode);
+    const countryCode = props.country;
+    onSelectCountry(countryCode || "");
     onAddressChange({
       country: addressState.country ?? "",
       province: addressState.province ?? "",

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

@@ -7,8 +7,7 @@ import "../../utils/system-info/get-browser-info.js";
 import { formatAmount } from "../../utils/format.js";
 import { PaymentType } from "../../constant.js";
 import { CoreContext } from "../../core/context.js";
-import "../../i18n/util.js";
-import "../../i18n/locales/index.js";
+import { PayKKaError } from "../../core/error.js";
 import { createAddressCore } from "../../core/Address.js";
 import { useBEM } from "../../hooks/useBEM.js";
 import { usePayState } from "../../hooks/usePayState.js";
@@ -24,9 +23,10 @@ import { RecurringTip } from "../RecurringTip/index.js";
 import { SubmitButton } from "../SubmitButton/index.js";
 const { bem } = useBEM("ali-pay");
 const AliPay = w((props, ref) => {
+  const { session } = props;
   let addressState = createAddressCore();
   let emailState = createEmailCore();
-  const { setErrorMsg, i18n, session, errorMsg, sessionReady } = usePayState();
+  const { setErrorMsg, i18n, errorMsg, sessionReady } = usePayState(session);
   const [submitButtonStatus, setSubmitButtonStatus] = h("unSubmit");
   const formRef = A(null);
   const [form, setForm] = h({
@@ -131,7 +131,7 @@ const AliPay = w((props, ref) => {
         },
         { locale: i18n.locale, timeout }
       );
-      const { status, orderStatus, errorMessage } = res;
+      const { status, orderStatus, errorMessage, errorCode } = res;
       !search && ((_a = props.onSubmitResponse) == null ? void 0 : _a.call(props, res));
       if (status === "PROCESSING") {
         if (!orderStatus) {
@@ -145,7 +145,7 @@ const AliPay = w((props, ref) => {
         } else if (orderStatus === "FAILURE") {
           setErrorMsg(errorMessage);
           setSubmitButtonStatus("unSubmit");
-          (_c = props.onError) == null ? void 0 : _c.call(props, "FAILURE");
+          (_c = props.onError) == null ? void 0 : _c.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           return {
             end: true
           };
@@ -188,8 +188,9 @@ const AliPay = w((props, ref) => {
           return { end: true };
         }
       } else {
-        setErrorMsg(error.i18nKey ? i18n.get(error.i18nKey) : error.message);
-        (_h = props.onError) == null ? void 0 : _h.call(props, error);
+        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 }));
         setSubmitButtonStatus("unSubmit");
         return { end: true };
       }

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

@@ -8,8 +8,7 @@ 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 "../../i18n/util.js";
-import "../../i18n/locales/index.js";
+import { PayKKaError } from "../../core/error.js";
 import { usePayState } from "../../hooks/usePayState.js";
 import { useRetry } from "../../hooks/useRetry.js";
 import { Info } from "../internal/Info/Info.js";
@@ -44,8 +43,9 @@ async function applePayEnv(id) {
 }
 const { bem } = useBEM("apple-pay");
 const ApplePay = w((props) => {
+  const { session } = props;
   let applePaySession;
-  const { i18n, session, sessionReady, fraudDetection } = usePayState();
+  const { i18n, sessionReady, fraudDetection } = usePayState(session);
   const [errorMsg, setErrorMsg] = h("");
   const [showApplePay, setShowApplePay] = h(false);
   const getPaymentSuccessData = () => ({
@@ -62,7 +62,7 @@ const ApplePay = w((props) => {
     }
     loadApplePayJS(
       async () => {
-        var _a2, _b, _c, _d, _e;
+        var _a2, _b, _c, _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
         );
@@ -71,7 +71,6 @@ const ApplePay = w((props) => {
         }
         setShowApplePay(true);
         (_d = props.onLoad) == null ? void 0 : _d.call(props, true);
-        console.log((_e = ApplePaySession.canMakePayments) == null ? void 0 : _e.call(ApplePaySession));
       },
       () => {
         var _a2;
@@ -139,7 +138,7 @@ const ApplePay = w((props) => {
           { locale: i18n.locale }
         );
       }());
-      const { status, orderStatus, errorMessage } = res;
+      const { status, orderStatus, errorMessage, errorCode } = res;
       if (status === "PROCESSING") {
         if (orderStatus === "SUCCESS") {
           applePaySession.completePayment({
@@ -156,7 +155,7 @@ const ApplePay = w((props) => {
           };
         } else if (orderStatus === "FAILURE") {
           setErrorMsg(errorMessage);
-          (_b = props.onError) == null ? void 0 : _b.call(props, "FAILURE");
+          (_b = props.onError) == null ? void 0 : _b.call(props, new PayKKaError("API_ERROR", errorMessage, { code: errorCode }));
           applePaySession.completePayment({
             status: 1,
             errors: [new ApplePayError("unknown", void 0, errorMessage)]
@@ -211,7 +210,7 @@ const ApplePay = w((props) => {
       } else {
         const message = error.i18nKey ? i18n.get(error.i18nKey) : error.message;
         setErrorMsg(message);
-        (_g = props.onError) == null ? void 0 : _g.call(props, error);
+        (_g = props.onError) == null ? void 0 : _g.call(props, new PayKKaError("API_ERROR", message, { code: error.code, cause: error }));
         applePaySession.completePayment({
           status: 1,
           errors: [new ApplePayError("unknown", void 0, message)]