Enforce separate location settings for Apple Pay/Google Pay and Amazon Pay

Author: Anne Mirasol

includes/class-wc-stripe-blocks-support.php

@@ -46,8 +46,8 @@ public function __construct( $payment_request_configuration = null, $express_che
 		$this->payment_request_configuration = null !== $payment_request_configuration ? $payment_request_configuration : new WC_Stripe_Payment_Request();
 
 		if ( null === $express_checkout_configuration ) {
-			$helper = new WC_Stripe_Express_Checkout_Helper();
-			$ajax_handler = new WC_Stripe_Express_Checkout_Ajax_Handler( $helper );
+			$helper                         = new WC_Stripe_Express_Checkout_Helper();
+			$ajax_handler                   = new WC_Stripe_Express_Checkout_Ajax_Handler( $helper );
 			$express_checkout_configuration = new WC_Stripe_Express_Checkout_Element( $ajax_handler, $helper );
 		}
 		$this->express_checkout_configuration = $express_checkout_configuration;
@@ -283,30 +283,6 @@ private function should_show_express_checkout_button() {
 			return false;
 		}
 
-		// Don't show if ECEs are supposed to be hidden on the cart page.
-		if (
-			has_block( 'woocommerce/cart' )
-			&& ! $this->express_checkout_configuration->express_checkout_helper->should_show_ece_on_cart_page()
-		) {
-			return false;
-		}
-
-		// Don't show if ECEs are supposed to be hidden on the checkout page.
-		if (
-			has_block( 'woocommerce/checkout' )
-			&& ! $this->express_checkout_configuration->express_checkout_helper->should_show_ece_on_checkout_page()
-		) {
-			return false;
-		}
-
-		// Don't show ECEs if there are unsupported products in the cart.
-		if (
-			( has_block( 'woocommerce/checkout' ) || has_block( 'woocommerce/cart' ) )
-			&& ! $this->express_checkout_configuration->express_checkout_helper->allowed_items_in_cart()
-		) {
-			return false;
-		}
-
 		return $this->express_checkout_configuration->express_checkout_helper->should_show_express_checkout_button();
 	}
 

includes/payment-methods/class-wc-stripe-express-checkout-helper.php

@@ -1523,24 +1523,42 @@ public function get_login_confirmation_settings() {
 	}
 
 	/**
-	 * Pages where the express checkout buttons should be displayed.
+	 * Check if the express checkout type is enabled for the given location.
 	 *
-	 * @return array
+	 * @param string $express_checkout_type The type of express checkout.
+	 * @param string $location The location to check.
+	 * @return boolean
 	 */
-	public function get_button_locations() {
-		// If the locations have not been set return the default setting.
-		if ( ! isset( $this->stripe_settings['payment_request_button_locations'] ) ) {
-			return [ 'product', 'cart' ];
+	public function is_enabled_for_location( $express_checkout_type = 'payment_request', $location = '' ) {
+		switch ( $express_checkout_type ) {
+			case 'payment_request':
+				$key = 'payment_request_button_locations';
+				break;
+			case 'link':
+				// Link does not yet have its own Customize page.
+				$key = 'payment_request_button_locations';
+				break;
+			case 'amazon_pay':
+				$key = 'amazon_pay_button_locations';
+				break;
+			default:
+				$key = 'payment_request_button_locations';
+				break;
 		}
 
-		// If all locations are removed through the settings UI the location config will be set to
-		// an empty string "". If that's the case (and if the settings are not an array for any
-		// other reason) we should return an empty array.
-		if ( ! is_array( $this->stripe_settings['payment_request_button_locations'] ) ) {
-			return [];
+		if ( ! isset( $this->stripe_settings[ $key ] ) ) {
+			// If the locations have not been set/modified, return the default setting.
+			$enabled_locations = [ 'product', 'cart' ];
+		} elseif ( ! is_array( $this->stripe_settings[ $key ] ) ) {
+			// If all locations are removed through the settings UI the location config will be set to
+			// an empty string "". If that's the case (and if the settings are not an array for any
+			// other reason) we should return an empty array.
+			$enabled_locations = [];
+		} else {
+			$enabled_locations = $this->stripe_settings[ $key ];
 		}
 
-		return $this->stripe_settings['payment_request_button_locations'];
+		return in_array( $location, $enabled_locations, true );
 	}
 
 	/**
@@ -1560,7 +1578,14 @@ public function is_express_checkout_enabled() {
 	 * @return boolean
 	 */
 	public function is_payment_request_enabled() {
-		return $this->gateway->is_payment_request_enabled();
+		$is_enabled = $this->gateway->is_payment_request_enabled();
+		if ( is_product() ) {
+			return $is_enabled && $this->is_enabled_for_location( 'payment_request', 'product' );
+		} elseif ( is_cart() ) {
+			return $is_enabled && $this->is_enabled_for_location( 'payment_request', 'cart' );
+		}
+
+		return $is_enabled;
 	}
 
 	/**
@@ -1569,7 +1594,14 @@ public function is_payment_request_enabled() {
 	 * @return boolean
 	 */
 	public function is_amazon_pay_enabled() {
-		return WC_Stripe_UPE_Payment_Method_Amazon_Pay::is_amazon_pay_enabled( $this->gateway );
+		$is_enabled = WC_Stripe_UPE_Payment_Method_Amazon_Pay::is_amazon_pay_enabled( $this->gateway );
+		if ( is_product() ) {
+			return $is_enabled && $this->is_enabled_for_location( 'amazon_pay', 'product' );
+		} elseif ( is_cart() ) {
+			return $is_enabled && $this->is_enabled_for_location( 'amazon_pay', 'cart' );
+		}
+
+		return $is_enabled;
 	}
 
 	/**