Merge branch 'develop' into update/6505-dispute-task-wc-home

changelog/dev-ts-refactor-download-button

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+minor refactor from js to tsx

changelog/dev-ts-refactor-inline-notice

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+minor tsx refactor

changelog/dev-ts-refactor-progress-bar

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+minor tsx refactor

changelog/fix-5525-cant-enable-cc-payments

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Corrected bug where checkbox could not be enabled when credit card was disabled

changelog/fix-6278-frt-meta-missing-on-manual-capture

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed payment intents still getting confirmed on UPE when intent update fails

client/checkout/classic/index.js

@@ -292,7 +292,11 @@ jQuery( function ( $ ) {
 			.catch( function ( error ) {
 				paymentMethodGenerated = null;
 				$form.removeClass( 'processing' ).unblock();
-				showError( error.message );
+				if ( error.responseJSON && ! error.responseJSON.success ) {
+					showError( error.responseJSON.data.error.message );
+				} else if ( error.message ) {
+					showError( error.message );
+				}
 			} );
 	};
 

client/checkout/classic/upe-split.js

@@ -473,6 +473,10 @@ jQuery( function ( $ ) {
 			);
 
 			if ( updateResponse.data ) {
+				if ( updateResponse.data.error ) {
+					throw updateResponse.data.error;
+				}
+
 				if ( api.handleDuplicatePayments( updateResponse.data ) ) {
 					return;
 				}

client/checkout/classic/upe.js

@@ -493,6 +493,10 @@ jQuery( function ( $ ) {
 			);
 
 			if ( updateResponse.data ) {
+				if ( updateResponse.data.error ) {
+					throw updateResponse.data.error;
+				}
+
 				if ( api.handleDuplicatePayments( updateResponse.data ) ) {
 					return;
 				}

client/components/download-button/index.js → client/components/download-button/index.tsx

@@ -13,7 +13,15 @@ import CloudDownloadIcon from 'gridicons/dist/cloud-download';
  */
 import './style.scss';
 
-const DownloadButton = ( { isDisabled, onClick } ) => (
+interface DownloadButtonProps {
+	isDisabled: boolean;
+	onClick: ( event: any ) => void;
+}
+
+const DownloadButton: React.FunctionComponent< DownloadButtonProps > = ( {
+	isDisabled,
+	onClick,
+} ) => (
 	<Button
 		className="woocommerce-table__download-button"
 		disabled={ isDisabled }

client/components/download-button/test/index.js → client/components/download-button/test/index.tsx

@@ -7,9 +7,18 @@ import { render, fireEvent, getByRole } from '@testing-library/react';
 /**
  * Internal dependencies
  */
-import DownloadButton from '../';
+import DownloadButton from '..';
+import React from 'react';
 
 describe( 'DownloadButton', () => {
+	function renderDownloadButton(
+		isDisabled: boolean,
+		onClick: jest.Mock< any, any >
+	) {
+		return render(
+			<DownloadButton isDisabled={ isDisabled } onClick={ onClick } />
+		);
+	}
 	test( 'renders an active button', () => {
 		const onDownload = jest.fn();
 		const { container: button } = renderDownloadButton( false, onDownload );
@@ -41,10 +50,4 @@ describe( 'DownloadButton', () => {
 		expect( onDownload.mock.calls.length ).toBe( 0 );
 		expect( button ).toMatchSnapshot();
 	} );
-
-	function renderDownloadButton( isDisabled, onClick ) {
-		return render(
-			<DownloadButton isDisabled={ isDisabled } onClick={ onClick } />
-		);
-	}
 } );

client/components/inline-notice/index.js → client/components/inline-notice/index.tsx

@@ -10,7 +10,10 @@ import classNames from 'classnames';
  */
 import './style.scss';
 
-const InlineNotice = ( { className, ...restProps } ) => (
+const InlineNotice: React.FunctionComponent< Notice.Props > = ( {
+	className,
+	...restProps
+} ) => (
 	<Notice
 		className={ classNames( 'wcpay-inline-notice', className ) }
 		{ ...restProps }

client/components/progress-bar/index.js → client/components/progress-bar/index.tsx

@@ -1,10 +1,25 @@
 /** @format */
+/**
+ * External dependencies
+ */
+import React from 'react';
+
 /**
  * Internal dependencies
  */
 import './style.scss';
 
-const ProgressBar = ( { progressLabel, totalLabel, progress } ) => {
+interface ProgressBarProps {
+	progressLabel: string;
+	totalLabel: string;
+	progress: number;
+}
+
+const ProgressBar: React.FunctionComponent< ProgressBarProps > = ( {
+	progressLabel,
+	totalLabel,
+	progress,
+} ) => {
 	const useInnerLabel = 0.5 < progress;
 	return (
 		<div className="progressbar">

client/components/progress-bar/test/index.js → client/components/progress-bar/test/index.tsx

@@ -3,6 +3,7 @@
  * External dependencies
  */
 import { render } from '@testing-library/react';
+import React from 'react';
 
 /**
  * Internal dependencies

client/payment-methods/index.js

@@ -150,6 +150,8 @@ const PaymentMethods = () => {
 		( methodId ) => methodsConfiguration[ methodId ]
 	);
 
+	const isCreditCardEnabled = enabledMethodIds.includes( 'card' );
+
 	const [ activationModalParams, handleActivationModalOpen ] = useState(
 		null
 	);
@@ -300,6 +302,7 @@ const PaymentMethods = () => {
 									}
 									locked={
 										PAYMENT_METHOD_IDS.CARD === id &&
+										isCreditCardEnabled &&
 										isUpeEnabled
 									}
 									Icon={ Icon }

includes/class-wc-payment-gateway-wcpay.php

@@ -9,14 +9,14 @@
 	exit; // Exit if accessed directly.
 }
 
+use WCPay\Constants\Fraud_Meta_Box_Type;
 use WCPay\Constants\Order_Status;
 use WCPay\Constants\Payment_Capture_Type;
 use WCPay\Constants\Payment_Initiated_By;
 use WCPay\Constants\Payment_Intent_Status;
 use WCPay\Constants\Payment_Type;
 use WCPay\Constants\Payment_Method;
 use WCPay\Exceptions\{ Add_Payment_Method_Exception, Amount_Too_Small_Exception, Process_Payment_Exception, Intent_Authentication_Exception, API_Exception };
-use WCPay\Core\Mode;
 use WCPay\Core\Server\Request\Cancel_Intention;
 use WCPay\Core\Server\Request\Capture_Intention;
 use WCPay\Core\Server\Request\Create_And_Confirm_Intention;
@@ -35,7 +35,6 @@
 use WCPay\Payment_Methods\Link_Payment_Method;
 use WCPay\WooPay\WooPay_Order_Status_Sync;
 use WCPay\WooPay\WooPay_Utilities;
-use WCPay\WooPay_Tracker;
 use WCPay\Session_Rate_Limiter;
 use WCPay\Tracker;
 
@@ -798,17 +797,23 @@ public function process_payment( $order_id ) {
 
 				$error_details = esc_html( rtrim( $e->getMessage(), '.' ) );
 
-				if ( $e instanceof API_Exception && 'card_error' === $e->get_error_type() && 'incorrect_zip' === $e->get_error_code() ) {
-					/* translators: %1: the failed payment amount, %2: error message  */
-					$error_message = __(
-						'A payment of %1$s <strong>failed</strong>. %2$s',
-						'woocommerce-payments'
-					);
+				if ( $e instanceof API_Exception && 'card_error' === $e->get_error_type() ) {
+					// If the payment failed with a 'card_error' API exception, initialize the fraud meta box
+					// type with ALLOW, because fraud checks are passed, and the payment returned a "card error".
+					$this->order_service->set_fraud_meta_box_type_for_order( $order, Fraud_Meta_Box_Type::ALLOW );
 
-					$error_details = __(
-						'We couldn’t verify the postal code in the billing address. If the issue persists, suggest the customer to reach out to the card issuing bank.',
-						'woocommerce-payments'
-					);
+					if ( 'incorrect_zip' === $e->get_error_code() ) {
+						/* translators: %1: the failed payment amount, %2: error message  */
+						$error_message = __(
+							'A payment of %1$s <strong>failed</strong>. %2$s',
+							'woocommerce-payments'
+						);
+
+						$error_details = __(
+							'We couldn’t verify the postal code in the billing address. If the issue persists, suggest the customer to reach out to the card issuing bank.',
+							'woocommerce-payments'
+						);
+					}
 				}
 
 				$note = sprintf(
@@ -3117,7 +3122,8 @@ public function create_setup_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}

includes/class-wc-payments-payment-request-button-handler.php

@@ -1382,7 +1382,7 @@ public function validate_state() {
 	 */
 	public function ajax_create_order() {
 		if ( WC()->cart->is_empty() ) {
-			wp_send_json_error( __( 'Empty cart', 'woocommerce-payments' ) );
+			wp_send_json_error( __( 'Empty cart', 'woocommerce-payments' ), 400 );
 		}
 
 		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {

includes/class-wc-payments-utils.php

@@ -552,6 +552,20 @@ public static function get_filtered_error_message( Exception $e ) {
 		return $error_message;
 	}
 
+	/**
+	 * Returns the customer facing HTTP status codes for an exception.
+	 *
+	 * @param   Exception $e  Exception to get the HTTP status code for.
+	 *
+	 * @return  int
+	 */
+	public static function get_filtered_error_status_code( Exception $e ) : int {
+		if ( $e instanceof API_Exception ) {
+			return $e->get_http_code() ?? 400;
+		}
+		return 400;
+	}
+
 	/**
 	 * Saves the minimum amount required for transactions in a given currency.
 	 *

includes/fraud-prevention/class-buyer-fingerprinting-service.php

@@ -62,12 +62,27 @@ public function hash_data_for_fraud_prevention( string $data ): string {
 	 * @return array An array of hashed data for an order.
 	 */
 	public function get_hashed_data_for_customer( $fingerprint ): array {
+		global $wp;
+		$order_items_count = WC()->cart ? intval( WC()->cart->get_cart_contents_count() ) : null;
+		$order_id          = null;
+		if ( isset( $wp->query_vars['order-pay'] ) ) {
+			$order_id = absint( $wp->query_vars['order-pay'] );
+		} elseif ( isset( $_POST['wcpay_order_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+			$order_id = absint( $_POST['wcpay_order_id'] ); // phpcs:ignore WordPress.Security.NonceVerification
+		}
+		if ( ! $order_items_count && 0 < $order_id ) {
+			$order = wc_get_order( $order_id );
+			if ( $order ) {
+				$order_items_count = $order->get_item_count();
+			}
+		}
+
 		return array_filter(
 			[
 				'fraud_prevention_data_shopper_ip_hash' => $this->hash_data_for_fraud_prevention( WC_Geolocation::get_ip_address() ),
 				'fraud_prevention_data_shopper_ua_hash' => $fingerprint,
 				'fraud_prevention_data_ip_country'      => WC_Geolocation::geolocate_ip( '', true )['country'],
-				'fraud_prevention_data_cart_contents'   => WC()->cart ? intval( WC()->cart->get_cart_contents_count() ) : null,
+				'fraud_prevention_data_cart_contents'   => $order_items_count,
 			]
 		);
 	}

includes/payment-methods/class-upe-payment-gateway.php

@@ -177,7 +177,8 @@ public function update_payment_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}
@@ -283,7 +284,8 @@ public function create_payment_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}
@@ -386,7 +388,8 @@ public function init_setup_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}
@@ -1018,7 +1021,8 @@ public function save_upe_appearance_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}
@@ -1141,9 +1145,10 @@ public function log_payment_error_ajax() {
 			wp_send_json_error(
 				[
 					'error' => [
-						'message' => $e->getMessage(),
+						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}

includes/payment-methods/class-upe-split-payment-gateway.php

@@ -198,7 +198,8 @@ public function update_payment_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}
@@ -255,7 +256,8 @@ public function create_payment_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}
@@ -301,7 +303,8 @@ public function init_setup_intent_ajax() {
 					'error' => [
 						'message' => WC_Payments_Utils::get_filtered_error_message( $e ),
 					],
-				]
+				],
+				WC_Payments_Utils::get_filtered_error_status_code( $e ),
 			);
 		}
 	}