Add phone number to my account shipping address. (#47062)

* Added phone number support to Shipping Address and refactor the code.

* Refactored to avoid evaluating extra if on !== billing address form

* Add changefile(s) from automation for the following project(s): woocommerce

* Fixed tests.

* Mock phone number consistency

plugins/woocommerce/changelog/47062-add-phone-number-to-my-account-shipping-address

@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Added phone number field to Shipping Address form under My Account

plugins/woocommerce/includes/class-wc-countries.php

@@ -1695,12 +1695,15 @@ class WC_Countries {
 			$address_fields[ $type . $key ] = $value;
 		}
 
-		// Add email and phone fields.
+		// Add fields to address forms.
-		if ( 'billing_' === $type ) {
+		if ( in_array( $type, array( 'billing_', 'shipping_' ), true ) ) {
-			if ( 'hidden' !== get_option( 'woocommerce_checkout_phone_field', 'required' ) ) {
+			// Add phone to billing/shipping address form.
-				$address_fields['billing_phone'] = array(
+			$show_phone_field = get_option( 'woocommerce_checkout_phone_field', 'required' );
+
+			if ( 'hidden' !== $show_phone_field ) {
+				$address_fields[ $type . 'phone' ] = array(
 					'label'        => __( 'Phone', 'woocommerce' ),
-					'required'     => 'required' === get_option( 'woocommerce_checkout_phone_field', 'required' ),
+					'required'     => 'required' === $show_phone_field,
 					'type'         => 'tel',
 					'class'        => array( 'form-row-wide' ),
 					'validate'     => array( 'phone' ),
@@ -1708,15 +1711,19 @@ class WC_Countries {
 					'priority'     => 100,
 				);
 			}
-			$address_fields['billing_email'] = array(
+
-				'label'        => __( 'Email address', 'woocommerce' ),
+			// Add email to billing address form.
-				'required'     => true,
+			if ( 'billing_' === $type ) {
-				'type'         => 'email',
+				$address_fields['billing_email'] = array(
-				'class'        => array( 'form-row-wide' ),
+					'label'        => __( 'Email address', 'woocommerce' ),
-				'validate'     => array( 'email' ),
+					'required'     => true,
-				'autocomplete' => 'no' === get_option( 'woocommerce_registration_generate_username' ) ? 'email' : 'email username',
+					'type'         => 'email',
-				'priority'     => 110,
+					'class'        => array( 'form-row-wide' ),
-			);
+					'validate'     => array( 'email' ),
+					'autocomplete' => 'no' === get_option( 'woocommerce_registration_generate_username' ) ? 'email' : 'email username',
+					'priority'     => 110,
+				);
+			}
 		}
 
 		/**

plugins/woocommerce/tests/e2e-pw/tests/shopper/cart-checkout-calculate-tax.spec.js

@@ -966,7 +966,7 @@ test.describe.serial( 'Tax rates in the cart and checkout', () => {
 					.getByRole( 'textbox', { name: 'ZIP Code *' } )
 					.type( customer.billing.us.zip );
 				await page
-					.getByLabel( 'Phone *' )
+					.getByRole( 'textbox', { name: 'Phone *' } )
 					.fill( customer.billing.us.phone );
 				await page
 					.getByLabel( 'Email address *' )

plugins/woocommerce/tests/e2e-pw/tests/shopper/checkout.spec.js

@@ -333,7 +333,9 @@ test.describe( 'Checkout page', () => {
 			await page
 				.getByRole( 'textbox', { name: 'ZIP Code *' } )
 				.fill( '97403' );
-			await page.getByLabel( 'Phone *' ).fill( '555 555-5555' );
+			await page
+				.getByRole( 'textbox', { name: 'Phone *' } )
+				.fill( '555 555-5555' );
 			await page.getByLabel( 'Email address *' ).fill( guestEmail );
 
 			await page.getByText( 'Cash on delivery' ).click();

plugins/woocommerce/tests/e2e-pw/tests/shopper/my-account-addresses.spec.js

@@ -108,6 +108,7 @@ test.describe( 'Customer can manage addresses in My Account > Addresses page', (
 		await page.locator( '#shipping_country' ).selectOption( 'US' );
 		await page.locator( '#shipping_state' ).selectOption( 'NY' );
 		await page.locator( '#shipping_postcode' ).fill( '10010' );
+		await page.locator( '#shipping_phone' ).fill( '555 555-5555' );
 		await page.locator( 'text=Save address' ).click();
 
 		// verify shipping address has been applied