Allow to specify products value in partner referrals data

modules/ppcp-api-client/services.php

@@ -126,7 +126,6 @@ return array(
 		return new PartnerReferrals(
 			$container->get( 'api.host' ),
 			$container->get( 'api.bearer' ),
-			$container->get( 'api.repository.partner-referrals-data' ),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
@@ -208,9 +207,8 @@ return array(
 	},
 	'api.repository.partner-referrals-data'     => static function ( ContainerInterface $container ) : PartnerReferralsData {
 
-		$merchant_email = $container->get( 'api.merchant_email' );
 		$dcc_applies    = $container->get( 'api.helpers.dccapplies' );
-		return new PartnerReferralsData( $merchant_email, $dcc_applies );
+		return new PartnerReferralsData( $dcc_applies );
 	},
 	'api.repository.cart'                       => static function ( ContainerInterface $container ): CartRepository {
 		$factory = $container->get( 'api.factory.purchase-unit' );

modules/ppcp-api-client/src/Endpoint/PartnerReferrals.php

@@ -12,7 +12,6 @@ namespace WooCommerce\PayPalCommerce\ApiClient\Endpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
-use WooCommerce\PayPalCommerce\ApiClient\Repository\PartnerReferralsData;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -36,13 +35,6 @@ class PartnerReferrals {
 	 */
 	private $bearer;
 
-	/**
-	 * The PartnerReferralsData.
-	 *
-	 * @var PartnerReferralsData
-	 */
-	private $data;
-
 	/**
 	 * The logger.
 	 *
@@ -53,32 +45,29 @@ class PartnerReferrals {
 	/**
 	 * PartnerReferrals constructor.
 	 *
-	 * @param string               $host The host.
-	 * @param Bearer               $bearer The bearer.
-	 * @param PartnerReferralsData $data The partner referrals data.
-	 * @param LoggerInterface      $logger The logger.
+	 * @param string          $host The host.
+	 * @param Bearer          $bearer The bearer.
+	 * @param LoggerInterface $logger The logger.
 	 */
 	public function __construct(
 		string $host,
 		Bearer $bearer,
-		PartnerReferralsData $data,
 		LoggerInterface $logger
 	) {
 
 		$this->host   = $host;
 		$this->bearer = $bearer;
-		$this->data   = $data;
 		$this->logger = $logger;
 	}
 
 	/**
 	 * Fetch the signup link.
 	 *
+	 * @param array $data The partner referrals data.
 	 * @return string
 	 * @throws RuntimeException If the request fails.
 	 */
-	public function signup_link(): string {
-		$data     = $this->data->data();
+	public function signup_link( array $data ): string {
 		$bearer   = $this->bearer->bearer();
 		$args     = array(
 			'method'  => 'POST',

modules/ppcp-api-client/src/Repository/PartnerReferralsData.php

@@ -15,14 +15,6 @@ use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
  * Class PartnerReferralsData
  */
 class PartnerReferralsData {
-
-	/**
-	 * The merchant email.
-	 *
-	 * @var string
-	 */
-	private $merchant_email;
-
 	/**
 	 * The DCC Applies Helper object.
 	 *
@@ -30,19 +22,39 @@ class PartnerReferralsData {
 	 */
 	private $dcc_applies;
 
+	/**
+	 * The list of products ('PPCP', 'EXPRESS_CHECKOUT').
+	 *
+	 * @var string[]
+	 */
+	private $products;
+
 	/**
 	 * PartnerReferralsData constructor.
 	 *
-	 * @param string     $merchant_email  The email of the merchant.
 	 * @param DccApplies $dcc_applies The DCC Applies helper.
 	 */
 	public function __construct(
-		string $merchant_email,
 		DccApplies $dcc_applies
 	) {
+		$this->dcc_applies = $dcc_applies;
+		$this->products    = array(
+			$this->dcc_applies->for_country_currency() ? 'PPCP' : 'EXPRESS_CHECKOUT',
+		);
+	}
 
-		$this->merchant_email = $merchant_email;
-		$this->dcc_applies    = $dcc_applies;
+	/**
+	 * Returns a new copy of this object with the given value set.
+	 *
+	 * @param string[] $products The list of products ('PPCP', 'EXPRESS_CHECKOUT').
+	 * @return static
+	 */
+	public function with_products( array $products ): self {
+		$obj = clone $this;
+
+		$obj->products = $products;
+
+		return $obj;
 	}
 
 	/**
@@ -60,17 +72,6 @@ class PartnerReferralsData {
 	 * @return array
 	 */
 	public function data(): array {
-		$data = $this->default_data();
-		return $data;
-	}
-
-	/**
-	 * Returns the default data.
-	 *
-	 * @return array
-	 */
-	private function default_data(): array {
-
 		return array(
 			'partner_config_override' => array(
 				'partner_logo_url'       => 'https://connect.woocommerce.com/images/woocommerce_logo.png',
@@ -84,9 +85,7 @@ class PartnerReferralsData {
 				),
 				'show_add_credit_card'   => true,
 			),
-			'products'                => array(
-				$this->dcc_applies->for_country_currency() ? 'PPCP' : 'EXPRESS_CHECKOUT',
-			),
+			'products'                => $this->products,
 			'legal_consents'          => array(
 				array(
 					'type'    => 'SHARE_DATA_CONSENT',

modules/ppcp-onboarding/services.php

@@ -188,7 +188,6 @@ return array(
 		return new PartnerReferrals(
 			CONNECT_WOO_SANDBOX_URL,
 			new ConnectBearer(),
-			$container->get( 'api.repository.partner-referrals-data' ),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
@@ -197,7 +196,6 @@ return array(
 		return new PartnerReferrals(
 			CONNECT_WOO_URL,
 			new ConnectBearer(),
-			$container->get( 'api.repository.partner-referrals-data' ),
 			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
@@ -205,11 +203,13 @@ return array(
 
 		$partner_referrals         = $container->get( 'api.endpoint.partner-referrals-production' );
 		$partner_referrals_sandbox = $container->get( 'api.endpoint.partner-referrals-sandbox' );
+		$partner_referrals_data    = $container->get( 'api.repository.partner-referrals-data' );
 		$settings                  = $container->get( 'wcgateway.settings' );
 		return new OnboardingRenderer(
 			$settings,
 			$partner_referrals,
-			$partner_referrals_sandbox
+			$partner_referrals_sandbox,
+			$partner_referrals_data
 		);
 	},
 	'onboarding.rest'                           => static function( $container ) : OnboardingRESTController {

modules/ppcp-onboarding/src/OnboardingModule.php

@@ -65,16 +65,15 @@ class OnboardingModule implements ModuleInterface {
 				if ( 'ppcp_onboarding' !== $config['type'] ) {
 					return $field;
 				}
-				$renderer      = $c->get( 'onboarding.render' );
-				$is_production = 'production' === $config['env'];
 
-				/**
-				 * The OnboardingRenderer.
-				 *
-				 * @var OnboardingRenderer $renderer
-				 */
+				$renderer = $c->get( 'onboarding.render' );
+				assert( $renderer instanceof OnboardingRenderer );
+
+				$is_production = 'production' === $config['env'];
+				$products      = $config['products'];
+
 				ob_start();
-				$renderer->render( $is_production );
+				$renderer->render( $is_production, $products );
 				$content = ob_get_contents();
 				ob_end_clean();
 				return $content;

modules/ppcp-onboarding/src/Render/OnboardingRenderer.php

@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Onboarding\Render;
 
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnerReferrals;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
+use WooCommerce\PayPalCommerce\ApiClient\Repository\PartnerReferralsData;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
 
 /**
@@ -39,31 +40,50 @@ class OnboardingRenderer {
 	 */
 	private $sandbox_partner_referrals;
 
+	/**
+	 * The default partner referrals data.
+	 *
+	 * @var PartnerReferralsData
+	 */
+	private $partner_referrals_data;
+
 	/**
 	 * OnboardingRenderer constructor.
 	 *
-	 * @param Settings         $settings The settings.
-	 * @param PartnerReferrals $production_partner_referrals The PartnerReferrals for production.
-	 * @param PartnerReferrals $sandbox_partner_referrals The PartnerReferrals for sandbox.
+	 * @param Settings             $settings The settings.
+	 * @param PartnerReferrals     $production_partner_referrals The PartnerReferrals for production.
+	 * @param PartnerReferrals     $sandbox_partner_referrals The PartnerReferrals for sandbox.
+	 * @param PartnerReferralsData $partner_referrals_data The default partner referrals data.
 	 */
-	public function __construct( Settings $settings, PartnerReferrals $production_partner_referrals, PartnerReferrals $sandbox_partner_referrals ) {
+	public function __construct(
+		Settings $settings,
+		PartnerReferrals $production_partner_referrals,
+		PartnerReferrals $sandbox_partner_referrals,
+		PartnerReferralsData $partner_referrals_data
+	) {
 		$this->settings                     = $settings;
 		$this->production_partner_referrals = $production_partner_referrals;
 		$this->sandbox_partner_referrals    = $sandbox_partner_referrals;
+		$this->partner_referrals_data       = $partner_referrals_data;
 	}
 
 	/**
 	 * Returns the action URL for the onboarding button/link.
 	 *
-	 * @param boolean $is_production Whether the production or sandbox button should be rendered.
+	 * @param boolean  $is_production Whether the production or sandbox button should be rendered.
+	 * @param string[] $products The list of products ('PPCP', 'EXPRESS_CHECKOUT').
 	 * @return string URL.
 	 */
-	public function get_signup_link( bool $is_production ) {
+	public function get_signup_link( bool $is_production, array $products ) {
 		$args = array(
 			'displayMode' => 'minibrowser',
 		);
 
-		$url = $is_production ? $this->production_partner_referrals->signup_link() : $this->sandbox_partner_referrals->signup_link();
+		$data = $this->partner_referrals_data
+			->with_products( $products )
+			->data();
+
+		$url = $is_production ? $this->production_partner_referrals->signup_link( $data ) : $this->sandbox_partner_referrals->signup_link( $data );
 		$url = add_query_arg( $args, $url );
 
 		return $url;
@@ -72,12 +92,13 @@ class OnboardingRenderer {
 	/**
 	 * Renders the "Connect to PayPal" button.
 	 *
-	 * @param bool $is_production Whether the production or sandbox button should be rendered.
+	 * @param bool     $is_production Whether the production or sandbox button should be rendered.
+	 * @param string[] $products The list of products ('PPCP', 'EXPRESS_CHECKOUT').
 	 */
-	public function render( bool $is_production ) {
+	public function render( bool $is_production, array $products ) {
 		try {
 			$this->render_button(
-				$this->get_signup_link( $is_production ),
+				$this->get_signup_link( $is_production, $products ),
 				$is_production ? 'connect-to-production' : 'connect-to-sandbox',
 				$is_production ? __( 'Connect PayPal', 'woocommerce-paypal-payments' ) : __( 'Test Payments', 'woocommerce-paypal-payments' ),
 				$is_production ? 'primary' : 'secondary',