Merge branch 'develop' into cobranded-cards

gpressutto5 · web-flow · commit 2a630ca5bec0 · 2024-04-04T14:24:31.000-03:00
diff --git a/assets/images/payment-methods/afterpay-logo.svg b/assets/images/payment-methods/afterpay-logo.svg
@@ -1 +1 @@
-<svg width="64" height="40" id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 24"><defs><style>.cls-1{fill:#ffffff;}</style></defs><path class="cls-1" d="M35,0H3A3,3,0,0,0,0,3V21a3,3,0,0,0,3,3H35a3,3,0,0,0,3-3V3A3,3,0,0,0,35,0Z"/><path d="M36.12,10l-1.06-.61L34,8.75a1.07,1.07,0,0,0-1.6.93v.13a.23.23,0,0,0,.1.19l.5.28a.2.2,0,0,0,.28-.08.19.19,0,0,0,0-.1V9.78a.21.21,0,0,1,.2-.22l.12,0,1,.57,1,.56a.22.22,0,0,1,.07.3l-.07.07-1,.56-1,.57a.21.21,0,0,1-.29-.07.24.24,0,0,1,0-.12v-.16a1.07,1.07,0,0,0-1.6-.93l-1.08.62-1.06.61a1.08,1.08,0,0,0-.4,1.46,1,1,0,0,0,.4.4l1.06.61,1.08.61a1.07,1.07,0,0,0,1.6-.93v-.13a.23.23,0,0,0-.1-.19l-.5-.29a.2.2,0,0,0-.28.08.23.23,0,0,0,0,.11v.32a.21.21,0,0,1-.2.22.27.27,0,0,1-.12,0l-1-.57-1-.56A.22.22,0,0,1,30,13l.07-.07,1-.56,1-.57a.21.21,0,0,1,.29.07.24.24,0,0,1,0,.12v.16a1.07,1.07,0,0,0,1.6.93l1.08-.62,1.06-.61a1.06,1.06,0,0,0,.34-1.47A1,1,0,0,0,36.12,10Z"/><path d="M29.14,10.18l-2.49,5.14h-1l.93-1.92-1.46-3.22h1.06l.94,2.15,1-2.15Z"/><path d="M4.25,12a1,1,0,1,0-1,1.05h0a1,1,0,0,0,1-1V12m0,1.83v-.48a1.49,1.49,0,0,1-1.16.54,1.79,1.79,0,0,1-1.75-1.83V12a1.82,1.82,0,0,1,1.75-1.89h0a1.47,1.47,0,0,1,1.14.53v-.46h.89v3.65Z"/><path d="M9.52,13c-.32,0-.4-.12-.4-.42V11h.57v-.79H9.12V9.29H8.2v.89H7V9.81c0-.3.12-.42.44-.42h.2V8.68H7.21c-.76,0-1.12.25-1.12,1v.49H5.58V11h.51v2.86H7V11H8.2v1.79c0,.75.28,1.07,1,1.07h.5V13Z"/><path d="M12.82,11.67a.87.87,0,0,0-.91-.75.89.89,0,0,0-.92.75ZM11,12.24a.91.91,0,0,0,.94.85,1,1,0,0,0,.86-.47h.94a1.79,1.79,0,0,1-1.82,1.27A1.8,1.8,0,0,1,10,12.22V12a1.89,1.89,0,1,1,3.78,0h0a.89.89,0,0,1,0,.23Z"/><path d="M19.66,12a1,1,0,1,0,0,.05V12m-2.89,3.32V10.18h.89v.47a1.49,1.49,0,0,1,1.16-.54,1.79,1.79,0,0,1,1.76,1.82V12a1.82,1.82,0,0,1-1.75,1.89h0a1.44,1.44,0,0,1-1.11-.49v1.92Z"/><path d="M23.82,12a1,1,0,1,0-1.05,1.05h.05a1,1,0,0,0,1-1V12m0,1.83v-.48a1.46,1.46,0,0,1-1.15.54,1.79,1.79,0,0,1-1.76-1.82V12a1.82,1.82,0,0,1,1.75-1.89h0a1.45,1.45,0,0,1,1.13.53v-.46h.9v3.65Z"/><path d="M15.15,10.54a.91.91,0,0,1,.79-.43.88.88,0,0,1,.39.08v.94a1.15,1.15,0,0,0-.65-.17.64.64,0,0,0-.5.71v2.16h-.93V10.18h.9Z"/></svg>
+<svg width="64" height="40" id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 24"><defs><style>.cls-1{fill:#b2fce4;}</style></defs><path class="cls-1" d="M35,0H3A3,3,0,0,0,0,3V21a3,3,0,0,0,3,3H35a3,3,0,0,0,3-3V3A3,3,0,0,0,35,0Z"/><path d="M36.12,10l-1.06-.61L34,8.75a1.07,1.07,0,0,0-1.6.93v.13a.23.23,0,0,0,.1.19l.5.28a.2.2,0,0,0,.28-.08.19.19,0,0,0,0-.1V9.78a.21.21,0,0,1,.2-.22l.12,0,1,.57,1,.56a.22.22,0,0,1,.07.3l-.07.07-1,.56-1,.57a.21.21,0,0,1-.29-.07.24.24,0,0,1,0-.12v-.16a1.07,1.07,0,0,0-1.6-.93l-1.08.62-1.06.61a1.08,1.08,0,0,0-.4,1.46,1,1,0,0,0,.4.4l1.06.61,1.08.61a1.07,1.07,0,0,0,1.6-.93v-.13a.23.23,0,0,0-.1-.19l-.5-.29a.2.2,0,0,0-.28.08.23.23,0,0,0,0,.11v.32a.21.21,0,0,1-.2.22.27.27,0,0,1-.12,0l-1-.57-1-.56A.22.22,0,0,1,30,13l.07-.07,1-.56,1-.57a.21.21,0,0,1,.29.07.24.24,0,0,1,0,.12v.16a1.07,1.07,0,0,0,1.6.93l1.08-.62,1.06-.61a1.06,1.06,0,0,0,.34-1.47A1,1,0,0,0,36.12,10Z"/><path d="M29.14,10.18l-2.49,5.14h-1l.93-1.92-1.46-3.22h1.06l.94,2.15,1-2.15Z"/><path d="M4.25,12a1,1,0,1,0-1,1.05h0a1,1,0,0,0,1-1V12m0,1.83v-.48a1.49,1.49,0,0,1-1.16.54,1.79,1.79,0,0,1-1.75-1.83V12a1.82,1.82,0,0,1,1.75-1.89h0a1.47,1.47,0,0,1,1.14.53v-.46h.89v3.65Z"/><path d="M9.52,13c-.32,0-.4-.12-.4-.42V11h.57v-.79H9.12V9.29H8.2v.89H7V9.81c0-.3.12-.42.44-.42h.2V8.68H7.21c-.76,0-1.12.25-1.12,1v.49H5.58V11h.51v2.86H7V11H8.2v1.79c0,.75.28,1.07,1,1.07h.5V13Z"/><path d="M12.82,11.67a.87.87,0,0,0-.91-.75.89.89,0,0,0-.92.75ZM11,12.24a.91.91,0,0,0,.94.85,1,1,0,0,0,.86-.47h.94a1.79,1.79,0,0,1-1.82,1.27A1.8,1.8,0,0,1,10,12.22V12a1.89,1.89,0,1,1,3.78,0h0a.89.89,0,0,1,0,.23Z"/><path d="M19.66,12a1,1,0,1,0,0,.05V12m-2.89,3.32V10.18h.89v.47a1.49,1.49,0,0,1,1.16-.54,1.79,1.79,0,0,1,1.76,1.82V12a1.82,1.82,0,0,1-1.75,1.89h0a1.44,1.44,0,0,1-1.11-.49v1.92Z"/><path d="M23.82,12a1,1,0,1,0-1.05,1.05h.05a1,1,0,0,0,1-1V12m0,1.83v-.48a1.46,1.46,0,0,1-1.15.54,1.79,1.79,0,0,1-1.76-1.82V12a1.82,1.82,0,0,1,1.75-1.89h0a1.45,1.45,0,0,1,1.13.53v-.46h.9v3.65Z"/><path d="M15.15,10.54a.91.91,0,0,1,.79-.43.88.88,0,0,1,.39.08v.94a1.15,1.15,0,0,0-.65-.17.64.64,0,0,0-.5.71v2.16h-.93V10.18h.9Z"/></svg>
diff --git a/changelog/2024-03-30-01-19-36-005298 b/changelog/2024-03-30-01-19-36-005298
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Add an instructive error message when customer tries to use 2 different currencies for Stripe Billing subscriptions.
diff --git a/changelog/fix-7866-tos-decline-busy b/changelog/fix-7866-tos-decline-busy
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix Decline button state for Accept loading on ToS modal
diff --git a/changelog/fix-8134-update-ip-ruleset-after-core-country-change b/changelog/fix-8134-update-ip-ruleset-after-core-country-change
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Change IP country rule after country settings are changed in WC settings page
diff --git a/changelog/fix-8567-connect-page-payment-methods b/changelog/fix-8567-connect-page-payment-methods
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix payment icons on connect page (Klarna, Afterpay)
diff --git a/changelog/fix-filesystem-phpcs-reports b/changelog/fix-filesystem-phpcs-reports
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Ignore alternative function WordPress PHPCS sniffs in the GH workflows and tests
diff --git a/changelog/fix-migrate-woopay-skipped-tracks-event b/changelog/fix-migrate-woopay-skipped-tracks-event
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Complete WooPay Tracks event migration and cleanup migration related code
+
+
diff --git a/client/checkout/woopay/email-input-iframe.js b/client/checkout/woopay/email-input-iframe.js
@@ -639,7 +639,7 @@ export const handleWooPayEmailInput = async (
 			dispatchUserExistEvent( true );
 		}, 2000 );
 
-		recordUserEvent( 'woopay_skipped', {}, true );
+		recordUserEvent( 'woopay_skipped', {} );
 
 		searchParams.delete( 'skip_woopay' );
 
diff --git a/client/connect-account-page/payment-methods.tsx b/client/connect-account-page/payment-methods.tsx
@@ -19,9 +19,9 @@ import {
 	DiscoverIcon,
 	GooglePayIcon,
 	MastercardIcon,
-	SofortIcon,
 	VisaIcon,
 	WooIcon,
+	KlarnaIcon,
 } from 'wcpay/payment-methods-icons';
 
 const PaymentMethods: React.FC = () => {
@@ -38,14 +38,14 @@ const PaymentMethods: React.FC = () => {
 				<GooglePayIcon />
 				{ wcpaySettings.isWooPayStoreCountryAvailable && <WooIcon /> }
 				<WooIcon />
-				<SofortIcon />
+				<KlarnaIcon />
 				<AffirmIcon />
 				{ 'GB' === wcpaySettings?.connect?.country ? (
 					<ClearpayIcon />
 				) : (
 					<AfterpayIcon />
 				) }
-				<span>& more.</span>
+				<span>& more</span>
 			</div>
 		</>
 	);
diff --git a/client/connect-account-page/test/__snapshots__/index.test.tsx.snap b/client/connect-account-page/test/__snapshots__/index.test.tsx.snap
@@ -107,9 +107,9 @@ exports[`ConnectAccountPage should render correctly 1`] = `
               src="assets/images/payment-methods/woo.svg"
             />
             <img
-              alt="Sofort"
+              alt="Klarna"
               class="payment-method__icon"
-              src="assets/images/payment-methods/sofort.svg"
+              src="assets/images/payment-methods/klarna.svg"
             />
             <img
               alt="Affirm"
@@ -122,7 +122,7 @@ exports[`ConnectAccountPage should render correctly 1`] = `
               src="assets/images/payment-methods/afterpay-logo.svg"
             />
             <span>
-              & more.
+              & more
             </span>
           </div>
           <div
@@ -374,9 +374,9 @@ exports[`ConnectAccountPage should render correctly with WooPay eligible 1`] = `
               src="assets/images/payment-methods/woo.svg"
             />
             <img
-              alt="Sofort"
+              alt="Klarna"
               class="payment-method__icon"
-              src="assets/images/payment-methods/sofort.svg"
+              src="assets/images/payment-methods/klarna.svg"
             />
             <img
               alt="Affirm"
@@ -389,7 +389,7 @@ exports[`ConnectAccountPage should render correctly with WooPay eligible 1`] = `
               src="assets/images/payment-methods/afterpay-logo.svg"
             />
             <span>
-              & more.
+              & more
             </span>
           </div>
           <div
@@ -598,9 +598,9 @@ exports[`ConnectAccountPage should render correctly with an incentive 1`] = `
               src="assets/images/payment-methods/woo.svg"
             />
             <img
-              alt="Sofort"
+              alt="Klarna"
               class="payment-method__icon"
-              src="assets/images/payment-methods/sofort.svg"
+              src="assets/images/payment-methods/klarna.svg"
             />
             <img
               alt="Affirm"
@@ -613,7 +613,7 @@ exports[`ConnectAccountPage should render correctly with an incentive 1`] = `
               src="assets/images/payment-methods/afterpay-logo.svg"
             />
             <span>
-              & more.
+              & more
             </span>
           </div>
           <div
diff --git a/client/settings/advanced-settings/stripe-billing-toggle.tsx b/client/settings/advanced-settings/stripe-billing-toggle.tsx
@@ -60,6 +60,7 @@ const StripeBillingToggle: React.FC< Props > = ( { onChange } ) => {
 					),
 				},
 			} ) }
+			data-testid={ 'stripe-billing-toggle' }
 		/>
 	);
 };
diff --git a/client/tos/modal/index.js b/client/tos/modal/index.js
@@ -73,7 +73,11 @@ const TosModalUI = ( { onAccept, onDecline, isBusy, hasError } ) => {
 					{ message }
 				</div>
 				<div className="woocommerce-payments__tos-footer">
-					<Button isSecondary onClick={ onDecline } isBusy={ isBusy }>
+					<Button
+						isSecondary
+						onClick={ onDecline }
+						disabled={ isBusy }
+					>
 						{ __( 'Decline', 'woocommerce-payments' ) }
 					</Button>
 
diff --git a/client/tracks/index.ts b/client/tracks/index.ts
@@ -62,12 +62,10 @@ export const recordEvent = (
  *
  * @param {string}  eventName         Name of the event.
  * @param {Object}  [eventProperties] Event properties (optional).
- * @param {boolean} isLegacy Event properties (optional).
  */
 export const recordUserEvent = (
 	eventName: string,
-	eventProperties: Record< string, unknown > = {},
-	isLegacy = false
+	eventProperties: Record< string, unknown > = {}
 ): void => {
 	const nonce =
 		getConfig( 'platformTrackerNonce' ) ??
@@ -80,7 +78,6 @@ export const recordUserEvent = (
 	body.append( 'action', 'platform_tracks' );
 	body.append( 'tracksEventName', eventName );
 	body.append( 'tracksEventProp', JSON.stringify( eventProperties ) );
-	body.append( 'isLegacy', JSON.stringify( isLegacy ) ); // formData does not allow appending booleans, so we stringify it - it is parsed back to a boolean on the PHP side.
 	fetch( ajaxUrl, {
 		method: 'post',
 		body,
diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php
@@ -531,6 +531,8 @@ public function init_hooks() {
 			add_action( 'woocommerce_update_order', [ $this, 'schedule_order_tracking' ], 10, 2 );
 
 			add_filter( 'rest_request_before_callbacks', [ $this, 'remove_all_actions_on_preflight_check' ], 10, 3 );
+
+			add_action( 'woocommerce_settings_save_general', [ $this, 'update_fraud_rules_based_on_general_options' ], 20 );
 		}
 
 		$this->maybe_init_subscriptions_hooks();
@@ -2976,6 +2978,48 @@ protected function maybe_refresh_fraud_protection_settings() {
 		}
 	}
 
+	/**
+	 * Updates the fraud rules depending on some settings when those settings have changed.
+	 *
+	 * @return  void           This is a readonly action.
+	 */
+	public function update_fraud_rules_based_on_general_options() {
+		// If the protection level is not "advanced", no need to run this, because it won't contain the IP country filter.
+		if ( 'advanced' !== $this->get_current_protection_level() ) {
+			return;
+		}
+
+		// If the ruleset can't be parsed, skip updating.
+		$ruleset = $this->get_advanced_fraud_protection_settings();
+		if (
+			'error' === $ruleset
+			|| ! is_array( $ruleset )
+			|| ! Fraud_Risk_Tools::is_valid_ruleset_array( $ruleset )
+		) {
+			return;
+		}
+
+		$needs_update = false;
+		foreach ( $ruleset as &$rule_array ) {
+			if ( isset( $rule_array['key'] ) && Fraud_Risk_Tools::RULE_INTERNATIONAL_IP_ADDRESS === $rule_array['key'] ) {
+				$new_rule_array = Fraud_Risk_Tools::get_international_ip_address_rule()->to_array();
+				if ( isset( $rule_array['check'] )
+					&& isset( $new_rule_array['check'] )
+					&& wp_json_encode( $rule_array['check'] ) !== wp_json_encode( $new_rule_array['check'] )
+				) {
+					$rule_array   = $new_rule_array;
+					$needs_update = true;
+				}
+			}
+		}
+
+		// Update the possibly changed values on the server, and the transient.
+		if ( $needs_update ) {
+			$this->payments_api_client->save_fraud_ruleset( $ruleset );
+			set_transient( 'wcpay_fraud_protection_settings', $ruleset, DAY_IN_SECONDS );
+		}
+	}
+
 	/**
 	 * The get_icon() method from the WC_Payment_Gateway class wraps the icon URL into a prepared HTML element, but there are situations when this
 	 * element needs to be rendered differently on the UI (e.g. additional styles or `display` property).
diff --git a/includes/class-wc-payments.php b/includes/class-wc-payments.php
@@ -409,6 +409,7 @@ public static function init() {
 		include_once __DIR__ . '/exceptions/class-add-payment-method-exception.php';
 		include_once __DIR__ . '/exceptions/class-amount-too-large-exception.php';
 		include_once __DIR__ . '/exceptions/class-amount-too-small-exception.php';
+		include_once __DIR__ . '/exceptions/class-cannot-combine-currencies-exception.php';
 		include_once __DIR__ . '/exceptions/class-intent-authentication-exception.php';
 		include_once __DIR__ . '/exceptions/class-invalid-payment-method-exception.php';
 		include_once __DIR__ . '/exceptions/class-process-payment-exception.php';
diff --git a/includes/class-woopay-tracker.php b/includes/class-woopay-tracker.php
@@ -21,13 +21,6 @@
  */
 class WooPay_Tracker extends Jetpack_Tracks_Client {
 
-	/**
-	 * Legacy prefix used for WooPay user events
-	 *
-	 * @var string
-	 */
-	private static $legacy_user_prefix = 'woocommerceanalytics';
-
 	/**
 	 * WCPay user event prefix
 	 *
@@ -107,10 +100,7 @@ public function ajax_tracks() {
 				$tracks_data = $event_prop;
 			}
 		}
-		// Legacy events are shopper events that still use the woocommerceanalytics prefix.
-		// These need to be migrated to the wcpay prefix.
-		$is_legacy_event = isset( $_REQUEST['isLegacy'] ) ? rest_sanitize_boolean( wc_clean( wp_unslash( $_REQUEST['isLegacy'] ) ) ) : false;
-		$this->maybe_record_event( sanitize_text_field( wp_unslash( $_REQUEST['tracksEventName'] ) ), $tracks_data, $is_legacy_event );
+		$this->maybe_record_event( sanitize_text_field( wp_unslash( $_REQUEST['tracksEventName'] ) ), $tracks_data );
 
 		wp_send_json_success();
 	}
@@ -132,13 +122,11 @@ public function ajax_tracks_id() {
 	 *
 	 * @param string  $event name of the event.
 	 * @param array   $data array of event properties.
-	 * @param boolean $is_legacy indicate whether this is a legacy event.
 	 */
-	public function maybe_record_event( $event, $data = [], $is_legacy = true ) {
+	public function maybe_record_event( $event, $data = [] ) {
 		// Top level events should not be namespaced.
 		if ( '_aliasUser' !== $event ) {
-			$prefix = $is_legacy ? self::$legacy_user_prefix : self::$user_prefix;
-			$event  = $prefix . '_' . $event;
+			$event  = self::$user_prefix . '_' . $event;
 		}
 
 		return $this->tracks_record_event( $event, $data );
diff --git a/includes/exceptions/class-cannot-combine-currencies-exception.php b/includes/exceptions/class-cannot-combine-currencies-exception.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Class Cannot_Combine_Currencies_Exception
+ *
+ * @package WooCommerce\Payments
+ */
+
+namespace WCPay\Exceptions;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class representing Amount_Too_Small_Exception
+ */
+class Cannot_Combine_Currencies_Exception extends API_Exception {
+	/**
+	 * Holds the attempted currency, extracted from the error message returned by the API.
+	 *
+	 * @var string
+	 */
+	private $currency;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string     $message        The Exception message to throw.
+	 * @param string     $currency       The currency for which this is the minimum amount.
+	 * @param int        $http_code      HTTP response code.
+	 * @param int        $code           The Exception code.
+	 * @param \Throwable $previous       The previous exception used for the exception chaining.
+	 */
+	public function __construct( $message, $currency, $http_code, $code = 0, $previous = null ) {
+		$this->currency = $currency;
+
+		parent::__construct( $message, 'cannot_combine_currencies', $http_code, null, null, $code, $previous );
+	}
+
+	/**
+	 * Returns the currency of the minumum required amount.
+	 *
+	 * @return string
+	 */
+	public function get_currency() {
+		return $this->currency;
+	}
+}
diff --git a/includes/fraud-prevention/class-fraud-risk-tools.php b/includes/fraud-prevention/class-fraud-risk-tools.php
diff --git a/includes/subscriptions/class-wc-payments-subscription-service.php b/includes/subscriptions/class-wc-payments-subscription-service.php
diff --git a/includes/wc-payment-api/class-wc-payments-api-client.php b/includes/wc-payment-api/class-wc-payments-api-client.php
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
diff --git a/tests/unit/fraud-prevention/test-class-fraud-risk-tools.php b/tests/unit/fraud-prevention/test-class-fraud-risk-tools.php
