Pass correct ticket remaining count & simplify logic

Fixes #72
joedolson · Oct 6, 2024 · 421f099 · 421f099
1 parent ed4711d
commit 421f099
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/mt-add-to-cart.php b/src/mt-add-to-cart.php
@@ -589,7 +589,7 @@ function mt_ticket_row( $event_id, $registration, $ticket_type, $type, $availabl
 				$available
 			);
 
-			$hide_remaining = mt_hide_remaining( $tickets_remaining );
+			$hide_remaining = mt_hide_remaining( $remaining );
 			$remaining_text = $ticket_price_label . sprintf(
 				apply_filters(
 					'mt_tickets_remaining_discrete_text',
@@ -780,12 +780,11 @@ function mt_event_status( $event_id = false ) {
 function mt_hide_remaining( $tickets_remaining ) {
 	$options = mt_get_settings();
 	// If hide remaining is enabled, set as hidden.
-	$hide_remaining  = ( isset( $options['mt_hide_remaining'] ) && 'true' === $options['mt_hide_remaining'] ) ? ' hiding' : '';
 	$remaining_limit = isset( $options['mt_hide_remaining_limit'] ) ? absint( $options['mt_hide_remaining_limit'] ) : 0;
-	// Hide tickets if there are more than x tickets available if limit is set.
-	$hide_limiting = ( isset( $options['mt_hide_remaining_limit'] ) && 0 !== $remaining_limit && ( $tickets_remaining > $remaining_limit ) ) ? ' hiding' : '';
+	$hide_remaining  = ( isset( $options['mt_hide_remaining'] ) && 'true' === $options['mt_hide_remaining'] ) ? true : false;
+	$hidden_class    = ( ( $hide_remaining && ! $remaining_limit ) || ( $hide_remaining && $tickets_remaining > $remaining_limit ) ) ? ' hiding' : '';
 
-	return ( isset( $options['mt_hide_remaining_limit'] ) ) ? $hide_limiting : $hide_remaining;
+	return $hidden_class;
 }
 /**
  * Test whether the current ticket type is admin-only