From e15d25e94816024bf7c54c456964f910f5472765 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 30 Jul 2024 14:07:28 -0400 Subject: [PATCH 1/2] CSR-2130 include mac check CSR-2130 include mac check --- src/mixins/base-mixin.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index d597348dc..ad43c8fb6 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -201,9 +201,10 @@ export default { return formValidateResponse?.valid; }, showApplePay() { - if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) { - var iOSversion = this.getiOSversion(); - if (iOSversion && iOSversion[0] >= 17) { + var iOSversion = this.getiOSversion(); + var isMacOS = navigator.platform.indexOf("Mac") !== -1 ? true : false; + if (isMacOS || (iOSversion && iOSversion[0] >= 17)) { + if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) { return true; } } From 337af181803ace0f0910220b74b74dd1e665092f Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 30 Jul 2024 14:34:09 -0400 Subject: [PATCH 2/2] CSR-2130 unnecessary ternary CSR-2130 unnecessary ternary --- src/mixins/base-mixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index ad43c8fb6..9d02e41a0 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -202,7 +202,7 @@ export default { }, showApplePay() { var iOSversion = this.getiOSversion(); - var isMacOS = navigator.platform.indexOf("Mac") !== -1 ? true : false; + var isMacOS = navigator.platform.indexOf("Mac") !== -1; if (isMacOS || (iOSversion && iOSversion[0] >= 17)) { if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) { return true;