Merge branch 'develop'

mollie · Nov 14, 2022 · 5e568a9 · 5e568a9
2 parents e554c8b + 026dbbe
commit 5e568a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/cartridges/int_mollie_sfra/cartridge/client/default/js/components/applePay.js b/cartridges/int_mollie_sfra/cartridge/client/default/js/components/applePay.js
@@ -99,7 +99,7 @@ module.exports = {
         $(document).on('applepay:init', function (e, data) {
             const { $container, productData } = data;
 
-            if (location.protocol !== 'https:' || !ApplePaySession.supportsVersion(appleSessionVersion)) {
+            if (!window.ApplePaySession || location.protocol !== 'https:' || !ApplePaySession.supportsVersion(appleSessionVersion)) {
                 return;
             }
 

diff --git a/cartridges/int_mollie_sfra/cartridge/client/default/js/components/applePaySessionService.js b/cartridges/int_mollie_sfra/cartridge/client/default/js/components/applePaySessionService.js
@@ -5,22 +5,23 @@
 const httpUtils = require('../utils/http');
 
 const ACTION = window.dw.applepay && window.dw.applepay.action;
-const STATUSES = {
-    Failure: ApplePaySession.STATUS_FAILURE,
-    InvalidBillingPostalAddress: ApplePaySession.STATUS_INVALID_BILLING_POSTAL_ADDRESS,
-    InvalidShippingPostalAddress: ApplePaySession.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
-    InvalidShippingContact: ApplePaySession.STATUS_INVALID_SHIPPING_CONTACT,
-    PINRequired: ApplePaySession.STATUS_PIN_REQUIRED,
-    PINIncorrect: ApplePaySession.STATUS_PIN_INCORRECT,
-    PINLockout: ApplePaySession.STATUS_PIN_LOCKOUT
-};
 const AppleSession = require('./applePaySession');
 
+
 /** Map Apple Pay Session statusses
  * @param {string} status - status to be mapped
  * @returns {number} AppleSession status
  */
 function mapStatus(status) {
+    const STATUSES = {
+        Failure: ApplePaySession.STATUS_FAILURE,
+        InvalidBillingPostalAddress: ApplePaySession.STATUS_INVALID_BILLING_POSTAL_ADDRESS,
+        InvalidShippingPostalAddress: ApplePaySession.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+        InvalidShippingContact: ApplePaySession.STATUS_INVALID_SHIPPING_CONTACT,
+        PINRequired: ApplePaySession.STATUS_PIN_REQUIRED,
+        PINIncorrect: ApplePaySession.STATUS_PIN_INCORRECT,
+        PINLockout: ApplePaySession.STATUS_PIN_LOCKOUT
+    };
     if (status && STATUSES[status]) {
         return STATUSES[status];
     }