Merge pull request #43 from godaddy-wordpress/release/1.11.2

Release: v1.11.2

Author: agibson-godaddy

readme.txt

@@ -104,6 +104,10 @@ $order_number = $order->get_order_number();
 
 == Changelog ==
 
+= 2025.nn.nn - version 1.11.2-dev.1 =
+ * Tweak - Add new "Sequential Order Number" option to the search order dropdown
+ * Fix - Searching by order number not working when Full Text Search is enabled (previous fix did not take full effect)
+
 = 2025.05.07 - version 1.11.1 =
  * Fix - Searching by order number not working when Full Text Search is enabled
 

woocommerce-sequential-order-numbers.php

@@ -5,17 +5,17 @@
  * Description: Provides sequential order numbers for WooCommerce orders
  * Author: SkyVerge
  * Author URI: http://www.skyverge.com
- * Version: 1.11.1
+ * Version: 1.11.2-dev.1
  * Text Domain: woocommerce-sequential-order-numbers
  * Domain Path: /i18n/languages/
  *
- * Copyright: (c) 2012-2023, SkyVerge, Inc. ([email protected])
+ * Copyright: (c) 2012-2025, SkyVerge, Inc. ([email protected])
  *
  * License: GNU General Public License v3.0
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
  *
  * @author    SkyVerge
- * @copyright Copyright (c) 2012-2023, SkyVerge, Inc. ([email protected])
+ * @copyright Copyright (c) 2012-2025, SkyVerge, Inc. ([email protected])
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  *
  * WC requires at least: 3.9.4
@@ -38,7 +38,7 @@ class WC_Seq_Order_Number {
 
 
 	/** Version number */
-	public const VERSION = '1.11.1';
+	public const VERSION = '1.11.2-dev.1';
 
 	/** Minimum required wc version */
 	public const MINIMUM_WC_VERSION = '3.9.4';
@@ -207,6 +207,7 @@ public function initialize() : void {
 			}
 
 			// ensure that admin order table search by order number works
+			add_filter('woocommerce_hpos_admin_search_filters', [$this, 'addOrderNumberSearchFilter']);
 			add_filter( 'woocommerce_shop_order_search_fields', [ $this, 'custom_search_fields' ] );
 			add_filter( 'woocommerce_order_table_search_query_meta_keys', [ $this, 'custom_search_fields' ] );
 
@@ -464,6 +465,36 @@ public function custom_orderby( array $args ) : array {
 		return $args;
 	}
 
+	/**
+	 * Adds a new search filter option for the sequential order number.
+	 * 
+	 * @internal
+	 * @since 1.11.2-dev.1
+	 * 
+	 * @param array|mixed $options search options
+	 * @return array|mixed
+	 */
+	public function addOrderNumberSearchFilter($options)
+	{
+		if (! is_array($options)) {
+			return $options;	
+		}
+
+		// Insert sequential_order_number after order_id
+		$newOption = ['sequential_order_number' => __('Sequential Order Number', 'woocommerce-sequential-order-numbers')];
+		$orderIdPosition = array_search('order_id', array_keys($options));
+		if ($orderIdPosition !== false) {
+			$insertPosition = $orderIdPosition + 1;
+			$options = array_slice($options, 0, $insertPosition, true) + 
+						$newOption + 
+						array_slice($options, $insertPosition, null, true);
+		} else {
+			$options = array_merge($options, $newOption);
+		}
+
+		return $options;
+	}
+
 
 	/**
 	 * Add our custom `_order_number` to the set of search fields so that the admin search functionality is maintained.
@@ -481,9 +512,7 @@ public function custom_search_fields( array $search_fields ) : array {
 	}
 
 	/**
-	 * When Full Text Search is enabled, {@see \Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableSearchQuery::generate_where_for_meta_table()}
-	 * doesn't run, which means our order ID meta field doesn't get searched. This method is responsible for reproducing that
-	 * method specifically when FTS is enabled.
+	 * Generates a WHERE clause for the sequential order number search filter.
 	 *
 	 * @param string|mixed $whereClause
 	 * @param string|mixed $searchTerm
@@ -493,16 +522,11 @@ public function custom_search_fields( array $search_fields ) : array {
 	 */
 	public function fullTextSearchFilterWhereClause($whereClause, $searchTerm, $searchFilter, $query)
 	{
-		try {
-			$ftsIsEnabled = get_option(CustomOrdersTableController::HPOS_FTS_INDEX_OPTION) === 'yes' && get_option(CustomOrdersTableController::HPOS_FTS_ORDER_ITEM_INDEX_CREATED_OPTION) === 'yes';
-			if (! $ftsIsEnabled) {
-				return $whereClause;
-			}
-
-			if ($searchFilter !== 'order_id') {
-				return $whereClause;
-			}
+		if ($searchFilter !== 'sequential_order_number') {
+			return $whereClause;
+		}
 
+		try {
 			global $wpdb;
 			$order_table = $query->get_table_name('orders');
 			$meta_table = $query->get_table_name('meta');