eventespresso / event-espresso-core

core/services/database/TableManager.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
             }
         }
         global $wpdb;
-        $wpdb->query('DROP TABLE ' . implode(', ', $tables_to_delete));
+        $wpdb->query('DROP TABLE '.implode(', ', $tables_to_delete));
         return $tables_to_delete;
     }
 

Indentation +206 added lines, -206 removed lines

@@ -17,211 +17,211 @@
 class TableManager extends \EE_Base
 {
 
-    /**
-     * @var TableAnalysis $table_analysis
-     */
-    private $table_analysis;
-
-
-
-    /**
-     * TableManager constructor.
-     *
-     * @param TableAnalysis $TableAnalysis
-     */
-    public function __construct(TableAnalysis $TableAnalysis)
-    {
-        $this->table_analysis = $TableAnalysis;
-    }
-
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function getTableAnalysis()
-    {
-        if ($this->table_analysis instanceof TableAnalysis) {
-            return $this->table_analysis;
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * @param string $table_name which can optionally start with $wpdb->prefix or not
-     * @param string $column_name
-     * @param string $column_info
-     * @return bool|false|int
-     */
-    public function addColumn($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL')
-    {
-        if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', false)) {
-            return false;
-        }
-        global $wpdb;
-        $full_table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-        $columns = $this->getTableColumns($table_name);
-        if ( ! in_array($column_name, $columns)) {
-            $alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info";
-            return $wpdb->query($alter_query);
-        }
-        return true;
-    }
-
-
-
-    /**
-     * Gets the name of all columns on the  table. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @global \wpdb $wpdb
-     * @param string $table_name
-     * @return array
-     */
-    public function getTableColumns($table_name)
-    {
-        global $wpdb;
-        $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-        $fieldArray = array();
-        if ( ! empty($table_name)) {
-            $columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name ");
-            if ($columns !== false) {
-                foreach ($columns as $column) {
-                    $fieldArray[] = $column->Field;
-                }
-            }
-        }
-        return $fieldArray;
-    }
-
-
-
-    /**
-     * Drops the specified table from the database. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @global \wpdb $wpdb
-     * @param string $table_name
-     * @return int
-     */
-    public function dropTable($table_name)
-    {
-        global $wpdb;
-        if ($this->getTableAnalysis()->tableExists($table_name)) {
-            $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-            return $wpdb->query("DROP TABLE IF EXISTS $table_name");
-        }
-        return 0;
-    }
-
-
-
-    /**
-     * Drops all the tables mentioned in a single MYSQL query. Double-checks
-     * each table name provided has a wpdb prefix attached, and that it exists.
-     * Returns the list actually deleted
-     *
-     * @global WPDB $wpdb
-     * @param array $table_names
-     * @return array of table names which we deleted
-     */
-    public function dropTables($table_names)
-    {
-        $tables_to_delete = array();
-        foreach ($table_names as $table_name) {
-            $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-            if ($this->getTableAnalysis()->tableExists($table_name)) {
-                $tables_to_delete[] = $table_name;
-            }
-        }
-        global $wpdb;
-        $wpdb->query('DROP TABLE ' . implode(', ', $tables_to_delete));
-        return $tables_to_delete;
-    }
-
-
-
-    /**
-     * Drops the specified index from the specified table. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @global \wpdb $wpdb
-     * @param string $table_name
-     * @param string $indexName
-     * @return int
-     */
-    public function dropIndex($table_name, $indexName)
-    {
-        if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', false)) {
-            return false;
-        }
-        global $wpdb;
-        $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-        $index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$indexName'";
-        if (
-            $this->getTableAnalysis()->tableExists($table_name)
-            && $wpdb->get_var($index_exists_query)
-               === $table_name //using get_var with the $index_exists_query returns the table's name
-        ) {
-            return $wpdb->query("ALTER TABLE $table_name DROP INDEX $indexName");
-        }
-        return 0;
-    }
-
-
-
-    /**
-     * Just creates the requested table. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @param string $table_name
-     * @param string $createSql defining the table's columns and indexes
-     * @param string $engine    (no need to specify "ENGINE=", that's implied)
-     * @return void
-     * @throws \EE_Error
-     */
-    public function createTable($table_name, $createSql, $engine = 'MyISAM')
-    {
-        // does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
-        if (preg_match('((((.*?))(,\s))+)', $createSql, $valid_column_data)) {
-            $table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
-            $SQL = "CREATE TABLE $table_name ( $createSql ) ENGINE=$engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;";
-            /** @var \wpdb $wpdb */
-            global $wpdb;
-            //get $wpdb to echo errors, but buffer them. This way at least WE know an error
-            //happened. And then we can choose to tell the end user
-            $old_show_errors_policy = $wpdb->show_errors(true);
-            $old_error_suppression_policy = $wpdb->suppress_errors(false);
-            ob_start();
-            dbDelta($SQL);
-            $output = ob_get_contents();
-            ob_end_clean();
-            $wpdb->show_errors($old_show_errors_policy);
-            $wpdb->suppress_errors($old_error_suppression_policy);
-            if ( ! empty($output)) {
-                throw new \EE_Error($output);
-            }
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __('The following table creation SQL does not contain valid information about the table columns: %1$s %2$s',
-                        'event_espresso'),
-                    '<br />',
-                    $createSql
-                )
-            );
-        }
-    }
+	/**
+	 * @var TableAnalysis $table_analysis
+	 */
+	private $table_analysis;
+
+
+
+	/**
+	 * TableManager constructor.
+	 *
+	 * @param TableAnalysis $TableAnalysis
+	 */
+	public function __construct(TableAnalysis $TableAnalysis)
+	{
+		$this->table_analysis = $TableAnalysis;
+	}
+
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function getTableAnalysis()
+	{
+		if ($this->table_analysis instanceof TableAnalysis) {
+			return $this->table_analysis;
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * @param string $table_name which can optionally start with $wpdb->prefix or not
+	 * @param string $column_name
+	 * @param string $column_info
+	 * @return bool|false|int
+	 */
+	public function addColumn($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL')
+	{
+		if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', false)) {
+			return false;
+		}
+		global $wpdb;
+		$full_table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+		$columns = $this->getTableColumns($table_name);
+		if ( ! in_array($column_name, $columns)) {
+			$alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info";
+			return $wpdb->query($alter_query);
+		}
+		return true;
+	}
+
+
+
+	/**
+	 * Gets the name of all columns on the  table. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @global \wpdb $wpdb
+	 * @param string $table_name
+	 * @return array
+	 */
+	public function getTableColumns($table_name)
+	{
+		global $wpdb;
+		$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+		$fieldArray = array();
+		if ( ! empty($table_name)) {
+			$columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name ");
+			if ($columns !== false) {
+				foreach ($columns as $column) {
+					$fieldArray[] = $column->Field;
+				}
+			}
+		}
+		return $fieldArray;
+	}
+
+
+
+	/**
+	 * Drops the specified table from the database. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @global \wpdb $wpdb
+	 * @param string $table_name
+	 * @return int
+	 */
+	public function dropTable($table_name)
+	{
+		global $wpdb;
+		if ($this->getTableAnalysis()->tableExists($table_name)) {
+			$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+			return $wpdb->query("DROP TABLE IF EXISTS $table_name");
+		}
+		return 0;
+	}
+
+
+
+	/**
+	 * Drops all the tables mentioned in a single MYSQL query. Double-checks
+	 * each table name provided has a wpdb prefix attached, and that it exists.
+	 * Returns the list actually deleted
+	 *
+	 * @global WPDB $wpdb
+	 * @param array $table_names
+	 * @return array of table names which we deleted
+	 */
+	public function dropTables($table_names)
+	{
+		$tables_to_delete = array();
+		foreach ($table_names as $table_name) {
+			$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+			if ($this->getTableAnalysis()->tableExists($table_name)) {
+				$tables_to_delete[] = $table_name;
+			}
+		}
+		global $wpdb;
+		$wpdb->query('DROP TABLE ' . implode(', ', $tables_to_delete));
+		return $tables_to_delete;
+	}
+
+
+
+	/**
+	 * Drops the specified index from the specified table. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @global \wpdb $wpdb
+	 * @param string $table_name
+	 * @param string $indexName
+	 * @return int
+	 */
+	public function dropIndex($table_name, $indexName)
+	{
+		if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', false)) {
+			return false;
+		}
+		global $wpdb;
+		$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+		$index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$indexName'";
+		if (
+			$this->getTableAnalysis()->tableExists($table_name)
+			&& $wpdb->get_var($index_exists_query)
+			   === $table_name //using get_var with the $index_exists_query returns the table's name
+		) {
+			return $wpdb->query("ALTER TABLE $table_name DROP INDEX $indexName");
+		}
+		return 0;
+	}
+
+
+
+	/**
+	 * Just creates the requested table. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @param string $table_name
+	 * @param string $createSql defining the table's columns and indexes
+	 * @param string $engine    (no need to specify "ENGINE=", that's implied)
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function createTable($table_name, $createSql, $engine = 'MyISAM')
+	{
+		// does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
+		if (preg_match('((((.*?))(,\s))+)', $createSql, $valid_column_data)) {
+			$table_name = $this->getTableAnalysis()->ensureTableNameHasPrefix($table_name);
+			$SQL = "CREATE TABLE $table_name ( $createSql ) ENGINE=$engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;";
+			/** @var \wpdb $wpdb */
+			global $wpdb;
+			//get $wpdb to echo errors, but buffer them. This way at least WE know an error
+			//happened. And then we can choose to tell the end user
+			$old_show_errors_policy = $wpdb->show_errors(true);
+			$old_error_suppression_policy = $wpdb->suppress_errors(false);
+			ob_start();
+			dbDelta($SQL);
+			$output = ob_get_contents();
+			ob_end_clean();
+			$wpdb->show_errors($old_show_errors_policy);
+			$wpdb->suppress_errors($old_error_suppression_policy);
+			if ( ! empty($output)) {
+				throw new \EE_Error($output);
+			}
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__('The following table creation SQL does not contain valid information about the table columns: %1$s %2$s',
+						'event_espresso'),
+					'<br />',
+					$createSql
+				)
+			);
+		}
+	}
 
 }

core/data_migration_scripts/EE_DMS_Core_4_9_0.dms.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 //unfortunately, this needs to be done upon INCLUSION of this file,
 //instead of construction, because it only gets constructed on first page load
 //(all other times it gets resurrected from a wordpress option)
-$stages = glob(EE_CORE . 'data_migration_scripts/4_9_0_stages/*');
+$stages = glob(EE_CORE.'data_migration_scripts/4_9_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
     $matches = array();
@@ -67,7 +67,7 @@ 
         } elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
             //no version string provided... this must be pre 4.3
-            return false;//changed mind. dont want people thinking they should migrate yet because they cant
+            return false; //changed mind. dont want people thinking they should migrate yet because they cant
         } else {
 //			echo "$version_string doesnt apply";
             return false;
@@ -91,7 +91,7 @@ 
      */
     public function schema_changes_before_migration()
     {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $now_in_mysql = current_time('mysql', true);
         $table_name = 'esp_answer';
         $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,

Indentation +190 added lines, -190 removed lines

@@ -12,9 +12,9 @@ 
 $stages = glob(EE_CORE . 'data_migration_scripts/4_9_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
-    $matches = array();
-    preg_match('~4_9_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[$matches[1]] = $filepath;
+	$matches = array();
+	preg_match('~4_9_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_9_0__autoloaded_stages', $class_to_filepath);
@@ -33,77 +33,77 @@ 
 class EE_DMS_Core_4_9_0 extends EE_Data_Migration_Script_Base
 {
 
-    /**
-     * return EE_DMS_Core_4_9_0
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name = __("Data Migration to Event Espresso 4.9.0.P", "event_espresso");
-        $this->_priority = 10;
-        $this->_migration_stages = array(
-            new EE_DMS_4_9_0_Email_System_Question(),
-            new EE_DMS_4_9_0_Answers_With_No_Registration(),
-        );
-        parent::__construct($table_manager, $table_analysis);
-    }
+	/**
+	 * return EE_DMS_Core_4_9_0
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name = __("Data Migration to Event Espresso 4.9.0.P", "event_espresso");
+		$this->_priority = 10;
+		$this->_migration_stages = array(
+			new EE_DMS_4_9_0_Email_System_Question(),
+			new EE_DMS_4_9_0_Answers_With_No_Registration(),
+		);
+		parent::__construct($table_manager, $table_analysis);
+	}
 
 
 
-    /**
-     * Whether to migrate or not.
-     *
-     * @param array $version_array
-     * @return bool
-     */
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.9.0', '<=') && version_compare($version_string, '4.8.0', '>=')) {
+	/**
+	 * Whether to migrate or not.
+	 *
+	 * @param array $version_array
+	 * @return bool
+	 */
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.9.0', '<=') && version_compare($version_string, '4.8.0', '>=')) {
 //			echo "$version_string can be migrated from";
-            return true;
-        } elseif ( ! $version_string) {
+			return true;
+		} elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
-            //no version string provided... this must be pre 4.3
-            return false;//changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
+			//no version string provided... this must be pre 4.3
+			return false;//changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
 
 
-    /**
-     * @return string|void
-     */
-    public function pretty_name()
-    {
-        return __("Core Data Migration to version 4.9.0", "event_espresso");
-    }
+	/**
+	 * @return string|void
+	 */
+	public function pretty_name()
+	{
+		return __("Core Data Migration to version 4.9.0", "event_espresso");
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function schema_changes_before_migration()
-    {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $now_in_mysql = current_time('mysql', true);
-        $table_name = 'esp_answer';
-        $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 * @return bool
+	 */
+	public function schema_changes_before_migration()
+	{
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_attendee_meta';
-        $sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_attendee_meta';
+		$sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				ATT_fname varchar(45) NOT NULL,
 				ATT_lname varchar(45) NOT	NULL,
@@ -120,9 +120,9 @@ 
 				KEY ATT_email (ATT_email),
 				KEY ATT_lname (ATT_lname),
 				KEY ATT_fname (ATT_fname)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_checkin';
-        $sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				REG_ID int(10) unsigned NOT NULL,
 				DTT_ID int(10) unsigned NOT NULL,
 				CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -130,9 +130,9 @@ 
 				PRIMARY KEY  (CHK_ID),
 				KEY REG_ID (REG_ID),
 				KEY DTT_ID (DTT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_country';
-        $sql = "CNT_ISO varchar(2) collate utf8_bin NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_country';
+		$sql = "CNT_ISO varchar(2) collate utf8_bin NOT NULL,
 				CNT_ISO3 varchar(3) collate utf8_bin NOT NULL,
 				RGN_ID tinyint(3) unsigned DEFAULT NULL,
 				CNT_name varchar(45) collate utf8_bin NOT NULL,
@@ -148,25 +148,25 @@ 
 				CNT_is_EU tinyint(1) DEFAULT '0',
 				CNT_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency';
-        $sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency';
+		$sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
 				CUR_single varchar(45) collate utf8_bin DEFAULT 'dollar',
 				CUR_plural varchar(45) collate utf8_bin DEFAULT 'dollars',
 				CUR_sign varchar(45) collate utf8_bin DEFAULT '$',
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency_payment_method';
-        $sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency_payment_method';
+		$sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
 				CUR_code varchar(6) collate utf8_bin NOT NULL,
 				PMD_ID int(11) NOT NULL,
 				PRIMARY KEY  (CPM_ID),
 				KEY PMD_ID (PMD_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_datetime';
-        $sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_datetime';
+		$sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				DTT_name varchar(255) NOT NULL DEFAULT '',
 				DTT_description text NOT NULL,
@@ -182,25 +182,25 @@ 
 				KEY DTT_EVT_start (DTT_EVT_start),
 				KEY EVT_ID (EVT_ID),
 				KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_datetime_ticket";
-        $sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_datetime_ticket";
+		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				DTT_ID int(10) unsigned NOT NULL,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (DTK_ID),
 				KEY DTT_ID (DTT_ID),
 				KEY TKT_ID (TKT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_message_template';
-        $sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_message_template';
+		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 				GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EMT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_meta';
-        $sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_meta';
+		$sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
 				EVT_display_ticket_selector tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -215,34 +215,34 @@ 
 				EVT_donations tinyint(1) NULL,
 				PRIMARY KEY  (EVTM_ID),
 				KEY EVT_ID (EVT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_question_group';
-        $sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				QSG_ID int(10) unsigned NOT NULL,
 				EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EQG_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY QSG_ID (QSG_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_venue';
-        $sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_meta';
-        $sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_join';
-        $sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_join';
+		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
 				EXJ_first_model_id varchar(6) NOT NULL,
 				EXJ_first_model_name varchar(20) NOT NULL,
 				EXJ_second_model_id varchar(6) NOT NULL,
@@ -250,9 +250,9 @@ 
 				PRIMARY KEY  (EXJ_ID),
 				KEY first_model (EXJ_first_model_name,EXJ_first_model_id),
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_line_item';
-        $sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -271,9 +271,9 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_log';
-        $sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_log';
+		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
 				LOG_time datetime DEFAULT NULL,
 				OBJ_ID varchar(45) DEFAULT NULL,
 				OBJ_type varchar(45) DEFAULT NULL,
@@ -284,9 +284,9 @@ 
 				KEY LOG_time (LOG_time),
 				KEY OBJ (OBJ_type,OBJ_ID),
 				KEY LOG_type (LOG_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message';
-        $sql = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message';
+		$sql = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NULL,
 				MSG_token varchar(255) NULL,
 				TXN_ID int(10) unsigned NULL,
@@ -318,18 +318,18 @@ 
 				KEY STS_ID (STS_ID),
 				KEY MSG_created (MSG_created),
 				KEY MSG_modified (MSG_modified)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template';
-        $sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template';
+		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NOT NULL,
 				MTP_context varchar(50) NOT NULL,
 				MTP_template_field varchar(30) NOT NULL,
 				MTP_content text NOT NULL,
 				PRIMARY KEY  (MTP_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template_group';
-        $sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template_group';
+		$sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				MTP_user_id int(10) NOT NULL DEFAULT '1',
 				MTP_name varchar(245) NOT NULL DEFAULT '',
 				MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -341,9 +341,9 @@ 
 				MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 				PRIMARY KEY  (GRP_ID),
 				KEY MTP_user_id (MTP_user_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_payment';
-        $sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_payment';
+		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_ID int(10) unsigned DEFAULT NULL,
 				STS_ID varchar(3) collate utf8_bin DEFAULT NULL,
 				PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -360,9 +360,9 @@ 
 				PRIMARY KEY  (PAY_ID),
 				KEY PAY_timestamp (PAY_timestamp),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_payment_method';
-        $sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_payment_method';
+		$sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
 				PMD_type varchar(124) DEFAULT NULL,
 				PMD_name varchar(255) DEFAULT NULL,
 				PMD_desc text,
@@ -378,24 +378,24 @@ 
 				PRIMARY KEY  (PMD_ID),
 				UNIQUE KEY PMD_slug_UNIQUE (PMD_slug),
 				KEY PMD_type (PMD_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket_price";
-        $sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket_price";
+		$sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRC_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (TKP_ID),
 				KEY TKT_ID (TKT_ID),
 				KEY PRC_ID (PRC_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_template";
-        $sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_template";
+		$sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_name varchar(45) NOT NULL,
 				TTM_description text,
 				TTM_file varchar(45),
 				PRIMARY KEY  (TTM_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question';
-        $sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QST_display_text text NOT NULL,
 				QST_admin_label varchar(255) NOT NULL,
 				QST_system varchar(25) DEFAULT NULL,
@@ -409,18 +409,18 @@ 
 				QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QST_ID),
 				KEY QST_order (QST_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group_question';
-        $sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_ID int(10) unsigned NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
 				QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QGQ_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSG_ID_order (QSG_ID,QGQ_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_option';
-        $sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSO_value varchar(255) NOT NULL,
 				QSO_desc text NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
@@ -430,9 +430,9 @@ 
 				PRIMARY KEY  (QSO_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSO_order (QSO_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_registration';
-        $sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_registration';
+		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				TXN_ID int(10) unsigned NOT NULL,
@@ -456,18 +456,18 @@ 
 				KEY TKT_ID (TKT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_registration_payment';
-        $sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_registration_payment';
+		$sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  REG_ID int(10) unsigned NOT NULL,
 					  PAY_ID int(10) unsigned NULL,
 					  RPY_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRIMARY KEY  (RPY_ID),
 					  KEY REG_ID (REG_ID),
 					  KEY PAY_ID (PAY_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_state';
-        $sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_state';
+		$sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 				CNT_ISO varchar(2) collate utf8_bin NOT NULL,
 				STA_abbrev varchar(24) collate utf8_bin NOT NULL,
 				STA_name varchar(100) collate utf8_bin NOT NULL,
@@ -475,9 +475,9 @@ 
 				PRIMARY KEY  (STA_ID),
 				KEY STA_abbrev (STA_abbrev),
 				KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_status';
-        $sql = "STS_ID varchar(3) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_status';
+		$sql = "STS_ID varchar(3) NOT NULL,
 				STS_code varchar(45) NOT NULL,
 				STS_type varchar(45) NOT NULL,
 				STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -485,9 +485,9 @@ 
 				STS_open tinyint(1) NOT NULL DEFAULT 1,
 				UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 				KEY STS_type (STS_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_transaction';
-        $sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_transaction';
+		$sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 				TXN_total decimal(10,3) DEFAULT '0.00',
 				TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -499,9 +499,9 @@ 
 				PRIMARY KEY  (TXN_ID),
 				KEY TXN_timestamp (TXN_timestamp),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_venue_meta';
-        $sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_venue_meta';
+		$sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -520,10 +520,10 @@ 
 			KEY VNU_ID (VNU_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        //modified tables
-        $table_name = "esp_price";
-        $sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		//modified tables
+		$table_name = "esp_price";
+		$sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_ID tinyint(3) unsigned NOT NULL,
 				PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 				PRC_name varchar(245) NOT NULL,
@@ -536,9 +536,9 @@ 
 				PRC_parent int(10) unsigned DEFAULT 0,
 				PRIMARY KEY  (PRC_ID),
 				KEY PRT_ID (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price_type";
-        $sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price_type";
+		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_name varchar(45) NOT NULL,
 				PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -547,9 +547,9 @@ 
 				PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				PRIMARY KEY  (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket";
-        $sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket";
+		$sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_ID int(10) unsigned NOT NULL,
 				TKT_name varchar(245) NOT NULL DEFAULT '',
 				TKT_description text NOT NULL,
@@ -571,9 +571,9 @@ 
 				TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				PRIMARY KEY  (TKT_ID),
 				KEY TKT_start_date (TKT_start_date)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group';
-        $sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group';
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_name varchar(255) NOT NULL,
 				QSG_identifier varchar(100) NOT NULL,
 				QSG_desc text NULL,
@@ -586,41 +586,41 @@ 
 				PRIMARY KEY  (QSG_ID),
 				UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 				KEY QSG_order (QSG_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        /** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
-        $script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
-        //(because many need to convert old string states to foreign keys into the states table)
-        $script_4_1_defaults->insert_default_states();
-        $script_4_1_defaults->insert_default_countries();
-        /** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
-        $script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
-        $script_4_5_defaults->insert_default_price_types();
-        $script_4_5_defaults->insert_default_prices();
-        $script_4_5_defaults->insert_default_tickets();
-        /** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
-        $script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
-        $script_4_6_defaults->add_default_admin_only_payments();
-        $script_4_6_defaults->insert_default_currencies();
-        /** @var EE_DMS_Core_4_8_0 $script_4_8_defaults */
-        $script_4_8_defaults = EE_Registry::instance()->load_dms('Core_4_8_0');
-        $script_4_8_defaults->verify_new_countries();
-        $script_4_8_defaults->verify_new_currencies();
-        return true;
-    }
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
+		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
+		//(because many need to convert old string states to foreign keys into the states table)
+		$script_4_1_defaults->insert_default_states();
+		$script_4_1_defaults->insert_default_countries();
+		/** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
+		$script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
+		$script_4_5_defaults->insert_default_price_types();
+		$script_4_5_defaults->insert_default_prices();
+		$script_4_5_defaults->insert_default_tickets();
+		/** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
+		$script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
+		$script_4_6_defaults->add_default_admin_only_payments();
+		$script_4_6_defaults->insert_default_currencies();
+		/** @var EE_DMS_Core_4_8_0 $script_4_8_defaults */
+		$script_4_8_defaults = EE_Registry::instance()->load_dms('Core_4_8_0');
+		$script_4_8_defaults->verify_new_countries();
+		$script_4_8_defaults->verify_new_currencies();
+		return true;
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        return true;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		return true;
+	}
 
 
 
-    public function migration_page_hooks()
-    {
-    }
+	public function migration_page_hooks()
+	{
+	}
 }
\ No newline at end of file

admin_pages/registrations/templates/reg_admin_details_main_meta_box_reg_details.template.php

Spacing +8 added lines, -8 removed lines

@@ -1,36 +1,36 @@
 <div id="admin-primary-mbox-reg-details-dv" class="admin-primary-mbox-dv">
 
-	<?php do_action( 'AHEE__reg_admin_details_main_meta_box_reg_details__top', $REG_ID ); ?>
+	<?php do_action('AHEE__reg_admin_details_main_meta_box_reg_details__top', $REG_ID); ?>
 	<?php echo $resend_registration_button; ?>
 	<?php echo $view_transaction_button; ?>
 	<br/>
 
-	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e( 'Registration Items', 'event_espresso' );?></h3>
+	<h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e('Registration Items', 'event_espresso'); ?></h3>
 
 	<?php echo $line_item_table; ?>
 
 	<a id="display-additional-registration-session-info" class="display-the-hidden smaller-text" rel="additional-registration-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional registration session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional registration session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-registration-session-info-dv" class="hidden">
 
 		<a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-registration-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional registration session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional registration session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h3 class="admin-primary-mbox-h4"><?php _e( 'Registration Session Details', 'event_espresso' );?></h3>
+		<h3 class="admin-primary-mbox-h4"><?php _e('Registration Session Details', 'event_espresso'); ?></h3>
 
 		<table id="admin-primary-mbox-reg-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $reg_details as $key => $reg_detail ) : ?>
+			<?php foreach ($reg_details as $key => $reg_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $reg_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $reg_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $reg_detail['value'];?>
+						<?php echo $reg_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $reg_details?>

admin_pages/transactions/templates/txn_admin_details_main_meta_box_txn_details.template.php

Spacing +117 added lines, -117 removed lines

@@ -1,7 +1,7 @@ 
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
 
 	<h3 class="admin-primary-mbox-h4 hdr-has-icon">
-		<span class="dashicons dashicons-cart"></span><?php _e( 'Transaction Items', 'event_espresso' );?>
+		<span class="dashicons dashicons-cart"></span><?php _e('Transaction Items', 'event_espresso'); ?>
 	</h3>
 
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -10,27 +10,27 @@ 
 	</div>
 
 	<a id="display-additional-transaction-session-info" class="display-the-hidden smaller-text" rel="additional-transaction-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional transaction session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional transaction session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-transaction-session-info-dv" class="hidden">
 
 		<a id="hide-additional-transaction-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-transaction-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional transaction session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional transaction session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h3 class="admin-primary-mbox-h4"><?php _e( 'Transaction Session Details', 'event_espresso' );?></h3>
+		<h3 class="admin-primary-mbox-h4"><?php _e('Transaction Session Details', 'event_espresso'); ?></h3>
 
 		<table id="admin-primary-mbox-txn-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $txn_details as $key => $txn_detail ) : ?>
+			<?php foreach ($txn_details as $key => $txn_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $txn_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $txn_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $txn_detail['value'];?>
+						<?php echo $txn_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $txn_details?>
@@ -40,10 +40,10 @@ 
 	<br class="clear"/>
 
 
-	<?php if ( $attendee instanceof EE_Attendee && ( $grand_raw_total > 0 || $TXN_status != 'TCM' || ! empty( $payments ) ) ) : ?>
+	<?php if ($attendee instanceof EE_Attendee && ($grand_raw_total > 0 || $TXN_status != 'TCM' || ! empty($payments))) : ?>
 
 	<h3 class="admin-primary-mbox-h4 hdr-has-icon">
-		<span class="ee-icon ee-icon-cash"></span><?php _e( 'Payment Details', 'event_espresso' );?>
+		<span class="ee-icon ee-icon-cash"></span><?php _e('Payment Details', 'event_espresso'); ?>
 	</h3>
 
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -52,79 +52,79 @@ 
 				<tr>
 					<th></th>
 					<th class="jst-cntr"></th>
-					<th class="jst-cntr"><?php _e( 'ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Date', 'event_espresso' );?></th>
-					<th class="jst-cntr"><?php _e( 'Source', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Method', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Gateway Response', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'P.O. / S.O.&nbsp;#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Notes / Extra&nbsp;Accounting', 'event_espresso' );?></th>
-					<!--<th class="jst-left"><?php _e( 'Details', 'event_espresso' );?></th>-->
-					<th class="jst-cntr"><?php _e( 'Amount', 'event_espresso' );?></th>
+					<th class="jst-cntr"><?php _e('ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Date', 'event_espresso'); ?></th>
+					<th class="jst-cntr"><?php _e('Source', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Method', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Gateway Response', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('P.O. / S.O.&nbsp;#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Notes / Extra&nbsp;Accounting', 'event_espresso'); ?></th>
+					<!--<th class="jst-left"><?php _e('Details', 'event_espresso'); ?></th>-->
+					<th class="jst-cntr"><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-		<?php if ( $payments ) : ?>
+		<?php if ($payments) : ?>
 			<?php $payment_total = 0; ?>
-			<?php foreach ( $payments as $PAY_ID => $payment ) :
-				$existing_reg_payment_json = isset( $existing_reg_payments[ $PAY_ID ] )
-					? wp_json_encode( $existing_reg_payments[ $PAY_ID ] )
+			<?php foreach ($payments as $PAY_ID => $payment) :
+				$existing_reg_payment_json = isset($existing_reg_payments[$PAY_ID])
+					? wp_json_encode($existing_reg_payments[$PAY_ID])
 					: '{}';
 				?>
-				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID;?>">
+				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID; ?>">
 					<td>
 						<span id="payment-status-<?php echo $PAY_ID; ?>" class="ee-status-strip-td ee-status-strip pymt-status-<?php echo $payment->STS_ID(); ?>"></span>
-						<div id="payment-STS_ID-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->STS_ID();?></div>
-						<div id="reg-payments-<?php echo $PAY_ID;?>" class="hidden"><?php echo $existing_reg_payment_json; ?></div>
+						<div id="payment-STS_ID-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->STS_ID(); ?></div>
+						<div id="reg-payments-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $existing_reg_payment_json; ?></div>
 					</td>
 					<td class=" jst-cntr">
 						<ul class="txn-overview-actions-ul">
 							<li>
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
 								</a>
 							</li>
 							<li>
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
 								</a>
 							</li>
 						</ul>
 					</td>
 					<td class=" jst-rght">
-						<div id="payment-id-<?php echo $PAY_ID;?>"><?php echo $PAY_ID;?></div>
+						<div id="payment-id-<?php echo $PAY_ID; ?>"><?php echo $PAY_ID; ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-date-<?php echo $PAY_ID;?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'g:i a');?></div>
+						<div id="payment-date-<?php echo $PAY_ID; ?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'g:i a'); ?></div>
 					</td>
 					<td class=" jst-cntr">
-						<div id="payment-method-<?php echo $PAY_ID;?>">
-							<?php echo $payment->source();?>
+						<div id="payment-method-<?php echo $PAY_ID; ?>">
+							<?php echo $payment->source(); ?>
 						</div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-gateway-<?php echo $PAY_ID;?>">
-							<?php echo $payment->payment_method() ?  $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso');?>
+						<div id="payment-gateway-<?php echo $PAY_ID; ?>">
+							<?php echo $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'); ?>
 						</div>
-						<div id="payment-gateway-id-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0;?></div>
+						<div id="payment-gateway-id-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0; ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-response-<?php echo $PAY_ID;?>"><?php echo $payment->gateway_response();?></div>
+						<div id="payment-response-<?php echo $PAY_ID; ?>"><?php echo $payment->gateway_response(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->txn_id_chq_nmbr();?></div>
+						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->txn_id_chq_nmbr(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-po-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->po_number();?></div>
+						<div id="payment-po-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->po_number(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-accntng-<?php echo $PAY_ID;?>"><?php echo $payment->extra_accntng();?></div>
+						<div id="payment-accntng-<?php echo $PAY_ID; ?>"><?php echo $payment->extra_accntng(); ?></div>
 					</td>
 					<td class=" jst-rght">
-						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-' . $payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
-						<span class="<?php echo $payment_class;?>">
-							<div id="payment-amount-<?php echo $PAY_ID;?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE ); ?></div>
+						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-'.$payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
+						<span class="<?php echo $payment_class; ?>">
+							<div id="payment-amount-<?php echo $PAY_ID; ?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE); ?></div>
 						</span>
 					</td>
 				</tr>
@@ -134,25 +134,25 @@ 
 			<?php endforeach; // $payment?>
 			<?php
 				$pay_totals_class = $payment_total > $grand_raw_total ? ' important-notice' : '';
-				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">' . __( 'This transaction has been overpaid ! ', 'event_espresso' ) . '</span>' : '';
+				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">'.__('This transaction has been overpaid ! ', 'event_espresso').'</span>' : '';
 			?>
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
 					<td class=" jst-rght" colspan="11">
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
 					</td>
 				</tr>
-				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class;?>">
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid . sprintf( __( 'Payments Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );?></span></th>
-					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE);?></span></th>
+				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class; ?>">
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid.sprintf(__('Payments Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); ?></span></th>
+					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE); ?></span></th>
 				</tr>
 		<?php else : ?>
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
 					<td class=" jst-rght" colspan="11">
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
 					</td>
 				</tr>
 				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __( 'Payments Total', 'event_espresso' );?></span></th>
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __('Payments Total', 'event_espresso'); ?></span></th>
 					<th class=" jst-rght"><span id="txn-admin-payment-total"></span></th>
 				</tr>
 		<?php endif; // $payments?>
@@ -165,12 +165,12 @@ 
 					<td class=" jst-cntr">
 						<ul class="txn-overview-actions-ul">
 							<li>
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
 								</a>
 							</li>
 							<li>
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
 								</a>
 							</li>
@@ -217,12 +217,12 @@ 
 	<ul id="txn-admin-payment-options-ul">
 		<li>
 			<a id="display-txn-admin-apply-payment" class="button-primary no-icon no-hide" rel="txn-admin-apply-payment" > <!--display-the-hidden -->
-				<?php _e( 'Apply Payment', 'event_espresso' );?>
+				<?php _e('Apply Payment', 'event_espresso'); ?>
 			</a>
 		</li>
 		<li>
 			<a id="display-txn-admin-apply-refund" class="button-secondary no-icon no-hide" rel="txn-admin-apply-refund" >  <!--display-the-hidden -->
-				<?php _e( 'Apply Refund', 'event_espresso' );?>
+				<?php _e('Apply Refund', 'event_espresso'); ?>
 			</a>
 		</li>
 	</ul>
@@ -232,14 +232,14 @@ 
 
 		<h2 id="admin-modal-dialog-apply-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-add float-left"></div>
-			<?php echo __( 'Apply a Payment to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Apply a Payment to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
 			<?php
 			echo sprintf(
-				__( 'Edit Payment #%s for Transaction #%s', 'event_espresso' ),
+				__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
 				'<span></span>',
 				$txn_nmbr['value']
 			);
@@ -250,7 +250,7 @@ 
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
 			<?php
 			echo sprintf(
-				__( 'Edit Refund #%s for Transaction #%s', 'event_espresso' ),
+				__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
 				'<span></span>',
 				$txn_nmbr['value']
 			);
@@ -259,14 +259,14 @@ 
 
 		<h2 id="admin-modal-dialog-apply-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-remove float-left"></div>
-			<?php echo __( 'Apply a Refund to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Apply a Refund to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<form name="txn-admin-apply-payment-frm" id="txn-admin-apply-payment-frm" action="<?php echo $apply_payment_form_url; ?>">
 			<div class="admin-modal-dialog-wrap">
 				<div class="admin-modal-dialog-inner">
 
-					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_apply_payment_nonce' );?>"/>
+					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce('espresso_apply_payment_nonce'); ?>"/>
 					<input  type="hidden" name="espresso_ajax" id="espresso-ajax" value="0"/>
 					<input  type="hidden" name="noheader" id="txn-admin-noheader-inp" value="0"/>
 					<input  type="hidden" name="txn_admin_payment[PAY_ID]" id="txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
@@ -274,108 +274,108 @@ 
 					<input  type="hidden" name="txn_admin_payment[type]" id="txn-admin-payment-type-inp" value="1"/>
 					<input  type="hidden" name="txn_admin_payment[details]" id="txn-admin-payment-details-inp" value=""/>
 					<input  type="hidden" name="txn_admin_delete_payment_form_url" id="txn-admin-delete-payment-form-url-inp" value="<?php echo $delete_payment_form_url; ?>"/>
-					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date( 'Y-m-d h:i a', current_time( 'timestamp' )); ?>"/>
+					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date('Y-m-d h:i a', current_time('timestamp')); ?>"/>
 
 					<div class="txn-admin-apply-payment-date-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-date-inp" class=""><?php _e( 'Payment Date', 'event_espresso' );?></label>
-						<input name="[date]txn_admin_payment" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date( 'Y-m-d g:i a', current_time( 'timestamp' )); ?>"/>
-						<p class="description"><?php _e( 'The date the payment was actually made on', 'event_espresso' );?></p>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-date-inp" class=""><?php _e('Payment Date', 'event_espresso'); ?></label>
+						<input name="[date]txn_admin_payment" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date('Y-m-d g:i a', current_time('timestamp')); ?>"/>
+						<p class="description"><?php _e('The date the payment was actually made on', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-amount-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-amount-inp" class=""><?php _e( 'Amount', 'event_espresso' );?></label>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-amount-inp" class=""><?php _e('Amount', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[amount]" id="txn-admin-payment-amount-inp" class="txn-admin-apply-payment-inp required" type="text" value=""/>
-						<p class="description"><?php _e( 'The amount of the payment', 'event_espresso' );?></p>
+						<p class="description"><?php _e('The amount of the payment', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-method-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-method-inp" class=""><?php _e( 'Method of Payment', 'event_espresso' );?></label>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-method-inp" class=""><?php _e('Method of Payment', 'event_espresso'); ?></label>
 						<select name="txn_admin_payment[PMD_ID]" id="txn-admin-payment-method-slct" class="txn-admin-apply-payment-slct required" type="text" >
-						<?php foreach ( $payment_methods as $method ) : ?>
+						<?php foreach ($payment_methods as $method) : ?>
 							<?php $selected = $method->slug() == 'cash' ? ' selected="selected"' : ''; ?>
-							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key( $method->admin_desc() ) ? substr( $method->admin_desc(), 0, 128) : $method->admin_name() ; ?>&nbsp;&nbsp;</option>
+							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key($method->admin_desc()) ? substr($method->admin_desc(), 0, 128) : $method->admin_name(); ?>&nbsp;&nbsp;</option>
 						<?php endforeach; ?>
 						</select>
-						<p class="description"><?php _e( 'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso' );?></p>
+						<p class="description"><?php _e('Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="mop-PP mop-CC mop-CHQ mop">
 						<div class="txn-admin-apply-payment-gw-txn-id-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e( 'TXN ID / CHQ #', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e('TXN ID / CHQ #', 'event_espresso'); ?></label>
 							<input name="txn_admin_payment[txn_id_chq_nmbr]" id="txn-admin-payment-txn-id-chq-nmbr-inp" class="txn-admin-apply-payment-inp" type="text" maxlength="100"/>
-							<p class="description"><?php _e( 'The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso' );?></p>
+							<p class="description"><?php _e('The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="mop-CC mop" style="display:none">
 						<div class="txn-admin-apply-payment-response-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e( 'Gateway Response', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e('Gateway Response', 'event_espresso'); ?></label>
 							<input name="txn_admin_payment[gateway_response]" id="txn-admin-payment-gateway-response-inp" class="txn-admin-apply-payment-inp" type="text"/>
-							<p class="description"><?php _e( 'The gateway response string (optional)', 'event_espresso' );?></p>
+							<p class="description"><?php _e('The gateway response string (optional)', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="mop-PP mop-CC mop">
 						<div class="txn-admin-apply-payment-status-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-status-inp" class=""><?php _e( 'Payment Status', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-status-inp" class=""><?php _e('Payment Status', 'event_espresso'); ?></label>
 							<select name="txn_admin_payment[status]" id="txn-admin-payment-status-slct" class="txn-admin-apply-payment-slct" type="text" >
-							<?php foreach ( $payment_status as $STS_ID => $STS_code ) : ?>
+							<?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
 								<?php $selected = $STS_ID == 'PAP' ? ' selected="selected"' : ''; ?>
 								<option id="payment-status-opt-<?php echo $STS_ID; ?>" value="<?php echo $STS_ID; ?>"<?php echo $selected; ?>><?php echo $STS_code; ?>&nbsp;&nbsp;</option>
 							<?php endforeach; ?>
 							</select>
-							<p class="description"><?php _e( 'Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso' );?></p>
+							<p class="description"><?php _e('Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="txn-admin-apply-payment-po-nmbr-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e( 'P.O. / S.O. #', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e('P.O. / S.O. #', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[po_number]" id="txn-admin-payment-po-nmbr-inp" class="txn-admin-apply-payment-inp" type="text" maxlength="100"/>
-						<p class="description"><?php _e( 'The Purchase or Sales Order Number if any (optional)', 'event_espresso' );?></p>
+						<p class="description"><?php _e('The Purchase or Sales Order Number if any (optional)', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e( 'Notes / Extra Accounting', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e('Notes / Extra Accounting', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[accounting]" id="txn-admin-payment-accounting-inp" class="txn-admin-apply-payment-inp" type="text" value="<?php echo $REG_code; ?>" maxlength="100"/>		<input type="hidden" id="txn-admin-reg-code-inp" value="<?php echo $REG_code; ?>"/>
-						<p class="description"><?php _e( 'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso' );?></p>
+						<p class="description"><?php _e('An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-registrations-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e( 'Registrations to Apply Payment to:', 'event_espresso' ); ?></label>
+						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e('Registrations to Apply Payment to:', 'event_espresso'); ?></label>
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
 							<input type="radio" value="1" id="txn-admin-apply-payment-to-all-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]"  checked="checked"/>
-							<?php _e( 'ALL Registrations', 'event_espresso' ); ?>
+							<?php _e('ALL Registrations', 'event_espresso'); ?>
 						</label>
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
 							<input type="radio" value="0" id="txn-admin-apply-payment-to-some-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]" />
-							<?php _e( 'Just the following Registrations', 'event_espresso' ); ?>
+							<?php _e('Just the following Registrations', 'event_espresso'); ?>
 						</label>
 						<?php echo $registrations_to_apply_payment_to; ?>
 					</div>
 
 					<div class="txn-admin-payment-reg-status-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
 						<?php echo $status_change_select; ?>
-						<p class="description"><?php _e( 'If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso' ); ?></p>
+						<p class="description"><?php _e('If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso'); ?></p>
 						<br/>
 					</div>
 
 					<div class="txn-admin-apply-payment-send-notifications-dv admin-modal-dialog-row">
 
-						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
 						<label class="txn-admin-payment-send-notifications-lbl">
 							<input type="checkbox" value="1" name="txn_payments[send_notifications]" checked="checked" aria-checked="true" style="vertical-align: middle;">
-							<?php _e( 'Payment Messages?', 'event_espresso' ); ?>
+							<?php _e('Payment Messages?', 'event_espresso'); ?>
 						</label>
 						<label class="txn-admin-payment-send-notifications-lbl">
 							<input type="checkbox" value="1" name="txn_reg_status_change[send_notifications]" style="vertical-align: middle;">
-							<?php _e( 'Registration Messages?', 'event_espresso' ); ?>
+							<?php _e('Registration Messages?', 'event_espresso'); ?>
 						</label>
 						<br class="clear-float"/>
-						<p class="description"><?php printf( __('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />' ); ?></p>
+						<p class="description"><?php printf(__('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />'); ?></p>
 						<label></label>
 					</div>
 					<div class="clear"></div>
@@ -386,27 +386,27 @@ 
 			<ul id="admin-modal-dialog-options-ul">
 				<li>
 					<a id="txn-admin-modal-dialog-apply-payment-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Apply Payment', 'event_espresso' );?>
+						<?php _e('Apply Payment', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-edit-payment-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Save Payment Details', 'event_espresso' );?>
+						<?php _e('Save Payment Details', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-edit-refund-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Save Refund Details', 'event_espresso' );?>
+						<?php _e('Save Refund Details', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-apply-refund-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Apply Refund', 'event_espresso' );?>
+						<?php _e('Apply Refund', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
-						<?php _e( 'Cancel', 'event_espresso' );?>
+						<?php _e('Cancel', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
@@ -423,29 +423,29 @@ 
 
 		<h2 id="admin-modal-dialog-delete-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<span class="ee-icon ee-icon-cash-add"></span>
-			<?php echo __( 'Delete Payment/Refund for Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Delete Payment/Refund for Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<form name="txn-admin-delete-payment-frm" id="txn-admin-delete-payment-frm" action="<?php echo $delete_payment_url; ?>">
 			<div class="admin-modal-dialog-wrap">
 				<div class="admin-modal-dialog-inner">
 
-					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_delete_payment_nonce' );?>"/>
+					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce('espresso_delete_payment_nonce'); ?>"/>
 					<input  type="hidden" name="delete_espresso_ajax" id="delete-espresso-ajax" value="0"/>
 					<input  type="hidden" name="delete_noheader" id="delete-txn-admin-noheader-inp" value="0"/>
 					<input  type="hidden" name="delete_txn_admin_payment[PAY_ID]" id="delete-txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
 					<input  type="hidden" name="delete_txn_admin_payment[TXN_ID]" id="delete-txn-admin-payment-txn-id-inp" value="<?php echo $txn_nmbr['value']; ?>"/>
 
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
+						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
 						<?php echo $delete_status_change_select; ?>
-						<p class="description"><?php printf( __('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
+						<p class="description"><?php printf(__('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 					</div>
 
 					<div class="ee-attention txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
+						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
 						<input type="checkbox" value="1" name="delete_txn_reg_status_change[send_notifications]">
-						<p class="description"><?php _e( 'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.', 'event_espresso' );?></p>
+						<p class="description"><?php _e('If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.', 'event_espresso'); ?></p>
 					</div>
 					<div class="clear"></div>
 
@@ -455,12 +455,12 @@ 
 			<ul id="del-admin-modal-dialog-options-ul">
 				<li>
 					<a id="txn-admin-modal-dialog-delete-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Delete', 'event_espresso' );?>
+						<?php _e('Delete', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="del-txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
-						<?php _e( 'Cancel', 'event_espresso' );?>
+						<?php _e('Cancel', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
@@ -476,30 +476,30 @@ 
 	<?php endif; // $grand_raw_total > 0?>
 
 	<?php
-	if ( WP_DEBUG ) {
-		$delivered_messages = get_option( 'EED_Messages__payment', array() );
-		if ( isset( $delivered_messages[ $TXN_ID ] )) {
+	if (WP_DEBUG) {
+		$delivered_messages = get_option('EED_Messages__payment', array());
+		if (isset($delivered_messages[$TXN_ID])) {
 			?>
-			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Primary Registrant', 'event_espresso' );?></h4>
+			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Primary Registrant', 'event_espresso'); ?></h4>
 
 			<div class="admin-primary-mbox-tbl-wrap">
 				<table class="admin-primary-mbox-tbl">
 					<thead>
 						<tr>
-							<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'Payment Status Upon Sending', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'TXN Status Upon Sending', 'event_espresso' );?></th>
+							<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('Payment Status Upon Sending', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('TXN Status Upon Sending', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
-						<?php foreach ( $delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message ) :
+						<?php foreach ($delivered_messages[$TXN_ID] as $timestamp => $delivered_message) :
 							?>
 							<tr>
-								<td class="jst-left"><?php echo date( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['pay_status'] ) ? $delivered_message['pay_status'] : '';?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['txn_status'] ) ? $delivered_message['txn_status'] : '';?></td>
+								<td class="jst-left"><?php echo date(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['pay_status']) ? $delivered_message['pay_status'] : ''; ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['txn_status']) ? $delivered_message['txn_status'] : ''; ?></td>
 							</tr>
 						<?php endforeach; // $delivered_messages?>
 					</tbody>

admin_pages/transactions/Transactions_Admin_Page.core.php

Spacing +418 added lines, -418 removed lines

@@ -56,8 +56,8 @@ 
 	 * @param bool $routing
 	 * @return Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return void
 	 */
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_apply_payment', array( $this, 'apply_payments_or_refunds'));
-		add_action('wp_ajax_espresso_apply_refund', array( $this, 'apply_payments_or_refunds'));
-		add_action('wp_ajax_espresso_delete_payment', array( $this, 'delete_payment'));
+		add_action('wp_ajax_espresso_apply_payment', array($this, 'apply_payments_or_refunds'));
+		add_action('wp_ajax_espresso_apply_refund', array($this, 'apply_payments_or_refunds'));
+		add_action('wp_ajax_espresso_delete_payment', array($this, 'delete_payment'));
 	}
 
 
@@ -97,7 +97,7 @@ 
 			'buttons' => array(
 				'add' => esc_html__('Add New Transaction', 'event_espresso'),
 				'edit' => esc_html__('Edit Transaction', 'event_espresso'),
-				'delete' => esc_html__('Delete Transaction','event_espresso'),
+				'delete' => esc_html__('Delete Transaction', 'event_espresso'),
 			)
 		);
 	}
@@ -113,7 +113,7 @@ 
 
 		$this->_set_transaction_status_array();
 
-		$txn_id = ! empty( $this->_req_data['TXN_ID'] ) && ! is_array( $this->_req_data['TXN_ID'] ) ? $this->_req_data['TXN_ID'] : 0;
+		$txn_id = ! empty($this->_req_data['TXN_ID']) && ! is_array($this->_req_data['TXN_ID']) ? $this->_req_data['TXN_ID'] : 0;
 
 		$this->_page_routes = array(
 
@@ -185,7 +185,7 @@ 
 						'filename' => 'transactions_overview_views_filters_search'
 					),
 				),
-				'help_tour' => array( 'Transactions_Overview_Help_Tour' ),
+				'help_tour' => array('Transactions_Overview_Help_Tour'),
 				/**
 				 * commented out because currently we are not displaying tips for transaction list table status but this
 				 * may change in a later iteration so want to keep the code for then.
@@ -197,7 +197,7 @@ 
 				'nav' => array(
 					'label' => esc_html__('View Transaction', 'event_espresso'),
 					'order' => 5,
-					'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+					'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID']), $this->_current_page_view_url) : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
 				'help_tabs' => array(
@@ -218,8 +218,8 @@ 
 						'filename' => 'transactions_view_transaction_primary_registrant_billing_information'
 					),
 				),
-				'qtips' => array( 'Transaction_Details_Tips' ),
-				'help_tour' => array( 'Transaction_Details_Help_Tour' ),
+				'qtips' => array('Transaction_Details_Tips'),
+				'help_tour' => array('Transaction_Details_Help_Tour'),
 				'metaboxes' => array('_transaction_details_metaboxes'),
 
 				'require_nonce' => FALSE
@@ -237,23 +237,23 @@ 
 		// IF a registration was JUST added via the admin...
 		if (
 		isset(
-			$this->_req_data[ 'redirect_from' ],
-			$this->_req_data[ 'EVT_ID' ],
-			$this->_req_data[ 'event_name' ]
+			$this->_req_data['redirect_from'],
+			$this->_req_data['EVT_ID'],
+			$this->_req_data['event_name']
 		)
 		) {
 			// then set a cookie so that we can block any attempts to use
 			// the back button as a way to enter another registration.
-			setcookie( 'ee_registration_added', $this->_req_data[ 'EVT_ID' ], time() + WEEK_IN_SECONDS, '/' );
+			setcookie('ee_registration_added', $this->_req_data['EVT_ID'], time() + WEEK_IN_SECONDS, '/');
 			// and update the global
-			$_COOKIE[ 'ee_registration_added' ] = $this->_req_data[ 'EVT_ID' ];
+			$_COOKIE['ee_registration_added'] = $this->_req_data['EVT_ID'];
 		}
-		EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = esc_html__( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'error_occurred' ] = esc_html__( 'An error occurred! Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'txn_status_array' ] = self::$_txn_status;
-		EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status;
-		EE_Registry::$i18n_js_strings[ 'payments_total' ] = esc_html__( 'Payments Total', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'transaction_overpaid' ] = esc_html__( 'This transaction has been overpaid ! Payments Total', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = esc_html__('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['error_occurred'] = esc_html__('An error occurred! Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['txn_status_array'] = self::$_txn_status;
+		EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status;
+		EE_Registry::$i18n_js_strings['payments_total'] = esc_html__('Payments Total', 'event_espresso');
+		EE_Registry::$i18n_js_strings['transaction_overpaid'] = esc_html__('This transaction has been overpaid ! Payments Total', 'event_espresso');
 	}
 	public function admin_notices() {}
 	public function admin_footer_scripts() {}
@@ -320,14 +320,14 @@ 
 	 */
 	public function load_scripts_styles() {
 		//enqueue style
-		wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_txn');
 
 		//scripts
 		add_filter('FHEE_load_accounting_js', '__return_true');
 
 		//scripts
-		wp_register_script('espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('espresso_txn');
 
 	}
@@ -367,8 +367,8 @@ 
 	 *	@return void
 	 */
 	protected function _set_list_table_views_default() {
-		$this->_views = array (
-			'all' => array (
+		$this->_views = array(
+			'all' => array(
 				'slug' 		=> 'all',
 				'label' 		=> esc_html__('View All Transactions', 'event_espresso'),
 				'count' 	=> 0
@@ -396,21 +396,21 @@ 
 	 *	@return void
 	 */
 	private function _set_transaction_object() {
-		if ( is_object( $this->_transaction) )
+		if (is_object($this->_transaction))
 			return; //get out we've already set the object
 
 	    $TXN = EEM_Transaction::instance();
 
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+	    $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE;
 
 	    //get transaction object
 	    $this->_transaction = $TXN->get_one_by_ID($TXN_ID);
-	    $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
+	    $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL;
 		$this->_transaction->verify_abandoned_transaction_status();
 
-	 	if ( empty( $this->_transaction ) ) {
-	    	$error_msg = esc_html__('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  esc_html__(' could not be retrieved.', 'event_espresso');
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+	 	if (empty($this->_transaction)) {
+	    	$error_msg = esc_html__('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.esc_html__(' could not be retrieved.', 'event_espresso');
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 	    }
 	}
 
@@ -423,12 +423,12 @@ 
 	 *	@return array
 	 */
 	protected function _transaction_legend_items() {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$items = array();
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$related_for_icon = EEH_MSG_Template::get_message_action_icon( 'see_notifications_for' );
-			if ( isset( $related_for_icon['css_class']) && isset( $related_for_icon['label'] ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
+			if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
 				$items['view_related_messages'] = array(
 					'class' => $related_for_icon['css_class'],
 					'desc' => $related_for_icon['label'],
@@ -438,7 +438,7 @@ 
 
 		$items = apply_filters(
 			'FHEE__Transactions_Admin_Page___transaction_legend_items__items',
-			array_merge( $items,
+			array_merge($items,
 				array(
 					'view_details' => array(
 						'class' => 'dashicons dashicons-cart',
@@ -450,7 +450,7 @@ 
 					),
 					'view_receipt' => array(
 						'class' => 'dashicons dashicons-media-default',
-						'desc' => esc_html__('View Transaction Receipt', 'event_espresso' )
+						'desc' => esc_html__('View Transaction Receipt', 'event_espresso')
 					),
 					'view_registration' => array(
 						'class' => 'dashicons dashicons-clipboard',
@@ -460,8 +460,8 @@ 
 			)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) {
-			if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) {
+			if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
 				$items['send_payment_reminder'] = array(
 					'class' => 'dashicons dashicons-email-alt',
 					'desc' => esc_html__('Send Payment Reminder', 'event_espresso')
@@ -482,29 +482,29 @@ 
 			'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items',
 			array(
 				'overpaid'   => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence')
 				),
 				'complete'   => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence')
 				),
 				'incomplete' => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence')
 				),
 				'abandoned'  => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence')
 				),
 				'failed'     => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence')
 				)
 			)
 		);
 
-		return array_merge( $items, $more_items);
+		return array_merge($items, $more_items);
 	}
 
 
@@ -517,9 +517,9 @@ 
 	 */
 	protected function _transactions_overview_list_table() {
 		$this->_admin_page_title = esc_html__('Transactions', 'event_espresso');
-		$event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL;
-		$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( esc_html__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL ) . '" title="' . esc_attr__('Click to Edit event', 'event_espresso') . '">' . $event->get('EVT_name') . '</a>', '</h3>' ) : '';
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() );
+		$event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL;
+		$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(esc_html__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'" title="'.esc_attr__('Click to Edit event', 'event_espresso').'">'.$event->get('EVT_name').'</a>', '</h3>') : '';
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -533,7 +533,7 @@ 
 	*	@return void
 	*/
 	protected function _transaction_details() {
-		do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction );
+		do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction);
 
 		$this->_set_transaction_status_array();
 
@@ -546,14 +546,14 @@ 
 		$attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL;
 
 		$this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID();
-		$this->_template_args['txn_nmbr']['label'] = esc_html__( 'Transaction Number', 'event_espresso' );
+		$this->_template_args['txn_nmbr']['label'] = esc_html__('Transaction Number', 'event_espresso');
 
 		$this->_template_args['txn_datetime']['value'] = $this->_transaction->get_i18n_datetime('TXN_timestamp');
-		$this->_template_args['txn_datetime']['label'] = esc_html__( 'Date', 'event_espresso' );
+		$this->_template_args['txn_datetime']['label'] = esc_html__('Date', 'event_espresso');
 
-		$this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ];
-		$this->_template_args['txn_status']['label'] = esc_html__( 'Transaction Status', 'event_espresso' );
-		$this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID');
+		$this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')];
+		$this->_template_args['txn_status']['label'] = esc_html__('Transaction Status', 'event_espresso');
+		$this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID');
 
 		$this->_template_args['grand_total'] = $this->_transaction->get('TXN_total');
 		$this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid');
@@ -566,7 +566,7 @@ 
 			)
 		) {
 			$this->_template_args['send_payment_reminder_button'] =
-				EEH_MSG_Template::is_mt_active( 'payment_reminder' )
+				EEH_MSG_Template::is_mt_active('payment_reminder')
 				&& $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code
 				&& $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code
 					? EEH_Template::get_button_or_link(
@@ -588,40 +588,40 @@ 
 		}
 
 		$amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid');
-		$this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE );
-		if ( EE_Registry::instance()->CFG->currency->sign_b4 ) {
-			$this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due'];
+		$this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE);
+		if (EE_Registry::instance()->CFG->currency->sign_b4) {
+			$this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due'];
 		} else {
-			$this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign;
+			$this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign;
 		}
-		$this->_template_args['amount_due_class'] =  '';
+		$this->_template_args['amount_due_class'] = '';
 
-		if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) {
+		if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) {
 			// paid in full
-			$this->_template_args['amount_due'] =  FALSE;
-		} elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) {
+			$this->_template_args['amount_due'] = FALSE;
+		} elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) {
 			// overpaid
-			$this->_template_args['amount_due_class'] =  'txn-overview-no-payment-spn';
-		} elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn';
+		} elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) {
 			// monies owing
-			$this->_template_args['amount_due_class'] =  'txn-overview-part-payment-spn';
-		} elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn';
+		} elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) {
 			// no payments made yet
-			$this->_template_args['amount_due_class'] =  'txn-overview-no-payment-spn';
-		} elseif ( $this->_transaction->get('TXN_total') == 0 ) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn';
+		} elseif ($this->_transaction->get('TXN_total') == 0) {
 			// free event
-			$this->_template_args['amount_due'] =  FALSE;
+			$this->_template_args['amount_due'] = FALSE;
 		}
 
 		$payment_method = $this->_transaction->payment_method();
 
 		$this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method
 			? $payment_method->admin_name()
-			: esc_html__( 'Unknown', 'event_espresso' );
+			: esc_html__('Unknown', 'event_espresso');
 
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
 		// link back to overview
-		$this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] )
+		$this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER'])
 			? $_SERVER['HTTP_REFERER']
 			: TXN_ADMIN_URL;
 
@@ -629,13 +629,13 @@ 
 		// next link
 		$next_txn = $this->_transaction->next(
 			null,
-			array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ),
+			array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))),
 			'TXN_ID'
 		);
 		$this->_template_args['next_transaction'] = $next_txn
 			? $this->_next_link(
 				EE_Admin_Page::add_query_args_and_nonce(
-					array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ),
+					array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']),
 					TXN_ADMIN_URL
 				),
 				'dashicons dashicons-arrow-right ee-icon-size-22'
@@ -644,13 +644,13 @@ 
 		// previous link
 		$previous_txn = $this->_transaction->previous(
 			null,
-			array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ),
+			array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))),
 			'TXN_ID'
 		);
 		$this->_template_args['previous_transaction'] = $previous_txn
 			? $this->_previous_link(
 				EE_Admin_Page::add_query_args_and_nonce(
-					array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ),
+					array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']),
 					TXN_ADMIN_URL
 				),
 				'dashicons dashicons-arrow-left ee-icon-size-22'
@@ -660,16 +660,16 @@ 
 		// were we just redirected here after adding a new registration ???
 		if (
 			isset(
-				$this->_req_data[ 'redirect_from' ],
-				$this->_req_data[ 'EVT_ID' ],
-				$this->_req_data[ 'event_name' ]
+				$this->_req_data['redirect_from'],
+				$this->_req_data['EVT_ID'],
+				$this->_req_data['event_name']
 			)
 		) {
 			if (
 				EE_Registry::instance()->CAP->current_user_can(
 					'ee_edit_registrations',
 					'espresso_registrations_new_registration',
-					$this->_req_data[ 'EVT_ID' ]
+					$this->_req_data['EVT_ID']
 				)
 			) {
 				$this->_admin_page_title .= '<a id="add-new-registration" class="add-new-h2 button-primary" href="';
@@ -679,25 +679,25 @@ 
 						'action'   => 'new_registration',
 						'return'   => 'default',
 						'TXN_ID'   => $this->_transaction->ID(),
-						'event_id' => $this->_req_data[ 'EVT_ID' ],
+						'event_id' => $this->_req_data['EVT_ID'],
 					),
 					REG_ADMIN_URL
 				);
 				$this->_admin_page_title .= '">';
 
 				$this->_admin_page_title .= sprintf(
-					esc_html__('Add Another New Registration to Event: "%1$s" ?', 'event_espresso' ),
-					htmlentities( urldecode( $this->_req_data[ 'event_name' ] ), ENT_QUOTES, 'UTF-8' )
+					esc_html__('Add Another New Registration to Event: "%1$s" ?', 'event_espresso'),
+					htmlentities(urldecode($this->_req_data['event_name']), ENT_QUOTES, 'UTF-8')
 				);
 				$this->_admin_page_title .= '</a>';
 			}
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 		// grab messages at the last second
 		$this->_template_args['notices'] = EE_Error::get_notices();
 		// path to template
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php';
-		$this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php';
+		$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -716,18 +716,18 @@ 
 
 		$this->_set_transaction_object();
 
-		add_meta_box( 'edit-txn-details-mbox', esc_html__( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-txn-details-mbox', esc_html__('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high');
 		add_meta_box(
 			'edit-txn-attendees-mbox',
-			esc_html__( 'Attendees Registered in this Transaction', 'event_espresso' ),
-			array( $this, 'txn_attendees_meta_box' ),
+			esc_html__('Attendees Registered in this Transaction', 'event_espresso'),
+			array($this, 'txn_attendees_meta_box'),
 			$this->_wp_page_slug,
 			'normal',
 			'high',
-			array( 'TXN_ID' => $this->_transaction->ID() )
+			array('TXN_ID' => $this->_transaction->ID())
 		);
-		add_meta_box( 'edit-txn-registrant-mbox', esc_html__( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' );
-		add_meta_box( 'edit-txn-billing-info-mbox', esc_html__( 'Billing Information', 'event_espresso' ), array( $this, 'txn_billing_info_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' );
+		add_meta_box('edit-txn-registrant-mbox', esc_html__('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high');
+		add_meta_box('edit-txn-billing-info-mbox', esc_html__('Billing Information', 'event_espresso'), array($this, 'txn_billing_info_side_meta_box'), $this->_wp_page_slug, 'side', 'high');
 
 	}
 
@@ -748,15 +748,15 @@ 
 
 		//get line table
 		EEH_Autoloader::register_line_item_display_autoloaders();
-		$Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' );
-		$this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() );
+		$Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item());
 		$this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code');
 
 		// process taxes
-		$taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax )));
-		$this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE;
+		$taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax)));
+		$this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE;
 
-		$this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE );
+		$this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE);
 		$this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total');
 		$this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID');
 
@@ -764,63 +764,63 @@ 
 
 		// process payment details
 		$payments = $this->_transaction->get_many_related('Payment');
-		if( ! empty(  $payments ) ) {
-			$this->_template_args[ 'payments' ] = $payments;
-			$this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments );
+		if ( ! empty($payments)) {
+			$this->_template_args['payments'] = $payments;
+			$this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments);
 		} else {
-			$this->_template_args[ 'payments' ] = false;
-			$this->_template_args[ 'existing_reg_payments' ] = array();
+			$this->_template_args['payments'] = false;
+			$this->_template_args['existing_reg_payments'] = array();
 		}
 
-		$this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment'  ), TXN_ADMIN_URL );
-		$this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL );
+		$this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL);
+		$this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL);
 
-		if ( isset( $txn_details['invoice_number'] )) {
+		if (isset($txn_details['invoice_number'])) {
 			$this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code'];
-			$this->_template_args['txn_details']['invoice_number']['label'] = esc_html__( 'Invoice Number', 'event_espresso' );
+			$this->_template_args['txn_details']['invoice_number']['label'] = esc_html__('Invoice Number', 'event_espresso');
 		}
 
 		$this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session');
-		$this->_template_args['txn_details']['registration_session']['label'] = esc_html__( 'Registration Session', 'event_espresso' );
+		$this->_template_args['txn_details']['registration_session']['label'] = esc_html__('Registration Session', 'event_espresso');
 
-		$this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '';
-		$this->_template_args['txn_details']['ip_address']['label'] = esc_html__( 'Transaction placed from IP', 'event_espresso' );
+		$this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '';
+		$this->_template_args['txn_details']['ip_address']['label'] = esc_html__('Transaction placed from IP', 'event_espresso');
 
-		$this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '';
-		$this->_template_args['txn_details']['user_agent']['label'] = esc_html__( 'Registrant User Agent', 'event_espresso' );
+		$this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '';
+		$this->_template_args['txn_details']['user_agent']['label'] = esc_html__('Registrant User Agent', 'event_espresso');
 
 		$reg_steps = '<ul>';
-		foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) {
-			if ( $reg_step_status === true ) {
-				$reg_steps .= '<li style="color:#70cc50">' . sprintf( esc_html__( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>';
-			} else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) {
-					$reg_steps .= '<li style="color:#2EA2CC">' . sprintf(
-							esc_html__( '%1$s : Initiated %2$s', 'event_espresso' ),
-							ucwords( str_replace( '_', ' ', $reg_step ) ),
-							date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) )
-						) . '</li>';
+		foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) {
+			if ($reg_step_status === true) {
+				$reg_steps .= '<li style="color:#70cc50">'.sprintf(esc_html__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>';
+			} else if (is_numeric($reg_step_status) && $reg_step_status !== false) {
+					$reg_steps .= '<li style="color:#2EA2CC">'.sprintf(
+							esc_html__('%1$s : Initiated %2$s', 'event_espresso'),
+							ucwords(str_replace('_', ' ', $reg_step)),
+							date(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS)))
+						).'</li>';
 				} else {
-				$reg_steps .= '<li style="color:#E76700">' . sprintf( esc_html__( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>';
+				$reg_steps .= '<li style="color:#E76700">'.sprintf(esc_html__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>';
 			}
 		}
 		$reg_steps .= '</ul>';
 		$this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps;
-		$this->_template_args['txn_details']['reg_steps']['label'] = esc_html__( 'Registration Step Progress', 'event_espresso' );
+		$this->_template_args['txn_details']['reg_steps']['label'] = esc_html__('Registration Step Progress', 'event_espresso');
 
 
 		$this->_get_registrations_to_apply_payment_to();
-		$this->_get_payment_methods( $payments );
+		$this->_get_payment_methods($payments);
 		$this->_get_payment_status_array();
 		$this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction.
 
-		$this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction'  ), TXN_ADMIN_URL );
-		$this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL );
-		$this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL );
+		$this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL);
+		$this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL);
+		$this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL);
 
 		// 'espresso_delete_payment_nonce'
 
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -835,27 +835,27 @@ 
 	 * @param EE_Payment[] $payments
 	 * @return array
 	 */
-	protected function _get_registration_payment_IDs( $payments = array() ) {
+	protected function _get_registration_payment_IDs($payments = array()) {
 		$existing_reg_payments = array();
 		// get all reg payments for these payments
-		$reg_payments = EEM_Registration_Payment::instance()->get_all( array(
+		$reg_payments = EEM_Registration_Payment::instance()->get_all(array(
 			array(
 				'PAY_ID' => array(
 					'IN',
-					array_keys( $payments )
+					array_keys($payments)
 				)
 			)
-		) );
-		if ( ! empty( $reg_payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( ! $payment instanceof EE_Payment ) {
+		));
+		if ( ! empty($reg_payments)) {
+			foreach ($payments as $payment) {
+				if ( ! $payment instanceof EE_Payment) {
 					continue;
-				} else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) {
-					$existing_reg_payments[ $payment->ID() ] = array();
+				} else if ( ! isset($existing_reg_payments[$payment->ID()])) {
+					$existing_reg_payments[$payment->ID()] = array();
 				}
-				foreach ( $reg_payments as $reg_payment ) {
-					if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) {
-						$existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID();
+				foreach ($reg_payments as $reg_payment) {
+					if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) {
+						$existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID();
 					}
 				}
 			}
@@ -888,54 +888,54 @@ 
 				)
 			)
 		);
-		$registrations_to_apply_payment_to = EEH_HTML::br() . EEH_HTML::div(
+		$registrations_to_apply_payment_to = EEH_HTML::br().EEH_HTML::div(
 			'', 'txn-admin-apply-payment-to-registrations-dv', '', 'clear: both; margin: 1.5em 0 0; display: none;'
 		);
-		$registrations_to_apply_payment_to .= EEH_HTML::br() . EEH_HTML::div( '', '', 'admin-primary-mbox-tbl-wrap' );
-		$registrations_to_apply_payment_to .= EEH_HTML::table( '', '', 'admin-primary-mbox-tbl' );
+		$registrations_to_apply_payment_to .= EEH_HTML::br().EEH_HTML::div('', '', 'admin-primary-mbox-tbl-wrap');
+		$registrations_to_apply_payment_to .= EEH_HTML::table('', '', 'admin-primary-mbox-tbl');
 		$registrations_to_apply_payment_to .= EEH_HTML::thead(
 			EEH_HTML::tr(
-				EEH_HTML::th( esc_html__( 'ID', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Registrant', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Ticket', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Event', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Paid', 'event_espresso' ), '', 'txn-admin-payment-paid-td jst-cntr' ) .
-				EEH_HTML::th( esc_html__( 'Owing', 'event_espresso' ), '', 'txn-admin-payment-owing-td jst-cntr' ) .
-				EEH_HTML::th( esc_html__( 'Apply', 'event_espresso' ), '', 'jst-cntr' )
+				EEH_HTML::th(esc_html__('ID', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Registrant', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Ticket', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Event', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Paid', 'event_espresso'), '', 'txn-admin-payment-paid-td jst-cntr').
+				EEH_HTML::th(esc_html__('Owing', 'event_espresso'), '', 'txn-admin-payment-owing-td jst-cntr').
+				EEH_HTML::th(esc_html__('Apply', 'event_espresso'), '', 'jst-cntr')
 			)
 		);
 		$registrations_to_apply_payment_to .= EEH_HTML::tbody();
 		// get registrations for TXN
-		$registrations = $this->_transaction->registrations( $query_params );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->_transaction->registrations($query_params);
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$attendee_name = $registration->attendee() instanceof EE_Attendee
 					? $registration->attendee()->full_name()
-					: esc_html__( 'Unknown Attendee', 'event_espresso' );
+					: esc_html__('Unknown Attendee', 'event_espresso');
 				$owing = $registration->final_price() - $registration->paid();
 				$taxable = $registration->ticket()->taxable()
-					? ' <span class="smaller-text lt-grey-text"> ' . esc_html__( '+ tax', 'event_espresso' ) . '</span>'
+					? ' <span class="smaller-text lt-grey-text"> '.esc_html__('+ tax', 'event_espresso').'</span>'
 					: '';
-				$checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments )
+				$checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments)
 					? ' checked="checked"'
 					: '';
 				$disabled = $registration->final_price() > 0 ? '' : ' disabled';
 				$registrations_to_apply_payment_to .= EEH_HTML::tr(
-					EEH_HTML::td( $registration->ID() ) .
-					EEH_HTML::td( $attendee_name ) .
+					EEH_HTML::td($registration->ID()).
+					EEH_HTML::td($attendee_name).
 					EEH_HTML::td(
-						$registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable
-					) .
-					EEH_HTML::td( $registration->event_name() ) .
-					EEH_HTML::td( $registration->pretty_paid(), '', 'txn-admin-payment-paid-td jst-cntr' ) .
-					EEH_HTML::td( EEH_Template::format_currency( $owing ), '', 'txn-admin-payment-owing-td jst-cntr' ) .
+						$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable
+					).
+					EEH_HTML::td($registration->event_name()).
+					EEH_HTML::td($registration->pretty_paid(), '', 'txn-admin-payment-paid-td jst-cntr').
+					EEH_HTML::td(EEH_Template::format_currency($owing), '', 'txn-admin-payment-owing-td jst-cntr').
 					EEH_HTML::td(
-						'<input type="checkbox" value="' . $registration->ID()
+						'<input type="checkbox" value="'.$registration->ID()
 						. '" name="txn_admin_payment[registrations]"'
-						. $checked . $disabled . '>',
+						. $checked.$disabled.'>',
 						'', 'jst-cntr'
 					),
-					'apply-payment-registration-row-' . $registration->ID()
+					'apply-payment-registration-row-'.$registration->ID()
 				);
 			}
 		}
@@ -950,7 +950,7 @@ 
 			'', 'clear description'
 		);
 		$registrations_to_apply_payment_to .= EEH_HTML::divx();
-		$this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to;
+		$this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to;
 	}
 
 
@@ -967,9 +967,9 @@ 
 		$statuses = EEM_Registration::reg_status_array(array(), TRUE);
 		//let's add a "don't change" option.
 		$status_array['NAN'] = esc_html__('Leave the Same', 'event_espresso');
-		$status_array = array_merge( $status_array, $statuses );
-		$this->_template_args['status_change_select'] = EEH_Form_Fields::select_input( 'txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status' );
-		$this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input( 'delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status' );
+		$status_array = array_merge($status_array, $statuses);
+		$this->_template_args['status_change_select'] = EEH_Form_Fields::select_input('txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status');
+		$this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input('delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status');
 
 	}
 
@@ -984,21 +984,21 @@ 
 	 * @param EE_Payment[] to show on this page
 	 *	@return void
 	 */
-	private function _get_payment_methods( $payments = array() ) {
+	private function _get_payment_methods($payments = array()) {
 		$payment_methods_of_payments = array();
-		foreach( $payments as $payment ){
-			if( $payment instanceof EE_Payment ){
-				$payment_methods_of_payments[] = $payment->get( 'PMD_ID' );
+		foreach ($payments as $payment) {
+			if ($payment instanceof EE_Payment) {
+				$payment_methods_of_payments[] = $payment->get('PMD_ID');
 			}
 		}
-		if( $payment_methods_of_payments ){
-			$query_args = array( array( 'OR*payment_method_for_payment' => array(
-					'PMD_ID' => array( 'IN', $payment_methods_of_payments ),
-					'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) );
-		}else{
-			$query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) );
+		if ($payment_methods_of_payments) {
+			$query_args = array(array('OR*payment_method_for_payment' => array(
+					'PMD_ID' => array('IN', $payment_methods_of_payments),
+					'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') )));
+		} else {
+			$query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%')));
 		}
-		$this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args );
+		$this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args);
 	}
 
 
@@ -1012,17 +1012,17 @@ 
 	 * @param array $metabox
 	 * @return void
 	 */
-	public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) {
+	public function txn_attendees_meta_box($post, $metabox = array('args' => array())) {
 
-		extract( $metabox['args'] );
+		extract($metabox['args']);
 		$this->_template_args['post'] = $post;
 		$this->_template_args['event_attendees'] = array();
 		// process items in cart
-		$line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) );
-		if ( ! empty( $line_items )) {
-			foreach ( $line_items as $item ) {
-				if ( $item instanceof EE_Line_Item ) {
-					switch( $item->OBJ_type() ) {
+		$line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item')));
+		if ( ! empty($line_items)) {
+			foreach ($line_items as $item) {
+				if ($item instanceof EE_Line_Item) {
+					switch ($item->OBJ_type()) {
 
 						case 'Event' :
 							break;
@@ -1030,39 +1030,39 @@ 
 						case 'Ticket' :
 							$ticket = $item->ticket();
 							//right now we're only handling tickets here.  Cause its expected that only tickets will have attendees right?
-							if ( ! $ticket instanceof EE_Ticket ) {
+							if ( ! $ticket instanceof EE_Ticket) {
 								continue;
 							}
 							try {
 								$event_name = $ticket->get_event_name();
-							} catch ( Exception $e ) {
-								EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
-								$event_name = esc_html__( 'Unknown Event', 'event_espresso' );
+							} catch (Exception $e) {
+								EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+								$event_name = esc_html__('Unknown Event', 'event_espresso');
 							}
-							$event_name .= ' - ' . $item->get( 'LIN_name' );
-							$ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' ) );
+							$event_name .= ' - '.$item->get('LIN_name');
+							$ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price'));
 							// now get all of the registrations for this transaction that use this ticket
-							$registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() )));
-							foreach( $registrations as $registration ) {
-								if ( ! $registration instanceof EE_Registration ) {
+							$registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID())));
+							foreach ($registrations as $registration) {
+								if ( ! $registration instanceof EE_Registration) {
 									continue;
 								}
-								$this->_template_args['event_attendees'][$registration->ID()]['STS_ID'] 			= $registration->status_ID();
-								$this->_template_args['event_attendees'][$registration->ID()]['att_num'] 			= $registration->count();
-								$this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] 	= $event_name;
-								$this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] 		= $ticket_price;
+								$this->_template_args['event_attendees'][$registration->ID()]['STS_ID'] = $registration->status_ID();
+								$this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->count();
+								$this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name;
+								$this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price;
 								// attendee info
 								$attendee = $registration->get_first_related('Attendee');
-								if ( $attendee instanceof EE_Attendee ) {
-									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] 	= $attendee->ID();
-									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] 	= $attendee->full_name();
-									$this->_template_args['event_attendees'][$registration->ID()]['email']		= '<a href="mailto:' . $attendee->email() . '?subject=' . $event_name . esc_html__(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>';
-									$this->_template_args['event_attendees'][$registration->ID()]['address'] 	= EEH_Address::format( $attendee, 'inline', false, false );
+								if ($attendee instanceof EE_Attendee) {
+									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] = $attendee->ID();
+									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] = $attendee->full_name();
+									$this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event_name.esc_html__(' Event', 'event_espresso').'">'.$attendee->email().'</a>';
+									$this->_template_args['event_attendees'][$registration->ID()]['address'] = EEH_Address::format($attendee, 'inline', false, false);
 								} else {
 									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] 	= '';
-									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] 	= '';
+									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] = '';
 									$this->_template_args['event_attendees'][$registration->ID()]['email'] 		= '';
-									$this->_template_args['event_attendees'][$registration->ID()]['address'] 	= '';
+									$this->_template_args['event_attendees'][$registration->ID()]['address'] = '';
 								}
 							}
 							break;
@@ -1071,12 +1071,12 @@ 
 				}
 			}
 
-			$this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees'  ), TXN_ADMIN_URL );
-			echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE );
+			$this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL);
+			echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE);
 
 		} else {
 			echo sprintf(
-				esc_html__( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ),
+				esc_html__('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'),
 				'<p class="important-notice">',
 				'</p>'
 			);
@@ -1095,19 +1095,19 @@ 
 	 */
 	public function txn_registrant_side_meta_box() {
 		$primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null;
-		if ( ! $primary_att instanceof EE_Attendee ) {
+		if ( ! $primary_att instanceof EE_Attendee) {
 			$this->_template_args['no_attendee_message'] = esc_html__('There is no attached contact for this transaction.  The transaction either failed due to an error or was abandoned.', 'event_espresso');
 			$primary_att = EEM_Attendee::instance()->create_default_object();
 		}
-		$this->_template_args['ATT_ID'] 						= $primary_att->ID();
+		$this->_template_args['ATT_ID'] = $primary_att->ID();
 		$this->_template_args['prime_reg_fname']		= $primary_att->fname();
 		$this->_template_args['prime_reg_lname']		= $primary_att->lname();
-		$this->_template_args['prime_reg_email'] 		= $primary_att->email();
+		$this->_template_args['prime_reg_email'] = $primary_att->email();
 		$this->_template_args['prime_reg_phone'] 	= $primary_att->phone();
-		$this->_template_args['edit_attendee_url'] 	= EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit_attendee', 'post' => $primary_att->ID()  ), REG_ADMIN_URL );
+		$this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit_attendee', 'post' => $primary_att->ID()), REG_ADMIN_URL);
 		// get formatted address for registrant
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att );
-		echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE );
+		$this->_template_args['formatted_address'] = EEH_Address::format($primary_att);
+		echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -1123,12 +1123,12 @@ 
 
 		$this->_template_args['billing_form'] = $this->_transaction->billing_info();
 		$this->_template_args['billing_form_url'] = add_query_arg(
-			array( 'action' => 'edit_transaction', 'process' => 'billing'  ),
+			array('action' => 'edit_transaction', 'process' => 'billing'),
 			TXN_ADMIN_URL
 		);
 
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/
 	}
 
 
@@ -1141,42 +1141,42 @@ 
 	*	@return void
 	*/
 	public function apply_payments_or_refunds() {
-		$json_response_data = array( 'return_data' => FALSE );
+		$json_response_data = array('return_data' => FALSE);
 		$valid_data = $this->_validate_payment_request_data();
-		if ( ! empty( $valid_data ) ) {
-			$PAY_ID = $valid_data[ 'PAY_ID' ];
+		if ( ! empty($valid_data)) {
+			$PAY_ID = $valid_data['PAY_ID'];
 			//save  the new payment
-			$payment = $this->_create_payment_from_request_data( $valid_data );
+			$payment = $this->_create_payment_from_request_data($valid_data);
 			// get the TXN for this payment
 			$transaction = $payment->transaction();
 			// verify transaction
-			if ( $transaction instanceof EE_Transaction ) {
+			if ($transaction instanceof EE_Transaction) {
 				// calculate_total_payments_and_update_status
-				$this->_process_transaction_payments( $transaction );
-				$REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment );
-				$this->_remove_existing_registration_payments( $payment, $PAY_ID );
+				$this->_process_transaction_payments($transaction);
+				$REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment);
+				$this->_remove_existing_registration_payments($payment, $PAY_ID);
 				// apply payment to registrations (if applicable)
-				if ( ! empty( $REG_IDs ) ) {
-					$this->_update_registration_payments( $transaction, $payment, $REG_IDs );
+				if ( ! empty($REG_IDs)) {
+					$this->_update_registration_payments($transaction, $payment, $REG_IDs);
 					$this->_maybe_send_notifications();
 					// now process status changes for the same registrations
-					$this->_process_registration_status_change( $transaction, $REG_IDs );
+					$this->_process_registration_status_change($transaction, $REG_IDs);
 				}
-				$this->_maybe_send_notifications( $payment );
+				$this->_maybe_send_notifications($payment);
 				//prepare to render page
-				$json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs );
-				do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment );
+				$json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs);
+				do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment);
 			} else {
 				EE_Error::add_error(
-					esc_html__( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ),
+					esc_html__('A valid Transaction for this payment could not be retrieved.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
-			EE_Error::add_error( esc_html__( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(esc_html__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		$notices = EE_Error::get_notices( false, false, false );
+		$notices = EE_Error::get_notices(false, false, false);
 		$this->_template_args = array(
 			'data' => $json_response_data,
 			'error' => $notices['errors'],
@@ -1193,30 +1193,30 @@ 
 	 * @return array
 	 */
 	protected function _validate_payment_request_data() {
-		if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) {
+		if ( ! isset($this->_req_data['txn_admin_payment'])) {
 			return false;
 		}
 		$payment_form = $this->_generate_payment_form_section();
 		try {
-			if ( $payment_form->was_submitted() ) {
+			if ($payment_form->was_submitted()) {
 				$payment_form->receive_form_submission();
-				if ( ! $payment_form->is_valid() ) {
+				if ( ! $payment_form->is_valid()) {
 					$submission_error_messages = array();
-					foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) {
-						if ( $validation_error instanceof EE_Validation_Error ) {
+					foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) {
+						if ($validation_error instanceof EE_Validation_Error) {
 							$submission_error_messages[] = sprintf(
-								_x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ),
+								_x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'),
 								$validation_error->get_form_section()->html_label_text(),
 								$validation_error->getMessage()
 							);
 						}
 					}
-					EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 					return array();
 				}
 			}
-		} catch ( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return array();
 		}
 		return $payment_form->valid_data();
@@ -1238,63 +1238,63 @@ 
 						array(
 							'default' => 0,
 							'required' => false,
-							'html_label_text' => esc_html__( 'Payment ID', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Payment ID', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'TXN_ID' => new EE_Text_Input(
 						array(
 							'default' => 0,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Transaction ID', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Transaction ID', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'type' => new EE_Text_Input(
 						array(
 							'default' => 1,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment or Refund', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Payment or Refund', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'amount' => new EE_Text_Input(
 						array(
 							'default' => 0,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment amount', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Float_Normalization() )
+							'html_label_text' => esc_html__('Payment amount', 'event_espresso'),
+							'validation_strategies' => array(new EE_Float_Normalization())
 						)
 					),
 					'status' => new EE_Text_Input(
 						array(
 							'default' => EEM_Payment::status_id_approved,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment status', 'event_espresso' ),
+							'html_label_text' => esc_html__('Payment status', 'event_espresso'),
 						)
 					),
 					'PMD_ID' => new EE_Text_Input(
 						array(
 							'default' => 2,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment Method', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Payment Method', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'date' => new EE_Text_Input(
 						array(
 							'default' => time(),
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment date', 'event_espresso' ),
+							'html_label_text' => esc_html__('Payment date', 'event_espresso'),
 						)
 					),
 					'txn_id_chq_nmbr' => new EE_Text_Input(
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => esc_html__( 'Transaction or Cheque Number', 'event_espresso' ),
+							'html_label_text' => esc_html__('Transaction or Cheque Number', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(esc_html__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1302,9 +1302,9 @@ 
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => esc_html__( 'Purchase Order Number', 'event_espresso' ),
+							'html_label_text' => esc_html__('Purchase Order Number', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(esc_html__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1312,9 +1312,9 @@ 
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => esc_html__( 'Extra Field for Accounting', 'event_espresso' ),
+							'html_label_text' => esc_html__('Extra Field for Accounting', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(esc_html__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1331,37 +1331,37 @@ 
 	 * @param array $valid_data
 	 * @return EE_Payment
 	 */
-	protected function _create_payment_from_request_data( $valid_data ) {
-		$PAY_ID = $valid_data[ 'PAY_ID' ];
+	protected function _create_payment_from_request_data($valid_data) {
+		$PAY_ID = $valid_data['PAY_ID'];
 		// get payment amount
-		$amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0;
+		$amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0;
 		// payments have a type value of 1 and refunds have a type value of -1
 		// so multiplying amount by type will give a positive value for payments, and negative values for refunds
-		$amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount;
+		$amount = $valid_data['type'] < 0 ? $amount * -1 : $amount;
 		// for some reason the date string coming in has extra spaces between the date and time.  This fixes that.
-		$date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) );
+		$date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp'));
 		$payment = EE_Payment::new_instance(
 			array(
-				'TXN_ID' 								=> $valid_data[ 'TXN_ID' ],
-				'STS_ID' 								=> $valid_data[ 'status' ],
+				'TXN_ID' 								=> $valid_data['TXN_ID'],
+				'STS_ID' 								=> $valid_data['status'],
 				'PAY_timestamp' 				=> $date,
 				'PAY_source'           			=> EEM_Payment_Method::scope_admin,
-				'PMD_ID'               				=> $valid_data[ 'PMD_ID' ],
+				'PMD_ID'               				=> $valid_data['PMD_ID'],
 				'PAY_amount'           			=> $amount,
-				'PAY_txn_id_chq_nmbr'  	=> $valid_data[ 'txn_id_chq_nmbr' ],
-				'PAY_po_number'        		=> $valid_data[ 'po_number' ],
-				'PAY_extra_accntng'    		=> $valid_data[ 'accounting' ],
+				'PAY_txn_id_chq_nmbr'  	=> $valid_data['txn_id_chq_nmbr'],
+				'PAY_po_number'        		=> $valid_data['po_number'],
+				'PAY_extra_accntng'    		=> $valid_data['accounting'],
 				'PAY_details'          				=> $valid_data,
 				'PAY_ID'               				=> $PAY_ID
 			),
 			'',
-			array( 'Y-m-d', 'g:i a' )
+			array('Y-m-d', 'g:i a')
 		);
 
-		if ( ! $payment->save() ) {
+		if ( ! $payment->save()) {
 			EE_Error::add_error(
 				sprintf(
-					esc_html__( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ),
+					esc_html__('Payment %1$d has not been successfully saved to the database.', 'event_espresso'),
 					$payment->ID()
 				),
 				__FILE__, __FUNCTION__, __LINE__
@@ -1378,15 +1378,15 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return array
 	 */
-	protected function _process_transaction_payments( EE_Transaction $transaction ) {
+	protected function _process_transaction_payments(EE_Transaction $transaction) {
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		//update the transaction with this payment
-		if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) {
-			EE_Error::add_success( esc_html__( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) {
+			EE_Error::add_success(esc_html__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			EE_Error::add_error(
-				esc_html__( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' )
+				esc_html__('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso')
 				, __FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1402,19 +1402,19 @@ 
 	 * @param \EE_Payment $payment
 	 * @return array
 	 */
-	protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) {
+	protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) {
 		$REG_IDs = array();
 		// grab array of IDs for specific registrations to apply changes to
-		if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) {
-			$REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ];
+		if (isset($this->_req_data['txn_admin_payment']['registrations'])) {
+			$REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations'];
 		}
 		//nothing specified ? then get all reg IDs
-		if ( empty( $REG_IDs ) ) {
+		if (empty($REG_IDs)) {
 			$registrations = $payment->transaction()->registrations();
-			$REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment );
+			$REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment);
 		}
 		// ensure that REG_IDs are integers and NOT strings
-		return array_map( 'intval', $REG_IDs );
+		return array_map('intval', $REG_IDs);
 	}
 
 
@@ -1431,7 +1431,7 @@ 
 	/**
 	 * @param array $existing_reg_payment_REG_IDs
 	 */
-	public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) {
+	public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) {
 		$this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs;
 	}
 
@@ -1446,13 +1446,13 @@ 
 	 * @param \EE_Payment $payment
 	 * @return array
 	 */
-	protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) {
-		if ( $this->existing_reg_payment_REG_IDs() === null ) {
+	protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) {
+		if ($this->existing_reg_payment_REG_IDs() === null) {
 			// let's get any existing reg payment records for this payment
-			$existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' );
+			$existing_reg_payment_REG_IDs = $payment->get_many_related('Registration');
 			// but we only want the REG IDs, so grab the array keys
-			$existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array();
-			$this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs );
+			$existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array();
+			$this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs);
 		}
 		return $this->existing_reg_payment_REG_IDs();
 	}
@@ -1471,23 +1471,23 @@ 
 	 * @param int         $PAY_ID
 	 * @return bool;
 	 */
-	protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) {
+	protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) {
 		// newly created payments will have nothing recorded for $PAY_ID
-		if ( $PAY_ID == 0 ) {
+		if ($PAY_ID == 0) {
 			return false;
 		}
-		$existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment );
-		if ( empty( $existing_reg_payment_REG_IDs )) {
+		$existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment);
+		if (empty($existing_reg_payment_REG_IDs)) {
 			return false;
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		return $transaction_payments->delete_registration_payments_and_update_registrations(
 			$payment,
 			array(
 				array(
 					'PAY_ID' => $payment->ID(),
-					'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ),
+					'REG_ID' => array('IN', $existing_reg_payment_REG_IDs),
 				)
 			)
 		);
@@ -1506,25 +1506,25 @@ 
 	 * @param array $REG_IDs
 	 * @return bool
 	 */
-	protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) {
+	protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) {
 		// we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments()
 		// so let's do that using our set of REG_IDs from the form
 		$registration_query_where_params = array(
-			'REG_ID' => array( 'IN', $REG_IDs )
+			'REG_ID' => array('IN', $REG_IDs)
 		);
 		// but add in some conditions regarding payment,
 		// so that we don't apply payments to registrations that are free or have already been paid for
 		// but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative )
-		if ( ! $payment->is_a_refund() ) {
-			$registration_query_where_params[ 'REG_final_price' ]  = array( '!=', 0 );
-			$registration_query_where_params[ 'REG_final_price*' ]  = array( '!=', 'REG_paid', true );
+		if ( ! $payment->is_a_refund()) {
+			$registration_query_where_params['REG_final_price'] = array('!=', 0);
+			$registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true);
 		}
 		//EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ );
-		$registrations = $transaction->registrations( array( $registration_query_where_params ) );
-		if ( ! empty( $registrations ) ) {
+		$registrations = $transaction->registrations(array($registration_query_where_params));
+		if ( ! empty($registrations)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-			$payment_processor->process_registration_payments( $transaction, $payment, $registrations );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+			$payment_processor->process_registration_payments($transaction, $payment, $registrations);
 		}
 	}
 
@@ -1540,22 +1540,22 @@ 
 	 * @param array $REG_IDs
 	 * @return bool
 	 */
-	protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) {
+	protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) {
 		// first if there is no change in status then we get out.
 		if (
-			! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] )
+			! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status'])
 			|| $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN'
 		) {
 			//no error message, no change requested, just nothing to do man.
 			return FALSE;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// made it here dude?  Oh WOW.  K, let's take care of changing the statuses
 		return $transaction_processor->manually_update_registration_statuses(
 			$transaction,
-			sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ),
-			array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) )
+			sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']),
+			array(array('REG_ID' => array('IN', $REG_IDs)))
 		);
 	}
 
@@ -1570,16 +1570,16 @@ 
 	 * @param bool | null        $delete_txn_reg_status_change
 	 * @return array
 	 */
-	protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) {
+	protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) {
 		// was the payment deleted ?
-		if ( is_bool( $delete_txn_reg_status_change )) {
+		if (is_bool($delete_txn_reg_status_change)) {
 			return array(
 				'PAY_ID' 				=> $payment->ID(),
 				'amount' 			=> $payment->amount(),
 				'total_paid' 			=> $payment->transaction()->paid(),
 				'txn_status' 			=> $payment->transaction()->status_ID(),
 				'pay_status' 		=> $payment->STS_ID(),
-				'registrations' 	=> $this->_registration_payment_data_array( $REG_IDs ),
+				'registrations' 	=> $this->_registration_payment_data_array($REG_IDs),
 				'delete_txn_reg_status_change' => $delete_txn_reg_status_change,
 			);
 		} else {
@@ -1591,16 +1591,16 @@ 
 				'pay_status' 	=> $payment->STS_ID(),
 				'PAY_ID'           => $payment->ID(),
 				'STS_ID' 			=> $payment->STS_ID(),
-				'status' 			=> self::$_pay_status[ $payment->STS_ID() ],
-				'date' 				=> $payment->timestamp( 'Y-m-d', 'h:i a' ),
-				'method' 		=> strtoupper( $payment->source() ),
+				'status' 			=> self::$_pay_status[$payment->STS_ID()],
+				'date' 				=> $payment->timestamp('Y-m-d', 'h:i a'),
+				'method' 		=> strtoupper($payment->source()),
 				'PM_ID' 			=> $payment->payment_method() ? $payment->payment_method()->ID() : 1,
-				'gateway' 		=> $payment->payment_method() ? $payment->payment_method()->admin_name() : esc_html__( "Unknown", 'event_espresso' ),
+				'gateway' 		=> $payment->payment_method() ? $payment->payment_method()->admin_name() : esc_html__("Unknown", 'event_espresso'),
 				'gateway_response' 	=> $payment->gateway_response(),
 				'txn_id_chq_nmbr'  	=> $payment->txn_id_chq_nmbr(),
 				'po_number'        		=> $payment->po_number(),
 				'extra_accntng'    		=> $payment->extra_accntng(),
-				'registrations'    			=> $this->_registration_payment_data_array( $REG_IDs ),
+				'registrations'    			=> $this->_registration_payment_data_array($REG_IDs),
 			);
 		}
 	}
@@ -1615,39 +1615,39 @@ 
 	*	@return void
 	*/
 	public function delete_payment() {
-		$json_response_data = array( 'return_data' => FALSE );
-		$PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0;
-		if ( $PAY_ID ) {
-			$delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false;
-			$payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID );
-			if ( $payment instanceof EE_Payment ) {
-				$REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment );
+		$json_response_data = array('return_data' => FALSE);
+		$PAY_ID = isset($this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID']) ? absint($this->_req_data['delete_txn_admin_payment']['PAY_ID']) : 0;
+		if ($PAY_ID) {
+			$delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false;
+			$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
+			if ($payment instanceof EE_Payment) {
+				$REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment);
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) {
-					$json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change );
-					if ( $delete_txn_reg_status_change ) {
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				if ($transaction_payments->delete_payment_and_update_transaction($payment)) {
+					$json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change);
+					if ($delete_txn_reg_status_change) {
 						$this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change;
 						//MAKE sure we also add the delete_txn_req_status_change to the
 						//$_REQUEST global because that's how messages will be looking for it.
 						$_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change;
 						$this->_maybe_send_notifications();
-						$this->_process_registration_status_change( $payment->transaction(), $REG_IDs );
+						$this->_process_registration_status_change($payment->transaction(), $REG_IDs);
 					}
 				}
 			} else {
 				EE_Error::add_error(
-					esc_html__( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ),
+					esc_html__('Valid Payment data could not be retrieved from the database.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
 			EE_Error::add_error(
-				esc_html__( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ),
+				esc_html__('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		$notices = EE_Error::get_notices( false, false, false);
+		$notices = EE_Error::get_notices(false, false, false);
 		$this->_template_args = array(
 			'data' => $json_response_data,
 			'success' => $notices['success'],
@@ -1667,16 +1667,16 @@ 
 	 * @param array $REG_IDs
 	 * @return array
 	 */
-	protected function _registration_payment_data_array( $REG_IDs ) {
+	protected function _registration_payment_data_array($REG_IDs) {
 		$registration_payment_data = array();
 		//if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows.
-		if ( ! empty( $REG_IDs ) ) {
-			$registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) );
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
-					$registration_payment_data[ $registration->ID() ] = array(
+		if ( ! empty($REG_IDs)) {
+			$registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs))));
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
+					$registration_payment_data[$registration->ID()] = array(
 						'paid' => $registration->pretty_paid(),
-						'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ),
+						'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()),
 					);
 				}
 			}
@@ -1696,30 +1696,30 @@ 
 	 * @access protected
 	 * @param \EE_Payment | null $payment
 	 */
-	protected function _maybe_send_notifications( $payment = null ) {
-		switch ( $payment instanceof EE_Payment ) {
+	protected function _maybe_send_notifications($payment = null) {
+		switch ($payment instanceof EE_Payment) {
 			// payment notifications
 			case true :
 				if (
 					isset(
-						$this->_req_data[ 'txn_payments' ],
-						$this->_req_data[ 'txn_payments' ][ 'send_notifications' ]
+						$this->_req_data['txn_payments'],
+						$this->_req_data['txn_payments']['send_notifications']
 					) &&
-					filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN )
+					filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN)
 				) {
-					$this->_process_payment_notification( $payment );
+					$this->_process_payment_notification($payment);
 				}
 				break;
 			// registration notifications
 			case false :
 				if (
 					isset(
-						$this->_req_data[ 'txn_reg_status_change' ],
-						$this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ]
+						$this->_req_data['txn_reg_status_change'],
+						$this->_req_data['txn_reg_status_change']['send_notifications']
 					) &&
-					filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN )
+					filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN)
 				) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				}
 				break;
 		}
@@ -1735,11 +1735,11 @@ 
 	*	@return void
 	*/
 	protected function _send_payment_reminder() {
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
-		$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
-		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array();
-		do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction );
-		$this->_redirect_after_action( FALSE, esc_html__('payment reminder', 'event_espresso'), esc_html__('sent', 'event_espresso'), $query_args, TRUE );
+	    $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE;
+		$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+		$query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array();
+		do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction);
+		$this->_redirect_after_action(FALSE, esc_html__('payment reminder', 'event_espresso'), esc_html__('sent', 'event_espresso'), $query_args, TRUE);
 	}
 
 
@@ -1753,36 +1753,36 @@ 
 	 * @param string   $view
 	 * @return mixed int = count || array of transaction objects
 	 */
-	public function get_transactions( $perpage, $count = FALSE, $view = '' ) {
+	public function get_transactions($perpage, $count = FALSE, $view = '') {
 
 		$TXN = EEM_Transaction::instance();
 
-	    $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-	    $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+	    $start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+	    $end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y');
 
 	    //make sure our timestamps start and end right at the boundaries for each day
-	    $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-	    $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+	    $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+	    $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 
 	    //convert to timestamps
-	    $start_date = strtotime( $start_date );
-	    $end_date = strtotime( $end_date );
+	    $start_date = strtotime($start_date);
+	    $end_date = strtotime($end_date);
 
 	    //makes sure start date is the lowest value and vice versa
-	    $start_date = min( $start_date, $end_date );
-	    $end_date = max( $start_date, $end_date );
+	    $start_date = min($start_date, $end_date);
+	    $end_date = max($start_date, $end_date);
 
 	    //convert to correct format for query
-	$start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-	$end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+	$start_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+	$end_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
 
 
 	    //set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
-		switch ( $this->_req_data['orderby'] ) {
+		switch ($this->_req_data['orderby']) {
 			case 'TXN_ID':
 				$orderby = 'TXN_ID';
 				break;
@@ -1796,66 +1796,66 @@ 
 				$orderby = 'TXN_timestamp';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $perpage ) && !empty( $perpage ) ? $perpage : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($perpage) && ! empty($perpage) ? $perpage : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
 		$_where = array(
-			'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ),
+			'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)),
 			'Registration.REG_count' => 1
 		);
 
-		if ( isset( $this->_req_data['EVT_ID'] ) ) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			$_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID'];
 		}
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Registration.Event.EVT_name' => array( 'LIKE', $search_string ),
-				'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ),
-				'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ),
-				'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_email' => array('LIKE', $search_string ),
-				'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ),
-				'Registration.REG_final_price' => array( 'LIKE', $search_string ),
-				'Registration.REG_code' => array( 'LIKE', $search_string ),
-				'Registration.REG_count' => array( 'LIKE' , $search_string ),
-				'Registration.REG_group_size' => array( 'LIKE' , $search_string ),
-				'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ),
-				'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ),
-				'Payment.PAY_source' => array('LIKE', $search_string ),
-				'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ),
-				'TXN_session_data' => array( 'LIKE', $search_string ),
-				'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string )
+				'Registration.Event.EVT_name' => array('LIKE', $search_string),
+				'Registration.Event.EVT_desc' => array('LIKE', $search_string),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_fname' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_lname' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_email' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_address' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_address2' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_city' => array('LIKE', $search_string),
+				'Registration.REG_final_price' => array('LIKE', $search_string),
+				'Registration.REG_code' => array('LIKE', $search_string),
+				'Registration.REG_count' => array('LIKE', $search_string),
+				'Registration.REG_group_size' => array('LIKE', $search_string),
+				'Registration.Ticket.TKT_name' => array('LIKE', $search_string),
+				'Registration.Ticket.TKT_description' => array('LIKE', $search_string),
+				'Payment.PAY_source' => array('LIKE', $search_string),
+				'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string),
+				'TXN_session_data' => array('LIKE', $search_string),
+				'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string)
 				);
 		}
 
 		//failed transactions
-		$failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE;
-		$abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE;
+		$failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE : FALSE;
+		$abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE : FALSE;
 
-		if ( $failed ) {
-			$_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code;
-		} else if ( $abandoned ) {
+		if ($failed) {
+			$_where['STS_ID'] = EEM_Transaction::failed_status_code;
+		} else if ($abandoned) {
 				$_where['STS_ID'] = EEM_Transaction::abandoned_status_code;
 		} else {
-				$_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code );
-				$_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code );
+				$_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code);
+				$_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code);
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit);
 
-		$transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params);
+		$transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params);
 
 
 		return $transactions;

core/db_models/EEM_Line_Item.model.php

Spacing +59 added lines, -59 removed lines

@@ -105,41 +105,41 @@ 
 	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * @return \EEM_Line_Item
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Line Item','event_espresso');
-		$this->plural_item = __('Line Items','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Line Item', 'event_espresso');
+		$this->plural_item = __('Line Items', 'event_espresso');
 
 		$this->_tables = array(
-			'Line_Item'=>new EE_Primary_Table('esp_line_item','LIN_ID')
+			'Line_Item'=>new EE_Primary_Table('esp_line_item', 'LIN_ID')
 		);
-		$line_items_can_be_for = apply_filters( 'FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket','Price', 'Event' ) );
+		$line_items_can_be_for = apply_filters('FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket', 'Price', 'Event'));
 		$this->_fields = array(
 			'Line_Item' => array(
-				'LIN_ID' 				=> new EE_Primary_Key_Int_Field( 'LIN_ID', __( "ID", "event_espresso" ) ),
-				'LIN_code' 			=> new EE_Slug_Field( 'LIN_code', __( "Code for index into Cart", "event_espresso" ), TRUE ),
-				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field( 'TXN_ID', __( "Transaction ID", "event_espresso" ), TRUE, NULL, 'Transaction' ),
-				'LIN_name' 			=> new EE_Full_HTML_Field( 'LIN_name', __( "Line Item Name", "event_espresso" ), FALSE, '' ),
-				'LIN_desc' 			=> new EE_Full_HTML_Field( 'LIN_desc', __( "Line Item Description", "event_espresso" ), TRUE ),
-				'LIN_unit_price' 	=> new EE_Money_Field( 'LIN_unit_price', __( "Unit Price", "event_espresso" ), FALSE, 0 ),
-				'LIN_percent' 		=> new EE_Float_Field( 'LIN_percent', __( "Percent", "event_espresso" ), FALSE, 0 ),
-				'LIN_is_taxable' 	=> new EE_Boolean_Field( 'LIN_is_taxable', __( "Taxable", "event_espresso" ), FALSE, FALSE ),
-				'LIN_order' 			=> new EE_Integer_Field( 'LIN_order', __( "Order of Application towards total of parent", "event_espresso" ), FALSE, 1 ),
-				'LIN_total' 			=> new EE_Money_Field( 'LIN_total', __( "Total (unit price x quantity)", "event_espresso" ), FALSE, 0 ),
-				'LIN_quantity' 	=> new EE_Integer_Field( 'LIN_quantity', __( "Quantity", "event_espresso" ), TRUE, 1 ),
-				'LIN_parent' 		=> new EE_Integer_Field( 'LIN_parent', __( "Parent ID (this item goes towards that Line Item's total)", "event_espresso" ), TRUE, NULL ),
-				'LIN_type' 			=> new EE_Enum_Text_Field( 'LIN_type', __( "Type", "event_espresso" ), FALSE, 'line-item', array(
+				'LIN_ID' 				=> new EE_Primary_Key_Int_Field('LIN_ID', __("ID", "event_espresso")),
+				'LIN_code' 			=> new EE_Slug_Field('LIN_code', __("Code for index into Cart", "event_espresso"), TRUE),
+				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field('TXN_ID', __("Transaction ID", "event_espresso"), TRUE, NULL, 'Transaction'),
+				'LIN_name' 			=> new EE_Full_HTML_Field('LIN_name', __("Line Item Name", "event_espresso"), FALSE, ''),
+				'LIN_desc' 			=> new EE_Full_HTML_Field('LIN_desc', __("Line Item Description", "event_espresso"), TRUE),
+				'LIN_unit_price' 	=> new EE_Money_Field('LIN_unit_price', __("Unit Price", "event_espresso"), FALSE, 0),
+				'LIN_percent' 		=> new EE_Float_Field('LIN_percent', __("Percent", "event_espresso"), FALSE, 0),
+				'LIN_is_taxable' 	=> new EE_Boolean_Field('LIN_is_taxable', __("Taxable", "event_espresso"), FALSE, FALSE),
+				'LIN_order' 			=> new EE_Integer_Field('LIN_order', __("Order of Application towards total of parent", "event_espresso"), FALSE, 1),
+				'LIN_total' 			=> new EE_Money_Field('LIN_total', __("Total (unit price x quantity)", "event_espresso"), FALSE, 0),
+				'LIN_quantity' 	=> new EE_Integer_Field('LIN_quantity', __("Quantity", "event_espresso"), TRUE, 1),
+				'LIN_parent' 		=> new EE_Integer_Field('LIN_parent', __("Parent ID (this item goes towards that Line Item's total)", "event_espresso"), TRUE, NULL),
+				'LIN_type' 			=> new EE_Enum_Text_Field('LIN_type', __("Type", "event_espresso"), FALSE, 'line-item', array(
 						self::type_line_item		=>  __("Line Item", "event_espresso"),
 						self::type_sub_line_item	=>  __("Sub-Item", "event_espresso"),
 						self::type_sub_total		=>  __("Subtotal", "event_espresso"),
 						self::type_tax_sub_total 	=> __("Tax Subtotal", "event_espresso"),
 						self::type_tax					=>  __("Tax", "event_espresso"),
 						self::type_total				=>  __("Total", "event_espresso"),
-						self::type_cancellation	=> __( 'Cancellation', 'event_espresso' )
+						self::type_cancellation	=> __('Cancellation', 'event_espresso')
 					)
 				),
-				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field( 'OBJ_ID', __( 'ID of Item purchased.', 'event_espresso' ), TRUE, NULL, $line_items_can_be_for ),
-				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field( 'OBJ_type', __( "Model Name this Line Item is for", "event_espresso" ), TRUE, NULL, $line_items_can_be_for ),
-				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created','event_espresso'), false, EE_Datetime_Field::now, $timezone ),
+				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field('OBJ_ID', __('ID of Item purchased.', 'event_espresso'), TRUE, NULL, $line_items_can_be_for),
+				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field('OBJ_type', __("Model Name this Line Item is for", "event_espresso"), TRUE, NULL, $line_items_can_be_for),
+				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created', 'event_espresso'), false, EE_Datetime_Field::now, $timezone),
 			)
 		);
 		$this->_model_relations = array(
@@ -150,7 +150,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Transaction.Registration.Event';
 		$this->_caps_slug = 'transactions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_of_type_for_transaction( $line_item_type, $transaction ){
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_of_type_for_transaction($line_item_type, $transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => $line_item_type,
 			'TXN_ID' => $transaction
 		)));
@@ -177,14 +177,14 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_non_ticket_line_items_for_transaction( $transaction ) {
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_non_ticket_line_items_for_transaction($transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => self::type_line_item,
 			'TXN_ID' => $transaction,
 			'OR' => array(
-				'OBJ_type*notticket' => array( '!=', 'Ticket'),
-				'OBJ_type*null' => array( 'IS_NULL' ))
+				'OBJ_type*notticket' => array('!=', 'Ticket'),
+				'OBJ_type*null' => array('IS_NULL'))
 		)));
 	}
 
@@ -194,7 +194,7 @@ 
 	 * because if there are spam bots afoot there will be LOTS of line items
 	 * @return int count of how many deleted
 	 */
-	public function delete_line_items_with_no_transaction(){
+	public function delete_line_items_with_no_transaction() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$time_to_leave_alone = apply_filters(
@@ -202,13 +202,13 @@ 
 		);
 		$query = $wpdb->prepare(
 				'DELETE li
-				FROM ' . $this->table() . ' li
-				LEFT JOIN ' . EEM_Transaction::instance()->table(). ' t ON li.TXN_ID = t.TXN_ID
+				FROM ' . $this->table().' li
+				LEFT JOIN ' . EEM_Transaction::instance()->table().' t ON li.TXN_ID = t.TXN_ID
 				WHERE t.TXN_ID IS NULL AND li.LIN_timestamp < %s',
 				// use GMT time because that's what TXN_timestamps are in
-				date(  'Y-m-d H:i:s', time() - $time_to_leave_alone )
+				date('Y-m-d H:i:s', time() - $time_to_leave_alone)
 				);
-		return $wpdb->query( $query );
+		return $wpdb->query($query);
 	}
 
 
@@ -221,10 +221,10 @@ 
 	 * @param \EE_Base_Class $object
 	 * @return EE_Line_Item[]
 	 */
-	public function get_line_item_for_transaction_object( $TXN_ID, EE_Base_Class $object ){
-		return $this->get_all( array( array(
+	public function get_line_item_for_transaction_object($TXN_ID, EE_Base_Class $object) {
+		return $this->get_all(array(array(
 			'TXN_ID' 		=> $TXN_ID,
-			'OBJ_type' 	=> str_replace( 'EE_', '', get_class( $object )),
+			'OBJ_type' 	=> str_replace('EE_', '', get_class($object)),
 			'OBJ_ID' 		=> $object->ID()
 		)));
 	}
@@ -240,16 +240,16 @@ 
 	 * @param array $OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
-	public function get_object_line_items_for_transaction( $TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array() ){
+	public function get_object_line_items_for_transaction($TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array()) {
 		$query_params = array(
 			'OBJ_type' 	=> $OBJ_type,
 			// if incoming $OBJ_IDs is an array, then make sure it is formatted correctly for the query
-			'OBJ_ID' 		=> is_array( $OBJ_IDs ) && ! isset( $OBJ_IDs['IN'] ) ? array( 'IN', $OBJ_IDs ) : $OBJ_IDs
+			'OBJ_ID' 		=> is_array($OBJ_IDs) && ! isset($OBJ_IDs['IN']) ? array('IN', $OBJ_IDs) : $OBJ_IDs
 		);
-		if ( $TXN_ID ) {
+		if ($TXN_ID) {
 			$query_params['TXN_ID'] = $TXN_ID;
 		}
-		return $this->get_all( array( $query_params ));
+		return $this->get_all(array($query_params));
 	}
 
 
@@ -260,13 +260,13 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_ticket_line_items_for_transaction( EE_Transaction $transaction ) {
-		return $this->get_all( array(
+	public function get_all_ticket_line_items_for_transaction(EE_Transaction $transaction) {
+		return $this->get_all(array(
 		   array(
 			   'TXN_ID'   => $transaction->ID(),
 			   'OBJ_type' => 'Ticket',
 		   )
-	   ) );
+	   ));
 	}
 
 
@@ -278,14 +278,14 @@ 
 	 * @param int $TKT_ID
 	 * @return \EE_Line_Item
 	 */
-	public function get_ticket_line_item_for_transaction( $TXN_ID, $TKT_ID ) {
-		return $this->get_one( array(
+	public function get_ticket_line_item_for_transaction($TXN_ID, $TKT_ID) {
+		return $this->get_one(array(
 		   array(
-			   'TXN_ID'   => EEM_Transaction::instance()->ensure_is_ID( $TXN_ID ),
+			   'TXN_ID'   => EEM_Transaction::instance()->ensure_is_ID($TXN_ID),
 			   'OBJ_ID'   => $TKT_ID,
 			   'OBJ_type' => 'Ticket',
 		   )
-	   ) );
+	   ));
 	}
 
 
@@ -300,8 +300,8 @@ 
 	 * @param EE_Promotion $promotion
 	 * @return EE_Line_Item
 	 */
-	public function get_existing_promotion_line_item( EE_Line_Item $parent_line_item, EE_Promotion $promotion ) {
-		return $this->get_one( array(
+	public function get_existing_promotion_line_item(EE_Line_Item $parent_line_item, EE_Promotion $promotion) {
+		return $this->get_one(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -322,8 +322,8 @@ 
 	 * @param EE_Line_Item $parent_line_item
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_promotion_line_items( EE_Line_Item $parent_line_item ) {
-		return $this->get_all( array(
+	public function get_all_promotion_line_items(EE_Line_Item $parent_line_item) {
+		return $this->get_all(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -340,8 +340,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Line_ITem
 	 */
-	public function get_line_item_for_registration( EE_Registration $registration ) {
-		return $this->get_one( $this->line_item_for_registration_query_params( $registration ));
+	public function get_line_item_for_registration(EE_Registration $registration) {
+		return $this->get_one($this->line_item_for_registration_query_params($registration));
 	}
 
 	/**
@@ -350,14 +350,14 @@ 
 	 * @param array $original_query_params any extra query params you'd like to be merged with
 	 * @return array like EEM_Base::get_all()'s $query_params
 	 */
-	public function line_item_for_registration_query_params( EE_Registration $registration, $original_query_params = array() ) {
-		return array_replace_recursive( $original_query_params, array(
+	public function line_item_for_registration_query_params(EE_Registration $registration, $original_query_params = array()) {
+		return array_replace_recursive($original_query_params, array(
 			array(
 				'OBJ_ID' => $registration->ticket_ID(),
 				'OBJ_type' => 'Ticket',
 				'TXN_ID' => $registration->transaction_ID()
 			)
-		) );
+		));
 	}
 
 

core/helpers/EEH_DTT_Helper.helper.php

Spacing +142 added lines, -143 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -53,12 +53,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_valid_timezone_string( $timezone_string = '' ) {
+	public static function get_valid_timezone_string($timezone_string = '') {
 		// if passed a value, then use that, else get WP option
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : get_option( 'timezone_string' );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
 		// value from above exists, use that, else get timezone string from gmt_offset
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
-		EEH_DTT_Helper::validate_timezone( $timezone_string );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
+		EEH_DTT_Helper::validate_timezone($timezone_string);
 		return $timezone_string;
 	}
 
@@ -74,18 +74,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function validate_timezone( $timezone_string, $throw_error = true ) {
+	public static function validate_timezone($timezone_string, $throw_error = true) {
 		// easiest way to test a timezone string is just see if it throws an error when you try to create a DateTimeZone object with it
 		try {
-			new DateTimeZone( $timezone_string );
-		} catch ( Exception $e ) {
+			new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
 			// sometimes we take exception to exceptions
-			if ( ! $throw_error ) {
+			if ( ! $throw_error) {
 				return false;
 			}
 			throw new EE_Error(
 				sprintf(
-					__( 'The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso' ),
+					__('The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso'),
 					$timezone_string,
 					'<a href="http://www.php.net/manual/en/timezones.php">',
 					'</a>'
@@ -104,19 +104,19 @@ 
 	 * @param string $gmt_offset
 	 * @return string
 	 */
-	public static function get_timezone_string_from_gmt_offset( $gmt_offset = '' ) {
+	public static function get_timezone_string_from_gmt_offset($gmt_offset = '') {
 		$timezone_string = 'UTC';
-		$gmt_offset = ! empty( $gmt_offset ) ? $gmt_offset : get_option( 'gmt_offset' );
-		if ( $gmt_offset !== '' ) {
+		$gmt_offset = ! empty($gmt_offset) ? $gmt_offset : get_option('gmt_offset');
+		if ($gmt_offset !== '') {
 			// convert GMT offset to seconds
 			$gmt_offset = $gmt_offset * HOUR_IN_SECONDS;
 			// account for WP offsets that aren't valid UTC
-			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets( $gmt_offset );
+			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets($gmt_offset);
 			// although we don't know the TZ abbreviation, we know the UTC offset
-			$timezone_string = timezone_name_from_abbr( null, $gmt_offset );
+			$timezone_string = timezone_name_from_abbr(null, $gmt_offset);
 		}
 		// better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
-		$timezone_string = $timezone_string !== false ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list( $gmt_offset );
+		$timezone_string = $timezone_string !== false ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list($gmt_offset);
 		return $timezone_string;
 	}
 	
@@ -127,15 +127,15 @@ 
 	 * @return int seconds offset
 	 */
 	public static function get_site_timezone_gmt_offset() {
-		$timezone_string = get_option( 'timezone_string' );
-		if ( $timezone_string ) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
 			try {
-				$timezone = new DateTimeZone( $timezone_string );
-				return $timezone->getOffset( new DateTime() ); //in WordPress DateTime defaults to UTC
-			} catch( Exception $e ){}
+				$timezone = new DateTimeZone($timezone_string);
+				return $timezone->getOffset(new DateTime()); //in WordPress DateTime defaults to UTC
+			} catch (Exception $e) {}
 		}
-		$offset = get_option( 'gmt_offset' );
-		return (int) ( $offset * HOUR_IN_SECONDS );
+		$offset = get_option('gmt_offset');
+		return (int) ($offset * HOUR_IN_SECONDS);
 	}
 
 
@@ -147,10 +147,10 @@ 
 	 * @param int $gmt_offset
 	 * @return int
 	 */
-	public static function adjust_invalid_gmt_offsets( $gmt_offset = 0 ) {
+	public static function adjust_invalid_gmt_offsets($gmt_offset = 0) {
 		//make sure $gmt_offset is int
 		$gmt_offset = (int) $gmt_offset;
-		switch ( $gmt_offset ) {
+		switch ($gmt_offset) {
 
 			//			case -30600 :
 			//				$gmt_offset = -28800;
@@ -202,13 +202,13 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_timezone_string_from_abbreviations_list( $gmt_offset = 0 ) {
+	public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0) {
 		$abbreviations = timezone_abbreviations_list();
-		foreach ( $abbreviations as $abbreviation ) {
-			foreach ( $abbreviation as $city ) {
-				if ( $city['offset'] === $gmt_offset && $city['dst'] === FALSE ) {
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['offset'] === $gmt_offset && $city['dst'] === FALSE) {
 					// check if the timezone is valid but don't throw any errors if it isn't
-					if ( EEH_DTT_Helper::validate_timezone( $city['timezone_id'], false ) ) {
+					if (EEH_DTT_Helper::validate_timezone($city['timezone_id'], false)) {
 						return $city['timezone_id'];
 					}
 				}
@@ -216,7 +216,7 @@ 
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso' ),
+				__('The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used', 'event_espresso'),
 				$gmt_offset,
 				'<a href="http://www.php.net/manual/en/timezones.php">',
 				'</a>'
@@ -230,23 +230,23 @@ 
 	 * @access public
 	 * @param string $timezone_string
 	 */
-	public static function timezone_select_input( $timezone_string = '' ) {
+	public static function timezone_select_input($timezone_string = '') {
 		// get WP date time format
-		$datetime_format = get_option('date_format') . ' '  . get_option('time_format');
+		$datetime_format = get_option('date_format').' '.get_option('time_format');
 		// if passed a value, then use that, else get WP option
-		$timezone_string = ! empty( $timezone_string ) ? $timezone_string : get_option( 'timezone_string' );
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
 		// check if the timezone is valid but don't throw any errors if it isn't
-		$timezone_string = EEH_DTT_Helper::validate_timezone( $timezone_string, false );
+		$timezone_string = EEH_DTT_Helper::validate_timezone($timezone_string, false);
 		$gmt_offset = get_option('gmt_offset');
 
 		$check_zone_info = true;
-		if ( empty( $timezone_string )) {
+		if (empty($timezone_string)) {
 			// Create a UTC+- zone if no timezone string exists
 			$check_zone_info = false;
-			if ( $gmt_offset > 0 ) {
-				$timezone_string = 'UTC+' . $gmt_offset;
-			} elseif ( $gmt_offset < 0 ) {
-				$timezone_string = 'UTC' . $gmt_offset;
+			if ($gmt_offset > 0) {
+				$timezone_string = 'UTC+'.$gmt_offset;
+			} elseif ($gmt_offset < 0) {
+				$timezone_string = 'UTC'.$gmt_offset;
 			} else {
 				$timezone_string = 'UTC';
 			}
@@ -268,11 +268,11 @@ 
 					__('%1$sUTC%2$s time is %3$s'),
 					'<abbr title="Coordinated Universal Time">',
 					'</abbr>',
-					'<code>' . date_i18n( $datetime_format , false, true ) . '</code>'
+					'<code>'.date_i18n($datetime_format, false, true).'</code>'
 				);
 				?></span>
-			<?php if ( ! empty( $timezone_string ) || ! empty( $gmt_offset )) : ?>
-				<br /><span><?php printf(__('Local time is %1$s'), '<code>' . date_i18n( $datetime_format ) . '</code>' ); ?></span>
+			<?php if ( ! empty($timezone_string) || ! empty($gmt_offset)) : ?>
+				<br /><span><?php printf(__('Local time is %1$s'), '<code>'.date_i18n($datetime_format).'</code>'); ?></span>
 		<?php endif; ?>
 
 				<?php if ($check_zone_info && $timezone_string) : ?>
@@ -304,10 +304,9 @@ 
 
 						if ($found) {
 							$message = $tr['isdst'] ?
-											__(' Daylight saving time begins on: %s.' ) :
-											__(' Standard time begins  on: %s.');
+											__(' Daylight saving time begins on: %s.') : __(' Standard time begins  on: %s.');
 							// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-							printf( $message, '<code >' . date_i18n( $datetime_format, $tr['ts'] + ( $tz_offset - $tr['offset'] ) ). '</code >' );
+							printf($message, '<code >'.date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])).'</code >');
 						} else {
 							_e('This timezone does not observe daylight saving time.');
 						}
@@ -337,14 +336,14 @@ 
 	 *
 	 * @return int      $unix_timestamp with the offset applied for the given timezone.
 	 */
-	public static function get_timestamp_with_offset( $unix_timestamp = 0, $timezone_string = '' ) {
+	public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '') {
 		$unix_timestamp = $unix_timestamp === 0 ? time() : (int) $unix_timestamp;
-		$timezone_string = self::get_valid_timezone_string( $timezone_string );
-		$TimeZone = new DateTimeZone( $timezone_string );
+		$timezone_string = self::get_valid_timezone_string($timezone_string);
+		$TimeZone = new DateTimeZone($timezone_string);
 
-		$DateTime = new DateTime( '@' . $unix_timestamp, $TimeZone );
-		$offset = timezone_offset_get( $TimeZone, $DateTime );
-		return (int)$DateTime->format( 'U' ) + (int)$offset;
+		$DateTime = new DateTime('@'.$unix_timestamp, $TimeZone);
+		$offset = timezone_offset_get($TimeZone, $DateTime);
+		return (int) $DateTime->format('U') + (int) $offset;
 	}
 
 
@@ -359,17 +358,17 @@ 
 	 * @param  string					$datetime_field_name 	the datetime fieldname to be manipulated
 	 * @return 	EE_Base_Class
 	 */
-	protected static function _set_date_time_field( EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name ) {
+	protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name) {
 		// grab current datetime format
 		$current_format = $obj->get_format();
 		// set new full timestamp format
-		$obj->set_date_format( EE_Datetime_Field::mysql_date_format );
-		$obj->set_time_format( EE_Datetime_Field::mysql_time_format );
+		$obj->set_date_format(EE_Datetime_Field::mysql_date_format);
+		$obj->set_time_format(EE_Datetime_Field::mysql_time_format);
 		// set the new date value using a full timestamp format so that no data is lost
-		$obj->set( $datetime_field_name, $DateTime->format( EE_Datetime_Field::mysql_timestamp_format ) );
+		$obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
 		// reset datetime formats
-		$obj->set_date_format( $current_format[0] );
-		$obj->set_time_format( $current_format[1] );
+		$obj->set_date_format($current_format[0]);
+		$obj->set_time_format($current_format[1]);
 		return $obj;
 	}
 
@@ -386,11 +385,11 @@ 
 	 * @param  integer 	$value    what you want to increment the time by
 	 * @return EE_Base_Class		   return the EE_Base_Class object so right away you can do something with it (chaining)
 	 */
-	public static function date_time_add( EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1 ) {
+	public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1) {
 		//get the raw UTC date.
-		$DateTime = $obj->get_DateTime_object( $datetime_field_name );
-		$DateTime = EEH_DTT_Helper::calc_date( $DateTime, $period, $value );
-		return EEH_DTT_Helper::_set_date_time_field( $obj, $DateTime, $datetime_field_name );
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
 	}
 
 
@@ -405,11 +404,11 @@ 
 	 * @param int            $value
 	 * @return \EE_Base_Class
 	 */
-	public static function date_time_subtract( EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1 ) {
+	public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1) {
 		//get the raw UTC date
-		$DateTime = $obj->get_DateTime_object( $datetime_field_name );
-		$DateTime = EEH_DTT_Helper::calc_date( $DateTime, $period, $value, '-' );
-		return EEH_DTT_Helper::_set_date_time_field( $obj, $DateTime, $datetime_field_name );
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
 	}
 
 
@@ -422,44 +421,44 @@ 
 	 * @return \DateTime return whatever type came in.
 	 * @throws \EE_Error
 	 */
-	protected static function _modify_datetime_object( DateTime $DateTime, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( ! $DateTime instanceof DateTime ) {
+	protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+') {
+		if ( ! $DateTime instanceof DateTime) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Expected a PHP DateTime object, but instead received %1$s', 'event_espresso' ),
-					print_r( $DateTime, true )
+					__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
+					print_r($DateTime, true)
 				)
 			);
 		}
-		switch ( $period ) {
+		switch ($period) {
 			case 'years' :
-				$value = 'P' . $value . 'Y';
+				$value = 'P'.$value.'Y';
 				break;
 			case 'months' :
-				$value = 'P' . $value . 'M';
+				$value = 'P'.$value.'M';
 				break;
 			case 'weeks' :
-				$value = 'P' . $value . 'W';
+				$value = 'P'.$value.'W';
 				break;
 			case 'days' :
-				$value = 'P' . $value . 'D';
+				$value = 'P'.$value.'D';
 				break;
 			case 'hours' :
-				$value = 'PT' . $value . 'H';
+				$value = 'PT'.$value.'H';
 				break;
 			case 'minutes' :
-				$value = 'PT' . $value . 'M';
+				$value = 'PT'.$value.'M';
 				break;
 			case 'seconds' :
-				$value = 'PT' . $value . 'S';
+				$value = 'PT'.$value.'S';
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$DateTime->add( new DateInterval( $value ) );
+				$DateTime->add(new DateInterval($value));
 				break;
 			case '-':
-				$DateTime->sub( new DateInterval( $value ) );
+				$DateTime->sub(new DateInterval($value));
 				break;
 		}
 		return $DateTime;
@@ -475,16 +474,16 @@ 
 	 * @return \DateTime return whatever type came in.
 	 * @throws \EE_Error
 	 */
-	protected static function _modify_timestamp( $timestamp, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( ! preg_match( EE_Datetime_Field::unix_timestamp_regex, $timestamp ) ) {
+	protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+') {
+		if ( ! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Expected a Unix timestamp, but instead received %1$s', 'event_espresso' ),
-					print_r( $timestamp, true )
+					__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
+					print_r($timestamp, true)
 				)
 			);
 		}
-		switch ( $period ) {
+		switch ($period) {
 			case 'years' :
 				$value = YEAR_IN_SECONDS * $value;
 				break;
@@ -504,9 +503,9 @@ 
 				$value = MINUTE_IN_SECONDS * $value;
 				break;
 		}
-		switch ( $operand ) {
+		switch ($operand) {
 			case '+':
-				$timestamp  += $value;
+				$timestamp += $value;
 				break;
 			case '-':
 				$timestamp -= $value;
@@ -526,11 +525,11 @@ 
 	 * @param  string  $operand What operand you wish to use for the calculation
 	 * @return mixed string|DateTime          return whatever type came in.
 	 */
-	public static function calc_date( $DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+' ) {
-		if ( $DateTime_or_timestamp instanceof DateTime ) {
-			return EEH_DTT_Helper::_modify_datetime_object( $DateTime_or_timestamp, $period, $value, $operand );
-		} else if ( preg_match( EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp )) {
-			return EEH_DTT_Helper::_modify_timestamp( $DateTime_or_timestamp, $period, $value, $operand );
+	public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+') {
+		if ($DateTime_or_timestamp instanceof DateTime) {
+			return EEH_DTT_Helper::_modify_datetime_object($DateTime_or_timestamp, $period, $value, $operand);
+		} else if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
+			return EEH_DTT_Helper::_modify_timestamp($DateTime_or_timestamp, $period, $value, $operand);
 		} else {
 			//error
 			return $DateTime_or_timestamp;
@@ -560,24 +559,24 @@ 
 	 * 			'moment' => //date and time format.
 	 * 		)
 	 */
-	public static function convert_php_to_js_and_moment_date_formats( $date_format_string = null, $time_format_string = null ) {
-		if ( $date_format_string === null ) {
-			$date_format_string = get_option( 'date_format' );
+	public static function convert_php_to_js_and_moment_date_formats($date_format_string = null, $time_format_string = null) {
+		if ($date_format_string === null) {
+			$date_format_string = get_option('date_format');
 		}
 
-		if ( $time_format_string === null ) {
-			$time_format_string = get_option( 'time_format' );
+		if ($time_format_string === null) {
+			$time_format_string = get_option('time_format');
 		}
 
-		$date_format = self::_php_to_js_moment_converter( $date_format_string );
-		$time_format = self::_php_to_js_moment_converter( $time_format_string );
+		$date_format = self::_php_to_js_moment_converter($date_format_string);
+		$time_format = self::_php_to_js_moment_converter($time_format_string);
 
 		return array(
 			'js' => array(
 				'date' => $date_format['js'],
 				'time' => $time_format['js']
 				),
-			'moment' => $date_format['moment'] . ' ' . $time_format['moment' ]
+			'moment' => $date_format['moment'].' '.$time_format['moment']
 			);
 	}
 
@@ -591,7 +590,7 @@ 
 	 *
 	 * @return array js and moment formats.
 	 */
-	protected static function _php_to_js_moment_converter( $format_string ) {
+	protected static function _php_to_js_moment_converter($format_string) {
 		/**
 		 * This is a map of symbols for formats.
 		 * The index is the php symbol, the equivalent values are in the array.
@@ -748,15 +747,15 @@ 
 		$jquery_ui_format = "";
 		$moment_format = "";
 		$escaping = false;
-		for ( $i = 0; $i < strlen($format_string); $i++ ) {
+		for ($i = 0; $i < strlen($format_string); $i++) {
 			$char = $format_string[$i];
-			if ( $char === '\\' )  { // PHP date format escaping character
+			if ($char === '\\') { // PHP date format escaping character
 				$i++;
-				if ( $escaping ) {
+				if ($escaping) {
 					$jquery_ui_format .= $format_string[$i];
 					$moment_format .= $format_string[$i];
 				} else {
-					$jquery_ui_format .= '\'' . $format_string[$i];
+					$jquery_ui_format .= '\''.$format_string[$i];
 					$moment_format .= $format_string[$i];
 				}
 				$escaping = true;
@@ -775,7 +774,7 @@ 
 				}
 			}
 		}
-		return array( 'js' => $jquery_ui_format, 'moment' => $moment_format );
+		return array('js' => $jquery_ui_format, 'moment' => $moment_format);
 	}
 
 
@@ -790,25 +789,25 @@ 
 	 *                           		errors is returned.  So for client code calling, check for is_array() to
 	 *                           		indicate failed validations.
 	 */
-	public static function validate_format_string( $format_string ) {
+	public static function validate_format_string($format_string) {
 		$error_msg = array();
 		//time format checks
-		switch ( true ) {
-			case   strpos( $format_string, 'h' )  !== false  :
-			case   strpos( $format_string, 'g' ) !== false :
+		switch (true) {
+			case   strpos($format_string, 'h') !== false  :
+			case   strpos($format_string, 'g') !== false :
 				/**
 				 * if the time string has a lowercase 'h' which == 12 hour time format and there
 				 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
 				 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
 				 */
-				if ( strpos( strtoupper( $format_string ), 'A' )  === false ) {
-					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".', 'event_espresso' );
+				if (strpos(strtoupper($format_string), 'A') === false) {
+					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".', 'event_espresso');
 				}
 				break;
 
 		}
 
-		return empty( $error_msg ) ? true : $error_msg;
+		return empty($error_msg) ? true : $error_msg;
 	}
 
 
@@ -830,11 +829,11 @@ 
 	 * @param mixed $date_2
 	 * @return bool
 	 */
-	public static function dates_represent_one_24_hour_date( $date_1, $date_2 ) {
+	public static function dates_represent_one_24_hour_date($date_1, $date_2) {
 
 		if (
-			( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime ) ||
-			( $date_1->format( EE_Datetime_Field::mysql_time_format ) != '00:00:00' || $date_2->format( EE_Datetime_Field::mysql_time_format ) != '00:00:00' )
+			( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
+			($date_1->format(EE_Datetime_Field::mysql_time_format) != '00:00:00' || $date_2->format(EE_Datetime_Field::mysql_time_format) != '00:00:00')
 		) {
 			return false;
 		}
@@ -851,11 +850,11 @@ 
 	 * @param string $field_for_interval  The Database field that is the interval is applied to in the query.
 	 * @return string
 	 */
-	public static function get_sql_query_interval_for_offset( $timezone_string, $field_for_interval ) {
+	public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval) {
 		try {
 			/** need to account for timezone offset on the selects */
-			$DateTimeZone = new DateTimeZone( $timezone_string );
-		} catch ( Exception $e ) {
+			$DateTimeZone = new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
 			$DateTimeZone = null;
 		}
 
@@ -863,10 +862,10 @@ 
 		 * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
 		 * Hence we do the calc for DateTimeZone::getOffset.
 		 */
-		$offset = $DateTimeZone instanceof DateTimeZone ? ( $DateTimeZone->getOffset( new DateTime('now') ) ) / HOUR_IN_SECONDS : get_option( 'gmt_offset' );
+		$offset = $DateTimeZone instanceof DateTimeZone ? ($DateTimeZone->getOffset(new DateTime('now'))) / HOUR_IN_SECONDS : get_option('gmt_offset');
 		$query_interval = $offset < 0
-			? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset*-1 . ' HOUR)'
-			: 'DATE_ADD(' . $field_for_interval .', INTERVAL ' . $offset . ' HOUR)';
+			? 'DATE_SUB('.$field_for_interval.', INTERVAL '.$offset * -1.' HOUR)'
+			: 'DATE_ADD('.$field_for_interval.', INTERVAL '.$offset.' HOUR)';
 		return $query_interval;
 	}
 	
@@ -878,47 +877,47 @@ 
 	 * @return string
 	 */
 	public static function get_timezone_string_for_display() {
-		$pretty_timezone = apply_filters( 'FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '' );
-		if( ! empty( $pretty_timezone ) ) {
-			return esc_html( $pretty_timezone );
+		$pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
+		if ( ! empty($pretty_timezone)) {
+			return esc_html($pretty_timezone);
 		}
-		$timezone_string = get_option( 'timezone_string' );
-		if( $timezone_string ) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
 			static $mo_loaded = false;
 			// Load translations for continents and cities just like wp_timezone_choice does
-			if ( ! $mo_loaded ) {
+			if ( ! $mo_loaded) {
 				$locale = get_locale();
-				$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-				load_textdomain( 'continents-cities', $mofile );
+				$mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
+				load_textdomain('continents-cities', $mofile);
 				$mo_loaded = true;
 			}
 			//well that was easy. 
-			$parts = explode('/', $timezone_string );
+			$parts = explode('/', $timezone_string);
 			//remove the continent
-			unset( $parts[0] );
+			unset($parts[0]);
 			$t_parts = array();
-			foreach( $parts as $part ) {
-				$t_parts[] = translate( str_replace( '_', ' ', $part ), 'continents-cities' );
+			foreach ($parts as $part) {
+				$t_parts[] = translate(str_replace('_', ' ', $part), 'continents-cities');
 			}
-			return implode( ' - ', $t_parts );
+			return implode(' - ', $t_parts);
 		}
 		//they haven't set the timezone string, so let's return a string like "UTC+1"
-		$gmt_offset = get_option( 'gmt_offset' );
-		if( intval( $gmt_offset ) >= 0 ) {
+		$gmt_offset = get_option('gmt_offset');
+		if (intval($gmt_offset) >= 0) {
 			$prefix = '+';
 		} else {
 			$prefix = '';
 		}
-		$parts = explode( '.', (string) $gmt_offset );
-		if( count( $parts ) === 1 ) {
+		$parts = explode('.', (string) $gmt_offset);
+		if (count($parts) === 1) {
 			$parts[1] = '00';
 		} else {
 			//convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
 			//to minutes, eg 30 or 15, respectively
-			$hour_fraction = (float)( '0.' . $parts[1] );
-			$parts[1] = (string)$hour_fraction * 60;
+			$hour_fraction = (float) ('0.'.$parts[1]);
+			$parts[1] = (string) $hour_fraction * 60;
 		}
-		return sprintf( __( 'UTC%1$s', 'event_espresso' ), $prefix . implode( ':', $parts ) );
+		return sprintf(__('UTC%1$s', 'event_espresso'), $prefix.implode(':', $parts));
 	}
 
 

core/db_models/EEM_Registration.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -373,7 +373,7 @@
      * @param    int $ATT_ID
      * @param    int $att_nmbr in case the ATT_ID is the same for multiple registrations (same details used) then the
      *                         attendee number is required
-     * @return        mixed        array on success, FALSE on fail
+     * @return        null|EE_Base_Class        array on success, FALSE on fail
      */
     public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0)
     {

Indentation +728 added lines, -728 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -17,716 +17,716 @@ 
 class EEM_Registration extends EEM_Soft_Delete_Base
 {
 
-    // private instance of the Registration object
-    protected static $_instance = null;
-
-    /**
-     * Keys are the status IDs for registrations (eg, RAP, RCN, etc), and the values
-     * are status codes (eg, approved, cancelled, etc)
-     *
-     * @var array
-     */
-    private static $_reg_status;
-
-    /**
-     * The value of REG_count for a primary registrant
-     */
-    const PRIMARY_REGISTRANT_COUNT = 1;
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate an INCOMPLETE registration.
-     * Initial status for registrations when they are first created
-     * Payments are NOT allowed.
-     * Automatically toggled to whatever the default Event registration status is upon completion of the attendee
-     * information reg step NO space reserved. Registration is NOT active
-     */
-    const status_id_incomplete = 'RIC';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate an UNAPPROVED registration.
-     * Payments are NOT allowed.
-     * Event Admin must manually toggle STS_ID for it to change
-     * No space reserved.
-     * Registration is active
-     */
-    const status_id_not_approved = 'RNA';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate registration is PENDING_PAYMENT .
-     * Payments are allowed.
-     * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
-     * No space reserved.
-     * Registration is active
-     */
-    const status_id_pending_payment = 'RPP';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate registration is on the WAIT_LIST .
-     * Payments are allowed.
-     * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
-     * No space reserved.
-     * Registration is active
-     */
-    const status_id_wait_list = 'RWL';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate an APPROVED registration.
-     * the TXN may or may not be completed ( paid in full )
-     * Payments are allowed.
-     * A space IS reserved.
-     * Registration is active
-     */
-    const status_id_approved = 'RAP';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate a registration was CANCELLED by the attendee.
-     * Payments are NOT allowed.
-     * NO space reserved.
-     * Registration is NOT active
-     */
-    const status_id_cancelled = 'RCN';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate a registration was DECLINED by the Event Admin
-     * Payments are NOT allowed.
-     * No space reserved.
-     * Registration is NOT active
-     */
-    const status_id_declined = 'RDC';
-
-    /**
-     * @var TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-
-    /**
-     *    private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access protected
-     * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
-     *                         incoming timezone data that gets saved). Note this just sends the timezone info to the
-     *                         date time model field objects.  Default is NULL (and will be assumed using the set
-     *                         timezone in the 'timezone_string' wp option)
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
-        $this->singular_item = __('Registration', 'event_espresso');
-        $this->plural_item = __('Registrations', 'event_espresso');
-        $this->_tables = array(
-            'Registration' => new EE_Primary_Table('esp_registration', 'REG_ID'),
-        );
-        $this->_fields = array(
-            'Registration' => array(
-                'REG_ID'           => new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
-                'EVT_ID'           => new EE_Foreign_Key_Int_Field(
-                    'EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'
-                ),
-                'ATT_ID'           => new EE_Foreign_Key_Int_Field(
-                    'ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'
-                ),
-                'TXN_ID'           => new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'),
-                    false, 0, 'Transaction'
-                ),
-                'TKT_ID'           => new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false,
-                    0, 'Ticket'
-                ),
-                'STS_ID'           => new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'),
-                    false, EEM_Registration::status_id_incomplete, 'Status'
-                ),
-                'REG_date'         => new EE_Datetime_Field('REG_date',
-                    __('Time registration occurred', 'event_espresso'), false, EE_Datetime_Field::now, $timezone
-                ),
-                'REG_final_price'  => new EE_Money_Field('REG_final_price',
-                    __('Registration\'s share of the transaction total', 'event_espresso'), false, 0
-                ),
-                'REG_paid'         => new EE_Money_Field('REG_paid',
-                    __('Amount paid to date towards registration', 'event_espresso'), false, 0
-                ),
-                'REG_session'      => new EE_Plain_Text_Field('REG_session',
-                    __('Session ID of registration', 'event_espresso'), false, ''
-                ),
-                'REG_code'         => new EE_Plain_Text_Field('REG_code',
-                    __('Unique Code for this registration', 'event_espresso'), false, ''
-                ),
-                'REG_url_link'     => new EE_Plain_Text_Field('REG_url_link',
-                    __('String to be used in URL for identifying registration', 'event_espresso'), false, ''
-                ),
-                'REG_count'        => new EE_Integer_Field('REG_count',
-                    __('Count of this registration in the group registration ', 'event_espresso'), true, 1
-                ),
-                'REG_group_size'   => new EE_Integer_Field('REG_group_size',
-                    __('Number of registrations on this group', 'event_espresso'), false, 1
-                ),
-                'REG_att_is_going' => new EE_Boolean_Field('REG_att_is_going',
-                    __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false
-                ),
-                'REG_deleted'      => new EE_Trashed_Flag_Field(
-                    'REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'),
-                    false, false
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Event'                => new EE_Belongs_To_Relation(),
-            'Attendee'             => new EE_Belongs_To_Relation(),
-            'Transaction'          => new EE_Belongs_To_Relation(),
-            'Ticket'               => new EE_Belongs_To_Relation(),
-            'Status'               => new EE_Belongs_To_Relation(),
-            'Answer'               => new EE_Has_Many_Relation(),
-            'Checkin'              => new EE_Has_Many_Relation(),
-            'Registration_Payment' => new EE_Has_Many_Relation(),
-            'Payment'              => new EE_HABTM_Relation('Registration_Payment'),
-            'Message'              => new EE_Has_Many_Any_Relation(false)
-            //allow deletes even if there are messages in the queue related
-        );
-        $this->_model_chain_to_wp_user = 'Event';
-        parent::__construct($timezone);
-    }
-
-
-
-    /**
-     * reg_statuses_that_allow_payment
-     * a filterable list of registration statuses that allow a registrant to make a payment
-     *
-     * @access public
-     * @return array
-     */
-    public static function reg_statuses_that_allow_payment()
-    {
-        return apply_filters('FHEE__EEM_Registration__reg_statuses_that_allow_payment', array(
-            EEM_Registration::status_id_approved,
-            EEM_Registration::status_id_pending_payment,
-            EEM_Registration::status_id_wait_list,
-        ));
-    }
-
-
-
-    /**
-     * inactive_reg_statuses
-     * a filterable list of registration statuses that are considered active
-     *
-     * @access public
-     * @return array
-     */
-    public static function active_reg_statuses()
-    {
-        return apply_filters('FHEE__EEM_Registration__reg_statuses_that_allow_payment', array(
-            EEM_Registration::status_id_approved,
-            EEM_Registration::status_id_pending_payment,
-            EEM_Registration::status_id_wait_list,
-            EEM_Registration::status_id_not_approved,
-        ));
-    }
-
-
-
-    /**
-     * inactive_reg_statuses
-     * a filterable list of registration statuses that are not considered active
-     *
-     * @access public
-     * @return array
-     */
-    public static function inactive_reg_statuses()
-    {
-        return apply_filters('FHEE__EEM_Registration__reg_statuses_that_allow_payment', array(
-            EEM_Registration::status_id_incomplete,
-            EEM_Registration::status_id_cancelled,
-            EEM_Registration::status_id_declined,
-        ));
-    }
-
-
-
-    /**
-     *    closed_reg_statuses
-     *    a filterable list of registration statuses that are considered "closed"
-     * meaning they should not be considered in any calculations involving monies owing
-     *
-     * @access public
-     * @return array
-     */
-    public static function closed_reg_statuses()
-    {
-        return apply_filters('FHEE__EEM_Registration__closed_reg_statuses', array(
-            EEM_Registration::status_id_cancelled,
-            EEM_Registration::status_id_declined,
-        ));
-    }
-
-
-
-    /**
-     *        get list of registration statuses
-     *
-     * @access public
-     * @param array $exclude    The status ids to exclude from the returned results
-     * @param bool  $translated If true will return the values as singular localized strings
-     * @return array
-     */
-    public static function reg_status_array($exclude = array(), $translated = false)
-    {
-        EEM_Registration::instance()->_get_registration_status_array($exclude);
-        return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, false, 'sentence')
-            : self::$_reg_status;
-    }
-
-
-
-    /**
-     *    get list of registration statuses
-     *
-     * @access private
-     * @param array $exclude
-     * @return array
-     */
-    private function _get_registration_status_array($exclude = array())
-    {
-        //in the very rare circumstance that we are deleting a model's table's data
-        //and the table hasn't actually been created, this could have an error
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        if ($this->_get_table_analysis()->tableExists($wpdb->prefix . 'esp_status')) {
-            $results = $wpdb->get_results(
-                "SELECT STS_ID, STS_code FROM {$wpdb->prefix}esp_status WHERE STS_type = 'registration'"
-            );
-            self::$_reg_status = array();
-            foreach ($results as $status) {
-                if ( ! in_array($status->STS_ID, $exclude)) {
-                    self::$_reg_status[$status->STS_ID] = $status->STS_code;
-                }
-            }
-        }
-    }
-
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new \EE_Error(sprintf(__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                get_class($this)));
-        }
-    }
-
-
-
-    /**
-     * This returns a wpdb->results array of all registration date month and years matching the incoming query params
-     * and grouped by month and year.
-     *
-     * @param  array $where_params Array of query_params as described in the comments for EEM_Base::get_all()
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_reg_months_and_years($where_params)
-    {
-        $query_params[0] = $where_params;
-        $query_params['group_by'] = array('reg_year', 'reg_month');
-        $query_params['order_by'] = array('REG_date' => 'DESC');
-        $columns_to_select = array(
-            'reg_year'  => array('YEAR(REG_date)', '%s'),
-            'reg_month' => array('MONTHNAME(REG_date)', '%s'),
-        );
-        return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
-    }
-
-
-
-    /**
-     *        retrieve ALL registrations for a particular Attendee from db
-     *
-     * @access        public
-     * @param        int $ATT_ID
-     * @return    EE_Registration[]
-     */
-    public function get_all_registrations_for_attendee($ATT_ID = 0)
-    {
-        if ( ! $ATT_ID) {
-            return false;
-        }
-        return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
-    }
-
-
-
-    /**
-     * Gets a registration given their REG_url_link. Yes, this should usually
-     * be passed via a GET parameter.
-     *
-     * @param string $REG_url_link
-     * @return EE_Registration
-     */
-    public function get_registration_for_reg_url_link($REG_url_link)
-    {
-        if ( ! $REG_url_link) {
-            return false;
-        }
-        return $this->get_one(array(array('REG_url_link' => $REG_url_link)));
-    }
-
-
-
-    /**
-     *        retrieve registration for a specific transaction attendee from db
-     *
-     * @access        public
-     * @param    int $TXN_ID
-     * @param    int $ATT_ID
-     * @param    int $att_nmbr in case the ATT_ID is the same for multiple registrations (same details used) then the
-     *                         attendee number is required
-     * @return        mixed        array on success, FALSE on fail
-     */
-    public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0)
-    {
-        return $this->get_one(array(
-            array(
-                'TXN_ID' => $TXN_ID,
-                'ATT_ID' => $ATT_ID,
-            ),
-            'limit' => array(min(($att_nmbr - 1), 0), 1),
-        ));
-    }
-
-
-
-    /**
-     *        get the number of registrations per day  for the Registration Admin page Reports Tab.
-     *        (doesn't utilize models because it's a fairly specialized query)
-     *
-     * @access        public
-     * @param $period string which can be passed to php's strtotime function (eg "-1 month")
-     * @return stdClass[] with properties regDate and total
-     */
-    public function get_registrations_per_day_report($period = '-1 month')
-    {
-        $sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)),
-            'Y-m-d H:i:s', 'UTC');
-        $where = array(
-            'REG_date' => array('>=', $sql_date),
-            'STS_ID'   => array('!=', EEM_Registration::status_id_incomplete),
-        );
-        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
-            $where['Event.EVT_wp_user'] = get_current_user_id();
-        }
-        $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
-        $results = $this->_get_all_wpdb_results(array(
-            $where,
-            'group_by' => 'regDate',
-            'order_by' => array('REG_date' => 'ASC'),
-        ), OBJECT, array(
-            'regDate' => array('DATE(' . $query_interval . ')', '%s'),
-            'total'   => array('count(REG_ID)', '%d'),
-        ));
-        return $results;
-    }
-
-
-
-    /**
-     * Get the number of registrations per day including the count of registrations for each Registration Status.
-     * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
-     *
-     * @param string $period
-     * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
-     *                    (i.e. RAP)
-     */
-    public function get_registrations_per_day_and_per_status_report($period = '-1 month')
-    {
-        global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
-        $event_table = $wpdb->posts;
-        $sql_date = date("Y-m-d H:i:s", strtotime($period));
-        //prepare the query interval for displaying offset
-        $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
-        //inner date query
-        $inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
-        $inner_where = " WHERE";
-        //exclude events not authored by user if permissions in effect
-        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where .= " post_author = " . get_current_user_id() . " AND";
-        }
-        $inner_where .= " REG_date >= '$sql_date'";
-        $inner_date_query .= $inner_where;
-        //start main query
-        $select = "SELECT DATE($query_interval) as Registration_REG_date, ";
-        $join = '';
-        $join_parts = array();
-        $select_parts = array();
-        //loop through registration stati to do parts for each status.
-        foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
-            if ($STS_ID === EEM_Registration::status_id_incomplete) {
-                continue;
-            }
-            $select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
-            $join_parts[] = "$registration_table AS $STS_code ON $STS_code.REG_date = dates.REG_date AND $STS_code.STS_ID = '$STS_ID'";
-        }
-        //setup the selects
-        $select .= implode(', ', $select_parts);
-        $select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
-        //setup the joins
-        $join .= implode(" LEFT JOIN ", $join_parts);
-        //now let's put it all together
-        $query = $select . $join . ' GROUP BY Registration_REG_date';
-        //and execute it
-        $results = $wpdb->get_results($query, ARRAY_A);
-        return $results;
-    }
-
-
-
-    /**
-     *        get the number of registrations per event  for the Registration Admin page Reports Tab
-     *
-     * @access        public
-     * @param $period string which can be passed to php's strtotime function (eg "-1 month")
-     * @return stdClass[] each with properties event_name, reg_limit, and total
-     */
-    public function get_registrations_per_event_report($period = '-1 month')
-    {
-        $date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)),
-            'Y-m-d H:i:s', 'UTC');
-        $where = array(
-            'REG_date' => array('>=', $date_sql),
-            'STS_ID'   => array('!=', EEM_Registration::status_id_incomplete),
-        );
-        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $where['Event.EVT_wp_user'] = get_current_user_id();
-        }
-        $results = $this->_get_all_wpdb_results(array(
-            $where,
-            'group_by' => 'Event.EVT_name',
-            'order_by' => 'Event.EVT_name',
-            'limit'    => array(0, 24),
-        ), OBJECT, array(
-            'event_name' => array('Event_CPT.post_title', '%s'),
-            'total'      => array('COUNT(REG_ID)', '%s'),
-        ));
-        return $results;
-    }
-
-
-
-    /**
-     * Get the number of registrations per event grouped by registration status.
-     * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
-     *
-     * @param string $period
-     * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
-     *                    (i.e. RAP)
-     */
-    public function get_registrations_per_event_and_per_status_report($period = '-1 month')
-    {
-        global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
-        $event_table = $wpdb->posts;
-        $sql_date = date("Y-m-d H:i:s", strtotime($period));
-        //inner date query
-        $inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
-        $inner_where = " WHERE";
-        //exclude events not authored by user if permissions in effect
-        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where .= " post_author = " . get_current_user_id() . " AND";
-        }
-        $inner_where .= " REG_date >= '$sql_date'";
-        $inner_date_query .= $inner_where;
-        //build main query
-        $select = "SELECT Event.post_title as Registration_Event, ";
-        $join = '';
-        $join_parts = array();
-        $select_parts = array();
-        //loop through registration stati to do parts for each status.
-        foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
-            if ($STS_ID === EEM_Registration::status_id_incomplete) {
-                continue;
-            }
-            $select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
-            $join_parts[] = "$registration_table AS $STS_code ON $STS_code.EVT_ID = dates.EVT_ID AND $STS_code.STS_ID = '$STS_ID' AND $STS_code.REG_date = dates.REG_date";
-        }
-        //setup the selects
-        $select .= implode(', ', $select_parts);
-        $select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
-        //setup remaining joins
-        $join .= implode(" LEFT JOIN ", $join_parts);
-        //now put it all together
-        $query = $select . $join . ' GROUP BY Registration_Event';
-        //and execute
-        $results = $wpdb->get_results($query, ARRAY_A);
-        return $results;
-    }
-
-
-
-    /**
-     * Returns the EE_Registration of the primary attendee on the transaction id provided
-     *
-     * @param int $TXN_ID
-     * @return EE_Registration
-     */
-    public function get_primary_registration_for_transaction_ID($TXN_ID = 0)
-    {
-        if ( ! $TXN_ID) {
-            return false;
-        }
-        return $this->get_one(array(
-            array(
-                'TXN_ID'    => $TXN_ID,
-                'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT,
-            ),
-        ));
-    }
-
-
-
-    /**
-     *        get_event_registration_count
-     *
-     * @access public
-     * @param int     $EVT_ID
-     * @param boolean $for_incomplete_payments
-     * @return int
-     */
-    public function get_event_registration_count($EVT_ID, $for_incomplete_payments = false)
-    {
-        // we only count approved registrations towards registration limits
-        $query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
-        if ($for_incomplete_payments) {
-            $query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
-        }
-        return $this->count($query_params);
-    }
-
-
-
-    /**
-     * Deletes all registrations with no transactions. Note that this needs to be very efficient
-     * and so it uses wpdb directly
-     *
-     * @global WPDB $wpdb
-     * @return int number deleted
-     */
-    public function delete_registrations_with_no_transaction()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        return $wpdb->query('DELETE r FROM '
-                            . $this->table()
-                            . ' r LEFT JOIN '
-                            . EEM_Transaction::instance()->table()
-                            . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL');
-    }
-
-
-
-    /**
-     *  Count registrations checked into (or out of) a datetime
-     *
-     * @param int     $DTT_ID     datetime ID
-     * @param boolean $checked_in whether to count registrations checked IN or OUT
-     * @return int
-     */
-    public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true)
-    {
-        global $wpdb;
-        //subquery to get latest checkin
-        $query = $wpdb->prepare('SELECT '
-                                . 'COUNT( DISTINCT checkins.REG_ID ) '
-                                . 'FROM '
-                                . EEM_Checkin::instance()
-                                             ->table()
-                                . ' AS checkins INNER JOIN'
-                                . '( SELECT '
-                                . 'max( CHK_timestamp ) AS latest_checkin, '
-                                . 'REG_ID AS REG_ID '
-                                . 'FROM '
-                                . EEM_Checkin::instance()->table()
-                                . ' '
-                                . 'WHERE DTT_ID=%d '
-                                . 'GROUP BY REG_ID'
-                                . ') AS most_recent_checkin_per_reg '
-                                . 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
-                                . 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
-                                . 'WHERE '
-                                . 'checkins.CHK_in=%d', $DTT_ID, $checked_in);
-        return (int)$wpdb->get_var($query);
-    }
-
-
-
-    /**
-     *  Count registrations checked into (or out of) an event.
-     *
-     * @param int     $EVT_ID     event ID
-     * @param boolean $checked_in whether to count registrations checked IN or OUT
-     * @return int
-     */
-    public function count_registrations_checked_into_event($EVT_ID, $checked_in = true)
-    {
-        global $wpdb;
-        //subquery to get latest checkin
-        $query = $wpdb->prepare('SELECT '
-                                . 'COUNT( DISTINCT checkins.REG_ID ) '
-                                . 'FROM '
-                                . EEM_Checkin::instance()
-                                             ->table()
-                                . ' AS checkins INNER JOIN'
-                                . '( SELECT '
-                                . 'max( CHK_timestamp ) AS latest_checkin, '
-                                . 'REG_ID AS REG_ID '
-                                . 'FROM '
-                                . EEM_Checkin::instance()->table()
-                                . ' AS c '
-                                . 'INNER JOIN '
-                                . EEM_Datetime::instance()->table()
-                                . ' AS d '
-                                . 'ON c.DTT_ID=d.DTT_ID '
-                                . 'WHERE d.EVT_ID=%d '
-                                . 'GROUP BY REG_ID'
-                                . ') AS most_recent_checkin_per_reg '
-                                . 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
-                                . 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
-                                . 'WHERE '
-                                . 'checkins.CHK_in=%d', $EVT_ID, $checked_in);
-        return (int)$wpdb->get_var($query);
-    }
-
-
-
-    /**
-     * The purpose of this method is to retrieve an array of
-     * EE_Registration objects that represent the latest registration
-     * for each ATT_ID given in the function argument.
-     *
-     * @param array $attendee_ids
-     * @return EE_Registration[]
-     */
-    public function get_latest_registration_for_each_of_given_contacts($attendee_ids = array())
-    {
-        //first do a native wp_query to get the latest REG_ID's matching these attendees.
-        global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
-        $attendee_table = $wpdb->posts;
-        $attendee_ids = is_array($attendee_ids) ? array_map('absint', $attendee_ids) : array((int)$attendee_ids);
-        $attendee_ids = implode(',', $attendee_ids);
-        //first we do a query to get the registration ids
-        // (because a group by before order by causes the order by to be ignored.)
-        $registration_id_query = "
+	// private instance of the Registration object
+	protected static $_instance = null;
+
+	/**
+	 * Keys are the status IDs for registrations (eg, RAP, RCN, etc), and the values
+	 * are status codes (eg, approved, cancelled, etc)
+	 *
+	 * @var array
+	 */
+	private static $_reg_status;
+
+	/**
+	 * The value of REG_count for a primary registrant
+	 */
+	const PRIMARY_REGISTRANT_COUNT = 1;
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate an INCOMPLETE registration.
+	 * Initial status for registrations when they are first created
+	 * Payments are NOT allowed.
+	 * Automatically toggled to whatever the default Event registration status is upon completion of the attendee
+	 * information reg step NO space reserved. Registration is NOT active
+	 */
+	const status_id_incomplete = 'RIC';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate an UNAPPROVED registration.
+	 * Payments are NOT allowed.
+	 * Event Admin must manually toggle STS_ID for it to change
+	 * No space reserved.
+	 * Registration is active
+	 */
+	const status_id_not_approved = 'RNA';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate registration is PENDING_PAYMENT .
+	 * Payments are allowed.
+	 * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
+	 * No space reserved.
+	 * Registration is active
+	 */
+	const status_id_pending_payment = 'RPP';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate registration is on the WAIT_LIST .
+	 * Payments are allowed.
+	 * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
+	 * No space reserved.
+	 * Registration is active
+	 */
+	const status_id_wait_list = 'RWL';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate an APPROVED registration.
+	 * the TXN may or may not be completed ( paid in full )
+	 * Payments are allowed.
+	 * A space IS reserved.
+	 * Registration is active
+	 */
+	const status_id_approved = 'RAP';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate a registration was CANCELLED by the attendee.
+	 * Payments are NOT allowed.
+	 * NO space reserved.
+	 * Registration is NOT active
+	 */
+	const status_id_cancelled = 'RCN';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate a registration was DECLINED by the Event Admin
+	 * Payments are NOT allowed.
+	 * No space reserved.
+	 * Registration is NOT active
+	 */
+	const status_id_declined = 'RDC';
+
+	/**
+	 * @var TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+
+	/**
+	 *    private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access protected
+	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
+	 *                         incoming timezone data that gets saved). Note this just sends the timezone info to the
+	 *                         date time model field objects.  Default is NULL (and will be assumed using the set
+	 *                         timezone in the 'timezone_string' wp option)
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
+		$this->singular_item = __('Registration', 'event_espresso');
+		$this->plural_item = __('Registrations', 'event_espresso');
+		$this->_tables = array(
+			'Registration' => new EE_Primary_Table('esp_registration', 'REG_ID'),
+		);
+		$this->_fields = array(
+			'Registration' => array(
+				'REG_ID'           => new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
+				'EVT_ID'           => new EE_Foreign_Key_Int_Field(
+					'EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'
+				),
+				'ATT_ID'           => new EE_Foreign_Key_Int_Field(
+					'ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'
+				),
+				'TXN_ID'           => new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'),
+					false, 0, 'Transaction'
+				),
+				'TKT_ID'           => new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false,
+					0, 'Ticket'
+				),
+				'STS_ID'           => new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'),
+					false, EEM_Registration::status_id_incomplete, 'Status'
+				),
+				'REG_date'         => new EE_Datetime_Field('REG_date',
+					__('Time registration occurred', 'event_espresso'), false, EE_Datetime_Field::now, $timezone
+				),
+				'REG_final_price'  => new EE_Money_Field('REG_final_price',
+					__('Registration\'s share of the transaction total', 'event_espresso'), false, 0
+				),
+				'REG_paid'         => new EE_Money_Field('REG_paid',
+					__('Amount paid to date towards registration', 'event_espresso'), false, 0
+				),
+				'REG_session'      => new EE_Plain_Text_Field('REG_session',
+					__('Session ID of registration', 'event_espresso'), false, ''
+				),
+				'REG_code'         => new EE_Plain_Text_Field('REG_code',
+					__('Unique Code for this registration', 'event_espresso'), false, ''
+				),
+				'REG_url_link'     => new EE_Plain_Text_Field('REG_url_link',
+					__('String to be used in URL for identifying registration', 'event_espresso'), false, ''
+				),
+				'REG_count'        => new EE_Integer_Field('REG_count',
+					__('Count of this registration in the group registration ', 'event_espresso'), true, 1
+				),
+				'REG_group_size'   => new EE_Integer_Field('REG_group_size',
+					__('Number of registrations on this group', 'event_espresso'), false, 1
+				),
+				'REG_att_is_going' => new EE_Boolean_Field('REG_att_is_going',
+					__('Flag indicating the registrant plans on attending', 'event_espresso'), false, false
+				),
+				'REG_deleted'      => new EE_Trashed_Flag_Field(
+					'REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'),
+					false, false
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Event'                => new EE_Belongs_To_Relation(),
+			'Attendee'             => new EE_Belongs_To_Relation(),
+			'Transaction'          => new EE_Belongs_To_Relation(),
+			'Ticket'               => new EE_Belongs_To_Relation(),
+			'Status'               => new EE_Belongs_To_Relation(),
+			'Answer'               => new EE_Has_Many_Relation(),
+			'Checkin'              => new EE_Has_Many_Relation(),
+			'Registration_Payment' => new EE_Has_Many_Relation(),
+			'Payment'              => new EE_HABTM_Relation('Registration_Payment'),
+			'Message'              => new EE_Has_Many_Any_Relation(false)
+			//allow deletes even if there are messages in the queue related
+		);
+		$this->_model_chain_to_wp_user = 'Event';
+		parent::__construct($timezone);
+	}
+
+
+
+	/**
+	 * reg_statuses_that_allow_payment
+	 * a filterable list of registration statuses that allow a registrant to make a payment
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function reg_statuses_that_allow_payment()
+	{
+		return apply_filters('FHEE__EEM_Registration__reg_statuses_that_allow_payment', array(
+			EEM_Registration::status_id_approved,
+			EEM_Registration::status_id_pending_payment,
+			EEM_Registration::status_id_wait_list,
+		));
+	}
+
+
+
+	/**
+	 * inactive_reg_statuses
+	 * a filterable list of registration statuses that are considered active
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function active_reg_statuses()
+	{
+		return apply_filters('FHEE__EEM_Registration__reg_statuses_that_allow_payment', array(
+			EEM_Registration::status_id_approved,
+			EEM_Registration::status_id_pending_payment,
+			EEM_Registration::status_id_wait_list,
+			EEM_Registration::status_id_not_approved,
+		));
+	}
+
+
+
+	/**
+	 * inactive_reg_statuses
+	 * a filterable list of registration statuses that are not considered active
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function inactive_reg_statuses()
+	{
+		return apply_filters('FHEE__EEM_Registration__reg_statuses_that_allow_payment', array(
+			EEM_Registration::status_id_incomplete,
+			EEM_Registration::status_id_cancelled,
+			EEM_Registration::status_id_declined,
+		));
+	}
+
+
+
+	/**
+	 *    closed_reg_statuses
+	 *    a filterable list of registration statuses that are considered "closed"
+	 * meaning they should not be considered in any calculations involving monies owing
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function closed_reg_statuses()
+	{
+		return apply_filters('FHEE__EEM_Registration__closed_reg_statuses', array(
+			EEM_Registration::status_id_cancelled,
+			EEM_Registration::status_id_declined,
+		));
+	}
+
+
+
+	/**
+	 *        get list of registration statuses
+	 *
+	 * @access public
+	 * @param array $exclude    The status ids to exclude from the returned results
+	 * @param bool  $translated If true will return the values as singular localized strings
+	 * @return array
+	 */
+	public static function reg_status_array($exclude = array(), $translated = false)
+	{
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, false, 'sentence')
+			: self::$_reg_status;
+	}
+
+
+
+	/**
+	 *    get list of registration statuses
+	 *
+	 * @access private
+	 * @param array $exclude
+	 * @return array
+	 */
+	private function _get_registration_status_array($exclude = array())
+	{
+		//in the very rare circumstance that we are deleting a model's table's data
+		//and the table hasn't actually been created, this could have an error
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		if ($this->_get_table_analysis()->tableExists($wpdb->prefix . 'esp_status')) {
+			$results = $wpdb->get_results(
+				"SELECT STS_ID, STS_code FROM {$wpdb->prefix}esp_status WHERE STS_type = 'registration'"
+			);
+			self::$_reg_status = array();
+			foreach ($results as $status) {
+				if ( ! in_array($status->STS_ID, $exclude)) {
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
+				}
+			}
+		}
+	}
+
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new \EE_Error(sprintf(__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+				get_class($this)));
+		}
+	}
+
+
+
+	/**
+	 * This returns a wpdb->results array of all registration date month and years matching the incoming query params
+	 * and grouped by month and year.
+	 *
+	 * @param  array $where_params Array of query_params as described in the comments for EEM_Base::get_all()
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_reg_months_and_years($where_params)
+	{
+		$query_params[0] = $where_params;
+		$query_params['group_by'] = array('reg_year', 'reg_month');
+		$query_params['order_by'] = array('REG_date' => 'DESC');
+		$columns_to_select = array(
+			'reg_year'  => array('YEAR(REG_date)', '%s'),
+			'reg_month' => array('MONTHNAME(REG_date)', '%s'),
+		);
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
+	}
+
+
+
+	/**
+	 *        retrieve ALL registrations for a particular Attendee from db
+	 *
+	 * @access        public
+	 * @param        int $ATT_ID
+	 * @return    EE_Registration[]
+	 */
+	public function get_all_registrations_for_attendee($ATT_ID = 0)
+	{
+		if ( ! $ATT_ID) {
+			return false;
+		}
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
+	}
+
+
+
+	/**
+	 * Gets a registration given their REG_url_link. Yes, this should usually
+	 * be passed via a GET parameter.
+	 *
+	 * @param string $REG_url_link
+	 * @return EE_Registration
+	 */
+	public function get_registration_for_reg_url_link($REG_url_link)
+	{
+		if ( ! $REG_url_link) {
+			return false;
+		}
+		return $this->get_one(array(array('REG_url_link' => $REG_url_link)));
+	}
+
+
+
+	/**
+	 *        retrieve registration for a specific transaction attendee from db
+	 *
+	 * @access        public
+	 * @param    int $TXN_ID
+	 * @param    int $ATT_ID
+	 * @param    int $att_nmbr in case the ATT_ID is the same for multiple registrations (same details used) then the
+	 *                         attendee number is required
+	 * @return        mixed        array on success, FALSE on fail
+	 */
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0)
+	{
+		return $this->get_one(array(
+			array(
+				'TXN_ID' => $TXN_ID,
+				'ATT_ID' => $ATT_ID,
+			),
+			'limit' => array(min(($att_nmbr - 1), 0), 1),
+		));
+	}
+
+
+
+	/**
+	 *        get the number of registrations per day  for the Registration Admin page Reports Tab.
+	 *        (doesn't utilize models because it's a fairly specialized query)
+	 *
+	 * @access        public
+	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
+	 * @return stdClass[] with properties regDate and total
+	 */
+	public function get_registrations_per_day_report($period = '-1 month')
+	{
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)),
+			'Y-m-d H:i:s', 'UTC');
+		$where = array(
+			'REG_date' => array('>=', $sql_date),
+			'STS_ID'   => array('!=', EEM_Registration::status_id_incomplete),
+		);
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
+			$where['Event.EVT_wp_user'] = get_current_user_id();
+		}
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
+		$results = $this->_get_all_wpdb_results(array(
+			$where,
+			'group_by' => 'regDate',
+			'order_by' => array('REG_date' => 'ASC'),
+		), OBJECT, array(
+			'regDate' => array('DATE(' . $query_interval . ')', '%s'),
+			'total'   => array('count(REG_ID)', '%d'),
+		));
+		return $results;
+	}
+
+
+
+	/**
+	 * Get the number of registrations per day including the count of registrations for each Registration Status.
+	 * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
+	 *
+	 * @param string $period
+	 * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
+	 *                    (i.e. RAP)
+	 */
+	public function get_registrations_per_day_and_per_status_report($period = '-1 month')
+	{
+		global $wpdb;
+		$registration_table = $wpdb->prefix . 'esp_registration';
+		$event_table = $wpdb->posts;
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
+		//prepare the query interval for displaying offset
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
+		//inner date query
+		$inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
+		$inner_where = " WHERE";
+		//exclude events not authored by user if permissions in effect
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
+			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+		}
+		$inner_where .= " REG_date >= '$sql_date'";
+		$inner_date_query .= $inner_where;
+		//start main query
+		$select = "SELECT DATE($query_interval) as Registration_REG_date, ";
+		$join = '';
+		$join_parts = array();
+		$select_parts = array();
+		//loop through registration stati to do parts for each status.
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
+				continue;
+			}
+			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
+			$join_parts[] = "$registration_table AS $STS_code ON $STS_code.REG_date = dates.REG_date AND $STS_code.STS_ID = '$STS_ID'";
+		}
+		//setup the selects
+		$select .= implode(', ', $select_parts);
+		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
+		//setup the joins
+		$join .= implode(" LEFT JOIN ", $join_parts);
+		//now let's put it all together
+		$query = $select . $join . ' GROUP BY Registration_REG_date';
+		//and execute it
+		$results = $wpdb->get_results($query, ARRAY_A);
+		return $results;
+	}
+
+
+
+	/**
+	 *        get the number of registrations per event  for the Registration Admin page Reports Tab
+	 *
+	 * @access        public
+	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
+	 * @return stdClass[] each with properties event_name, reg_limit, and total
+	 */
+	public function get_registrations_per_event_report($period = '-1 month')
+	{
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)),
+			'Y-m-d H:i:s', 'UTC');
+		$where = array(
+			'REG_date' => array('>=', $date_sql),
+			'STS_ID'   => array('!=', EEM_Registration::status_id_incomplete),
+		);
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+			$where['Event.EVT_wp_user'] = get_current_user_id();
+		}
+		$results = $this->_get_all_wpdb_results(array(
+			$where,
+			'group_by' => 'Event.EVT_name',
+			'order_by' => 'Event.EVT_name',
+			'limit'    => array(0, 24),
+		), OBJECT, array(
+			'event_name' => array('Event_CPT.post_title', '%s'),
+			'total'      => array('COUNT(REG_ID)', '%s'),
+		));
+		return $results;
+	}
+
+
+
+	/**
+	 * Get the number of registrations per event grouped by registration status.
+	 * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
+	 *
+	 * @param string $period
+	 * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
+	 *                    (i.e. RAP)
+	 */
+	public function get_registrations_per_event_and_per_status_report($period = '-1 month')
+	{
+		global $wpdb;
+		$registration_table = $wpdb->prefix . 'esp_registration';
+		$event_table = $wpdb->posts;
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
+		//inner date query
+		$inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
+		$inner_where = " WHERE";
+		//exclude events not authored by user if permissions in effect
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
+			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+		}
+		$inner_where .= " REG_date >= '$sql_date'";
+		$inner_date_query .= $inner_where;
+		//build main query
+		$select = "SELECT Event.post_title as Registration_Event, ";
+		$join = '';
+		$join_parts = array();
+		$select_parts = array();
+		//loop through registration stati to do parts for each status.
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
+				continue;
+			}
+			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
+			$join_parts[] = "$registration_table AS $STS_code ON $STS_code.EVT_ID = dates.EVT_ID AND $STS_code.STS_ID = '$STS_ID' AND $STS_code.REG_date = dates.REG_date";
+		}
+		//setup the selects
+		$select .= implode(', ', $select_parts);
+		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
+		//setup remaining joins
+		$join .= implode(" LEFT JOIN ", $join_parts);
+		//now put it all together
+		$query = $select . $join . ' GROUP BY Registration_Event';
+		//and execute
+		$results = $wpdb->get_results($query, ARRAY_A);
+		return $results;
+	}
+
+
+
+	/**
+	 * Returns the EE_Registration of the primary attendee on the transaction id provided
+	 *
+	 * @param int $TXN_ID
+	 * @return EE_Registration
+	 */
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0)
+	{
+		if ( ! $TXN_ID) {
+			return false;
+		}
+		return $this->get_one(array(
+			array(
+				'TXN_ID'    => $TXN_ID,
+				'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT,
+			),
+		));
+	}
+
+
+
+	/**
+	 *        get_event_registration_count
+	 *
+	 * @access public
+	 * @param int     $EVT_ID
+	 * @param boolean $for_incomplete_payments
+	 * @return int
+	 */
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = false)
+	{
+		// we only count approved registrations towards registration limits
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
+		}
+		return $this->count($query_params);
+	}
+
+
+
+	/**
+	 * Deletes all registrations with no transactions. Note that this needs to be very efficient
+	 * and so it uses wpdb directly
+	 *
+	 * @global WPDB $wpdb
+	 * @return int number deleted
+	 */
+	public function delete_registrations_with_no_transaction()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		return $wpdb->query('DELETE r FROM '
+							. $this->table()
+							. ' r LEFT JOIN '
+							. EEM_Transaction::instance()->table()
+							. ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL');
+	}
+
+
+
+	/**
+	 *  Count registrations checked into (or out of) a datetime
+	 *
+	 * @param int     $DTT_ID     datetime ID
+	 * @param boolean $checked_in whether to count registrations checked IN or OUT
+	 * @return int
+	 */
+	public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true)
+	{
+		global $wpdb;
+		//subquery to get latest checkin
+		$query = $wpdb->prepare('SELECT '
+								. 'COUNT( DISTINCT checkins.REG_ID ) '
+								. 'FROM '
+								. EEM_Checkin::instance()
+											 ->table()
+								. ' AS checkins INNER JOIN'
+								. '( SELECT '
+								. 'max( CHK_timestamp ) AS latest_checkin, '
+								. 'REG_ID AS REG_ID '
+								. 'FROM '
+								. EEM_Checkin::instance()->table()
+								. ' '
+								. 'WHERE DTT_ID=%d '
+								. 'GROUP BY REG_ID'
+								. ') AS most_recent_checkin_per_reg '
+								. 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
+								. 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
+								. 'WHERE '
+								. 'checkins.CHK_in=%d', $DTT_ID, $checked_in);
+		return (int)$wpdb->get_var($query);
+	}
+
+
+
+	/**
+	 *  Count registrations checked into (or out of) an event.
+	 *
+	 * @param int     $EVT_ID     event ID
+	 * @param boolean $checked_in whether to count registrations checked IN or OUT
+	 * @return int
+	 */
+	public function count_registrations_checked_into_event($EVT_ID, $checked_in = true)
+	{
+		global $wpdb;
+		//subquery to get latest checkin
+		$query = $wpdb->prepare('SELECT '
+								. 'COUNT( DISTINCT checkins.REG_ID ) '
+								. 'FROM '
+								. EEM_Checkin::instance()
+											 ->table()
+								. ' AS checkins INNER JOIN'
+								. '( SELECT '
+								. 'max( CHK_timestamp ) AS latest_checkin, '
+								. 'REG_ID AS REG_ID '
+								. 'FROM '
+								. EEM_Checkin::instance()->table()
+								. ' AS c '
+								. 'INNER JOIN '
+								. EEM_Datetime::instance()->table()
+								. ' AS d '
+								. 'ON c.DTT_ID=d.DTT_ID '
+								. 'WHERE d.EVT_ID=%d '
+								. 'GROUP BY REG_ID'
+								. ') AS most_recent_checkin_per_reg '
+								. 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
+								. 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
+								. 'WHERE '
+								. 'checkins.CHK_in=%d', $EVT_ID, $checked_in);
+		return (int)$wpdb->get_var($query);
+	}
+
+
+
+	/**
+	 * The purpose of this method is to retrieve an array of
+	 * EE_Registration objects that represent the latest registration
+	 * for each ATT_ID given in the function argument.
+	 *
+	 * @param array $attendee_ids
+	 * @return EE_Registration[]
+	 */
+	public function get_latest_registration_for_each_of_given_contacts($attendee_ids = array())
+	{
+		//first do a native wp_query to get the latest REG_ID's matching these attendees.
+		global $wpdb;
+		$registration_table = $wpdb->prefix . 'esp_registration';
+		$attendee_table = $wpdb->posts;
+		$attendee_ids = is_array($attendee_ids) ? array_map('absint', $attendee_ids) : array((int)$attendee_ids);
+		$attendee_ids = implode(',', $attendee_ids);
+		//first we do a query to get the registration ids
+		// (because a group by before order by causes the order by to be ignored.)
+		$registration_id_query = "
 			SELECT registrations.registration_ids as registration_id
 			FROM (
 				SELECT
@@ -740,23 +740,23 @@ 
 			  ) AS registrations
 			  GROUP BY registrations.attendee_ids
 		";
-        $registration_ids = $wpdb->get_results($registration_id_query, ARRAY_A);
-        if (empty($registration_ids)) {
-            return array();
-        }
-        $ids_for_model_query = array();
-        //let's flatten the ids so they can be used in the model query.
-        foreach ($registration_ids as $registration_id) {
-            if (isset($registration_id['registration_id'])) {
-                $ids_for_model_query[] = $registration_id['registration_id'];
-            }
-        }
-        //construct query
-        $_where = array(
-            'REG_ID' => array('IN', $ids_for_model_query),
-        );
-        return $this->get_all(array($_where));
-    }
+		$registration_ids = $wpdb->get_results($registration_id_query, ARRAY_A);
+		if (empty($registration_ids)) {
+			return array();
+		}
+		$ids_for_model_query = array();
+		//let's flatten the ids so they can be used in the model query.
+		foreach ($registration_ids as $registration_id) {
+			if (isset($registration_id['registration_id'])) {
+				$ids_for_model_query[] = $registration_id['registration_id'];
+			}
+		}
+		//construct query
+		$_where = array(
+			'REG_ID' => array('IN', $ids_for_model_query),
+		);
+		return $this->get_all(array($_where));
+	}
 
 
 

Spacing +12 added lines, -12 removed lines

@@ -292,7 +292,7 @@ 
         //and the table hasn't actually been created, this could have an error
         /** @type WPDB $wpdb */
         global $wpdb;
-        if ($this->_get_table_analysis()->tableExists($wpdb->prefix . 'esp_status')) {
+        if ($this->_get_table_analysis()->tableExists($wpdb->prefix.'esp_status')) {
             $results = $wpdb->get_results(
                 "SELECT STS_ID, STS_code FROM {$wpdb->prefix}esp_status WHERE STS_type = 'registration'"
             );
@@ -429,7 +429,7 @@ 
             'group_by' => 'regDate',
             'order_by' => array('REG_date' => 'ASC'),
         ), OBJECT, array(
-            'regDate' => array('DATE(' . $query_interval . ')', '%s'),
+            'regDate' => array('DATE('.$query_interval.')', '%s'),
             'total'   => array('count(REG_ID)', '%d'),
         ));
         return $results;
@@ -448,7 +448,7 @@ 
     public function get_registrations_per_day_and_per_status_report($period = '-1 month')
     {
         global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
+        $registration_table = $wpdb->prefix.'esp_registration';
         $event_table = $wpdb->posts;
         $sql_date = date("Y-m-d H:i:s", strtotime($period));
         //prepare the query interval for displaying offset
@@ -459,7 +459,7 @@ 
         //exclude events not authored by user if permissions in effect
         if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
             $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where .= " post_author = " . get_current_user_id() . " AND";
+            $inner_where .= " post_author = ".get_current_user_id()." AND";
         }
         $inner_where .= " REG_date >= '$sql_date'";
         $inner_date_query .= $inner_where;
@@ -482,7 +482,7 @@ 
         //setup the joins
         $join .= implode(" LEFT JOIN ", $join_parts);
         //now let's put it all together
-        $query = $select . $join . ' GROUP BY Registration_REG_date';
+        $query = $select.$join.' GROUP BY Registration_REG_date';
         //and execute it
         $results = $wpdb->get_results($query, ARRAY_A);
         return $results;
@@ -533,7 +533,7 @@ 
     public function get_registrations_per_event_and_per_status_report($period = '-1 month')
     {
         global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
+        $registration_table = $wpdb->prefix.'esp_registration';
         $event_table = $wpdb->posts;
         $sql_date = date("Y-m-d H:i:s", strtotime($period));
         //inner date query
@@ -542,7 +542,7 @@ 
         //exclude events not authored by user if permissions in effect
         if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
             $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where .= " post_author = " . get_current_user_id() . " AND";
+            $inner_where .= " post_author = ".get_current_user_id()." AND";
         }
         $inner_where .= " REG_date >= '$sql_date'";
         $inner_date_query .= $inner_where;
@@ -565,7 +565,7 @@ 
         //setup remaining joins
         $join .= implode(" LEFT JOIN ", $join_parts);
         //now put it all together
-        $query = $select . $join . ' GROUP BY Registration_Event';
+        $query = $select.$join.' GROUP BY Registration_Event';
         //and execute
         $results = $wpdb->get_results($query, ARRAY_A);
         return $results;
@@ -664,7 +664,7 @@ 
                                 . 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
                                 . 'WHERE '
                                 . 'checkins.CHK_in=%d', $DTT_ID, $checked_in);
-        return (int)$wpdb->get_var($query);
+        return (int) $wpdb->get_var($query);
     }
 
 
@@ -703,7 +703,7 @@ 
                                 . 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
                                 . 'WHERE '
                                 . 'checkins.CHK_in=%d', $EVT_ID, $checked_in);
-        return (int)$wpdb->get_var($query);
+        return (int) $wpdb->get_var($query);
     }
 
 
@@ -720,9 +720,9 @@ 
     {
         //first do a native wp_query to get the latest REG_ID's matching these attendees.
         global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
+        $registration_table = $wpdb->prefix.'esp_registration';
         $attendee_table = $wpdb->posts;
-        $attendee_ids = is_array($attendee_ids) ? array_map('absint', $attendee_ids) : array((int)$attendee_ids);
+        $attendee_ids = is_array($attendee_ids) ? array_map('absint', $attendee_ids) : array((int) $attendee_ids);
         $attendee_ids = implode(',', $attendee_ids);
         //first we do a query to get the registration ids
         // (because a group by before order by causes the order by to be ignored.)

core/libraries/batch/JobHandlers/RegistrationsReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -418,7 +418,7 @@
      * In this case, we delete the temporary file
      *
      * @param JobParameters $job_parameters
-     * @return boolean
+     * @return JobStepResponse
      */
     public function cleanup_job(JobParameters $job_parameters)
     {

Indentation +385 added lines, -385 removed lines

@@ -17,7 +17,7 @@ 
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -25,408 +25,408 @@ 
 class RegistrationsReport extends JobHandlerFile
 {
 
-    /**
-     * Performs any necessary setup for starting the job. This is also a good
-     * place to setup the $job_arguments which will be used for subsequent HTTP requests
-     * when continue_job will be called
-     *
-     * @param JobParameters $job_parameters
-     * @throws BatchRequestException
-     * @return JobStepResponse
-     */
-    public function create_job(JobParameters $job_parameters)
-    {
-        $event_id = intval($job_parameters->request_datum('EVT_ID', '0'));
-        if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_registrations', 'generating_report')) {
-            throw new BatchRequestException(__('You do not have permission to view registrations', 'event_espresso'));
-        }
-        $filepath = $this->create_file_from_job_with_name($job_parameters->job_id(),
-            $this->get_filename_from_event($event_id));
-        $job_parameters->add_extra_data('filepath', $filepath);
-        $question_data_for_columns = $this->_get_questions_for_report($event_id);
-        $job_parameters->add_extra_data('questions_data', $question_data_for_columns);
-        $job_parameters->set_job_size($this->count_units_to_process($event_id));
-        //we should also set the header columns
-        $csv_data_for_row = $this->get_csv_data_for($event_id, 0, 1, $job_parameters->extra_datum('questions_data'));
-        \EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
-        //if we actually processed a row there, record it
-        if ($job_parameters->job_size()) {
-            $job_parameters->mark_processed(1);
-        }
-        return new JobStepResponse($job_parameters,
-            __('Registrations report started successfully...', 'event_espresso'));
-    }
+	/**
+	 * Performs any necessary setup for starting the job. This is also a good
+	 * place to setup the $job_arguments which will be used for subsequent HTTP requests
+	 * when continue_job will be called
+	 *
+	 * @param JobParameters $job_parameters
+	 * @throws BatchRequestException
+	 * @return JobStepResponse
+	 */
+	public function create_job(JobParameters $job_parameters)
+	{
+		$event_id = intval($job_parameters->request_datum('EVT_ID', '0'));
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_registrations', 'generating_report')) {
+			throw new BatchRequestException(__('You do not have permission to view registrations', 'event_espresso'));
+		}
+		$filepath = $this->create_file_from_job_with_name($job_parameters->job_id(),
+			$this->get_filename_from_event($event_id));
+		$job_parameters->add_extra_data('filepath', $filepath);
+		$question_data_for_columns = $this->_get_questions_for_report($event_id);
+		$job_parameters->add_extra_data('questions_data', $question_data_for_columns);
+		$job_parameters->set_job_size($this->count_units_to_process($event_id));
+		//we should also set the header columns
+		$csv_data_for_row = $this->get_csv_data_for($event_id, 0, 1, $job_parameters->extra_datum('questions_data'));
+		\EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
+		//if we actually processed a row there, record it
+		if ($job_parameters->job_size()) {
+			$job_parameters->mark_processed(1);
+		}
+		return new JobStepResponse($job_parameters,
+			__('Registrations report started successfully...', 'event_espresso'));
+	}
 
 
 
-    /**
-     * Creates teh filename form the event id (or lack thereof)
-     *
-     * @param int $event_id
-     * @return string
-     */
-    protected function get_filename_from_event($event_id)
-    {
-        if ($event_id) {
-            $event_slug = \EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug');
-            if ( ! $event_slug) {
-                $event_slug = __('unknown', 'event_espresso');
-            }
-        } else {
-            $event_slug = __('all', 'event_espresso');
-        }
-        return sprintf("registrations-for-%s.csv", $event_slug);
-    }
+	/**
+	 * Creates teh filename form the event id (or lack thereof)
+	 *
+	 * @param int $event_id
+	 * @return string
+	 */
+	protected function get_filename_from_event($event_id)
+	{
+		if ($event_id) {
+			$event_slug = \EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug');
+			if ( ! $event_slug) {
+				$event_slug = __('unknown', 'event_espresso');
+			}
+		} else {
+			$event_slug = __('all', 'event_espresso');
+		}
+		return sprintf("registrations-for-%s.csv", $event_slug);
+	}
 
 
 
-    /**
-     * Gets the questions which are to be used for this report, so they
-     * can be remembered for later
-     *
-     * @param int|null $event_id
-     * @return array of wpdb results for questions which are to be used for this report
-     */
-    protected function _get_questions_for_report($event_id)
-    {
-        $question_query_params = array(
-            array(
-                'Answer.ANS_ID' => array('IS_NOT_NULL'),
-            ),
-            'group_by' => array('QST_ID'),
-        );
-        if ($event_id) {
-            $question_query_params[0]['Answer.Registration.EVT_ID'] = $event_id;
-        }
-        return \EEM_Question::instance()->get_all_wpdb_results($question_query_params);
-    }
+	/**
+	 * Gets the questions which are to be used for this report, so they
+	 * can be remembered for later
+	 *
+	 * @param int|null $event_id
+	 * @return array of wpdb results for questions which are to be used for this report
+	 */
+	protected function _get_questions_for_report($event_id)
+	{
+		$question_query_params = array(
+			array(
+				'Answer.ANS_ID' => array('IS_NOT_NULL'),
+			),
+			'group_by' => array('QST_ID'),
+		);
+		if ($event_id) {
+			$question_query_params[0]['Answer.Registration.EVT_ID'] = $event_id;
+		}
+		return \EEM_Question::instance()->get_all_wpdb_results($question_query_params);
+	}
 
 
 
-    /**
-     * Performs another step of the job
-     *
-     * @param JobParameters $job_parameters
-     * @param int           $batch_size
-     * @return JobStepResponse
-     * @throws \EE_Error
-     */
-    public function continue_job(JobParameters $job_parameters, $batch_size = 50)
-    {
-        $csv_data = $this->get_csv_data_for($job_parameters->request_datum('EVT_ID', '0'),
-            $job_parameters->units_processed(), $batch_size, $job_parameters->extra_datum('questions_data'));
-        \EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
-        $units_processed = count($csv_data);
-        $job_parameters->mark_processed($units_processed);
-        $extra_response_data = array(
-            'file_url' => '',
-        );
-        if ($units_processed < $batch_size) {
-            $job_parameters->set_status(JobParameters::status_complete);
-            $extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
-        }
-        return new JobStepResponse($job_parameters,
-            sprintf(__('Wrote %1$s rows to report CSV file...', 'event_espresso'), count($csv_data)),
-            $extra_response_data);
-    }
+	/**
+	 * Performs another step of the job
+	 *
+	 * @param JobParameters $job_parameters
+	 * @param int           $batch_size
+	 * @return JobStepResponse
+	 * @throws \EE_Error
+	 */
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50)
+	{
+		$csv_data = $this->get_csv_data_for($job_parameters->request_datum('EVT_ID', '0'),
+			$job_parameters->units_processed(), $batch_size, $job_parameters->extra_datum('questions_data'));
+		\EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
+		$units_processed = count($csv_data);
+		$job_parameters->mark_processed($units_processed);
+		$extra_response_data = array(
+			'file_url' => '',
+		);
+		if ($units_processed < $batch_size) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			$extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
+		}
+		return new JobStepResponse($job_parameters,
+			sprintf(__('Wrote %1$s rows to report CSV file...', 'event_espresso'), count($csv_data)),
+			$extra_response_data);
+	}
 
 
 
-    /**
-     * Gets the csv data for a batch of registrations
-     *
-     * @param int|null $event_id
-     * @param int      $offset
-     * @param int      $limit
-     * @param array    $questions_for_these_regs_rows results of $wpdb->get_results( $something, ARRAY_A) when querying
-     *                                                for questions
-     * @return array top-level keys are numeric, next-level keys are column headers
-     */
-    function get_csv_data_for($event_id, $offset, $limit, $questions_for_these_regs_rows)
-    {
-        $reg_fields_to_include = array(
-            'TXN_ID',
-            'ATT_ID',
-            'REG_ID',
-            'REG_date',
-            'REG_code',
-            'REG_count',
-            'REG_final_price',
-        );
-        $att_fields_to_include = array(
-            'ATT_fname',
-            'ATT_lname',
-            'ATT_email',
-            'ATT_address',
-            'ATT_address2',
-            'ATT_city',
-            'STA_ID',
-            'CNT_ISO',
-            'ATT_zip',
-            'ATT_phone',
-        );
-        $registrations_csv_ready_array = array();
-        $reg_model = \EE_Registry::instance()->load_model('Registration');
-        $query_params = apply_filters('FHEE__EE_Export__report_registration_for_event', array(
-                array(
-                    'OR'                 => array(
-                        //don't include registrations from failed or abandoned transactions...
-                        'Transaction.STS_ID' => array(
-                            'NOT IN',
-                            array(
-                                \EEM_Transaction::failed_status_code,
-                                \EEM_Transaction::abandoned_status_code,
-                            ),
-                        ),
-                        //unless the registration is approved, in which case include it regardless of transaction status
-                        'STS_ID'             => \EEM_Registration::status_id_approved,
-                    ),
-                    'Ticket.TKT_deleted' => array('IN', array(true, false)),
-                ),
-                'order_by'   => array('Transaction.TXN_ID' => 'asc', 'REG_count' => 'asc'),
-                'force_join' => array('Transaction', 'Ticket', 'Attendee'),
-                'limit'      => array($offset, $limit),
-                'caps'       => \EEM_Base::caps_read_admin,
-            ), $event_id);
-        if ($event_id) {
-            $query_params[0]['EVT_ID'] = $event_id;
-        } else {
-            $query_params['force_join'][] = 'Event';
-        }
-        $registration_rows = $reg_model->get_all_wpdb_results($query_params);
-        //get all questions which relate to someone in this group
-        $registration_ids = array();
-        foreach ($registration_rows as $reg_row) {
-            $registration_ids[] = intval($reg_row['Registration.REG_ID']);
-        }
-        foreach ($registration_rows as $reg_row) {
-            if (is_array($reg_row)) {
-                $reg_csv_array = array();
-                if ( ! $event_id) {
-                    //get the event's name and Id
-                    $reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'),
-                        \EEH_Export::prepare_value_from_db_for_display(\EEM_Event::instance(), 'EVT_name',
-                            $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
-                }
-                $is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
-                /*@var $reg_row EE_Registration */
-                foreach ($reg_fields_to_include as $field_name) {
-                    $field = $reg_model->field_settings_for($field_name);
-                    if ($field_name == 'REG_final_price') {
-                        $value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
-                            $reg_row['Registration.REG_final_price'], 'localized_float');
-                    } elseif ($field_name == 'REG_count') {
-                        $value = sprintf(__('%s of %s', 'event_espresso'),
-                            \EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_count',
-                                $reg_row['Registration.REG_count']),
-                            \EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_group_size',
-                                $reg_row['Registration.REG_group_size']));
-                    } elseif ($field_name == 'REG_date') {
-                        $value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
-                            $reg_row['Registration.REG_date'], 'no_html');
-                    } else {
-                        $value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
-                            $reg_row[$field->get_qualified_column()]);
-                    }
-                    $reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = $value;
-                    if ($field_name == 'REG_final_price') {
-                        //add a column named Currency after the final price
-                        $reg_csv_array[__("Currency", "event_espresso")] = \EE_Config::instance()->currency->code;
-                    }
-                }
-                //get pretty status
-                $stati = \EEM_Status::instance()->localized_status(array(
-                    $reg_row['Registration.STS_ID']     => __('unknown', 'event_espresso'),
-                    $reg_row['TransactionTable.STS_ID'] => __('unknown', 'event_espresso'),
-                ), false, 'sentence');
-                $reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
-                //get pretty transaction status
-                $reg_csv_array[__("Transaction Status",
-                    'event_espresso')] = $stati[$reg_row['TransactionTable.STS_ID']];
-                $reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg
-                    ? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_total',
-                        $reg_row['TransactionTable.TXN_total'], 'localized_float') : '0.00';
-                $reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg
-                    ? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_paid',
-                        $reg_row['TransactionTable.TXN_paid'], 'localized_float') : '0.00';
-                $payment_methods = array();
-                $gateway_txn_ids_etc = array();
-                $payment_times = array();
-                if ($is_primary_reg && $reg_row['TransactionTable.TXN_ID']) {
-                    $payments_info = \EEM_Payment::instance()->get_all_wpdb_results(array(
-                        array(
-                            'TXN_ID' => $reg_row['TransactionTable.TXN_ID'],
-                            'STS_ID' => \EEM_Payment::status_id_approved,
-                        ),
-                        'force_join' => array('Payment_Method'),
-                    ), ARRAY_A,
-                        'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time');
-                    foreach ($payments_info as $payment_method_and_gateway_txn_id) {
-                        $payment_methods[] = isset($payment_method_and_gateway_txn_id['name'])
-                            ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
-                        $gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id'])
-                            ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
-                        $payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time'])
-                            ? $payment_method_and_gateway_txn_id['payment_time'] : '';
-                    }
-                }
-                $reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
-                $reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
-                $reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
-                //get whether or not the user has checked in
-                $reg_csv_array[__("Check-Ins",
-                    "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
-                //get ticket of registration and its price
-                $ticket_model = \EE_Registry::instance()->load_model('Ticket');
-                if ($reg_row['Ticket.TKT_ID']) {
-                    $ticket_name = \EEH_Export::prepare_value_from_db_for_display($ticket_model, 'TKT_name',
-                        $reg_row['Ticket.TKT_name']);
-                    $datetimes_strings = array();
-                    foreach (
-                        \EEM_Datetime::instance()
-                                     ->get_all_wpdb_results(array(
-                                         array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']),
-                                         'order_by'                 => array('DTT_EVT_start' => 'ASC'),
-                                         'default_where_conditions' => 'none',
-                                     )) as $datetime
-                    ) {
-                        $datetimes_strings[] = \EEH_Export::prepare_value_from_db_for_display(\EEM_Datetime::instance(),
-                            'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
-                    }
-                } else {
-                    $ticket_name = __('Unknown', 'event_espresso');
-                    $datetimes_strings = array(__('Unknown', 'event_espresso'));
-                }
-                $reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
-                $reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
-                //get datetime(s) of registration
-                //add attendee columns
-                foreach ($att_fields_to_include as $att_field_name) {
-                    $field_obj = \EEM_Attendee::instance()->field_settings_for($att_field_name);
-                    if ($reg_row['Attendee_CPT.ID']) {
-                        if ($att_field_name == 'STA_ID') {
-                            $value = \EEM_State::instance()
-                                               ->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])),
-                                                   'STA_name');
-                        } elseif ($att_field_name == 'CNT_ISO') {
-                            $value = \EEM_Country::instance()
-                                                 ->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])),
-                                                     'CNT_name');
-                        } else {
-                            $value = \EEH_Export::prepare_value_from_db_for_display(\EEM_Attendee::instance(),
-                                $att_field_name, $reg_row[$field_obj->get_qualified_column()]);
-                        }
-                    } else {
-                        $value = '';
-                    }
-                    $reg_csv_array[\EEH_Export::get_column_name_for_field($field_obj)] = $value;
-                }
-                //make sure each registration has the same questions in the same order
-                foreach ($questions_for_these_regs_rows as $question_row) {
-                    if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) {
-                        $reg_csv_array[$question_row['Question.QST_admin_label']] = null;
-                    }
-                }
-                $answers = \EEM_Answer::instance()->get_all_wpdb_results(array(
-                        array('REG_ID' => $reg_row['Registration.REG_ID']),
-                        'force_join' => array('Question'),
-                    ));
-                //now fill out the questions THEY answered
-                foreach ($answers as $answer_row) {
-                    if ($answer_row['Question.QST_ID']) {
-                        $question_label = \EEH_Export::prepare_value_from_db_for_display(\EEM_Question::instance(),
-                            'QST_admin_label', $answer_row['Question.QST_admin_label']);
-                    } else {
-                        $question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
-                    }
-                    if (isset($answer_row['Question.QST_type'])
-                        && $answer_row['Question.QST_type'] == \EEM_Question::QST_type_state
-                    ) {
-                        $reg_csv_array[$question_label] = \EEM_State::instance()
-                                                                    ->get_state_name_by_ID($answer_row['Answer.ANS_value']);
-                    } else {
-                        //this isn't for html, so don't show html entities
-                        $reg_csv_array[$question_label] = html_entity_decode(\EEH_Export::prepare_value_from_db_for_display(\EEM_Answer::instance(),
-                            'ANS_value', $answer_row['Answer.ANS_value']));
-                    }
-                }
-                $registrations_csv_ready_array[] = apply_filters('FHEE__EE_Export__report_registrations__reg_csv_array',
-                    $reg_csv_array, $reg_row);
-            }
-        }
-        //if we couldn't export anything, we want to at least show the column headers
-        if (empty($registrations_csv_ready_array)) {
-            $reg_csv_array = array();
-            $model_and_fields_to_include = array(
-                'Registration' => $reg_fields_to_include,
-                'Attendee'     => $att_fields_to_include,
-            );
-            foreach ($model_and_fields_to_include as $model_name => $field_list) {
-                $model = \EE_Registry::instance()->load_model($model_name);
-                foreach ($field_list as $field_name) {
-                    $field = $model->field_settings_for($field_name);
-                    $reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = null;
-                }
-            }
-            $registrations_csv_ready_array[] = $reg_csv_array;
-        }
-        return $registrations_csv_ready_array;
-    }
+	/**
+	 * Gets the csv data for a batch of registrations
+	 *
+	 * @param int|null $event_id
+	 * @param int      $offset
+	 * @param int      $limit
+	 * @param array    $questions_for_these_regs_rows results of $wpdb->get_results( $something, ARRAY_A) when querying
+	 *                                                for questions
+	 * @return array top-level keys are numeric, next-level keys are column headers
+	 */
+	function get_csv_data_for($event_id, $offset, $limit, $questions_for_these_regs_rows)
+	{
+		$reg_fields_to_include = array(
+			'TXN_ID',
+			'ATT_ID',
+			'REG_ID',
+			'REG_date',
+			'REG_code',
+			'REG_count',
+			'REG_final_price',
+		);
+		$att_fields_to_include = array(
+			'ATT_fname',
+			'ATT_lname',
+			'ATT_email',
+			'ATT_address',
+			'ATT_address2',
+			'ATT_city',
+			'STA_ID',
+			'CNT_ISO',
+			'ATT_zip',
+			'ATT_phone',
+		);
+		$registrations_csv_ready_array = array();
+		$reg_model = \EE_Registry::instance()->load_model('Registration');
+		$query_params = apply_filters('FHEE__EE_Export__report_registration_for_event', array(
+				array(
+					'OR'                 => array(
+						//don't include registrations from failed or abandoned transactions...
+						'Transaction.STS_ID' => array(
+							'NOT IN',
+							array(
+								\EEM_Transaction::failed_status_code,
+								\EEM_Transaction::abandoned_status_code,
+							),
+						),
+						//unless the registration is approved, in which case include it regardless of transaction status
+						'STS_ID'             => \EEM_Registration::status_id_approved,
+					),
+					'Ticket.TKT_deleted' => array('IN', array(true, false)),
+				),
+				'order_by'   => array('Transaction.TXN_ID' => 'asc', 'REG_count' => 'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee'),
+				'limit'      => array($offset, $limit),
+				'caps'       => \EEM_Base::caps_read_admin,
+			), $event_id);
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
+		}
+		$registration_rows = $reg_model->get_all_wpdb_results($query_params);
+		//get all questions which relate to someone in this group
+		$registration_ids = array();
+		foreach ($registration_rows as $reg_row) {
+			$registration_ids[] = intval($reg_row['Registration.REG_ID']);
+		}
+		foreach ($registration_rows as $reg_row) {
+			if (is_array($reg_row)) {
+				$reg_csv_array = array();
+				if ( ! $event_id) {
+					//get the event's name and Id
+					$reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'),
+						\EEH_Export::prepare_value_from_db_for_display(\EEM_Event::instance(), 'EVT_name',
+							$reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
+				}
+				$is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
+				/*@var $reg_row EE_Registration */
+				foreach ($reg_fields_to_include as $field_name) {
+					$field = $reg_model->field_settings_for($field_name);
+					if ($field_name == 'REG_final_price') {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
+							$reg_row['Registration.REG_final_price'], 'localized_float');
+					} elseif ($field_name == 'REG_count') {
+						$value = sprintf(__('%s of %s', 'event_espresso'),
+							\EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_count',
+								$reg_row['Registration.REG_count']),
+							\EEH_Export::prepare_value_from_db_for_display($reg_model, 'REG_group_size',
+								$reg_row['Registration.REG_group_size']));
+					} elseif ($field_name == 'REG_date') {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
+							$reg_row['Registration.REG_date'], 'no_html');
+					} else {
+						$value = \EEH_Export::prepare_value_from_db_for_display($reg_model, $field_name,
+							$reg_row[$field->get_qualified_column()]);
+					}
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = $value;
+					if ($field_name == 'REG_final_price') {
+						//add a column named Currency after the final price
+						$reg_csv_array[__("Currency", "event_espresso")] = \EE_Config::instance()->currency->code;
+					}
+				}
+				//get pretty status
+				$stati = \EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID']     => __('unknown', 'event_espresso'),
+					$reg_row['TransactionTable.STS_ID'] => __('unknown', 'event_espresso'),
+				), false, 'sentence');
+				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
+				//get pretty transaction status
+				$reg_csv_array[__("Transaction Status",
+					'event_espresso')] = $stati[$reg_row['TransactionTable.STS_ID']];
+				$reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg
+					? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_total',
+						$reg_row['TransactionTable.TXN_total'], 'localized_float') : '0.00';
+				$reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg
+					? \EEH_Export::prepare_value_from_db_for_display(\EEM_Transaction::instance(), 'TXN_paid',
+						$reg_row['TransactionTable.TXN_paid'], 'localized_float') : '0.00';
+				$payment_methods = array();
+				$gateway_txn_ids_etc = array();
+				$payment_times = array();
+				if ($is_primary_reg && $reg_row['TransactionTable.TXN_ID']) {
+					$payments_info = \EEM_Payment::instance()->get_all_wpdb_results(array(
+						array(
+							'TXN_ID' => $reg_row['TransactionTable.TXN_ID'],
+							'STS_ID' => \EEM_Payment::status_id_approved,
+						),
+						'force_join' => array('Payment_Method'),
+					), ARRAY_A,
+						'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time');
+					foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+						$payment_methods[] = isset($payment_method_and_gateway_txn_id['name'])
+							? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
+						$gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id'])
+							? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
+						$payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time'])
+							? $payment_method_and_gateway_txn_id['payment_time'] : '';
+					}
+				}
+				$reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
+				$reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
+				$reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
+				//get whether or not the user has checked in
+				$reg_csv_array[__("Check-Ins",
+					"event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
+				//get ticket of registration and its price
+				$ticket_model = \EE_Registry::instance()->load_model('Ticket');
+				if ($reg_row['Ticket.TKT_ID']) {
+					$ticket_name = \EEH_Export::prepare_value_from_db_for_display($ticket_model, 'TKT_name',
+						$reg_row['Ticket.TKT_name']);
+					$datetimes_strings = array();
+					foreach (
+						\EEM_Datetime::instance()
+									 ->get_all_wpdb_results(array(
+										 array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']),
+										 'order_by'                 => array('DTT_EVT_start' => 'ASC'),
+										 'default_where_conditions' => 'none',
+									 )) as $datetime
+					) {
+						$datetimes_strings[] = \EEH_Export::prepare_value_from_db_for_display(\EEM_Datetime::instance(),
+							'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
+					}
+				} else {
+					$ticket_name = __('Unknown', 'event_espresso');
+					$datetimes_strings = array(__('Unknown', 'event_espresso'));
+				}
+				$reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
+				$reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
+				//get datetime(s) of registration
+				//add attendee columns
+				foreach ($att_fields_to_include as $att_field_name) {
+					$field_obj = \EEM_Attendee::instance()->field_settings_for($att_field_name);
+					if ($reg_row['Attendee_CPT.ID']) {
+						if ($att_field_name == 'STA_ID') {
+							$value = \EEM_State::instance()
+											   ->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])),
+												   'STA_name');
+						} elseif ($att_field_name == 'CNT_ISO') {
+							$value = \EEM_Country::instance()
+												 ->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])),
+													 'CNT_name');
+						} else {
+							$value = \EEH_Export::prepare_value_from_db_for_display(\EEM_Attendee::instance(),
+								$att_field_name, $reg_row[$field_obj->get_qualified_column()]);
+						}
+					} else {
+						$value = '';
+					}
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field_obj)] = $value;
+				}
+				//make sure each registration has the same questions in the same order
+				foreach ($questions_for_these_regs_rows as $question_row) {
+					if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) {
+						$reg_csv_array[$question_row['Question.QST_admin_label']] = null;
+					}
+				}
+				$answers = \EEM_Answer::instance()->get_all_wpdb_results(array(
+						array('REG_ID' => $reg_row['Registration.REG_ID']),
+						'force_join' => array('Question'),
+					));
+				//now fill out the questions THEY answered
+				foreach ($answers as $answer_row) {
+					if ($answer_row['Question.QST_ID']) {
+						$question_label = \EEH_Export::prepare_value_from_db_for_display(\EEM_Question::instance(),
+							'QST_admin_label', $answer_row['Question.QST_admin_label']);
+					} else {
+						$question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
+					}
+					if (isset($answer_row['Question.QST_type'])
+						&& $answer_row['Question.QST_type'] == \EEM_Question::QST_type_state
+					) {
+						$reg_csv_array[$question_label] = \EEM_State::instance()
+																	->get_state_name_by_ID($answer_row['Answer.ANS_value']);
+					} else {
+						//this isn't for html, so don't show html entities
+						$reg_csv_array[$question_label] = html_entity_decode(\EEH_Export::prepare_value_from_db_for_display(\EEM_Answer::instance(),
+							'ANS_value', $answer_row['Answer.ANS_value']));
+					}
+				}
+				$registrations_csv_ready_array[] = apply_filters('FHEE__EE_Export__report_registrations__reg_csv_array',
+					$reg_csv_array, $reg_row);
+			}
+		}
+		//if we couldn't export anything, we want to at least show the column headers
+		if (empty($registrations_csv_ready_array)) {
+			$reg_csv_array = array();
+			$model_and_fields_to_include = array(
+				'Registration' => $reg_fields_to_include,
+				'Attendee'     => $att_fields_to_include,
+			);
+			foreach ($model_and_fields_to_include as $model_name => $field_list) {
+				$model = \EE_Registry::instance()->load_model($model_name);
+				foreach ($field_list as $field_name) {
+					$field = $model->field_settings_for($field_name);
+					$reg_csv_array[\EEH_Export::get_column_name_for_field($field)] = null;
+				}
+			}
+			$registrations_csv_ready_array[] = $reg_csv_array;
+		}
+		return $registrations_csv_ready_array;
+	}
 
 
 
-    /**
-     * Counts total unit to process
-     *
-     * @param int $event_id
-     * @return int
-     */
-    public function count_units_to_process($event_id)
-    {
-        //use the legacy filter
-        $query_params = apply_filters('FHEE__EE_Export__report_registration_for_event', array(
-                array(
-                    'OR'                 => array(
-                        //don't include registrations from failed or abandoned transactions...
-                        'Transaction.STS_ID' => array(
-                            'NOT IN',
-                            array(
-                                \EEM_Transaction::failed_status_code,
-                                \EEM_Transaction::abandoned_status_code,
-                            ),
-                        ),
-                        //unless the registration is approved, in which case include it regardless of transaction status
-                        'STS_ID'             => \EEM_Registration::status_id_approved,
-                    ),
-                    'Ticket.TKT_deleted' => array('IN', array(true, false)),
-                ),
-                'order_by'   => array('Transaction.TXN_ID' => 'asc', 'REG_count' => 'asc'),
-                'force_join' => array('Transaction', 'Ticket', 'Attendee'),
-                'caps'       => \EEM_Base::caps_read_admin,
-            ), $event_id);
-        if ($event_id) {
-            $query_params[0]['EVT_ID'] = $event_id;
-        } else {
-            $query_params['force_join'][] = 'Event';
-        }
-        return \EEM_Registration::instance()->count($query_params);
-    }
+	/**
+	 * Counts total unit to process
+	 *
+	 * @param int $event_id
+	 * @return int
+	 */
+	public function count_units_to_process($event_id)
+	{
+		//use the legacy filter
+		$query_params = apply_filters('FHEE__EE_Export__report_registration_for_event', array(
+				array(
+					'OR'                 => array(
+						//don't include registrations from failed or abandoned transactions...
+						'Transaction.STS_ID' => array(
+							'NOT IN',
+							array(
+								\EEM_Transaction::failed_status_code,
+								\EEM_Transaction::abandoned_status_code,
+							),
+						),
+						//unless the registration is approved, in which case include it regardless of transaction status
+						'STS_ID'             => \EEM_Registration::status_id_approved,
+					),
+					'Ticket.TKT_deleted' => array('IN', array(true, false)),
+				),
+				'order_by'   => array('Transaction.TXN_ID' => 'asc', 'REG_count' => 'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee'),
+				'caps'       => \EEM_Base::caps_read_admin,
+			), $event_id);
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
+		}
+		return \EEM_Registration::instance()->count($query_params);
+	}
 
 
 
-    /**
-     * Performs any clean-up logic when we know the job is completed.
-     * In this case, we delete the temporary file
-     *
-     * @param JobParameters $job_parameters
-     * @return boolean
-     */
-    public function cleanup_job(JobParameters $job_parameters)
-    {
-        $this->_file_helper->delete(\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
-            true, 'd');
-        return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
-    }
+	/**
+	 * Performs any clean-up logic when we know the job is completed.
+	 * In this case, we delete the temporary file
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return boolean
+	 */
+	public function cleanup_job(JobParameters $job_parameters)
+	{
+		$this->_file_helper->delete(\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
+			true, 'd');
+		return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
+	}
 }