fix rate selection

Author: frosso

client/express-checkout/compatibility/__tests__/wc-subscriptions.test.js

@@ -190,6 +190,34 @@ describe( 'ECE WC Subscriptions compatibility', () => {
 			).toBe( 1999 );
 		} );
 
+		it( 'includes shipping from selected rate in recurring total', () => {
+			const cart = buildTrialCart( {
+				subscriptions: [
+					buildSubscriptionSchedule( {
+						totalPrice: '2499',
+						totalItems: '1999',
+						shippingRates: [
+							{
+								package_id: 'sub_month_0',
+								shipping_rates: [
+									{
+										rate_id: 'flat_rate:1',
+										price: '500',
+										taxes: '0',
+										selected: true,
+									},
+								],
+							},
+						],
+					} ),
+				],
+			} );
+
+			expect(
+				applyFilters( 'wcpay.express-checkout.total-amount', 0, cart )
+			).toBe( 2499 );
+		} );
+
 		it( 'sums recurring totals across multiple subscription schedules', () => {
 			const cart = buildTrialCart( {
 				items: [
@@ -391,6 +419,40 @@ describe( 'ECE WC Subscriptions compatibility', () => {
 			expect( result.items[ 1 ].totals.line_subtotal ).toBe( '1500' );
 		} );
 
+		it( 'includes shipping from selected rate in totals', () => {
+			const cart = buildTrialCart( {
+				subscriptions: [
+					buildSubscriptionSchedule( {
+						totalPrice: '2499',
+						totalItems: '1999',
+						shippingRates: [
+							{
+								package_id: 'sub_month_0',
+								shipping_rates: [
+									{
+										rate_id: 'flat_rate:1',
+										name: 'Standard',
+										price: '500',
+										taxes: '0',
+										selected: true,
+									},
+								],
+							},
+						],
+					} ),
+				],
+			} );
+
+			const result = applyFilters(
+				'wcpay.express-checkout.map-line-items',
+				cart
+			);
+
+			expect( result.totals.total_price ).toBe( '2499' );
+			expect( result.totals.total_shipping ).toBe( '500' );
+			expect( result.totals.total_items ).toBe( '1999' );
+		} );
+
 		it( 'handles multiple billing periods and aggregates totals', () => {
 			const cart = buildTrialCart( {
 				items: [

client/express-checkout/compatibility/wc-subscriptions.js

@@ -81,14 +81,27 @@ const getRecurringCartTotal = ( cartData ) => {
 		totalRecurring += parseInt( subscription.totals.total_price, 10 );
 		totalItems += parseInt( subscription.totals.total_items || '0', 10 );
 		totalTax += parseInt( subscription.totals.total_tax || '0', 10 );
-		totalShipping += parseInt(
-			subscription.totals.total_shipping || '0',
-			10
-		);
-		totalShippingTax += parseInt(
-			subscription.totals.total_shipping_tax || '0',
-			10
+
+		// During free trials, subscription.totals.total_shipping may be 0
+		// even after a shipping rate is selected, because shipping is deferred.
+		// Read the selected rate's price from the extension's shipping_rates instead.
+		const selectedRate = subscription.shipping_rates?.[ 0 ]?.shipping_rates?.find(
+			( r ) => r.selected
 		);
+		if ( selectedRate ) {
+			totalShipping += parseInt( selectedRate.price || '0', 10 );
+			totalShippingTax += parseInt( selectedRate.taxes || '0', 10 );
+		} else {
+			totalShipping += parseInt(
+				subscription.totals.total_shipping || '0',
+				10
+			);
+			totalShippingTax += parseInt(
+				subscription.totals.total_shipping_tax || '0',
+				10
+			);
+		}
+
 		currencyMinorUnit =
 			subscription.totals.currency_minor_unit ?? currencyMinorUnit;
 

client/express-checkout/event-handlers.js

@@ -29,6 +29,7 @@ import {
 } from './transformers/wc-to-stripe';
 
 let lastSelectedAddress = null;
+let lastCartData = null;
 let cartApi = new ExpressCheckoutCartApi();
 export const setCartApiHandler = ( handler ) => ( cartApi = handler );
 export const getCartApiHandler = () => cartApi;
@@ -69,6 +70,8 @@ export const shippingAddressChangeHandler = async ( event, elements ) => {
 			),
 		} );
 
+		lastCartData = cartData;
+
 		event.resolve( {
 			shippingRates,
 			lineItems: transformCartDataForDisplayItems( cartData ),
@@ -83,19 +86,27 @@ export const shippingRateChangeHandler = async (
 	elements,
 	currentCartData = null
 ) => {
+	// Use the most recent cart data from a previous address/rate change,
+	// falling back to the caller-provided data. This ensures we have
+	// up-to-date subscription extension data (e.g., shipping rates for
+	// the current address) when resolving the shipping package ID.
+	const effectiveCartData = lastCartData || currentCartData;
+
 	try {
 		const cartData = await cartApi.selectShippingRate( {
 			// Apply filter to get the correct package ID (e.g., for trial subscriptions
 			// where shipping is in subscription extensions, not main cart)
 			package_id: applyFilters(
 				'wcpay.express-checkout.shipping-package-id',
 				0,
-				currentCartData,
+				effectiveCartData,
 				event.shippingRate.id
 			),
 			rate_id: event.shippingRate.id,
 		} );
 
+		lastCartData = cartData;
+
 		elements.update( {
 			// Apply filter to allow modifications (e.g., for trial subscriptions with $0 initial payment)
 			amount: applyFilters(

includes/express-checkout/class-wc-payments-express-checkout-button-helper.php

@@ -284,6 +284,11 @@ public function has_subscription_product() {
 	 * This is used to determine if ECE buttons should be shown even when the cart
 	 * total is $0, as the customer will still need to authorize the recurring payment.
 	 *
+	 * Only returns true when the cart needs shipping, because Express Checkout
+	 * collects a shipping address for physical products — which also provides the
+	 * billing information needed to calculate taxes correctly. Virtual-only carts
+	 * don't trigger address collection, so the displayed price could be wrong.
+	 *
 	 * @return boolean True if cart is zero total with a trial subscription that has a recurring amount.
 	 */
 	public function is_cart_zero_total_with_trial_subscription() {
@@ -300,6 +305,14 @@ public function is_cart_zero_total_with_trial_subscription() {
 			return false;
 		}
 
+		// Only allow when the cart needs shipping — Express Checkout collects
+		// a shipping address for physical products, giving us the billing info
+		// required for correct tax calculation. Virtual-only carts skip address
+		// collection so the price shown could be inaccurate.
+		if ( ! WC()->cart->needs_shipping() ) {
+			return false;
+		}
+
 		// Check if cart contains subscriptions.
 		if ( ! WC_Subscriptions_Cart::cart_contains_subscription() ) {
 			return false;
@@ -841,6 +854,14 @@ private function is_product_supported() {
 			|| ( class_exists( 'WC_Pre_Orders_Product' ) && WC_Pre_Orders_Product::product_is_charged_upon_release( $product ) ) // Pre Orders charge upon release not supported.
 			|| ( class_exists( 'WC_Composite_Products' ) && $product->is_type( 'composite' ) ) // Composite products are not supported on the product page.
 			|| ( class_exists( 'WC_Mix_and_Match' ) && $product->is_type( 'mix-and-match' ) ) // Mix and match products are not supported on the product page.
+			// Virtual subscriptions with a free trial are not supported because Express
+			// Checkout won't collect a shipping address, so we can't calculate taxes.
+			|| (
+				class_exists( 'WC_Subscriptions_Product' )
+				&& WC_Subscriptions_Product::is_subscription( $product )
+				&& ! $product->needs_shipping()
+				&& WC_Subscriptions_Product::get_trial_length( $product ) > 0
+			)
 		) {
 			$is_supported = false;
 		} elseif ( class_exists( 'WC_Product_Addons_Helper' ) ) {

tests/unit/express-checkout/test-class-wc-payments-express-checkout-button-helper.php

@@ -762,7 +762,6 @@ public function test_is_cart_zero_total_with_trial_subscription_returns_false_wh
 				'name'          => 'Regular Subscription',
 				'regular_price' => 0,
 				'price'         => 0,
-				'virtual'       => true,
 			]
 		);
 		$product->save();
@@ -784,6 +783,38 @@ public function test_is_cart_zero_total_with_trial_subscription_returns_false_wh
 		$this->assertFalse( $helper->is_cart_zero_total_with_trial_subscription() );
 	}
 
+	public function test_is_cart_zero_total_with_trial_subscription_returns_false_when_cart_is_virtual_only() {
+		// Virtual-only carts should not qualify because Express Checkout
+		// won't collect a shipping address, so we can't calculate taxes.
+		WC()->cart->empty_cart();
+		$product = new WC_Product_Simple();
+		$product->set_props(
+			[
+				'name'          => 'Virtual Trial Subscription',
+				'regular_price' => 0,
+				'price'         => 0,
+				'virtual'       => true,
+			]
+		);
+		$product->save();
+		WC()->cart->add_to_cart( $product->get_id(), 1 );
+		WC()->cart->calculate_totals();
+
+		WC_Subscriptions_Product::$is_subscription = true;
+		WC_Subscriptions_Product::$trial_length    = 1;
+		WC_Subscriptions_Cart::set_cart_contains_subscription( true );
+
+		$helper = $this->getMockBuilder( WC_Payments_Express_Checkout_Button_Helper::class )
+			->setConstructorArgs( [ $this->mock_wcpay_gateway, $this->mock_wcpay_account ] )
+			->onlyMethods( [ 'is_cart', 'is_checkout' ] )
+			->getMock();
+
+		$helper->method( 'is_cart' )->willReturn( true );
+		$helper->method( 'is_checkout' )->willReturn( false );
+
+		$this->assertFalse( $helper->is_cart_zero_total_with_trial_subscription() );
+	}
+
 	public function test_should_show_express_checkout_button_with_zero_total_trial_subscription() {
 		// Set up a zero-total cart.
 		WC()->cart->empty_cart();