Merge release/5.3.0 into trunk

Author: cesarcosta99

.github/workflows/compatibility.yml

@@ -4,7 +4,7 @@ on:
   pull_request
 
 env:
-  WC_L2_VERSION: '7.0.1'
+  WC_L2_VERSION: '7.1.1'
   WP_L2_VERSION: '5.9'
 
 jobs:
@@ -20,7 +20,7 @@ jobs:
           WC_VERSIONS=$( echo "[\"$WC_L2_VERSION\", \"latest\", \"beta\"]" )
           MATRIX_INCLUDE=$( echo "[{\"woocommerce\":\"$WC_L2_VERSION\",\"wordpress\":\"$WP_L2_VERSION\",\"gutenberg\":\"13.6.0\",\"php\":\"7.2\"}]" )
           echo "matrix={\"woocommerce\":$WC_VERSIONS,\"wordpress\":[\"latest\"],\"gutenberg\":[\"latest\"],\"php\":[\"7.4\"], \"include\":$MATRIX_INCLUDE}" >> $GITHUB_OUTPUT
-  
+
   woocommerce-compatibility:
     name: "WC compatibility"
     needs: generate-matrix

.github/workflows/e2e-test.yml

@@ -23,7 +23,7 @@ env:
   E2E_SLACK_TOKEN:       ${{ secrets.E2E_SLACK_TOKEN }}
   E2E_USE_LOCAL_SERVER:  false
   E2E_RESULT_FILEPATH:   'tests/e2e/results.json'
-  WC_L2_VERSION: '7.0.1'
+  WC_L2_VERSION: '7.1.1'
 
 
 jobs:
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast:     false
       matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
-    
+
     name: WC - ${{ matrix.woocommerce }} | ${{ matrix.test_groups }} - ${{ matrix.test_branches }}
 
     env:

.github/workflows/php-lint-test.yml

@@ -5,7 +5,7 @@ on:
 
 env:
   WP_VERSION:        latest
-  WC_L2_VERSION: '7.0.1'  # the min supported version as per L-2 policy
+  WC_L2_VERSION: '7.1.1'  # the min supported version as per L-2 policy
   GUTENBERG_VERSION: latest
 
 jobs:

.github/workflows/release-code-freeze.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
     inputs:
       skipSlackPing:
-        description: "If true, the Slack ping will be skipped"
+        description: "Skip the Slack ping"
         type: boolean
         required: false
         default: false
@@ -75,6 +75,7 @@ jobs:
     uses: ./.github/workflows/release-pr.yml
     with:
       releaseVersion: ${{ needs.check-code-freeze.outputs.nextReleaseVersion }}
+    secrets: inherit
 
   slack-notification:
     name: "Send notification to Slack"

.github/workflows/release-pr.yml

@@ -13,6 +13,7 @@ on:
         required: false
         default: "next wednesday"
         type: string
+
   workflow_dispatch:
     inputs:
       releaseVersion:

changelog.txt

@@ -1,5 +1,24 @@
 *** WooCommerce Payments Changelog ***
 
+= 5.3.0 - 2023-01-11 =
+* Add - Added support for WooPay express checkout on product page. This feature is currently behind a feature flag and is not yet publicly available.
+* Add - Add the processing order_id to WC Session and its handling to prevent duplicate orders
+* Fix - Ensure script dependencies are loaded properly even when trying to register them again in the same request.
+* Fix - Fix an issue which caused synced wcpay subscription to not sync the first payment date when the customer is charged upfront.
+* Fix - Fix subscriptions remaining on-hold after processing a WCPay Subscription renewal on HPOS environments.
+* Fix - Make the webhook processing respect the test/live mode setting for the gateway
+* Fix - Prevent 'No such customer' errors after store is migrated to a new WCPay account.
+* Fix - Prevent occasional fatal errors when creating customers via ActionScheduler jobs
+* Fix - Updates subscriptions' payment token when a new default payment method is set.
+* Update - Bail out before payment processing for WooPay's order validation request
+* Update - Check the status of previously initiated payments and mark orders as processing instead of initiating a new payment.
+* Update - Enhance save my info section on classic and Blocks checkout
+* Dev - Bump minimum required version of WooCommerce to 7.1.1.
+* Dev - Remove redundant compatibility utility class for admin notes.
+* Dev - Replace typed payment intent strings with constants saved in an Enum clas
+* Dev - Retry API requests on network failure if Idempotency-Key header is present.
+* Dev - The PR replaces hard-coded order status constants, with a dedicated Enum class to make it reusable across the codebase.
+
 = 5.2.1 - 2022-12-30 =
 * Fix - UPE not loading on checkout page due to undefined i18n.
 

client/checkout/api/index.js

@@ -662,10 +662,21 @@ export default class WCPayAPI {
 				_wpnonce: nonce,
 				email: userEmail,
 				user_session: platformCheckoutUserSession,
+				return_url: window?.location?.href ?? '',
 			}
 		);
 	}
 
+	expressCheckoutAddToCart( productData ) {
+		const wcAjaxUrl = getConfig( 'wcAjaxUrl' );
+		const addToCartNonce = getConfig( 'addToCartNonce' );
+
+		return this.request( buildAjaxURL( wcAjaxUrl, 'add_to_cart' ), {
+			security: addToCartNonce,
+			...productData,
+		} );
+	}
+
 	paymentRequestPayForOrder( order, paymentData ) {
 		return this.request( getPaymentRequestAjaxURL( 'pay_for_order' ), {
 			_wpnonce: getPaymentRequestData( 'nonce' )?.pay_for_order,
@@ -692,4 +703,30 @@ export default class WCPayAPI {
 			return true;
 		} );
 	}
+
+	/**
+	 * Redirect to the order-received page for duplicate payments.
+	 *
+	 * @param {Object} response Response data to check if doing the redirect.
+	 * @return {boolean} Returns true if doing the redirection.
+	 */
+	handleDuplicatePayments( {
+		wcpay_upe_paid_for_previous_order: previouslyPaid,
+		wcpay_upe_previous_successful_intent: previousSuccessfulIntent,
+		redirect,
+	} ) {
+		if ( redirect ) {
+			// Another order has the same cart content and was paid.
+			if ( previouslyPaid ) {
+				return ( window.location = redirect );
+			}
+
+			// Another intent has the equivalent successful status for the order.
+			if ( previousSuccessfulIntent ) {
+				return ( window.location = redirect );
+			}
+		}
+
+		return false;
+	}
 }

client/checkout/api/test/index.test.js

@@ -25,6 +25,7 @@ describe( 'WCPayAPI', () => {
 		expect( request ).toHaveBeenLastCalledWith( 'https://example.org/', {
 			_wpnonce: 'foo',
 			email: '[email protected]',
+			return_url: 'http://localhost/',
 			user_session: 'qwerty123',
 		} );
 	} );

client/checkout/blocks/upe-fields.js

@@ -272,6 +272,10 @@ const WCPayUPEFields = ( {
 			onCheckoutAfterProcessingWithSuccess(
 				( { orderId, processingResponse: { paymentDetails } } ) => {
 					async function updateIntent() {
+						if ( api.handleDuplicatePayments( paymentDetails ) ) {
+							return;
+						}
+
 						await api.updateIntent(
 							paymentIntentId,
 							orderId,

client/checkout/classic/upe.js

@@ -453,14 +453,20 @@ jQuery( function ( $ ) {
 
 		try {
 			// Update payment intent with level3 data, customer and maybe setup for future use.
-			await api.updateIntent(
+			const updateResponse = await api.updateIntent(
 				paymentIntentId,
 				orderId,
 				savePaymentMethod,
 				$( '#wcpay_selected_upe_payment_type' ).val(),
 				$( '#wcpay_payment_country' ).val()
 			);
 
+			if ( updateResponse.data ) {
+				if ( api.handleDuplicatePayments( updateResponse.data ) ) {
+					return;
+				}
+			}
+
 			const { error } = await api.handlePaymentConfirmation(
 				elements,
 				{
@@ -535,6 +541,11 @@ jQuery( function ( $ ) {
 				formFields,
 				fingerprint ? fingerprint : ''
 			);
+
+			if ( api.handleDuplicatePayments( response ) ) {
+				return;
+			}
+
 			const redirectUrl = response.redirect_url;
 			const upeConfig = {
 				elements,