@paykka/card-checkout-ui 0.11.6 → 0.13.1

package/dist/es/api/index.js

@@ -1,3 +1,4 @@
 import "./http.js";
 import "../utils/card-brand/brands.js";
 import "../utils/system-info/get-browser-info.js";
+import "../core.js";

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

@@ -1,7 +1,7 @@
 import { mergeAsyncFn } from "../../../utils/merge-async-fn.js";
 import { http } from "../../http.js";
 import { addressItemMap } from "./map.js";
-async function getCountry(options) {
+const getCountry = async (options) => {
   return http.get("/pub/datadict/get/COUNTRY", void 0, options).then((res) => {
     var _a;
     const { values } = res;
@@ -10,12 +10,12 @@ async function getCountry(options) {
       value: item.value
     }))) ?? [];
   });
-}
-async function getAddressFormat(countryCode, options) {
-  return http.post(`/address/style/${countryCode}`, void 0, options).then(({ address_style_list }) => {
+};
+const getAddressFormat = async (country, options) => {
+  return http.post(`/address/style/${country}`, void 0, options).then(({ address_style_list }) => {
     return address_style_list.map((item) => addressItemMap(item));
   });
-}
+};
 const mergedGetAddressFormat = mergeAsyncFn(getAddressFormat, {
   argsResolver(items) {
     return items == null ? void 0 : items[0].args;
@@ -24,7 +24,7 @@ const mergedGetAddressFormat = mergeAsyncFn(getAddressFormat, {
     return result;
   }
 });
-async function getProvince(country, options) {
+const getProvince = async (country, options) => {
   return http.post(`/address/province-dict/${country}`, void 0, options).then((res) => {
     var _a;
     return (_a = res == null ? void 0 : res.map) == null ? void 0 : _a.call(res, ({ code, description }) => {
@@ -34,7 +34,7 @@ async function getProvince(country, options) {
       };
     });
   });
-}
+};
 const mergedGetProvince = mergeAsyncFn(getProvince, {
   argsResolver(items) {
     return items == null ? void 0 : items[0].args;
@@ -43,7 +43,7 @@ const mergedGetProvince = mergeAsyncFn(getProvince, {
     return result;
   }
 });
-async function getCity(province) {
+const getCity = async (province) => {
   return http.post(`/address/city-dict/${province}`).then((res) => {
     var _a;
     return (_a = res == null ? void 0 : res.map) == null ? void 0 : _a.call(res, ({ code, description }) => {
@@ -53,7 +53,7 @@ async function getCity(province) {
       };
     });
   });
-}
+};
 export {
   getCity,
   getCountry,

package/dist/es/api/modules/ali-pay/index.js

@@ -1,54 +1,15 @@
-import { PaymentMethod } from "../../../constant.js";
-import "../../../utils/card-brand/brands.js";
-import "../../../utils/system-info/get-browser-info.js";
-import { deepMerge } from "../../../utils/object.js";
+import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
-import { getBrowserParams } from "../get-browser-params.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
 import { payResMap } from "../map.js";
-async function aliPay({
-  sessionId,
-  clientKey,
-  bill
-}, core, options) {
-  const { _getExtraParams } = core.config;
-  const extraParams = _getExtraParams == null ? void 0 : _getExtraParams("payment", PaymentMethod.ALI_PAY);
-  const params = deepMerge({
-    bill: {
-      email: bill.email,
-      country: bill.country,
-      state: bill.province,
-      city: bill.city,
-      postal_code: bill.postCode,
-      address_line1: bill.address1,
-      address_line2: bill.address2,
-      county: bill.area
-    }
-  }, extraParams || {});
-  return http.post(
-    "/session/payments",
-    {
-      ...params,
-      session_id: sessionId,
-      client_key: clientKey,
-      payment: {
-        payment_method: PaymentMethod.ALI_PAY
-      },
-      browser: await getBrowserParams()
-    },
-    options
-  ).then(payResMap);
-}
-async function getAliPayInfo({ sessionId, clientKey }, options) {
-  return http.post(
-    "/session/payments/query",
-    {
-      session_id: sessionId,
-      client_key: clientKey,
-      payment_method: PaymentMethod.ALI_PAY
-    },
-    options
-  ).then(payResMap);
-}
+const aliPay = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
+};
+const getAliPayInfo = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
+};
 export {
   aliPay,
   getAliPayInfo

package/dist/es/api/modules/apple-pay/index.js

@@ -1,64 +1,18 @@
-import { PaymentMethod } from "../../../constant.js";
-import "../../../utils/card-brand/brands.js";
-import "../../../utils/system-info/get-browser-info.js";
-import { deepMerge } from "../../../utils/object.js";
+import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
 import { payResMap } from "../map.js";
-async function getMerchantSession(options) {
-  return http.post(`/session/apple-pay/create-session`, options);
-}
-async function applePay({
-  sessionId,
-  clientKey,
-  token,
-  bill,
-  browser
-}, core, options) {
-  const { _getExtraParams } = core.config;
-  const extraParams = _getExtraParams == null ? void 0 : _getExtraParams("payment", PaymentMethod.APPLE_PAY);
-  const params = deepMerge({
-    bill: {
-      first_name: bill == null ? void 0 : bill.firstName,
-      middle_name: bill == null ? void 0 : bill.middleName,
-      last_name: bill == null ? void 0 : bill.lastName,
-      address_line1: bill == null ? void 0 : bill.addressLine1,
-      address_line2: bill == null ? void 0 : bill.addressLine2,
-      country: bill == null ? void 0 : bill.country,
-      state: bill == null ? void 0 : bill.state,
-      city: bill == null ? void 0 : bill.city,
-      email: bill == null ? void 0 : bill.email,
-      postal_code: bill == null ? void 0 : bill.postalCode,
-      area_code: bill == null ? void 0 : bill.areaCode,
-      phone_number: bill == null ? void 0 : bill.phoneNumber,
-      descriptor: bill == null ? void 0 : bill.descriptor
-    }
-  }, extraParams || {});
-  return http.post(
-    "/session/payments",
-    {
-      ...params,
-      session_id: sessionId,
-      client_key: clientKey,
-      payment: {
-        payment_method: PaymentMethod.APPLE_PAY,
-        token_data: token
-      },
-      browser
-    },
-    options
-  ).then(payResMap);
-}
-async function getApplePayInfo({ sessionId, clientKey }, options) {
-  return http.post(
-    "/session/payments/query",
-    {
-      session_id: sessionId,
-      client_key: clientKey,
-      payment_method: PaymentMethod.APPLE_PAY
-    },
-    options
-  ).then(payResMap);
-}
+const getMerchantSession = async (options) => {
+  return http.post(`${apiPrefix}/apple-pay/create-session`, options);
+};
+const applePay = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
+};
+const getApplePayInfo = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
+};
 export {
   applePay,
   getApplePayInfo,

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

@@ -1,54 +1,14 @@
-import { PaymentMethod } from "../../../constant.js";
-import "../../../utils/card-brand/brands.js";
-import "../../../utils/system-info/get-browser-info.js";
-import { deepMerge } from "../../../utils/object.js";
 import { http } from "../../http.js";
 import { payResMap } from "../map.js";
-const boostPay = async ({
-  sessionId,
-  clientKey,
-  payment,
-  bill,
-  browser
-}, core, options) => {
-  const { _getExtraParams } = core.config;
-  const extraParams = _getExtraParams == null ? void 0 : _getExtraParams("payment", payment.paymentMethod);
-  const params = deepMerge({
-    bill: {
-      email: bill.email,
-      country: bill.country,
-      state: bill.province,
-      city: bill.city,
-      postal_code: bill.postCode,
-      address_line1: bill.address1,
-      address_line2: bill.address2,
-      county: bill.area
-    }
-  }, extraParams || {});
-  return http.post(
-    "/session/payments",
-    {
-      ...params,
-      session_id: sessionId,
-      client_key: clientKey,
-      payment: {
-        payment_method: payment.paymentMethod
-      },
-      browser
-    },
-    options
-  ).then(payResMap);
+import { apiPrefix } from "../../../config.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
+const boostPay = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
 };
-const getBoostPayInfo = async ({ sessionId, clientKey }, options) => {
-  return http.post(
-    "/session/payments/query",
-    {
-      session_id: sessionId,
-      client_key: clientKey,
-      payment_method: PaymentMethod.BOOST
-    },
-    options
-  ).then(payResMap);
+const getBoostPayInfo = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
 };
 export {
   boostPay,

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

@@ -1,59 +1,15 @@
-import "../../../utils/card-brand/brands.js";
-import "../../../utils/system-info/get-browser-info.js";
-import { deepMerge } from "../../../utils/object.js";
+import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
 import { payResMap } from "../map.js";
-async function cardPay({
-  sessionId,
-  clientKey,
-  payment,
-  bill,
-  browser
-}, extraParams, options) {
-  const params = deepMerge({
-    bill: {
-      email: bill.email,
-      country: bill.country,
-      state: bill.province,
-      city: bill.city,
-      postal_code: bill.postCode,
-      address_line1: bill.address1,
-      address_line2: bill.address2,
-      county: bill.area
-    }
-  }, extraParams || {});
-  return http.post(
-    "/session/payments",
-    {
-      ...params,
-      session_id: sessionId,
-      client_key: clientKey,
-      payment: {
-        payment_method: payment.paymentMethod,
-        card_no: payment.cardNo,
-        exp_year: payment.expYear,
-        exp_month: payment.expMonth,
-        cvv: payment.cvv,
-        holder_name: payment.holderName,
-        store_payment_method: payment.storePaymentMethod,
-        token_usage: payment.tokenUsage,
-        token: payment.token
-      },
-      browser
-    },
-    options
-  ).then(payResMap);
-}
-async function getCardPayInfo({ sessionId, clientKey }, options) {
-  return http.post(
-    "/session/payments/query",
-    {
-      session_id: sessionId,
-      client_key: clientKey
-    },
-    options
-  ).then(payResMap);
-}
+const cardPay = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
+};
+const getCardPayInfo = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
+};
 export {
   cardPay,
   getCardPayInfo

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

@@ -1,25 +1,27 @@
 import { RequestCacheManager } from "../../../utils/request-cache-manager.js";
+import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
 import { getBrowserParams } from "../get-browser-params.js";
 import { checkoutMap } from "./map.js";
-const queryCheckout = async ({ sessionId, clientKey }, options) => {
+const queryCheckout = async (params, extraParams = {}, options) => {
   return http.post(
-    "/session/info",
+    `${apiPrefix}/info`,
     {
-      session_id: sessionId,
-      client_key: clientKey,
+      session_id: params.sessionId,
+      client_key: params.clientKey,
+      ...extraParams,
       browser: await getBrowserParams()
     },
     options
   );
 };
-const getCheckoutInfo = async ({ sessionId, clientKey }, options) => {
-  const checkoutInfo = await queryCheckout({ sessionId, clientKey }, options);
-  return checkoutMap({ ...checkoutInfo, ...checkoutInfo == null ? void 0 : checkoutInfo.support_methods });
+const getCheckoutInfo = async (params, extraParams = {}, options) => {
+  const checkoutInfo = await queryCheckout(params, extraParams, options);
+  return checkoutMap(checkoutInfo);
 };
 const requestCacheManager = new RequestCacheManager();
-const onceGetCheckoutInfo = async (params, options) => {
-  const request = getCheckoutInfo(params, options);
+const onceGetCheckoutInfo = async (params, extraParams = {}, options) => {
+  const request = getCheckoutInfo(params, extraParams, options);
   return requestCacheManager.cacheRequest(JSON.stringify(params), request);
 };
 export {

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

@@ -1,7 +1,7 @@
 import { PaymentMethod } from "../../../constant.js";
 import { amountMap } from "../map.js";
-function formatPaymentMethodInfo(paymentMethods = []) {
-  const paymentMethod = [];
+const formatPaymentMethodInfo = (paymentMethods = []) => {
+  const supportMethods = [];
   const channelParams = {};
   paymentMethods.forEach(({ value, configuration = {} }) => {
     if (value === PaymentMethod.APPLE_PAY) {
@@ -38,17 +38,17 @@ function formatPaymentMethodInfo(paymentMethods = []) {
       };
     }
     if (value === PaymentMethod.BANKCARD) {
-      paymentMethod.push(...configuration.allowed_card_networks || []);
+      supportMethods.push(...configuration.allowed_card_networks || []);
     } else {
-      paymentMethod.push(value);
+      supportMethods.push(value);
     }
   });
   return {
-    paymentMethod,
+    supportMethods,
     channelParams
   };
-}
-function formatAmountBreakdown(info = {}) {
+};
+const formatAmountBreakdown = (info = {}) => {
   return {
     goodsTax: amountMap(info.goods_tax),
     shippingAmount: amountMap(info.shipping_amount),
@@ -56,10 +56,11 @@ function formatAmountBreakdown(info = {}) {
     discount: amountMap(info.discount),
     other: amountMap(info.other)
   };
-}
-function checkoutMap(res = {}) {
-  var _a, _b, _c;
-  const { theme, bill, payment_methods, field } = res;
+};
+const checkoutMap = (res = {}) => {
+  var _a, _b;
+  const { theme, field, support_methods = {} } = res;
+  const { payment_methods, bill, tokens } = support_methods;
   const paymentMethodsInfo = formatPaymentMethodInfo(payment_methods);
   const sessionMode = res.session_mode === "HOST" ? "HOSTED" : res.session_mode;
   return {
@@ -69,13 +70,17 @@ function checkoutMap(res = {}) {
     status: res.status,
     transAmount: amountMap(res.trans_amount),
     expireTime: res.expire_time,
-    sessionMode,
+    paymentMethod: res.payment_method,
+    // 兼容其他收银台，没有 session_mode 字段就默认 HOSTED
+    sessionMode: sessionMode || "HOSTED",
     merchantName: (_a = res.theme) == null ? void 0 : _a.merchant_name,
     returnUrl: res.return_url,
     cancelUrl: res.cancel_url,
     locale: res.locale,
-    paymentType: res.payment_type,
-    goods: res.goods ? res.goods : [],
+    // 兼容其他收银台，没有 payment_type 字段就默认 PURCHASE
+    paymentType: res.payment_type || "PURCHASE",
+    orderId: res.order_id,
+    goods: res.goods || [],
     theme: {
       merchantName: theme == null ? void 0 : theme.merchant_name,
       logo: theme == null ? void 0 : theme.logo,
@@ -91,13 +96,13 @@ function checkoutMap(res = {}) {
       descriptor: bill == null ? void 0 : bill.descriptor,
       country: bill == null ? void 0 : bill.country
     },
-    tokens: (_b = res.tokens) == null ? void 0 : _b.map((card) => ({
+    tokens: tokens == null ? void 0 : tokens.map((card) => ({
       token: card.token,
       last4: card.last4,
       cardBrand: card.card_brand,
       billingAddressFilled: card.billing_address_filled
     })),
-    storePaymentMethod: (_c = res.payment) == null ? void 0 : _c.store_payment_method,
+    storePaymentMethod: (_b = res.payment) == null ? void 0 : _b.store_payment_method,
     field: {
       holderName: {
         show: !!(field == null ? void 0 : field.holder_name_display),
@@ -114,9 +119,11 @@ function checkoutMap(res = {}) {
       }
     },
     amountBreakdown: formatAmountBreakdown(res.amount_breakdown),
-    ...paymentMethodsInfo
+    finishTime: res.utc_finish_time,
+    ...paymentMethodsInfo,
+    rawResponse: res
   };
-}
+};
 export {
   checkoutMap,
   formatPaymentMethodInfo

package/dist/es/api/modules/encrypted-card/index.js

@@ -1,5 +1,6 @@
 import { intersection } from "../../../utils/index.js";
 import { http } from "../../http.js";
+import "../../../core.js";
 import { formatPaymentMethodInfo } from "../checkout/map.js";
 import { cardBrandCodes } from "../../../utils/card-brand/brands.js";
 const verifyClientKey = async (clientKey, merchantId, options) => {
@@ -12,8 +13,8 @@ const verifyClientKey = async (clientKey, merchantId, options) => {
     options
   ).then((res) => {
     var _a;
-    const { paymentMethod } = formatPaymentMethodInfo(((_a = res.support_methods) == null ? void 0 : _a.payment_methods) || []);
-    const brands = intersection(cardBrandCodes, paymentMethod);
+    const { supportMethods } = formatPaymentMethodInfo(((_a = res.support_methods) == null ? void 0 : _a.payment_methods) || []);
+    const brands = intersection(cardBrandCodes, supportMethods);
     return {
       brands
     };

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

@@ -1,54 +1,14 @@
-import { PaymentMethod } from "../../../constant.js";
-import "../../../utils/card-brand/brands.js";
-import "../../../utils/system-info/get-browser-info.js";
-import { deepMerge } from "../../../utils/object.js";
+import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
 import { payResMap } from "../map.js";
-const gcashPay = async ({
-  sessionId,
-  clientKey,
-  payment,
-  bill,
-  browser
-}, core, options) => {
-  const { _getExtraParams } = core.config;
-  const extraParams = _getExtraParams == null ? void 0 : _getExtraParams("payment", payment.paymentMethod);
-  const params = deepMerge({
-    bill: {
-      email: bill.email,
-      country: bill.country,
-      state: bill.province,
-      city: bill.city,
-      postal_code: bill.postCode,
-      address_line1: bill.address1,
-      address_line2: bill.address2,
-      county: bill.area
-    }
-  }, extraParams || {});
-  return http.post(
-    "/session/payments",
-    {
-      ...params,
-      session_id: sessionId,
-      client_key: clientKey,
-      payment: {
-        payment_method: payment.paymentMethod
-      },
-      browser
-    },
-    options
-  ).then(payResMap);
+const gcashPay = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
 };
-const getGcashPayInfo = async ({ sessionId, clientKey }, options) => {
-  return http.post(
-    "/session/payments/query",
-    {
-      session_id: sessionId,
-      client_key: clientKey,
-      payment_method: PaymentMethod.GCASH
-    },
-    options
-  ).then(payResMap);
+const getGcashPayInfo = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
 };
 export {
   gcashPay,

package/dist/es/api/modules/google-pay/index.js

@@ -1,61 +1,15 @@
-import { PaymentMethod } from "../../../constant.js";
-import "../../../utils/card-brand/brands.js";
-import "../../../utils/system-info/get-browser-info.js";
-import { deepMerge } from "../../../utils/object.js";
+import { apiPrefix } from "../../../config.js";
 import { http } from "../../http.js";
+import { buildPaymentParams, buildQueryParams } from "../../utils/index.js";
 import { payResMap } from "../map.js";
-async function googlePay({
-  sessionId,
-  clientKey,
-  token,
-  bill,
-  browser
-}, core, options) {
-  const { _getExtraParams } = core.config;
-  const extraParams = _getExtraParams == null ? void 0 : _getExtraParams("payment", PaymentMethod.GOOGLE_PAY);
-  const params = deepMerge({
-    bill: {
-      first_name: bill == null ? void 0 : bill.firstName,
-      middle_name: bill == null ? void 0 : bill.middleName,
-      last_name: bill == null ? void 0 : bill.lastName,
-      address_line1: bill == null ? void 0 : bill.addressLine1,
-      address_line2: bill == null ? void 0 : bill.addressLine2,
-      country: bill == null ? void 0 : bill.country,
-      state: bill == null ? void 0 : bill.state,
-      city: bill == null ? void 0 : bill.city,
-      email: bill == null ? void 0 : bill.email,
-      postal_code: bill == null ? void 0 : bill.postalCode,
-      area_code: bill == null ? void 0 : bill.areaCode,
-      phone_number: bill == null ? void 0 : bill.phoneNumber,
-      descriptor: bill == null ? void 0 : bill.descriptor
-    }
-  }, extraParams || {});
-  return http.post(
-    "/session/payments",
-    {
-      ...params,
-      session_id: sessionId,
-      client_key: clientKey,
-      payment: {
-        payment_method: PaymentMethod.GOOGLE_PAY,
-        token_data: token
-      },
-      browser
-    },
-    options
-  ).then(payResMap);
-}
-async function getGooglePayInfo({ sessionId, clientKey }, options) {
-  return http.post(
-    "/session/payments/query",
-    {
-      session_id: sessionId,
-      client_key: clientKey,
-      payment_method: PaymentMethod.GOOGLE_PAY
-    },
-    options
-  ).then(payResMap);
-}
+const googlePay = async (params, extraParams, options) => {
+  const paymentParams = buildPaymentParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments`, paymentParams, options).then(payResMap);
+};
+const getGooglePayInfo = async (params, extraParams, options) => {
+  const queryParams = buildQueryParams(params, extraParams);
+  return http.post(`${apiPrefix}/payments/query`, queryParams, options).then(payResMap);
+};
 export {
   getGooglePayInfo,
   googlePay