Merge branch 'trunk' into PCP-533-multi-currency-broke

modules/ppcp-api-client/services.php

@@ -127,7 +127,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' )
 		);
 	},
@@ -209,9 +208,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' );
@@ -397,141 +395,144 @@ return array(
 	 * The matrix which countries and currency combinations can be used for DCC.
 	 */
 	'api.dcc-supported-country-currency-matrix' => static function ( ContainerInterface $container ) : array {
-		return array(
-			'AU' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
-			'DE' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
-			'ES' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
-			'FR' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
-			'GB' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
-			'IT' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
-			'US' => array(
-				'AUD',
-				'CAD',
-				'EUR',
-				'GBP',
-				'JPY',
-				'USD',
-			),
-			'CA' => array(
-				'AUD',
-				'CAD',
-				'CHF',
-				'CZK',
-				'DKK',
-				'EUR',
-				'GBP',
-				'HKD',
-				'HUF',
-				'JPY',
-				'NOK',
-				'NZD',
-				'PLN',
-				'SEK',
-				'SGD',
-				'USD',
-			),
+		return apply_filters(
+			'woocommerce_paypal_payments_supported_country_currency_matrix',
+			array(
+				'AU' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+				'DE' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+				'ES' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+				'FR' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+				'GB' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+				'IT' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+				'US' => array(
+					'AUD',
+					'CAD',
+					'EUR',
+					'GBP',
+					'JPY',
+					'USD',
+				),
+				'CA' => array(
+					'AUD',
+					'CAD',
+					'CHF',
+					'CZK',
+					'DKK',
+					'EUR',
+					'GBP',
+					'HKD',
+					'HUF',
+					'JPY',
+					'NOK',
+					'NZD',
+					'PLN',
+					'SEK',
+					'SGD',
+					'USD',
+				),
+			)
 		);
 	},
 
@@ -539,49 +540,52 @@ return array(
 	 * Which countries support which credit cards. Empty credit card arrays mean no restriction on currency.
 	 */
 	'api.dcc-supported-country-card-matrix'     => static function ( ContainerInterface $container ) : array {
-		return array(
-			'AU' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'AUD' ),
-			),
-			'DE' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'EUR' ),
-			),
-			'ES' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'EUR' ),
-			),
-			'FR' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'EUR' ),
-			),
-			'GB' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'GBP', 'USD' ),
-			),
-			'IT' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'EUR' ),
-			),
-			'US' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'USD' ),
-				'discover'   => array( 'USD' ),
-			),
-			'CA' => array(
-				'mastercard' => array(),
-				'visa'       => array(),
-				'amex'       => array( 'CAD' ),
-				'jcb'        => array( 'CAD' ),
-			),
+		return apply_filters(
+			'woocommerce_paypal_payments_supported_country_card_matrix',
+			array(
+				'AU' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'AUD' ),
+				),
+				'DE' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'EUR' ),
+				),
+				'ES' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'EUR' ),
+				),
+				'FR' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'EUR' ),
+				),
+				'GB' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'GBP', 'USD' ),
+				),
+				'IT' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'EUR' ),
+				),
+				'US' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'USD' ),
+					'discover'   => array( 'USD' ),
+				),
+				'CA' => array(
+					'mastercard' => array(),
+					'visa'       => array(),
+					'amex'       => array( 'CAD' ),
+					'jcb'        => array( 'CAD' ),
+				),
+			)
 		);
 	},
 

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',