eventespresso / event-espresso-core

modules/gateways/Invoice/lib/invoice_functions.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
  * @param $class_file
  * @return array
  */
-function espresso_invoice_template_files( $class_file) {
+function espresso_invoice_template_files($class_file) {
 	// read our template dir and build an array of files
-	$dhandle = opendir(dirname($class_file) . '/lib/templates/css/'); //If the template files have been moved to the uploads folder
+	$dhandle = opendir(dirname($class_file).'/lib/templates/css/'); //If the template files have been moved to the uploads folder
 	//} else return FALSE;
 
 	$files = array();
@@ -50,8 +50,8 @@ 
  * @param string $selected
  * @return string
  */
-function espresso_invoice_is_selected( $input_item, $selected='') {
-	if ( $input_item === $selected ) {
+function espresso_invoice_is_selected($input_item, $selected = '') {
+	if ($input_item === $selected) {
 		return 'selected="selected"';
 	} else {
 		return '';

admin_pages/registrations/EE_Registrations_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
      *    _get_table_filters
      *
      * @access protected
-     * @return array
+     * @return string[]
      */
     protected function _get_table_filters()
     {

Indentation +965 added lines, -965 removed lines

@@ -24,1046 +24,1046 @@
 {
 
 
-    /**
-     * @var array
-     */
-    private $_status;
+	/**
+	 * @var array
+	 */
+	private $_status;
 
 
-    /**
-     * An array of transaction details for the related transaction to the registration being processed.
-     * This is set via the _set_related_details method.
-     *
-     * @var array
-     */
-    protected $_transaction_details = array();
+	/**
+	 * An array of transaction details for the related transaction to the registration being processed.
+	 * This is set via the _set_related_details method.
+	 *
+	 * @var array
+	 */
+	protected $_transaction_details = array();
 
 
-    /**
-     * An array of event details for the related event to the registration being processed.
-     * This is set via the _set_related_details method.
-     *
-     * @var array
-     */
-    protected $_event_details = array();
+	/**
+	 * An array of event details for the related event to the registration being processed.
+	 * This is set via the _set_related_details method.
+	 *
+	 * @var array
+	 */
+	protected $_event_details = array();
 
 
-    /**
-     * @param \Registrations_Admin_Page $admin_page
-     */
-    public function __construct(Registrations_Admin_Page $admin_page)
-    {
-        if (! empty($_GET['event_id'])) {
-            $extra_query_args = array();
-            foreach ($admin_page->get_views() as $key => $view_details) {
-                $extra_query_args[ $view_details['slug'] ] = array('event_id' => $_GET['event_id']);
-            }
-            $this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
-        }
-        parent::__construct($admin_page);
-        $this->_status = $this->_admin_page->get_registration_status_array();
-    }
+	/**
+	 * @param \Registrations_Admin_Page $admin_page
+	 */
+	public function __construct(Registrations_Admin_Page $admin_page)
+	{
+		if (! empty($_GET['event_id'])) {
+			$extra_query_args = array();
+			foreach ($admin_page->get_views() as $key => $view_details) {
+				$extra_query_args[ $view_details['slug'] ] = array('event_id' => $_GET['event_id']);
+			}
+			$this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
+		}
+		parent::__construct($admin_page);
+		$this->_status = $this->_admin_page->get_registration_status_array();
+	}
 
 
-    /**
-     *    _setup_data
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_registrations($this->_per_page);
-        $this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, true, false, false);
-    }
+	/**
+	 *    _setup_data
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_registrations($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, true, false, false);
+	}
 
 
-    /**
-     *    _set_properties
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('registration', 'event_espresso'),
-            'plural'   => __('registrations', '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 .= __('Registrant Name', 'event_espresso');
-        $ID_column_name .= '</span> ';
-        if (isset($_GET['event_id'])) {
-            $this->_columns = array(
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                '_REG_ID'          => $ID_column_name,
-                'ATT_fname'        => __('Name', 'event_espresso'),
-                'ATT_email'        => __('Email', 'event_espresso'),
-                '_REG_date'        => __('Reg Date', 'event_espresso'),
-                'PRC_amount'       => __('TKT Price', 'event_espresso'),
-                '_REG_final_price' => __('Final Price', 'event_espresso'),
-                'TXN_total'        => __('Total Txn', 'event_espresso'),
-                'TXN_paid'         => __('Paid', 'event_espresso'),
-                'actions'          => __('Actions', 'event_espresso'),
-            );
-            $this->_bottom_buttons = array(
-                'report' => array(
-                    'route'         => 'registrations_report',
-                    'extra_request' => array(
-                        'EVT_ID'     => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null,
-                        'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"),
-                    ),
-                ),
-            );
-        } else {
-            $this->_columns = array(
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                '_REG_ID'          => $ID_column_name,
-                'ATT_fname'        => __('Name', 'event_espresso'),
-                '_REG_date'        => __('TXN Date', 'event_espresso'),
-                'event_name'       => __('Event', 'event_espresso'),
-                'DTT_EVT_start'    => __('Event Date', 'event_espresso'),
-                '_REG_final_price' => __('Price', 'event_espresso'),
-                '_REG_paid'        => __('Paid', 'event_espresso'),
-                'actions'          => __('Actions', 'event_espresso'),
-            );
-            $this->_bottom_buttons = array(
-                'report_all' => array(
-                    'route'         => 'registrations_report',
-                    'extra_request' => array(
-                        'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"),
-                    ),
-                ),
-            );
-        }
-        $this->_bottom_buttons['report_filtered'] = array(
-            'route'         => 'registrations_report',
-            'extra_request' => array(
-                'use_filters' => true,
-                'return_url'  => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"),
-            ),
-        );
-        $filters = array_diff_key(
-            $this->_req_data,
-            array_flip(
-                array(
-                    'page',
-                    'action',
-                    'default_nonce',
-                )
-            )
-        );
-        if (!empty($filters)) {
-            $this->_bottom_buttons['report_filtered']['extra_request']['filters'] = $filters;
-        }
-        $this->_primary_column = '_REG_ID';
-        $this->_sortable_columns = array(
-            '_REG_date'     => array('_REG_date' => true),   // true means its already sorted
-            /**
-             * Allows users to change the default sort if they wish.
-             * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
-             * name.
-             */
-            'ATT_fname'     => array(
-                'FHEE__EE_Registrations_List_Table___set_properties__default_sort_by_registration_last_name',
-                true,
-                $this,
-            )
-                ? array('ATT_lname' => false)
-                : array('ATT_fname' => false),
-            'event_name'    => array('event_name' => false),
-            'DTT_EVT_start' => array('DTT_EVT_start' => false),
-            '_REG_ID'       => array('_REG_ID' => false),
-        );
-        $this->_hidden_columns = array();
-    }
+	/**
+	 *    _set_properties
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('registration', 'event_espresso'),
+			'plural'   => __('registrations', '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 .= __('Registrant Name', 'event_espresso');
+		$ID_column_name .= '</span> ';
+		if (isset($_GET['event_id'])) {
+			$this->_columns = array(
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'_REG_ID'          => $ID_column_name,
+				'ATT_fname'        => __('Name', 'event_espresso'),
+				'ATT_email'        => __('Email', 'event_espresso'),
+				'_REG_date'        => __('Reg Date', 'event_espresso'),
+				'PRC_amount'       => __('TKT Price', 'event_espresso'),
+				'_REG_final_price' => __('Final Price', 'event_espresso'),
+				'TXN_total'        => __('Total Txn', 'event_espresso'),
+				'TXN_paid'         => __('Paid', 'event_espresso'),
+				'actions'          => __('Actions', 'event_espresso'),
+			);
+			$this->_bottom_buttons = array(
+				'report' => array(
+					'route'         => 'registrations_report',
+					'extra_request' => array(
+						'EVT_ID'     => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null,
+						'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"),
+					),
+				),
+			);
+		} else {
+			$this->_columns = array(
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'_REG_ID'          => $ID_column_name,
+				'ATT_fname'        => __('Name', 'event_espresso'),
+				'_REG_date'        => __('TXN Date', 'event_espresso'),
+				'event_name'       => __('Event', 'event_espresso'),
+				'DTT_EVT_start'    => __('Event Date', 'event_espresso'),
+				'_REG_final_price' => __('Price', 'event_espresso'),
+				'_REG_paid'        => __('Paid', 'event_espresso'),
+				'actions'          => __('Actions', 'event_espresso'),
+			);
+			$this->_bottom_buttons = array(
+				'report_all' => array(
+					'route'         => 'registrations_report',
+					'extra_request' => array(
+						'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"),
+					),
+				),
+			);
+		}
+		$this->_bottom_buttons['report_filtered'] = array(
+			'route'         => 'registrations_report',
+			'extra_request' => array(
+				'use_filters' => true,
+				'return_url'  => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"),
+			),
+		);
+		$filters = array_diff_key(
+			$this->_req_data,
+			array_flip(
+				array(
+					'page',
+					'action',
+					'default_nonce',
+				)
+			)
+		);
+		if (!empty($filters)) {
+			$this->_bottom_buttons['report_filtered']['extra_request']['filters'] = $filters;
+		}
+		$this->_primary_column = '_REG_ID';
+		$this->_sortable_columns = array(
+			'_REG_date'     => array('_REG_date' => true),   // true means its already sorted
+			/**
+			 * Allows users to change the default sort if they wish.
+			 * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
+			 * name.
+			 */
+			'ATT_fname'     => array(
+				'FHEE__EE_Registrations_List_Table___set_properties__default_sort_by_registration_last_name',
+				true,
+				$this,
+			)
+				? array('ATT_lname' => false)
+				: array('ATT_fname' => false),
+			'event_name'    => array('event_name' => false),
+			'DTT_EVT_start' => array('DTT_EVT_start' => false),
+			'_REG_ID'       => array('_REG_ID' => false),
+		);
+		$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_Registration $item the current item
-     * @return string
-     */
-    protected function _get_row_class($item)
-    {
-        $class = parent::_get_row_class($item);
-        // add status class
-        $class .= ' ee-status-strip reg-status-' . $item->status_ID();
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param  EE_Registration $item the current item
+	 * @return string
+	 */
+	protected function _get_row_class($item)
+	{
+		$class = parent::_get_row_class($item);
+		// add status class
+		$class .= ' ee-status-strip reg-status-' . $item->status_ID();
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
 
 
-    /**
-     * Set the $_transaction_details property if not set yet.
-     *
-     * @param EE_Registration $registration
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _set_related_details(EE_Registration $registration)
-    {
-        $transaction = $registration->get_first_related('Transaction');
-        $status = $transaction instanceof EE_Transaction ? $transaction->status_ID()
-            : EEM_Transaction::failed_status_code;
-        $this->_transaction_details = array(
-            'transaction' => $transaction,
-            'status'      => $status,
-            'id'          => $transaction instanceof EE_Transaction ? $transaction->ID() : 0,
-            'title_attr'  => sprintf(
-                __('View Transaction Details (%s)', 'event_espresso'),
-                EEH_Template::pretty_status($status, false, 'sentence')
-            ),
-        );
-        try {
-            $event = $registration->event();
-        } catch (EntityNotFoundException $e) {
-            $event = null;
-        }
-        $status = $event instanceof EE_Event ? $event->get_active_status() : EE_Datetime::inactive;
-        $this->_event_details = array(
-            'event'      => $event,
-            'status'     => $status,
-            'id'         => $event instanceof EE_Event ? $event->ID() : 0,
-            'title_attr' => sprintf(
-                __('Edit Event (%s)', 'event_espresso'),
-                EEH_Template::pretty_status($status, false, 'sentence')
-            ),
-        );
-    }
+	/**
+	 * Set the $_transaction_details property if not set yet.
+	 *
+	 * @param EE_Registration $registration
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _set_related_details(EE_Registration $registration)
+	{
+		$transaction = $registration->get_first_related('Transaction');
+		$status = $transaction instanceof EE_Transaction ? $transaction->status_ID()
+			: EEM_Transaction::failed_status_code;
+		$this->_transaction_details = array(
+			'transaction' => $transaction,
+			'status'      => $status,
+			'id'          => $transaction instanceof EE_Transaction ? $transaction->ID() : 0,
+			'title_attr'  => sprintf(
+				__('View Transaction Details (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
+			),
+		);
+		try {
+			$event = $registration->event();
+		} catch (EntityNotFoundException $e) {
+			$event = null;
+		}
+		$status = $event instanceof EE_Event ? $event->get_active_status() : EE_Datetime::inactive;
+		$this->_event_details = array(
+			'event'      => $event,
+			'status'     => $status,
+			'id'         => $event instanceof EE_Event ? $event->ID() : 0,
+			'title_attr' => sprintf(
+				__('Edit Event (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
+			),
+		);
+	}
 
 
-    /**
-     *    _get_table_filters
-     *
-     * @access protected
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-        // todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as
-        // methods.
-        $cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
-        $cur_category = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
-        $reg_status = isset($this->_req_data['_reg_status']) ? $this->_req_data['_reg_status'] : '';
-        $filters[] = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
-        $filters[] = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
-        $status = array();
-        $status[] = array('id' => 0, 'text' => __('Select Status', 'event_espresso'));
-        foreach ($this->_status as $key => $value) {
-            $status[] = array('id' => $key, 'text' => $value);
-        }
-        if ($this->_view !== 'incomplete') {
-            $filters[] = EEH_Form_Fields::select_input(
-                '_reg_status',
-                $status,
-                isset($this->_req_data['_reg_status']) ? strtoupper(sanitize_key($this->_req_data['_reg_status']))
-                    : ''
-            );
-        }
-        if (isset($this->_req_data['event_id'])) {
-            $filters[] = EEH_Form_Fields::hidden_input('event_id', $this->_req_data['event_id'], 'reg_event_id');
-        }
-        return $filters;
-    }
+	/**
+	 *    _get_table_filters
+	 *
+	 * @access protected
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+		// todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as
+		// methods.
+		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
+		$cur_category = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
+		$reg_status = isset($this->_req_data['_reg_status']) ? $this->_req_data['_reg_status'] : '';
+		$filters[] = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
+		$filters[] = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
+		$status = array();
+		$status[] = array('id' => 0, 'text' => __('Select Status', 'event_espresso'));
+		foreach ($this->_status as $key => $value) {
+			$status[] = array('id' => $key, 'text' => $value);
+		}
+		if ($this->_view !== 'incomplete') {
+			$filters[] = EEH_Form_Fields::select_input(
+				'_reg_status',
+				$status,
+				isset($this->_req_data['_reg_status']) ? strtoupper(sanitize_key($this->_req_data['_reg_status']))
+					: ''
+			);
+		}
+		if (isset($this->_req_data['event_id'])) {
+			$filters[] = EEH_Form_Fields::hidden_input('event_id', $this->_req_data['event_id'], 'reg_event_id');
+		}
+		return $filters;
+	}
 
 
-    /**
-     *    _add_view_counts
-     *
-     * @access protected
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_total_registrations();
-        $this->_views['month']['count'] = $this->_total_registrations_this_month();
-        $this->_views['today']['count'] = $this->_total_registrations_today();
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_registrations',
-            'espresso_registrations_trash_registrations'
-        )) {
-            $this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
-            $this->_views['trash']['count'] = $this->_total_registrations('trash');
-        }
-    }
+	/**
+	 *    _add_view_counts
+	 *
+	 * @access protected
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_total_registrations();
+		$this->_views['month']['count'] = $this->_total_registrations_this_month();
+		$this->_views['today']['count'] = $this->_total_registrations_today();
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_registrations',
+			'espresso_registrations_trash_registrations'
+		)) {
+			$this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
+			$this->_views['trash']['count'] = $this->_total_registrations('trash');
+		}
+	}
 
 
-    /**
-     * _total_registrations
-     *
-     * @access protected
-     * @param string $view
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _total_registrations($view = '')
-    {
-        $_where = array();
-        $EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false;
-        if ($EVT_ID) {
-            $_where['EVT_ID'] = $EVT_ID;
-        }
-        switch ($view) {
-            case 'trash':
-                return EEM_Registration::instance()->count_deleted(array($_where));
-                break;
-            case 'incomplete':
-                $_where['STS_ID'] = EEM_Registration::status_id_incomplete;
-                break;
-            default:
-                $_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
-        }
-        return EEM_Registration::instance()->count(array($_where));
-    }
+	/**
+	 * _total_registrations
+	 *
+	 * @access protected
+	 * @param string $view
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _total_registrations($view = '')
+	{
+		$_where = array();
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false;
+		if ($EVT_ID) {
+			$_where['EVT_ID'] = $EVT_ID;
+		}
+		switch ($view) {
+			case 'trash':
+				return EEM_Registration::instance()->count_deleted(array($_where));
+				break;
+			case 'incomplete':
+				$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
+				break;
+			default:
+				$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		}
+		return EEM_Registration::instance()->count(array($_where));
+	}
 
 
-    /**
-     * _total_registrations_this_month
-     *
-     * @access protected
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _total_registrations_this_month()
-    {
-        $EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false;
-        $_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
-        $this_year_r = date('Y', current_time('timestamp'));
-        $time_start = ' 00:00:00';
-        $time_end = ' 23:59:59';
-        $this_month_r = date('m', current_time('timestamp'));
-        $days_this_month = date('t', current_time('timestamp'));
-        // setup date query.
-        $beginning_string = EEM_Registration::instance()->convert_datetime_for_query(
-            'REG_date',
-            $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
-            'Y-m-d H:i:s'
-        );
-        $end_string = EEM_Registration::instance()->convert_datetime_for_query(
-            'REG_date',
-            $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
-            'Y-m-d H:i:s'
-        );
-        $_where['REG_date'] = array(
-            'BETWEEN',
-            array(
-                $beginning_string,
-                $end_string,
-            ),
-        );
-        $_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
-        return EEM_Registration::instance()->count(array($_where));
-    }
+	/**
+	 * _total_registrations_this_month
+	 *
+	 * @access protected
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _total_registrations_this_month()
+	{
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false;
+		$_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
+		$this_year_r = date('Y', current_time('timestamp'));
+		$time_start = ' 00:00:00';
+		$time_end = ' 23:59:59';
+		$this_month_r = date('m', current_time('timestamp'));
+		$days_this_month = date('t', current_time('timestamp'));
+		// setup date query.
+		$beginning_string = EEM_Registration::instance()->convert_datetime_for_query(
+			'REG_date',
+			$this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
+			'Y-m-d H:i:s'
+		);
+		$end_string = EEM_Registration::instance()->convert_datetime_for_query(
+			'REG_date',
+			$this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
+			'Y-m-d H:i:s'
+		);
+		$_where['REG_date'] = array(
+			'BETWEEN',
+			array(
+				$beginning_string,
+				$end_string,
+			),
+		);
+		$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		return EEM_Registration::instance()->count(array($_where));
+	}
 
 
-    /**
-     * _total_registrations_today
-     *
-     * @access protected
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _total_registrations_today()
-    {
-        $EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false;
-        $_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
-        $current_date = date('Y-m-d', current_time('timestamp'));
-        $time_start = ' 00:00:00';
-        $time_end = ' 23:59:59';
-        $_where['REG_date'] = array(
-            'BETWEEN',
-            array(
-                EEM_Registration::instance()->convert_datetime_for_query(
-                    'REG_date',
-                    $current_date . $time_start,
-                    'Y-m-d H:i:s'
-                ),
-                EEM_Registration::instance()->convert_datetime_for_query(
-                    'REG_date',
-                    $current_date . $time_end,
-                    'Y-m-d H:i:s'
-                ),
-            ),
-        );
-        $_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
-        return EEM_Registration::instance()->count(array($_where));
-    }
+	/**
+	 * _total_registrations_today
+	 *
+	 * @access protected
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _total_registrations_today()
+	{
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false;
+		$_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
+		$current_date = date('Y-m-d', current_time('timestamp'));
+		$time_start = ' 00:00:00';
+		$time_end = ' 23:59:59';
+		$_where['REG_date'] = array(
+			'BETWEEN',
+			array(
+				EEM_Registration::instance()->convert_datetime_for_query(
+					'REG_date',
+					$current_date . $time_start,
+					'Y-m-d H:i:s'
+				),
+				EEM_Registration::instance()->convert_datetime_for_query(
+					'REG_date',
+					$current_date . $time_end,
+					'Y-m-d H:i:s'
+				),
+			),
+		);
+		$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		return EEM_Registration::instance()->count(array($_where));
+	}
 
 
-    /**
-     * column_cb
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_cb($item)
-    {
-        /** checkbox/lock **/
-        $transaction = $item->get_first_related('Transaction');
-        $payment_count = $transaction instanceof EE_Transaction
-            ? $transaction->count_related('Payment')
-            : 0;
-        return $payment_count > 0
-               || ! EE_Registry::instance()->CAP->current_user_can(
-                   'ee_edit_registration',
-                   'registration_list_table_checkbox_input',
-                   $item->ID()
-               )
-            ? sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$d" />', $item->ID())
-              . '<span class="ee-lock-icon"></span>'
-            : sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$d" />', $item->ID());
-    }
+	/**
+	 * column_cb
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_cb($item)
+	{
+		/** checkbox/lock **/
+		$transaction = $item->get_first_related('Transaction');
+		$payment_count = $transaction instanceof EE_Transaction
+			? $transaction->count_related('Payment')
+			: 0;
+		return $payment_count > 0
+			   || ! EE_Registry::instance()->CAP->current_user_can(
+				   'ee_edit_registration',
+				   'registration_list_table_checkbox_input',
+				   $item->ID()
+			   )
+			? sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$d" />', $item->ID())
+			  . '<span class="ee-lock-icon"></span>'
+			: sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$d" />', $item->ID());
+	}
 
 
-    /**
-     * column__REG_ID
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column__REG_ID(EE_Registration $item)
-    {
-        $attendee = $item->attendee();
-        $content = $item->ID();
-        $content .= '<div class="show-on-mobile-view-only">';
-        $content .= '<br>';
-        $content .= $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-        $content .= '&nbsp;' . sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
-        $content .= '<br>' . sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
-        $content .= '</div>';
-        return $content;
-    }
+	/**
+	 * column__REG_ID
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column__REG_ID(EE_Registration $item)
+	{
+		$attendee = $item->attendee();
+		$content = $item->ID();
+		$content .= '<div class="show-on-mobile-view-only">';
+		$content .= '<br>';
+		$content .= $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
+		$content .= '&nbsp;' . sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
+		$content .= '<br>' . sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
+		$content .= '</div>';
+		return $content;
+	}
 
 
-    /**
-     * column__REG_date
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column__REG_date(EE_Registration $item)
-    {
-        $this->_set_related_details($item);
-        // Build row actions
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $this->_transaction_details['id'],
-            ),
-            TXN_ADMIN_URL
-        );
-        $view_link = EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_transaction',
-            'espresso_transactions_view_transaction'
-        )
-            ? '<a class="ee-status-color-'
-              . $this->_transaction_details['status']
-              . '" href="'
-              . $view_lnk_url
-              . '" title="'
-              . esc_attr($this->_transaction_details['title_attr'])
-              . '">'
-              . $item->get_i18n_datetime('REG_date')
-              . '</a>' : $item->get_i18n_datetime('REG_date');
-        $view_link .= '<br><span class="ee-status-text-small">'
-                      . EEH_Template::pretty_status($this->_transaction_details['status'], false, 'sentence')
-                      . '</span>';
-        return $view_link;
-    }
+	/**
+	 * column__REG_date
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column__REG_date(EE_Registration $item)
+	{
+		$this->_set_related_details($item);
+		// Build row actions
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $this->_transaction_details['id'],
+			),
+			TXN_ADMIN_URL
+		);
+		$view_link = EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_transaction',
+			'espresso_transactions_view_transaction'
+		)
+			? '<a class="ee-status-color-'
+			  . $this->_transaction_details['status']
+			  . '" href="'
+			  . $view_lnk_url
+			  . '" title="'
+			  . esc_attr($this->_transaction_details['title_attr'])
+			  . '">'
+			  . $item->get_i18n_datetime('REG_date')
+			  . '</a>' : $item->get_i18n_datetime('REG_date');
+		$view_link .= '<br><span class="ee-status-text-small">'
+					  . EEH_Template::pretty_status($this->_transaction_details['status'], false, 'sentence')
+					  . '</span>';
+		return $view_link;
+	}
 
 
-    /**
-     * column_event_name
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_event_name(EE_Registration $item)
-    {
-        $this->_set_related_details($item);
-        // page=espresso_events&action=edit_event&EVT_ID=2&edit_event_nonce=cf3a7e5b62
-        $EVT_ID = $item->event_ID();
-        $event_name = $item->event_name();
-        $event_name = $event_name ? $event_name : __("No Associated Event", 'event_espresso');
-        $event_name = wp_trim_words($event_name, 30, '...');
-        if ($EVT_ID) {
-            $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
-                array('action' => 'edit', 'post' => $EVT_ID),
-                EVENTS_ADMIN_URL
-            );
-            $edit_event = EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'edit_event', $EVT_ID)
-                ? '<a class="ee-status-color-'
-                  . $this->_event_details['status']
-                  . '" href="'
-                  . $edit_event_url
-                  . '" title="'
-                  . esc_attr($this->_event_details['title_attr'])
-                  . '">'
-                  . $event_name
-                  . '</a>' : $event_name;
-            $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('event_id' => $EVT_ID), REG_ADMIN_URL);
-            $actions['event_filter'] = '<a href="' . $edit_event_url . '" title="';
-            $actions['event_filter'] .= sprintf(
-                esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
-                $event_name
-            );
-            $actions['event_filter'] .= '">' . __('View Registrations', 'event_espresso') . '</a>';
-        } else {
-            $edit_event = $event_name;
-            $actions['event_filter'] = '';
-        }
-        return sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions));
-    }
+	/**
+	 * column_event_name
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_event_name(EE_Registration $item)
+	{
+		$this->_set_related_details($item);
+		// page=espresso_events&action=edit_event&EVT_ID=2&edit_event_nonce=cf3a7e5b62
+		$EVT_ID = $item->event_ID();
+		$event_name = $item->event_name();
+		$event_name = $event_name ? $event_name : __("No Associated Event", 'event_espresso');
+		$event_name = wp_trim_words($event_name, 30, '...');
+		if ($EVT_ID) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
+				array('action' => 'edit', 'post' => $EVT_ID),
+				EVENTS_ADMIN_URL
+			);
+			$edit_event = EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'edit_event', $EVT_ID)
+				? '<a class="ee-status-color-'
+				  . $this->_event_details['status']
+				  . '" href="'
+				  . $edit_event_url
+				  . '" title="'
+				  . esc_attr($this->_event_details['title_attr'])
+				  . '">'
+				  . $event_name
+				  . '</a>' : $event_name;
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('event_id' => $EVT_ID), REG_ADMIN_URL);
+			$actions['event_filter'] = '<a href="' . $edit_event_url . '" title="';
+			$actions['event_filter'] .= sprintf(
+				esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
+				$event_name
+			);
+			$actions['event_filter'] .= '">' . __('View Registrations', 'event_espresso') . '</a>';
+		} else {
+			$edit_event = $event_name;
+			$actions['event_filter'] = '';
+		}
+		return sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions));
+	}
 
 
-    /**
-     * column_DTT_EVT_start
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_DTT_EVT_start(EE_Registration $item)
-    {
-        $datetime_strings = array();
-        $ticket = $item->ticket(true);
-        if ($ticket instanceof EE_Ticket) {
-            $remove_defaults = array('default_where_conditions' => 'none');
-            $datetimes = $ticket->datetimes($remove_defaults);
-            foreach ($datetimes as $datetime) {
-                $datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start');
-            }
-            return $this->generateDisplayForDatetimes($datetime_strings);
-        }
-        return __('There is no ticket on this registration', 'event_espresso');
-    }
+	/**
+	 * column_DTT_EVT_start
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_DTT_EVT_start(EE_Registration $item)
+	{
+		$datetime_strings = array();
+		$ticket = $item->ticket(true);
+		if ($ticket instanceof EE_Ticket) {
+			$remove_defaults = array('default_where_conditions' => 'none');
+			$datetimes = $ticket->datetimes($remove_defaults);
+			foreach ($datetimes as $datetime) {
+				$datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start');
+			}
+			return $this->generateDisplayForDatetimes($datetime_strings);
+		}
+		return __('There is no ticket on this registration', 'event_espresso');
+	}
 
 
-    /**
-     * Receives an array of datetime strings to display and converts them to the html container for the column.
-     *
-     * @param array $datetime_strings
-     * @return string
-     */
-    public function generateDisplayForDateTimes(array $datetime_strings)
-    {
-        $content = '<div class="ee-registration-event-datetimes-container">';
-        $expand_toggle = count($datetime_strings) > 1
-            ? ' <span title="' . esc_attr__('Click to view all dates', 'event_espresso')
-              . '" class="ee-js ee-more-datetimes-toggle dashicons dashicons-plus"></span>'
-            : '';
-        // get first item for initial visibility
-        $content .= '<div class="left">' . array_shift($datetime_strings) . '</div>';
-        $content .= $expand_toggle;
-        if ($datetime_strings) {
-            $content .= '<div style="clear:both"></div>';
-            $content .= '<div class="ee-registration-event-datetimes-container more-items hidden">';
-            $content .= implode("<br />", $datetime_strings);
-            $content .= '</div>';
-        }
-        $content .= '</div>';
-        return $content;
-    }
+	/**
+	 * Receives an array of datetime strings to display and converts them to the html container for the column.
+	 *
+	 * @param array $datetime_strings
+	 * @return string
+	 */
+	public function generateDisplayForDateTimes(array $datetime_strings)
+	{
+		$content = '<div class="ee-registration-event-datetimes-container">';
+		$expand_toggle = count($datetime_strings) > 1
+			? ' <span title="' . esc_attr__('Click to view all dates', 'event_espresso')
+			  . '" class="ee-js ee-more-datetimes-toggle dashicons dashicons-plus"></span>'
+			: '';
+		// get first item for initial visibility
+		$content .= '<div class="left">' . array_shift($datetime_strings) . '</div>';
+		$content .= $expand_toggle;
+		if ($datetime_strings) {
+			$content .= '<div style="clear:both"></div>';
+			$content .= '<div class="ee-registration-event-datetimes-container more-items hidden">';
+			$content .= implode("<br />", $datetime_strings);
+			$content .= '</div>';
+		}
+		$content .= '</div>';
+		return $content;
+	}
 
 
-    /**
-     * column_ATT_fname
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_ATT_fname(EE_Registration $item)
-    {
-        $attendee = $item->attendee();
-        $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action'  => 'view_registration',
-                '_REG_ID' => $item->ID(),
-            ),
-            REG_ADMIN_URL
-        );
-        $attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-        $link = EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_registration',
-            'espresso_registrations_view_registration',
-            $item->ID()
-        )
-            ? '<a href="'
-              . $edit_lnk_url
-              . '" title="'
-              . esc_attr__('View Registration Details', 'event_espresso')
-              . '">'
-              . $attendee_name
-              . '</a>' : $attendee_name;
-        $link .= $item->count() === 1
-            ? '&nbsp;<sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup>' : '';
-        $t = $item->get_first_related('Transaction');
-        $payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
-        // append group count to name
-        $link .= '&nbsp;' . sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
-        // append reg_code
-        $link .= '<br>' . sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
-        // reg status text for accessibility
-        $link .= '<br><span class="ee-status-text-small">'
-                 . EEH_Template::pretty_status($item->status_ID(), false, 'sentence')
-                 . '</span>';
-        $action = [ '_REG_ID' => $item->ID() ];
-        if (isset($this->_req_data['event_id'])) {
-            $action['event_id'] = $item->event_ID();
-        }
-        // trash/restore/delete actions
-        $actions = array();
-        if ($this->_view !== 'trash'
-            && $payment_count === 0
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_registration',
-                'espresso_registrations_trash_registrations',
-                $item->ID()
-            )) {
-            $action['action'] = 'trash_registrations';
-            $trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                $action,
-                REG_ADMIN_URL
-            );
-            $actions['trash'] = '<a href="'
-                                . $trash_lnk_url
-                                . '" title="'
-                                . esc_attr__('Trash Registration', 'event_espresso')
-                                . '">' . __('Trash', 'event_espresso') . '</a>';
-        } elseif ($this->_view === 'trash') {
-            // restore registration link
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_registration',
-                'espresso_registrations_restore_registrations',
-                $item->ID()
-            )) {
-                $action['action'] = 'restore_registrations';
-                $restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                    $action,
-                    REG_ADMIN_URL
-                );
-                $actions['restore'] = '<a href="'
-                                      . $restore_lnk_url
-                                      . '" title="'
-                                      . esc_attr__('Restore Registration', 'event_espresso') . '">'
-                                      . __('Restore', 'event_espresso') . '</a>';
-            }
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_registration',
-                'espresso_registrations_ee_delete_registrations',
-                $item->ID()
-            )) {
-                $action['action'] = 'delete_registrations';
-                $delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                    $action,
-                    REG_ADMIN_URL
-                );
-                $actions['delete'] = '<a href="'
-                                     . $delete_lnk_url
-                                     . '" title="'
-                                     . esc_attr__('Delete Registration Permanently', 'event_espresso')
-                                     . '">'
-                                     . __('Delete', 'event_espresso')
-                                     . '</a>';
-            }
-        }
-        return sprintf('%1$s %2$s', $link, $this->row_actions($actions));
-    }
+	/**
+	 * column_ATT_fname
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_ATT_fname(EE_Registration $item)
+	{
+		$attendee = $item->attendee();
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action'  => 'view_registration',
+				'_REG_ID' => $item->ID(),
+			),
+			REG_ADMIN_URL
+		);
+		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
+		$link = EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_registration',
+			'espresso_registrations_view_registration',
+			$item->ID()
+		)
+			? '<a href="'
+			  . $edit_lnk_url
+			  . '" title="'
+			  . esc_attr__('View Registration Details', 'event_espresso')
+			  . '">'
+			  . $attendee_name
+			  . '</a>' : $attendee_name;
+		$link .= $item->count() === 1
+			? '&nbsp;<sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup>' : '';
+		$t = $item->get_first_related('Transaction');
+		$payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
+		// append group count to name
+		$link .= '&nbsp;' . sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
+		// append reg_code
+		$link .= '<br>' . sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
+		// reg status text for accessibility
+		$link .= '<br><span class="ee-status-text-small">'
+				 . EEH_Template::pretty_status($item->status_ID(), false, 'sentence')
+				 . '</span>';
+		$action = [ '_REG_ID' => $item->ID() ];
+		if (isset($this->_req_data['event_id'])) {
+			$action['event_id'] = $item->event_ID();
+		}
+		// trash/restore/delete actions
+		$actions = array();
+		if ($this->_view !== 'trash'
+			&& $payment_count === 0
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_registration',
+				'espresso_registrations_trash_registrations',
+				$item->ID()
+			)) {
+			$action['action'] = 'trash_registrations';
+			$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+				$action,
+				REG_ADMIN_URL
+			);
+			$actions['trash'] = '<a href="'
+								. $trash_lnk_url
+								. '" title="'
+								. esc_attr__('Trash Registration', 'event_espresso')
+								. '">' . __('Trash', 'event_espresso') . '</a>';
+		} elseif ($this->_view === 'trash') {
+			// restore registration link
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_registration',
+				'espresso_registrations_restore_registrations',
+				$item->ID()
+			)) {
+				$action['action'] = 'restore_registrations';
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+					$action,
+					REG_ADMIN_URL
+				);
+				$actions['restore'] = '<a href="'
+									  . $restore_lnk_url
+									  . '" title="'
+									  . esc_attr__('Restore Registration', 'event_espresso') . '">'
+									  . __('Restore', 'event_espresso') . '</a>';
+			}
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_registration',
+				'espresso_registrations_ee_delete_registrations',
+				$item->ID()
+			)) {
+				$action['action'] = 'delete_registrations';
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+					$action,
+					REG_ADMIN_URL
+				);
+				$actions['delete'] = '<a href="'
+									 . $delete_lnk_url
+									 . '" title="'
+									 . esc_attr__('Delete Registration Permanently', 'event_espresso')
+									 . '">'
+									 . __('Delete', 'event_espresso')
+									 . '</a>';
+			}
+		}
+		return sprintf('%1$s %2$s', $link, $this->row_actions($actions));
+	}
 
 
-    /**
-     * column_ATT_email
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_ATT_email(EE_Registration $item)
-    {
-        $attendee = $item->get_first_related('Attendee');
-        return ! $attendee instanceof EE_Attendee ? __('No attached contact record.', 'event_espresso')
-            : $attendee->email();
-    }
+	/**
+	 * column_ATT_email
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_ATT_email(EE_Registration $item)
+	{
+		$attendee = $item->get_first_related('Attendee');
+		return ! $attendee instanceof EE_Attendee ? __('No attached contact record.', 'event_espresso')
+			: $attendee->email();
+	}
 
 
-    /**
-     * column__REG_count
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     */
-    public function column__REG_count(EE_Registration $item)
-    {
-        return sprintf(__('%1$s / %2$s', 'event_espresso'), $item->count(), $item->group_size());
-    }
+	/**
+	 * column__REG_count
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 */
+	public function column__REG_count(EE_Registration $item)
+	{
+		return sprintf(__('%1$s / %2$s', 'event_espresso'), $item->count(), $item->group_size());
+	}
 
 
-    /**
-     * column_PRC_amount
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_PRC_amount(EE_Registration $item)
-    {
-        $ticket = $item->ticket();
-        $content = isset($_GET['event_id']) && $ticket instanceof EE_Ticket ? '<span class="TKT_name">'
-                                                                              . $ticket->name()
-                                                                              . '</span><br />' : '';
-        if ($item->final_price() > 0) {
-            $content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
-        } else {
-            // free event
-            $content .= '<span class="reg-overview-free-event-spn reg-pad-rght">'
-                        . __('free', 'event_espresso')
-                        . '</span>';
-        }
-        return $content;
-    }
+	/**
+	 * column_PRC_amount
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_PRC_amount(EE_Registration $item)
+	{
+		$ticket = $item->ticket();
+		$content = isset($_GET['event_id']) && $ticket instanceof EE_Ticket ? '<span class="TKT_name">'
+																			  . $ticket->name()
+																			  . '</span><br />' : '';
+		if ($item->final_price() > 0) {
+			$content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
+		} else {
+			// free event
+			$content .= '<span class="reg-overview-free-event-spn reg-pad-rght">'
+						. __('free', 'event_espresso')
+						. '</span>';
+		}
+		return $content;
+	}
 
 
-    /**
-     * column__REG_final_price
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     */
-    public function column__REG_final_price(EE_Registration $item)
-    {
-        $ticket = $item->ticket();
-        $content = isset($_GET['event_id']) || ! $ticket instanceof EE_Ticket
-            ? ''
-            : '<span class="TKT_name">'
-              . $ticket->name()
-              . '</span><br />';
-        $content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
-        return $content;
-    }
+	/**
+	 * column__REG_final_price
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column__REG_final_price(EE_Registration $item)
+	{
+		$ticket = $item->ticket();
+		$content = isset($_GET['event_id']) || ! $ticket instanceof EE_Ticket
+			? ''
+			: '<span class="TKT_name">'
+			  . $ticket->name()
+			  . '</span><br />';
+		$content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
+		return $content;
+	}
 
 
-    /**
-     * column__REG_paid
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     */
-    public function column__REG_paid(EE_Registration $item)
-    {
-        $payment_method = $item->payment_method();
-        $payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name()
-            : __('Unknown', 'event_espresso');
-        $content = '<span class="reg-pad-rght">' . $item->pretty_paid() . '</span>';
-        if ($item->paid() > 0) {
-            $content .= '<br><span class="ee-status-text-small">'
-                        . sprintf(
-                            __('...via %s', 'event_espresso'),
-                            $payment_method_name
-                        )
-                        . '</span>';
-        }
-        return $content;
-    }
+	/**
+	 * column__REG_paid
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column__REG_paid(EE_Registration $item)
+	{
+		$payment_method = $item->payment_method();
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name()
+			: __('Unknown', 'event_espresso');
+		$content = '<span class="reg-pad-rght">' . $item->pretty_paid() . '</span>';
+		if ($item->paid() > 0) {
+			$content .= '<br><span class="ee-status-text-small">'
+						. sprintf(
+							__('...via %s', 'event_espresso'),
+							$payment_method_name
+						)
+						. '</span>';
+		}
+		return $content;
+	}
 
 
-    /**
-     * column_TXN_total
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_TXN_total(EE_Registration $item)
-    {
-        if ($item->transaction()) {
-            $view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'view_transaction',
-                    'TXN_ID' => $item->transaction_ID(),
-                ),
-                TXN_ADMIN_URL
-            );
-            return EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_transaction',
-                'espresso_transactions_view_transaction',
-                $item->transaction_ID()
-            )
-                ? '<span class="reg-pad-rght"><a class="status-'
-                  . $item->transaction()->status_ID()
-                  . '" href="'
-                  . $view_txn_lnk_url
-                  . '"  title="'
-                  . esc_attr__('View Transaction', 'event_espresso')
-                  . '">'
-                  . $item->transaction()->pretty_total()
-                  . '</a></span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_total() . '</span>';
-        } else {
-            return __("None", "event_espresso");
-        }
-    }
+	/**
+	 * column_TXN_total
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_TXN_total(EE_Registration $item)
+	{
+		if ($item->transaction()) {
+			$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'view_transaction',
+					'TXN_ID' => $item->transaction_ID(),
+				),
+				TXN_ADMIN_URL
+			);
+			return EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_transaction',
+				'espresso_transactions_view_transaction',
+				$item->transaction_ID()
+			)
+				? '<span class="reg-pad-rght"><a class="status-'
+				  . $item->transaction()->status_ID()
+				  . '" href="'
+				  . $view_txn_lnk_url
+				  . '"  title="'
+				  . esc_attr__('View Transaction', 'event_espresso')
+				  . '">'
+				  . $item->transaction()->pretty_total()
+				  . '</a></span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_total() . '</span>';
+		} else {
+			return __("None", "event_espresso");
+		}
+	}
 
 
-    /**
-     * column_TXN_paid
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_TXN_paid(EE_Registration $item)
-    {
-        if ($item->count() === 1) {
-            $transaction = $item->transaction() ? $item->transaction() : EE_Transaction::new_instance();
-            if ($transaction->paid() >= $transaction->total()) {
-                return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>';
-            } else {
-                $view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'action' => 'view_transaction',
-                        'TXN_ID' => $item->transaction_ID(),
-                    ),
-                    TXN_ADMIN_URL
-                );
-                return EE_Registry::instance()->CAP->current_user_can(
-                    'ee_read_transaction',
-                    'espresso_transactions_view_transaction',
-                    $item->transaction_ID()
-                )
-                    ? '<span class="reg-pad-rght"><a class="status-'
-                      . $transaction->status_ID()
-                      . '" href="'
-                      . $view_txn_lnk_url
-                      . '"  title="'
-                      . esc_attr__('View Transaction', 'event_espresso')
-                      . '">'
-                      . $item->transaction()->pretty_paid()
-                      . '</a><span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
-            }
-        }
-        return '&nbsp;';
-    }
+	/**
+	 * column_TXN_paid
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_TXN_paid(EE_Registration $item)
+	{
+		if ($item->count() === 1) {
+			$transaction = $item->transaction() ? $item->transaction() : EE_Transaction::new_instance();
+			if ($transaction->paid() >= $transaction->total()) {
+				return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>';
+			} else {
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'action' => 'view_transaction',
+						'TXN_ID' => $item->transaction_ID(),
+					),
+					TXN_ADMIN_URL
+				);
+				return EE_Registry::instance()->CAP->current_user_can(
+					'ee_read_transaction',
+					'espresso_transactions_view_transaction',
+					$item->transaction_ID()
+				)
+					? '<span class="reg-pad-rght"><a class="status-'
+					  . $transaction->status_ID()
+					  . '" href="'
+					  . $view_txn_lnk_url
+					  . '"  title="'
+					  . esc_attr__('View Transaction', 'event_espresso')
+					  . '">'
+					  . $item->transaction()->pretty_paid()
+					  . '</a><span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
+			}
+		}
+		return '&nbsp;';
+	}
 
 
-    /**
-     * column_actions
-     *
-     * @access public
-     * @param \EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_actions(EE_Registration $item)
-    {
-        $actions = array();
-        $attendee = $item->attendee();
-        $this->_set_related_details($item);
-        // Build row actions
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action'  => 'view_registration',
-                '_REG_ID' => $item->ID(),
-            ),
-            REG_ADMIN_URL
-        );
-        $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'edit_attendee',
-                'post'   => $item->attendee_ID(),
-            ),
-            REG_ADMIN_URL
-        );
-        // page=attendees&event_admin_reports=resend_email&registration_id=43653465634&event_id=2&form_action=resend_email
-        // $resend_reg_lnk_url_params = array( 'action'=>'resend_registration', '_REG_ID'=>$item->REG_ID );
-        $resend_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action'  => 'resend_registration',
-                '_REG_ID' => $item->ID(),
-            ),
-            REG_ADMIN_URL,
-            true
-        );
-        // Build row actions
-        $actions['view_lnk'] = EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_registration',
-            'espresso_registrations_view_registration',
-            $item->ID()
-        ) ? '<li><a href="'
-            . $view_lnk_url
-            . '" title="'
-            . esc_attr__('View Registration Details', 'event_espresso')
-            . '" class="tiny-text">
+	/**
+	 * column_actions
+	 *
+	 * @access public
+	 * @param \EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_actions(EE_Registration $item)
+	{
+		$actions = array();
+		$attendee = $item->attendee();
+		$this->_set_related_details($item);
+		// Build row actions
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action'  => 'view_registration',
+				'_REG_ID' => $item->ID(),
+			),
+			REG_ADMIN_URL
+		);
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'edit_attendee',
+				'post'   => $item->attendee_ID(),
+			),
+			REG_ADMIN_URL
+		);
+		// page=attendees&event_admin_reports=resend_email&registration_id=43653465634&event_id=2&form_action=resend_email
+		// $resend_reg_lnk_url_params = array( 'action'=>'resend_registration', '_REG_ID'=>$item->REG_ID );
+		$resend_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action'  => 'resend_registration',
+				'_REG_ID' => $item->ID(),
+			),
+			REG_ADMIN_URL,
+			true
+		);
+		// Build row actions
+		$actions['view_lnk'] = EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_registration',
+			'espresso_registrations_view_registration',
+			$item->ID()
+		) ? '<li><a href="'
+			. $view_lnk_url
+			. '" title="'
+			. esc_attr__('View Registration Details', 'event_espresso')
+			. '" class="tiny-text">
 				<div class="dashicons dashicons-clipboard"></div>
 			</a>
 			</li>'
-            : '';
-        $actions['edit_lnk'] = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_contacts',
-            'espresso_registrations_edit_attendee'
-        )
-                               && $attendee instanceof EE_Attendee
-            ? '
+			: '';
+		$actions['edit_lnk'] = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_contacts',
+			'espresso_registrations_edit_attendee'
+		)
+							   && $attendee instanceof EE_Attendee
+			? '
 			<li>
 			<a href="' . $edit_lnk_url . '" title="'
-              . esc_attr__('Edit Contact Details', 'event_espresso') . '" class="tiny-text">
+			  . esc_attr__('Edit Contact Details', 'event_espresso') . '" class="tiny-text">
 				<div class="ee-icon ee-icon-user-edit ee-icon-size-16"></div>
 			</a>
 			</li>' : '';
-        $actions['resend_reg_lnk'] = $attendee instanceof EE_Attendee
-                                     && EE_Registry::instance()->CAP->current_user_can(
-                                         'ee_send_message',
-                                         'espresso_registrations_resend_registration',
-                                         $item->ID()
-                                     )
-            ? '
+		$actions['resend_reg_lnk'] = $attendee instanceof EE_Attendee
+									 && EE_Registry::instance()->CAP->current_user_can(
+										 'ee_send_message',
+										 'espresso_registrations_resend_registration',
+										 $item->ID()
+									 )
+			? '
 			<li>
 			<a href="'
-              . $resend_reg_lnk_url
-              . '" title="'
-              . esc_attr__('Resend Registration Details', 'event_espresso')
-              . '" class="tiny-text">
+			  . $resend_reg_lnk_url
+			  . '" title="'
+			  . esc_attr__('Resend Registration Details', 'event_espresso')
+			  . '" class="tiny-text">
 				<div class="dashicons dashicons-email-alt"></div>
 			</a>
 			</li>' : '';
-        // page=transactions&action=view_transaction&txn=256&_wpnonce=6414da4dbb
-        $view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $this->_transaction_details['id'],
-            ),
-            TXN_ADMIN_URL
-        );
-        $actions['view_txn_lnk'] = EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_transaction',
-            'espresso_transactions_view_transaction',
-            $this->_transaction_details['id']
-        )
-            ? '
+		// page=transactions&action=view_transaction&txn=256&_wpnonce=6414da4dbb
+		$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $this->_transaction_details['id'],
+			),
+			TXN_ADMIN_URL
+		);
+		$actions['view_txn_lnk'] = EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_transaction',
+			'espresso_transactions_view_transaction',
+			$this->_transaction_details['id']
+		)
+			? '
 			<li>
 			<a class="ee-status-color-'
-              . $this->_transaction_details['status']
-              . ' tiny-text" href="'
-              . $view_txn_lnk_url
-              . '"  title="'
-              . $this->_transaction_details['title_attr']
-              . '">
+			  . $this->_transaction_details['status']
+			  . ' tiny-text" href="'
+			  . $view_txn_lnk_url
+			  . '"  title="'
+			  . $this->_transaction_details['title_attr']
+			  . '">
 				<div class="dashicons dashicons-cart"></div>
 			</a>
 			</li>' : '';
-        // invoice link
-        $actions['dl_invoice_lnk'] = '';
-        $dl_invoice_lnk_url = $item->invoice_url();
-        // only show invoice link if message type is active.
-        if ($attendee instanceof EE_Attendee
-            && $item->is_primary_registrant()
-            && EEH_MSG_Template::is_mt_active('invoice')
-        ) {
-            $actions['dl_invoice_lnk'] = '
+		// invoice link
+		$actions['dl_invoice_lnk'] = '';
+		$dl_invoice_lnk_url = $item->invoice_url();
+		// only show invoice link if message type is active.
+		if ($attendee instanceof EE_Attendee
+			&& $item->is_primary_registrant()
+			&& EEH_MSG_Template::is_mt_active('invoice')
+		) {
+			$actions['dl_invoice_lnk'] = '
 		<li>
 			<a title="'
-                                         . esc_attr__('View Transaction Invoice', 'event_espresso')
-                                         . '" target="_blank" href="'
-                                         . $dl_invoice_lnk_url
-                                         . '" class="tiny-text">
+										 . esc_attr__('View Transaction Invoice', 'event_espresso')
+										 . '" target="_blank" href="'
+										 . $dl_invoice_lnk_url
+										 . '" class="tiny-text">
 				<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 			</a>
 		</li>';
-        }
-        $actions['filtered_messages_link'] = '';
-        // message list table link (filtered by REG_ID
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
-            $actions['filtered_messages_link'] = '<li>'
-                                                 . EEH_MSG_Template::get_message_action_link(
-                                                     'see_notifications_for',
-                                                     null,
-                                                     array('_REG_ID' => $item->ID())
-                                                 ) . '</li>';
-        }
-        $actions = apply_filters('FHEE__EE_Registrations_List_Table__column_actions__actions', $actions, $item, $this);
-        return $this->_action_string(implode('', $actions), $item, 'ul', 'reg-overview-actions-ul');
-    }
+		}
+		$actions['filtered_messages_link'] = '';
+		// message list table link (filtered by REG_ID
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$actions['filtered_messages_link'] = '<li>'
+												 . EEH_MSG_Template::get_message_action_link(
+													 'see_notifications_for',
+													 null,
+													 array('_REG_ID' => $item->ID())
+												 ) . '</li>';
+		}
+		$actions = apply_filters('FHEE__EE_Registrations_List_Table__column_actions__actions', $actions, $item, $this);
+		return $this->_action_string(implode('', $actions), $item, 'ul', 'reg-overview-actions-ul');
+	}
 }

Spacing +29 added lines, -29 removed lines

@@ -53,10 +53,10 @@ 
      */
     public function __construct(Registrations_Admin_Page $admin_page)
     {
-        if (! empty($_GET['event_id'])) {
+        if ( ! empty($_GET['event_id'])) {
             $extra_query_args = array();
             foreach ($admin_page->get_views() as $key => $view_details) {
-                $extra_query_args[ $view_details['slug'] ] = array('event_id' => $_GET['event_id']);
+                $extra_query_args[$view_details['slug']] = array('event_id' => $_GET['event_id']);
             }
             $this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
         }
@@ -156,12 +156,12 @@ 
                 )
             )
         );
-        if (!empty($filters)) {
+        if ( ! empty($filters)) {
             $this->_bottom_buttons['report_filtered']['extra_request']['filters'] = $filters;
         }
         $this->_primary_column = '_REG_ID';
         $this->_sortable_columns = array(
-            '_REG_date'     => array('_REG_date' => true),   // true means its already sorted
+            '_REG_date'     => array('_REG_date' => true), // true means its already sorted
             /**
              * Allows users to change the default sort if they wish.
              * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
@@ -193,7 +193,7 @@ 
     {
         $class = parent::_get_row_class($item);
         // add status class
-        $class .= ' ee-status-strip reg-status-' . $item->status_ID();
+        $class .= ' ee-status-strip reg-status-'.$item->status_ID();
         if ($this->_has_checkbox_column) {
             $class .= ' has-checkbox-column';
         }
@@ -358,12 +358,12 @@ 
         // setup date query.
         $beginning_string = EEM_Registration::instance()->convert_datetime_for_query(
             'REG_date',
-            $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
+            $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start,
             'Y-m-d H:i:s'
         );
         $end_string = EEM_Registration::instance()->convert_datetime_for_query(
             'REG_date',
-            $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
+            $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end,
             'Y-m-d H:i:s'
         );
         $_where['REG_date'] = array(
@@ -400,12 +400,12 @@ 
             array(
                 EEM_Registration::instance()->convert_datetime_for_query(
                     'REG_date',
-                    $current_date . $time_start,
+                    $current_date.$time_start,
                     'Y-m-d H:i:s'
                 ),
                 EEM_Registration::instance()->convert_datetime_for_query(
                     'REG_date',
-                    $current_date . $time_end,
+                    $current_date.$time_end,
                     'Y-m-d H:i:s'
                 ),
             ),
@@ -465,8 +465,8 @@ 
         $content .= '<div class="show-on-mobile-view-only">';
         $content .= '<br>';
         $content .= $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-        $content .= '&nbsp;' . sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
-        $content .= '<br>' . sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
+        $content .= '&nbsp;'.sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
+        $content .= '<br>'.sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
         $content .= '</div>';
         return $content;
     }
@@ -551,12 +551,12 @@ 
                   . $event_name
                   . '</a>' : $event_name;
             $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('event_id' => $EVT_ID), REG_ADMIN_URL);
-            $actions['event_filter'] = '<a href="' . $edit_event_url . '" title="';
+            $actions['event_filter'] = '<a href="'.$edit_event_url.'" title="';
             $actions['event_filter'] .= sprintf(
                 esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
                 $event_name
             );
-            $actions['event_filter'] .= '">' . __('View Registrations', 'event_espresso') . '</a>';
+            $actions['event_filter'] .= '">'.__('View Registrations', 'event_espresso').'</a>';
         } else {
             $edit_event = $event_name;
             $actions['event_filter'] = '';
@@ -603,11 +603,11 @@ 
     {
         $content = '<div class="ee-registration-event-datetimes-container">';
         $expand_toggle = count($datetime_strings) > 1
-            ? ' <span title="' . esc_attr__('Click to view all dates', 'event_espresso')
+            ? ' <span title="'.esc_attr__('Click to view all dates', 'event_espresso')
               . '" class="ee-js ee-more-datetimes-toggle dashicons dashicons-plus"></span>'
             : '';
         // get first item for initial visibility
-        $content .= '<div class="left">' . array_shift($datetime_strings) . '</div>';
+        $content .= '<div class="left">'.array_shift($datetime_strings).'</div>';
         $content .= $expand_toggle;
         if ($datetime_strings) {
             $content .= '<div style="clear:both"></div>';
@@ -660,14 +660,14 @@ 
         $t = $item->get_first_related('Transaction');
         $payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
         // append group count to name
-        $link .= '&nbsp;' . sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
+        $link .= '&nbsp;'.sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
         // append reg_code
-        $link .= '<br>' . sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
+        $link .= '<br>'.sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
         // reg status text for accessibility
         $link .= '<br><span class="ee-status-text-small">'
                  . EEH_Template::pretty_status($item->status_ID(), false, 'sentence')
                  . '</span>';
-        $action = [ '_REG_ID' => $item->ID() ];
+        $action = ['_REG_ID' => $item->ID()];
         if (isset($this->_req_data['event_id'])) {
             $action['event_id'] = $item->event_ID();
         }
@@ -689,7 +689,7 @@ 
                                 . $trash_lnk_url
                                 . '" title="'
                                 . esc_attr__('Trash Registration', 'event_espresso')
-                                . '">' . __('Trash', 'event_espresso') . '</a>';
+                                . '">'.__('Trash', 'event_espresso').'</a>';
         } elseif ($this->_view === 'trash') {
             // restore registration link
             if (EE_Registry::instance()->CAP->current_user_can(
@@ -705,8 +705,8 @@ 
                 $actions['restore'] = '<a href="'
                                       . $restore_lnk_url
                                       . '" title="'
-                                      . esc_attr__('Restore Registration', 'event_espresso') . '">'
-                                      . __('Restore', 'event_espresso') . '</a>';
+                                      . esc_attr__('Restore Registration', 'event_espresso').'">'
+                                      . __('Restore', 'event_espresso').'</a>';
             }
             if (EE_Registry::instance()->CAP->current_user_can(
                 'ee_delete_registration',
@@ -779,7 +779,7 @@ 
                                                                               . $ticket->name()
                                                                               . '</span><br />' : '';
         if ($item->final_price() > 0) {
-            $content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
+            $content .= '<span class="reg-pad-rght">'.$item->pretty_final_price().'</span>';
         } else {
             // free event
             $content .= '<span class="reg-overview-free-event-spn reg-pad-rght">'
@@ -806,7 +806,7 @@ 
             : '<span class="TKT_name">'
               . $ticket->name()
               . '</span><br />';
-        $content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
+        $content .= '<span class="reg-pad-rght">'.$item->pretty_final_price().'</span>';
         return $content;
     }
 
@@ -824,7 +824,7 @@ 
         $payment_method = $item->payment_method();
         $payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name()
             : __('Unknown', 'event_espresso');
-        $content = '<span class="reg-pad-rght">' . $item->pretty_paid() . '</span>';
+        $content = '<span class="reg-pad-rght">'.$item->pretty_paid().'</span>';
         if ($item->paid() > 0) {
             $content .= '<br><span class="ee-status-text-small">'
                         . sprintf(
@@ -872,7 +872,7 @@ 
                   . esc_attr__('View Transaction', 'event_espresso')
                   . '">'
                   . $item->transaction()->pretty_total()
-                  . '</a></span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_total() . '</span>';
+                  . '</a></span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_total().'</span>';
         } else {
             return __("None", "event_espresso");
         }
@@ -918,7 +918,7 @@ 
                       . esc_attr__('View Transaction', 'event_espresso')
                       . '">'
                       . $item->transaction()->pretty_paid()
-                      . '</a><span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
+                      . '</a><span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_paid().'</span>';
             }
         }
         return '&nbsp;';
@@ -988,8 +988,8 @@ 
                                && $attendee instanceof EE_Attendee
             ? '
 			<li>
-			<a href="' . $edit_lnk_url . '" title="'
-              . esc_attr__('Edit Contact Details', 'event_espresso') . '" class="tiny-text">
+			<a href="' . $edit_lnk_url.'" title="'
+              . esc_attr__('Edit Contact Details', 'event_espresso').'" class="tiny-text">
 				<div class="ee-icon ee-icon-user-edit ee-icon-size-16"></div>
 			</a>
 			</li>' : '';
@@ -1061,7 +1061,7 @@ 
                                                      'see_notifications_for',
                                                      null,
                                                      array('_REG_ID' => $item->ID())
-                                                 ) . '</li>';
+                                                 ).'</li>';
         }
         $actions = apply_filters('FHEE__EE_Registrations_List_Table__column_actions__actions', $actions, $item, $this);
         return $this->_action_string(implode('', $actions), $item, 'ul', 'reg-overview-actions-ul');

caffeinated/admin/extend/transactions/Extend_Transactions_Admin_Page.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
      *
      * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
      *
-     * @return int
+     * @return string
      */
     private function _revenue_per_event_report($period = '-1 month')
     {

Indentation +243 added lines, -243 removed lines

@@ -16,247 +16,247 @@
 {
 
 
-    /**
-     * This is used to hold the reports template data which is setup early in the request.
-     *
-     * @type array
-     */
-    protected $_reports_template_data = array();
-
-    /**
-     * @Constructor
-     * @access public
-     *
-     * @param bool $routing
-     *
-     * @return \Extend_Transactions_Admin_Page
-     */
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-        define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-        define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
-    }
-
-
-    /**
-     *    _extend_page_config
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _extend_page_config()
-    {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
-
-        $new_page_routes = array(
-            'reports' => array(
-                'func'       => '_transaction_reports',
-                'capability' => 'ee_read_transactions',
-            ),
-        );
-
-        $this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
-
-        $new_page_config = array(
-            'reports' => array(
-                'nav'           => array(
-                    'label' => __('Reports', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'help_tabs'     => array(
-                    'transactions_reports_help_tab' => array(
-                        'title'    => __('Transaction Reports', 'event_espresso'),
-                        'filename' => 'transactions_reports',
-                    ),
-                ),
-                /*'help_tour' => array( 'Transaction_Reports_Help_Tour' ),*/
-                'require_nonce' => false,
-            ),
-        );
-        $this->_page_config = array_merge($this->_page_config, $new_page_config);
-    }
-
-
-    /**
-     *    load_scripts_styles_reports
-     *
-     * @access public
-     * @return void
-     */
-    public function load_scripts_styles_reports()
-    {
-        wp_register_script(
-            'ee-txn-reports-js',
-            TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js',
-            array('google-charts'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('ee-txn-reports-js');
-        $this->_transaction_reports_js_setup();
-        EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
-    }
-
-
-    /**
-     * This is called when javascript is being enqueued to setup the various data needed for the reports js.
-     * Also $this->{$_reports_template_data} property is set for later usage by the _transaction_reports method.
-     */
-    protected function _transaction_reports_js_setup()
-    {
-        $this->_reports_template_data['admin_reports'][] = $this->_revenue_per_day_report();
-        $this->_reports_template_data['admin_reports'][] = $this->_revenue_per_event_report();
-    }
-
-
-    /**
-     * _transaction_reports
-     *    generates Business Reports regarding Transactions
-     *
-     * @return void
-     */
-    protected function _transaction_reports()
-    {
-        $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
-        $this->_admin_page_title = __('Transactions', 'event_espresso');
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $template_path,
-            $this->_reports_template_data,
-            true
-        );
-
-        // the final template wrapper
-        $this->display_admin_page_with_no_sidebar();
-    }
-
-
-    /**
-     * _revenue_per_day_report
-     * generates Business Report showing Total Revenue per Day.
-     *
-     * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
-     *
-     * @return string
-     */
-    private function _revenue_per_day_report($period = '-1 month')
-    {
-
-        $report_ID = 'txn-admin-revenue-per-day-report-dv';
-
-        $TXN = EEM_Transaction::instance();
-
-        $results = $TXN->get_revenue_per_day_report($period);
-        $results = (array) $results;
-        $revenue = array();
-        $subtitle = '';
-
-        if ($results) {
-            $revenue[] = array(
-                __('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'),
-                __('Total Revenue', 'event_espresso'),
-            );
-            foreach ($results as $result) {
-                $revenue[] = array($result->txnDate, (float) $result->revenue);
-            }
-
-            // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $subtitle = sprintf(
-                wp_strip_all_tags(
-                    _x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
-                ),
-                $beginning_date->format('Y-m-d'),
-                $ending_date->format('Y-m-d')
-            );
-        }
-
-        $report_title = wp_strip_all_tags(__('Total Revenue per Day', 'event_espresso'));
-
-        $report_params = array(
-            'title'     => $report_title,
-            'subtitle'  => $subtitle,
-            'id'        => $report_ID,
-            'revenue'   => $revenue,
-            'noResults' => empty($revenue) || count($revenue) === 1,
-            'noTxnMsg'  => sprintf(
-                wp_strip_all_tags(
-                    __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
-                ),
-                '<h2>' . $report_title . '</h2><p>',
-                '</p>'
-            ),
-        );
-        wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
-
-        return $report_ID;
-    }
-
-
-    /**
-     * _revenue_per_event_report
-     * generates Business Report showing total revenue per event.
-     *
-     * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
-     *
-     * @return int
-     */
-    private function _revenue_per_event_report($period = '-1 month')
-    {
-
-        $report_ID = 'txn-admin-revenue-per-event-report-dv';
-
-        $TXN = EEM_Transaction::instance();
-        $results = $TXN->get_revenue_per_event_report($period);
-        $results = (array) $results;
-        $revenue = array();
-        $subtitle = '';
-
-        if ($results) {
-            $revenue[] = array(
-                __('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'),
-                __('Total Revenue', 'event_espresso'),
-            );
-            foreach ($results as $result) {
-                if ($result->revenue > 1) {
-                    $event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
-                    $event_name = wp_trim_words($event_name, 5, '...');
-                    $revenue[] = array($event_name, (float) $result->revenue);
-                }
-            }
-
-            // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
-            $subtitle = sprintf(
-                wp_strip_all_tags(
-                    _x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
-                ),
-                $beginning_date->format('Y-m-d'),
-                $ending_date->format('Y-m-d')
-            );
-        }
-
-        $report_title = wp_strip_all_tags(__('Total Revenue per Event', 'event_espresso'));
-
-        $report_params = array(
-            'title'     => $report_title,
-            'subtitle'  => $subtitle,
-            'id'        => $report_ID,
-            'revenue'   => $revenue,
-            'noResults' => empty($revenue),
-            'noTxnMsg'  => sprintf(
-                wp_strip_all_tags(
-                    __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
-                ),
-                '<h2>' . $report_title . '</h2><p>',
-                '</p>'
-            ),
-        );
-        wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
-
-        return $report_ID;
-    }
+	/**
+	 * This is used to hold the reports template data which is setup early in the request.
+	 *
+	 * @type array
+	 */
+	protected $_reports_template_data = array();
+
+	/**
+	 * @Constructor
+	 * @access public
+	 *
+	 * @param bool $routing
+	 *
+	 * @return \Extend_Transactions_Admin_Page
+	 */
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
+		define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
+		define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+	}
+
+
+	/**
+	 *    _extend_page_config
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _extend_page_config()
+	{
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+
+		$new_page_routes = array(
+			'reports' => array(
+				'func'       => '_transaction_reports',
+				'capability' => 'ee_read_transactions',
+			),
+		);
+
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
+
+		$new_page_config = array(
+			'reports' => array(
+				'nav'           => array(
+					'label' => __('Reports', 'event_espresso'),
+					'order' => 20,
+				),
+				'help_tabs'     => array(
+					'transactions_reports_help_tab' => array(
+						'title'    => __('Transaction Reports', 'event_espresso'),
+						'filename' => 'transactions_reports',
+					),
+				),
+				/*'help_tour' => array( 'Transaction_Reports_Help_Tour' ),*/
+				'require_nonce' => false,
+			),
+		);
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
+	}
+
+
+	/**
+	 *    load_scripts_styles_reports
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function load_scripts_styles_reports()
+	{
+		wp_register_script(
+			'ee-txn-reports-js',
+			TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js',
+			array('google-charts'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('ee-txn-reports-js');
+		$this->_transaction_reports_js_setup();
+		EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts();
+	}
+
+
+	/**
+	 * This is called when javascript is being enqueued to setup the various data needed for the reports js.
+	 * Also $this->{$_reports_template_data} property is set for later usage by the _transaction_reports method.
+	 */
+	protected function _transaction_reports_js_setup()
+	{
+		$this->_reports_template_data['admin_reports'][] = $this->_revenue_per_day_report();
+		$this->_reports_template_data['admin_reports'][] = $this->_revenue_per_event_report();
+	}
+
+
+	/**
+	 * _transaction_reports
+	 *    generates Business Reports regarding Transactions
+	 *
+	 * @return void
+	 */
+	protected function _transaction_reports()
+	{
+		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+		$this->_admin_page_title = __('Transactions', 'event_espresso');
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$template_path,
+			$this->_reports_template_data,
+			true
+		);
+
+		// the final template wrapper
+		$this->display_admin_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * _revenue_per_day_report
+	 * generates Business Report showing Total Revenue per Day.
+	 *
+	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
+	 *
+	 * @return string
+	 */
+	private function _revenue_per_day_report($period = '-1 month')
+	{
+
+		$report_ID = 'txn-admin-revenue-per-day-report-dv';
+
+		$TXN = EEM_Transaction::instance();
+
+		$results = $TXN->get_revenue_per_day_report($period);
+		$results = (array) $results;
+		$revenue = array();
+		$subtitle = '';
+
+		if ($results) {
+			$revenue[] = array(
+				__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'),
+				__('Total Revenue', 'event_espresso'),
+			);
+			foreach ($results as $result) {
+				$revenue[] = array($result->txnDate, (float) $result->revenue);
+			}
+
+			// setup the date range.
+			$beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(
+				wp_strip_all_tags(
+					_x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
+				),
+				$beginning_date->format('Y-m-d'),
+				$ending_date->format('Y-m-d')
+			);
+		}
+
+		$report_title = wp_strip_all_tags(__('Total Revenue per Day', 'event_espresso'));
+
+		$report_params = array(
+			'title'     => $report_title,
+			'subtitle'  => $subtitle,
+			'id'        => $report_ID,
+			'revenue'   => $revenue,
+			'noResults' => empty($revenue) || count($revenue) === 1,
+			'noTxnMsg'  => sprintf(
+				wp_strip_all_tags(
+					__('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
+				),
+				'<h2>' . $report_title . '</h2><p>',
+				'</p>'
+			),
+		);
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params);
+
+		return $report_ID;
+	}
+
+
+	/**
+	 * _revenue_per_event_report
+	 * generates Business Report showing total revenue per event.
+	 *
+	 * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated.
+	 *
+	 * @return int
+	 */
+	private function _revenue_per_event_report($period = '-1 month')
+	{
+
+		$report_ID = 'txn-admin-revenue-per-event-report-dv';
+
+		$TXN = EEM_Transaction::instance();
+		$results = $TXN->get_revenue_per_event_report($period);
+		$results = (array) $results;
+		$revenue = array();
+		$subtitle = '';
+
+		if ($results) {
+			$revenue[] = array(
+				__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'),
+				__('Total Revenue', 'event_espresso'),
+			);
+			foreach ($results as $result) {
+				if ($result->revenue > 1) {
+					$event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
+					$event_name = wp_trim_words($event_name, 5, '...');
+					$revenue[] = array($event_name, (float) $result->revenue);
+				}
+			}
+
+			// setup the date range.
+			$beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+			$subtitle = sprintf(
+				wp_strip_all_tags(
+					_x('For the period: %s to %s', 'Used to give date range', 'event_espresso')
+				),
+				$beginning_date->format('Y-m-d'),
+				$ending_date->format('Y-m-d')
+			);
+		}
+
+		$report_title = wp_strip_all_tags(__('Total Revenue per Event', 'event_espresso'));
+
+		$report_params = array(
+			'title'     => $report_title,
+			'subtitle'  => $subtitle,
+			'id'        => $report_ID,
+			'revenue'   => $revenue,
+			'noResults' => empty($revenue),
+			'noTxnMsg'  => sprintf(
+				wp_strip_all_tags(
+					__('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
+				),
+				'<h2>' . $report_title . '</h2><p>',
+				'</p>'
+			),
+		);
+		wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params);
+
+		return $report_ID;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -34,9 +34,9 @@ 
     public function __construct($routing = true)
     {
         parent::__construct($routing);
-        define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-        define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-        define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+        define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/');
+        define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/');
+        define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/');
     }
 
 
@@ -48,7 +48,7 @@ 
      */
     protected function _extend_page_config()
     {
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions';
 
         $new_page_routes = array(
             'reports' => array(
@@ -89,7 +89,7 @@ 
     {
         wp_register_script(
             'ee-txn-reports-js',
-            TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js',
+            TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js',
             array('google-charts'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -119,7 +119,7 @@ 
      */
     protected function _transaction_reports()
     {
-        $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+        $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
         $this->_admin_page_title = __('Transactions', 'event_espresso');
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
             $template_path,
@@ -162,7 +162,7 @@ 
             }
 
             // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+            $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $subtitle = sprintf(
                 wp_strip_all_tags(
@@ -185,7 +185,7 @@ 
                 wp_strip_all_tags(
                     __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
                 ),
-                '<h2>' . $report_title . '</h2><p>',
+                '<h2>'.$report_title.'</h2><p>',
                 '</p>'
             ),
         );
@@ -228,7 +228,7 @@ 
             }
 
             // setup the date range.
-            $beginning_date = new DateTime('now' . $period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
+            $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone()));
             $subtitle = sprintf(
                 wp_strip_all_tags(
@@ -251,7 +251,7 @@ 
                 wp_strip_all_tags(
                     __('%sThere is no revenue to report for the last 30 days.%s', 'event_espresso')
                 ),
-                '<h2>' . $report_title . '</h2><p>',
+                '<h2>'.$report_title.'</h2><p>',
                 '</p>'
             ),
         );

caffeinated/EE_Caf_Messages.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
      *
      * @param  array $dir_ref original array of paths
      *
-     * @return array           appended paths
+     * @return string[]           appended paths
      */
     public function messages_autoload_paths($dir_ref)
     {
@@ -701,7 +701,7 @@ 
      * @param EE_Question[]  $questions        An array of questions indexed by answer id.
      * @param EE_Answer[]    $answers          An array of answer objects
      * @param string         $template         Template content to be parsed.
-     * @param array          $valid_shortcodes Valid shortcodes for the template being parsed.
+     * @param string[]          $valid_shortcodes Valid shortcodes for the template being parsed.
      * @param array          $extra_data       Extra data that might be used when parsing the template.
      */
     protected function _parse_question_list_for_primary_or_recipient_registration(

Indentation +799 added lines, -799 removed lines

@@ -13,803 +13,803 @@
 {
 
 
-    /**
-     * constructor.
-     */
-    public function __construct()
-    {
-        $this->_caf_hooks();
-    }
-
-
-    /**
-     * Contains all the hooks filters for setting up caffeinated messages functionality.
-     *
-     * @since 4.3.2
-     *
-     * @return void
-     */
-    private function _caf_hooks()
-    {
-        add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array($this, 'messages_autoload_paths'), 5);
-        add_filter(
-            'FHEE__EE_Email_messenger__get_validator_config',
-            array($this, 'email_messenger_validator_config'),
-            5,
-            2
-        );
-        add_filter(
-            'FHEE__EE_Email_messenger__get_template_fields',
-            array($this, 'email_messenger_template_fields'),
-            5,
-            2
-        );
-        add_filter(
-            'FHEE__EE_Html_messenger__get_template_fields',
-            array($this, 'html_messenger_template_fields'),
-            5,
-            2
-        );
-        add_filter(
-            'FHEE__EE_Html_messenger__get_validator_config',
-            array($this, 'html_messenger_validator_config'),
-            5,
-            2
-        );
-        add_filter('FHEE__EE_Pdf_messenger__get_template_fields', array($this, 'pdf_messenger_template_fields'), 5, 2);
-        add_filter(
-            'FHEE__EE_Pdf_messenger__get_validator_config',
-            array($this, 'pdf_messenger_validator_config'),
-            5,
-            2
-        );
-        add_filter(
-            'FHEE__EE_Messages_Template_Pack__get_specific_template__contents',
-            array($this, 'new_default_templates'),
-            5,
-            7
-        );
-        add_filter(
-            'FHEE__EE_Messages_Base__get_valid_shortcodes',
-            array($this, 'message_types_valid_shortcodes'),
-            5,
-            2
-        );
-
-        // shortcode parsers
-        add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array($this, 'additional_attendee_shortcodes'), 5, 2);
-        add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array($this, 'additional_attendee_parser'), 5, 5);
-        add_filter(
-            'FHEE__EE_Recipient_List_Shortcodes__shortcodes',
-            array($this, 'additional_recipient_details_shortcodes'),
-            5,
-            2
-        );
-        add_filter(
-            'FHEE__EE_Recipient_List_Shortcodes__parser_after',
-            array($this, 'additional_recipient_details_parser'),
-            5,
-            5
-        );
-        add_filter(
-            'FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes',
-            array($this, 'additional_primary_registration_details_shortcodes'),
-            5,
-            2
-        );
-        add_filter(
-            'FHEE__EE_Primary_Registration_List_Shortcodes__parser_after',
-            array($this, 'additional_primary_registration_details_parser'),
-            5,
-            5
-        );
-
-        /**
-         * @since 4.2.0
-         */
-        add_filter('FHEE__EE_Datetime_Shortcodes__shortcodes', array($this, 'additional_datetime_shortcodes'), 10, 2);
-        add_filter('FHEE__EE_Datetime_Shortcodes__parser_after', array($this, 'additional_datetime_parser'), 10, 5);
-
-        /**
-         * @since 4.3.0
-         */
-        // eat our own dog food!
-        add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_message_types'));
-        add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_shortcodes'));
-        do_action('EE_Brewing_Regular___messages_caf');
-    }
-
-
-    /**
-     * This just allows us to add additional paths to the autoloader (EED_Messages::autoload_messages()) for the
-     * messages system.
-     *
-     * @param  array $dir_ref original array of paths
-     *
-     * @return array           appended paths
-     */
-    public function messages_autoload_paths($dir_ref)
-    {
-        $dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
-
-        return $dir_ref;
-    }
-
-
-    public function email_messenger_validator_config($validator_config, EE_Email_messenger $messenger)
-    {
-        $validator_config['attendee_list'] = array(
-            'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
-            'required'   => array('[ATTENDEE_LIST]'),
-        );
-        $validator_config['question_list'] = array(
-            'shortcodes' => array('question'),
-            'required'   => array('[QUESTION_LIST]'),
-        );
-
-        return $validator_config;
-    }
-
-
-    public function html_messenger_validator_config($validator_config, EE_Html_messenger $messenger)
-    {
-        $validator_config['attendee_list'] = array(
-            'shortcodes' => array('attendee', 'question_list'),
-            'required'   => array('[ATTENDEE_LIST]'),
-        );
-        $validator_config['question_list'] = array(
-            'shortcodes' => array('question'),
-            'required'   => array('[QUESTION_LIST]'),
-        );
-
-        return $validator_config;
-    }
-
-
-    public function pdf_messenger_validator_config($validator_config, EE_Pdf_messenger $messenger)
-    {
-        $validator_config['attendee_list'] = array(
-            'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
-            'required'   => array('[ATTENDEE_LIST]'),
-        );
-        $validator_config['question_list'] = array(
-            'shortcodes' => array('question'),
-            'required'   => array('[QUESTION_LIST]'),
-        );
-
-        return $validator_config;
-    }
-
-
-    public function email_messenger_template_fields($template_fields, EE_Email_messenger $messenger)
-    {
-        $template_fields['extra']['content']['question_list'] = array(
-            'input'               => 'textarea',
-            'label'               => '[QUESTION_LIST]',
-            'type'                => 'string',
-            'required'            => true,
-            'validation'          => true,
-            'format'              => '%s',
-            'css_class'           => 'large-text',
-            'rows'                => '5',
-            'shortcodes_required' => array('[QUESTION_LIST]'),
-        );
-
-        return $template_fields;
-    }
-
-
-    public function html_messenger_template_fields($template_fields, EE_Html_messenger $messenger)
-    {
-        $template_fields['extra']['content']['question_list'] = array(
-            'input'               => 'textarea',
-            'label'               => '[QUESTION_LIST]',
-            'type'                => 'string',
-            'required'            => true,
-            'validation'          => true,
-            'format'              => '%s',
-            'css_class'           => 'large-text',
-            'rows'                => '5',
-            'shortcodes_required' => array('[QUESTION_LIST]'),
-        );
-
-        return $template_fields;
-    }
-
-
-    public function pdf_messenger_template_fields($template_fields, EE_Pdf_messenger $messenger)
-    {
-        $template_fields['extra']['content']['question_list'] = array(
-            'input'               => 'textarea',
-            'label'               => '[QUESTION_LIST]',
-            'type'                => 'string',
-            'required'            => true,
-            'validation'          => true,
-            'format'              => '%s',
-            'css_class'           => 'large-text',
-            'rows'                => '5',
-            'shortcodes_required' => array('[QUESTION_LIST]'),
-        );
-
-        return $template_fields;
-    }
-
-
-    public function new_default_templates(
-        $contents,
-        $actual_path,
-        EE_messenger $messenger,
-        EE_message_type $message_type,
-        $field,
-        $context,
-        EE_Messages_Template_Pack $template_pack
-    ) {
-
-        // we're only modifying templates for the default template pack
-        if (! $template_pack instanceof EE_Messages_Template_Pack_Default) {
-            return $contents;
-        }
-
-        // the template file name we're replacing contents for.
-        $template_file_prefix = $field . '_' . $context;
-        $msg_prefix = $messenger->name . '_' . $message_type->name . '_';
-
-        $base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
-
-        if ($messenger->name == 'email' && $message_type->name == 'registration') {
-            switch ($template_file_prefix) {
-                case 'question_list_admin':
-                case 'question_list_attendee':
-                case 'question_list_primary_attendee':
-                    $path = $base_path . $msg_prefix . 'question_list.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-
-                case 'attendee_list_primary_attendee':
-                    $path = $base_path . $msg_prefix . 'attendee_list.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-
-                case 'attendee_list_admin':
-                    $path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
-                    $contents = EEH_Template::display_template(
-                        $path,
-                        array(),
-                        true
-                    );
-                    break;
-
-                case 'attendee_list_attendee':
-                    $contents = '';
-                    break;
-
-                case 'event_list_attendee':
-                    $path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-            }
-        } elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
-            switch ($template_file_prefix) {
-                case 'content_attendee':
-                    $path = $base_path . $msg_prefix . 'content.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-
-                case 'newsletter_content_attendee':
-                    $path = $base_path . $msg_prefix . 'newsletter_content.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-
-                case 'newsletter_subject_attendee':
-                    $path = $base_path . $msg_prefix . 'subject.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-            }
-        } elseif ($messenger->name == 'html' && $message_type->name == 'receipt') {
-            switch ($template_file_prefix) {
-                case 'attendee_list_purchaser':
-                    $path = $base_path . $msg_prefix . 'attendee_list.template.php';
-                    $contents = EEH_Template::display_template($path, array(), true);
-                    break;
-            }
-        }
-
-        return $contents;
-    }
-
-
-    public function message_types_valid_shortcodes($valid_shortcodes, EE_Messages_Base $msg)
-    {
-        // make sure question_list and question are ONLY added for the core message types.  Any other message types will have to explicitly set question_list as a valid shortcode.
-        $include_with = array(
-            'registration',
-            'cancelled_registration',
-            'declined_registration',
-            'not_approved_registration',
-            'payment_declined',
-            'payment_failed',
-            'payment_cancelled',
-            'payment',
-            'payment_reminder',
-            'pending_approval',
-            'registration_summary',
-            'invoice',
-            'receipt',
-        );
-        if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
-            $contexts = array_keys($msg->get_contexts());
-            foreach ($contexts as $context) {
-                $valid_shortcodes[ $context ][] = 'question_list';
-                $valid_shortcodes[ $context ][] = 'question';
-            }
-        }
-
-        return $valid_shortcodes;
-    }
-
-
-    public function additional_attendee_shortcodes($shortcodes, $shortcode_parser)
-    {
-        $shortcodes['[ANSWER_*]'] = __(
-            'This is a special dynamic shortcode. Right after the "*", add the exact text of a existing question, and if there is an answer for that question for this registrant, that will take the place of this shortcode.',
-            'event_espresso'
-        );
-
-        return $shortcodes;
-    }
-
-
-    public function additional_attendee_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
-    {
-
-        if (strpos($shortcode, '[ANSWER_*') === false
-            || ! isset($extra_data['data']->questions)
-            || ! isset($extra_data['data']->registrations)
-        ) {
-            return $parsed;
-        }
-
-        // let's get the question from the code.
-        $shortcode = str_replace('[ANSWER_*', '', $shortcode);
-        $shortcode = trim(str_replace(']', '', $shortcode));
-
-        $registration = $data instanceof EE_Registration ? $data : null;
-        $registration = ! $registration instanceof EE_Registration && is_array(
-            $extra_data
-        ) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
-
-        $aee = $data instanceof EE_Messages_Addressee ? $data : null;
-        $aee = ! $aee instanceof EE_Messages_Addressee && is_array(
-            $extra_data
-        ) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
-
-        if (! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
-            return $parsed;
-        }
-
-        // now let's figure out which question has this text.
-        foreach ($aee->questions as $ansid => $question) {
-            if ($question instanceof EE_Question
-                && trim($question->display_text()) == trim($shortcode)
-                && isset($aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ])
-            ) {
-                return $aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ]->get_pretty(
-                    'ANS_value',
-                    'no_wpautop'
-                );
-            }
-        }
-
-        // nothing!
-        return $parsed;
-    }
-
-
-    /**
-     * Callback for additional shortcodes filter for adding additional datetime shortcodes.
-     *
-     * @since  4.2
-     *
-     * @param  array                  $shortcodes         array of shortcodes and
-     *                                                    descriptions
-     * @param  EE_Datetime_Shortcodes $shortcode_parser   EE_Shortcodes object
-     *
-     * @return array                                        array of shortcodes and
-     *                                                        descriptions
-     */
-    public function additional_datetime_shortcodes($shortcodes, $shortcode_parser)
-    {
-        $shortcodes['[DTT_NAME]'] = __(
-            'This will be parsed to the Title given for a Datetime',
-            'event_espresso'
-        );
-        $shortcodes['[DTT_DESCRIPTION]'] = __(
-            'This will be parsed to the description for a Datetime',
-            'event_espresso'
-        );
-        $shortcodes['[DTT_NAME_OR_DATES]'] = __(
-            'When parsed, if the Datetime has a name, it is used, otherwise a formatted string including the start date and end date will be used.',
-            'event_espresso'
-        );
-
-        return $shortcodes;
-    }
-
-
-    /**
-     * Callback for additional shortcodes parser filter used for adding parser for new
-     * Datetime shortcodes
-     *
-     * @since  4.2
-     *
-     * @param  string                 $parsed     The finished parsed string for the given shortcode.
-     * @param  string                 $shortcode  The shortcode being parsed.
-     * @param  object                 $data       The incoming data object for the Shortcode Parser.
-     * @param  object                 $extra_data The incoming extra date object for the Shortcode
-     *                                            Parser.
-     * @param  EE_Datetime_Shortcodes $shortcode_parser
-     *
-     * @return string                   The new parsed string.
-     */
-    public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
-    {
-
-        if (! $data instanceof EE_Datetime) {
-            return ''; // get out because we can only parse with the datetime object.
-        }
-
-        switch ($shortcode) {
-            case '[DTT_NAME]':
-                return $data->name();
-                break;
-            case '[DTT_DESCRIPTION]':
-                return $data->description();
-                break;
-            case '[DTT_NAME_OR_DATES]':
-                return $data->get_dtt_display_name(true);
-                break;
-            default:
-                return $parsed;
-                break;
-        }
-    }
-
-
-    public function additional_recipient_details_shortcodes($shortcodes, $shortcode_parser)
-    {
-        $shortcodes['[RECIPIENT_QUESTION_LIST]'] = __(
-            'This is used to indicate where you want the list of questions and answers to show for the person receiving the message.',
-            'event_espresso'
-        );
-
-        return $shortcodes;
-    }
-
-
-    /**
-     * Callback for FHEE__EE_Recipient_List_Shortcodes__parser_after filter (dynamic filter).
-     *
-     * @param string         $parsed           The original parsed content for the shortcode
-     * @param string         $shortcode        The shortcode being parsed
-     * @param array          $data             The shortcode parser data array
-     * @param array          $extra_data       The shortcode parser extra data array
-     * @param \EE_Shortcodes $shortcode_parser Shortcode parser.
-     *
-     * @return string
-     */
-    public function additional_recipient_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
-    {
-
-        if (array($data) && ! isset($data['data'])) {
-            return $parsed;
-        }
-
-        $recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : null;
-        $recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
-
-        if (! $recipient instanceof EE_Messages_Addressee) {
-            return $parsed;
-        }
-
-        switch ($shortcode) {
-            case '[RECIPIENT_QUESTION_LIST]':
-                $att = $recipient->att_obj;
-                $registrations_on_attendee = $att instanceof EE_Attendee
-                    ? $recipient->attendees[ $att->ID() ]['reg_objs']
-                    : array();
-                $registrations_on_attendee = empty($registrations_on_attendee) && $recipient->reg_obj instanceof EE_Registration ? array($recipient->reg_obj) : $registrations_on_attendee;
-                $answers = array();
-
-                $template = is_array($data['template']) && isset($data['template']['question_list'])
-                    ? $data['template']['question_list']
-                    : $extra_data['template']['question_list'];
-                $valid_shortcodes = array('question');
-
-                // if the context is main_content then get all answers for all registrations on this attendee
-                if ($data['data'] instanceof EE_Messages_Addressee) {
-                    foreach ($registrations_on_attendee as $reg) {
-                        if ($reg instanceof EE_Registration) {
-                            $anss = ! empty($recipient->registrations[ $reg->ID() ]['ans_objs'])
-                                ? $recipient->registrations[ $reg->ID() ]['ans_objs']
-                                : array();
-                            foreach ($anss as $ans) {
-                                if ($ans instanceof EE_Answer) {
-                                    $answers[ $ans->ID() ] = $ans;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // if the context is the event list parser, then let's return just the answers for all registrations attached to the recipient for that event.
-                if ($data['data'] instanceof EE_Event) {
-                    $event = $data['data'];
-                    foreach ($registrations_on_attendee as $reg) {
-                        if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
-                            $anss = ! empty($recipient->registrations[ $reg->ID() ]['ans_objs'])
-                                ? $recipient->registrations[ $reg->ID() ]['ans_objs']
-                                : array();
-                            foreach ($anss as $ans) {
-                                if ($ans instanceof EE_Answer) {
-                                    $answers[ $ans->ID() ] = $ans;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                $questions = $questions = isset($recipient->questions) ? $recipient->questions : array();
-
-                // if $extra_data does not have a 'data' key then let's make sure we add it and set the EE_Messages_Addressee
-                // object on it.
-                if (! isset($extra_data['data'])) {
-                    $extra_data['data'] = $recipient;
-                }
-
-                return $this->_parse_question_list_for_primary_or_recipient_registration(
-                    $shortcode_parser,
-                    $questions,
-                    $answers,
-                    $template,
-                    $valid_shortcodes,
-                    $extra_data
-                );
-                break;
-
-            default:
-                return $parsed;
-                break;
-        }
-    }
-
-
-    public function additional_primary_registration_details_shortcodes($shortcodes, $shortcode_parser)
-    {
-        $shortcodes['[PRIMARY_REGISTRANT_QUESTION_LIST]'] = __(
-            'This is used to indicate the questions and answers for the primary_registrant. It should be placed in the "[attendee_list]" field',
-            'event_espresso'
-        );
-
-        return $shortcodes;
-    }
-
-
-    /**
-     * Callback for FHEE__EE_Primary_Registration_List_Shortcodes__parser_after filter (dynamic filter).
-     *
-     * @param string         $parsed           The original parsed content for the shortcode
-     * @param string         $shortcode        The shortcode being parsed
-     * @param array          $data             The shortcode parser data array
-     * @param array          $extra_data       The shortcode parser extra data array
-     * @param \EE_Shortcodes $shortcode_parser Shortcode parser.
-     *
-     * @return string
-     */
-    public function additional_primary_registration_details_parser(
-        $parsed,
-        $shortcode,
-        $data,
-        $extra_data,
-        $shortcode_parser
-    ) {
-        if (array($data) && ! isset($data['data'])) {
-            return $parsed;
-        }
-
-        $recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : null;
-        $recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
-
-        if (! $recipient instanceof EE_Messages_Addressee) {
-            return $parsed;
-        }
-
-        switch ($shortcode) {
-            case '[PRIMARY_REGISTRANT_QUESTION_LIST]':
-                if (! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration) {
-                    return '';
-                }
-                $registration = $recipient->primary_reg_obj;
-                $answers = isset($recipient->registrations[ $registration->ID() ]['ans_objs'])
-                    ? $recipient->registrations[ $registration->ID() ]['ans_objs']
-                    : array();
-                if (empty($answers)) {
-                    return '';
-                }
-                $template = is_array($data['template']) && isset($data['template']['question_list'])
-                    ? $data['template']['question_list']
-                    : $extra_data['template']['question_list'];
-                $valid_shortcodes = array('question');
-                $answers = $recipient->registrations[ $registration->ID() ]['ans_objs'];
-                $questions = isset($recipient->questions) ? $recipient->questions : array();
-                // if $extra_data does not have a 'data' key then let's make sure we add it and set the EE_Messages_Addressee
-                // object on it.
-                if (! isset($extra_data['data'])) {
-                    $extra_data['data'] = $recipient;
-                }
-                return $this->_parse_question_list_for_primary_or_recipient_registration(
-                    $shortcode_parser,
-                    $questions,
-                    $answers,
-                    $template,
-                    $valid_shortcodes,
-                    $extra_data
-                );
-                break;
-
-            default:
-                return $parsed;
-                break;
-        }
-    }
-
-
-    /**
-     * Takes care of registering the  message types that are only available in caffeinated EE.
-     *
-     * @since   4.3.2
-     *
-     * @return  void
-     */
-    public function register_caf_message_types()
-    {
-        // register newsletter message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Newsletter_message_type.class.php',
-            'autoloadpaths'                                    => array(
-                EE_CAF_LIBRARIES . 'messages/message_type/newsletter/',
-            ),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('newsletter', $setup_args);
-
-        // register payment reminder message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Payment_Reminder_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/'),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('payment_reminder', $setup_args);
-
-        // register payment declined message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Payment_Declined_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/'),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('payment_declined', $setup_args);
-
-        // register registration declined message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Declined_Registration_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/'),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('declined_registration', $setup_args);
-
-        // register registration cancelled message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Cancelled_Registration_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/'),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('cancelled_registration', $setup_args);
-
-
-        // register payment failed message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Payment_Failed_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/'),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('payment_failed', $setup_args);
-
-        // register payment declined message type
-        $setup_args = array(
-            'mtfilename'                                       => 'EE_Payment_Cancelled_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/'),
-            'messengers_to_activate_with'                      => array('email'),
-            'messengers_to_validate_with'                      => array('email'),
-            'messengers_supporting_default_template_pack_with' => array('email'),
-        );
-        EE_Register_Message_Type::register('payment_cancelled', $setup_args);
-    }
-
-
-    /**
-     * Takes care of registering the  shortcode libraries implemented with caffeinated EE and set up related items.
-     *
-     * @since   4.3.2
-     *
-     * @return void
-     */
-    public function register_caf_shortcodes()
-    {
-        $setup_args = array(
-            'autoloadpaths'                 => array(
-                EE_CAF_LIBRARIES . 'shortcodes/',
-            ),
-            'msgr_validator_callback'       => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
-            'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
-            'list_type_shortcodes'          => array('[NEWSLETTER_CONTENT]'),
-        );
-        EE_Register_Messages_Shortcode_Library::register('newsletter', $setup_args);
-    }
-
-
-    /**
-     * Parses a question list shortcode using given data and template
-     *
-     * @param \EE_Shortcodes $shortcode_parser
-     * @param EE_Question[]  $questions        An array of questions indexed by answer id.
-     * @param EE_Answer[]    $answers          An array of answer objects
-     * @param string         $template         Template content to be parsed.
-     * @param array          $valid_shortcodes Valid shortcodes for the template being parsed.
-     * @param array          $extra_data       Extra data that might be used when parsing the template.
-     */
-    protected function _parse_question_list_for_primary_or_recipient_registration(
-        $shortcode_parser,
-        $questions,
-        $answers,
-        $template,
-        $valid_shortcodes,
-        $extra_data
-    ) {
-        $question_list = '';
-        /** @var EEH_Parse_Shortcodes $shortcode_helper */
-        $shortcode_helper = $shortcode_parser->get_shortcode_helper();
-        foreach ($answers as $answer) {
-            if ($answer instanceof EE_Answer) {
-                // first see if the question is in our $questions array. If not then try to get from answer object.
-                $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
-                $question = ! $question instanceof EE_Question ? $answer->question() : $question;
-                if (! $question instanceof EE_Question
-                    || (
-                        $question instanceof EE_Question
-                        && $question->admin_only()
-                    )
-                ) {
-                    continue;
-                }
-                $question_list .= $shortcode_helper->parse_question_list_template(
-                    $template,
-                    $answer,
-                    $valid_shortcodes,
-                    $extra_data
-                );
-            }
-        }
-        return $question_list;
-    }
+	/**
+	 * constructor.
+	 */
+	public function __construct()
+	{
+		$this->_caf_hooks();
+	}
+
+
+	/**
+	 * Contains all the hooks filters for setting up caffeinated messages functionality.
+	 *
+	 * @since 4.3.2
+	 *
+	 * @return void
+	 */
+	private function _caf_hooks()
+	{
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array($this, 'messages_autoload_paths'), 5);
+		add_filter(
+			'FHEE__EE_Email_messenger__get_validator_config',
+			array($this, 'email_messenger_validator_config'),
+			5,
+			2
+		);
+		add_filter(
+			'FHEE__EE_Email_messenger__get_template_fields',
+			array($this, 'email_messenger_template_fields'),
+			5,
+			2
+		);
+		add_filter(
+			'FHEE__EE_Html_messenger__get_template_fields',
+			array($this, 'html_messenger_template_fields'),
+			5,
+			2
+		);
+		add_filter(
+			'FHEE__EE_Html_messenger__get_validator_config',
+			array($this, 'html_messenger_validator_config'),
+			5,
+			2
+		);
+		add_filter('FHEE__EE_Pdf_messenger__get_template_fields', array($this, 'pdf_messenger_template_fields'), 5, 2);
+		add_filter(
+			'FHEE__EE_Pdf_messenger__get_validator_config',
+			array($this, 'pdf_messenger_validator_config'),
+			5,
+			2
+		);
+		add_filter(
+			'FHEE__EE_Messages_Template_Pack__get_specific_template__contents',
+			array($this, 'new_default_templates'),
+			5,
+			7
+		);
+		add_filter(
+			'FHEE__EE_Messages_Base__get_valid_shortcodes',
+			array($this, 'message_types_valid_shortcodes'),
+			5,
+			2
+		);
+
+		// shortcode parsers
+		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array($this, 'additional_attendee_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array($this, 'additional_attendee_parser'), 5, 5);
+		add_filter(
+			'FHEE__EE_Recipient_List_Shortcodes__shortcodes',
+			array($this, 'additional_recipient_details_shortcodes'),
+			5,
+			2
+		);
+		add_filter(
+			'FHEE__EE_Recipient_List_Shortcodes__parser_after',
+			array($this, 'additional_recipient_details_parser'),
+			5,
+			5
+		);
+		add_filter(
+			'FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes',
+			array($this, 'additional_primary_registration_details_shortcodes'),
+			5,
+			2
+		);
+		add_filter(
+			'FHEE__EE_Primary_Registration_List_Shortcodes__parser_after',
+			array($this, 'additional_primary_registration_details_parser'),
+			5,
+			5
+		);
+
+		/**
+		 * @since 4.2.0
+		 */
+		add_filter('FHEE__EE_Datetime_Shortcodes__shortcodes', array($this, 'additional_datetime_shortcodes'), 10, 2);
+		add_filter('FHEE__EE_Datetime_Shortcodes__parser_after', array($this, 'additional_datetime_parser'), 10, 5);
+
+		/**
+		 * @since 4.3.0
+		 */
+		// eat our own dog food!
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_message_types'));
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_shortcodes'));
+		do_action('EE_Brewing_Regular___messages_caf');
+	}
+
+
+	/**
+	 * This just allows us to add additional paths to the autoloader (EED_Messages::autoload_messages()) for the
+	 * messages system.
+	 *
+	 * @param  array $dir_ref original array of paths
+	 *
+	 * @return array           appended paths
+	 */
+	public function messages_autoload_paths($dir_ref)
+	{
+		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
+
+		return $dir_ref;
+	}
+
+
+	public function email_messenger_validator_config($validator_config, EE_Email_messenger $messenger)
+	{
+		$validator_config['attendee_list'] = array(
+			'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
+			'required'   => array('[ATTENDEE_LIST]'),
+		);
+		$validator_config['question_list'] = array(
+			'shortcodes' => array('question'),
+			'required'   => array('[QUESTION_LIST]'),
+		);
+
+		return $validator_config;
+	}
+
+
+	public function html_messenger_validator_config($validator_config, EE_Html_messenger $messenger)
+	{
+		$validator_config['attendee_list'] = array(
+			'shortcodes' => array('attendee', 'question_list'),
+			'required'   => array('[ATTENDEE_LIST]'),
+		);
+		$validator_config['question_list'] = array(
+			'shortcodes' => array('question'),
+			'required'   => array('[QUESTION_LIST]'),
+		);
+
+		return $validator_config;
+	}
+
+
+	public function pdf_messenger_validator_config($validator_config, EE_Pdf_messenger $messenger)
+	{
+		$validator_config['attendee_list'] = array(
+			'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
+			'required'   => array('[ATTENDEE_LIST]'),
+		);
+		$validator_config['question_list'] = array(
+			'shortcodes' => array('question'),
+			'required'   => array('[QUESTION_LIST]'),
+		);
+
+		return $validator_config;
+	}
+
+
+	public function email_messenger_template_fields($template_fields, EE_Email_messenger $messenger)
+	{
+		$template_fields['extra']['content']['question_list'] = array(
+			'input'               => 'textarea',
+			'label'               => '[QUESTION_LIST]',
+			'type'                => 'string',
+			'required'            => true,
+			'validation'          => true,
+			'format'              => '%s',
+			'css_class'           => 'large-text',
+			'rows'                => '5',
+			'shortcodes_required' => array('[QUESTION_LIST]'),
+		);
+
+		return $template_fields;
+	}
+
+
+	public function html_messenger_template_fields($template_fields, EE_Html_messenger $messenger)
+	{
+		$template_fields['extra']['content']['question_list'] = array(
+			'input'               => 'textarea',
+			'label'               => '[QUESTION_LIST]',
+			'type'                => 'string',
+			'required'            => true,
+			'validation'          => true,
+			'format'              => '%s',
+			'css_class'           => 'large-text',
+			'rows'                => '5',
+			'shortcodes_required' => array('[QUESTION_LIST]'),
+		);
+
+		return $template_fields;
+	}
+
+
+	public function pdf_messenger_template_fields($template_fields, EE_Pdf_messenger $messenger)
+	{
+		$template_fields['extra']['content']['question_list'] = array(
+			'input'               => 'textarea',
+			'label'               => '[QUESTION_LIST]',
+			'type'                => 'string',
+			'required'            => true,
+			'validation'          => true,
+			'format'              => '%s',
+			'css_class'           => 'large-text',
+			'rows'                => '5',
+			'shortcodes_required' => array('[QUESTION_LIST]'),
+		);
+
+		return $template_fields;
+	}
+
+
+	public function new_default_templates(
+		$contents,
+		$actual_path,
+		EE_messenger $messenger,
+		EE_message_type $message_type,
+		$field,
+		$context,
+		EE_Messages_Template_Pack $template_pack
+	) {
+
+		// we're only modifying templates for the default template pack
+		if (! $template_pack instanceof EE_Messages_Template_Pack_Default) {
+			return $contents;
+		}
+
+		// the template file name we're replacing contents for.
+		$template_file_prefix = $field . '_' . $context;
+		$msg_prefix = $messenger->name . '_' . $message_type->name . '_';
+
+		$base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
+
+		if ($messenger->name == 'email' && $message_type->name == 'registration') {
+			switch ($template_file_prefix) {
+				case 'question_list_admin':
+				case 'question_list_attendee':
+				case 'question_list_primary_attendee':
+					$path = $base_path . $msg_prefix . 'question_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+
+				case 'attendee_list_primary_attendee':
+					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+
+				case 'attendee_list_admin':
+					$path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
+					$contents = EEH_Template::display_template(
+						$path,
+						array(),
+						true
+					);
+					break;
+
+				case 'attendee_list_attendee':
+					$contents = '';
+					break;
+
+				case 'event_list_attendee':
+					$path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+			}
+		} elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
+			switch ($template_file_prefix) {
+				case 'content_attendee':
+					$path = $base_path . $msg_prefix . 'content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+
+				case 'newsletter_content_attendee':
+					$path = $base_path . $msg_prefix . 'newsletter_content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+
+				case 'newsletter_subject_attendee':
+					$path = $base_path . $msg_prefix . 'subject.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+			}
+		} elseif ($messenger->name == 'html' && $message_type->name == 'receipt') {
+			switch ($template_file_prefix) {
+				case 'attendee_list_purchaser':
+					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
+					break;
+			}
+		}
+
+		return $contents;
+	}
+
+
+	public function message_types_valid_shortcodes($valid_shortcodes, EE_Messages_Base $msg)
+	{
+		// make sure question_list and question are ONLY added for the core message types.  Any other message types will have to explicitly set question_list as a valid shortcode.
+		$include_with = array(
+			'registration',
+			'cancelled_registration',
+			'declined_registration',
+			'not_approved_registration',
+			'payment_declined',
+			'payment_failed',
+			'payment_cancelled',
+			'payment',
+			'payment_reminder',
+			'pending_approval',
+			'registration_summary',
+			'invoice',
+			'receipt',
+		);
+		if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
+			$contexts = array_keys($msg->get_contexts());
+			foreach ($contexts as $context) {
+				$valid_shortcodes[ $context ][] = 'question_list';
+				$valid_shortcodes[ $context ][] = 'question';
+			}
+		}
+
+		return $valid_shortcodes;
+	}
+
+
+	public function additional_attendee_shortcodes($shortcodes, $shortcode_parser)
+	{
+		$shortcodes['[ANSWER_*]'] = __(
+			'This is a special dynamic shortcode. Right after the "*", add the exact text of a existing question, and if there is an answer for that question for this registrant, that will take the place of this shortcode.',
+			'event_espresso'
+		);
+
+		return $shortcodes;
+	}
+
+
+	public function additional_attendee_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
+	{
+
+		if (strpos($shortcode, '[ANSWER_*') === false
+			|| ! isset($extra_data['data']->questions)
+			|| ! isset($extra_data['data']->registrations)
+		) {
+			return $parsed;
+		}
+
+		// let's get the question from the code.
+		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
+		$shortcode = trim(str_replace(']', '', $shortcode));
+
+		$registration = $data instanceof EE_Registration ? $data : null;
+		$registration = ! $registration instanceof EE_Registration && is_array(
+			$extra_data
+		) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
+
+		$aee = $data instanceof EE_Messages_Addressee ? $data : null;
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array(
+			$extra_data
+		) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
+
+		if (! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
+			return $parsed;
+		}
+
+		// now let's figure out which question has this text.
+		foreach ($aee->questions as $ansid => $question) {
+			if ($question instanceof EE_Question
+				&& trim($question->display_text()) == trim($shortcode)
+				&& isset($aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ])
+			) {
+				return $aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ]->get_pretty(
+					'ANS_value',
+					'no_wpautop'
+				);
+			}
+		}
+
+		// nothing!
+		return $parsed;
+	}
+
+
+	/**
+	 * Callback for additional shortcodes filter for adding additional datetime shortcodes.
+	 *
+	 * @since  4.2
+	 *
+	 * @param  array                  $shortcodes         array of shortcodes and
+	 *                                                    descriptions
+	 * @param  EE_Datetime_Shortcodes $shortcode_parser   EE_Shortcodes object
+	 *
+	 * @return array                                        array of shortcodes and
+	 *                                                        descriptions
+	 */
+	public function additional_datetime_shortcodes($shortcodes, $shortcode_parser)
+	{
+		$shortcodes['[DTT_NAME]'] = __(
+			'This will be parsed to the Title given for a Datetime',
+			'event_espresso'
+		);
+		$shortcodes['[DTT_DESCRIPTION]'] = __(
+			'This will be parsed to the description for a Datetime',
+			'event_espresso'
+		);
+		$shortcodes['[DTT_NAME_OR_DATES]'] = __(
+			'When parsed, if the Datetime has a name, it is used, otherwise a formatted string including the start date and end date will be used.',
+			'event_espresso'
+		);
+
+		return $shortcodes;
+	}
+
+
+	/**
+	 * Callback for additional shortcodes parser filter used for adding parser for new
+	 * Datetime shortcodes
+	 *
+	 * @since  4.2
+	 *
+	 * @param  string                 $parsed     The finished parsed string for the given shortcode.
+	 * @param  string                 $shortcode  The shortcode being parsed.
+	 * @param  object                 $data       The incoming data object for the Shortcode Parser.
+	 * @param  object                 $extra_data The incoming extra date object for the Shortcode
+	 *                                            Parser.
+	 * @param  EE_Datetime_Shortcodes $shortcode_parser
+	 *
+	 * @return string                   The new parsed string.
+	 */
+	public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
+	{
+
+		if (! $data instanceof EE_Datetime) {
+			return ''; // get out because we can only parse with the datetime object.
+		}
+
+		switch ($shortcode) {
+			case '[DTT_NAME]':
+				return $data->name();
+				break;
+			case '[DTT_DESCRIPTION]':
+				return $data->description();
+				break;
+			case '[DTT_NAME_OR_DATES]':
+				return $data->get_dtt_display_name(true);
+				break;
+			default:
+				return $parsed;
+				break;
+		}
+	}
+
+
+	public function additional_recipient_details_shortcodes($shortcodes, $shortcode_parser)
+	{
+		$shortcodes['[RECIPIENT_QUESTION_LIST]'] = __(
+			'This is used to indicate where you want the list of questions and answers to show for the person receiving the message.',
+			'event_espresso'
+		);
+
+		return $shortcodes;
+	}
+
+
+	/**
+	 * Callback for FHEE__EE_Recipient_List_Shortcodes__parser_after filter (dynamic filter).
+	 *
+	 * @param string         $parsed           The original parsed content for the shortcode
+	 * @param string         $shortcode        The shortcode being parsed
+	 * @param array          $data             The shortcode parser data array
+	 * @param array          $extra_data       The shortcode parser extra data array
+	 * @param \EE_Shortcodes $shortcode_parser Shortcode parser.
+	 *
+	 * @return string
+	 */
+	public function additional_recipient_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
+	{
+
+		if (array($data) && ! isset($data['data'])) {
+			return $parsed;
+		}
+
+		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : null;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+
+		if (! $recipient instanceof EE_Messages_Addressee) {
+			return $parsed;
+		}
+
+		switch ($shortcode) {
+			case '[RECIPIENT_QUESTION_LIST]':
+				$att = $recipient->att_obj;
+				$registrations_on_attendee = $att instanceof EE_Attendee
+					? $recipient->attendees[ $att->ID() ]['reg_objs']
+					: array();
+				$registrations_on_attendee = empty($registrations_on_attendee) && $recipient->reg_obj instanceof EE_Registration ? array($recipient->reg_obj) : $registrations_on_attendee;
+				$answers = array();
+
+				$template = is_array($data['template']) && isset($data['template']['question_list'])
+					? $data['template']['question_list']
+					: $extra_data['template']['question_list'];
+				$valid_shortcodes = array('question');
+
+				// if the context is main_content then get all answers for all registrations on this attendee
+				if ($data['data'] instanceof EE_Messages_Addressee) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration) {
+							$anss = ! empty($recipient->registrations[ $reg->ID() ]['ans_objs'])
+								? $recipient->registrations[ $reg->ID() ]['ans_objs']
+								: array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
+									$answers[ $ans->ID() ] = $ans;
+								}
+							}
+						}
+					}
+				}
+
+				// if the context is the event list parser, then let's return just the answers for all registrations attached to the recipient for that event.
+				if ($data['data'] instanceof EE_Event) {
+					$event = $data['data'];
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+							$anss = ! empty($recipient->registrations[ $reg->ID() ]['ans_objs'])
+								? $recipient->registrations[ $reg->ID() ]['ans_objs']
+								: array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
+									$answers[ $ans->ID() ] = $ans;
+								}
+							}
+						}
+					}
+				}
+
+				$questions = $questions = isset($recipient->questions) ? $recipient->questions : array();
+
+				// if $extra_data does not have a 'data' key then let's make sure we add it and set the EE_Messages_Addressee
+				// object on it.
+				if (! isset($extra_data['data'])) {
+					$extra_data['data'] = $recipient;
+				}
+
+				return $this->_parse_question_list_for_primary_or_recipient_registration(
+					$shortcode_parser,
+					$questions,
+					$answers,
+					$template,
+					$valid_shortcodes,
+					$extra_data
+				);
+				break;
+
+			default:
+				return $parsed;
+				break;
+		}
+	}
+
+
+	public function additional_primary_registration_details_shortcodes($shortcodes, $shortcode_parser)
+	{
+		$shortcodes['[PRIMARY_REGISTRANT_QUESTION_LIST]'] = __(
+			'This is used to indicate the questions and answers for the primary_registrant. It should be placed in the "[attendee_list]" field',
+			'event_espresso'
+		);
+
+		return $shortcodes;
+	}
+
+
+	/**
+	 * Callback for FHEE__EE_Primary_Registration_List_Shortcodes__parser_after filter (dynamic filter).
+	 *
+	 * @param string         $parsed           The original parsed content for the shortcode
+	 * @param string         $shortcode        The shortcode being parsed
+	 * @param array          $data             The shortcode parser data array
+	 * @param array          $extra_data       The shortcode parser extra data array
+	 * @param \EE_Shortcodes $shortcode_parser Shortcode parser.
+	 *
+	 * @return string
+	 */
+	public function additional_primary_registration_details_parser(
+		$parsed,
+		$shortcode,
+		$data,
+		$extra_data,
+		$shortcode_parser
+	) {
+		if (array($data) && ! isset($data['data'])) {
+			return $parsed;
+		}
+
+		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : null;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+
+		if (! $recipient instanceof EE_Messages_Addressee) {
+			return $parsed;
+		}
+
+		switch ($shortcode) {
+			case '[PRIMARY_REGISTRANT_QUESTION_LIST]':
+				if (! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration) {
+					return '';
+				}
+				$registration = $recipient->primary_reg_obj;
+				$answers = isset($recipient->registrations[ $registration->ID() ]['ans_objs'])
+					? $recipient->registrations[ $registration->ID() ]['ans_objs']
+					: array();
+				if (empty($answers)) {
+					return '';
+				}
+				$template = is_array($data['template']) && isset($data['template']['question_list'])
+					? $data['template']['question_list']
+					: $extra_data['template']['question_list'];
+				$valid_shortcodes = array('question');
+				$answers = $recipient->registrations[ $registration->ID() ]['ans_objs'];
+				$questions = isset($recipient->questions) ? $recipient->questions : array();
+				// if $extra_data does not have a 'data' key then let's make sure we add it and set the EE_Messages_Addressee
+				// object on it.
+				if (! isset($extra_data['data'])) {
+					$extra_data['data'] = $recipient;
+				}
+				return $this->_parse_question_list_for_primary_or_recipient_registration(
+					$shortcode_parser,
+					$questions,
+					$answers,
+					$template,
+					$valid_shortcodes,
+					$extra_data
+				);
+				break;
+
+			default:
+				return $parsed;
+				break;
+		}
+	}
+
+
+	/**
+	 * Takes care of registering the  message types that are only available in caffeinated EE.
+	 *
+	 * @since   4.3.2
+	 *
+	 * @return  void
+	 */
+	public function register_caf_message_types()
+	{
+		// register newsletter message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Newsletter_message_type.class.php',
+			'autoloadpaths'                                    => array(
+				EE_CAF_LIBRARIES . 'messages/message_type/newsletter/',
+			),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('newsletter', $setup_args);
+
+		// register payment reminder message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Payment_Reminder_message_type.class.php',
+			'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/'),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('payment_reminder', $setup_args);
+
+		// register payment declined message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Payment_Declined_message_type.class.php',
+			'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/'),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('payment_declined', $setup_args);
+
+		// register registration declined message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Declined_Registration_message_type.class.php',
+			'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/'),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('declined_registration', $setup_args);
+
+		// register registration cancelled message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Cancelled_Registration_message_type.class.php',
+			'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/'),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('cancelled_registration', $setup_args);
+
+
+		// register payment failed message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Payment_Failed_message_type.class.php',
+			'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/'),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('payment_failed', $setup_args);
+
+		// register payment declined message type
+		$setup_args = array(
+			'mtfilename'                                       => 'EE_Payment_Cancelled_message_type.class.php',
+			'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/'),
+			'messengers_to_activate_with'                      => array('email'),
+			'messengers_to_validate_with'                      => array('email'),
+			'messengers_supporting_default_template_pack_with' => array('email'),
+		);
+		EE_Register_Message_Type::register('payment_cancelled', $setup_args);
+	}
+
+
+	/**
+	 * Takes care of registering the  shortcode libraries implemented with caffeinated EE and set up related items.
+	 *
+	 * @since   4.3.2
+	 *
+	 * @return void
+	 */
+	public function register_caf_shortcodes()
+	{
+		$setup_args = array(
+			'autoloadpaths'                 => array(
+				EE_CAF_LIBRARIES . 'shortcodes/',
+			),
+			'msgr_validator_callback'       => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
+			'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
+			'list_type_shortcodes'          => array('[NEWSLETTER_CONTENT]'),
+		);
+		EE_Register_Messages_Shortcode_Library::register('newsletter', $setup_args);
+	}
+
+
+	/**
+	 * Parses a question list shortcode using given data and template
+	 *
+	 * @param \EE_Shortcodes $shortcode_parser
+	 * @param EE_Question[]  $questions        An array of questions indexed by answer id.
+	 * @param EE_Answer[]    $answers          An array of answer objects
+	 * @param string         $template         Template content to be parsed.
+	 * @param array          $valid_shortcodes Valid shortcodes for the template being parsed.
+	 * @param array          $extra_data       Extra data that might be used when parsing the template.
+	 */
+	protected function _parse_question_list_for_primary_or_recipient_registration(
+		$shortcode_parser,
+		$questions,
+		$answers,
+		$template,
+		$valid_shortcodes,
+		$extra_data
+	) {
+		$question_list = '';
+		/** @var EEH_Parse_Shortcodes $shortcode_helper */
+		$shortcode_helper = $shortcode_parser->get_shortcode_helper();
+		foreach ($answers as $answer) {
+			if ($answer instanceof EE_Answer) {
+				// first see if the question is in our $questions array. If not then try to get from answer object.
+				$question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+				$question = ! $question instanceof EE_Question ? $answer->question() : $question;
+				if (! $question instanceof EE_Question
+					|| (
+						$question instanceof EE_Question
+						&& $question->admin_only()
+					)
+				) {
+					continue;
+				}
+				$question_list .= $shortcode_helper->parse_question_list_template(
+					$template,
+					$answer,
+					$valid_shortcodes,
+					$extra_data
+				);
+			}
+		}
+		return $question_list;
+	}
 }

Spacing +44 added lines, -44 removed lines

@@ -130,7 +130,7 @@ 
      */
     public function messages_autoload_paths($dir_ref)
     {
-        $dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
+        $dir_ref[] = EE_CAF_LIBRARIES.'shortcodes/';
 
         return $dir_ref;
     }
@@ -246,32 +246,32 @@ 
     ) {
 
         // we're only modifying templates for the default template pack
-        if (! $template_pack instanceof EE_Messages_Template_Pack_Default) {
+        if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default) {
             return $contents;
         }
 
         // the template file name we're replacing contents for.
-        $template_file_prefix = $field . '_' . $context;
-        $msg_prefix = $messenger->name . '_' . $message_type->name . '_';
+        $template_file_prefix = $field.'_'.$context;
+        $msg_prefix = $messenger->name.'_'.$message_type->name.'_';
 
-        $base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
+        $base_path = EE_CAF_LIBRARIES.'messages/defaults/default/';
 
         if ($messenger->name == 'email' && $message_type->name == 'registration') {
             switch ($template_file_prefix) {
                 case 'question_list_admin':
                 case 'question_list_attendee':
                 case 'question_list_primary_attendee':
-                    $path = $base_path . $msg_prefix . 'question_list.template.php';
+                    $path = $base_path.$msg_prefix.'question_list.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
 
                 case 'attendee_list_primary_attendee':
-                    $path = $base_path . $msg_prefix . 'attendee_list.template.php';
+                    $path = $base_path.$msg_prefix.'attendee_list.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
 
                 case 'attendee_list_admin':
-                    $path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
+                    $path = $base_path.$msg_prefix.'attendee_list_admin.template.php';
                     $contents = EEH_Template::display_template(
                         $path,
                         array(),
@@ -284,31 +284,31 @@ 
                     break;
 
                 case 'event_list_attendee':
-                    $path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
+                    $path = $base_path.$msg_prefix.'event_list_attendee.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
             }
         } elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
             switch ($template_file_prefix) {
                 case 'content_attendee':
-                    $path = $base_path . $msg_prefix . 'content.template.php';
+                    $path = $base_path.$msg_prefix.'content.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
 
                 case 'newsletter_content_attendee':
-                    $path = $base_path . $msg_prefix . 'newsletter_content.template.php';
+                    $path = $base_path.$msg_prefix.'newsletter_content.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
 
                 case 'newsletter_subject_attendee':
-                    $path = $base_path . $msg_prefix . 'subject.template.php';
+                    $path = $base_path.$msg_prefix.'subject.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
             }
         } elseif ($messenger->name == 'html' && $message_type->name == 'receipt') {
             switch ($template_file_prefix) {
                 case 'attendee_list_purchaser':
-                    $path = $base_path . $msg_prefix . 'attendee_list.template.php';
+                    $path = $base_path.$msg_prefix.'attendee_list.template.php';
                     $contents = EEH_Template::display_template($path, array(), true);
                     break;
             }
@@ -339,8 +339,8 @@ 
         if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
             $contexts = array_keys($msg->get_contexts());
             foreach ($contexts as $context) {
-                $valid_shortcodes[ $context ][] = 'question_list';
-                $valid_shortcodes[ $context ][] = 'question';
+                $valid_shortcodes[$context][] = 'question_list';
+                $valid_shortcodes[$context][] = 'question';
             }
         }
 
@@ -383,7 +383,7 @@ 
             $extra_data
         ) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
 
-        if (! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
+        if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
             return $parsed;
         }
 
@@ -391,9 +391,9 @@ 
         foreach ($aee->questions as $ansid => $question) {
             if ($question instanceof EE_Question
                 && trim($question->display_text()) == trim($shortcode)
-                && isset($aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ])
+                && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid])
             ) {
-                return $aee->registrations[ $registration->ID() ]['ans_objs'][ $ansid ]->get_pretty(
+                return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty(
                     'ANS_value',
                     'no_wpautop'
                 );
@@ -454,7 +454,7 @@ 
     public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser)
     {
 
-        if (! $data instanceof EE_Datetime) {
+        if ( ! $data instanceof EE_Datetime) {
             return ''; // get out because we can only parse with the datetime object.
         }
 
@@ -507,7 +507,7 @@ 
         $recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : null;
         $recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-        if (! $recipient instanceof EE_Messages_Addressee) {
+        if ( ! $recipient instanceof EE_Messages_Addressee) {
             return $parsed;
         }
 
@@ -515,7 +515,7 @@ 
             case '[RECIPIENT_QUESTION_LIST]':
                 $att = $recipient->att_obj;
                 $registrations_on_attendee = $att instanceof EE_Attendee
-                    ? $recipient->attendees[ $att->ID() ]['reg_objs']
+                    ? $recipient->attendees[$att->ID()]['reg_objs']
                     : array();
                 $registrations_on_attendee = empty($registrations_on_attendee) && $recipient->reg_obj instanceof EE_Registration ? array($recipient->reg_obj) : $registrations_on_attendee;
                 $answers = array();
@@ -529,12 +529,12 @@ 
                 if ($data['data'] instanceof EE_Messages_Addressee) {
                     foreach ($registrations_on_attendee as $reg) {
                         if ($reg instanceof EE_Registration) {
-                            $anss = ! empty($recipient->registrations[ $reg->ID() ]['ans_objs'])
-                                ? $recipient->registrations[ $reg->ID() ]['ans_objs']
+                            $anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs'])
+                                ? $recipient->registrations[$reg->ID()]['ans_objs']
                                 : array();
                             foreach ($anss as $ans) {
                                 if ($ans instanceof EE_Answer) {
-                                    $answers[ $ans->ID() ] = $ans;
+                                    $answers[$ans->ID()] = $ans;
                                 }
                             }
                         }
@@ -546,12 +546,12 @@ 
                     $event = $data['data'];
                     foreach ($registrations_on_attendee as $reg) {
                         if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
-                            $anss = ! empty($recipient->registrations[ $reg->ID() ]['ans_objs'])
-                                ? $recipient->registrations[ $reg->ID() ]['ans_objs']
+                            $anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs'])
+                                ? $recipient->registrations[$reg->ID()]['ans_objs']
                                 : array();
                             foreach ($anss as $ans) {
                                 if ($ans instanceof EE_Answer) {
-                                    $answers[ $ans->ID() ] = $ans;
+                                    $answers[$ans->ID()] = $ans;
                                 }
                             }
                         }
@@ -562,7 +562,7 @@ 
 
                 // if $extra_data does not have a 'data' key then let's make sure we add it and set the EE_Messages_Addressee
                 // object on it.
-                if (! isset($extra_data['data'])) {
+                if ( ! isset($extra_data['data'])) {
                     $extra_data['data'] = $recipient;
                 }
 
@@ -619,18 +619,18 @@ 
         $recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : null;
         $recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-        if (! $recipient instanceof EE_Messages_Addressee) {
+        if ( ! $recipient instanceof EE_Messages_Addressee) {
             return $parsed;
         }
 
         switch ($shortcode) {
             case '[PRIMARY_REGISTRANT_QUESTION_LIST]':
-                if (! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration) {
+                if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration) {
                     return '';
                 }
                 $registration = $recipient->primary_reg_obj;
-                $answers = isset($recipient->registrations[ $registration->ID() ]['ans_objs'])
-                    ? $recipient->registrations[ $registration->ID() ]['ans_objs']
+                $answers = isset($recipient->registrations[$registration->ID()]['ans_objs'])
+                    ? $recipient->registrations[$registration->ID()]['ans_objs']
                     : array();
                 if (empty($answers)) {
                     return '';
@@ -639,11 +639,11 @@ 
                     ? $data['template']['question_list']
                     : $extra_data['template']['question_list'];
                 $valid_shortcodes = array('question');
-                $answers = $recipient->registrations[ $registration->ID() ]['ans_objs'];
+                $answers = $recipient->registrations[$registration->ID()]['ans_objs'];
                 $questions = isset($recipient->questions) ? $recipient->questions : array();
                 // if $extra_data does not have a 'data' key then let's make sure we add it and set the EE_Messages_Addressee
                 // object on it.
-                if (! isset($extra_data['data'])) {
+                if ( ! isset($extra_data['data'])) {
                     $extra_data['data'] = $recipient;
                 }
                 return $this->_parse_question_list_for_primary_or_recipient_registration(
@@ -676,7 +676,7 @@ 
         $setup_args = array(
             'mtfilename'                                       => 'EE_Newsletter_message_type.class.php',
             'autoloadpaths'                                    => array(
-                EE_CAF_LIBRARIES . 'messages/message_type/newsletter/',
+                EE_CAF_LIBRARIES.'messages/message_type/newsletter/',
             ),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
@@ -687,7 +687,7 @@ 
         // register payment reminder message type
         $setup_args = array(
             'mtfilename'                                       => 'EE_Payment_Reminder_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/'),
+            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES.'messages/message_type/payment_reminder/'),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
             'messengers_supporting_default_template_pack_with' => array('email'),
@@ -697,7 +697,7 @@ 
         // register payment declined message type
         $setup_args = array(
             'mtfilename'                                       => 'EE_Payment_Declined_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/'),
+            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES.'messages/message_type/payment_declined/'),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
             'messengers_supporting_default_template_pack_with' => array('email'),
@@ -707,7 +707,7 @@ 
         // register registration declined message type
         $setup_args = array(
             'mtfilename'                                       => 'EE_Declined_Registration_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/'),
+            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES.'messages/message_type/declined_registration/'),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
             'messengers_supporting_default_template_pack_with' => array('email'),
@@ -717,7 +717,7 @@ 
         // register registration cancelled message type
         $setup_args = array(
             'mtfilename'                                       => 'EE_Cancelled_Registration_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/'),
+            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES.'messages/message_type/cancelled_registration/'),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
             'messengers_supporting_default_template_pack_with' => array('email'),
@@ -728,7 +728,7 @@ 
         // register payment failed message type
         $setup_args = array(
             'mtfilename'                                       => 'EE_Payment_Failed_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/'),
+            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES.'messages/message_type/payment_failed/'),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
             'messengers_supporting_default_template_pack_with' => array('email'),
@@ -738,7 +738,7 @@ 
         // register payment declined message type
         $setup_args = array(
             'mtfilename'                                       => 'EE_Payment_Cancelled_message_type.class.php',
-            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/'),
+            'autoloadpaths'                                    => array(EE_CAF_LIBRARIES.'messages/message_type/payment_cancelled/'),
             'messengers_to_activate_with'                      => array('email'),
             'messengers_to_validate_with'                      => array('email'),
             'messengers_supporting_default_template_pack_with' => array('email'),
@@ -758,7 +758,7 @@ 
     {
         $setup_args = array(
             'autoloadpaths'                 => array(
-                EE_CAF_LIBRARIES . 'shortcodes/',
+                EE_CAF_LIBRARIES.'shortcodes/',
             ),
             'msgr_validator_callback'       => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
             'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
@@ -792,9 +792,9 @@ 
         foreach ($answers as $answer) {
             if ($answer instanceof EE_Answer) {
                 // first see if the question is in our $questions array. If not then try to get from answer object.
-                $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+                $question = isset($questions[$answer->ID()]) ? $questions[$answer->ID()] : null;
                 $question = ! $question instanceof EE_Question ? $answer->question() : $question;
-                if (! $question instanceof EE_Question
+                if ( ! $question instanceof EE_Question
                     || (
                         $question instanceof EE_Question
                         && $question->admin_only()

public/Espresso_Arabica_2014/content-espresso_events-datetimes.php

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
-if ( is_single() || ( is_archive() && espresso_display_datetimes_in_event_list() ) ) :
+if (is_single() || (is_archive() && espresso_display_datetimes_in_event_list())) :
 global $post;
-do_action( 'AHEE_event_details_before_event_date', $post );
+do_action('AHEE_event_details_before_event_date', $post);
 ?>
 	<div class="event-datetimes">
-		<?php espresso_list_of_event_dates( $post->ID );?>
+		<?php espresso_list_of_event_dates($post->ID); ?>
 	</div>
 	<!-- .event-datetimes -->
 <?php
-do_action( 'AHEE_event_details_after_event_date', $post );
+do_action('AHEE_event_details_after_event_date', $post);
 endif;
 ?>
\ No newline at end of file

core/db_models/fields/EE_Field_With_Model_Name.php

Spacing +2 added lines, -2 removed lines

@@ -70,10 +70,10 @@
         $model_names = array();
         if (is_array($this->_model_name_pointed_to)) {
             foreach ($this->_model_name_pointed_to as $model_name) {
-                $model_names[] = "EE_" . $model_name;
+                $model_names[] = "EE_".$model_name;
             }
         } else {
-            $model_names = array("EE_" . $this->_model_name_pointed_to);
+            $model_names = array("EE_".$this->_model_name_pointed_to);
         }
         return $model_names;
     }

Indentation +79 added lines, -79 removed lines

@@ -8,88 +8,88 @@
  */
 abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base
 {
-    /**
-     * Usually the name of a single model. However, as in the case for custom post types,
-     * it can actually be an array of models
-     *
-     * @var string or array
-     */
-    protected $_model_name_pointed_to;
+	/**
+	 * Usually the name of a single model. However, as in the case for custom post types,
+	 * it can actually be an array of models
+	 *
+	 * @var string or array
+	 */
+	protected $_model_name_pointed_to;
 
-    /**
-     * @param string  $table_column  name fo column for field
-     * @param string  $nicename      should eb internationalized with __('blah','event_espresso')
-     * @param boolean $nullable
-     * @param mixed   $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul
-     *                               dbe a string
-     * @param string  $model_name    eg 'Event','Answer','Term', etc. Basically its the model class's name without the
-     *                               "EEM_"
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value, $model_name)
-    {
-        $this->_model_name_pointed_to = $model_name;
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-    }
+	/**
+	 * @param string  $table_column  name fo column for field
+	 * @param string  $nicename      should eb internationalized with __('blah','event_espresso')
+	 * @param boolean $nullable
+	 * @param mixed   $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul
+	 *                               dbe a string
+	 * @param string  $model_name    eg 'Event','Answer','Term', etc. Basically its the model class's name without the
+	 *                               "EEM_"
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value, $model_name)
+	{
+		$this->_model_name_pointed_to = $model_name;
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+	}
 
-    /**
-     * Returns the name of the model(s) pointed to
-     *
-     * @deprecated since version 4.6.7
-     * @return mixed string or array of strings
-     */
-    public function get_model_name_pointed_to()
-    {
-        EE_Error::doing_it_wrong(
-            'get_model_name_pointed_to',
-            __(
-                'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array',
-                'event_espresso'
-            ),
-            '4.6.7'
-        );
-        return $this->_model_name_pointed_to;
-    }
+	/**
+	 * Returns the name of the model(s) pointed to
+	 *
+	 * @deprecated since version 4.6.7
+	 * @return mixed string or array of strings
+	 */
+	public function get_model_name_pointed_to()
+	{
+		EE_Error::doing_it_wrong(
+			'get_model_name_pointed_to',
+			__(
+				'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array',
+				'event_espresso'
+			),
+			'4.6.7'
+		);
+		return $this->_model_name_pointed_to;
+	}
 
-    /**
-     * Gets the model names pointed to by this field, always as an array
-     * (even if there's only one)
-     *
-     * @return array of model names pointed to by this field
-     */
-    public function get_model_names_pointed_to()
-    {
-        if (is_array($this->_model_name_pointed_to)) {
-            return $this->_model_name_pointed_to;
-        } else {
-            return array($this->_model_name_pointed_to);
-        }
-    }
+	/**
+	 * Gets the model names pointed to by this field, always as an array
+	 * (even if there's only one)
+	 *
+	 * @return array of model names pointed to by this field
+	 */
+	public function get_model_names_pointed_to()
+	{
+		if (is_array($this->_model_name_pointed_to)) {
+			return $this->_model_name_pointed_to;
+		} else {
+			return array($this->_model_name_pointed_to);
+		}
+	}
 
-    /**
-     * Returns the model's classname (eg EE_Event instead of just Event)
-     *
-     * @return array
-     */
-    public function get_model_class_names_pointed_to()
-    {
-        $model_names = array();
-        if (is_array($this->_model_name_pointed_to)) {
-            foreach ($this->_model_name_pointed_to as $model_name) {
-                $model_names[] = "EE_" . $model_name;
-            }
-        } else {
-            $model_names = array("EE_" . $this->_model_name_pointed_to);
-        }
-        return $model_names;
-    }
+	/**
+	 * Returns the model's classname (eg EE_Event instead of just Event)
+	 *
+	 * @return array
+	 */
+	public function get_model_class_names_pointed_to()
+	{
+		$model_names = array();
+		if (is_array($this->_model_name_pointed_to)) {
+			foreach ($this->_model_name_pointed_to as $model_name) {
+				$model_names[] = "EE_" . $model_name;
+			}
+		} else {
+			$model_names = array("EE_" . $this->_model_name_pointed_to);
+		}
+		return $model_names;
+	}
 
-    public function is_model_obj_of_type_pointed_to($model_obj_or_ID)
-    {
-        foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) {
-            if ($model_obj_or_ID instanceof $model_obj_classname) {
-                return true;
-            }
-        }
-        return false;
-    }
+	public function is_model_obj_of_type_pointed_to($model_obj_or_ID)
+	{
+		foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) {
+			if ($model_obj_or_ID instanceof $model_obj_classname) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

core/db_models/fields/EE_Serialized_Text_Field.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function __construct($table_column, $nicename, $nullable, $default_value = null)
     {
         parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType(array('object','string'));
+        $this->setSchemaType(array('object', 'string'));
     }
 
 

Indentation +63 added lines, -63 removed lines

@@ -9,72 +9,72 @@
 class EE_Serialized_Text_Field extends EE_Text_Field_Base
 {
 
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType(array('object','string'));
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType(array('object','string'));
+	}
 
 
-    /**
-     * Value SHOULD be an array, and we want to now convert it to a serialized string
-     *
-     * @param array $value_of_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
-    {
-        return maybe_serialize($value_of_field_on_model_object);
-    }
+	/**
+	 * Value SHOULD be an array, and we want to now convert it to a serialized string
+	 *
+	 * @param array $value_of_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
+	{
+		return maybe_serialize($value_of_field_on_model_object);
+	}
 
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        $value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize($value_inputted_for_field_on_model_object);
-        if (is_string($value_inputted_for_field_on_model_object)) {
-            return parent::prepare_for_set($value_inputted_for_field_on_model_object);
-        } elseif (is_array($value_inputted_for_field_on_model_object)) {
-            return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
-        } else {// so they passed NULL or an INT or something wack
-            return $value_inputted_for_field_on_model_object;
-        }
-    }
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		$value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize($value_inputted_for_field_on_model_object);
+		if (is_string($value_inputted_for_field_on_model_object)) {
+			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
+		} elseif (is_array($value_inputted_for_field_on_model_object)) {
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
+		} else {// so they passed NULL or an INT or something wack
+			return $value_inputted_for_field_on_model_object;
+		}
+	}
 
-    /**
-     * Value provided should definetely be a serialized string. We should unserialize into an array
-     *
-     * @param string $value_found_in_db_for_model_object
-     * @return array
-     */
-    public function prepare_for_set_from_db($value_found_in_db_for_model_object)
-    {
-        return EEH_Array::maybe_unserialize($value_found_in_db_for_model_object);
-    }
+	/**
+	 * Value provided should definetely be a serialized string. We should unserialize into an array
+	 *
+	 * @param string $value_found_in_db_for_model_object
+	 * @return array
+	 */
+	public function prepare_for_set_from_db($value_found_in_db_for_model_object)
+	{
+		return EEH_Array::maybe_unserialize($value_found_in_db_for_model_object);
+	}
 
-    /**
-     * Gets a string representation of the array
-     *
-     * @param type   $value_on_field_to_be_outputted
-     * @param string $schema , possible values are ',', others can be added
-     * @return string
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        switch ($schema) {
-            case 'print_r':
-                $pretty_value = print_r($value_on_field_to_be_outputted, true);
-                break;
-            case 'as_table':
-                $pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
-                break;
-            default:
-                $pretty_value = implode(", ", $value_on_field_to_be_outputted);
-        }
-        return $pretty_value;
-    }
+	/**
+	 * Gets a string representation of the array
+	 *
+	 * @param type   $value_on_field_to_be_outputted
+	 * @param string $schema , possible values are ',', others can be added
+	 * @return string
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		switch ($schema) {
+			case 'print_r':
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
+				break;
+			case 'as_table':
+				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
+				break;
+			default:
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
+		}
+		return $pretty_value;
+	}
 }

core/db_models/fields/EE_DB_Only_Float_Field.php

Indentation +11 added lines, -11 removed lines

@@ -3,16 +3,16 @@
 
 class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base
 {
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('number');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('number');
+	}
 
 }

core/domain/EnqueueAssetsInterface.php

Indentation +39 added lines, -39 removed lines

@@ -8,45 +8,45 @@
 interface EnqueueAssetsInterface
 {
 
-    /**
-     * a place to register scripts and stylesheets with WordPress core
-     * IMPORTANT !!!
-     * ALL JavaScript files need to be registered for loading in the footer
-     * by setting the 5th parameter of wp_register_script() to ` true `
-     *
-     * @return void
-     */
-    public function registerScriptsAndStylesheets();
-
-    /**
-     * a place to enqueue previously registered stylesheets
-     * this will be called during the wp_enqueue_scripts hook for frontend requests
-     *
-     * @return void
-     */
-    public function enqueueStylesheets();
-
-    /**
-     * a place to enqueue previously registered stylesheets
-     * this will be called during the admin_enqueue_scripts hook for admin requests
-     *
-     * @return void
-     */
-    public function enqueueAdminStylesheets();
-
-    /**
-     * a place to enqueue previously registered scripts for frontend requests
-     *
-     * @return void
-     */
-    public function enqueueScripts();
-
-    /**
-     * a place to enqueue previously registered scripts for admin requests
-     *
-     * @return void
-     */
-    public function enqueueAdminScripts();
+	/**
+	 * a place to register scripts and stylesheets with WordPress core
+	 * IMPORTANT !!!
+	 * ALL JavaScript files need to be registered for loading in the footer
+	 * by setting the 5th parameter of wp_register_script() to ` true `
+	 *
+	 * @return void
+	 */
+	public function registerScriptsAndStylesheets();
+
+	/**
+	 * a place to enqueue previously registered stylesheets
+	 * this will be called during the wp_enqueue_scripts hook for frontend requests
+	 *
+	 * @return void
+	 */
+	public function enqueueStylesheets();
+
+	/**
+	 * a place to enqueue previously registered stylesheets
+	 * this will be called during the admin_enqueue_scripts hook for admin requests
+	 *
+	 * @return void
+	 */
+	public function enqueueAdminStylesheets();
+
+	/**
+	 * a place to enqueue previously registered scripts for frontend requests
+	 *
+	 * @return void
+	 */
+	public function enqueueScripts();
+
+	/**
+	 * a place to enqueue previously registered scripts for admin requests
+	 *
+	 * @return void
+	 */
+	public function enqueueAdminScripts();
 
 }
 // End of file EnqueueAssetsInterface.php