Merge pull request woocommerce#16713 from woocommerce/fix/php-notice-on-item-order

Fix PHP notice on item order

Author: mikejolley

includes/class-wc-checkout.php

@@ -299,7 +299,9 @@ public function create_order( $data ) {
 					$order->{"set_{$key}"}( $value );
 
 				// Store custom fields prefixed with wither shipping_ or billing_. This is for backwards compatibility with 2.6.x.
-				} elseif ( 0 === stripos( $key, 'billing_' ) || 0 === stripos( $key, 'shipping_' ) ) {
+				// TODO: Fix conditional to only include shipping/billing address fields in a smarter way without str(i)pos.
+				} elseif ( ( 0 === stripos( $key, 'billing_' ) || 0 === stripos( $key, 'shipping_' ) )
+					&& ! in_array( $key, array( 'shipping_method', 'shipping_total', 'shipping_tax' ) ) ) {
 					$order->update_meta_data( '_' . $key, $value );
 				}
 			}

includes/data-stores/class-wc-order-data-store-cpt.php

@@ -66,7 +66,6 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
 		'_shipping_address_index',
 		'_recorded_sales',
 		'_recorded_coupon_usage_counts',
-		'_shipping_method',
 	);
 
 	/**