[SL-253] Update seating availability calculation depending on seat reservation.

changelog/feat-sl-253-calc-seating-availablity

@@ -0,0 +1,4 @@
+Significance: minor
+Type: feat
+
+Seated tickets stock now calculated from attendee reservation count. [SL-253]

changelog/fix-ET-2273-et-removing-screen-options

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Screen options will no longer be disabled when Event Tickets is active. [ET-2273]

changelog/fix-ET-2275-maybe-disable-foreign-keys-default-array

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Added a default empty array to `maybe_disable_foreign_key_checks`. [ET-2275]

changelog/fix-revert-aggresive-hook-update

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Reverts aggressive hook update, causing fatals on installtion with themes overwritting the template `Single Ticket Item`. [ET-2276]

src/Tickets/Admin/Tickets/Screen_Options.php

@@ -46,14 +46,18 @@ public function add_hooks() {
 	 * Filters the screen options show screen.
 	 *
 	 * @since 5.14.0
+	 * @since TBD Fixed show screen options logic.
 	 *
 	 * @param boolean   $show   Whether to show the screen options.
 	 * @param WP_Screen $screen The current screen.
 	 *
 	 * @return boolean
 	 */
 	public function filter_screen_options_show_screen( $show, $screen ) {
-		$show = ! empty( $screen ) && Page::$hook_suffix === $screen->id;
+		// Only show the screen options on the Tickets screen, otherwise bail.
+		if ( empty( $screen ) || Page::$hook_suffix !== $screen->id ) {
+			return $show;
+		}
 
 		/**
 		 * Filter the screen options show screen.
@@ -62,7 +66,7 @@ public function filter_screen_options_show_screen( $show, $screen ) {
 		 *
 		 * @param boolean   $show   Whether to show the screen options.
 		 */
-		return apply_filters( 'tec_tickets_admin_tickets_screen_options_show_screen', $show );
+		return apply_filters( 'tec_tickets_admin_tickets_screen_options_show_screen', true );
 	}
 
 	/**

src/Tickets/Commerce/Attendee.php

@@ -628,11 +628,16 @@ public function registration_cart_provider( $provider_obj, $provider ) {
 	 *
 	 * @since 5.1.9
 	 *
+	 * @param bool  $decreases_inventory Whether the attendee decreases inventory or not.
 	 * @param array $attendee array of attendee information.
 	 *
 	 * @return bool
 	 */
-	public function decreases_inventory( $attendee ) {
+	public function decreases_inventory( $decreases_inventory, $attendee ) {
+		if ( Module::class !== $attendee['provider'] ) {
+			return $decreases_inventory;
+		}
+
 		$attendee = tec_tc_get_attendee( $attendee['ID'] );
 		$order    = tec_tc_get_order( $attendee->post_parent );
 		$statuses = array_unique(

src/Tickets/Commerce/Hooks.php

@@ -146,6 +146,8 @@ protected function add_filters() {
 
 		add_filter( 'tec_tickets_all_tickets_table_provider_options', [ $this, 'filter_all_tickets_table_provider_options' ] );
 		add_filter( 'tec_tickets_all_tickets_table_event_meta_keys', [ $this, 'filter_all_tickets_table_event_meta_keys' ] );
+
+		add_filter( 'tec_tickets_attendee_decreases_inventory', [ $this, 'filter_attendee_decreases_inventory' ], 10, 2 );
 	}
 
 	/**
@@ -1177,4 +1179,18 @@ public function filter_all_tickets_table_event_meta_keys( $meta_keys ) {
 
 		return $meta_keys;
 	}
+
+	/**
+	 * Filters if the attendee decreases inventory.
+	 *
+	 * @since TBD
+	 *
+	 * @param bool  $decreases_inventory Whether the attendee decreases inventory.
+	 * @param array $attendee The attendee data.
+	 *
+	 * @return bool Whether the attendee decreases inventory.
+	 */
+	public function filter_attendee_decreases_inventory( $decreases_inventory, $attendee ): bool {
+		return tribe( Attendee::class )->decreases_inventory( $decreases_inventory, $attendee );
+	}
 }

src/Tickets/Commerce/Module.php

@@ -460,24 +460,6 @@ public function get_price_value( $product ) {
 		return tribe( Ticket::class )->get_price_value( $product );
 	}
 
-	/**
-	 * Whether a specific attendee is valid toward inventory decrease or not.
-	 *
-	 * By default only attendees generated as part of a Completed order will count toward
-	 * an inventory decrease but, if the option to reserve stock for Pending Orders is activated,
-	 * then those attendees generated as part of a Pending Order will, for a limited time after the
-	 * order creation, cause the inventory to be decreased.
-	 *
-	 * @since 5.1.9
-	 *
-	 * @param array $attendee
-	 *
-	 * @return bool
-	 */
-	public function attendee_decreases_inventory( array $attendee ) {
-		return tribe( Attendee::class )->decreases_inventory( $attendee );
-	}
-
 	/**
 	 * {@inheritdoc}
 	 */

src/Tickets/Flexible_Tickets/WP_Cli.php

@@ -62,15 +62,19 @@ public function is_active(): bool {
 	 * checks will be re-enabled after the command is run, in the `truncate_custom_tables` method.
 	 *
 	 * @since 5.8.0
+	 * @since TBD Added default value and safeguards.
+	 *
+	 * @version TBD
 	 *
 	 * @param array $args The arguments passed to the WP CLI command.
 	 *
 	 * @return bool Whether the foreign key checks were disabled or not.
 	 */
-	public function maybe_disable_foreign_key_checks( array $args ): bool {
-		if ( ! ( $args[0] === 'site' && $args[1] === 'empty' ) ) {
+	public function maybe_disable_foreign_key_checks( array $args = [] ): bool {
+		if ( empty( $args[0] ) || 'site' !== $args[0] || empty( $args[1] ) || 'empty' !== $args[1] ) {
 			return false;
 		}
+
 		global $wpdb;
 		$wpdb->query( 'SET FOREIGN_KEY_CHECKS=0;' );
 
@@ -87,4 +91,4 @@ public function maybe_disable_foreign_key_checks( array $args ): bool {
 	public function truncate_custom_tables(): int {
 		return $this->container->make( Custom_Tables::class )->truncate_tables();
 	}
-}
+}

src/Tickets/Seating/Admin/Ajax.php

@@ -1225,7 +1225,8 @@ public function update_event_layout() {
 
 		foreach ( $attendees as $attendee_id ) {
 			update_post_meta( $attendee_id, Meta::META_KEY_SEAT_TYPE, $new_seat_type_id );
-			update_post_meta( $attendee_id, Meta::META_KEY_ATTENDEE_SEAT_LABEL, '' );
+			delete_post_meta( $attendee_id, Meta::META_KEY_ATTENDEE_SEAT_LABEL );
+			delete_post_meta( $attendee_id, Meta::META_KEY_RESERVATION_ID );
 
 			++$updated_attendees;
 		}

src/Tickets/Seating/Commerce/Attendees.php

@@ -77,6 +77,8 @@ public function get_count_by_post_seat_type( int $post_id, string $seat_type ):
 					AND attendee_for_event.meta_key in ({$attendee_to_event_meta_keys_in})
 				JOIN %i AS attendee_for_ticket ON attendee.ID = attendee_for_ticket.post_id
 					AND attendee_for_ticket.meta_key in ({$attendee_to_ticket_meta_keys_in})
+				JOIN %i AS attendee_reservation_meta ON attendee.ID = attendee_reservation_meta.post_id
+					AND attendee_reservation_meta.meta_key = %s
 				WHERE attendee.post_type IN ({$attendee_types_in})
 				AND attendee.post_status != 'trash'
 				AND attendee_for_event.meta_value = %d
@@ -93,6 +95,8 @@ public function get_count_by_post_seat_type( int $post_id, string $seat_type ):
 				$wpdb->posts,
 				$wpdb->postmeta,
 				$wpdb->postmeta,
+				$wpdb->postmeta,
+				Meta::META_KEY_RESERVATION_ID,
 				$post_id,
 				$wpdb->posts,
 				$wpdb->postmeta,

src/Tickets/Seating/Commerce/Controller.php

@@ -23,6 +23,7 @@
 use Tribe__Tickets__Tickets as Tickets;
 use Tribe__Tickets__Tickets_Handler as Tickets_Handler;
 use WP_Post;
+use Tribe__Cache_Listener as Triggers;
 
 /**
  * Class Controller.
@@ -104,6 +105,7 @@ protected function do_register(): void {
 		add_filter( 'update_post_metadata', [ $this, 'handle_ticket_meta_update' ], 10, 4 );
 		add_action( 'before_delete_post', [ $this, 'restock_ticket_on_attendee_deletion' ], 10, 2 );
 		add_action( 'wp_trash_post', [ $this, 'restock_ticket_on_attendee_trash' ] );
+		add_filter( 'tec_tickets_ticket_stock', [ $this, 'filter_ticket_stock_value' ], 10, 2 );
 	}
 
 	/**
@@ -124,6 +126,42 @@ public function unregister(): void {
 		remove_filter( 'update_post_metadata', [ $this, 'handle_ticket_meta_update' ], 10 );
 		remove_action( 'before_delete_post', [ $this, 'restock_ticket_on_attendee_deletion' ] );
 		remove_action( 'wp_trash_post', [ $this, 'restock_ticket_on_attendee_trash' ] );
+		remove_filter( 'tec_tickets_ticket_stock', [ $this, 'filter_ticket_stock_value' ] );
+	}
+
+	/**
+	 * Filters the stock value for a ticket to match the seated ticket inventory.
+	 *
+	 * @since TBD
+	 *
+	 * @param int           $stock  The stock value.
+	 * @param Ticket_Object $ticket The ticket object.
+	 *
+	 * @return int The filtered stock value.
+	 */
+	public function filter_ticket_stock_value( $stock, $ticket ) {
+		$seat_type = get_post_meta( $ticket->ID, Meta::META_KEY_SEAT_TYPE, true );
+		if ( ! $seat_type ) {
+			return $stock;
+		}
+
+		$cache_key = sprintf( 'seating_filter_ticket_stock_value_%d_%s', $stock, $ticket->ID );
+
+		$cache = tribe_cache();
+
+		// This cached value will be invalidated by the save of any Ticket, Attendee or Order.
+		$cached = $cache->get( $cache_key, Triggers::TRIGGER_SAVE_POST, null, DAY_IN_SECONDS );
+
+		if ( is_int( $cached ) ) {
+			return $cached;
+		}
+
+		$attendees = $ticket->get_provider()->get_attendees_by_id( $ticket->get_event()->ID );
+		$stock     = $this->get_seated_ticket_inventory( $stock, $ticket, $attendees );
+
+		$cache->set( $cache_key, $stock, Triggers::TRIGGER_SAVE_POST, DAY_IN_SECONDS );
+
+		return $stock;
 	}
 
 	/**
@@ -172,21 +210,25 @@ public function set_event_stock_counts( $types, $post_id ): array {
 			if ( empty( $seat_type ) ) {
 				continue;
 			}
-
+			
 			$capacity = $ticket->capacity();
 			$stock    = $ticket->stock();
 			$sold_qty = $ticket->qty_sold();
-
+
+			if ( $stock ) {
+				$sold_qty = min( $capacity - $stock, $sold_qty );
+			}
+
 			if ( ! isset( $capacity_by_type[ $seat_type ] ) ) {
 				$capacity_by_type[ $seat_type ] = $capacity;
 			}
-
+			
 			if ( ! isset( $total_sold_by_type[ $seat_type ] ) ) {
 				$total_sold_by_type[ $seat_type ] = $sold_qty;
 			} else {
 				$total_sold_by_type[ $seat_type ] += $sold_qty;
 			}
-
+			
 			++$types['tickets']['count'];
 		}
 
@@ -227,7 +269,7 @@ public function get_seated_ticket_inventory( int $inventory, Ticket_Object $tick
 		$return_false = static fn() => false;
 		add_filter( 'tribe_tickets_ticket_object_is_ticket_cache_enabled', $return_false );
 
-		$ticket_ids = [ $ticket->ID ];
+		$ticket_ids = [ (int) $ticket->ID ];
 
 		// Pull the inventory from the other tickets with the same seat type.
 		foreach (
@@ -245,7 +287,9 @@ public function get_seated_ticket_inventory( int $inventory, Ticket_Object $tick
 			$total_sold = count(
 				array_filter(
 					$event_attendees,
-					static fn( array $attendee ): bool => in_array( (int) $attendee['product_id'], $ticket_ids, true )
+					static fn( array $attendee ): bool =>
+						in_array( (int) $attendee['product_id'], $ticket_ids, true )
+						&& ! empty( get_post_meta( $attendee['ID'], Meta::META_KEY_RESERVATION_ID, true ) )
 				)
 			);
 		}

src/Tickets/Seating/Frontend.php

@@ -232,13 +232,14 @@ public function get_events_ticket_capacity_for_seating( int $post_id ): int {
 
 			$seat_type = get_post_meta( $ticket->ID, Meta::META_KEY_SEAT_TYPE, true );
 
+			$stock = $ticket->stock();
 			if ( empty( $available[ $seat_type ] ) ) {
 				// The array's keys are the seating types. In order for us to calculate the stock per type and NOT per ticket.
-				$available[ $seat_type ] = $ticket->stock();
+				$available[ $seat_type ] = $stock;
 				continue;
 			}
 
-			$available[ $seat_type ] = $available[ $seat_type ] < $ticket->stock() ? $available[ $seat_type ] : $ticket->stock();
+			$available[ $seat_type ] = $available[ $seat_type ] < $stock ? $available[ $seat_type ] : $stock;
 		}
 
 		if ( empty( $available ) ) {
@@ -309,7 +310,7 @@ private function get_seat_selection_modal_content( int $post_id, int $timeout ):
 	protected function do_register(): void {
 		add_filter( 'tribe_template_pre_html:tickets/v2/tickets', [ $this, 'print_tickets_block' ], 10, 5 );
 
-		add_filter( 'tribe_tickets_block_ticket_html_attributes', [ $this, 'add_seat_selected_labels_per_ticket_attribute' ], 10, 3 );
+		add_filter( 'tribe_tickets_block_ticket_html_attributes', [ $this, 'add_seat_selected_labels_per_ticket_attribute' ], 10, 2 );
 
 		// Register the front-end JS.
 		Asset::add(
@@ -370,14 +371,19 @@ public function should_enqueue_assets() {
 	 * Adds the seat selected labels to the ticket block.
 	 *
 	 * @since 5.16.0
+	 * @since TBD Removed the $event_id parameter.
 	 *
 	 * @param array         $attributes The attributes of the ticket block.
 	 * @param Ticket_Object $ticket     The ticket object.
-	 * @param int           $event_id    The post ID.
 	 *
 	 * @return array The attributes of the ticket block.
 	 */
-	public function add_seat_selected_labels_per_ticket_attribute( array $attributes, Ticket_Object $ticket, int $event_id ): array {
+	public function add_seat_selected_labels_per_ticket_attribute( array $attributes, Ticket_Object $ticket ): array {
+		$event_id = $ticket->get_event_id();
+		if ( ! $event_id ) {
+			return $attributes;
+		}
+
 		if ( ! tec_tickets_seating_enabled( $event_id ) ) {
 			return $attributes;
 		}
@@ -492,10 +498,10 @@ public function build_seat_type_map( ?int $post_id = null ): array {
 					'tickets' => [],
 				];
 			}
-			
+
 			/** @var Tickets_Handler $tickets_handler */
 			$tickets_handler = tribe( 'tickets.handler' );
-			
+
 			$seat_type_map[ $seat_type ]['tickets'][] = [
 				'ticketId'    => $ticket_id,
 				'name'        => $ticket->name,

src/Tickets/Seating/Orders/Attendee.php

@@ -425,4 +425,35 @@ public function adjust_attendee_page_render_context_for_seating( array $render_c
 
 		return $render_context;
 	}
+
+	/**
+	 * Check if the attendee has a seating ticket and valid reservation.
+	 * If it's a seating ticket without reservation, the inventory should not be decreased.
+	 *
+	 * @since TBD
+	 *
+	 * @param bool                $decrease_inventory Whether to decrease inventory.
+	 * @param array<string,mixed> $attendee The attendee data.
+	 *
+	 * @return bool Whether to decrease inventory.
+	 */
+	public function should_decrease_inventory( $decrease_inventory, $attendee ): bool {
+		if ( ! $decrease_inventory ) {
+			return $decrease_inventory;
+		}
+
+		$ticket_seat_type = get_post_meta( $attendee['product_id'], Meta::META_KEY_SEAT_TYPE, true );
+
+		if ( empty( $ticket_seat_type ) ) {
+			return $decrease_inventory;
+		}
+
+		$has_reservation = get_post_meta( $attendee['ID'], Meta::META_KEY_RESERVATION_ID, true );
+
+		if ( empty( $has_reservation ) ) {
+			return false;
+		}
+
+		return $decrease_inventory;
+	}
 }