Reverting part of the hooks since it is required by the legacy endpoint

woocommerce · Feb 5, 2025 · 529abdd · 529abdd
1 parent 58cad21
commit 529abdd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 63 deletions.
diff --git a/client/entrypoints/express-checkout/index.js b/client/entrypoints/express-checkout/index.js
@@ -525,6 +525,26 @@ jQuery( function ( $ ) {
 				productId = $( '.wc-booking-product-id' ).val();
 			}
 
+			// Add extension data to the POST body
+			const formData = $( 'form.cart' ).serializeArray();
+			$.each( formData, ( i, field ) => {
+				if ( /^(addon-|wc_)/.test( field.name ) ) {
+					if ( /\[\]$/.test( field.name ) ) {
+						const fieldName = field.name.substring(
+							0,
+							field.name.length - 2
+						);
+						if ( data[ fieldName ] ) {
+							data[ fieldName ].push( field.value );
+						} else {
+							data[ fieldName ] = [ field.value ];
+						}
+					} else {
+						data[ field.name ] = field.value;
+					}
+				}
+			} );
+
 			// Legacy support for variations.
 			if ( useLegacyCartEndpoints ) {
 				data.product_id = productId;

diff --git a/client/express-checkout/compatibility/__tests__/wc-product-page.test.js b/client/express-checkout/compatibility/__tests__/wc-product-page.test.js
@@ -21,35 +21,5 @@ describe( 'ECE product page compatibility', () => {
 
 			expect( cartAddItemData ).toStrictEqual( { id: 123 } );
 		} );
-
-		it( 'adds extension data to POST body', () => {
-			function App() {
-				return (
-					<form className="cart">
-						<input name="addon-1" defaultValue="addon-1-value" />
-						<input name="wc_field" defaultValue="wc-field-value" />
-						<input
-							name="wc_field[]"
-							defaultValue="wc-field-value-1"
-						/>
-						<input
-							name="wc_field[]"
-							defaultValue="wc-field-value-2"
-						/>
-					</form>
-				);
-			}
-			render( <App /> );
-
-			const cartAddItemData = applyFilters(
-				'wcstripe.express-checkout.cart-add-item',
-				{}
-			);
-
-			expect( cartAddItemData ).toStrictEqual( {
-				'addon-1': 'addon-1-value',
-				wc_field: [ 'wc-field-value-1', 'wc-field-value-2' ],
-			} );
-		} );
 	} );
 } );
diff --git a/client/express-checkout/compatibility/wc-product-page.js b/client/express-checkout/compatibility/wc-product-page.js
@@ -22,36 +22,3 @@ addFilter(
 		};
 	}
 );
-
-/**
- * Add extension data to the POST body.
- */
-addFilter(
-	'wcstripe.express-checkout.cart-add-item',
-	'automattic/wcstripe/express-checkout',
-	( productData ) => {
-		const formData = jQuery( 'form.cart' ).serializeArray();
-		const data = [];
-		jQuery.each( formData, ( i, field ) => {
-			if ( /^(addon-|wc_)/.test( field.name ) ) {
-				if ( /\[\]$/.test( field.name ) ) {
-					const fieldName = field.name.substring(
-						0,
-						field.name.length - 2
-					);
-					if ( Array.isArray( data[ fieldName ] ) ) {
-						data[ fieldName ].push( field.value );
-					} else {
-						data[ fieldName ] = [ field.value ];
-					}
-				} else {
-					data[ field.name ] = field.value;
-				}
-			}
-		} );
-		return {
-			...productData,
-			...data,
-		};
-	}
-);