chore: EPMs to always send shipping phone (#8902)

Co-authored-by: Brett Shumaker <brettshumaker@gmail.com>
Automattic · Jun 6, 2024 · 0703cc1 · 0703cc1
1 parent 91a340d
commit 0703cc1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/changelog/chore-epms-always-send-shipping-phone b/changelog/chore-epms-always-send-shipping-phone
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+chore: EPMs to always send shipping phone
diff --git a/client/express-checkout/utils/normalize.js b/client/express-checkout/utils/normalize.js
@@ -30,19 +30,22 @@ export const normalizeLineItems = ( displayItems ) => {
 export const normalizeOrderData = ( event, paymentMethodId ) => {
 	const name = event?.billingDetails?.name;
 	const email = event?.billingDetails?.email ?? '';
-	const phone = event?.billingDetails?.phone ?? '';
 	const billing = event?.billingDetails?.address ?? {};
 	const shipping = event?.shippingAddress ?? {};
 	const fraudPreventionTokenValue = window.wcpayFraudPreventionToken ?? '';
 
+	const phone =
+		event?.billingDetails?.phone ??
+		event?.payerPhone?.replace( '/[() -]/g', '' ) ??
+		'';
+
 	return {
 		billing_first_name:
 			name?.split( ' ' )?.slice( 0, 1 )?.join( ' ' ) ?? '',
 		billing_last_name: name?.split( ' ' )?.slice( 1 )?.join( ' ' ) || '-',
 		billing_company: billing?.organization ?? '',
 		billing_email: email ?? event?.payerEmail ?? '',
-		billing_phone:
-			phone ?? event?.payerPhone?.replace( '/[() -]/g', '' ) ?? '',
+		billing_phone: phone,
 		billing_country: billing?.country ?? '',
 		billing_address_1: billing?.line1 ?? '',
 		billing_address_2: billing?.line2 ?? '',
@@ -54,6 +57,7 @@ export const normalizeOrderData = ( event, paymentMethodId ) => {
 		shipping_last_name:
 			shipping?.name?.split( ' ' )?.slice( 1 )?.join( ' ' ) ?? '',
 		shipping_company: shipping?.organization ?? '',
+		shipping_phone: phone,
 		shipping_country: shipping?.address?.country ?? '',
 		shipping_address_1: shipping?.address?.line1 ?? '',
 		shipping_address_2: shipping?.address?.line2 ?? '',

diff --git a/client/payment-request/utils/normalize.js b/client/payment-request/utils/normalize.js
@@ -32,7 +32,6 @@ export const normalizeOrderData = ( paymentData ) => {
 		paymentData?.paymentMethod?.billing_details?.name ??
 		paymentData.payerName;
 	const email = paymentData?.paymentMethod?.billing_details?.email ?? '';
-	const phone = paymentData?.paymentMethod?.billing_details?.phone ?? '';
 	const billing = paymentData?.paymentMethod?.billing_details?.address ?? {};
 	const shipping = paymentData?.shippingAddress ?? {};
 	const fraudPreventionTokenValue = window.wcpayFraudPreventionToken ?? '';
@@ -44,14 +43,17 @@ export const normalizeOrderData = ( paymentData ) => {
 		paymentRequestType = 'google_pay';
 	}
 
+	const phone =
+		paymentData?.paymentMethod?.billing_details?.phone ??
+		paymentData?.payerPhone?.replace( '/[() -]/g', '' ) ??
+		'';
 	return {
 		billing_first_name:
 			name?.split( ' ' )?.slice( 0, 1 )?.join( ' ' ) ?? '',
 		billing_last_name: name?.split( ' ' )?.slice( 1 )?.join( ' ' ) || '-',
 		billing_company: billing?.organization ?? '',
 		billing_email: email ?? paymentData?.payerEmail ?? '',
-		billing_phone:
-			phone ?? paymentData?.payerPhone?.replace( '/[() -]/g', '' ) ?? '',
+		billing_phone: phone,
 		billing_country: billing?.country ?? '',
 		billing_address_1: billing?.line1 ?? '',
 		billing_address_2: billing?.line2 ?? '',
@@ -63,6 +65,7 @@ export const normalizeOrderData = ( paymentData ) => {
 		shipping_last_name:
 			shipping?.recipient?.split( ' ' )?.slice( 1 )?.join( ' ' ) ?? '',
 		shipping_company: shipping?.organization ?? '',
+		shipping_phone: phone,
 		shipping_country: shipping?.country ?? '',
 		shipping_address_1: shipping?.addressLine?.[ 0 ] ?? '',
 		shipping_address_2: shipping?.addressLine?.[ 1 ] ?? '',

diff --git a/client/tokenized-payment-request/transformers/stripe-to-wc.js b/client/tokenized-payment-request/transformers/stripe-to-wc.js
@@ -50,6 +50,10 @@ export const transformStripePaymentMethodForStoreApi = ( paymentData ) => {
 	const paymentRequestType =
 		paymentData.walletName === 'applePay' ? 'apple_pay' : 'google_pay';
 
+	const billingPhone =
+		paymentData.paymentMethod?.billing_details?.phone ??
+		paymentData.payerPhone?.replace( '/[() -]/g', '' ) ??
+		'';
 	return {
 		customer_note: paymentData.order_comments,
 		billing_address: {
@@ -66,13 +70,16 @@ export const transformStripePaymentMethodForStoreApi = ( paymentData ) => {
 				paymentData.paymentMethod?.billing_details?.email ??
 				paymentData.payerEmail ??
 				'',
-			phone:
-				paymentData.paymentMethod?.billing_details?.phone ??
-				paymentData.payerPhone?.replace( '/[() -]/g', '' ) ??
-				'',
+			phone: billingPhone,
 		},
 		// refreshing any shipping address data, now that the customer is placing the order.
-		...transformStripeShippingAddressForStoreApi( shipping ),
+		shipping_address: {
+			...transformStripeShippingAddressForStoreApi( shipping )
+				.shipping_address,
+			// adding the phone number, because it might be needed.
+			// Stripe doesn't provide us with a different phone number for shipping, so we're going to use the same phone used for billing.
+			phone: billingPhone,
+		},
 		payment_method: 'woocommerce_payments',
 		payment_data: [
 			{