optmize reCaptcha

airwallex · Oct 18, 2024 · c060929 · c060929
1 parent 76cf93b
commit c060929
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/view/frontend/web/js/view/payment/method-renderer/express-checkout.js b/view/frontend/web/js/view/payment/method-renderer/express-checkout.js
@@ -196,6 +196,13 @@ define(
                 return this.paymentConfig.checkout.indexOf('apple_pay') !== -1;
             },
 
+            deviceSupportApplePay() {
+                const APPLE_PAY_VERSION = 4;
+                return 'ApplePaySession' in window && ApplePaySession.supportsVersion && ApplePaySession.canMakePayments &&
+                    ApplePaySession.supportsVersion(APPLE_PAY_VERSION) &&
+                    ApplePaySession.canMakePayments()
+            },
+
             createPays() {
                 if (this.isGooglePayActive()) {
                     googlepay.create(this);

diff --git a/view/frontend/web/js/view/payment/method-renderer/express/applepay.js b/view/frontend/web/js/view/payment/method-renderer/express/applepay.js
@@ -34,6 +34,12 @@ define([
             let el = this.applepay.mount('awx-apple-pay-' + this.from);
             el.addEventListener('onReady', (event) => {
                 utils.initCheckoutPageExpressCheckoutClick();
+                if (that.deviceSupportApplePay()) {
+                    $(".express-title").show();
+                    $(".airwallex-express-checkout .checkout-agreements").show();
+                } else {
+                    if (!that.isGooglePayActive()) $(".airwallex-recaptcha").hide();
+                }
             });
             this.attachEvents(that);
             utils.loadRecaptcha(that.isShowRecaptcha);

diff --git a/view/frontend/web/js/view/payment/method-renderer/express/googlepay.js b/view/frontend/web/js/view/payment/method-renderer/express/googlepay.js
@@ -22,6 +22,8 @@ define([
             let el = this.googlepay.mount('awx-google-pay-' + this.from);
             el.addEventListener('onReady', (event) => {
                 utils.initCheckoutPageExpressCheckoutClick();
+                $(".express-title").show();
+                $(".airwallex-express-checkout .checkout-agreements").show();
             });
             this.attachEvents(that);
             utils.loadRecaptcha(that.isShowRecaptcha);

diff --git a/view/frontend/web/template/payment/express-checkout.html b/view/frontend/web/template/payment/express-checkout.html
@@ -4,7 +4,7 @@
     </div>
 
 
-    <div data-role="title" class="express-title">
+    <div data-role="title" class="express-title" style="display: none;">
         <!-- ko i18n: 'Express Checkout' --><!-- /ko -->
     </div>
 
@@ -23,7 +23,7 @@
 
 
     <div class="payment-method">
-        <div class="checkout-agreements checkout-agreements-block">
+        <div class="checkout-agreements checkout-agreements-block" style="display: none;">
             <!-- ko foreach: getRegion('beforeMethods') -->
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->