Merge pull request #104 from magento-l3/PR-2023-02-07

Pr 2023 02 07

Author: viktym

ReCaptchaCheckout/view/frontend/web/js/model/place-order-mixin.js

@@ -30,8 +30,15 @@ define([
                 });
                 //Trigger ReCaptcha validation
                 recaptchaRegistry.triggers['recaptcha-checkout-place-order']();
-                //remove listener so that place order action is only triggered by the 'Place Order' button
-                recaptchaRegistry.removeListener('recaptcha-checkout-place-order');
+
+                if (
+                    !recaptchaRegistry._isInvisibleType.hasOwnProperty('recaptcha-checkout-place-order') ||
+                    recaptchaRegistry._isInvisibleType['recaptcha-checkout-place-order'] === false
+                ) {
+                    //remove listener so that place order action is only triggered by the 'Place Order' button
+                    recaptchaRegistry.removeListener('recaptcha-checkout-place-order');
+                }
+
                 return recaptchaDeferred;
             }
 

ReCaptchaContact/etc/frontend/di.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+
+    <type name="Magento\Framework\View\Element\ButtonLockManager">
+        <arguments>
+            <argument name="buttonLockPool" xsi:type="array">
+                <item name="contact_us_form_submit" xsi:type="object">Magento\ReCaptchaContact\Model\ButtonLock\ContactUsFormSubmit</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <virtualType name="Magento\ReCaptchaContact\Model\ButtonLock\ContactUsFormSubmit" type="Magento\ReCaptchaUi\Model\ButtonLock">
+        <arguments>
+            <argument name="buttonCode" xsi:type="string">contact_us_form_submit</argument>
+            <argument name="reCaptchaId" xsi:type="string">contact</argument>
+        </arguments>
+    </virtualType>
+</config>