Merge remote-tracking branch 'origin/release/8.8.0' into trunk

Author: james-allan

.eslintrc.js

@@ -18,7 +18,6 @@ module.exports = {
 		node: true,
 	},
 	rules: {
-		'require-await': 'error',
 		'react-hooks/exhaustive-deps': 'error',
 		'react-hooks/rules-of-hooks': 'error',
 		'react/jsx-curly-brace-presence': [

.github/workflows/compatibility.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   beta-compatibility:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

.github/workflows/php-tests.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast:    false
       max-parallel: 10

.jshintrc

@@ -1,5 +1,5 @@
 {
-	"esversion": 6,
+	"esversion": 11,
 	"boss": true,
 	"curly": true,
 	"eqeqeq": true,
@@ -13,6 +13,9 @@
 
 	"browser": true,
 
+	"mocha": true,
+	"jasmine": true,
+
 	"globals": {
 		"_": false,
 		"Backbone": false,

assets/js/stripe-payment-request.js

@@ -69,8 +69,8 @@ jQuery( function( $ ) {
 			};
 		},
 
-		processSource: function( source, paymentRequestType ) {
-			var data = wc_stripe_payment_request.getOrderData( source, paymentRequestType );
+		processPaymentMethod: function( paymentMethod, paymentRequestType ) {
+			var data = wc_stripe_payment_request.getOrderData( paymentMethod, paymentRequestType );
 
 			return $.ajax( {
 				type:    'POST',
@@ -85,46 +85,49 @@ jQuery( function( $ ) {
 		 *
 		 * @since 3.1.0
 		 * @version 4.0.0
-		 * @param {PaymentResponse} source Payment Response instance.
+		 * @param {Object} evt The event object containing payment details and user information.
+		 * @param {string} paymentRequestType The type of payment request, either 'google_pay' or 'apple_pay'.
 		 *
-		 * @return {Object}
+		 * @return {Object} Processed order data for further handling, including shipping, billing, and payment method information.
 		 */
 		getOrderData: function( evt, paymentRequestType ) {
-			var source   = evt.source;
-			var email    = source.owner.email;
-			var phone    = source.owner.phone;
-			var billing  = source.owner.address;
-			var name     = source.owner.name ?? evt.payerName;
-			var shipping = evt.shippingAddress;
-			var data     = {
-				_wpnonce:                  wc_stripe_payment_request_params.nonce.checkout,
-				billing_first_name:        name?.split( ' ' )?.slice( 0, 1 )?.join( ' ' ) ?? '',
-				billing_last_name:         name?.split( ' ' )?.slice( 1 )?.join( ' ' ) || '-',
-				billing_company:           '',
-				billing_email:             null !== email   ? email : evt.payerEmail,
-				billing_phone:             null !== phone   ? phone : evt.payerPhone && evt.payerPhone.replace( '/[() -]/g', '' ),
-				billing_country:           null !== billing ? billing.country : '',
-				billing_address_1:         null !== billing ? billing.line1 : '',
-				billing_address_2:         null !== billing ? billing.line2 : '',
-				billing_city:              null !== billing ? billing.city : '',
-				billing_state:             null !== billing ? billing.state : '',
-				billing_postcode:          null !== billing ? billing.postal_code : '',
-				shipping_first_name:       '',
-				shipping_last_name:        '',
-				shipping_company:          '',
-				shipping_country:          '',
-				shipping_address_1:        '',
-				shipping_address_2:        '',
-				shipping_city:             '',
-				shipping_state:            '',
-				shipping_postcode:         '',
-				shipping_method:           [ null === evt.shippingOption ? null : evt.shippingOption.id ],
-				order_comments:            '',
-				payment_method:            'stripe',
-				ship_to_different_address: 1,
-				terms:                     1,
-				stripe_source:             source.id,
-				payment_request_type:      paymentRequestType
+			var paymentMethod = evt.paymentMethod;
+			var email         = paymentMethod.billing_details.email;
+			var phone         = paymentMethod.billing_details.phone;
+			var billing       = paymentMethod.billing_details.address;
+			var name          = paymentMethod.billing_details.name ?? evt.payerName;
+			var shipping      = evt.shippingAddress;
+			var data          = {
+				_wpnonce:                       wc_stripe_payment_request_params.nonce.checkout,
+				billing_first_name:             name?.split( ' ' )?.slice( 0, 1 )?.join( ' ' ) ?? '',
+				billing_last_name:              name?.split( ' ' )?.slice( 1 )?.join( ' ' ) || '-',
+				billing_company:                '',
+				billing_email:                  null !== email   ? email : evt.payerEmail,
+				billing_phone:                  null !== phone   ? phone : evt.payerPhone && evt.payerPhone.replace( '/[() -]/g', '' ),
+				billing_country:                null !== billing ? billing.country : '',
+				billing_address_1:              null !== billing ? billing.line1 : '',
+				billing_address_2:              null !== billing ? billing.line2 : '',
+				billing_city:                   null !== billing ? billing.city : '',
+				billing_state:                  null !== billing ? billing.state : '',
+				billing_postcode:               null !== billing ? billing.postal_code : '',
+				shipping_first_name:            '',
+				shipping_last_name:             '',
+				shipping_company:               '',
+				shipping_country:               '',
+				shipping_address_1:             '',
+				shipping_address_2:             '',
+				shipping_city:                  '',
+				shipping_state:                 '',
+				shipping_postcode:              '',
+				shipping_method:                [ null === evt.shippingOption ? null : evt.shippingOption.id ],
+				order_comments:                 '',
+				payment_method:                 'stripe',
+				ship_to_different_address:      1,
+				terms:                          1,
+				'wc-stripe-payment-method':     paymentMethod.id,
+				stripe_source:                  paymentMethod.id, // Needed to process the payment in legacy checkout mode.
+				payment_request_type:           paymentRequestType,
+				'wc-stripe-is-deferred-intent': true,
 			};
 
 			if ( shipping ) {
@@ -480,12 +483,12 @@ jQuery( function( $ ) {
 					} );
 				} );
 
-				paymentRequest.on( 'source', function( evt ) {
+				paymentRequest.on( 'paymentmethod', function( evt ) {
 					// Check if we allow prepaid cards.
 					if ( 'no' === wc_stripe_payment_request_params.stripe.allow_prepaid_card && 'prepaid' === evt.source.card.funding ) {
 						wc_stripe_payment_request.abortPayment( evt, wc_stripe_payment_request.getErrorMessageHTML( wc_stripe_payment_request_params.i18n.no_prepaid_card ) );
 					} else {
-						$.when( wc_stripe_payment_request.processSource( evt, paymentRequestType ) ).then( function( response ) {
+						$.when( wc_stripe_payment_request.processPaymentMethod( evt, paymentRequestType ) ).then( function( response ) {
 							if ( 'success' === response.result ) {
 								wc_stripe_payment_request.completePayment( evt, response.redirect );
 							} else {

changelog.txt

@@ -1,5 +1,41 @@
 *** Changelog ***
 
+= 8.8.0 - 2024-10-17 =
+* Fix - Update URL and path constants to support use of symlinked plugin.
+* Tweak - Disable ECE when cart has virtual products and tax is based on customer billing or shipping address.
+* Fix - Fix the usage of coupons and the total shipping amount when using the Express Checkout Element on the shortcode checkout.
+* Fix - Fixes some JS console errors when making a purchase with the Stripe Express Checkout Element on the shortcode checkout.
+* Fix - Updates the display logic for the OAuth re-connect promotional surface to follow the latest changes made to the connection settings object.
+* Fix - Remove unexpected HTML in error message for shortcode checkout.
+* Fix - Ensure ordering for Stripe payment methods is saved even when setting up from scratch.
+* Add - Implemented the "Update all subscriptions payment methods" checkbox on My Account → Payment methods for UPE payment methods.
+* Add - Add support for the new Stripe Express Checkout Element on the block cart and checkout page.
+* Add - Add support for the new Stripe Express Checkout Element on the shortcode checkout page.
+* Add - Add support for the new Stripe Express Checkout Element on the shortcode cart page.
+* Add - Add support for the new Stripe Express Checkout Element on the pay for order page.
+* Add - Add support for the new Stripe Checkout Element on the product page.
+* Dev - Introduces a new class with payment methods constants.
+* Dev - Introduces a new class with currency codes constants.
+* Dev - Improves the readability of the redirect URL generation code (UPE).
+* Fix - Fix mandate creation for subscriptions and saved payment methods.
+* Fix - Fix Google Pay address fields mapping for UAE addresses.
+* Tweak - Render the Klarna payment page in the store locale.
+* Tweak - Update the Apple Pay domain registration flow to use the new Stripe API endpoint.
+* Fix - Fix empty error message for Express Payments when order creation fails.
+* Fix - Fix multiple issues related to the reuse of Cash App Pay tokens (as a saved payment method) when subscribing.
+* Fix - Move charge related code to separate try-catch to prevent renewal failure.
+* Fix - Corrected translation text domain in UPE checkout integration.
+* Fix - Resolve an issue where Stripe Payment Method API calls passed the token's database ID instead of the Stripe ID.
+* Fix - Pre-orders set to pay upon release were remaining pending when attempting to pay using Stripe.
+* Fix - Ensure subscription renewal order statement descriptors include the order number suffix.
+* Fix - Resolved an issue which caused the WeChat Pay payment icon to not be displayed on shortcode checkout pages.
+* Fix - Set order payment method title to the customizable title setting rather than the default label.
+* Fix - Update Cash App payments to avoid confirming on creation, resolving issues with generic payment failures in live mode.
+* Fix - Switch Google Pay and Apple Pay PRB flow to create PaymentMethod (pm_) instead of Source (src_), utilizing deferred intent processing.
+* Tweak - Add order lock for redirect payments.
+* Fix - Missing Stripe Fee and Stripe Payout details on orders that were captured manually.
+* Fix - Allow legacy `src_` payment methods linked to a saved credit card to be displayed on the checkout and My Account pages when the new checkout experience is enabled.
+
 = 8.7.0 - 2024-09-16 =
 * Add - Introduces a new promotional surface to encourage merchants with the legacy checkout experience and APMs enabled to use the new checkout experience.
 * Fix - Prevent duplicate failed-order emails from being sent.

client/api/index.js

@@ -1,6 +1,11 @@
 /* global Stripe */
 import { __ } from '@wordpress/i18n';
 import { isLinkEnabled } from 'wcstripe/stripe-utils';
+import {
+	getExpressCheckoutData,
+	getExpressCheckoutAjaxURL,
+	getRequiredFieldDataFromCheckoutForm,
+} from 'wcstripe/express-checkout/utils';
 
 /**
  * Handles generic connections to the server and Stripe.
@@ -168,13 +173,15 @@ export default class WCStripeAPI {
 	 * Creates and confirms a setup intent.
 	 *
 	 * @param {Object} paymentMethod Payment method data.
+	 * @param {Object} additionalData Additional data to send with the request.
 	 *
 	 * @return {Promise} Promise containing the setup intent.
 	 */
-	setupIntent( paymentMethod ) {
+	setupIntent( paymentMethod, additionalData = {} ) {
 		return this.request(
 			this.getAjaxUrl( 'create_and_confirm_setup_intent' ),
 			{
+				...additionalData,
 				action: 'create_and_confirm_setup_intent',
 				'wc-stripe-payment-method': paymentMethod.id,
 				'wc-stripe-payment-type': paymentMethod.type,
@@ -467,4 +474,121 @@ export default class WCStripeAPI {
 				}
 			} );
 	}
+
+	/**
+	 * Submits shipping address to get available shipping options
+	 * from Express Checkout ECE payment method.
+	 *
+	 * @param {Object} shippingAddress Shipping details.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutECECalculateShippingOptions( shippingAddress ) {
+		return this.request(
+			getExpressCheckoutAjaxURL( 'get_shipping_options' ),
+			{
+				security: getExpressCheckoutData( 'nonce' )?.shipping,
+				is_product_page: getExpressCheckoutData( 'is_product_page' ),
+				...shippingAddress,
+			}
+		);
+	}
+
+	/**
+	 * Updates cart with selected shipping option.
+	 *
+	 * @param {Object} shippingOption Shipping option.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutUpdateShippingDetails( shippingOption ) {
+		return this.request(
+			getExpressCheckoutAjaxURL( 'update_shipping_method' ),
+			{
+				security: getExpressCheckoutData( 'nonce' )?.update_shipping,
+				shipping_method: [ shippingOption.id ],
+				is_product_page: getExpressCheckoutData( 'is_product_page' ),
+			}
+		);
+	}
+
+	/**
+	 * Get cart items and total amount.
+	 *
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutGetCartDetails() {
+		return this.request( getExpressCheckoutAjaxURL( 'get_cart_details' ), {
+			security: getExpressCheckoutData( 'nonce' )?.get_cart_details,
+		} );
+	}
+
+	/**
+	 * Creates order based on Express Checkout ECE payment method.
+	 *
+	 * @param {Object} paymentData Order data.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutECECreateOrder( paymentData ) {
+		return this.request( getExpressCheckoutAjaxURL( 'create_order' ), {
+			_wpnonce: getExpressCheckoutData( 'nonce' )?.checkout,
+			...getRequiredFieldDataFromCheckoutForm( paymentData ),
+		} );
+	}
+
+	/**
+	 * Pays for an order based on the Express Checkout payment method.
+	 *
+	 * @param {number} order The order ID.
+	 * @param {Object} paymentData Order data.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutECEPayForOrder( order, paymentData ) {
+		return this.request( getExpressCheckoutAjaxURL( 'pay_for_order' ), {
+			_wpnonce: getExpressCheckoutData( 'nonce' )?.pay_for_order,
+			order,
+			...paymentData,
+		} );
+	}
+
+	/**
+	 * Add product to cart from product page.
+	 *
+	 * @param {Object} productData Product data.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutAddToCart( productData ) {
+		return this.request( getExpressCheckoutAjaxURL( 'add_to_cart' ), {
+			security: getExpressCheckoutData( 'nonce' )?.add_to_cart,
+			...productData,
+		} );
+	}
+
+	/**
+	 * Get selected product data from variable product page.
+	 *
+	 * @param {Object} productData Product data.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutGetSelectedProductData( productData ) {
+		return this.request(
+			getExpressCheckoutAjaxURL( 'get_selected_product_data' ),
+			{
+				security: getExpressCheckoutData( 'nonce' )
+					?.get_selected_product_data,
+				...productData,
+			}
+		);
+	}
+
+	/**
+	 * Empty the cart.
+	 *
+	 * @param {number} bookingId Booking ID.
+	 * @return {Promise} Promise for the request to the server.
+	 */
+	expressCheckoutEmptyCart( bookingId ) {
+		return this.request( getExpressCheckoutAjaxURL( 'clear_cart' ), {
+			security: getExpressCheckoutData( 'nonce' )?.clear_cart,
+			booking_id: bookingId,
+		} );
+	}
 }

client/blocks/express-checkout/apple-pay-preview.js

@@ -0,0 +1,2 @@
+export const PAYMENT_METHOD_EXPRESS_CHECKOUT_ELEMENT =
+	'express_checkout_element';