Fix - HPOS compatibility on Edit Order Screen (#7527)

Co-authored-by: Jessy P <jessy.pappachan@automattic.com>
Automattic · Oct 24, 2023 · 3c4b117 · 3c4b117
1 parent 0e2fe50
commit 3c4b117
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/changelog/7466-fix-hpos-compat-order-edit b/changelog/7466-fix-hpos-compat-order-edit
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix order status inconsistency in HPOS mode on Order Edit screen.
diff --git a/client/order/index.js b/client/order/index.js
@@ -56,7 +56,15 @@ jQuery( function ( $ ) {
 	);
 
 	$( 'select#order_status' ).on( 'change', function () {
-		const originalStatus = $( 'input#original_post_status' ).val();
+		//get the original status of the order from post or order data.
+		let originalStatus =
+			$( 'input#original_post_status' ).val() ||
+			$( 'input#original_order_status' ).val();
+		//TODO: Remove this after https://github.com/woocommerce/woocommerce/issues/40871 is fixed.
+		if ( originalStatus && ! originalStatus.startsWith( 'wc-' ) ) {
+			originalStatus = 'wc-' + originalStatus;
+		}
+
 		const canRefund = getConfig( 'canRefund' );
 		const refundAmount = getConfig( 'refundAmount' );
 		if (

diff --git a/tests/e2e/specs/wcpay/merchant/merchant-orders-status-change.spec.js b/tests/e2e/specs/wcpay/merchant/merchant-orders-status-change.spec.js
@@ -46,8 +46,7 @@ describe( 'Order > Status Change', () => {
 			await merchant.logout();
 		} );
 
-		// TODO: unskip when https://github.com/Automattic/woocommerce-payments/issues/7466 is closed
-		it.skip( 'Show Cancel Confirmation modal, do not change status if Do Nothing selected', async () => {
+		it( 'Show Cancel Confirmation modal, do not change status if Do Nothing selected', async () => {
 			// Select cancel from the order status dropdown.
 			await expect( page ).toSelect(
 				orderStatusDropdownSelector,
@@ -148,8 +147,7 @@ describe( 'Order > Status Change', () => {
 			await merchant.logout();
 		} );
 
-		// TODO: unskip when https://github.com/Automattic/woocommerce-payments/issues/7466 is closed
-		it.skip( 'Show Refund Confirmation modal, do not change status if Cancel clicked', async () => {
+		it( 'Show Refund Confirmation modal, do not change status if Cancel clicked', async () => {
 			// Select refunded from the order status dropdown.
 			await expect( page ).toSelect(
 				orderStatusDropdownSelector,