@alipay/ams-checkout 0.0.1710212811-dev.1 → 0.0.1710212811-dev.3

package/esm/common/applepay/index.d.ts

@@ -6,7 +6,7 @@
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
 import { IGetMerchantSession, ICompletePaymentAuthorized, ICompleteApplePay, ILogError, IApplePayTrace } from './interface';
-import { IpaymentSessionMetaData } from '../../types';
+import { ApplePaySubTypeEnum, IpaymentSessionMetaData } from '../../types';
 /**
  * Apple Pay Service
  */
@@ -19,7 +19,6 @@ declare class ApplePayService {
     private completeApplePay;
     private logError;
     private applePayTrace;
-    private onEventCallback;
     constructor();
     /**
      * set Apple Pay Params
@@ -31,9 +30,11 @@ declare class ApplePayService {
      */
     setApplePayParams(getMerchantSession: IGetMerchantSession, completePaymentAuthorized: ICompletePaymentAuthorized, completeApplePay: ICompleteApplePay, logError: ILogError, applePayTrace: IApplePayTrace): void;
     /**
-     * Apple Pay is enabled
+     * Is Apple Pay Enabled
+     * @param subTypeEnum
+     * @returns
      */
-    isEnabled: () => boolean;
+    canMakePayments(subTypeEnum?: ApplePaySubTypeEnum): any;
     /**
      * has Active Card in Apple Pay
      * @param merchantIdentifier

package/esm/common/applepay/index.js

@@ -17,6 +17,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { APPLE_PAY_VERSION, APPLE_PAY_RECURRING_VERSION } from "./interface";
+import { ApplePaySubTypeEnum } from "../../types";
+
 /**
  * Apple Pay Service
  */
@@ -32,13 +34,6 @@ var ApplePayService = /*#__PURE__*/function () {
     _defineProperty(this, "completeApplePay", void 0);
     _defineProperty(this, "logError", void 0);
     _defineProperty(this, "applePayTrace", void 0);
-    _defineProperty(this, "onEventCallback", void 0);
-    /**
-     * Apple Pay is enabled
-     */
-    _defineProperty(this, "isEnabled", function () {
-      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() : false;
-    });
     _defineProperty(this, "onvalidatemerchant", function (event) {
       _this.applePayTrace('onValidateMerchant');
       _this.getMerchantSession({
@@ -183,14 +178,28 @@ var ApplePayService = /*#__PURE__*/function () {
       this.logError = logError;
       this.applePayTrace = applePayTrace;
     }
+
+    /**
+     * Is Apple Pay Enabled
+     * @param subTypeEnum 
+     * @returns 
+     */
   }, {
-    key: "hasActiveCard",
-    value: (
+    key: "canMakePayments",
+    value: function canMakePayments(subTypeEnum) {
+      if (ApplePaySubTypeEnum.ApplePayRecurringPayment === subTypeEnum) {
+        return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_RECURRING_VERSION) : false;
+      }
+      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_VERSION) : false;
+    }
+
     /**
      * has Active Card in Apple Pay
      * @param merchantIdentifier
      */
-    function () {
+  }, {
+    key: "hasActiveCard",
+    value: (function () {
       var _hasActiveCard = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(merchantIdentifier) {
         var _window3, ApplePaySession;
         return _regeneratorRuntime().wrap(function _callee$(_context) {

package/esm/core/applepay/index.d.ts

@@ -23,7 +23,7 @@ declare class ApplePayComponent extends CoreInstance {
      * @param subTypeEnum
      * @returns
      */
-    canMakePayments(subTypeEnum: ApplePaySubTypeEnum): any;
+    canMakePayments(subTypeEnum?: ApplePaySubTypeEnum): any;
     /**
      * Submit Pay
      * @param paymentSessionData

package/esm/core/applepay/index.js

@@ -28,12 +28,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
-import { ApplePaySubTypeEnum, componentSignEnum, environmentEnum, eventCodeEnum, productSceneEnum } from "../../types";
+import { componentSignEnum, environmentEnum, eventCodeEnum, productSceneEnum } from "../../types";
 import ApplePayService from "../../common/applepay";
 import { getComponentSign, parseSessionData } from "../component";
 import { getApplePayPaymentSession, submitPayInfo } from "../../service";
 import CoreInstance from "../instance";
-import { APPLE_PAY_RECURRING_VERSION, APPLE_PAY_VERSION } from "../../common/applepay/interface";
 import { EVENT } from "../../constant";
 
 /**
@@ -139,10 +138,7 @@ var ApplePayComponent = /*#__PURE__*/function (_CoreInstance) {
   }, {
     key: "canMakePayments",
     value: function canMakePayments(subTypeEnum) {
-      if (ApplePaySubTypeEnum.ApplePayRecurringPayment === subTypeEnum) {
-        return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_RECURRING_VERSION) : false;
-      }
-      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_VERSION) : false;
+      return window.ApplePaySession ? this._applePayService.canMakePayments(subTypeEnum) : false;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1710212811-dev.1",
+  "version": "0.0.1710212811-dev.3",
   "description": "",
   "author": "",
   "main": "esm/index.js",