Merge branch 'develop' into fix/8141-fraud-prevention-token-site-edit…

…or-problem
Automattic · Feb 13, 2024 · e706cd7 · e706cd7
2 parents 97eac27 + 55b3d52
commit e706cd7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/changelog/7695-readd-variation-product-type b/changelog/7695-readd-variation-product-type
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Adding back a product type that was mistakenly removed.
+
+
diff --git a/changelog/fix-open-email-input-iframe-when-no-wcpay b/changelog/fix-open-email-input-iframe-when-no-wcpay
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Do not open the email input iframe without wcpay payment method
diff --git a/client/checkout/woopay/email-input-iframe.js b/client/checkout/woopay/email-input-iframe.js
@@ -11,6 +11,7 @@ import {
 	validateEmail,
 	appendRedirectionParams,
 } from './utils';
+import { select } from '@wordpress/data';
 
 export const handleWooPayEmailInput = async (
 	field,
@@ -608,11 +609,16 @@ export const handleWooPayEmailInput = async (
 	} );
 
 	if ( ! customerClickedBackButton ) {
-		// Check if user already has a WooPay login session.
-		if (
-			! hasCheckedLoginSession &&
-			! getConfig( 'isWooPayDirectCheckoutEnabled' )
-		) {
+		const paymentMethods = await select(
+			'wc/store/payment'
+		).getAvailablePaymentMethods();
+
+		const hasWCPayPaymentMethod = paymentMethods.hasOwnProperty(
+			'woocommerce_payments'
+		);
+
+		// Check if user already has a WooPay login session and only open the iframe if there is WCPay.
+		if ( ! hasCheckedLoginSession && hasWCPayPaymentMethod ) {
 			openLoginSessionIframe( woopayEmailInput.value );
 		}
 	} else {

diff --git a/includes/express-checkout/class-wc-payments-express-checkout-button-helper.php b/includes/express-checkout/class-wc-payments-express-checkout-button-helper.php
@@ -95,7 +95,7 @@ public function ajax_add_to_cart() {
 			WC()->cart->add_to_cart( $product->get_id(), $quantity, $variation_id, $attributes );
 		}
 
-		if ( in_array( $product_type, [ 'simple', 'subscription', 'subscription_variation', 'bundle', 'mix-and-match' ], true ) ) {
+		if ( in_array( $product_type, [ 'simple', 'variation', 'subscription', 'subscription_variation', 'bundle', 'mix-and-match' ], true ) ) {
 			WC()->cart->add_to_cart( $product->get_id(), $quantity );
 		}