fix: prevent blocks detection from blocking scripts on order-pay pages

jimmyn · jimmyn · commit 4fb34437b443 · 2025-10-09T17:43:26.000+02:00
The is_block_checkout_page() method was checking if the main checkout
page uses blocks, which incorrectly prevented classic checkout scripts
from loading on order-pay and add-payment-method pages (which are
always classic, even when main checkout uses blocks).

Added early returns to detect order-pay and add-payment-method pages
and treat them as classic checkout, ensuring card input, card brands,
and payment buttons render correctly.

Fixes issue where card input field and card brands disappeared on
order-pay page when main checkout was using WooCommerce Blocks.
diff --git a/src/Gateways/Abstracts/WCMoneiPaymentGateway.php b/src/Gateways/Abstracts/WCMoneiPaymentGateway.php
@@ -370,6 +370,10 @@ public function isBlockCheckout() {
 	 * @return bool
 	 */
 	public function is_block_checkout_page() {
+		// Order-pay and add payment method pages are always classic
+		if ( is_checkout_pay_page() || is_add_payment_method_page() ) {
+			return false;
+		}
 		if ( ! is_checkout() ) {
 			return false;
 		}
diff --git a/src/Gateways/Abstracts/WCMoneiPaymentGatewayComponent.php b/src/Gateways/Abstracts/WCMoneiPaymentGatewayComponent.php
@@ -300,6 +300,10 @@ public function isBlockCheckout() {
 	 * @return bool
 	 */
 	public function is_block_checkout_page() {
+		// Order-pay and add payment method pages are always classic
+		if ( is_checkout_pay_page() || is_add_payment_method_page() ) {
+			return false;
+		}
 		if ( ! is_checkout() ) {
 			return false;
 		}
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiAppleGoogle.php b/src/Gateways/PaymentMethods/WCGatewayMoneiAppleGoogle.php
@@ -229,6 +229,10 @@ public function hideAppleGoogleInCheckout( $available_gateways ) {
 	}
 
 	public function isBlockCheckout(): bool {
+		// Order-pay and add payment method pages are always classic
+		if ( is_checkout_pay_page() || is_add_payment_method_page() ) {
+			return false;
+		}
 		if ( ! is_checkout() ) {
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,10 @@ public function hideAppleGoogleInCheckout( $available_gateways ) {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`public function isBlockCheckout(): bool {`
	`232`	`+ // Order-pay and add payment method pages are always classic`
	`233`	`+ if ( is_checkout_pay_page() \|\| is_add_payment_method_page() ) {`
	`234`	`+ return false;`
	`235`	`+ }`
`232`	`236`	`if ( ! is_checkout() ) {`
`233`	`237`	`return false;`
`234`	`238`	`}`