From e3222accf3b1785ca2c3b0f341929df10f89b881 Mon Sep 17 00:00:00 2001
From: Jorge Torres <jorge.torres@automattic.com>
Date: Tue, 12 Mar 2024 16:30:09 -0300
Subject: [PATCH] Minor fix for CPT version (which only takes order differences
 into account)

---
 .../src/Internal/DataStores/Orders/LegacyDataHandler.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/LegacyDataHandler.php b/plugins/woocommerce/src/Internal/DataStores/Orders/LegacyDataHandler.php
index 0437764059596..07d31c376da1e 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/LegacyDataHandler.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/LegacyDataHandler.php
@@ -384,9 +384,9 @@ public function backfill_order_to_datastore( int $order_id, string $source_data_
 			);
 
 			$dest_order->set_props( $new_values );
-			$dest_order->apply_changes();
 
 			if ( 'hpos' === $destination_data_store ) {
+				$dest_order->apply_changes();
 				$limit_cb = function( $rows, $order ) use ( $dest_order, $fields ) {
 					if ( $dest_order->get_id() === $order->get_id() ) {
 						$rows = $this->limit_hpos_update_to_props( $rows, $fields['props'] );