Remove the feature flag for the pay-for-order flow (#8699)

Automattic · Apr 24, 2024 · ba97c20 · ba97c20
1 parent 9b6d54c
commit ba97c20
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/changelog/remove-feature-flag-for-the-pay-for-order-flow b/changelog/remove-feature-flag-for-the-pay-for-order-flow
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Remove feature flag for the pay-for-order flow
diff --git a/includes/class-wc-payments-features.php b/includes/class-wc-payments-features.php
@@ -21,7 +21,6 @@ class WC_Payments_Features {
 	const WOOPAY_FIRST_PARTY_AUTH_FLAG_NAME = '_wcpay_feature_woopay_first_party_auth';
 	const WOOPAY_DIRECT_CHECKOUT_FLAG_NAME  = '_wcpay_feature_woopay_direct_checkout';
 	const AUTH_AND_CAPTURE_FLAG_NAME        = '_wcpay_feature_auth_and_capture';
-	const PAY_FOR_ORDER_FLOW                = '_wcpay_feature_pay_for_order_flow';
 	const DISPUTE_ISSUER_EVIDENCE           = '_wcpay_feature_dispute_issuer_evidence';
 	const STREAMLINE_REFUNDS_FLAG_NAME      = '_wcpay_feature_streamline_refunds';
 	const PAYMENT_OVERVIEW_WIDGET_FLAG_NAME = '_wcpay_feature_payment_overview_widget';
@@ -351,15 +350,6 @@ public static function should_use_stripe_billing() {
 		return false;
 	}
 
-	/**
-	 * Checks whether the pay for order flow is enabled
-	 *
-	 * @return bool
-	 */
-	public static function is_pay_for_order_flow_enabled() {
-		return '1' === get_option( self::PAY_FOR_ORDER_FLOW, '0' );
-	}
-
 	/**
 	 * Checks whether Dispute issuer evidence feature should be enabled. Disabled by default.
 	 *
@@ -392,7 +382,6 @@ public static function to_array() {
 				'clientSecretEncryption'         => self::is_client_secret_encryption_enabled(),
 				'woopayExpressCheckout'          => self::is_woopay_express_checkout_enabled(),
 				'isAuthAndCaptureEnabled'        => self::is_auth_and_capture_enabled(),
-				'isPayForOrderFlowEnabled'       => self::is_pay_for_order_flow_enabled(),
 				'isDisputeIssuerEvidenceEnabled' => self::is_dispute_issuer_evidence_enabled(),
 				'isRefundControlsEnabled'        => self::is_streamline_refunds_enabled(),
 				'isPaymentOverviewWidgetEnabled' => self::is_payment_overview_widget_ui_enabled(),

diff --git a/includes/express-checkout/class-wc-payments-express-checkout-button-display-handler.php b/includes/express-checkout/class-wc-payments-express-checkout-button-display-handler.php
@@ -130,7 +130,7 @@ public function display_express_checkout_buttons() {
 	 * @return bool
 	 */
 	private function is_pay_for_order_flow_supported() {
-		return ( WC_Payments_Features::is_pay_for_order_flow_enabled() && class_exists( '\Automattic\WooCommerce\Blocks\Package' ) && version_compare( \Automattic\WooCommerce\Blocks\Package::get_version(), '11.1.0', '>=' ) );
+		return ( class_exists( '\Automattic\WooCommerce\Blocks\Package' ) && version_compare( \Automattic\WooCommerce\Blocks\Package::get_version(), '11.1.0', '>=' ) );
 	}
 
 	/**