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

Author: diegocurbelo

assets/js/stripe-payment-request.js

@@ -144,7 +144,7 @@ jQuery( function( $ ) {
 
 			data = wc_stripe_payment_request.getRequiredFieldDataFromCheckoutForm( data );
 
-			return data;
+			return { ...data, ...wc_stripe_payment_request.extractOrderAttributionData() };
 		},
 
 		/**
@@ -173,7 +173,7 @@ jQuery( function( $ ) {
 						if ( ! data[ name ] ) {
 							data[ name ] = value;
 						}
-	
+
 						// if shipping same as billing is selected, copy the billing field to shipping field.
 						const shipToDiffAddress = $( '#ship-to-different-address' ).find( 'input' ).is( ':checked' );
 						if ( ! shipToDiffAddress ) {
@@ -833,6 +833,24 @@ jQuery( function( $ ) {
 			} );
 		},
 
+		/**
+		 * Get order attribution data from the hidden inputs.
+		 *
+		 * @return {Object} Order attribution data.
+		 */
+		extractOrderAttributionData: function() {
+			const $orderAttributionWrapper = $( 'wc-order-attribution-inputs' );
+			if ( ! $orderAttributionWrapper.length ) {
+				return {};
+			}
+
+			const orderAttributionData = {};
+			$orderAttributionWrapper.children( 'input' ).each( function () {
+				orderAttributionData[ $(this).attr( 'name' ) ] = $(this).val();
+			});
+			return orderAttributionData;
+		},
+
 		showPaymentRequestButton: function( prButton ) {
 			if ( wc_stripe_payment_request.isCustomPaymentRequestButton( prButton ) ) {
 				prButton.addClass( 'is-active' );

changelog.txt

@@ -1,5 +1,25 @@
 *** Changelog ***
 
+= 9.0.0 - 2024-12-12 =
+* Fix - Fix 404 that happens when using ECE and 3D Secure auth is triggered.
+* Fix - Set correct payment method when using Link and a card that is 3D Secure authenticated.
+* Fix - Fix total calculation for custom product types when using the Payment Request Button.
+* Fix - Fix order attribution metadata not included in PRBs or Express Checkout Element.
+* Add - Pre-fill user email and phone number for Link in the Payment Element.
+* Remove - Remove Link autofill modal feature.
+* Update - Improve accuracy of webhook status information displayed in settings page.
+* Tweak - Standardize ECE Express payment buttons on Pay for Order page to match cart and checkout itemization behavior.
+* Tweak - Remove duplicate notice about the new checkout experience.
+* Tweak - Include page URL information in the SSL-required log for the Stripe Express Checkout Element.
+* Fix - Fix ECE modal not loading on pay for order page when coupon is applied.
+* Fix - Do not load express payment buttons on switch subscription page.
+* Fix - Resolve a fatal error by casting product price and subscription sign up fee to 'float' while adding them.
+* Fix - Return 'is_live' as true in account summary response when test mode is disabled in gateway settings and charge is enabled in Stripe account.
+* Fix - Prevents notices being displayed on WordPress 6.7 due to loading translations too early (only shown on stores with WP_DEBUG enabled).
+* Fix - Prevent showing the shipping options on express checkout modal for virtual product variations.
+* Fix - Do not assume payment is using a saved card when retrying a failed payment.
+* Tweak - Update links to plugin documentation and Stripe documentation.
+
 = 8.9.0 - 2024-11-14 =
 * Update - Enhance webhook processing to enable retrieving orders using payment_intent metadata.
 * Dev - Minor updates to the webhook handler class related to payment method names constants.
@@ -1347,7 +1367,7 @@
 * Add support for changing a subscription's recurring amount
 
 = 1.5.0 - 2013-01-18 =
-* Supports Stripe Checkout https://stripe.com/docs/checkout
+* Supports Stripe Checkout https://docs.stripe.com/payments/checkout
 
 = 1.4.0 - 2013-01-18 =
 * WC 2.0 Compat

client/api/index.js

@@ -1,6 +1,5 @@
 /* global Stripe */
 import { __ } from '@wordpress/i18n';
-import { isLinkEnabled } from 'wcstripe/stripe-utils';
 import {
 	getExpressCheckoutData,
 	getExpressCheckoutAjaxURL,
@@ -64,20 +63,9 @@ export default class WCStripeAPI {
 	 * @return {Object} The Stripe Object.
 	 */
 	getStripe() {
-		const {
-			key,
-			locale,
-			isUPEEnabled,
-			paymentMethodsConfig,
-		} = this.options;
+		const { key, locale } = this.options;
 		if ( ! this.stripe ) {
-			if ( isUPEEnabled && isLinkEnabled( paymentMethodsConfig ) ) {
-				this.stripe = this.createStripe( key, locale, [
-					'link_autofill_modal_beta_1',
-				] );
-			} else {
-				this.stripe = this.createStripe( key, locale );
-			}
+			this.stripe = this.createStripe( key, locale );
 		}
 		return this.stripe;
 	}
@@ -302,7 +290,8 @@ export default class WCStripeAPI {
 	 *
 	 * @param {string} redirectUrl The redirect URL, returned from the server.
 	 * @param {string} paymentMethodToSave The ID of a Payment Method if it should be saved (optional).
-	 * @return {string|true} A redirect URL on success, or `true` if no confirmation is needed.
+	 * @return {Object|true} An object containing the redirect URL on success and a flag indicating
+	 *   if the page is the Pay for order page, or `true` if no confirmation is needed.
 	 */
 	confirmIntent( redirectUrl, paymentMethodToSave ) {
 		const partials = redirectUrl.match(

client/blocks/__tests__/utils.test.js

@@ -0,0 +1,46 @@
+import { render } from '@testing-library/react';
+import {
+	extractOrderAttributionData,
+	populateOrderAttributionInputs,
+} from 'wcstripe/blocks/utils';
+
+describe( 'Blocks Utils', () => {
+	describe( 'extractOrderAttributionData', () => {
+		it( 'order attribution wrapper not found', () => {
+			const data = extractOrderAttributionData();
+			expect( data ).toStrictEqual( {} );
+		} );
+
+		it( 'order attribution wrapper exists', () => {
+			render(
+				<wc-order-attribution-inputs>
+					<input name="foo" defaultValue="bar" />
+					<input name="baz" defaultValue="qux" />
+				</wc-order-attribution-inputs>
+			);
+
+			const data = extractOrderAttributionData();
+			expect( data ).toStrictEqual( {
+				foo: 'bar',
+				baz: 'qux',
+			} );
+		} );
+	} );
+
+	describe( 'populateOrderAttributionInputs', () => {
+		test( 'order attribution global present', () => {
+			global.wc_order_attribution = {
+				params: {
+					allowTracking: true,
+				},
+				setOrderTracking: jest.fn(),
+			};
+
+			populateOrderAttributionInputs();
+
+			expect(
+				global.wc_order_attribution.setOrderTracking
+			).toHaveBeenCalledWith( true );
+		} );
+	} );
+} );

client/blocks/normalize.js

@@ -9,7 +9,10 @@
  * @typedef {import('@woocommerce/type-defs/billing').BillingData} CartBillingAddress
  */
 
-import { getBlocksConfiguration } from 'wcstripe/blocks/utils';
+import {
+	extractOrderAttributionData,
+	getBlocksConfiguration,
+} from 'wcstripe/blocks/utils';
 
 /**
  * Normalizes order data received upon creating an order using the store's AJAX API.
@@ -79,7 +82,7 @@ const normalizeOrderData = ( paymentMethodEvent, paymentRequestType ) => {
 		data.shipping_postcode = shipping?.postalCode;
 	}
 
-	return data;
+	return { ...data, ...extractOrderAttributionData() };
 };
 
 /**

client/blocks/payment-request/payment-request-express.js

@@ -1,4 +1,5 @@
 import { __ } from '@wordpress/i18n';
+import { useEffect } from '@wordpress/element';
 import {
 	Elements,
 	PaymentRequestButtonElement,
@@ -70,6 +71,17 @@ const PaymentRequestExpressComponent = ( {
 	);
 	useCancelHandler( paymentRequest, onClose );
 
+	useEffect( () => {
+		if ( paymentRequest ) {
+			const orderAttribution = window?.wc_order_attribution;
+			if ( orderAttribution ) {
+				orderAttribution.setOrderTracking(
+					orderAttribution.params.allowTracking
+				);
+			}
+		}
+	}, [ paymentRequest ] );
+
 	// locale is not a valid value for the paymentRequestButton style.
 	// Make sure `theme` defaults to 'dark' if it's not found in the server provided configuration.
 	let {
@@ -173,6 +185,7 @@ export const PaymentRequestExpress = ( props ) => {
 	return (
 		<Elements stripe={ stripe }>
 			<PaymentRequestExpressComponent { ...props } />
+			<wc-order-attribution-inputs id="wc-stripe-express-checkout__order-attribution-inputs" />
 		</Elements>
 	);
 };

client/blocks/upe/hooks.js

@@ -1,9 +1,7 @@
 import { useEffect } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import confirmCardPayment from './confirm-card-payment.js';
-import enableStripeLinkPaymentMethod from 'wcstripe/stripe-link';
 import { WC_STORE_CART } from 'wcstripe/blocks/credit-card/constants';
-import { isLinkEnabled } from 'wcstripe/stripe-utils';
 
 /**
  * Handles the Block Checkout onCheckoutSuccess event.
@@ -80,103 +78,6 @@ export const usePaymentFailHandler = (
 	);
 };
 
-/**
- * Handles rendering the Block Checkout Stripe Link payment method.
- *
- * @param {*} api                  The api object.
- * @param {*} elements             The Stripe elements object.
- * @param {*} paymentMethodsConfig The payment methods config object. Used to determine if Stripe Link is enabled.
- */
-export const useStripeLink = ( api, elements, paymentMethodsConfig ) => {
-	const customerData = useCustomerData();
-	useEffect( () => {
-		if ( isLinkEnabled( paymentMethodsConfig ) ) {
-			const shippingAddressFields = {
-				line1: 'shipping-address_1',
-				line2: 'shipping-address_2',
-				city: 'shipping-city',
-				state: 'components-form-token-input-1',
-				postal_code: 'shipping-postcode',
-				country: 'components-form-token-input-0',
-				first_name: 'shipping-first_name',
-				last_name: 'shipping-last_name',
-			};
-			const billingAddressFields = {
-				line1: 'billing-address_1',
-				line2: 'billing-address_2',
-				city: 'billing-city',
-				state: 'components-form-token-input-3',
-				postal_code: 'billing-postcode',
-				country: 'components-form-token-input-2',
-				first_name: 'billing-first_name',
-				last_name: 'billing-last_name',
-			};
-
-			enableStripeLinkPaymentMethod( {
-				api,
-				elements,
-				emailId: 'email',
-				fill_field_method: ( address, nodeId, key ) => {
-					const setAddress =
-						shippingAddressFields[ key ] === nodeId
-							? customerData.setShippingAddress
-							: customerData.setBillingAddress;
-					const customerAddress =
-						shippingAddressFields[ key ] === nodeId
-							? customerData.shippingAddress
-							: customerData.billingAddress;
-
-					if ( undefined === customerAddress ) {
-						return;
-					}
-
-					if ( address.address[ key ] === null ) {
-						address.address[ key ] = '';
-					}
-
-					if ( key === 'line1' ) {
-						customerAddress.address_1 = address.address[ key ];
-					} else if ( key === 'line2' ) {
-						customerAddress.address_2 = address.address[ key ];
-					} else if ( key === 'postal_code' ) {
-						customerAddress.postcode = address.address[ key ];
-					} else {
-						customerAddress[ key ] = address.address[ key ];
-					}
-
-					if ( undefined !== customerData.billingAddress ) {
-						customerAddress.email = getEmail();
-					}
-
-					setAddress( customerAddress );
-
-					function getEmail() {
-						return document.getElementById( 'email' ).value;
-					}
-
-					customerData.billingAddress.email = getEmail();
-					customerData.setBillingAddress(
-						customerData.billingAddress
-					);
-				},
-				complete_shipping: () => {
-					return (
-						document.getElementById( 'shipping-address_1' ) !== null
-					);
-				},
-				shipping_fields: shippingAddressFields,
-				billing_fields: billingAddressFields,
-				complete_billing: () => {
-					return (
-						document.getElementById( 'billing-address_1' ) !== null
-					);
-				},
-			} );
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [ elements ] );
-};
-
 /**
  * Returns the customer data and setters for the customer data.
  *

client/blocks/upe/index.js

@@ -14,7 +14,11 @@ import {
 	expressCheckoutElementsStripeLink,
 } from 'wcstripe/blocks/express-checkout';
 import WCStripeAPI from 'wcstripe/api';
-import { getBlocksConfiguration } from 'wcstripe/blocks/utils';
+import {
+	addOrderAttributionInputsIfNotExists,
+	getBlocksConfiguration,
+	populateOrderAttributionInputs,
+} from 'wcstripe/blocks/utils';
 import './styles.scss';
 
 const api = new WCStripeAPI(
@@ -106,3 +110,9 @@ if ( getBlocksConfiguration()?.isECEEnabled ) {
 
 // Update token labels when the checkout form is loaded.
 updateTokenLabelsWhenLoaded();
+
+// Add order attribution inputs to the page.
+addOrderAttributionInputsIfNotExists();
+
+// Populate order attribution inputs with order tracking data.
+populateOrderAttributionInputs();