Consolidate merchant details before and after onboarding (5311)

modules/ppcp-onboarding/services.php

@@ -105,7 +105,7 @@
 		$woo_country        = $container->get( 'api.shop.country' );
 		$eligibility_checks = $container->get( 'wcgateway.feature-eligibility.list' );
 
-		return new MerchantDetails( $woo_country, $woo_country, $eligibility_checks );
+		return new MerchantDetails( $woo_country, $eligibility_checks );
 	},
 	'onboarding.assets'                  => function ( ContainerInterface $container ): OnboardingAssets {
 		$state                 = $container->get( 'onboarding.state' );

modules/ppcp-settings/src/Data/Definition/FeaturesDefinition.php

@@ -22,12 +22,6 @@
 class FeaturesDefinition {
 
 
-	/**
-	 * The features eligibility service.
-	 *
-	 * @var FeaturesEligibilityService
-	 */
-	protected FeaturesEligibilityService $eligibilities;
 
 	/**
 	 * The general settings service.
@@ -53,18 +47,15 @@ class FeaturesDefinition {
 	/**
 	 * Constructor.
 	 *
-	 * @param FeaturesEligibilityService $eligibilities The features eligibility service.
 	 * @param GeneralSettings            $settings The general settings service.
 	 * @param array                      $merchant_capabilities The merchant capabilities.
 	 * @param SettingsModel              $plugin_settings The plugin settings.
 	 */
 	public function __construct(
-		FeaturesEligibilityService $eligibilities,
 		GeneralSettings $settings,
 		array $merchant_capabilities,
 		SettingsModel $plugin_settings
 	) {
-		$this->eligibilities         = $eligibilities;
 		$this->settings              = $settings;
 		$this->merchant_capabilities = $merchant_capabilities;
 		$this->plugin_settings       = $plugin_settings;
@@ -76,15 +67,7 @@ public function __construct(
 	 * @return array The array of feature definitions.
 	 */
 	public function get(): array {
-		$all_features       = $this->all_available_features();
-		$eligible_features  = array();
-		$eligibility_checks = $this->eligibilities->get_eligibility_checks();
-		foreach ( $all_features as $feature_key => $feature ) {
-			if ( $eligibility_checks[ $feature_key ]() ) {
-				$eligible_features[ $feature_key ] = $feature;
-			}
-		}
-		return $eligible_features;
+		return $this->all_available_features();
 	}
 
 	/**
@@ -106,7 +89,7 @@ public function all_available_features(): array {
 		$country_location      = in_array( $store_country, $paylater_countries, true ) ? strtolower( $store_country ) : 'us';
 		$save_paypal_and_venmo = $this->plugin_settings->get_save_paypal_and_venmo();
 
-		return array(
+		$features = array(
 			'save_paypal_and_venmo'           => array(
 				'title'       => __( 'Save PayPal and Venmo', 'woocommerce-paypal-payments' ),
 				'description' => __( 'Securely save PayPal and Venmo payment methods for subscriptions or return buyers.', 'woocommerce-paypal-payments' ),
@@ -297,7 +280,7 @@ public function all_available_features(): array {
 					'Let customers know they can buy now and pay later with PayPal. Adding this messaging can boost conversion rates and increase cart sizes by 39%¹, with no extra cost to you—plus, you get paid up front.',
 					'woocommerce-paypal-payments'
 				),
-				'enabled'     => $this->merchant_capabilities['pay_later'] && ! $save_paypal_and_venmo,
+				'enabled'     => $this->merchant_capabilities['paylater'] && ! $save_paypal_and_venmo,
 				'buttons'     => array(
 					array(
 						'type'     => 'secondary',
@@ -346,5 +329,10 @@ public function all_available_features(): array {
 				),
 			),
 		);
+		if ( $this->settings->get_merchant_country() !== 'MX' ) {
+			unset( $features['installments'] );
+		}
+
+		return $features;
 	}
 }