eventespresso / event-espresso-core

public/template_tags.php

Doc Comments +5 added lines, -5 removed lines

@@ -130,7 +130,7 @@ 
  * can_use_espresso_conditionals
  * tests whether the Espresso Conditional tags like is_espresso_event_single() can be called
  *
- * @param $conditional_tag
+ * @param string $conditional_tag
  * @return bool
  */
 function can_use_espresso_conditionals( $conditional_tag ) {
@@ -201,7 +201,7 @@ 
 if ( ! function_exists( 'espresso_ticket_selector' )) {
 	/**
 	 * espresso_ticket_selector
-	 * @param null $event
+	 * @param EE_Event $event
 	 */
 	function espresso_ticket_selector( $event = NULL ) {
 		if (  ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) {
@@ -842,7 +842,7 @@ 
 	/**
 	 * espresso_event_venues
 	 *
-	 * @return array  all venues related to an event
+	 * @return EE_Venue[]  all venues related to an event
 	 */
 	function espresso_event_venues() {
 		return EEH_Venue_View::get_event_venues();
@@ -875,7 +875,7 @@ 
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
 	 *
-	 * @return bool | null
+	 * @return null|boolean | null
 	 */
 	function espresso_is_venue_private( $VNU_ID = 0 ) {
 		return EEH_Venue_View::is_venue_private( $VNU_ID );
@@ -889,7 +889,7 @@ 
 	 * returns true or false if a venue is password protected or not
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
-	 * @return string
+	 * @return boolean
 	 */
 	function espresso_venue_is_password_protected( $VNU_ID = 0 ) {
 		EE_Registry::instance()->load_helper( 'Venue_View' );

Indentation +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
 	function espresso_ticket_selector( $event = NULL ) {
 		if (  ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) {
 			espresso_load_ticket_selector();
-            \EED_Ticket_Selector::set_definitions();
+			\EED_Ticket_Selector::set_definitions();
 			echo EED_Ticket_Selector::display_ticket_selector( $event );
 		}
 	}

Spacing +291 added lines, -291 removed lines

@@ -14,12 +14,12 @@ 
  * @param int | \EE_Event $event
  * @return bool
  */
-function is_espresso_event( $event = NULL ) {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+function is_espresso_event($event = NULL) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		// extract EE_Event object from passed param regardless of what it is (within reason of course)
-		$event = EEH_Event_View::get_event( $event );
+		$event = EEH_Event_View::get_event($event);
 		// do we have a valid event ?
-		return $event instanceof EE_Event  ? TRUE : FALSE;
+		return $event instanceof EE_Event ? TRUE : FALSE;
 	}
 	return FALSE;
 }
@@ -31,7 +31,7 @@ 
  * @return bool
  */
 function is_espresso_event_single() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		// return conditionals set by CPTs
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : FALSE;
@@ -46,7 +46,7 @@ 
  * @return bool
  */
 function is_espresso_event_archive() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : FALSE;
 	}
@@ -60,7 +60,7 @@ 
  * @return bool
  */
 function is_espresso_event_taxonomy() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : FALSE;
 	}
@@ -74,10 +74,10 @@ 
  * @param int | \EE_Venue $venue
  * @return bool
  */
-function is_espresso_venue( $venue = NULL ) {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+function is_espresso_venue($venue = NULL) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		// extract EE_Venue object from passed param regardless of what it is (within reason of course)
-		$venue = EEH_Venue_View::get_venue( $venue, FALSE );
+		$venue = EEH_Venue_View::get_venue($venue, FALSE);
 		// do we have a valid event ?
 		return $venue instanceof EE_Venue ? TRUE : FALSE;
 	}
@@ -91,7 +91,7 @@ 
  * @return bool
  */
 function is_espresso_venue_single() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : FALSE;
 	}
@@ -105,7 +105,7 @@ 
  * @return bool
  */
 function is_espresso_venue_archive() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : FALSE;
 	}
@@ -119,7 +119,7 @@ 
  * @return bool
  */
 function is_espresso_venue_taxonomy() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : FALSE;
 	}
@@ -133,12 +133,12 @@ 
  * @param $conditional_tag
  * @return bool
  */
-function can_use_espresso_conditionals( $conditional_tag ) {
-	if ( ! did_action( 'AHEE__EE_System__initialize' )) {
+function can_use_espresso_conditionals($conditional_tag) {
+	if ( ! did_action('AHEE__EE_System__initialize')) {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				esc_html__( 'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.','event_espresso'),
+				esc_html__('The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.', 'event_espresso'),
 				$conditional_tag
 			),
 			'4.4.0'
@@ -153,13 +153,13 @@ 
 
 /*************************** Event Queries ***************************/
 
-if ( ! function_exists( 'espresso_get_events' )) {
+if ( ! function_exists('espresso_get_events')) {
 	/**
 	 * 	espresso_get_events
 	 * @param array $params
 	 * @return array
 	 */
-	function espresso_get_events( $params = array() ) {
+	function espresso_get_events($params = array()) {
 		//set default params
 		$default_espresso_events_params = array(
 			'limit' => 10,
@@ -170,18 +170,18 @@ 
 			'sort' => 'ASC'
 		);
 		// allow the defaults to be filtered
-		$default_espresso_events_params = apply_filters( 'espresso_get_events__default_espresso_events_params', $default_espresso_events_params );
+		$default_espresso_events_params = apply_filters('espresso_get_events__default_espresso_events_params', $default_espresso_events_params);
 		// grab params and merge with defaults, then extract
-		$params = array_merge( $default_espresso_events_params, $params );
+		$params = array_merge($default_espresso_events_params, $params);
 		// run the query
-		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery( $params );
+		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
 		// assign results to a variable so we can return it
 		$events = $events_query->have_posts() ? $events_query->posts : array();
 		// but first reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
-		unset( $events_query );
+		unset($events_query);
 		return $events;
 	}
 }
@@ -195,33 +195,33 @@ 
  * espresso_load_ticket_selector
  */
 function espresso_load_ticket_selector() {
-	EE_Registry::instance()->load_file( EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module' );
+	EE_Registry::instance()->load_file(EE_MODULES.'ticket_selector', 'EED_Ticket_Selector', 'module');
 }
 
-if ( ! function_exists( 'espresso_ticket_selector' )) {
+if ( ! function_exists('espresso_ticket_selector')) {
 	/**
 	 * espresso_ticket_selector
 	 * @param null $event
 	 */
-	function espresso_ticket_selector( $event = NULL ) {
-		if (  ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) {
+	function espresso_ticket_selector($event = NULL) {
+		if ( ! apply_filters('FHEE_disable_espresso_ticket_selector', FALSE)) {
 			espresso_load_ticket_selector();
             \EED_Ticket_Selector::set_definitions();
-			echo EED_Ticket_Selector::display_ticket_selector( $event );
+			echo EED_Ticket_Selector::display_ticket_selector($event);
 		}
 	}
 }
 
 
-	if ( ! function_exists( 'espresso_view_details_btn' )) {
+	if ( ! function_exists('espresso_view_details_btn')) {
 	/**
 	 * espresso_view_details_btn
 	 * @param null $event
 	 */
-	function espresso_view_details_btn( $event = NULL ) {
-		if (  ! apply_filters( 'FHEE_disable_espresso_view_details_btn', FALSE ) ) {
+	function espresso_view_details_btn($event = NULL) {
+		if ( ! apply_filters('FHEE_disable_espresso_view_details_btn', FALSE)) {
 			espresso_load_ticket_selector();
-			echo EED_Ticket_Selector::display_ticket_selector( $event, TRUE );
+			echo EED_Ticket_Selector::display_ticket_selector($event, TRUE);
 		}
 	}
 }
@@ -231,7 +231,7 @@ 
 
 /*************************** EEH_Event_View ***************************/
 
-if ( ! function_exists( 'espresso_load_event_list_assets' )) {
+if ( ! function_exists('espresso_load_event_list_assets')) {
 	/**
 	 * espresso_load_event_list_assets
 	 * ensures that event list styles and scripts are loaded
@@ -240,13 +240,13 @@ 
 	 */
 	function espresso_load_event_list_assets() {
 		$event_list = EED_Events_Archive::instance();
-		add_action( 'AHEE__EE_System__initialize_last', array( $event_list, 'load_event_list_assets' ), 10 );
-		add_filter( 'FHEE_enable_default_espresso_css', '__return_true' );
+		add_action('AHEE__EE_System__initialize_last', array($event_list, 'load_event_list_assets'), 10);
+		add_filter('FHEE_enable_default_espresso_css', '__return_true');
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_reg_button' )) {
+if ( ! function_exists('espresso_event_reg_button')) {
 	/**
 	 * espresso_event_reg_button
 	 * returns the "Register Now" button if event is active,
@@ -258,13 +258,13 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_reg_button( $btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( ! $event instanceof EE_Event ) {
+	function espresso_event_reg_button($btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ( ! $event instanceof EE_Event) {
 			return;
 		}
 		$event_status = $event->get_active_status();
-		switch ( $event_status ) {
+		switch ($event_status) {
 			case EE_Datetime::sold_out :
 				$btn_text = esc_html__('Sold Out', 'event_espresso');
 				$class = 'ee-pink';
@@ -284,15 +284,15 @@ 
 			case EE_Datetime::upcoming :
 			case EE_Datetime::active :
 			default :
-				$btn_text =! empty( $btn_text_if_active ) ? $btn_text_if_active : esc_html__( 'Register Now', 'event_espresso' );
+				$btn_text = ! empty($btn_text_if_active) ? $btn_text_if_active : esc_html__('Register Now', 'event_espresso');
 				$class = 'ee-green';
 		}
-		if ( $event_status < 1 && ! empty( $btn_text_if_inactive )) {
+		if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
 			$btn_text = $btn_text_if_inactive;
 			$class = 'ee-grey';
 		}
 		?>
-		<a class="ee-button ee-register-button <?php echo $class; ?>" href="<?php espresso_event_link_url( $EVT_ID ); ?>"<?php echo \EED_Events_Archive::link_target(); ?>>
+		<a class="ee-button ee-register-button <?php echo $class; ?>" href="<?php espresso_event_link_url($EVT_ID); ?>"<?php echo \EED_Events_Archive::link_target(); ?>>
 			<?php echo $btn_text; ?>
 		</a>
 	<?php
@@ -301,7 +301,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_display_ticket_selector' )) {
+if ( ! function_exists('espresso_display_ticket_selector')) {
 	/**
 	 * espresso_display_ticket_selector
 	 * whether or not to display the Ticket Selector for an event
@@ -309,14 +309,14 @@ 
 	 * @param bool $EVT_ID
 	 * @return boolean
 	 */
-	function espresso_display_ticket_selector( $EVT_ID = FALSE ) {
-		return EEH_Event_View::display_ticket_selector( $EVT_ID );
+	function espresso_display_ticket_selector($EVT_ID = FALSE) {
+		return EEH_Event_View::display_ticket_selector($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_status_banner' )) {
+if ( ! function_exists('espresso_event_status_banner')) {
 	/**
 	 * espresso_event_status
 	 * returns a banner showing the event status if it is sold out, expired, or inactive
@@ -324,13 +324,13 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_status_banner( $EVT_ID = FALSE ) {
-		return EEH_Event_View::event_status( $EVT_ID );
+	function espresso_event_status_banner($EVT_ID = FALSE) {
+		return EEH_Event_View::event_status($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_status' )) {
+if ( ! function_exists('espresso_event_status')) {
 	/**
 	 * espresso_event_status
 	 * returns the event status if it is sold out, expired, or inactive
@@ -339,13 +339,13 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_status( $EVT_ID = 0, $echo = TRUE ) {
-		return EEH_Event_View::event_active_status( $EVT_ID, $echo );
+	function espresso_event_status($EVT_ID = 0, $echo = TRUE) {
+		return EEH_Event_View::event_active_status($EVT_ID, $echo);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_categories' )) {
+if ( ! function_exists('espresso_event_categories')) {
 	/**
 	 * espresso_event_categories
 	 * returns the terms associated with an event
@@ -355,17 +355,17 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized );
+	function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
 			return '';
 		}
-		return EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized );
+		return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_tickets_available' )) {
+if ( ! function_exists('espresso_event_tickets_available')) {
 	/**
 	 * espresso_event_tickets_available
 	 * returns the ticket types available for purchase for an event
@@ -375,26 +375,26 @@ 
 	 * @param bool $format
 	 * @return string
 	 */
-	function espresso_event_tickets_available( $EVT_ID = 0, $echo = TRUE, $format = TRUE ) {
-		$tickets = EEH_Event_View::event_tickets_available( $EVT_ID );
-		if ( is_array( $tickets ) && ! empty( $tickets )) {
+	function espresso_event_tickets_available($EVT_ID = 0, $echo = TRUE, $format = TRUE) {
+		$tickets = EEH_Event_View::event_tickets_available($EVT_ID);
+		if (is_array($tickets) && ! empty($tickets)) {
 			// if formatting then $html will be a string, else it will be an array of ticket objects
-			$html = $format ? '<ul id="ee-event-tickets-ul-' . $EVT_ID . '" class="ee-event-tickets-ul">' : array();
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
-					if ( $format ) {
-						$html .= '<li id="ee-event-tickets-li-' . $ticket->ID() . '" class="ee-event-tickets-li">';
-						$html .= $ticket->name() . ' ' . EEH_Template::format_currency( $ticket->get_ticket_total_with_taxes() );
+			$html = $format ? '<ul id="ee-event-tickets-ul-'.$EVT_ID.'" class="ee-event-tickets-ul">' : array();
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
+					if ($format) {
+						$html .= '<li id="ee-event-tickets-li-'.$ticket->ID().'" class="ee-event-tickets-li">';
+						$html .= $ticket->name().' '.EEH_Template::format_currency($ticket->get_ticket_total_with_taxes());
 						$html .= '</li>';
 					} else {
 						$html[] = $ticket;
 					}
 				}
 			}
-			if ( $format ) {
+			if ($format) {
 				$html .= '</ul>';
 			}
-			if ( $echo && $format ) {
+			if ($echo && $format) {
 				echo $html;
 				return '';
 			}
@@ -404,7 +404,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_obj' )) {
+if ( ! function_exists('espresso_event_date_obj')) {
 	/**
 	 * espresso_event_date_obj
 	 * returns the primary date object for an event
@@ -412,13 +412,13 @@ 
 	 * @param bool $EVT_ID
 	 * @return object
 	 */
-	function espresso_event_date_obj( $EVT_ID = FALSE ) {
-		return EEH_Event_View::get_primary_date_obj( $EVT_ID );
+	function espresso_event_date_obj($EVT_ID = FALSE) {
+		return EEH_Event_View::get_primary_date_obj($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_date' )) {
+if ( ! function_exists('espresso_event_date')) {
 	/**
 	 * espresso_event_date
 	 * returns the primary date for an event
@@ -429,22 +429,22 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_date__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_event_date__time_format', $time_format );
-		if($echo){
-			echo EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID );
+	function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID );
+		return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
 
 	}
 }
 
 
-if ( ! function_exists( 'espresso_list_of_event_dates' )) {
+if ( ! function_exists('espresso_list_of_event_dates')) {
 	/**
 	 * espresso_list_of_event_dates
 	 * returns a unordered list of dates for an event
@@ -459,40 +459,40 @@ 
 	 * @param null   $limit
 	 * @return string
 	 */
-	function espresso_list_of_event_dates( $EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_list_of_event_dates__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_list_of_event_dates__time_format', $time_format );
-		$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, $show_expired, FALSE, $limit );
-		if ( ! $format ) {
-			return apply_filters( 'FHEE__espresso_list_of_event_dates__datetimes', $datetimes );
+	function espresso_list_of_event_dates($EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
+		$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, FALSE, $limit);
+		if ( ! $format) {
+			return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
 		}
 		//d( $datetimes );
-		if ( is_array( $datetimes ) && ! empty( $datetimes )) {
+		if (is_array($datetimes) && ! empty($datetimes)) {
 			global $post;
-			$html = $format ? '<ul id="ee-event-datetimes-ul-' . $post->ID . '" class="ee-event-datetimes-ul ee-clearfix">' : '';
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$html .= '<li id="ee-event-datetimes-li-' . $datetime->ID();
-					$html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-' . $datetime->get_active_status() . '">';
+			$html = $format ? '<ul id="ee-event-datetimes-ul-'.$post->ID.'" class="ee-event-datetimes-ul ee-clearfix">' : '';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$html .= '<li id="ee-event-datetimes-li-'.$datetime->ID();
+					$html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-'.$datetime->get_active_status().'">';
 					$datetime_name = $datetime->name();
-					$html .= ! empty( $datetime_name ) ? '<strong>' . $datetime_name . '</strong>' : '';
-					$html .= ! empty( $datetime_name )  && $add_breaks ? '<br />' : '';
-					$html .= '<span class="dashicons dashicons-calendar"></span><span class="ee-event-datetimes-li-daterange">' . $datetime->date_range( $date_format ) . '</span><br/>';
-					$html .= '<span class="dashicons dashicons-clock"></span><span class="ee-event-datetimes-li-timerange">' . $datetime->time_range( $time_format ) . '</span>';
+					$html .= ! empty($datetime_name) ? '<strong>'.$datetime_name.'</strong>' : '';
+					$html .= ! empty($datetime_name) && $add_breaks ? '<br />' : '';
+					$html .= '<span class="dashicons dashicons-calendar"></span><span class="ee-event-datetimes-li-daterange">'.$datetime->date_range($date_format).'</span><br/>';
+					$html .= '<span class="dashicons dashicons-clock"></span><span class="ee-event-datetimes-li-timerange">'.$datetime->time_range($time_format).'</span>';
 					$datetime_description = $datetime->description();
-					$html .= ! empty( $datetime_description )  && $add_breaks ? '<br />' : '';
-					$html .= ! empty( $datetime_description ) ? ' - ' . $datetime_description : '';
-					$html = apply_filters( 'FHEE__espresso_list_of_event_dates__datetime_html', $html, $datetime );
+					$html .= ! empty($datetime_description) && $add_breaks ? '<br />' : '';
+					$html .= ! empty($datetime_description) ? ' - '.$datetime_description : '';
+					$html = apply_filters('FHEE__espresso_list_of_event_dates__datetime_html', $html, $datetime);
 					$html .= '</li>';
 				}
 			}
 			$html .= $format ? '</ul>' : '';
 		} else {
-			$html = $format ?  '<p><span class="dashicons dashicons-marker pink-text"></span>' . esc_html__( 'There are no upcoming dates for this event.', 'event_espresso' ) . '</p><br/>' : '';
+			$html = $format ? '<p><span class="dashicons dashicons-marker pink-text"></span>'.esc_html__('There are no upcoming dates for this event.', 'event_espresso').'</p><br/>' : '';
 		}
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 			return '';
 		}
@@ -501,7 +501,7 @@ 
 }
 
 
-if ( ! function_exists( 'espresso_event_end_date' )) {
+if ( ! function_exists('espresso_event_end_date')) {
 	/**
 	 * espresso_event_end_date
 	 * returns the last date for an event
@@ -512,20 +512,20 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_event_end_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_end_date__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_event_end_date__time_format', $time_format );
-		if($echo){
-			echo EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID );
+	function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID );
+		return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_range' )) {
+if ( ! function_exists('espresso_event_date_range')) {
 	/**
 	 * espresso_event_date_range
 	 * returns the first and last chronologically ordered dates for an event (if different)
@@ -538,32 +538,32 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_event_date_range( $date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
+	function espresso_event_date_range($date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
 		// set and filter date and time formats when a range is returned
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', $date_format );
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
 		// get the start and end date with NO time portion
-		$the_event_date = EEH_Event_View::the_earliest_event_date( $date_format, '', $EVT_ID );
-		$the_event_end_date = EEH_Event_View::the_latest_event_date( $date_format, '', $EVT_ID );
+		$the_event_date = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
+		$the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
 		// now we can determine if date range spans more than one day
-		if ( $the_event_date != $the_event_end_date ) {
-			$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-			$time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', $time_format );
+		if ($the_event_date != $the_event_end_date) {
+			$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+			$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
 			$html = sprintf(
 				/* translators: 1: first event date, 2: last event date */
-				esc_html__( '%1$s - %2$s', 'event_espresso' ),
-				EEH_Event_View::the_earliest_event_date( $date_format, $time_format, $EVT_ID ),
-				EEH_Event_View::the_latest_event_date( $date_format, $time_format, $EVT_ID )
+				esc_html__('%1$s - %2$s', 'event_espresso'),
+				EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
+				EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
 			);
 		} else {
 			// set and filter date and time formats when only a single datetime is returned
-			$single_date_format = ! empty( $single_date_format ) ? $single_date_format : get_option( 'date_format' );
-			$single_time_format = ! empty( $single_time_format ) ? $single_time_format : get_option( 'time_format' );
-			$single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', $single_date_format );
-			$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', $single_time_format );
-			$html = EEH_Event_View::the_earliest_event_date( $single_date_format, $single_time_format, $EVT_ID );
+			$single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
+			$single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
+			$single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
+			$single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
+			$html = EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
 		}
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 			return '';
 		}
@@ -571,7 +571,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'espresso_next_upcoming_datetime_obj' )) {
+if ( ! function_exists('espresso_next_upcoming_datetime_obj')) {
 	/**
 	 * espresso_next_upcoming_datetime_obj
 	 * returns the next upcoming datetime object for an event
@@ -579,12 +579,12 @@ 
 	 * @param int $EVT_ID
 	 * @return EE_Datetime|null
 	 */
-	function espresso_next_upcoming_datetime_obj( $EVT_ID = 0 ) {
-		return EEH_Event_View::get_next_upcoming_date_obj( $EVT_ID );
+	function espresso_next_upcoming_datetime_obj($EVT_ID = 0) {
+		return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
 	}
 }
 
-if ( ! function_exists( 'espresso_next_upcoming_datetime' ) ) {
+if ( ! function_exists('espresso_next_upcoming_datetime')) {
 	/**
 	 * espresso_next_upcoming_datetime
 	 * returns the start date and time for the next upcoming event.
@@ -595,30 +595,30 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_next_upcoming_datetime( $date_format = '', $time_format = '', $EVT_ID = 0, $echo = true ) {
+	function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true) {
 
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$date_format = apply_filters( 'FHEE__espresso_next_upcoming_datetime__date_format', $date_format );
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
 
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$time_format = apply_filters( 'FHEE__espresso_next_upcoming_datetime__time_format', $time_format );
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
 
-		$datetime_format = trim( $date_format . ' ' . $time_format);
+		$datetime_format = trim($date_format.' '.$time_format);
 
-		$datetime = espresso_next_upcoming_datetime_obj( $EVT_ID );
+		$datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
 
-		if( ! $datetime instanceof EE_Datetime ) {
+		if ( ! $datetime instanceof EE_Datetime) {
 			return '';
 		}
-		if ( $echo ){
-			echo $datetime->get_i18n_datetime( 'DTT_EVT_start', $datetime_format );
+		if ($echo) {
+			echo $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
 			return '';
 		}
-		return $datetime->get_i18n_datetime( 'DTT_EVT_start', $datetime_format );
+		return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_as_calendar_page' )) {
+if ( ! function_exists('espresso_event_date_as_calendar_page')) {
 	/**
 	 * espresso_event_date_as_calendar_page
 	 * returns the primary date for an event, stylized to appear as the page of a calendar
@@ -626,15 +626,15 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_date_as_calendar_page( $EVT_ID = FALSE ) {
-		EEH_Event_View::event_date_as_calendar_page( $EVT_ID );
+	function espresso_event_date_as_calendar_page($EVT_ID = FALSE) {
+		EEH_Event_View::event_date_as_calendar_page($EVT_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_event_link_url' )) {
+if ( ! function_exists('espresso_event_link_url')) {
 	/**
 	 * espresso_event_link_url
 	 *
@@ -642,18 +642,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_link_url( $EVT_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_link_url( $EVT_ID );
+	function espresso_event_link_url($EVT_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_link_url($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_link_url( $EVT_ID );
+		return EEH_Event_View::event_link_url($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_has_content_or_excerpt' )) {
+if ( ! function_exists('espresso_event_has_content_or_excerpt')) {
 	/**
 	 *    espresso_event_has_content_or_excerpt
 	 *
@@ -661,15 +661,15 @@ 
 	 * @param bool $EVT_ID
 	 * @return    boolean
 	 */
-	function espresso_event_has_content_or_excerpt( $EVT_ID = FALSE ) {
-		return EEH_Event_View::event_has_content_or_excerpt( $EVT_ID );
+	function espresso_event_has_content_or_excerpt($EVT_ID = FALSE) {
+		return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_event_content_or_excerpt' )) {
+if ( ! function_exists('espresso_event_content_or_excerpt')) {
 	/**
 	 * espresso_event_content_or_excerpt
 	 *
@@ -678,18 +678,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_content_or_excerpt( $num_words = 55, $more = NULL, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_content_or_excerpt( $num_words, $more );
+	function espresso_event_content_or_excerpt($num_words = 55, $more = NULL, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_content_or_excerpt($num_words, $more);
 			return '';
 		}
-		return EEH_Event_View::event_content_or_excerpt( $num_words, $more );
+		return EEH_Event_View::event_content_or_excerpt($num_words, $more);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_phone' )) {
+if ( ! function_exists('espresso_event_phone')) {
 	/**
 	 * espresso_event_phone
 	 *
@@ -697,18 +697,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_phone( $EVT_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_phone( $EVT_ID );
+	function espresso_event_phone($EVT_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_phone($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_phone( $EVT_ID );
+		return EEH_Event_View::event_phone($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_edit_event_link' )) {
+if ( ! function_exists('espresso_edit_event_link')) {
 	/**
 	 * espresso_edit_event_link
 	 * returns a link to edit an event
@@ -717,39 +717,39 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_edit_event_link( $EVT_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::edit_event_link( $EVT_ID );
+	function espresso_edit_event_link($EVT_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::edit_event_link($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::edit_event_link( $EVT_ID );
+		return EEH_Event_View::edit_event_link($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_organization_name' )) {
+if ( ! function_exists('espresso_organization_name')) {
 	/**
 	 * espresso_organization_name
 	 * @param bool $echo
 	 * @return string
 	 */
 	function espresso_organization_name($echo = TRUE) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('name');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('name');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_address' )) {
+if ( ! function_exists('espresso_organization_address')) {
 	/**
 	 * espresso_organization_address
 	 * @param string $type
 	 * @return string
 	 */
-	function espresso_organization_address( $type = 'inline' ) {
-		if ( EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ) {
+	function espresso_organization_address($type = 'inline') {
+		if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
 			$address = new EventEspresso\core\domain\entities\GenericAddress(
 				EE_Registry::instance()->CFG->organization->address_1,
 				EE_Registry::instance()->CFG->organization->address_2,
@@ -758,129 +758,129 @@ 
 				EE_Registry::instance()->CFG->organization->zip,
 				EE_Registry::instance()->CFG->organization->CNT_ISO
 			);
-			return EEH_Address::format( $address, $type );
+			return EEH_Address::format($address, $type);
 		}
 		return '';
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_email' )) {
+if ( ! function_exists('espresso_organization_email')) {
 	/**
 	 * espresso_organization_email
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_email( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+	function espresso_organization_email($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('email');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('email');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_logo_url' )) {
+if ( ! function_exists('espresso_organization_logo_url')) {
 	/**
 	 * espresso_organization_logo_url
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_logo_url( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+	function espresso_organization_logo_url($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_facebook' )) {
+if ( ! function_exists('espresso_organization_facebook')) {
 	/**
 	 * espresso_organization_facebook
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_facebook( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+	function espresso_organization_facebook($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_twitter' )) {
+if ( ! function_exists('espresso_organization_twitter')) {
 	/**
 	 * espresso_organization_twitter
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_twitter( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+	function espresso_organization_twitter($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_linkedin' )) {
+if ( ! function_exists('espresso_organization_linkedin')) {
 	/**
 	 * espresso_organization_linkedin
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_linkedin( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+	function espresso_organization_linkedin($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_pinterest' )) {
+if ( ! function_exists('espresso_organization_pinterest')) {
 	/**
 	 * espresso_organization_pinterest
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_pinterest( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+	function espresso_organization_pinterest($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_google' )) {
+if ( ! function_exists('espresso_organization_google')) {
 	/**
 	 * espresso_organization_google
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_google( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+	function espresso_organization_google($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('google');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('google');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_instagram' )) {
+if ( ! function_exists('espresso_organization_instagram')) {
 	/**
 	 * espresso_organization_instagram
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_instagram( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+	function espresso_organization_instagram($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 	}
 }
 
@@ -890,7 +890,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_event_venues' )) {
+if ( ! function_exists('espresso_event_venues')) {
 	/**
 	 * espresso_event_venues
 	 *
@@ -904,7 +904,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_venue_id' )) {
+if ( ! function_exists('espresso_venue_id')) {
 	/**
 	 *    espresso_venue_name
 	 *
@@ -912,15 +912,15 @@ 
 	 * @param     int $EVT_ID
 	 * @return    string
 	 */
-	function espresso_venue_id( $EVT_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $EVT_ID );
+	function espresso_venue_id($EVT_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($EVT_ID);
 		return $venue instanceof EE_Venue ? $venue->ID() : 0;
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_is_venue_private' ) ) {
+if ( ! function_exists('espresso_is_venue_private')) {
 	/**
 	 * Return whether a venue is private or not.
 	 * @see EEH_Venue_View::get_venue() for more info on expected return results.
@@ -929,45 +929,45 @@ 
 	 *
 	 * @return bool | null
 	 */
-	function espresso_is_venue_private( $VNU_ID = 0 ) {
-		return EEH_Venue_View::is_venue_private( $VNU_ID );
+	function espresso_is_venue_private($VNU_ID = 0) {
+		return EEH_Venue_View::is_venue_private($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_is_password_protected' ) ) {
+if ( ! function_exists('espresso_venue_is_password_protected')) {
 	/**
 	 * returns true or false if a venue is password protected or not
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
 	 * @return string
 	 */
-	function espresso_venue_is_password_protected( $VNU_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::is_venue_password_protected( $VNU_ID );
+	function espresso_venue_is_password_protected($VNU_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::is_venue_password_protected($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_password_protected_venue_form' ) ) {
+if ( ! function_exists('espresso_password_protected_venue_form')) {
 	/**
 	 * Returns a password form if venue is password protected.
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
 	 * @return string
 	 */
-	function espresso_password_protected_venue_form( $VNU_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::password_protected_venue_form( $VNU_ID );
+	function espresso_password_protected_venue_form($VNU_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::password_protected_venue_form($VNU_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_venue_name' )) {
+if ( ! function_exists('espresso_venue_name')) {
 	/**
 	 *    espresso_venue_name
 	 *
@@ -977,19 +977,19 @@ 
 	 * @param bool   $echo
 	 * @return    string
 	 */
-	function espresso_venue_name( $VNU_ID = 0, $link_to = 'details', $echo = TRUE ) {
-		if($echo){
-			echo EEH_Venue_View::venue_name( $link_to, $VNU_ID );
+	function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_name($link_to, $VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_name( $link_to, $VNU_ID );
+		return EEH_Venue_View::venue_name($link_to, $VNU_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_venue_link' )) {
+if ( ! function_exists('espresso_venue_link')) {
 	/**
 	 * 	espresso_venue_link
 	 *
@@ -998,14 +998,14 @@ 
 	 *  @param 	string 	$text
 	 *  @return 	string
 	 */
-	function espresso_venue_link( $VNU_ID = 0, $text = '' ) {
-		return EEH_Venue_View::venue_details_link( $VNU_ID, $text );
+	function espresso_venue_link($VNU_ID = 0, $text = '') {
+		return EEH_Venue_View::venue_details_link($VNU_ID, $text);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_description' )) {
+if ( ! function_exists('espresso_venue_description')) {
 	/**
 	 *    espresso_venue_description
 	 *
@@ -1014,17 +1014,17 @@ 
 	 * @param bool $echo
 	 * @return    string
 	 */
-	function espresso_venue_description( $VNU_ID = FALSE, $echo = TRUE ) {
-		if($echo){
-			echo EEH_Venue_View::venue_description( $VNU_ID );
+	function espresso_venue_description($VNU_ID = FALSE, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_description($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_description( $VNU_ID );
+		return EEH_Venue_View::venue_description($VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_excerpt' )) {
+if ( ! function_exists('espresso_venue_excerpt')) {
 	/**
 	 *    espresso_venue_excerpt
 	 *
@@ -1033,18 +1033,18 @@ 
 	 * @param bool $echo
 	 * @return    string
 	 */
-	function espresso_venue_excerpt( $VNU_ID = 0,  $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_excerpt( $VNU_ID );
+	function espresso_venue_excerpt($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_excerpt($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_excerpt( $VNU_ID );
+		return EEH_Venue_View::venue_excerpt($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_categories' )) {
+if ( ! function_exists('espresso_venue_categories')) {
 	/**
 	 * espresso_venue_categories
 	 * returns the terms associated with a venue
@@ -1054,17 +1054,17 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE,  $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized );
+	function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
 			return '';
 		}
-		return EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized );
+		return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_address' )) {
+if ( ! function_exists('espresso_venue_address')) {
 	/**
 	 * espresso_venue_address
 	 * returns a formatted block of html  for displaying a venue's address
@@ -1074,17 +1074,17 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_venue_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_address( $type, $VNU_ID );
+	function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_address( $type, $VNU_ID );
+		return EEH_Venue_View::venue_address($type, $VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_raw_address' )) {
+if ( ! function_exists('espresso_venue_raw_address')) {
 	/**
 	 * espresso_venue_address
 	 * returns an UN-formatted string containing a venue's address
@@ -1094,17 +1094,17 @@ 
 	 * @param bool     $echo
 	 * @return string
 	 */
-	function espresso_venue_raw_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE );
+	function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE);
 			return '';
 		}
-		return EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE );
+		return EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_has_address' )) {
+if ( ! function_exists('espresso_venue_has_address')) {
 	/**
 	 * espresso_venue_has_address
 	 * returns TRUE or FALSE if a Venue has address information
@@ -1112,13 +1112,13 @@ 
 	 * @param int $VNU_ID
 	 * @return bool
 	 */
-	function espresso_venue_has_address( $VNU_ID = 0 ) {
-		return EEH_Venue_View::venue_has_address( $VNU_ID );
+	function espresso_venue_has_address($VNU_ID = 0) {
+		return EEH_Venue_View::venue_has_address($VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_gmap' )) {
+if ( ! function_exists('espresso_venue_gmap')) {
 	/**
 	 * espresso_venue_gmap
 	 * returns a google map for the venue address
@@ -1129,17 +1129,17 @@ 
 	 * @param bool     $echo
 	 * @return string
 	 */
-	function espresso_venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE  ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap );
+	function espresso_venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
 			return '';
 		}
-		return EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap );
+		return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_phone' )) {
+if ( ! function_exists('espresso_venue_phone')) {
 	/**
 	 * espresso_venue_phone
 	 *
@@ -1147,18 +1147,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_phone( $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_phone( $VNU_ID );
+	function espresso_venue_phone($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_phone($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_phone( $VNU_ID );
+		return EEH_Venue_View::venue_phone($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_website' )) {
+if ( ! function_exists('espresso_venue_website')) {
 	/**
 	 * espresso_venue_website
 	 *
@@ -1166,18 +1166,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_website( $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_website_link( $VNU_ID );
+	function espresso_venue_website($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_website_link($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_website_link( $VNU_ID );
+		return EEH_Venue_View::venue_website_link($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_edit_venue_link' )) {
+if ( ! function_exists('espresso_edit_venue_link')) {
 	/**
 	 * espresso_edit_venue_link
 	 *
@@ -1185,12 +1185,12 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_edit_venue_link( $VNU_ID = 0, $echo = TRUE ) {
-		if($echo){
-			echo EEH_Venue_View::edit_venue_link( $VNU_ID );
+	function espresso_edit_venue_link($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::edit_venue_link($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::edit_venue_link( $VNU_ID );
+		return EEH_Venue_View::edit_venue_link($VNU_ID);
 	}
 }
 

core/services/cache/BasicCacheManager.php

Spacing +4 added lines, -4 removed lines

@@ -140,7 +140,7 @@ 
         // with these parameters
         $cache_id .= filter_input(INPUT_SERVER, 'QUERY_STRING', FILTER_SANITIZE_URL);
         // then md5 the above to control it's length, add all of our prefixes, and truncate
-        return substr($this->cachePrefix() . $id_prefix . '-' . md5($cache_id), 0, 182);
+        return substr($this->cachePrefix().$id_prefix.'-'.md5($cache_id), 0, 182);
     }
 
 
@@ -170,9 +170,9 @@ 
         return '
 <div class="ee-cached-content-notice" style="position:fixed; bottom:0; left: 0;">
     <p style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;margin:0 0 3px 5px">
-        <b>' . $type . '</b><span style="color:#999"> : </span>
-        <span>' . $cache_id . '</span>
-        <span style="margin-left:2em;">' . __FILE__ . '</span>
+        <b>' . $type.'</b><span style="color:#999"> : </span>
+        <span>' . $cache_id.'</span>
+        <span style="margin-left:2em;">' . __FILE__.'</span>
     </p>
 </div>';
     }

Indentation +130 added lines, -130 removed lines

@@ -16,135 +16,135 @@ 
 class BasicCacheManager implements CacheManagerInterface
 {
 
-    /**
-     * @type string
-     */
-    const CACHE_PREFIX = 'ee_cache_';
-
-
-    /**
-     * @var CacheStorageInterface $cache_storage
-     */
-    private $cache_storage;
-
-
-    /**
-     * BasicCacheManager constructor.
-     *
-     * @param CacheStorageInterface $cache_storage [required]
-     */
-    public function __construct(CacheStorageInterface $cache_storage)
-    {
-        $this->cache_storage = $cache_storage;
-    }
-
-
-    /**
-     * returns a string that will be prepended to all cache identifiers
-     *
-     * @return string
-     */
-    public function cachePrefix()
-    {
-        return BasicCacheManager::CACHE_PREFIX;
-    }
-
-
-    /**
-     * @param string  $id_prefix [required] Prepended to all cache IDs. Can be helpful in finding specific cache types.
-     *                           May also be helpful to include an additional specific identifier,
-     *                           such as a post ID as part of the $id_prefix so that individual caches
-     *                           can be found and/or cleared. ex: "venue-28", or "shortcode-156".
-     *                           BasicCacheManager::CACHE_PREFIX will also be prepended to the cache id.
-     * @param string  $cache_id  [required] Additional identifying details that make this cache unique.
-     *                           It is advisable to use some of the actual data
-     *                           that is used to generate the content being cached,
-     *                           in order to guarantee that the cache id is unique for that content.
-     *                           The cache id will be md5'd before usage to make it more db friendly,
-     *                           and the entire cache id string will be truncated to 190 characters.
-     * @param Closure $callback  [required] since the point of caching is to avoid generating content when not
-     *                           necessary,
-     *                           we wrap our content creation in a Closure so that it is not executed until needed.
-     * @param int     $expiration
-     * @return Closure|mixed
-     */
-    public function get($id_prefix, $cache_id, Closure $callback, $expiration = HOUR_IN_SECONDS)
-    {
-        $content = '';
-        $expiration = absint(
-            apply_filters(
-                'FHEE__CacheManager__get__cache_expiration',
-                $expiration,
-                $id_prefix,
-                $cache_id
-            )
-        );
-        $cache_id = $this->generateCacheIdentifier($id_prefix, $cache_id);
-        // is caching enabled for this content ?
-        if ($expiration) {
-            $content = $this->cache_storage->get($cache_id);
-        }
-        // any existing content ?
-        if (empty($content)) {
-            // nope! let's generate some new stuff
-            $content = $callback();
-            // save the new content if caching is enabled
-            if ($expiration) {
-                $this->cache_storage->add($cache_id, $content, $expiration);
-                if (EE_DEBUG) {
-                    $content .= $this->displayCacheNotice($cache_id, 'REFRESH CACHE');
-                }
-            }
-        } else {
-            if (EE_DEBUG) {
-                $content .= $this->displayCacheNotice($cache_id, 'CACHED CONTENT');
-            }
-        }
-        return $content;
-    }
-
-
-    /**
-     * Generates a unique identifier string for the cache
-     *
-     * @param string $id_prefix [required] see BasicCacheManager::get()
-     * @param string $cache_id  [required] see BasicCacheManager::get()
-     * @return string
-     */
-    private function generateCacheIdentifier($id_prefix, $cache_id)
-    {
-        // let's make the cached content unique for this "page"
-        $cache_id .= filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL);
-        // with these parameters
-        $cache_id .= filter_input(INPUT_SERVER, 'QUERY_STRING', FILTER_SANITIZE_URL);
-        // then md5 the above to control it's length, add all of our prefixes, and truncate
-        return substr($this->cachePrefix() . $id_prefix . '-' . md5($cache_id), 0, 182);
-    }
-
-
-    /**
-     * @param array|string $cache_id [required] Could be an ID prefix affecting many caches
-     *                               or a specific ID targeting a single cache item
-     * @return void
-     */
-    public function clear($cache_id)
-    {
-        // ensure incoming arg is in an array
-        $cache_id = is_array($cache_id) ? $cache_id : array($cache_id);
-        // delete corresponding transients for the supplied id prefix
-        $this->cache_storage->deleteMany($cache_id);
-    }
-
-
-    /**
-     * @param array|string $cache_id [required] Could be an ID prefix affecting many caches
-     *                               or a specific ID targeting a single cache item
-     * @param string       $type
-     * @return string
-     */
-    private function displayCacheNotice($cache_id, $type)
-    {
-        return '
+	/**
+	 * @type string
+	 */
+	const CACHE_PREFIX = 'ee_cache_';
+
+
+	/**
+	 * @var CacheStorageInterface $cache_storage
+	 */
+	private $cache_storage;
+
+
+	/**
+	 * BasicCacheManager constructor.
+	 *
+	 * @param CacheStorageInterface $cache_storage [required]
+	 */
+	public function __construct(CacheStorageInterface $cache_storage)
+	{
+		$this->cache_storage = $cache_storage;
+	}
+
+
+	/**
+	 * returns a string that will be prepended to all cache identifiers
+	 *
+	 * @return string
+	 */
+	public function cachePrefix()
+	{
+		return BasicCacheManager::CACHE_PREFIX;
+	}
+
+
+	/**
+	 * @param string  $id_prefix [required] Prepended to all cache IDs. Can be helpful in finding specific cache types.
+	 *                           May also be helpful to include an additional specific identifier,
+	 *                           such as a post ID as part of the $id_prefix so that individual caches
+	 *                           can be found and/or cleared. ex: "venue-28", or "shortcode-156".
+	 *                           BasicCacheManager::CACHE_PREFIX will also be prepended to the cache id.
+	 * @param string  $cache_id  [required] Additional identifying details that make this cache unique.
+	 *                           It is advisable to use some of the actual data
+	 *                           that is used to generate the content being cached,
+	 *                           in order to guarantee that the cache id is unique for that content.
+	 *                           The cache id will be md5'd before usage to make it more db friendly,
+	 *                           and the entire cache id string will be truncated to 190 characters.
+	 * @param Closure $callback  [required] since the point of caching is to avoid generating content when not
+	 *                           necessary,
+	 *                           we wrap our content creation in a Closure so that it is not executed until needed.
+	 * @param int     $expiration
+	 * @return Closure|mixed
+	 */
+	public function get($id_prefix, $cache_id, Closure $callback, $expiration = HOUR_IN_SECONDS)
+	{
+		$content = '';
+		$expiration = absint(
+			apply_filters(
+				'FHEE__CacheManager__get__cache_expiration',
+				$expiration,
+				$id_prefix,
+				$cache_id
+			)
+		);
+		$cache_id = $this->generateCacheIdentifier($id_prefix, $cache_id);
+		// is caching enabled for this content ?
+		if ($expiration) {
+			$content = $this->cache_storage->get($cache_id);
+		}
+		// any existing content ?
+		if (empty($content)) {
+			// nope! let's generate some new stuff
+			$content = $callback();
+			// save the new content if caching is enabled
+			if ($expiration) {
+				$this->cache_storage->add($cache_id, $content, $expiration);
+				if (EE_DEBUG) {
+					$content .= $this->displayCacheNotice($cache_id, 'REFRESH CACHE');
+				}
+			}
+		} else {
+			if (EE_DEBUG) {
+				$content .= $this->displayCacheNotice($cache_id, 'CACHED CONTENT');
+			}
+		}
+		return $content;
+	}
+
+
+	/**
+	 * Generates a unique identifier string for the cache
+	 *
+	 * @param string $id_prefix [required] see BasicCacheManager::get()
+	 * @param string $cache_id  [required] see BasicCacheManager::get()
+	 * @return string
+	 */
+	private function generateCacheIdentifier($id_prefix, $cache_id)
+	{
+		// let's make the cached content unique for this "page"
+		$cache_id .= filter_input(INPUT_SERVER, 'REQUEST_URI', FILTER_SANITIZE_URL);
+		// with these parameters
+		$cache_id .= filter_input(INPUT_SERVER, 'QUERY_STRING', FILTER_SANITIZE_URL);
+		// then md5 the above to control it's length, add all of our prefixes, and truncate
+		return substr($this->cachePrefix() . $id_prefix . '-' . md5($cache_id), 0, 182);
+	}
+
+
+	/**
+	 * @param array|string $cache_id [required] Could be an ID prefix affecting many caches
+	 *                               or a specific ID targeting a single cache item
+	 * @return void
+	 */
+	public function clear($cache_id)
+	{
+		// ensure incoming arg is in an array
+		$cache_id = is_array($cache_id) ? $cache_id : array($cache_id);
+		// delete corresponding transients for the supplied id prefix
+		$this->cache_storage->deleteMany($cache_id);
+	}
+
+
+	/**
+	 * @param array|string $cache_id [required] Could be an ID prefix affecting many caches
+	 *                               or a specific ID targeting a single cache item
+	 * @param string       $type
+	 * @return string
+	 */
+	private function displayCacheNotice($cache_id, $type)
+	{
+		return '
 <div class="ee-cached-content-notice" style="position:fixed; bottom:0; left: 0;">
     <p style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;margin:0 0 3px 5px">
         <b>' . $type . '</b><span style="color:#999"> : </span>
@@ -152,5 +152,5 @@ 
         <span style="margin-left:2em;">' . __FILE__ . '</span>
     </p>
 </div>';
-    }
+	}
 }

acceptance_tests/Page/EventsAdmin.php

Doc Comments +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 
     /**
      * Wrapper for getting the selector for a given field and given display row of a ticket in the event editor.
-     * @param     $field_name
+     * @param     string $field_name
      * @param int $row_number
      * @return string
      */

Indentation +276 added lines, -276 removed lines

@@ -14,280 +14,280 @@
 class EventsAdmin extends CoreAdmin
 {
 
-    /**
-     * Selector for the Add new Event button in the admin.
-     * @var string
-     */
-    const ADD_NEW_EVENT_BUTTON_SELECTOR = '#add-new-event';
-
-
-    /**
-     * Selector for the Event Title field in the event editor
-     * @var string
-     */
-    const EVENT_EDITOR_TITLE_FIELD_SELECTOR = ['xpath' => "//input[@id='title']"];
-
-    /**
-     * Selector for the publish submit button in the event editor.
-     * @var string
-     */
-    const EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR = ['xpath'=>"//div[@id='major-publishing-actions']//input[@id='publish']"];
-
-
-    /**
-     * Selector for the save button in the event editor
-     */
-    const EVENT_EDITOR_SAVE_BUTTON_SELECTOR = ['xpath' => "//div[@id='minor-publishing-actions']//input[@id='save-post']"];
-
-
-    /**
-     * @var string
-     */
-    const EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR = '#EVT_default_registration_status';
-
-    /**
-     * Selector for the view link after publishing an event.
-     * @var string
-     */
-    const EVENT_EDITOR_VIEW_LINK_AFTER_PUBLISH_SELECTOR = "//span[@id='sample-permalink']/a";
-
-
-    /**
-     * Selector for the ID of the event in the event editor
-     * @var string
-     */
-    const EVENT_EDITOR_EVT_ID_SELECTOR = "//input[@id='post_ID']";
-
-
-    /**
-     * Selector for the search input on the event list table page.
-     * @var string
-     */
-    const EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR = '#toplevel_page_espresso_events-search-input';
-
-
-
-
-    /**
-     * @param string $additional_params
-     * @return string
-     */
-    public static function defaultEventsListTableUrl($additional_params = '')
-    {
-        return self::adminUrl('espresso_events', 'default', $additional_params);
-    }
-
-
-    /**
-     * The selector for the DTTname field for the given row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorDatetimeNameFieldSelector($row_number = 1)
-    {
-        return self::eventEditorDatetimeFieldSelectorForField('DTT_name', $row_number);
-    }
-
-
-    /**
-     * The selector for the DTT_EVT_start field for the given row in the event editor.d
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorDatetimeStartDateFieldSelector($row_number = 1)
-    {
-        return self::eventEditorDatetimeFieldSelectorForField('DTT_EVT_start', $row_number);
-    }
-
-
-    /**
-     * Wrapper for getting the selector for a given field and given row of a datetime in the event editor.
-     *
-     * @param string $field_name
-     * @param int    $row_number
-     * @return string
-     */
-    public static function eventEditorDatetimeFieldSelectorForField($field_name, $row_number = 1)
-    {
-        return "//input[@id='event-datetime-$field_name-$row_number']";
-    }
-
-
-    /**
-     * The selector for the TKT_name field for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketNameFieldSelector($row_number = 1)
-    {
-        return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_name', $row_number);
-    }
-
-
-    /**
-     * Selector for the TKT_base_price field for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketPriceFieldSelector($row_number = 1)
-    {
-        return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_base_price', $row_number);
-    }
-
-
-    /**
-     * Selector for the TKT_qty field for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketQuantityFieldSelector($row_number = 1)
-    {
-        return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_qty', $row_number);
-    }
-
-
-    /**
-     * Selector for the advanced details toggle for the ticket for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketAdvancedDetailsSelector($row_number = 1)
-    {
-        return "//tr[@id='display-ticketrow-$row_number']//span[contains(@class, 'gear-icon')]";
-    }
-
-
-    /**
-     * Selector for the subtotal amount for the given display row of the ticket in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketAdvancedDetailsSubtotalSelector($row_number = 1)
-    {
-        return "//span[@id='price-total-amount-$row_number']";
-    }
-
-
-    /**
-     * Selector for the Total element for the given display row of the ticket in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketAdvancedDetailsTotalSelector($row_number = 1)
-    {
-        return "//span[@id='price-total-amount-$row_number']";
-    }
-
-
-    /**
-     * Selector for the taxable selector for the ticket for the given display row in the event editor.
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketTaxableCheckboxSelector($row_number = 1)
-    {
-        return "//input[@id='edit-ticket-TKT_taxable-$row_number']";
-    }
-
-
-    /**
-     * This returns the xpath locater for the Tax amount display container within the advanced settings view for the
-     * given ticket (row) and the given tax id (PRC_ID).
-     *
-     * @param int $tax_id     The PRC_ID for the tax you want the locater for.  Note, this defaults to the default tax
-     *                        setup on a fresh install.
-     * @param int $row_number What row representing the ticket you want the locator for.
-     * @return string
-     */
-    public static function eventEditorTicketTaxAmountDisplayForTaxIdAndTicketRowSelector($tax_id = 2, $row_number = 1)
-    {
-        return "//span[@id='TKT-tax-amount-display-$tax_id-$row_number']";
-    }
-
-
-    /**
-     * Wrapper for getting the selector for a given field and given display row of a ticket in the event editor.
-     * @param     $field_name
-     * @param int $row_number
-     * @return string
-     */
-    public static function eventEditorTicketFieldSelectorForFieldInDisplayRow($field_name, $row_number = 1)
-    {
-        return "//tr[@id='display-ticketrow-$row_number']//input[contains(@class, 'edit-ticket-$field_name')]";
-    }
-
-
-    /**
-     * Returns the selector for the event title edit link in the events list table for the given Event Title.
-     * @param string $event_title
-     * @return string
-     */
-    public static function eventListTableEventTitleEditLinkSelectorForTitle($event_title)
-    {
-        return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']";
-    }
-
-
-    /**
-     * Locator for for the ID column in the event list table for a given event title.
-     * @param string $event_title
-     * @return string
-     */
-    public static function eventListTableEventIdSelectorForTitle($event_title)
-    {
-        return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
-               . "//ancestor::tr/th[contains(@class, 'check-column')]/input";
-    }
-
-
-    /**
-     * Locator for the view link in the row of an event list table for the given event title.
-     * @param string $event_title
-     * @return string
-     */
-    public static function eventListTableEventTitleViewLinkSelectorForTitle($event_title)
-    {
-        return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
-               . "//ancestor::td//span[@class='view']/a";
-    }
-
-
-    /**
-     * Locator for the messenger tab in the Notifications metabox in the event editor.
-     * @param string $messenger_slug  The slug for the messenger (it's reference slug).
-     * @return string
-     */
-    public static function eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug)
-    {
-        return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
-               . "//a[@rel='ee-tab-$messenger_slug']";
-    }
-
-
-    /**
-     * Locator for the select input within the notifications metabox.
-     * Note, this assumes the tab content for the related messenger is already visible.
-     * @param string $message_type_label The message type label (visible string in the table) you want the selector for.
-     * @return string
-     */
-    public static function eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label)
-    {
-        return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
-               . "//table[@class='messages-custom-template-switcher']"
-               . "//tr/td[contains(.,'Registration Approved')]"
-               . "//ancestor::tr//select[contains(@class,'message-template-selector')]";
-    }
-
-
-    /**
-     * Returns the selector for the action link to the registrations list table view filtered by the given event_id.
-     * Assumes one is in the context of the Events List Table
-     * @param int $event_id
-     * @return string
-     */
-    public static function listTableActionLinkRegistrationsForEvent($event_id)
-    {
-        return "//tbody[@id='the-list']/tr/td[contains(@class, 'column-id') and contains(.,$event_id)]"
-                . "//ancestor::tr/td//a[div[contains(@class, 'dashicons-groups')]]";
-    }
+	/**
+	 * Selector for the Add new Event button in the admin.
+	 * @var string
+	 */
+	const ADD_NEW_EVENT_BUTTON_SELECTOR = '#add-new-event';
+
+
+	/**
+	 * Selector for the Event Title field in the event editor
+	 * @var string
+	 */
+	const EVENT_EDITOR_TITLE_FIELD_SELECTOR = ['xpath' => "//input[@id='title']"];
+
+	/**
+	 * Selector for the publish submit button in the event editor.
+	 * @var string
+	 */
+	const EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR = ['xpath'=>"//div[@id='major-publishing-actions']//input[@id='publish']"];
+
+
+	/**
+	 * Selector for the save button in the event editor
+	 */
+	const EVENT_EDITOR_SAVE_BUTTON_SELECTOR = ['xpath' => "//div[@id='minor-publishing-actions']//input[@id='save-post']"];
+
+
+	/**
+	 * @var string
+	 */
+	const EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR = '#EVT_default_registration_status';
+
+	/**
+	 * Selector for the view link after publishing an event.
+	 * @var string
+	 */
+	const EVENT_EDITOR_VIEW_LINK_AFTER_PUBLISH_SELECTOR = "//span[@id='sample-permalink']/a";
+
+
+	/**
+	 * Selector for the ID of the event in the event editor
+	 * @var string
+	 */
+	const EVENT_EDITOR_EVT_ID_SELECTOR = "//input[@id='post_ID']";
+
+
+	/**
+	 * Selector for the search input on the event list table page.
+	 * @var string
+	 */
+	const EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR = '#toplevel_page_espresso_events-search-input';
+
+
+
+
+	/**
+	 * @param string $additional_params
+	 * @return string
+	 */
+	public static function defaultEventsListTableUrl($additional_params = '')
+	{
+		return self::adminUrl('espresso_events', 'default', $additional_params);
+	}
+
+
+	/**
+	 * The selector for the DTTname field for the given row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorDatetimeNameFieldSelector($row_number = 1)
+	{
+		return self::eventEditorDatetimeFieldSelectorForField('DTT_name', $row_number);
+	}
+
+
+	/**
+	 * The selector for the DTT_EVT_start field for the given row in the event editor.d
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorDatetimeStartDateFieldSelector($row_number = 1)
+	{
+		return self::eventEditorDatetimeFieldSelectorForField('DTT_EVT_start', $row_number);
+	}
+
+
+	/**
+	 * Wrapper for getting the selector for a given field and given row of a datetime in the event editor.
+	 *
+	 * @param string $field_name
+	 * @param int    $row_number
+	 * @return string
+	 */
+	public static function eventEditorDatetimeFieldSelectorForField($field_name, $row_number = 1)
+	{
+		return "//input[@id='event-datetime-$field_name-$row_number']";
+	}
+
+
+	/**
+	 * The selector for the TKT_name field for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketNameFieldSelector($row_number = 1)
+	{
+		return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_name', $row_number);
+	}
+
+
+	/**
+	 * Selector for the TKT_base_price field for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketPriceFieldSelector($row_number = 1)
+	{
+		return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_base_price', $row_number);
+	}
+
+
+	/**
+	 * Selector for the TKT_qty field for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketQuantityFieldSelector($row_number = 1)
+	{
+		return self::eventEditorTicketFieldSelectorForFieldInDisplayRow('TKT_qty', $row_number);
+	}
+
+
+	/**
+	 * Selector for the advanced details toggle for the ticket for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketAdvancedDetailsSelector($row_number = 1)
+	{
+		return "//tr[@id='display-ticketrow-$row_number']//span[contains(@class, 'gear-icon')]";
+	}
+
+
+	/**
+	 * Selector for the subtotal amount for the given display row of the ticket in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketAdvancedDetailsSubtotalSelector($row_number = 1)
+	{
+		return "//span[@id='price-total-amount-$row_number']";
+	}
+
+
+	/**
+	 * Selector for the Total element for the given display row of the ticket in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketAdvancedDetailsTotalSelector($row_number = 1)
+	{
+		return "//span[@id='price-total-amount-$row_number']";
+	}
+
+
+	/**
+	 * Selector for the taxable selector for the ticket for the given display row in the event editor.
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketTaxableCheckboxSelector($row_number = 1)
+	{
+		return "//input[@id='edit-ticket-TKT_taxable-$row_number']";
+	}
+
+
+	/**
+	 * This returns the xpath locater for the Tax amount display container within the advanced settings view for the
+	 * given ticket (row) and the given tax id (PRC_ID).
+	 *
+	 * @param int $tax_id     The PRC_ID for the tax you want the locater for.  Note, this defaults to the default tax
+	 *                        setup on a fresh install.
+	 * @param int $row_number What row representing the ticket you want the locator for.
+	 * @return string
+	 */
+	public static function eventEditorTicketTaxAmountDisplayForTaxIdAndTicketRowSelector($tax_id = 2, $row_number = 1)
+	{
+		return "//span[@id='TKT-tax-amount-display-$tax_id-$row_number']";
+	}
+
+
+	/**
+	 * Wrapper for getting the selector for a given field and given display row of a ticket in the event editor.
+	 * @param     $field_name
+	 * @param int $row_number
+	 * @return string
+	 */
+	public static function eventEditorTicketFieldSelectorForFieldInDisplayRow($field_name, $row_number = 1)
+	{
+		return "//tr[@id='display-ticketrow-$row_number']//input[contains(@class, 'edit-ticket-$field_name')]";
+	}
+
+
+	/**
+	 * Returns the selector for the event title edit link in the events list table for the given Event Title.
+	 * @param string $event_title
+	 * @return string
+	 */
+	public static function eventListTableEventTitleEditLinkSelectorForTitle($event_title)
+	{
+		return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']";
+	}
+
+
+	/**
+	 * Locator for for the ID column in the event list table for a given event title.
+	 * @param string $event_title
+	 * @return string
+	 */
+	public static function eventListTableEventIdSelectorForTitle($event_title)
+	{
+		return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
+			   . "//ancestor::tr/th[contains(@class, 'check-column')]/input";
+	}
+
+
+	/**
+	 * Locator for the view link in the row of an event list table for the given event title.
+	 * @param string $event_title
+	 * @return string
+	 */
+	public static function eventListTableEventTitleViewLinkSelectorForTitle($event_title)
+	{
+		return "//td[contains(@class, 'column-name')]/strong/a[text()='$event_title']"
+			   . "//ancestor::td//span[@class='view']/a";
+	}
+
+
+	/**
+	 * Locator for the messenger tab in the Notifications metabox in the event editor.
+	 * @param string $messenger_slug  The slug for the messenger (it's reference slug).
+	 * @return string
+	 */
+	public static function eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug)
+	{
+		return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
+			   . "//a[@rel='ee-tab-$messenger_slug']";
+	}
+
+
+	/**
+	 * Locator for the select input within the notifications metabox.
+	 * Note, this assumes the tab content for the related messenger is already visible.
+	 * @param string $message_type_label The message type label (visible string in the table) you want the selector for.
+	 * @return string
+	 */
+	public static function eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label)
+	{
+		return "//div[@id='espresso_events_Messages_Hooks_Extend_messages_metabox_metabox']"
+			   . "//table[@class='messages-custom-template-switcher']"
+			   . "//tr/td[contains(.,'Registration Approved')]"
+			   . "//ancestor::tr//select[contains(@class,'message-template-selector')]";
+	}
+
+
+	/**
+	 * Returns the selector for the action link to the registrations list table view filtered by the given event_id.
+	 * Assumes one is in the context of the Events List Table
+	 * @param int $event_id
+	 * @return string
+	 */
+	public static function listTableActionLinkRegistrationsForEvent($event_id)
+	{
+		return "//tbody[@id='the-list']/tr/td[contains(@class, 'column-id') and contains(.,$event_id)]"
+				. "//ancestor::tr/td//a[div[contains(@class, 'dashicons-groups')]]";
+	}
 }

acceptance_tests/Page/CoreAdmin.php

Spacing +5 added lines, -5 removed lines

@@ -66,9 +66,9 @@ 
      */
     public static function adminUrl($page = 'espresso_events', $action = 'default', $additional_params = '')
     {
-        $url = self::URL_PREFIX . $page;
-        $url .= $action ? '&action=' . $action : '';
-        $url .= $additional_params ? '&' . ltrim('&', ltrim('?', $additional_params)) : '';
+        $url = self::URL_PREFIX.$page;
+        $url .= $action ? '&action='.$action : '';
+        $url .= $additional_params ? '&'.ltrim('&', ltrim('?', $additional_params)) : '';
         return $url;
     }
 
@@ -80,7 +80,7 @@ 
      */
     public static function wpEditorTextTabSelector($field_reference)
     {
-        return '#content-' . $field_reference . '-content-html';
+        return '#content-'.$field_reference.'-content-html';
     }
 
 
@@ -91,6 +91,6 @@ 
      */
     public static function wpEditorTextAreaSelector($field_reference)
     {
-        return '#content-' . $field_reference . '-content';
+        return '#content-'.$field_reference.'-content';
     }
 }

Indentation +92 added lines, -92 removed lines

@@ -13,96 +13,96 @@
 class CoreAdmin
 {
 
-    /**
-     * @var string
-     */
-    const URL_PREFIX = 'admin.php?page=';
-
-
-    /**
-     * This is the selector for the next page button on list tables.
-     * @var string
-     */
-    const ADMIN_LIST_TABLE_NEXT_PAGE_CLASS = '.next-page';
-
-
-    /**
-     * The selector for the search input submit button on list table pages
-     * @var string
-     */
-    const LIST_TABLE_SEARCH_SUBMIT_SELECTOR = '#search-submit';
-
-
-    /**
-     * Selector for the screen options dropdown.
-     * @var string
-     */
-    const WP_SCREEN_SETTINGS_LINK_SELECTOR = '#show-settings-link';
-
-
-    /**
-     * Selector for the per page field setting selector (found within screen options dropdown)
-     * @var string
-     */
-    const WP_SCREEN_SETTINGS_PER_PAGE_FIELD_SELECTOR = '.screen-per-page';
-
-
-    /**
-     * Selector for apply screen options settings.
-     * @var string
-     */
-    const WP_SCREEN_OPTIONS_APPLY_SETTINGS_BUTTON_SELECTOR = '#screen-options-apply';
-
-
-    /**
-     * Selector for bulk action select field on list tables.
-     */
-    const SELECTOR_LIST_TABLE_BULK_ACTION_FIELD = '#bulk-action-selector-';
-
-
-    /**
-     * Selector for applying a bulk action.
-     */
-    const SELECTOR_LIST_TABLE_BULK_ACTTION_APPLY = '#doaction';
-
-
-    /**
-     * Get the EE admin url for the given properties.
-     * Note, this is JUST the endpoint for the admin route.  It is expected that the actor/test would be calling this
-     * with `amOnAdminPage` action.
-     *
-     * @param string $page
-     * @param string $action
-     * @param string $additional_params
-     * @return string
-     */
-    public static function adminUrl($page = 'espresso_events', $action = 'default', $additional_params = '')
-    {
-        $url = self::URL_PREFIX . $page;
-        $url .= $action ? '&action=' . $action : '';
-        $url .= $additional_params ? '&' . ltrim('&', ltrim('?', $additional_params)) : '';
-        return $url;
-    }
-
-
-    /**
-     * Returns the selector for the text tab switcher for a wp-editor instance.
-     * @param $field_reference
-     * @return string
-     */
-    public static function wpEditorTextTabSelector($field_reference)
-    {
-        return '#content-' . $field_reference . '-content-html';
-    }
-
-
-    /**
-     * Returns the selector for the textarea exposed when clicing the text tab switcher for a wp-editor instance.
-     * @param $field_reference
-     * @return string
-     */
-    public static function wpEditorTextAreaSelector($field_reference)
-    {
-        return '#content-' . $field_reference . '-content';
-    }
+	/**
+	 * @var string
+	 */
+	const URL_PREFIX = 'admin.php?page=';
+
+
+	/**
+	 * This is the selector for the next page button on list tables.
+	 * @var string
+	 */
+	const ADMIN_LIST_TABLE_NEXT_PAGE_CLASS = '.next-page';
+
+
+	/**
+	 * The selector for the search input submit button on list table pages
+	 * @var string
+	 */
+	const LIST_TABLE_SEARCH_SUBMIT_SELECTOR = '#search-submit';
+
+
+	/**
+	 * Selector for the screen options dropdown.
+	 * @var string
+	 */
+	const WP_SCREEN_SETTINGS_LINK_SELECTOR = '#show-settings-link';
+
+
+	/**
+	 * Selector for the per page field setting selector (found within screen options dropdown)
+	 * @var string
+	 */
+	const WP_SCREEN_SETTINGS_PER_PAGE_FIELD_SELECTOR = '.screen-per-page';
+
+
+	/**
+	 * Selector for apply screen options settings.
+	 * @var string
+	 */
+	const WP_SCREEN_OPTIONS_APPLY_SETTINGS_BUTTON_SELECTOR = '#screen-options-apply';
+
+
+	/**
+	 * Selector for bulk action select field on list tables.
+	 */
+	const SELECTOR_LIST_TABLE_BULK_ACTION_FIELD = '#bulk-action-selector-';
+
+
+	/**
+	 * Selector for applying a bulk action.
+	 */
+	const SELECTOR_LIST_TABLE_BULK_ACTTION_APPLY = '#doaction';
+
+
+	/**
+	 * Get the EE admin url for the given properties.
+	 * Note, this is JUST the endpoint for the admin route.  It is expected that the actor/test would be calling this
+	 * with `amOnAdminPage` action.
+	 *
+	 * @param string $page
+	 * @param string $action
+	 * @param string $additional_params
+	 * @return string
+	 */
+	public static function adminUrl($page = 'espresso_events', $action = 'default', $additional_params = '')
+	{
+		$url = self::URL_PREFIX . $page;
+		$url .= $action ? '&action=' . $action : '';
+		$url .= $additional_params ? '&' . ltrim('&', ltrim('?', $additional_params)) : '';
+		return $url;
+	}
+
+
+	/**
+	 * Returns the selector for the text tab switcher for a wp-editor instance.
+	 * @param $field_reference
+	 * @return string
+	 */
+	public static function wpEditorTextTabSelector($field_reference)
+	{
+		return '#content-' . $field_reference . '-content-html';
+	}
+
+
+	/**
+	 * Returns the selector for the textarea exposed when clicing the text tab switcher for a wp-editor instance.
+	 * @param $field_reference
+	 * @return string
+	 */
+	public static function wpEditorTextAreaSelector($field_reference)
+	{
+		return '#content-' . $field_reference . '-content';
+	}
 }

core/libraries/form_sections/strategies/layout/EE_Two_Column_Layout.strategy.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
             $this->_form_section->html_id(),
             $this->_form_section->html_class(),
             $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
+        ).EEH_HTML::tbody();
     }
 
 
@@ -31,7 +31,7 @@ 
      */
     public function layout_form_end($additional_args = array())
     {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+        return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
     }
 
 
@@ -50,11 +50,11 @@ 
         } else {
             $html_for_input = $input->get_html_for_input();
             $html_for_input .= $input->get_html_for_errors() != ''
-                ? EEH_HTML::nl() . $input->get_html_for_errors()
+                ? EEH_HTML::nl().$input->get_html_for_errors()
                 : '';
-            $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+            $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
             $html .= EEH_HTML::tr(
-                EEH_HTML::th($input->get_html_for_label()) .
+                EEH_HTML::th($input->get_html_for_label()).
                 EEH_HTML::td($html_for_input)
             );
         }

Indentation +68 added lines, -68 removed lines

@@ -5,81 +5,81 @@
 class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base
 {
 
-    /**
-     * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_begin($additional_args = array())
-    {
-        return $this->display_form_wide_errors()
-        . EEH_HTML::table(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class(),
-            $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
-    }
+	/**
+	 * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_begin($additional_args = array())
+	{
+		return $this->display_form_wide_errors()
+		. EEH_HTML::table(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class(),
+			$this->_form_section->html_style()
+		) . EEH_HTML::tbody();
+	}
 
 
 
-    /**
-     * Should be used to end the form section (eg a /table tag, or a /div tag, etc)
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_end($additional_args = array())
-    {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
-    }
+	/**
+	 * Should be used to end the form section (eg a /table tag, or a /div tag, etc)
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_end($additional_args = array())
+	{
+		return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+	}
 
 
 
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     */
-    public function layout_input($input)
-    {
-        $html = '';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= $input->get_html_for_input();
-        } else {
-            $html_for_input = $input->get_html_for_input();
-            $html_for_input .= $input->get_html_for_errors() != ''
-                ? EEH_HTML::nl() . $input->get_html_for_errors()
-                : '';
-            $html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
-            $html .= EEH_HTML::tr(
-                EEH_HTML::th($input->get_html_for_label()) .
-                EEH_HTML::td($html_for_input)
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 */
+	public function layout_input($input)
+	{
+		$html = '';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= $input->get_html_for_input();
+		} else {
+			$html_for_input = $input->get_html_for_input();
+			$html_for_input .= $input->get_html_for_errors() != ''
+				? EEH_HTML::nl() . $input->get_html_for_errors()
+				: '';
+			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+			$html .= EEH_HTML::tr(
+				EEH_HTML::th($input->get_html_for_label()) .
+				EEH_HTML::td($html_for_input)
+			);
+		}
+		return $html;
+	}
 
 
 
-    /**
-     * Lays out a row for the subsection. Please note that if you have a subsection which you don't want wrapped in
-     * a tr and td with a colspan=2, you should use a different layout strategy, like EE_No_Layout, EE_Template_Layout,
-     * or EE_Div_Per_Section_Layout, and create subsections using EE_Two_Column_Layout for everywhere you want the
-     * two-column layout, and then other sub-sections can be outside the EE_Two_Column_Layout table.
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-    */
-    public function layout_subsection($form_section)
-    {
-        if ($form_section instanceof EE_Form_Section_Proper
-            || $form_section instanceof EE_Form_Section_HTML
-        ) {
-            return EEH_HTML::no_row($form_section->get_html());
-        }
-        return '';
-    }
+	/**
+	 * Lays out a row for the subsection. Please note that if you have a subsection which you don't want wrapped in
+	 * a tr and td with a colspan=2, you should use a different layout strategy, like EE_No_Layout, EE_Template_Layout,
+	 * or EE_Div_Per_Section_Layout, and create subsections using EE_Two_Column_Layout for everywhere you want the
+	 * two-column layout, and then other sub-sections can be outside the EE_Two_Column_Layout table.
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		if ($form_section instanceof EE_Form_Section_Proper
+			|| $form_section instanceof EE_Form_Section_HTML
+		) {
+			return EEH_HTML::no_row($form_section->get_html());
+		}
+		return '';
+	}
 }

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
      *
      * @abstract
      * @access protected
-     * @return array
+     * @return string[]
      */
     protected function _get_table_filters()
     {
@@ -265,7 +265,7 @@ 
      *    column_TXN_paid
      *
      * @param \EE_Transaction $transaction
-     * @return mixed|string
+     * @return string
      * @throws \EE_Error
      */
     public function column_TXN_paid(EE_Transaction $transaction)

Indentation +658 added lines, -658 removed lines

@@ -15,121 +15,121 @@ 
 class EE_Admin_Transactions_List_Table extends EE_Admin_List_Table
 {
 
-    /**
-     * @var SessionLifespan $session_lifespan
-     */
-    private $session_lifespan;
-
-    private $_status;
-
-
-    /**
-     * @param \Transactions_Admin_Page $admin_page
-     * @param SessionLifespan          $lifespan
-     */
-    public function __construct(\Transactions_Admin_Page $admin_page, SessionLifespan $lifespan)
-    {
-        parent::__construct($admin_page);
-        $this->session_lifespan = $lifespan;
-        $this->_status = $this->_admin_page->get_transaction_status_array();
-    }
-
-
-    /**
-     *_setup_data
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_transactions($this->_per_page);
-        $status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
-        $this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, true, $status);
-    }
-
-
-    /**
-     *_set_properties
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('transaction', 'event_espresso'),
-            'plural'   => __('transactions', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-        $ID_column_name = __('ID', 'event_espresso');
-        $ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
-        $ID_column_name .= __('Transaction Date', 'event_espresso');
-        $ID_column_name .= '</span> ';
-        $this->_columns = array(
-            'TXN_ID'        => $ID_column_name,
-            'TXN_timestamp' => __('Transaction Date', 'event_espresso'),
-            'TXN_total'     => __('Total', 'event_espresso'),
-            'TXN_paid'      => __('Paid', 'event_espresso'),
-            'ATT_fname'     => __('Primary Registrant', 'event_espresso'),
-            'event_name'    => __('Event', 'event_espresso'),
-            'actions'       => __('Actions', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'TXN_ID'        => array('TXN_ID' => false),
-            'event_name'    => array('event_name' => false),
-            'ATT_fname'     => array('ATT_fname' => false),
-            'TXN_timestamp' => array('TXN_timestamp' => true) // true means its already sorted
-        );
-
-        $this->_primary_column = 'TXN_ID';
-
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param  EE_Transaction $transaction the current item
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function _get_row_class($transaction)
-    {
-        $class = parent::_get_row_class($transaction);
-        // add status class
-        $class .= ' ee-status-strip txn-status-' . $transaction->status_ID();
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * _get_table_filters
-     * We use this to assemble and return any filters that are associated with this table that help further refine what
-     * get's shown in the table.
-     *
-     * @abstract
-     * @access protected
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-        $start_date = isset($this->_req_data['txn-filter-start-date'])
-            ? wp_strip_all_tags($this->_req_data['txn-filter-start-date'])
-            : date(
-                'm/d/Y',
-                strtotime('-10 year')
-            );
-        $end_date = isset($this->_req_data['txn-filter-end-date'])
-            ? wp_strip_all_tags($this->_req_data['txn-filter-end-date'])
-            : date(
-                'm/d/Y',
-                current_time('timestamp')
-            );
-        ob_start();
-        ?>
+	/**
+	 * @var SessionLifespan $session_lifespan
+	 */
+	private $session_lifespan;
+
+	private $_status;
+
+
+	/**
+	 * @param \Transactions_Admin_Page $admin_page
+	 * @param SessionLifespan          $lifespan
+	 */
+	public function __construct(\Transactions_Admin_Page $admin_page, SessionLifespan $lifespan)
+	{
+		parent::__construct($admin_page);
+		$this->session_lifespan = $lifespan;
+		$this->_status = $this->_admin_page->get_transaction_status_array();
+	}
+
+
+	/**
+	 *_setup_data
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, true, $status);
+	}
+
+
+	/**
+	 *_set_properties
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('transaction', 'event_espresso'),
+			'plural'   => __('transactions', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+		$ID_column_name = __('ID', 'event_espresso');
+		$ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
+		$ID_column_name .= __('Transaction Date', 'event_espresso');
+		$ID_column_name .= '</span> ';
+		$this->_columns = array(
+			'TXN_ID'        => $ID_column_name,
+			'TXN_timestamp' => __('Transaction Date', 'event_espresso'),
+			'TXN_total'     => __('Total', 'event_espresso'),
+			'TXN_paid'      => __('Paid', 'event_espresso'),
+			'ATT_fname'     => __('Primary Registrant', 'event_espresso'),
+			'event_name'    => __('Event', 'event_espresso'),
+			'actions'       => __('Actions', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'TXN_ID'        => array('TXN_ID' => false),
+			'event_name'    => array('event_name' => false),
+			'ATT_fname'     => array('ATT_fname' => false),
+			'TXN_timestamp' => array('TXN_timestamp' => true) // true means its already sorted
+		);
+
+		$this->_primary_column = 'TXN_ID';
+
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param  EE_Transaction $transaction the current item
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function _get_row_class($transaction)
+	{
+		$class = parent::_get_row_class($transaction);
+		// add status class
+		$class .= ' ee-status-strip txn-status-' . $transaction->status_ID();
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * _get_table_filters
+	 * We use this to assemble and return any filters that are associated with this table that help further refine what
+	 * get's shown in the table.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+		$start_date = isset($this->_req_data['txn-filter-start-date'])
+			? wp_strip_all_tags($this->_req_data['txn-filter-start-date'])
+			: date(
+				'm/d/Y',
+				strtotime('-10 year')
+			);
+		$end_date = isset($this->_req_data['txn-filter-end-date'])
+			? wp_strip_all_tags($this->_req_data['txn-filter-end-date'])
+			: date(
+				'm/d/Y',
+				current_time('timestamp')
+			);
+		ob_start();
+		?>
         <label for="txn-filter-start-date">Display Transactions from </label>
         <input id="txn-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>"
                name="txn-filter-start-date" size="15"/>
@@ -137,578 +137,578 @@ 
         <input id="txn-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>"
                name="txn-filter-end-date" size="15"/>
         <?php
-        $filters[] = ob_get_contents();
-        ob_end_clean();
-        return $filters;
-    }
-
-
-    /**
-     *_add_view_counts
-     */
-    protected function _add_view_counts()
-    {
-        foreach ($this->_views as $view) {
-            $this->_views[ $view['slug'] ]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
-        }
-    }
-
-
-    /**
-     *    column TXN_ID
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_TXN_ID(EE_Transaction $transaction)
-    {
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ),
-            TXN_ADMIN_URL
-        );
-        $content = '<a href="' . $view_lnk_url . '"'
-                   . ' title="' . esc_attr__('Go to Transaction Details', 'event_espresso') . '">'
-                   . $transaction->ID()
-                   . '</a>';
-
-        // txn timestamp
-        $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp($transaction) . '</span>';
-        return $content;
-    }
-
-
-    /**
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _get_txn_timestamp(EE_Transaction $transaction)
-    {
-        // is TXN less than 2 hours old ?
-        if (($transaction->failed() || $transaction->is_abandoned())
-            && $this->session_lifespan->expiration() < $transaction->datetime(false, true)
-        ) {
-            $timestamp = esc_html__('TXN in progress...', 'event_espresso');
-        } else {
-            $timestamp = $transaction->get_i18n_datetime('TXN_timestamp');
-        }
-        return $timestamp;
-    }
-
-
-    /**
-     *    column_cb
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_cb($transaction)
-    {
-        return sprintf(
-            '<input type="checkbox" name="%1$s[]" value="%2$s" />',
-            $this->_wp_list_args['singular'],
-            $transaction->ID()
-        );
-    }
-
-
-    /**
-     *    column_TXN_timestamp
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_TXN_timestamp(EE_Transaction $transaction)
-    {
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ),
-            TXN_ADMIN_URL
-        );
-        $txn_date = '<a href="' . $view_lnk_url . '"'
-                    . ' title="'
-                    . esc_attr__('View Transaction Details for TXN #', 'event_espresso') . $transaction->ID() . '">'
-                    . $this->_get_txn_timestamp($transaction)
-                    . '</a>';
-        // status
-        $txn_date .= '<br><span class="ee-status-text-small">'
-                    . EEH_Template::pretty_status(
-                        $transaction->status_ID(),
-                        false,
-                        'sentence'
-                    )
-                     . '</span>';
-        return $txn_date;
-    }
-
-
-    /**
-     *    column_TXN_total
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_TXN_total(EE_Transaction $transaction)
-    {
-        if ($transaction->get('TXN_total') > 0) {
-            return '<span class="txn-pad-rght">'
-                   . apply_filters(
-                       'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total',
-                       $transaction->get_pretty('TXN_total'),
-                       $transaction
-                   )
-                   . '</span>';
-        } else {
-            return '<span class="txn-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
-        }
-    }
-
-
-    /**
-     *    column_TXN_paid
-     *
-     * @param \EE_Transaction $transaction
-     * @return mixed|string
-     * @throws \EE_Error
-     */
-    public function column_TXN_paid(EE_Transaction $transaction)
-    {
-        $transaction_total = $transaction->get('TXN_total');
-        $transaction_paid = $transaction->get('TXN_paid');
-
-        if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
-            // monies owing
-            $span_class = 'txn-overview-part-payment-spn';
-            if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
-                // paid in full
-                $span_class = 'txn-overview-full-payment-spn';
-            } elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
-                // no payments made
-                $span_class = 'txn-overview-no-payment-spn';
-            }
-        } else {
-            // transaction_total == 0 so this is a free event
-            $span_class = 'txn-overview-free-event-spn';
-        }
-
-        $payment_method = $transaction->payment_method();
-        $payment_method_name = $payment_method instanceof EE_Payment_Method
-            ? $payment_method->admin_name()
-            : esc_html__('Unknown', 'event_espresso');
-
-        $content = '<span class="' . $span_class . ' txn-pad-rght">'
-                   . $transaction->get_pretty('TXN_paid')
-                   . '</span>';
-        if ($transaction_paid > 0) {
-            $content .= '<br><span class="ee-status-text-small">'
-                        . sprintf(
-                            esc_html__('...via %s', 'event_espresso'),
-                            $payment_method_name
-                        )
-                        . '</span>';
-        }
-        return $content;
-    }
-
-
-    /**
-     *    column_ATT_fname
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_ATT_fname(EE_Transaction $transaction)
-    {
-        $primary_reg = $transaction->primary_registration();
-        $attendee = $primary_reg->get_first_related('Attendee');
-        if ($attendee instanceof EE_Attendee) {
-            $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action'  => 'view_registration',
-                    '_REG_ID' => $primary_reg->ID(),
-                ),
-                REG_ADMIN_URL
-            );
-            $content = EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_registration',
-                'espresso_registrations_view_registration',
-                $primary_reg->ID()
-            )
-                ? '<a href="' . $edit_lnk_url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '">'
-                  . $attendee->full_name()
-                  . '</a>'
-                : $attendee->full_name();
-            $content .= '<br>' . $attendee->email();
-            return $content;
-        }
-        return $transaction->failed() || $transaction->is_abandoned()
-            ? esc_html__('no contact record.', 'event_espresso')
-            : esc_html__(
-                'No contact record, because the transaction was abandoned or the registration process failed.',
-                'event_espresso'
-            );
-    }
-
-
-    /**
-     *    column_ATT_email
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_ATT_email(EE_Transaction $transaction)
-    {
-        $attendee = $transaction->primary_registration()->get_first_related('Attendee');
-        if (! empty($attendee)) {
-            return '<a href="mailto:' . $attendee->get('ATT_email') . '">'
-                   . $attendee->get('ATT_email')
-                   . '</a>';
-        } else {
-            return $transaction->failed() || $transaction->is_abandoned()
-                ? esc_html__('no contact record.', 'event_espresso')
-                : esc_html__(
-                    'No contact record, because the transaction was abandoned or the registration process failed.',
-                    'event_espresso'
-                );
-        }
-    }
-
-
-    /**
-     *    column_event_name
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_event_name(EE_Transaction $transaction)
-    {
-        $actions = array();
-        $event = $transaction->primary_registration()->get_first_related('Event');
-        if (! empty($event)) {
-            $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
-                array('action' => 'edit', 'post' => $event->ID()),
-                EVENTS_ADMIN_URL
-            );
-            $event_name = $event->get('EVT_name');
-
-            // filter this view by transactions for this event
-            $txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'default',
-                    'EVT_ID' => $event->ID(),
-                )
-            );
-            if (empty($this->_req_data['EVT_ID'])
-                && EE_Registry::instance()->CAP->current_user_can(
-                    'ee_edit_event',
-                    'espresso_events_edit',
-                    $event->ID()
-                )
-            ) {
-                $actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '"'
-                                              . ' title="' . esc_attr__(
-                                                  'Filter transactions by this event',
-                                                  'event_espresso'
-                                              ) . '">'
-                                              . esc_html__('View Transactions for this event', 'event_espresso')
-                                              . '</a>';
-            }
-
-            return sprintf(
-                '%1$s %2$s',
-                EE_Registry::instance()->CAP->current_user_can(
-                    'ee_edit_event',
-                    'espresso_events_edit',
-                    $event->ID()
-                )
-                    ? '<a href="' . $edit_event_url . '"'
-                      . ' title="'
-                      . sprintf(
-                          esc_attr__('Edit Event: %s', 'event_espresso'),
-                          $event->get('EVT_name')
-                      )
-                      . '">'
-                      . wp_trim_words(
-                          $event_name,
-                          30,
-                          '...'
-                      )
-                      . '</a>'
-                    : wp_trim_words($event_name, 30, '...'),
-                $this->row_actions($actions)
-            );
-        } else {
-            return esc_html__(
-                'The event associated with this transaction via the primary registration cannot be retrieved.',
-                'event_espresso'
-            );
-        }
-    }
-
-
-    /**
-     *    column_actions
-     *
-     * @param \EE_Transaction $transaction
-     * @return string
-     * @throws \EE_Error
-     */
-    public function column_actions(EE_Transaction $transaction)
-    {
-        return $this->_action_string(
-            $this->get_transaction_details_link($transaction)
-            . $this->get_invoice_link($transaction)
-            . $this->get_receipt_link($transaction)
-            . $this->get_primary_registration_details_link($transaction)
-            . $this->get_send_payment_reminder_trigger_link($transaction)
-            . $this->get_payment_overview_link($transaction)
-            . $this->get_related_messages_link($transaction),
-            $transaction,
-            'ul',
-            'txn-overview-actions-ul'
-        );
-    }
-
-
-    /**
-     * Get the transaction details link.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_transaction_details_link(EE_Transaction $transaction)
-    {
-        $url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ),
-            TXN_ADMIN_URL
-        );
-        return '
+		$filters[] = ob_get_contents();
+		ob_end_clean();
+		return $filters;
+	}
+
+
+	/**
+	 *_add_view_counts
+	 */
+	protected function _add_view_counts()
+	{
+		foreach ($this->_views as $view) {
+			$this->_views[ $view['slug'] ]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
+		}
+	}
+
+
+	/**
+	 *    column TXN_ID
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_ID(EE_Transaction $transaction)
+	{
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			),
+			TXN_ADMIN_URL
+		);
+		$content = '<a href="' . $view_lnk_url . '"'
+				   . ' title="' . esc_attr__('Go to Transaction Details', 'event_espresso') . '">'
+				   . $transaction->ID()
+				   . '</a>';
+
+		// txn timestamp
+		$content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp($transaction) . '</span>';
+		return $content;
+	}
+
+
+	/**
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _get_txn_timestamp(EE_Transaction $transaction)
+	{
+		// is TXN less than 2 hours old ?
+		if (($transaction->failed() || $transaction->is_abandoned())
+			&& $this->session_lifespan->expiration() < $transaction->datetime(false, true)
+		) {
+			$timestamp = esc_html__('TXN in progress...', 'event_espresso');
+		} else {
+			$timestamp = $transaction->get_i18n_datetime('TXN_timestamp');
+		}
+		return $timestamp;
+	}
+
+
+	/**
+	 *    column_cb
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_cb($transaction)
+	{
+		return sprintf(
+			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
+			$this->_wp_list_args['singular'],
+			$transaction->ID()
+		);
+	}
+
+
+	/**
+	 *    column_TXN_timestamp
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_timestamp(EE_Transaction $transaction)
+	{
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			),
+			TXN_ADMIN_URL
+		);
+		$txn_date = '<a href="' . $view_lnk_url . '"'
+					. ' title="'
+					. esc_attr__('View Transaction Details for TXN #', 'event_espresso') . $transaction->ID() . '">'
+					. $this->_get_txn_timestamp($transaction)
+					. '</a>';
+		// status
+		$txn_date .= '<br><span class="ee-status-text-small">'
+					. EEH_Template::pretty_status(
+						$transaction->status_ID(),
+						false,
+						'sentence'
+					)
+					 . '</span>';
+		return $txn_date;
+	}
+
+
+	/**
+	 *    column_TXN_total
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_total(EE_Transaction $transaction)
+	{
+		if ($transaction->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'
+				   . apply_filters(
+					   'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total',
+					   $transaction->get_pretty('TXN_total'),
+					   $transaction
+				   )
+				   . '</span>';
+		} else {
+			return '<span class="txn-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+		}
+	}
+
+
+	/**
+	 *    column_TXN_paid
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return mixed|string
+	 * @throws \EE_Error
+	 */
+	public function column_TXN_paid(EE_Transaction $transaction)
+	{
+		$transaction_total = $transaction->get('TXN_total');
+		$transaction_paid = $transaction->get('TXN_paid');
+
+		if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
+			// monies owing
+			$span_class = 'txn-overview-part-payment-spn';
+			if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
+				// paid in full
+				$span_class = 'txn-overview-full-payment-spn';
+			} elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
+				// no payments made
+				$span_class = 'txn-overview-no-payment-spn';
+			}
+		} else {
+			// transaction_total == 0 so this is a free event
+			$span_class = 'txn-overview-free-event-spn';
+		}
+
+		$payment_method = $transaction->payment_method();
+		$payment_method_name = $payment_method instanceof EE_Payment_Method
+			? $payment_method->admin_name()
+			: esc_html__('Unknown', 'event_espresso');
+
+		$content = '<span class="' . $span_class . ' txn-pad-rght">'
+				   . $transaction->get_pretty('TXN_paid')
+				   . '</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'
+						. sprintf(
+							esc_html__('...via %s', 'event_espresso'),
+							$payment_method_name
+						)
+						. '</span>';
+		}
+		return $content;
+	}
+
+
+	/**
+	 *    column_ATT_fname
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_ATT_fname(EE_Transaction $transaction)
+	{
+		$primary_reg = $transaction->primary_registration();
+		$attendee = $primary_reg->get_first_related('Attendee');
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action'  => 'view_registration',
+					'_REG_ID' => $primary_reg->ID(),
+				),
+				REG_ADMIN_URL
+			);
+			$content = EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_registration',
+				'espresso_registrations_view_registration',
+				$primary_reg->ID()
+			)
+				? '<a href="' . $edit_lnk_url . '"'
+				  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '">'
+				  . $attendee->full_name()
+				  . '</a>'
+				: $attendee->full_name();
+			$content .= '<br>' . $attendee->email();
+			return $content;
+		}
+		return $transaction->failed() || $transaction->is_abandoned()
+			? esc_html__('no contact record.', 'event_espresso')
+			: esc_html__(
+				'No contact record, because the transaction was abandoned or the registration process failed.',
+				'event_espresso'
+			);
+	}
+
+
+	/**
+	 *    column_ATT_email
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_ATT_email(EE_Transaction $transaction)
+	{
+		$attendee = $transaction->primary_registration()->get_first_related('Attendee');
+		if (! empty($attendee)) {
+			return '<a href="mailto:' . $attendee->get('ATT_email') . '">'
+				   . $attendee->get('ATT_email')
+				   . '</a>';
+		} else {
+			return $transaction->failed() || $transaction->is_abandoned()
+				? esc_html__('no contact record.', 'event_espresso')
+				: esc_html__(
+					'No contact record, because the transaction was abandoned or the registration process failed.',
+					'event_espresso'
+				);
+		}
+	}
+
+
+	/**
+	 *    column_event_name
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_event_name(EE_Transaction $transaction)
+	{
+		$actions = array();
+		$event = $transaction->primary_registration()->get_first_related('Event');
+		if (! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
+				array('action' => 'edit', 'post' => $event->ID()),
+				EVENTS_ADMIN_URL
+			);
+			$event_name = $event->get('EVT_name');
+
+			// filter this view by transactions for this event
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'default',
+					'EVT_ID' => $event->ID(),
+				)
+			);
+			if (empty($this->_req_data['EVT_ID'])
+				&& EE_Registry::instance()->CAP->current_user_can(
+					'ee_edit_event',
+					'espresso_events_edit',
+					$event->ID()
+				)
+			) {
+				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '"'
+											  . ' title="' . esc_attr__(
+												  'Filter transactions by this event',
+												  'event_espresso'
+											  ) . '">'
+											  . esc_html__('View Transactions for this event', 'event_espresso')
+											  . '</a>';
+			}
+
+			return sprintf(
+				'%1$s %2$s',
+				EE_Registry::instance()->CAP->current_user_can(
+					'ee_edit_event',
+					'espresso_events_edit',
+					$event->ID()
+				)
+					? '<a href="' . $edit_event_url . '"'
+					  . ' title="'
+					  . sprintf(
+						  esc_attr__('Edit Event: %s', 'event_espresso'),
+						  $event->get('EVT_name')
+					  )
+					  . '">'
+					  . wp_trim_words(
+						  $event_name,
+						  30,
+						  '...'
+					  )
+					  . '</a>'
+					: wp_trim_words($event_name, 30, '...'),
+				$this->row_actions($actions)
+			);
+		} else {
+			return esc_html__(
+				'The event associated with this transaction via the primary registration cannot be retrieved.',
+				'event_espresso'
+			);
+		}
+	}
+
+
+	/**
+	 *    column_actions
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function column_actions(EE_Transaction $transaction)
+	{
+		return $this->_action_string(
+			$this->get_transaction_details_link($transaction)
+			. $this->get_invoice_link($transaction)
+			. $this->get_receipt_link($transaction)
+			. $this->get_primary_registration_details_link($transaction)
+			. $this->get_send_payment_reminder_trigger_link($transaction)
+			. $this->get_payment_overview_link($transaction)
+			. $this->get_related_messages_link($transaction),
+			$transaction,
+			'ul',
+			'txn-overview-actions-ul'
+		);
+	}
+
+
+	/**
+	 * Get the transaction details link.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_transaction_details_link(EE_Transaction $transaction)
+	{
+		$url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			),
+			TXN_ADMIN_URL
+		);
+		return '
 			<li>
 				<a href="' . $url . '"'
-               . ' title="' . esc_attr__('View Transaction Details', 'event_espresso') . '" class="tiny-text">
+			   . ' title="' . esc_attr__('View Transaction Details', 'event_espresso') . '" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
-    }
-
-
-    /**
-     * Get the invoice link for the given registration.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_invoice_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration) {
-            $url = $registration->invoice_url();
-            // only show invoice link if message type is active.
-            if ($registration->attendee() instanceof EE_Attendee
-                && EEH_MSG_Template::is_mt_active('invoice')
-            ) {
-                return '
+	}
+
+
+	/**
+	 * Get the invoice link for the given registration.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_invoice_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration) {
+			$url = $registration->invoice_url();
+			// only show invoice link if message type is active.
+			if ($registration->attendee() instanceof EE_Attendee
+				&& EEH_MSG_Template::is_mt_active('invoice')
+			) {
+				return '
                 <li>
                     <a title="' . esc_attr__('View Transaction Invoice', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+					   . ' target="_blank" href="' . $url . '" class="tiny-text">
                         <span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
                     </a>
                 </li>';
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * Get the receipt link for the transaction.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_receipt_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration) {
-            $url = $registration->receipt_url();
-            // only show receipt link if message type is active.
-            if ($registration->attendee() instanceof EE_Attendee
-                && EEH_MSG_Template::is_mt_active('receipt')) {
-                return '
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get the receipt link for the transaction.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_receipt_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration) {
+			$url = $registration->receipt_url();
+			// only show receipt link if message type is active.
+			if ($registration->attendee() instanceof EE_Attendee
+				&& EEH_MSG_Template::is_mt_active('receipt')) {
+				return '
 			<li>
 				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+					   . ' target="_blank" href="' . $url . '" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * Get the link to view the details for the primary registration.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function get_primary_registration_details_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration) {
-            $url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action'  => 'view_registration',
-                    '_REG_ID' => $registration->ID(),
-                ),
-                REG_ADMIN_URL
-            );
-            return EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_registration',
-                'espresso_registrations_view_registration',
-                $registration->ID()
-            )
-                ? '
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get the link to view the details for the primary registration.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function get_primary_registration_details_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration) {
+			$url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action'  => 'view_registration',
+					'_REG_ID' => $registration->ID(),
+				),
+				REG_ADMIN_URL
+			);
+			return EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_registration',
+				'espresso_registrations_view_registration',
+				$registration->ID()
+			)
+				? '
 				<li>
 					<a href="' . $url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '" class="tiny-text">
+				  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
-                : '';
-        }
-        return '';
-    }
-
-
-    /**
-     * Get send payment reminder trigger link
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function get_send_payment_reminder_trigger_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration
-            && $registration->attendee() instanceof EE_Attendee
-            && EEH_MSG_Template::is_mt_active('payment_reminder')
-            && ! in_array(
-                $transaction->status_ID(),
-                array(EEM_Transaction::complete_status_code, EEM_Transaction::overpaid_status_code),
-                true
-            )
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_send_message',
-                'espresso_transactions_send_payment_reminder'
-            )
-        ) {
-            $url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'send_payment_reminder',
-                    'TXN_ID' => $transaction->ID(),
-                ),
-                TXN_ADMIN_URL
-            );
-            return '
+				: '';
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get send payment reminder trigger link
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function get_send_payment_reminder_trigger_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration
+			&& $registration->attendee() instanceof EE_Attendee
+			&& EEH_MSG_Template::is_mt_active('payment_reminder')
+			&& ! in_array(
+				$transaction->status_ID(),
+				array(EEM_Transaction::complete_status_code, EEM_Transaction::overpaid_status_code),
+				true
+			)
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_send_message',
+				'espresso_transactions_send_payment_reminder'
+			)
+		) {
+			$url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'send_payment_reminder',
+					'TXN_ID' => $transaction->ID(),
+				),
+				TXN_ADMIN_URL
+			);
+			return '
             <li>
                 <a href="' . $url . '"'
-                   . ' title="' . esc_attr__('Send Payment Reminder', 'event_espresso') . '" class="tiny-text">
+				   . ' title="' . esc_attr__('Send Payment Reminder', 'event_espresso') . '" class="tiny-text">
                     <span class="dashicons dashicons-email-alt"></span>
                 </a>
             </li>';
-        }
-        return '';
-    }
-
-
-    /**
-     * Get link to filtered view in the message activity list table of messages for this transaction.
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function get_related_messages_link(EE_Transaction $transaction)
-    {
-        $url = EEH_MSG_Template::get_message_action_link(
-            'see_notifications_for',
-            null,
-            array('TXN_ID' => $transaction->ID())
-        );
-        return EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_global_messages',
-            'view_filtered_messages'
-        )
-            ? '<li>' . $url . '</li>'
-            : '';
-    }
-
-
-    /**
-     * Return the link to make a payment on the frontend
-     *
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     */
-    protected function get_payment_overview_link(EE_Transaction $transaction)
-    {
-        $registration = $transaction->primary_registration();
-        if ($registration instanceof EE_Registration
-            && $transaction->status_ID() !== EEM_Transaction::complete_status_code
-            && $registration->owes_monies_and_can_pay()
-        ) {
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * Get link to filtered view in the message activity list table of messages for this transaction.
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function get_related_messages_link(EE_Transaction $transaction)
+	{
+		$url = EEH_MSG_Template::get_message_action_link(
+			'see_notifications_for',
+			null,
+			array('TXN_ID' => $transaction->ID())
+		);
+		return EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_global_messages',
+			'view_filtered_messages'
+		)
+			? '<li>' . $url . '</li>'
+			: '';
+	}
+
+
+	/**
+	 * Return the link to make a payment on the frontend
+	 *
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function get_payment_overview_link(EE_Transaction $transaction)
+	{
+		$registration = $transaction->primary_registration();
+		if ($registration instanceof EE_Registration
+			&& $transaction->status_ID() !== EEM_Transaction::complete_status_code
+			&& $registration->owes_monies_and_can_pay()
+		) {
+			return '
             <li>
                 <a title="' . esc_attr__('Make Payment from the Frontend.', 'event_espresso') . '"'
-                   . ' target="_blank" href="' . $registration->payment_overview_url(true) . '"'
-                   . ' class="tiny-text">
+				   . ' target="_blank" href="' . $registration->payment_overview_url(true) . '"'
+				   . ' class="tiny-text">
                     <span class="dashicons dashicons-money ee-icon-size-18"></span>
                 </a>
             </li>
             ';
-        }
-        return '';
-    }
+		}
+		return '';
+	}
 }

Spacing +32 added lines, -32 removed lines

@@ -96,7 +96,7 @@ 
     {
         $class = parent::_get_row_class($transaction);
         // add status class
-        $class .= ' ee-status-strip txn-status-' . $transaction->status_ID();
+        $class .= ' ee-status-strip txn-status-'.$transaction->status_ID();
         if ($this->_has_checkbox_column) {
             $class .= ' has-checkbox-column';
         }
@@ -149,7 +149,7 @@ 
     protected function _add_view_counts()
     {
         foreach ($this->_views as $view) {
-            $this->_views[ $view['slug'] ]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
+            $this->_views[$view['slug']]['count'] = $this->_admin_page->get_transactions($this->_per_page, true, $view['slug']);
         }
     }
 
@@ -170,13 +170,13 @@ 
             ),
             TXN_ADMIN_URL
         );
-        $content = '<a href="' . $view_lnk_url . '"'
-                   . ' title="' . esc_attr__('Go to Transaction Details', 'event_espresso') . '">'
+        $content = '<a href="'.$view_lnk_url.'"'
+                   . ' title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'
                    . $transaction->ID()
                    . '</a>';
 
         // txn timestamp
-        $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp($transaction) . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($transaction).'</span>';
         return $content;
     }
 
@@ -236,9 +236,9 @@ 
             ),
             TXN_ADMIN_URL
         );
-        $txn_date = '<a href="' . $view_lnk_url . '"'
+        $txn_date = '<a href="'.$view_lnk_url.'"'
                     . ' title="'
-                    . esc_attr__('View Transaction Details for TXN #', 'event_espresso') . $transaction->ID() . '">'
+                    . esc_attr__('View Transaction Details for TXN #', 'event_espresso').$transaction->ID().'">'
                     . $this->_get_txn_timestamp($transaction)
                     . '</a>';
         // status
@@ -271,7 +271,7 @@ 
                    )
                    . '</span>';
         } else {
-            return '<span class="txn-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+            return '<span class="txn-overview-free-event-spn">'.esc_html__('free', 'event_espresso').'</span>';
         }
     }
 
@@ -308,7 +308,7 @@ 
             ? $payment_method->admin_name()
             : esc_html__('Unknown', 'event_espresso');
 
-        $content = '<span class="' . $span_class . ' txn-pad-rght">'
+        $content = '<span class="'.$span_class.' txn-pad-rght">'
                    . $transaction->get_pretty('TXN_paid')
                    . '</span>';
         if ($transaction_paid > 0) {
@@ -350,12 +350,12 @@ 
                 'espresso_registrations_view_registration',
                 $primary_reg->ID()
             )
-                ? '<a href="' . $edit_lnk_url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '">'
+                ? '<a href="'.$edit_lnk_url.'"'
+                  . ' title="'.esc_attr__('View Registration Details', 'event_espresso').'">'
                   . $attendee->full_name()
                   . '</a>'
                 : $attendee->full_name();
-            $content .= '<br>' . $attendee->email();
+            $content .= '<br>'.$attendee->email();
             return $content;
         }
         return $transaction->failed() || $transaction->is_abandoned()
@@ -377,8 +377,8 @@ 
     public function column_ATT_email(EE_Transaction $transaction)
     {
         $attendee = $transaction->primary_registration()->get_first_related('Attendee');
-        if (! empty($attendee)) {
-            return '<a href="mailto:' . $attendee->get('ATT_email') . '">'
+        if ( ! empty($attendee)) {
+            return '<a href="mailto:'.$attendee->get('ATT_email').'">'
                    . $attendee->get('ATT_email')
                    . '</a>';
         } else {
@@ -406,7 +406,7 @@ 
     {
         $actions = array();
         $event = $transaction->primary_registration()->get_first_related('Event');
-        if (! empty($event)) {
+        if ( ! empty($event)) {
             $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
                 array('action' => 'edit', 'post' => $event->ID()),
                 EVENTS_ADMIN_URL
@@ -427,11 +427,11 @@ 
                     $event->ID()
                 )
             ) {
-                $actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '"'
-                                              . ' title="' . esc_attr__(
+                $actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'"'
+                                              . ' title="'.esc_attr__(
                                                   'Filter transactions by this event',
                                                   'event_espresso'
-                                              ) . '">'
+                                              ).'">'
                                               . esc_html__('View Transactions for this event', 'event_espresso')
                                               . '</a>';
             }
@@ -443,7 +443,7 @@ 
                     'espresso_events_edit',
                     $event->ID()
                 )
-                    ? '<a href="' . $edit_event_url . '"'
+                    ? '<a href="'.$edit_event_url.'"'
                       . ' title="'
                       . sprintf(
                           esc_attr__('Edit Event: %s', 'event_espresso'),
@@ -510,8 +510,8 @@ 
         );
         return '
 			<li>
-				<a href="' . $url . '"'
-               . ' title="' . esc_attr__('View Transaction Details', 'event_espresso') . '" class="tiny-text">
+				<a href="' . $url.'"'
+               . ' title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
@@ -536,8 +536,8 @@ 
             ) {
                 return '
                 <li>
-                    <a title="' . esc_attr__('View Transaction Invoice', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+                    <a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'"'
+                       . ' target="_blank" href="'.$url.'" class="tiny-text">
                         <span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
                     </a>
                 </li>';
@@ -564,8 +564,8 @@ 
                 && EEH_MSG_Template::is_mt_active('receipt')) {
                 return '
 			<li>
-				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso') . '"'
-                       . ' target="_blank" href="' . $url . '" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'"'
+                       . ' target="_blank" href="'.$url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
@@ -603,8 +603,8 @@ 
             )
                 ? '
 				<li>
-					<a href="' . $url . '"'
-                  . ' title="' . esc_attr__('View Registration Details', 'event_espresso') . '" class="tiny-text">
+					<a href="' . $url.'"'
+                  . ' title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
@@ -649,8 +649,8 @@ 
             );
             return '
             <li>
-                <a href="' . $url . '"'
-                   . ' title="' . esc_attr__('Send Payment Reminder', 'event_espresso') . '" class="tiny-text">
+                <a href="' . $url.'"'
+                   . ' title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
                     <span class="dashicons dashicons-email-alt"></span>
                 </a>
             </li>';
@@ -680,7 +680,7 @@ 
             'ee_read_global_messages',
             'view_filtered_messages'
         )
-            ? '<li>' . $url . '</li>'
+            ? '<li>'.$url.'</li>'
             : '';
     }
 
@@ -701,8 +701,8 @@ 
         ) {
             return '
             <li>
-                <a title="' . esc_attr__('Make Payment from the Frontend.', 'event_espresso') . '"'
-                   . ' target="_blank" href="' . $registration->payment_overview_url(true) . '"'
+                <a title="' . esc_attr__('Make Payment from the Frontend.', 'event_espresso').'"'
+                   . ' target="_blank" href="'.$registration->payment_overview_url(true).'"'
                    . ' class="tiny-text">
                     <span class="dashicons dashicons-money ee-icon-size-18"></span>
                 </a>

acceptance_tests/Helpers/CountrySettingsAdmin.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace EventEspresso\Codeception\helpers;
 
-use Page\CoreAdmin;
 use Page\CountrySettingsAdmin as CountrySettings;
 
 trait CountrySettingsAdmin

Indentation +47 added lines, -47 removed lines

@@ -6,59 +6,59 @@
 
 trait CountrySettingsAdmin
 {
-    /**
-     * Instructs the actor to browse to the country settings page.
-     * Assumes the actor is already logged in.
-     * @param string $additional_params
-     */
-    public function amOnCountrySettingsAdminPage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(CountrySettings::url($additional_params));
-    }
+	/**
+	 * Instructs the actor to browse to the country settings page.
+	 * Assumes the actor is already logged in.
+	 * @param string $additional_params
+	 */
+	public function amOnCountrySettingsAdminPage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(CountrySettings::url($additional_params));
+	}
 
 
-    /**
-     * Instructs the actor to select the given decimal places radio option.
-     * Assumes the actor is already on the country settings page.
-     * @param string $decimal_places
-     * @param string $country_code
-     */
-    public function setCurrencyDecimalPlacesTo($decimal_places = '2', $country_code = 'US')
-    {
-        $this->actor()->click(CountrySettings::currencyDecimalPlacesRadioField($decimal_places, $country_code));
-    }
+	/**
+	 * Instructs the actor to select the given decimal places radio option.
+	 * Assumes the actor is already on the country settings page.
+	 * @param string $decimal_places
+	 * @param string $country_code
+	 */
+	public function setCurrencyDecimalPlacesTo($decimal_places = '2', $country_code = 'US')
+	{
+		$this->actor()->click(CountrySettings::currencyDecimalPlacesRadioField($decimal_places, $country_code));
+	}
 
 
-    /**
-     * Instructs the actor to select the given decimal mark radio option.
-     * Assumes the actor is already on the country settings page.
-     * @param string $decimal_mark
-     */
-    public function setCurrencyDecimalMarkTo($decimal_mark = '.')
-    {
-        $this->actor()->click(CountrySettings::currencyDecimalMarkRadioField($decimal_mark));
-    }
+	/**
+	 * Instructs the actor to select the given decimal mark radio option.
+	 * Assumes the actor is already on the country settings page.
+	 * @param string $decimal_mark
+	 */
+	public function setCurrencyDecimalMarkTo($decimal_mark = '.')
+	{
+		$this->actor()->click(CountrySettings::currencyDecimalMarkRadioField($decimal_mark));
+	}
 
 
-    /**
-     * Instructs the actor to select the given thousands separator radio option.
-     * Assumes the actor is already on the country settings page.
-     * @param string $thousands_seperator
-     */
-    public function setCurrencyThousandsSeparatorTo($thousands_seperator = ',')
-    {
-        $this->actor()->click(CountrySettings::currencyThousandsSeparatorField($thousands_seperator));
-    }
+	/**
+	 * Instructs the actor to select the given thousands separator radio option.
+	 * Assumes the actor is already on the country settings page.
+	 * @param string $thousands_seperator
+	 */
+	public function setCurrencyThousandsSeparatorTo($thousands_seperator = ',')
+	{
+		$this->actor()->click(CountrySettings::currencyThousandsSeparatorField($thousands_seperator));
+	}
 
 
-    /**
-     * Clicks the country settings submit button.
-     * Assumes the actor is on the country settings admin page.
-     */
-    public function saveCountrySettings()
-    {
-        $this->actor()->click(CountrySettings::COUNTRY_SETTINGS_SAVE_BUTTON);
-        //no indicator on the page when stuff has been updated so just give a bit of time for it to finish.
-        $this->actor()->wait(10);
-    }
+	/**
+	 * Clicks the country settings submit button.
+	 * Assumes the actor is on the country settings admin page.
+	 */
+	public function saveCountrySettings()
+	{
+		$this->actor()->click(CountrySettings::COUNTRY_SETTINGS_SAVE_BUTTON);
+		//no indicator on the page when stuff has been updated so just give a bit of time for it to finish.
+		$this->actor()->wait(10);
+	}
 }
\ No newline at end of file

acceptance_tests/Page/CountrySettingsAdmin.php

Indentation +38 added lines, -38 removed lines

@@ -14,51 +14,51 @@
 {
 
 
-    const COUNTRY_SETTINGS_SAVE_BUTTON = '#country_settings_save_2';
+	const COUNTRY_SETTINGS_SAVE_BUTTON = '#country_settings_save_2';
 
 
 
-    /**
-     * Return the url for the country settings admin page.
-     * @param string $additional_params
-     * @return string
-     */
-    public static function url($additional_params = '')
-    {
-        return self::adminUrl('espresso_general_settings', 'country_settings', $additional_params);
-    }
+	/**
+	 * Return the url for the country settings admin page.
+	 * @param string $additional_params
+	 * @return string
+	 */
+	public static function url($additional_params = '')
+	{
+		return self::adminUrl('espresso_general_settings', 'country_settings', $additional_params);
+	}
 
 
-    /**
-     * Return the decimal places (precision) radio field locator for selection.
-     * @param int    $decimal_place_value
-     * @param string $country_code
-     * @return string
-     */
-    public static function currencyDecimalPlacesRadioField($decimal_place_value = 2, $country_code = 'US')
-    {
-        return "//input[@id='CNT_cur_dec_plc-$country_code-$decimal_place_value']";
-    }
+	/**
+	 * Return the decimal places (precision) radio field locator for selection.
+	 * @param int    $decimal_place_value
+	 * @param string $country_code
+	 * @return string
+	 */
+	public static function currencyDecimalPlacesRadioField($decimal_place_value = 2, $country_code = 'US')
+	{
+		return "//input[@id='CNT_cur_dec_plc-$country_code-$decimal_place_value']";
+	}
 
 
-    /**
-     * Return the currency decimal mark field locator for selection.
-     * @param string $decimal_mark
-     * @return string
-     */
-    public static function currencyDecimalMarkRadioField($decimal_mark = '.')
-    {
-        return "//input[@class='CNT_cur_dec_mrk' and @value='$decimal_mark']";
-    }
+	/**
+	 * Return the currency decimal mark field locator for selection.
+	 * @param string $decimal_mark
+	 * @return string
+	 */
+	public static function currencyDecimalMarkRadioField($decimal_mark = '.')
+	{
+		return "//input[@class='CNT_cur_dec_mrk' and @value='$decimal_mark']";
+	}
 
 
-    /**
-     * Return the currency thousands separator field locator for selection.
-     * @param string $thousands_separator
-     * @return string
-     */
-    public static function currencyThousandsSeparatorField($thousands_separator = ',')
-    {
-        return "//input[@class='CNT_cur_thsnds' and @value='$thousands_separator']";
-    }
+	/**
+	 * Return the currency thousands separator field locator for selection.
+	 * @param string $thousands_separator
+	 * @return string
+	 */
+	public static function currencyThousandsSeparatorField($thousands_separator = ',')
+	{
+		return "//input[@class='CNT_cur_thsnds' and @value='$thousands_separator']";
+	}
 }
\ No newline at end of file

core/domain/services/validation/email/strategies/InternationalDNS.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
             $email_address,
             $this->getAtIndex($email_address)
         );
-        if (! checkdnsrr($domain, 'MX')) {
+        if ( ! checkdnsrr($domain, 'MX')) {
             // domain not found in MX records
             throw new EmailValidationException(
                 __(
@@ -45,7 +45,7 @@ 
                 )
             );
         }
-        if (! checkdnsrr($domain, 'A')) {
+        if ( ! checkdnsrr($domain, 'A')) {
             // domain not found in A records
             throw new EmailValidationException(
                 __(

Indentation +39 added lines, -39 removed lines

@@ -15,43 +15,43 @@
 class InternationalDNS extends International
 {
 
-    /**
-     * Validates the email in teh same way as the parent, but also
-     * verifies the domain exists.
-     *
-     * @param string $email_address
-     * @return bool
-     * @throws EmailValidationException
-     */
-    public function validate($email_address)
-    {
-        parent::validate($email_address);
-        $domain = $this->getDomainPartOfEmail(
-            $email_address,
-            $this->getAtIndex($email_address)
-        );
-        if (! checkdnsrr($domain, 'MX')) {
-            // domain not found in MX records
-            throw new EmailValidationException(
-                __(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        if (! checkdnsrr($domain, 'A')) {
-            // domain not found in A records
-            throw new EmailValidationException(
-                __(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        return true;
-    }
+	/**
+	 * Validates the email in teh same way as the parent, but also
+	 * verifies the domain exists.
+	 *
+	 * @param string $email_address
+	 * @return bool
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address)
+	{
+		parent::validate($email_address);
+		$domain = $this->getDomainPartOfEmail(
+			$email_address,
+			$this->getAtIndex($email_address)
+		);
+		if (! checkdnsrr($domain, 'MX')) {
+			// domain not found in MX records
+			throw new EmailValidationException(
+				__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		if (! checkdnsrr($domain, 'A')) {
+			// domain not found in A records
+			throw new EmailValidationException(
+				__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		return true;
+	}
 }