Merge pull request #53 from angelleye/GFB-49

GFB-49 Braintree form validation triggering even when GF field is hidden
angelleye · Sep 6, 2024 · f7fa4a2 · f7fa4a2
2 parents 2dc598e + 02d845a
commit f7fa4a2
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/assets/js/angelleye-braintree-ach-cc.js b/assets/js/angelleye-braintree-ach-cc.js
@@ -648,30 +648,35 @@ function loadBraintreeDropIn( form_id, args = [] ) {
                     }
 
                     enableGformLoader(loaderEl);
-                    dropinInstance.requestPaymentMethod((error, payload) => {
+                    var dropinField = document.querySelector('#gform_' + form_id + ' .gfield--type-braintree_credit_card');
+                    if(dropinField && getComputedStyle(dropinField).display !== 'none') {
+                        dropinInstance.requestPaymentMethod((error, payload) => {
 
-                        if (error) {
-                            console.error(error);
-                            removeGformLoader(form_id);
-                        } else {
-                            document.getElementById('nonce_'+form_id).value = payload.nonce;
-                            let binDataDebit = payload?.binData?.debit;
-
-                            let paymentCardType = payload.type;
-                            if( undefined !== binDataDebit && binDataDebit.toLowerCase() === 'yes' || binDataDebit === true) {
-                                paymentCardType = 'DebitCard';
-                            }
-                            document.getElementById('payment_card_type_'+form_id).value = paymentCardType;
-                            let cardType = payload.details.cardType;
-                            let cardLastFour = payload.details.lastFour;
-                            document.getElementById('payment_card_details_'+form_id).value = cardLastFour+" ("+cardType+")";
-                            if( args.is_fees_enable ) {
-                                managePreviewBeforePayment(payload, form_id, args);
+                            if (error) {
+                                console.error(error);
+                                removeGformLoader(form_id);
                             } else {
-                                document.getElementById('gform_'+form_id).submit();
+                                document.getElementById('nonce_'+form_id).value = payload.nonce;
+                                let binDataDebit = payload?.binData?.debit;
+
+                                let paymentCardType = payload.type;
+                                if( undefined !== binDataDebit && binDataDebit.toLowerCase() === 'yes' || binDataDebit === true) {
+                                    paymentCardType = 'DebitCard';
+                                }
+                                document.getElementById('payment_card_type_'+form_id).value = paymentCardType;
+                                let cardType = payload.details.cardType;
+                                let cardLastFour = payload.details.lastFour;
+                                document.getElementById('payment_card_details_'+form_id).value = cardLastFour+" ("+cardType+")";
+                                if( args.is_fees_enable ) {
+                                    managePreviewBeforePayment(payload, form_id, args);
+                                } else {
+                                    document.getElementById('gform_'+form_id).submit();
+                                }
                             }
-                        }
-                    });
+                        });
+                    } else {
+                        document.getElementById('gform_'+form_id).submit();
+                    }
                 });
             });
         }