Merge pull request #15 from jawordpressorg/fix-redirec

検索とチケットのリダイレクトを改善
jawordpressorg · Feb 23, 2024 · b2a62fe · b2a62fe
2 parents 25bc215 + 87626b0
commit b2a62fe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/lib/WCTokyo/WpCheckin/Router.php b/lib/WCTokyo/WpCheckin/Router.php
@@ -162,7 +162,7 @@ public function render_qr() {
 		}
 		$tickets = Tickets::search( $query );
 		if ( 1 === $tickets['total'] ) {
-			$url = home_url( 'checkin/' . $tickets['tickets'][0][0] );
+			$url = home_url( 'checkin/ticket/' . $tickets['tickets'][0][0] );
 		} elseif ( ! empty( $query[4] ) ) {
 			// Not found. Try to search with email.
 			$url = home_url( 'checkin/?s=' . rawurlencode( $query[4] ) );

diff --git a/lib/WCTokyo/WpCheckin/Tickets.php b/lib/WCTokyo/WpCheckin/Tickets.php
@@ -72,12 +72,22 @@ public static function search( $query = '', $page = 1 ) {
 				return ! $not_found;
 			} ) );
 		} elseif ( $query ) {
-			// This is string search.
-			$tickets = array_values( array_filter( self::tickets( false ), function( $ticket ) use ( $query ) {
-				// Flatten array.
-				$str = implode( '', $ticket );
-				return str_contains( $str, $query );
-			} ) );
+			$query   = array_values( array_filter( preg_split( '/[ 　+]/u', $query ) ) );
+			$tickets = self::tickets( false );
+			if ( ! empty( $query ) ) {
+				// This is string search.
+				$tickets = array_values( array_filter( $tickets, function( $ticket ) use ( $query ) {
+					// Flatten array.
+					$str     = implode( '', $ticket );
+					$matched = 0;
+					foreach ( $query as $q ) {
+						if ( str_contains( $str, $q ) ) {
+							$matched++;
+						}
+					}
+					return count( $query ) === $matched;
+				} ) );
+			}
 		} else {
 			$tickets = self::tickets( false );
 		}