fix: add null checks and fallbacks to all classic payment methods

jimmyn · jimmyn · commit 048842754877 · 2025-10-10T12:38:43.000+02:00
- PayPal: Add fallback from monei-paypal-form to wc-monei_paypal-form
- Apple/Google Pay: Add null check before appending hidden input
- Credit Card: Add null check before appending hidden input
- All methods now log errors when form container not found
- Prevents exceptions in order-pay flow when form IDs differ
- Consistent error handling across all payment methods
diff --git a/assets/js/monei-apple-google-classic.js b/assets/js/monei-apple-google-classic.js
@@ -244,7 +244,15 @@
 			hiddenInput.setAttribute( 'id', id );
 			hiddenInput.setAttribute( 'value', token );
 			wc_monei_form.$paymentForm = document.getElementById( form );
-			wc_monei_form.$paymentForm.appendChild( hiddenInput );
+
+			// Only append if we found a target element
+			if ( wc_monei_form.$paymentForm ) {
+				wc_monei_form.$paymentForm.appendChild( hiddenInput );
+			} else {
+				console.error(
+					`Apple/Google Pay form container "${ form }" not found. Cannot append payment token.`
+				);
+			}
 		},
 		/**
 		 * If Apple can make payments then we need to show the apple logo and title instead of Google
diff --git a/assets/js/monei-cc-classic.js b/assets/js/monei-cc-classic.js
@@ -346,7 +346,15 @@
 			hiddenInput.setAttribute( 'id', id );
 			hiddenInput.setAttribute( 'value', token );
 			wc_monei_form.$paymentForm = document.getElementById( form );
-			wc_monei_form.$paymentForm.appendChild( hiddenInput );
+
+			// Only append if we found a target element
+			if ( wc_monei_form.$paymentForm ) {
+				wc_monei_form.$paymentForm.appendChild( hiddenInput );
+			} else {
+				console.error(
+					`Credit Card form container "${ form }" not found. Cannot append payment token.`
+				);
+			}
 		},
 		render_card_brands_in_label() {
 			if ( ! wc_monei_params.cardBrands ) {
diff --git a/assets/js/monei-paypal-classic.js b/assets/js/monei-paypal-classic.js
@@ -227,9 +227,20 @@
 			hiddenInput.setAttribute( 'name', id );
 			hiddenInput.setAttribute( 'id', id );
 			hiddenInput.setAttribute( 'value', token );
+
+			// Try primary form ID first, then fall back to order-pay form ID
 			wc_paypal_form.$paymentForm =
-				document.getElementById( 'monei-paypal-form' );
-			wc_paypal_form.$paymentForm.appendChild( hiddenInput );
+				document.getElementById( 'monei-paypal-form' ) ||
+				document.getElementById( 'wc-monei_paypal-form' );
+
+			// Only append if we found a target element
+			if ( wc_paypal_form.$paymentForm ) {
+				wc_paypal_form.$paymentForm.appendChild( hiddenInput );
+			} else {
+				console.error(
+					'PayPal form container not found. Cannot append payment token.'
+				);
+			}
 		},
 	};
 
