eventespresso / event-espresso-core

core/business/EE_Transaction_Payments.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 	 * @param EE_Transaction $transaction
 	 * @param string         $payment_status One of EEM_Payment's statuses, like 'PAP' (Approved).
 	 *                                       By default, searches for approved payments
-	 * @return float|false   float on success, false on fail
+	 * @return double   float on success, false on fail
 	 * @throws \EE_Error
 	 */
 	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {

Spacing +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Payments
@@ -42,7 +42,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Payments ) {
+		if ( ! self::$_instance instanceof EE_Transaction_Payments) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -59,18 +59,18 @@ 
 	 * @return bool true if TXN total was updated, false if not
 	 * @throws \EE_Error
 	 */
-	public function recalculate_transaction_total( EE_Transaction $transaction, $update_txn = true ) {
+	public function recalculate_transaction_total(EE_Transaction $transaction, $update_txn = true) {
 		$total_line_item = $transaction->total_line_item();
-		if ( ! $total_line_item instanceof EE_Line_Item ) {
+		if ( ! $total_line_item instanceof EE_Line_Item) {
 			EE_Error::add_error(
-				sprintf( __( 'The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso' ), $transaction->ID() ),
+				sprintf(__('The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso'), $transaction->ID()),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return false;
 		}
 		$new_total = $total_line_item->recalculate_total_including_taxes();
-		$transaction->set_total( $new_total );
-		if ( $update_txn ) {
+		$transaction->set_total($new_total);
+		if ($update_txn) {
 			return $transaction->save() ? true : false;
 		}
 		return false;
@@ -93,20 +93,20 @@ 
 	 * @return    boolean        whether the TXN was saved
 	 * @throws \EE_Error
 	 */
-	public function calculate_total_payments_and_update_status( EE_Transaction $transaction, $update_txn = true ){
+	public function calculate_total_payments_and_update_status(EE_Transaction $transaction, $update_txn = true) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// calculate total paid
-		$total_paid = $this->recalculate_total_payments_for_transaction( $transaction );
+		$total_paid = $this->recalculate_total_payments_for_transaction($transaction);
 		// if total paid has changed
-		if ( $total_paid !== false && (float)$total_paid !== $transaction->paid() ) {
-			$transaction->set_paid( $total_paid );
+		if ($total_paid !== false && (float) $total_paid !== $transaction->paid()) {
+			$transaction->set_paid($total_paid);
 			// maybe update status, and make sure to save transaction if not done already
-			if ( ! $transaction->update_status_based_on_total_paid( $update_txn ) ) {
-				if ( $update_txn ) {
+			if ( ! $transaction->update_status_based_on_total_paid($update_txn)) {
+				if ($update_txn) {
 					return $transaction->save() ? true : false;
 				}
 			} else {
@@ -130,18 +130,18 @@ 
 	 * @return float|false   float on success, false on fail
 	 * @throws \EE_Error
 	 */
-	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
+	public function recalculate_total_payments_for_transaction(EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// ensure Payment model is loaded
-		EE_Registry::instance()->load_model( 'Payment' );
+		EE_Registry::instance()->load_model('Payment');
 		// calls EEM_Base::sum()
 		return EEM_Payment::instance()->sum(
 			// query params
-			array( array( 'TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status )),
+			array(array('TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status)),
 			// field to sum
 			'PAY_amount'
 		);
@@ -159,17 +159,17 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function delete_payment_and_update_transaction( EE_Payment $payment ) {
+	public function delete_payment_and_update_transaction(EE_Payment $payment) {
 		// verify payment
-		if ( ! $payment instanceof EE_Payment ) {
-			EE_Error::add_error( __( 'A valid Payment object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment instanceof EE_Payment) {
+			EE_Error::add_error(__('A valid Payment object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! $this->delete_registration_payments_and_update_registrations( $payment ) ) {
+		if ( ! $this->delete_registration_payments_and_update_registrations($payment)) {
 			return false;
 		}
-		if ( ! $payment->delete() ) {
-			EE_Error::add_error( __( 'The payment could not be deleted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment->delete()) {
+			EE_Error::add_error(__('The payment could not be deleted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -180,14 +180,14 @@ 
 			|| $TXN_status === EEM_Transaction::failed_status_code
 			|| $payment->amount() === 0
 		) {
-			EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
+			EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
 			return true;
 		}
 
 
 		//if this fails, that just means that the transaction didn't get its status changed and/or updated.
 		//however the payment was still deleted.
-		if ( ! $this->calculate_total_payments_and_update_status( $transaction ) ) {
+		if ( ! $this->calculate_total_payments_and_update_status($transaction)) {
 
 			EE_Error::add_attention(
 				__(
@@ -221,28 +221,28 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function delete_registration_payments_and_update_registrations( EE_Payment $payment, $reg_payment_query_params = array() ) {
+	public function delete_registration_payments_and_update_registrations(EE_Payment $payment, $reg_payment_query_params = array()) {
 		$save_payment = false;
-		$reg_payment_query_params = ! empty( $reg_payment_query_params ) ? $reg_payment_query_params : array( array( 'PAY_ID' => $payment->ID() ) );
-		$registration_payments = EEM_Registration_Payment::instance()->get_all( $reg_payment_query_params );
-		if ( ! empty( $registration_payments )) {
-			foreach ( $registration_payments as $registration_payment ) {
-				if ( $registration_payment instanceof EE_Registration_Payment ) {
+		$reg_payment_query_params = ! empty($reg_payment_query_params) ? $reg_payment_query_params : array(array('PAY_ID' => $payment->ID()));
+		$registration_payments = EEM_Registration_Payment::instance()->get_all($reg_payment_query_params);
+		if ( ! empty($registration_payments)) {
+			foreach ($registration_payments as $registration_payment) {
+				if ($registration_payment instanceof EE_Registration_Payment) {
 					$amount_paid = $registration_payment->amount();
 					$registration = $registration_payment->registration();
-					if ( $registration instanceof EE_Registration ) {
-						$registration->set_paid( $registration->paid() - $amount_paid );
-						if ( $registration->save() ) {
-							if ( $registration_payment->delete() ) {
-								$registration->_remove_relation_to( $payment, 'Payment' );
-								$payment->_remove_relation_to( $registration, 'Registration' );
+					if ($registration instanceof EE_Registration) {
+						$registration->set_paid($registration->paid() - $amount_paid);
+						if ($registration->save()) {
+							if ($registration_payment->delete()) {
+								$registration->_remove_relation_to($payment, 'Payment');
+								$payment->_remove_relation_to($registration, 'Registration');
 							}
 							$save_payment = true;
 						}
 					} else {
 						EE_Error::add_error(
 							sprintf(
-								__( 'An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso' ),
+								__('An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso'),
 								$registration_payment->ID()
 							),
 							__FILE__, __FUNCTION__, __LINE__
@@ -252,7 +252,7 @@ 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso' ),
+							__('An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso'),
 							$payment->ID()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -261,7 +261,7 @@ 
 				}
 			}
 		}
-		if ( $save_payment ) {
+		if ($save_payment) {
 			$payment->save();
 		}
 		return true;
@@ -285,7 +285,7 @@ 
 	public function update_transaction_status_based_on_total_paid(EE_Transaction $transaction, $update_txn = true)
 	{
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'EE_Transaction::update_status_based_on_total_paid()'),
 			'4.9.1',
@@ -327,7 +327,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -337,7 +337,7 @@ 
 			'4.9.12'
 		);
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -366,7 +366,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(

core/EE_Cron_Tasks.core.php

Indentation +1 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
 	 * @param int $PAY_ID
 	 */
 	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $PAY_ID = 0 ) {
-            do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
+			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
 		if ( absint( $TXN_ID )) {
 			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
 			add_action(
@@ -303,7 +303,6 @@ 
 
 	/**
 	 * finalize_abandoned_transactions
-
 	 * loops through the self::$_abandoned_transactions array
 	 * and attempts to finalize any TXNs that have not been completed
 	 * but have had their sessions expired, most likely due to a user not

Spacing +64 added lines, -64 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Cron_Tasks ) {
+		if ( ! self::$_instance instanceof EE_Cron_Tasks) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -41,9 +41,9 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	private function __construct() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// verify that WP Cron is enabled
-		if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && is_admin() ) {
+		if (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && is_admin()) {
 			EE_Error::add_persistent_admin_notice(
 				'wp_cron_disabled',
 				sprintf(
@@ -58,26 +58,26 @@ 
 		// UPDATE TRANSACTION WITH PAYMENT
 		add_action(
 			'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-			array( 'EE_Cron_Tasks', 'setup_update_for_transaction_with_payment' ),
+			array('EE_Cron_Tasks', 'setup_update_for_transaction_with_payment'),
 			10, 2
 		);
 		// FINALIZE ABANDONED TRANSACTIONS
 		add_action(
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-			array( 'EE_Cron_Tasks', 'check_for_abandoned_transactions' ),
+			array('EE_Cron_Tasks', 'check_for_abandoned_transactions'),
 			10, 1
 		);
 		// CLEAN OUT JUNK TRANSACTIONS AND RELATED DATA
 		add_action(
 				'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-				array( 'EE_Cron_Tasks', 'clean_out_junk_transactions' )
+				array('EE_Cron_Tasks', 'clean_out_junk_transactions')
 		);
 		// logging
 		add_action(
 			'AHEE__EE_System__load_core_configuration__complete',
-			array( 'EE_Cron_Tasks', 'log_scheduled_ee_crons' )
+			array('EE_Cron_Tasks', 'log_scheduled_ee_crons')
 		);
-		EE_Registry::instance()->load_lib( 'Messages_Scheduler' );
+		EE_Registry::instance()->load_lib('Messages_Scheduler');
 	}
 
 
@@ -92,17 +92,17 @@ 
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
 			'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
 		);
-		$crons = get_option( 'cron' );
-		if ( ! is_array( $crons ) ) {
+		$crons = get_option('cron');
+		if ( ! is_array($crons)) {
 			return;
 		}
-		foreach ( $crons as $timestamp => $cron ) {
-			foreach ( $ee_crons as $ee_cron ) {
-				if ( isset( $cron[ $ee_cron ] ) ) {
-					do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron' );
-					foreach ( $cron[ $ee_cron ] as $ee_cron_details ) {
-						if ( ! empty( $ee_cron_details[ 'args' ] )) {
-							do_action( 'AHEE_log', __CLASS__, __FUNCTION__, print_r( $ee_cron_details[ 'args' ], true ), "$ee_cron args" );
+		foreach ($crons as $timestamp => $cron) {
+			foreach ($ee_crons as $ee_cron) {
+				if (isset($cron[$ee_cron])) {
+					do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
+					foreach ($cron[$ee_cron] as $ee_cron_details) {
+						if ( ! empty($ee_cron_details['args'])) {
+							do_action('AHEE_log', __CLASS__, __FUNCTION__, print_r($ee_cron_details['args'], true), "$ee_cron args");
 						}
 					}
 				}
@@ -139,15 +139,15 @@ 
 		$TXN_ID,
 		$PAY_ID
 	) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-				array( $TXN_ID, $PAY_ID )
+				array($TXN_ID, $PAY_ID)
 			);
 		}
 	}
@@ -169,13 +169,13 @@ 
 	 * @param int  $TXN_ID
 	 * @param int $PAY_ID
 	 */
-	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $PAY_ID = 0 ) {
-            do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( absint( $TXN_ID )) {
-			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
+	public static function setup_update_for_transaction_with_payment($TXN_ID = 0, $PAY_ID = 0) {
+            do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_update_transactions_with_payment[$TXN_ID] = $PAY_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'update_transaction_with_payment' ),
+				array('EE_Cron_Tasks', 'update_transaction_with_payment'),
 				5
 			);
 		}
@@ -194,18 +194,18 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_transaction_with_payment() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_update_transactions_with_payment ) ) {
+		if ( ! empty(self::$_update_transactions_with_payment)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// set revisit flag for payment processor
-			$payment_processor->set_revisit( false );
+			$payment_processor->set_revisit(false);
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID ) {
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID) {
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for updating the TXN
 					EE_Cron_Tasks::schedule_update_transaction_with_payment(
 						time() + EE_Cron_Tasks::reschedule_timeout,
@@ -214,14 +214,14 @@ 
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
-				$payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+				$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction && $payment instanceof EE_Payment ) {
+				if ($transaction instanceof EE_Transaction && $payment instanceof EE_Payment) {
 					// now try to update the TXN with any payments
-					$payment_processor->update_txn_based_on_payment( $transaction, $payment, true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
 				}
-				unset( self::$_update_transactions_with_payment[ $TXN_ID ] );
+				unset(self::$_update_transactions_with_payment[$TXN_ID]);
 			}
 		}
 	}
@@ -258,14 +258,14 @@ 
 		$TXN_ID
 	) {
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-				array( $TXN_ID )
+				array($TXN_ID)
 			);
 		}
 	}
@@ -287,13 +287,13 @@ 
 	 *
 	 * @param int $TXN_ID
 	 */
-	public static function check_for_abandoned_transactions(	$TXN_ID = 0 ) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( absint( $TXN_ID )) {
-			self::$_abandoned_transactions[]  = $TXN_ID;
+	public static function check_for_abandoned_transactions($TXN_ID = 0) {
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_abandoned_transactions[] = $TXN_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'finalize_abandoned_transactions' ),
+				array('EE_Cron_Tasks', 'finalize_abandoned_transactions'),
 				5
 			);
 		}
@@ -312,21 +312,21 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function finalize_abandoned_transactions() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_abandoned_transactions ) ) {
+		if ( ! empty(self::$_abandoned_transactions)) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set revisit flag for txn processor
-			$transaction_processor->set_revisit( false );
+			$transaction_processor->set_revisit(false);
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_abandoned_transactions as $TXN_ID ) {
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_abandoned_transactions as $TXN_ID) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for finalizing the TXN
 					EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
 						time() + EE_Cron_Tasks::reschedule_timeout,
@@ -334,17 +334,17 @@ 
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction ) {
+				if ($transaction instanceof EE_Transaction) {
 					// don't finalize the TXN if it has already been completed
-					if ( $transaction->all_reg_steps_completed() === true ) {
+					if ($transaction->all_reg_steps_completed() === true) {
 						continue;
 					}
 					// let's simulate an IPN here which will trigger any notifications that need to go out
-					$payment_processor->update_txn_based_on_payment( $transaction, $transaction->last_payment(), true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $transaction->last_payment(), true, true);
 				}
-				unset( self::$_abandoned_transactions[ $TXN_ID ] );
+				unset(self::$_abandoned_transactions[$TXN_ID]);
 			}
 		}
 	}
@@ -360,7 +360,7 @@ 
 	//when a transaction is initially made, schedule this check.
 	//if it has NO REG data by the time it has expired, forget about it
 	public static function clean_out_junk_transactions() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			EEM_Transaction::instance('')->delete_junk_transactions();
 			EEM_Registration::instance('')->delete_registrations_with_no_transaction();
 			EEM_Line_Item::instance('')->delete_line_items_with_no_transaction();

admin_pages/events/Events_Admin_Page.core.php

Doc Comments +2 added lines, -2 removed lines

@@ -1321,7 +1321,7 @@ 
 	 * This just returns whatever is set as the _event object property
 	 *
 	 * //todo this will become obsolete once the models are in place
-	 * @return object
+	 * @return EE_Event
 	 */
 	public function get_event_object() {
 		return $this->_cpt_model_obj;
@@ -2198,7 +2198,7 @@ 
 
 
 	/**
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _category_details_content() {
 		$editor_args['category_desc'] = array(

Indentation +19 added lines, -19 removed lines

@@ -829,11 +829,11 @@ 
 		if ( ! empty( $id ) ) {
 			$post = get_post( $id );
 			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'
-			           . esc_html__( 'Shortcode', 'event_espresso' )
-			           . '</a> ';
+					   . esc_html__( 'Shortcode', 'event_espresso' )
+					   . '</a> ';
 			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='
-			           . $post->ID
-			           . ']">';
+					   . $post->ID
+					   . ']">';
 		}
 		return $return;
 	}
@@ -1045,8 +1045,8 @@ 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 			if ( ! empty( $dtt['DTT_ID'] ) ) {
 				$DTM = EE_Registry::instance()
-				                  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
-				                  ->get_one_by_ID( $dtt['DTT_ID'] );
+								  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
+								  ->get_one_by_ID( $dtt['DTT_ID'] );
 				$DTM->set_date_format( $incoming_date_formats[0] );
 				$DTM->set_time_format( $incoming_date_formats[1] );
 				foreach ( $datetime_values as $field => $value ) {
@@ -1144,7 +1144,7 @@ 
 					) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
 					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' )
-					                  && ! $TKT->get(
+									  && ! $TKT->get(
 						'TKT_deleted'
 					) ? true : false;
 					$TKT->set_date_format( $incoming_date_formats[0] );
@@ -1454,7 +1454,7 @@ 
 		$first_datetime = reset( $times );
 		//do we get related tickets?
 		if ( $first_datetime instanceof EE_Datetime
-		     && $first_datetime->ID() !== 0
+			 && $first_datetime->ID() !== 0
 		) {
 			$existing_datetime_ids[] = $first_datetime->get( 'DTT_ID' );
 			$template_args['time'] = $first_datetime;
@@ -1529,7 +1529,7 @@ 
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_sold'            => $skeleton ? 0 : $ticket->get( 'TKT_sold' ),
 			'trash_icon'          => ( $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) )
-			                         && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
+									 && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
 				? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
 			'disabled'            => $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) ? ''
 				: ' disabled=disabled',
@@ -1695,8 +1695,8 @@ 
 			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
 			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
 			$end = $DateTime->setDate( date( 'Y' ), date( 'm' ), $DateTime->format( 't' ) )
-			                ->setTime( 23, 59, 59 )
-			                ->format( implode( ' ', $start_formats ) );
+							->setTime( 23, 59, 59 )
+							->format( implode( ' ', $start_formats ) );
 			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
 		}
 		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
@@ -1716,7 +1716,7 @@ 
 		}
 		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
 			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id()
-			     && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
+				 && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
 			) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
@@ -2213,13 +2213,13 @@ 
 	protected function _template_settings() {
 		$this->_admin_page_title = esc_html__( 'Template Settings (Preview)', 'event_espresso' );
 		$this->_template_args['preview_img'] = '<img src="'
-		                                       . EVENTS_ASSETS_URL
-		                                       . DS
-		                                       . 'images'
-		                                       . DS
-		                                       . 'caffeinated_template_features.jpg" alt="'
-		                                       . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
-		                                       . '" />';
+											   . EVENTS_ASSETS_URL
+											   . DS
+											   . 'images'
+											   . DS
+											   . 'caffeinated_template_features.jpg" alt="'
+											   . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
+											   . '" />';
 		$this->_template_args['preview_text'] = '<strong>' . esc_html__(
 				'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.',
 				'event_espresso'

Spacing +591 added lines, -591 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 
@@ -63,7 +63,7 @@ 
 		);
 		add_action(
 			'AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object',
-			array( $this, 'verify_event_edit' )
+			array($this, 'verify_event_edit')
 		);
 	}
 
@@ -79,22 +79,22 @@ 
 		$this->_admin_page_title = EVENTS_LABEL;
 		$this->_labels = array(
 			'buttons'      => array(
-				'add'             => esc_html__( 'Add New Event', 'event_espresso' ),
-				'edit'            => esc_html__( 'Edit Event', 'event_espresso' ),
-				'delete'          => esc_html__( 'Delete Event', 'event_espresso' ),
-				'add_category'    => esc_html__( 'Add New Category', 'event_espresso' ),
-				'edit_category'   => esc_html__( 'Edit Category', 'event_espresso' ),
-				'delete_category' => esc_html__( 'Delete Category', 'event_espresso' ),
+				'add'             => esc_html__('Add New Event', 'event_espresso'),
+				'edit'            => esc_html__('Edit Event', 'event_espresso'),
+				'delete'          => esc_html__('Delete Event', 'event_espresso'),
+				'add_category'    => esc_html__('Add New Category', 'event_espresso'),
+				'edit_category'   => esc_html__('Edit Category', 'event_espresso'),
+				'delete_category' => esc_html__('Delete Category', 'event_espresso'),
 			),
 			'editor_title' => array(
-				'espresso_events' => esc_html__( 'Enter event title here', 'event_espresso' ),
+				'espresso_events' => esc_html__('Enter event title here', 'event_espresso'),
 			),
 			'publishbox'   => array(
-				'create_new'        => esc_html__( 'Save New Event', 'event_espresso' ),
-				'edit'              => esc_html__( 'Update Event', 'event_espresso' ),
-				'add_category'      => esc_html__( 'Save New Category', 'event_espresso' ),
-				'edit_category'     => esc_html__( 'Update Category', 'event_espresso' ),
-				'template_settings' => esc_html__( 'Update Settings', 'event_espresso' ),
+				'create_new'        => esc_html__('Save New Event', 'event_espresso'),
+				'edit'              => esc_html__('Update Event', 'event_espresso'),
+				'add_category'      => esc_html__('Save New Category', 'event_espresso'),
+				'edit_category'     => esc_html__('Update Category', 'event_espresso'),
+				'template_settings' => esc_html__('Update Settings', 'event_espresso'),
 			),
 		);
 	}
@@ -105,9 +105,9 @@ 
 		//load formatter helper
 		//load field generator helper
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] )
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID'])
 			? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 		$this->_page_routes = array(
 			'default'                       => array(
 				'func'       => '_events_overview_list_table',
@@ -130,27 +130,27 @@ 
 			),
 			'trash_event'                   => array(
 				'func'       => '_trash_or_restore_event',
-				'args'       => array( 'event_status' => 'trash' ),
+				'args'       => array('event_status' => 'trash'),
 				'capability' => 'ee_delete_event',
 				'obj_id'     => $evt_id,
 				'noheader'   => true,
 			),
 			'trash_events'                  => array(
 				'func'       => '_trash_or_restore_events',
-				'args'       => array( 'event_status' => 'trash' ),
+				'args'       => array('event_status' => 'trash'),
 				'capability' => 'ee_delete_events',
 				'noheader'   => true,
 			),
 			'restore_event'                 => array(
 				'func'       => '_trash_or_restore_event',
-				'args'       => array( 'event_status' => 'draft' ),
+				'args'       => array('event_status' => 'draft'),
 				'capability' => 'ee_delete_event',
 				'obj_id'     => $evt_id,
 				'noheader'   => true,
 			),
 			'restore_events'                => array(
 				'func'       => '_trash_or_restore_events',
-				'args'       => array( 'event_status' => 'draft' ),
+				'args'       => array('event_status' => 'draft'),
 				'capability' => 'ee_delete_events',
 				'noheader'   => true,
 			),
@@ -186,12 +186,12 @@ 
 			'add_category'                  => array(
 				'func'       => '_category_details',
 				'capability' => 'ee_edit_event_category',
-				'args'       => array( 'add' ),
+				'args'       => array('add'),
 			),
 			'edit_category'                 => array(
 				'func'       => '_category_details',
 				'capability' => 'ee_edit_event_category',
-				'args'       => array( 'edit' ),
+				'args'       => array('edit'),
 			),
 			'delete_categories'             => array(
 				'func'       => '_delete_categories',
@@ -205,13 +205,13 @@ 
 			),
 			'insert_category' => array(
 				'func'       => '_insert_or_update_category',
-				'args'       => array( 'new_category' => true ),
+				'args'       => array('new_category' => true),
 				'capability' => 'ee_edit_event_category',
 				'noheader'   => true,
 			),
 			'update_category' => array(
 				'func'       => '_insert_or_update_category',
-				'args'       => array( 'new_category' => false ),
+				'args'       => array('new_category' => false),
 				'capability' => 'ee_edit_event_category',
 				'noheader'   => true,
 			),
@@ -228,29 +228,29 @@ 
 		$this->_page_config = array(
 			'default'                => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Overview', 'event_espresso' ),
+					'label' => esc_html__('Overview', 'event_espresso'),
 					'order' => 10,
 				),
 				'list_table'    => 'Events_Admin_List_Table',
 				'help_tabs'     => array(
 					'events_overview_help_tab'                       => array(
-						'title'    => esc_html__( 'Events Overview', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview', 'event_espresso'),
 						'filename' => 'events_overview',
 					),
 					'events_overview_table_column_headings_help_tab' => array(
-						'title'    => esc_html__( 'Events Overview Table Column Headings', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Table Column Headings', 'event_espresso'),
 						'filename' => 'events_overview_table_column_headings',
 					),
 					'events_overview_filters_help_tab'               => array(
-						'title'    => esc_html__( 'Events Overview Filters', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Filters', 'event_espresso'),
 						'filename' => 'events_overview_filters',
 					),
 					'events_overview_view_help_tab'                  => array(
-						'title'    => esc_html__( 'Events Overview Views', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Views', 'event_espresso'),
 						'filename' => 'events_overview_views',
 					),
 					'events_overview_other_help_tab'                 => array(
-						'title'    => esc_html__( 'Events Overview Other', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Other', 'event_espresso'),
 						'filename' => 'events_overview_other',
 					),
 				),
@@ -265,218 +265,218 @@ 
 			),
 			'create_new'             => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Add Event', 'event_espresso' ),
+					'label'      => esc_html__('Add Event', 'event_espresso'),
 					'order'      => 5,
 					'persistent' => false,
 				),
-				'metaboxes'     => array( '_register_event_editor_meta_boxes' ),
+				'metaboxes'     => array('_register_event_editor_meta_boxes'),
 				'help_tabs'     => array(
 					'event_editor_help_tab'                            => array(
-						'title'    => esc_html__( 'Event Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Editor', 'event_espresso'),
 						'filename' => 'event_editor',
 					),
 					'event_editor_title_richtexteditor_help_tab'       => array(
-						'title'    => esc_html__( 'Event Title & Rich Text Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Title & Rich Text Editor', 'event_espresso'),
 						'filename' => 'event_editor_title_richtexteditor',
 					),
 					'event_editor_venue_details_help_tab'              => array(
-						'title'    => esc_html__( 'Event Venue Details', 'event_espresso' ),
+						'title'    => esc_html__('Event Venue Details', 'event_espresso'),
 						'filename' => 'event_editor_venue_details',
 					),
 					'event_editor_event_datetimes_help_tab'            => array(
-						'title'    => esc_html__( 'Event Datetimes', 'event_espresso' ),
+						'title'    => esc_html__('Event Datetimes', 'event_espresso'),
 						'filename' => 'event_editor_event_datetimes',
 					),
 					'event_editor_event_tickets_help_tab'              => array(
-						'title'    => esc_html__( 'Event Tickets', 'event_espresso' ),
+						'title'    => esc_html__('Event Tickets', 'event_espresso'),
 						'filename' => 'event_editor_event_tickets',
 					),
 					'event_editor_event_registration_options_help_tab' => array(
-						'title'    => esc_html__( 'Event Registration Options', 'event_espresso' ),
+						'title'    => esc_html__('Event Registration Options', 'event_espresso'),
 						'filename' => 'event_editor_event_registration_options',
 					),
 					'event_editor_tags_categories_help_tab'            => array(
-						'title'    => esc_html__( 'Event Tags & Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Tags & Categories', 'event_espresso'),
 						'filename' => 'event_editor_tags_categories',
 					),
 					'event_editor_questions_registrants_help_tab'      => array(
-						'title'    => esc_html__( 'Questions for Registrants', 'event_espresso' ),
+						'title'    => esc_html__('Questions for Registrants', 'event_espresso'),
 						'filename' => 'event_editor_questions_registrants',
 					),
 					'event_editor_save_new_event_help_tab'             => array(
-						'title'    => esc_html__( 'Save New Event', 'event_espresso' ),
+						'title'    => esc_html__('Save New Event', 'event_espresso'),
 						'filename' => 'event_editor_save_new_event',
 					),
 					'event_editor_other_help_tab'                      => array(
-						'title'    => esc_html__( 'Event Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Other', 'event_espresso'),
 						'filename' => 'event_editor_other',
 					),
 				),
 				'help_tour'     => array(
 					'Event_Editor_Help_Tour',
 				),
-				'qtips'         => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips'         => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => false,
 			),
 			'edit'                   => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Edit Event', 'event_espresso' ),
+					'label'      => esc_html__('Edit Event', 'event_espresso'),
 					'order'      => 5,
 					'persistent' => false,
-					'url'        => isset( $this->_req_data['post'] )
+					'url'        => isset($this->_req_data['post'])
 						? EE_Admin_Page::add_query_args_and_nonce(
-							array( 'post' => $this->_req_data['post'], 'action' => 'edit' ),
+							array('post' => $this->_req_data['post'], 'action' => 'edit'),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
 				),
-				'metaboxes'     => array( '_register_event_editor_meta_boxes' ),
+				'metaboxes'     => array('_register_event_editor_meta_boxes'),
 				'help_tabs'     => array(
 					'event_editor_help_tab'                            => array(
-						'title'    => esc_html__( 'Event Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Editor', 'event_espresso'),
 						'filename' => 'event_editor',
 					),
 					'event_editor_title_richtexteditor_help_tab'       => array(
-						'title'    => esc_html__( 'Event Title & Rich Text Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Title & Rich Text Editor', 'event_espresso'),
 						'filename' => 'event_editor_title_richtexteditor',
 					),
 					'event_editor_venue_details_help_tab'              => array(
-						'title'    => esc_html__( 'Event Venue Details', 'event_espresso' ),
+						'title'    => esc_html__('Event Venue Details', 'event_espresso'),
 						'filename' => 'event_editor_venue_details',
 					),
 					'event_editor_event_datetimes_help_tab'            => array(
-						'title'    => esc_html__( 'Event Datetimes', 'event_espresso' ),
+						'title'    => esc_html__('Event Datetimes', 'event_espresso'),
 						'filename' => 'event_editor_event_datetimes',
 					),
 					'event_editor_event_tickets_help_tab'              => array(
-						'title'    => esc_html__( 'Event Tickets', 'event_espresso' ),
+						'title'    => esc_html__('Event Tickets', 'event_espresso'),
 						'filename' => 'event_editor_event_tickets',
 					),
 					'event_editor_event_registration_options_help_tab' => array(
-						'title'    => esc_html__( 'Event Registration Options', 'event_espresso' ),
+						'title'    => esc_html__('Event Registration Options', 'event_espresso'),
 						'filename' => 'event_editor_event_registration_options',
 					),
 					'event_editor_tags_categories_help_tab'            => array(
-						'title'    => esc_html__( 'Event Tags & Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Tags & Categories', 'event_espresso'),
 						'filename' => 'event_editor_tags_categories',
 					),
 					'event_editor_questions_registrants_help_tab'      => array(
-						'title'    => esc_html__( 'Questions for Registrants', 'event_espresso' ),
+						'title'    => esc_html__('Questions for Registrants', 'event_espresso'),
 						'filename' => 'event_editor_questions_registrants',
 					),
 					'event_editor_save_new_event_help_tab'             => array(
-						'title'    => esc_html__( 'Save New Event', 'event_espresso' ),
+						'title'    => esc_html__('Save New Event', 'event_espresso'),
 						'filename' => 'event_editor_save_new_event',
 					),
 					'event_editor_other_help_tab'                      => array(
-						'title'    => esc_html__( 'Event Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Other', 'event_espresso'),
 						'filename' => 'event_editor_other',
 					),
 				),
 				/*'help_tour' => array(
 					'Event_Edit_Help_Tour'
 				),*/
-				'qtips'         => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips'         => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => false,
 			),
 			'default_event_settings' => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Default Settings', 'event_espresso' ),
+					'label' => esc_html__('Default Settings', 'event_espresso'),
 					'order' => 40,
 				),
-				'metaboxes'     => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'labels'        => array(
-					'publishbox' => esc_html__( 'Update Settings', 'event_espresso' ),
+					'publishbox' => esc_html__('Update Settings', 'event_espresso'),
 				),
 				'help_tabs'     => array(
 					'default_settings_help_tab'        => array(
-						'title'    => esc_html__( 'Default Event Settings', 'event_espresso' ),
+						'title'    => esc_html__('Default Event Settings', 'event_espresso'),
 						'filename' => 'events_default_settings',
 					),
 					'default_settings_status_help_tab' => array(
-						'title'    => esc_html__( 'Default Registration Status', 'event_espresso' ),
+						'title'    => esc_html__('Default Registration Status', 'event_espresso'),
 						'filename' => 'events_default_settings_status',
 					),
 				),
-				'help_tour'     => array( 'Event_Default_Settings_Help_Tour' ),
+				'help_tour'     => array('Event_Default_Settings_Help_Tour'),
 				'require_nonce' => false,
 			),
 			//template settings
 			'template_settings'      => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Templates', 'event_espresso' ),
+					'label' => esc_html__('Templates', 'event_espresso'),
 					'order' => 30,
 				),
 				'metaboxes'     => $this->_default_espresso_metaboxes,
 				'help_tabs'     => array(
 					'general_settings_templates_help_tab' => array(
-						'title'    => esc_html__( 'Templates', 'event_espresso' ),
+						'title'    => esc_html__('Templates', 'event_espresso'),
 						'filename' => 'general_settings_templates',
 					),
 				),
-				'help_tour'     => array( 'Templates_Help_Tour' ),
+				'help_tour'     => array('Templates_Help_Tour'),
 				'require_nonce' => false,
 			),
 			//event category stuff
 			'add_category'           => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Add Category', 'event_espresso' ),
+					'label'      => esc_html__('Add Category', 'event_espresso'),
 					'order'      => 15,
 					'persistent' => false,
 				),
 				'help_tabs'     => array(
 					'add_category_help_tab' => array(
-						'title'    => esc_html__( 'Add New Event Category', 'event_espresso' ),
+						'title'    => esc_html__('Add New Event Category', 'event_espresso'),
 						'filename' => 'events_add_category',
 					),
 				),
-				'help_tour'     => array( 'Event_Add_Category_Help_Tour' ),
-				'metaboxes'     => array( '_publish_post_box' ),
+				'help_tour'     => array('Event_Add_Category_Help_Tour'),
+				'metaboxes'     => array('_publish_post_box'),
 				'require_nonce' => false,
 			),
 			'edit_category'          => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Edit Category', 'event_espresso' ),
+					'label'      => esc_html__('Edit Category', 'event_espresso'),
 					'order'      => 15,
 					'persistent' => false,
-					'url'        => isset( $this->_req_data['EVT_CAT_ID'] )
+					'url'        => isset($this->_req_data['EVT_CAT_ID'])
 						? add_query_arg(
-							array( 'EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ),
+							array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
 				),
 				'help_tabs'     => array(
 					'edit_category_help_tab' => array(
-						'title'    => esc_html__( 'Edit Event Category', 'event_espresso' ),
+						'title'    => esc_html__('Edit Event Category', 'event_espresso'),
 						'filename' => 'events_edit_category',
 					),
 				),
 				/*'help_tour' => array('Event_Edit_Category_Help_Tour'),*/
-				'metaboxes'     => array( '_publish_post_box' ),
+				'metaboxes'     => array('_publish_post_box'),
 				'require_nonce' => false,
 			),
 			'category_list'          => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Categories', 'event_espresso' ),
+					'label' => esc_html__('Categories', 'event_espresso'),
 					'order' => 20,
 				),
 				'list_table'    => 'Event_Categories_Admin_List_Table',
 				'help_tabs'     => array(
 					'events_categories_help_tab'                       => array(
-						'title'    => esc_html__( 'Event Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories', 'event_espresso'),
 						'filename' => 'events_categories',
 					),
 					'events_categories_table_column_headings_help_tab' => array(
-						'title'    => esc_html__( 'Event Categories Table Column Headings', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Table Column Headings', 'event_espresso'),
 						'filename' => 'events_categories_table_column_headings',
 					),
 					'events_categories_view_help_tab'                  => array(
-						'title'    => esc_html__( 'Event Categories Views', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Views', 'event_espresso'),
 						'filename' => 'events_categories_views',
 					),
 					'events_categories_other_help_tab'                 => array(
-						'title'    => esc_html__( 'Event Categories Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Other', 'event_espresso'),
 						'filename' => 'events_categories_other',
 					),
 				),
@@ -505,7 +505,7 @@ 
 
 	protected function _add_screen_options_category_list() {
 		$page_title = $this->_admin_page_title;
-		$this->_admin_page_title = esc_html__( 'Categories', 'event_espresso' );
+		$this->_admin_page_title = esc_html__('Categories', 'event_espresso');
 		$this->_per_page_screen_option();
 		$this->_admin_page_title = $page_title;
 	}
@@ -521,20 +521,20 @@ 
 	public function load_scripts_styles() {
 		wp_register_style(
 			'events-admin-css',
-			EVENTS_ASSETS_URL . 'events-admin-page.css',
+			EVENTS_ASSETS_URL.'events-admin-page.css',
 			array(),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_register_style( 'ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'events-admin-css' );
-		wp_enqueue_style( 'ee-cat-admin' );
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('events-admin-css');
+		wp_enqueue_style('ee-cat-admin');
 		//todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details
 		//registers for all views
 		//scripts
 		wp_register_script(
 			'event_editor_js',
-			EVENTS_ASSETS_URL . 'event_editor.js',
-			array( 'ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon' ),
+			EVENTS_ASSETS_URL.'event_editor.js',
+			array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
@@ -560,22 +560,22 @@ 
 	 */
 	public function load_scripts_styles_edit() {
 		//styles
-		wp_enqueue_style( 'espresso-ui-theme' );
+		wp_enqueue_style('espresso-ui-theme');
 		wp_register_style(
 			'event-editor-css',
-			EVENTS_ASSETS_URL . 'event-editor.css',
-			array( 'ee-admin-css' ),
+			EVENTS_ASSETS_URL.'event-editor.css',
+			array('ee-admin-css'),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_enqueue_style( 'event-editor-css' );
+		wp_enqueue_style('event-editor-css');
 		//scripts
 		wp_register_script(
 			'event-datetime-metabox',
-			EVENTS_ASSETS_URL . 'event-datetime-metabox.js',
-			array( 'event_editor_js', 'ee-datepicker' ),
+			EVENTS_ASSETS_URL.'event-datetime-metabox.js',
+			array('event_editor_js', 'ee-datepicker'),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_enqueue_script( 'event-datetime-metabox' );
+		wp_enqueue_script('event-datetime-metabox');
 	}
 
 
@@ -595,10 +595,10 @@ 
 		$this->_views = array(
 			'all' => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'All', 'event_espresso' ),
+				'label'       => esc_html__('All', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'delete_categories' => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'delete_categories' => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			),
 		);
@@ -634,14 +634,14 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function verify_event_edit( $event = null ) {
+	public function verify_event_edit($event = null) {
 		// no event?
-		if ( empty( $event ) ) {
+		if (empty($event)) {
 			// set event
 			$event = $this->_cpt_model_obj;
 		}
 		// STILL no event?
-		if ( empty ( $event ) ) {
+		if (empty ($event)) {
 			return;
 		}
 		$orig_status = $event->status();
@@ -655,32 +655,32 @@ 
 			return;
 		}
 		//made it here so it IS active... next check that any of the tickets are sold.
-		if ( $event->is_sold_out( true ) ) {
-			if ( $orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status ) {
+		if ($event->is_sold_out(true)) {
+			if ($orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status) {
 				EE_Error::add_attention(
 					sprintf(
 						esc_html__(
 							'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.',
 							'event_espresso'
 						),
-						EEH_Template::pretty_status( EEM_Event::sold_out, false, 'sentence' )
+						EEH_Template::pretty_status(EEM_Event::sold_out, false, 'sentence')
 					)
 				);
 			}
 			return;
-		} else if ( $orig_status === EEM_Event::sold_out ) {
+		} else if ($orig_status === EEM_Event::sold_out) {
 			EE_Error::add_attention(
 				sprintf(
 					esc_html__(
 						'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
 						'event_espresso'
 					),
-					EEH_Template::pretty_status( $event->status(), false, 'sentence' )
+					EEH_Template::pretty_status($event->status(), false, 'sentence')
 				)
 			);
 		}
 		//now we need to determine if the event has any tickets on sale.  If not then we dont' show the error
-		if ( ! $event->tickets_on_sale() ) {
+		if ( ! $event->tickets_on_sale()) {
 			return;
 		}
 		//made it here so show warning
@@ -698,7 +698,7 @@ 
 	 */
 	protected function _edit_event_warning() {
 		// we don't want to add warnings during these requests
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] === 'editpost' ) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'editpost') {
 			return;
 		}
 		EE_Error::add_attention(
@@ -715,29 +715,29 @@ 
 		$this->_views = array(
 			'all'   => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'View All Events', 'event_espresso' ),
+				'label'       => esc_html__('View All Events', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'draft' => array(
 				'slug'        => 'draft',
-				'label'       => esc_html__( 'Draft', 'event_espresso' ),
+				'label'       => esc_html__('Draft', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 		);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash'] = array(
 				'slug'        => 'trash',
-				'label'       => esc_html__( 'Trash', 'event_espresso' ),
+				'label'       => esc_html__('Trash', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'restore_events' => esc_html__( 'Restore From Trash', 'event_espresso' ),
-					'delete_events'  => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'restore_events' => esc_html__('Restore From Trash', 'event_espresso'),
+					'delete_events'  => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			);
 		}
@@ -752,50 +752,50 @@ 
 		$items = array(
 			'view_details'   => array(
 				'class' => 'dashicons dashicons-search',
-				'desc'  => esc_html__( 'View Event', 'event_espresso' ),
+				'desc'  => esc_html__('View Event', 'event_espresso'),
 			),
 			'edit_event'     => array(
 				'class' => 'ee-icon ee-icon-calendar-edit',
-				'desc'  => esc_html__( 'Edit Event Details', 'event_espresso' ),
+				'desc'  => esc_html__('Edit Event Details', 'event_espresso'),
 			),
 			'view_attendees' => array(
 				'class' => 'dashicons dashicons-groups',
-				'desc'  => esc_html__( 'View Registrations for Event', 'event_espresso' ),
+				'desc'  => esc_html__('View Registrations for Event', 'event_espresso'),
 			),
 		);
-		$items = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items );
+		$items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items);
 		$statuses = array(
 			'sold_out_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::sold_out, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::sold_out, false, 'sentence'),
 			),
 			'active_status'    => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::active, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::active, false, 'sentence'),
 			),
 			'upcoming_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::upcoming, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::upcoming, false, 'sentence'),
 			),
 			'postponed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::postponed, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::postponed, false, 'sentence'),
 			),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::cancelled, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::cancelled, false, 'sentence'),
 			),
 			'expired_status'   => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::expired, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::expired, false, 'sentence'),
 			),
 			'inactive_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::inactive, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::inactive, false, 'sentence'),
 			),
 		);
-		$statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses );
-		return array_merge( $items, $statuses );
+		$statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses);
+		return array_merge($items, $statuses);
 	}
 
 
@@ -806,8 +806,8 @@ 
 	 * @return EEM_Event
 	 */
 	private function _event_model() {
-		if ( ! $this->_event_model instanceof EEM_Event ) {
-			$this->_event_model = EE_Registry::instance()->load_model( 'Event' );
+		if ( ! $this->_event_model instanceof EEM_Event) {
+			$this->_event_model = EE_Registry::instance()->load_model('Event');
 		}
 		return $this->_event_model;
 	}
@@ -824,12 +824,12 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
 		//make sure this is only when editing
-		if ( ! empty( $id ) ) {
-			$post = get_post( $id );
+		if ( ! empty($id)) {
+			$post = get_post($id);
 			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'
-			           . esc_html__( 'Shortcode', 'event_espresso' )
+			           . esc_html__('Shortcode', 'event_espresso')
 			           . '</a> ';
 			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='
 			           . $post->ID
@@ -848,14 +848,14 @@ 
 	 * @return void
 	 */
 	protected function _events_overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
-			get_post_type_archive_link( 'espresso_events' ),
-			esc_html__( "View Event Archive Page", "event_espresso" ),
+			get_post_type_archive_link('espresso_events'),
+			esc_html__("View Event Archive Page", "event_espresso"),
 			'button'
 		);
-		$this->_template_args['after_list_table'] .= $this->_display_legend( $this->_event_legend_items() );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		$this->_template_args['after_list_table'] .= $this->_display_legend($this->_event_legend_items());
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 				'create_new',
 				'add',
 				array(),
@@ -881,48 +881,48 @@ 
 	 * @param string $post_id
 	 * @param object $post
 	 */
-	protected function _insert_update_cpt_item( $post_id, $post ) {
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') {
 			//get out we're not processing an event save.
 			return;
 		}
 		$event_values = array(
-			'EVT_display_desc'                => ! empty( $this->_req_data['display_desc'] ) ? 1 : 0,
-			'EVT_display_ticket_selector'     => ! empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0,
+			'EVT_display_desc'                => ! empty($this->_req_data['display_desc']) ? 1 : 0,
+			'EVT_display_ticket_selector'     => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0,
 			'EVT_additional_limit'            => min(
-				apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ),
-				! empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : null
+				apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255),
+				! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : null
 			),
-			'EVT_default_registration_status' => ! empty( $this->_req_data['EVT_default_registration_status'] )
+			'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status'])
 				? $this->_req_data['EVT_default_registration_status']
 				: EE_Registry::instance()->CFG->registration->default_STS_ID,
-			'EVT_member_only'                 => ! empty( $this->_req_data['member_only'] ) ? 1 : 0,
-			'EVT_allow_overflow'              => ! empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0,
-			'EVT_timezone_string'             => ! empty( $this->_req_data['timezone_string'] )
+			'EVT_member_only'                 => ! empty($this->_req_data['member_only']) ? 1 : 0,
+			'EVT_allow_overflow'              => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0,
+			'EVT_timezone_string'             => ! empty($this->_req_data['timezone_string'])
 				? $this->_req_data['timezone_string'] : null,
-			'EVT_external_URL'                => ! empty( $this->_req_data['externalURL'] )
+			'EVT_external_URL'                => ! empty($this->_req_data['externalURL'])
 				? $this->_req_data['externalURL'] : null,
-			'EVT_phone'                       => ! empty( $this->_req_data['event_phone'] )
+			'EVT_phone'                       => ! empty($this->_req_data['event_phone'])
 				? $this->_req_data['event_phone'] : null,
 		);
 		//update event
-		$success = $this->_event_model()->update_by_ID( $event_values, $post_id );
+		$success = $this->_event_model()->update_by_ID($event_values, $post_id);
 		//get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status );
-		$event = $this->_event_model()->get_one( array( $get_one_where ) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 		//the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons.
 		$event_update_callbacks = apply_filters(
 			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-			array( array( $this, '_default_venue_update' ), array( $this, '_default_tickets_update' ) )
+			array(array($this, '_default_venue_update'), array($this, '_default_tickets_update'))
 		);
 		$att_success = true;
-		foreach ( $event_update_callbacks as $e_callback ) {
-			$_succ = call_user_func_array( $e_callback, array( $event, $this->_req_data ) );
+		foreach ($event_update_callbacks as $e_callback) {
+			$_succ = call_user_func_array($e_callback, array($event, $this->_req_data));
 			$att_success = ! $att_success ? $att_success
 				: $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 		//any errors?
-		if ( $success && false === $att_success ) {
+		if ($success && false === $att_success) {
 			EE_Error::add_error(
 				esc_html__(
 					'Event Details saved successfully but something went wrong with saving attachments.',
@@ -932,9 +932,9 @@ 
 				__FUNCTION__,
 				__LINE__
 			);
-		} else if ( $success === false ) {
+		} else if ($success === false) {
 			EE_Error::add_error(
-				esc_html__( 'Event Details did not save successfully.', 'event_espresso' ),
+				esc_html__('Event Details did not save successfully.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -949,14 +949,14 @@ 
 	 * @param int $post_id
 	 * @param int $revision_id
 	 */
-	protected function _restore_cpt_item( $post_id, $revision_id ) {
+	protected function _restore_cpt_item($post_id, $revision_id) {
 		//copy existing event meta to new post
-		$post_evt = $this->_event_model()->get_one_by_ID( $post_id );
-		if ( $post_evt instanceof EE_Event ) {
+		$post_evt = $this->_event_model()->get_one_by_ID($post_id);
+		if ($post_evt instanceof EE_Event) {
 			//meta revision restore
-			$post_evt->restore_revision( $revision_id );
+			$post_evt->restore_revision($revision_id);
 			//related objs restore
-			$post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) );
+			$post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price'));
 		}
 	}
 
@@ -969,49 +969,49 @@ 
 	 * @param  array     $data   The request data from the form
 	 * @return bool           Success or fail.
 	 */
-	protected function _default_venue_update( \EE_Event $evtobj, $data ) {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
-		$venue_model = EE_Registry::instance()->load_model( 'Venue' );
+	protected function _default_venue_update(\EE_Event $evtobj, $data) {
+		require_once(EE_MODELS.'EEM_Venue.model.php');
+		$venue_model = EE_Registry::instance()->load_model('Venue');
 		$rows_affected = null;
-		$venue_id = ! empty( $data['venue_id'] ) ? $data['venue_id'] : null;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
 		// very important.  If we don't have a venue name...
 		// then we'll get out because not necessary to create empty venue
-		if ( empty( $data['venue_title'] ) ) {
+		if (empty($data['venue_title'])) {
 			return false;
 		}
 		$venue_array = array(
-			'VNU_wp_user'         => $evtobj->get( 'EVT_wp_user' ),
-			'VNU_name'            => ! empty( $data['venue_title'] ) ? $data['venue_title'] : null,
-			'VNU_desc'            => ! empty( $data['venue_description'] ) ? $data['venue_description'] : null,
-			'VNU_identifier'      => ! empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : null,
-			'VNU_short_desc'      => ! empty( $data['venue_short_description'] ) ? $data['venue_short_description']
+			'VNU_wp_user'         => $evtobj->get('EVT_wp_user'),
+			'VNU_name'            => ! empty($data['venue_title']) ? $data['venue_title'] : null,
+			'VNU_desc'            => ! empty($data['venue_description']) ? $data['venue_description'] : null,
+			'VNU_identifier'      => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : null,
+			'VNU_short_desc'      => ! empty($data['venue_short_description']) ? $data['venue_short_description']
 				: null,
-			'VNU_address'         => ! empty( $data['address'] ) ? $data['address'] : null,
-			'VNU_address2'        => ! empty( $data['address2'] ) ? $data['address2'] : null,
-			'VNU_city'            => ! empty( $data['city'] ) ? $data['city'] : null,
-			'STA_ID'              => ! empty( $data['state'] ) ? $data['state'] : null,
-			'CNT_ISO'             => ! empty( $data['countries'] ) ? $data['countries'] : null,
-			'VNU_zip'             => ! empty( $data['zip'] ) ? $data['zip'] : null,
-			'VNU_phone'           => ! empty( $data['venue_phone'] ) ? $data['venue_phone'] : null,
-			'VNU_capacity'        => ! empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : null,
-			'VNU_url'             => ! empty( $data['venue_url'] ) ? $data['venue_url'] : null,
-			'VNU_virtual_phone'   => ! empty( $data['virtual_phone'] ) ? $data['virtual_phone'] : null,
-			'VNU_virtual_url'     => ! empty( $data['virtual_url'] ) ? $data['virtual_url'] : null,
-			'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0,
+			'VNU_address'         => ! empty($data['address']) ? $data['address'] : null,
+			'VNU_address2'        => ! empty($data['address2']) ? $data['address2'] : null,
+			'VNU_city'            => ! empty($data['city']) ? $data['city'] : null,
+			'STA_ID'              => ! empty($data['state']) ? $data['state'] : null,
+			'CNT_ISO'             => ! empty($data['countries']) ? $data['countries'] : null,
+			'VNU_zip'             => ! empty($data['zip']) ? $data['zip'] : null,
+			'VNU_phone'           => ! empty($data['venue_phone']) ? $data['venue_phone'] : null,
+			'VNU_capacity'        => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : null,
+			'VNU_url'             => ! empty($data['venue_url']) ? $data['venue_url'] : null,
+			'VNU_virtual_phone'   => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : null,
+			'VNU_virtual_url'     => ! empty($data['virtual_url']) ? $data['virtual_url'] : null,
+			'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0,
 			'status'              => 'publish',
 		);
 		//if we've got the venue_id then we're just updating the existing venue so let's do that and then get out.
-		if ( ! empty( $venue_id ) ) {
-			$update_where = array( $venue_model->primary_key_name() => $venue_id );
-			$rows_affected = $venue_model->update( $venue_array, array( $update_where ) );
+		if ( ! empty($venue_id)) {
+			$update_where = array($venue_model->primary_key_name() => $venue_id);
+			$rows_affected = $venue_model->update($venue_array, array($update_where));
 			//we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present.
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
+			$evtobj->_add_relation_to($venue_id, 'Venue');
 			return $rows_affected > 0 ? true : false;
 		} else {
 			//we insert the venue
-			$venue_id = $venue_model->insert( $venue_array );
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
-			return ! empty( $venue_id ) ? true : false;
+			$venue_id = $venue_model->insert($venue_array);
+			$evtobj->_add_relation_to($venue_id, 'Venue');
+			return ! empty($venue_id) ? true : false;
 		}
 		//when we have the ancestor come in it's already been handled by the revision save.
 	}
@@ -1025,51 +1025,51 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return array
 	 */
-	protected function _default_tickets_update( EE_Event $evtobj, $data ) {
+	protected function _default_tickets_update(EE_Event $evtobj, $data) {
 		$success = true;
 		$saved_dtt = null;
 		$saved_tickets = array();
-		$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		$incoming_date_formats = array('Y-m-d', 'h:i a');
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
-			$dtt = array_map( 'trim', $dtt );
-			$dtt['DTT_EVT_end'] = isset( $dtt['DTT_EVT_end'] ) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end']
+			$dtt = array_map('trim', $dtt);
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end']
 				: $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID'        => ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : null,
+				'DTT_ID'        => ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : null,
 				'DTT_EVT_start' => $dtt['DTT_EVT_start'],
 				'DTT_EVT_end'   => $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
 				'DTT_order'     => $row,
 			);
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
-			if ( ! empty( $dtt['DTT_ID'] ) ) {
+			if ( ! empty($dtt['DTT_ID'])) {
 				$DTM = EE_Registry::instance()
-				                  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
-				                  ->get_one_by_ID( $dtt['DTT_ID'] );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				                  ->load_model('Datetime', array($evtobj->get_timezone()))
+				                  ->get_one_by_ID($dtt['DTT_ID']);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 				//make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.  We need to do this so we dont' TRASH the parent DTT.
-				$saved_dtts[ $DTM->ID() ] = $DTM;
+				$saved_dtts[$DTM->ID()] = $DTM;
 			} else {
-				$DTM = EE_Registry::instance()->load_class( 'Datetime', array( $datetime_values ), false, false );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				$DTM->set_timezone( $evtobj->get_timezone() );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), false, false);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				$DTM->set_timezone($evtobj->get_timezone());
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 			$DTM->save();
-			$DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' );
+			$DTT = $evtobj->_add_relation_to($DTM, 'Datetime');
 			//load DTT helper
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if ( $DTT->get_raw( 'DTT_EVT_start' ) > $DTT->get_raw( 'DTT_EVT_end' ) ) {
-				$DTT->set( 'DTT_EVT_end', $DTT->get( 'DTT_EVT_start' ) );
-				$DTT = EEH_DTT_Helper::date_time_add( $DTT, 'DTT_EVT_end', 'days' );
+			if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) {
+				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start'));
+				$DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days');
 				$DTT->save();
 			}
 			//now we got to make sure we add the new DTT_ID to the $saved_dtts array  because it is possible there was a new one created for the autosave.
@@ -1080,20 +1080,20 @@ 
 		}
 		//no dtts get deleted so we don't do any of that logic here.
 		//update tickets next
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode( ',', $data['ticket_IDs'] ) : array();
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
-			$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$incoming_date_formats = array('Y-m-d', 'h:i a');
 			$update_prices = false;
-			$ticket_price = isset( $data['edit_prices'][ $row ][1]['PRC_amount'] )
-				? $data['edit_prices'][ $row ][1]['PRC_amount'] : 0;
+			$ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount'])
+				? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
 			// trim inputs to ensure any excess whitespace is removed.
-			$tkt = array_map( 'trim', $tkt );
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			$tkt = array_map('trim', $tkt);
+			if (empty($tkt['TKT_start_date'])) {
 				//let's use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]);
 			}
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				//use the start date of the first datetime
 				$dtt = $evtobj->first_datetime();
 				$tkt['TKT_end_date'] = $dtt->start_date_and_time(
@@ -1102,22 +1102,22 @@ 
 				);
 			}
 			$TKT_values = array(
-				'TKT_ID'          => ! empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : null,
-				'TTM_ID'          => ! empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name'        => ! empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' => ! empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '',
+				'TKT_ID'          => ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : null,
+				'TTM_ID'          => ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name'        => ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' => ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '',
 				'TKT_start_date'  => $tkt['TKT_start_date'],
 				'TKT_end_date'    => $tkt['TKT_end_date'],
-				'TKT_qty'         => ! isset( $tkt['TKT_qty'] ) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
-				'TKT_uses'        => ! isset( $tkt['TKT_uses'] ) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
-				'TKT_min'         => empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max'         => empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty'         => ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses'        => ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min'         => empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max'         => empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row'         => $row,
-				'TKT_order'       => isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row,
+				'TKT_order'       => isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row,
 				'TKT_price'       => $ticket_price,
 			);
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$TKT_values['TKT_price'] = $ticket_price;
@@ -1126,110 +1126,110 @@ 
 			//if we have a TKT_ID then we need to get that existing TKT_obj and update it
 			//we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified.
 			//keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-			if ( ! empty( $tkt['TKT_ID'] ) ) {
+			if ( ! empty($tkt['TKT_ID'])) {
 				$TKT = EE_Registry::instance()
-						->load_model( 'Ticket', array( $evtobj->get_timezone() ) )
-						->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+						->load_model('Ticket', array($evtobj->get_timezone()))
+						->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 					$ticket_sold = $TKT->count_related(
 						'Registration',
 						array(
 							array(
 								'STS_ID' => array(
 									'NOT IN',
-									array( EEM_Registration::status_id_incomplete ),
+									array(EEM_Registration::status_id_incomplete),
 								),
 							),
 						)
 					) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
-					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' )
+					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price')
 					                  && ! $TKT->get(
 						'TKT_deleted'
 					) ? true : false;
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
+					if ($create_new_TKT) {
 						//archive the old ticket first
-						$TKT->set( 'TKT_deleted', 1 );
+						$TKT->set('TKT_deleted', 1);
 						$TKT->save();
 						//make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine.
-						$saved_tickets[ $TKT->ID() ] = $TKT;
+						$saved_tickets[$TKT->ID()] = $TKT;
 						//create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it.
 						$TKT = clone $TKT;
-						$TKT->set( 'TKT_ID', 0 );
-						$TKT->set( 'TKT_deleted', 0 );
-						$TKT->set( 'TKT_price', $ticket_price );
-						$TKT->set( 'TKT_sold', 0 );
+						$TKT->set('TKT_ID', 0);
+						$TKT->set('TKT_deleted', 0);
+						$TKT->set('TKT_price', $ticket_price);
+						$TKT->set('TKT_sold', 0);
 						//now we need to make sure that $new prices are created as well and attached to new ticket.
 						$update_prices = true;
 					}
 					//make sure price is set if it hasn't been already
-					$TKT->set( 'TKT_price', $ticket_price );
+					$TKT->set('TKT_price', $ticket_price);
 				}
 			} else {
 				//no TKT_id so a new TKT
 				$TKT_values['TKT_price'] = $ticket_price;
-				$TKT = EE_Registry::instance()->load_class( 'Ticket', array( $TKT_values ), false, false );
-				if ( $TKT instanceof EE_Ticket ) {
+				$TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), false, false);
+				if ($TKT instanceof EE_Ticket) {
 					//need to reset values to properly account for the date formats
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
-					$TKT->set_timezone( $evtobj->get_timezone() );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
+					$TKT->set_timezone($evtobj->get_timezone());
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					$update_prices = true;
 				}
 			}
 			// cap ticket qty by datetime reg limits
-			$TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) );
+			$TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit')));
 			//update ticket.
 			$TKT->save();
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if ( $TKT->get_raw( 'TKT_start_date' ) > $TKT->get_raw( 'TKT_end_date' ) ) {
-				$TKT->set( 'TKT_end_date', $TKT->get( 'TKT_start_date' ) );
-				$TKT = EEH_DTT_Helper::date_time_add( $TKT, 'TKT_end_date', 'days' );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
+				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 				$TKT->save();
 			}
 			//initially let's add the ticket to the dtt
-			$saved_dtt->_add_relation_to( $TKT, 'Ticket' );
-			$saved_tickets[ $TKT->ID() ] = $TKT;
+			$saved_dtt->_add_relation_to($TKT, 'Ticket');
+			$saved_tickets[$TKT->ID()] = $TKT;
 			//add prices to ticket
-			$this->_add_prices_to_ticket( $data['edit_prices'][ $row ], $TKT, $update_prices );
+			$this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices);
 		}
 		//however now we need to handle permanently deleting tickets via the ui.  Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold.  However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db.
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) );
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 			//get the ticket for this id
-			$tkt_to_remove = EE_Registry::instance()->load_model( 'Ticket' )->get_one_by_ID( $id );
+			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
 			//need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold)
-			$dtts = $tkt_to_remove->get_many_related( 'Datetime' );
-			foreach ( $dtts as $dtt ) {
-				$tkt_to_remove->_remove_relation_to( $dtt, 'Datetime' );
+			$dtts = $tkt_to_remove->get_many_related('Datetime');
+			foreach ($dtts as $dtt) {
+				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 			//need to do the same for prices (except these prices can also be deleted because again, tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
-			$tkt_to_remove->delete_related_permanently( 'Price' );
+			$tkt_to_remove->delete_related_permanently('Price');
 			//finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships)
 			$tkt_to_remove->delete_permanently();
 		}
-		return array( $saved_dtt, $saved_tickets );
+		return array($saved_dtt, $saved_tickets);
 	}
 
 
@@ -1246,29 +1246,29 @@ 
 	 * @param bool      $new_prices Whether attach existing incoming prices or create new ones.
 	 * @return  void
 	 */
-	private function _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = false ) {
-		foreach ( $prices as $row => $prc ) {
+	private function _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = false) {
+		foreach ($prices as $row => $prc) {
 			$PRC_values = array(
-				'PRC_ID'         => ! empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : null,
-				'PRT_ID'         => ! empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : null,
-				'PRC_amount'     => ! empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name'       => ! empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc'       => ! empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_ID'         => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : null,
+				'PRT_ID'         => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : null,
+				'PRC_amount'     => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name'       => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc'       => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => 0, //make sure prices are NOT set as default from this context
 				'PRC_order'      => $row,
 			);
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class( 'Price', array( $PRC_values ), false, false );
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), false, false);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 				$PRC->save();
 			}
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 	}
 
@@ -1300,7 +1300,7 @@ 
 	private function _generate_publish_box_extra_content() {
 		//load formatter helper
 		//args for getting related registrations
-		$approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) );
+		$approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved));
 		$not_approved_query_args = array(
 			array(
 				'REG_deleted' => 0,
@@ -1371,7 +1371,7 @@ 
 		$publish_box_extra_args['event_editor_overview_add'] = ob_get_clean();
 		// load template
 		EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php',
+			EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php',
 			$publish_box_extra_args
 		);
 	}
@@ -1405,16 +1405,16 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_tickets',
-			esc_html__( 'Event Datetime & Ticket', 'event_espresso' ),
-			array( $this, 'ticket_metabox' ),
+			esc_html__('Event Datetime & Ticket', 'event_espresso'),
+			array($this, 'ticket_metabox'),
 			$this->page_slug,
 			'normal',
 			'high'
 		);
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			esc_html__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			esc_html__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'default'
@@ -1442,65 +1442,65 @@ 
 			'trash_icon'               => 'ee-lock-icon',
 			'disabled'                 => '',
 		);
-		$event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : null;
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		$event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		/**
 		 * 1. Start with retrieving Datetimes
 		 * 2. Fore each datetime get related tickets
 		 * 3. For each ticket get related prices
 		 */
-		$times = EE_Registry::instance()->load_model( 'Datetime' )->get_all_event_dates( $event_id );
+		$times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id);
 		/** @type EE_Datetime $first_datetime */
-		$first_datetime = reset( $times );
+		$first_datetime = reset($times);
 		//do we get related tickets?
-		if ( $first_datetime instanceof EE_Datetime
+		if ($first_datetime instanceof EE_Datetime
 		     && $first_datetime->ID() !== 0
 		) {
-			$existing_datetime_ids[] = $first_datetime->get( 'DTT_ID' );
+			$existing_datetime_ids[] = $first_datetime->get('DTT_ID');
 			$template_args['time'] = $first_datetime;
 			$related_tickets = $first_datetime->tickets(
 				array(
-					array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ),
+					array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)),
 					'default_where_conditions' => 'none',
 				)
 			);
-			if ( ! empty( $related_tickets ) ) {
-				$template_args['total_ticket_rows'] = count( $related_tickets );
+			if ( ! empty($related_tickets)) {
+				$template_args['total_ticket_rows'] = count($related_tickets);
 				$row = 0;
-				foreach ( $related_tickets as $ticket ) {
-					$existing_ticket_ids[] = $ticket->get( 'TKT_ID' );
-					$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket, false, $row );
+				foreach ($related_tickets as $ticket) {
+					$existing_ticket_ids[] = $ticket->get('TKT_ID');
+					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, false, $row);
 					$row++;
 				}
 			} else {
 				$template_args['total_ticket_rows'] = 1;
 				/** @type EE_Ticket $ticket */
-				$ticket = EE_Registry::instance()->load_model( 'Ticket' )->create_default_object();
-				$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket );
+				$ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object();
+				$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
 			}
 		} else {
 			$template_args['time'] = $times[0];
 			/** @type EE_Ticket $ticket */
-			$ticket = EE_Registry::instance()->load_model( 'Ticket' )->get_all_default_tickets();
-			$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] );
+			$ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
+			$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]);
 			// NOTE: we're just sending the first default row
 			// (decaf can't manage default tickets so this should be sufficient);
 		}
 		$template_args['event_datetime_help_link'] = $this->_get_help_tab_link(
 			'event_editor_event_datetimes_help_tab'
 		);
-		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link( 'ticket_options_info' );
-		$template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
-		$template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
+		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info');
+		$template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
+		$template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
 		$template_args['ticket_js_structure'] = $this->_get_ticket_row(
-			EE_Registry::instance()->load_model( 'Ticket' )->create_default_object(),
+			EE_Registry::instance()->load_model('Ticket')->create_default_object(),
 			true
 		);
 		$template = apply_filters(
 			'FHEE__Events_Admin_Page__ticket_metabox__template',
-			EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php'
+			EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php'
 		);
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -1514,74 +1514,74 @@ 
 	 * @param int        $row
 	 * @return string generated html for the ticket row.
 	 */
-	private function _get_ticket_row( $ticket, $skeleton = false, $row = 0 ) {
+	private function _get_ticket_row($ticket, $skeleton = false, $row = 0) {
 		$template_args = array(
-			'tkt_status_class'    => ' tkt-status-' . $ticket->ticket_status(),
+			'tkt_status_class'    => ' tkt-status-'.$ticket->ticket_status(),
 			'tkt_archive_class'   => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived'
 				: '',
 			'ticketrow'           => $skeleton ? 'TICKETNUM' : $row,
-			'TKT_ID'              => $ticket->get( 'TKT_ID' ),
-			'TKT_name'            => $ticket->get( 'TKT_name' ),
-			'TKT_start_date'      => $skeleton ? '' : $ticket->get_date( 'TKT_start_date', 'Y-m-d h:i a' ),
-			'TKT_end_date'        => $skeleton ? '' : $ticket->get_date( 'TKT_end_date', 'Y-m-d h:i a' ),
-			'TKT_is_default'      => $ticket->get( 'TKT_is_default' ),
-			'TKT_qty'             => $ticket->get_pretty( 'TKT_qty', 'input' ),
+			'TKT_ID'              => $ticket->get('TKT_ID'),
+			'TKT_name'            => $ticket->get('TKT_name'),
+			'TKT_start_date'      => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'),
+			'TKT_end_date'        => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'),
+			'TKT_is_default'      => $ticket->get('TKT_is_default'),
+			'TKT_qty'             => $ticket->get_pretty('TKT_qty', 'input'),
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
-			'TKT_sold'            => $skeleton ? 0 : $ticket->get( 'TKT_sold' ),
-			'trash_icon'          => ( $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) )
-			                         && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
+			'TKT_sold'            => $skeleton ? 0 : $ticket->get('TKT_sold'),
+			'trash_icon'          => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')))
+			                         && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0)
 				? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
-			'disabled'            => $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) ? ''
+			'disabled'            => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? ''
 				: ' disabled=disabled',
 		);
 		$price = $ticket->ID() !== 0
-			? $ticket->get_first_related( 'Price', array( 'default_where_conditions' => 'none' ) )
-			: EE_Registry::instance()->load_model( 'Price' )->create_default_object();
+			? $ticket->get_first_related('Price', array('default_where_conditions' => 'none'))
+			: EE_Registry::instance()->load_model('Price')->create_default_object();
 		$price_args = array(
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'PRC_amount'            => $price->get( 'PRC_amount' ),
-			'PRT_ID'                => $price->get( 'PRT_ID' ),
-			'PRC_ID'                => $price->get( 'PRC_ID' ),
-			'PRC_is_default'        => $price->get( 'PRC_is_default' ),
+			'PRC_amount'            => $price->get('PRC_amount'),
+			'PRT_ID'                => $price->get('PRT_ID'),
+			'PRC_ID'                => $price->get('PRC_ID'),
+			'PRC_is_default'        => $price->get('PRC_is_default'),
 		);
 		//make sure we have default start and end dates if skeleton
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
-			$template_args['TKT_start_date'] = date( 'Y-m-d h:i a', current_time( 'timestamp' ) );
+			$template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp'));
 		}
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 			//get the earliest datetime (if present);
 			$earliest_dtt = $this->_cpt_model_obj->ID() > 0
 				? $this->_cpt_model_obj->get_first_related(
 					'Datetime',
-					array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) )
+					array('order_by' => array('DTT_EVT_start' => 'ASC'))
 				)
 				: null;
-			if ( ! empty( $earliest_dtt ) ) {
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime( 'DTT_EVT_start', 'Y-m-d', 'h:i a' );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
 			} else {
 				$template_args['TKT_end_date'] = date(
 					'Y-m-d h:i a',
-					mktime( 0, 0, 0, date( "m" ), date( "d" ) + 7, date( "Y" ) )
+					mktime(0, 0, 0, date("m"), date("d") + 7, date("Y"))
 				);
 			}
 		}
-		$template_args = array_merge( $template_args, $price_args );
+		$template_args = array_merge($template_args, $price_args);
 		$template = apply_filters(
 			'FHEE__Events_Admin_Page__get_ticket_row__template',
-			EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php',
+			EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php',
 			$ticket
 		);
-		return EEH_Template::display_template( $template, $template_args, true );
+		return EEH_Template::display_template($template, $template_args, true);
 	}
 
 
 
 	public function registration_options_meta_box() {
 		$yes_no_values = array(
-			array( 'id' => true, 'text' => esc_html__( 'Yes', 'event_espresso' ) ),
-			array( 'id' => false, 'text' => esc_html__( 'No', 'event_espresso' ) ),
+			array('id' => true, 'text' => esc_html__('Yes', 'event_espresso')),
+			array('id' => false, 'text' => esc_html__('No', 'event_espresso')),
 		);
 		$default_reg_status_values = EEM_Registration::reg_status_array(
 			array(
@@ -1593,7 +1593,7 @@ 
 		);
 		//$template_args['is_active_select'] = EEH_Form_Fields::select_input('is_active', $yes_no_values, $this->_cpt_model_obj->is_active());
 		$template_args['_event'] = $this->_cpt_model_obj;
-		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status( false );
+		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(false);
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input(
 			'default_reg_status',
@@ -1621,7 +1621,7 @@ 
 			$default_reg_status_values
 		);
 		EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_registration_options.template.php',
+			EVENTS_TEMPLATE_PATH.'event_registration_options.template.php',
 			$template_args
 		);
 	}
@@ -1640,97 +1640,97 @@ 
 	 *                           that match the given _view and paging parameters.
 	 * @return array an array of event objects.
 	 */
-	public function get_events( $per_page = 10, $current_page = 1, $count = false ) {
+	public function get_events($per_page = 10, $current_page = 1, $count = false) {
 		$EEME = $this->_event_model();
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $count ? null : $offset . ',' . $per_page;
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'EVT_ID';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : "DESC";
-		if ( isset( $this->_req_data['month_range'] ) ) {
-			$pieces = explode( ' ', $this->_req_data['month_range'], 3 );
-			$month_r = ! empty( $pieces[0] ) ? date( 'm', strtotime( $pieces[0] ) ) : '';
-			$year_r = ! empty( $pieces[1] ) ? $pieces[1] : '';
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? null : $offset.','.$per_page;
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC";
+		if (isset($this->_req_data['month_range'])) {
+			$pieces = explode(' ', $this->_req_data['month_range'], 3);
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
 		}
 		$where = array();
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case null :
 			case 'all' :
 				break;
 			case 'draft' :
-				$where['status'] = array( 'IN', array( 'draft', 'auto-draft' ) );
+				$where['status'] = array('IN', array('draft', 'auto-draft'));
 				break;
 			default :
 				$where['status'] = $status;
 		}
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0
 			? $this->_req_data['EVT_CAT'] : null;
-		if ( ! empty ( $category ) ) {
+		if ( ! empty ($category)) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 		//date where conditions
-		$start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' );
-		if ( isset( $this->_req_data['month_range'] ) && $this->_req_data['month_range'] != '' ) {
+		$start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start');
+		if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') {
 			$DateTime = new DateTime(
-				$year_r . '-' . $month_r . '-01 00:00:00',
-				new DateTimeZone( EEM_Datetime::instance()->get_timezone() )
+				$year_r.'-'.$month_r.'-01 00:00:00',
+				new DateTimeZone(EEM_Datetime::instance()->get_timezone())
 			);
-			$start = $DateTime->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( $year_r, $month_r, $DateTime->format( 't' ) )->setTime( 23, 59, 59 )->format(
-				implode( ' ', $start_formats )
+			$start = $DateTime->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(
+				implode(' ', $start_formats)
 			);
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ) {
-			$DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ) {
-			$now = date( 'Y-m-01' );
-			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( date( 'Y' ), date( 'm' ), $DateTime->format( 't' ) )
-			                ->setTime( 23, 59, 59 )
-			                ->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') {
+			$DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') {
+			$now = date('Y-m-01');
+			$DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))
+			                ->setTime(23, 59, 59)
+			                ->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		}
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
 			$where['EVT_wp_user'] = get_current_user_id();
 		} else {
-			if ( ! isset( $where['status'] ) ) {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) {
+			if ( ! isset($where['status'])) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND'                     => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'EVT_wp_user'      => get_current_user_id(),
 						),
 					);
 				}
 			}
 		}
-		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
-			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id()
-			     && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
+		if (isset($this->_req_data['EVT_wp_user'])) {
+			if ($this->_req_data['EVT_wp_user'] != get_current_user_id()
+			     && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')
 			) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
 		}
 		//search query handling
-		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(
-				'EVT_name'       => array( 'LIKE', $search_string ),
-				'EVT_desc'       => array( 'LIKE', $search_string ),
-				'EVT_short_desc' => array( 'LIKE', $search_string ),
+				'EVT_name'       => array('LIKE', $search_string),
+				'EVT_desc'       => array('LIKE', $search_string),
+				'EVT_short_desc' => array('LIKE', $search_string),
 			);
 		}
-		$where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data );
+		$where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data);
 		$query_params = apply_filters(
 			'FHEE__Events_Admin_Page__get_events__query_params',
 			array(
@@ -1743,23 +1743,23 @@ 
 			$this->_req_data
 		);
 		//let's first check if we have special requests coming in.
-		if ( isset( $this->_req_data['active_status'] ) ) {
-			switch ( $this->_req_data['active_status'] ) {
+		if (isset($this->_req_data['active_status'])) {
+			switch ($this->_req_data['active_status']) {
 				case 'upcoming' :
-					return $EEME->get_upcoming_events( $query_params, $count );
+					return $EEME->get_upcoming_events($query_params, $count);
 					break;
 				case 'expired' :
-					return $EEME->get_expired_events( $query_params, $count );
+					return $EEME->get_expired_events($query_params, $count);
 					break;
 				case 'active' :
-					return $EEME->get_active_events( $query_params, $count );
+					return $EEME->get_active_events($query_params, $count);
 					break;
 				case 'inactive' :
-					return $EEME->get_inactive_events( $query_params, $count );
+					return $EEME->get_inactive_events($query_params, $count);
 					break;
 			}
 		}
-		$events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params );
+		$events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params);
 		return $events;
 	}
 
@@ -1770,9 +1770,9 @@ 
 	 *
 	 * @param string $post_id
 	 */
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'trash', false );
+		$this->_trash_or_restore_event('trash', false);
 	}
 
 
@@ -1780,9 +1780,9 @@ 
 	/**
 	 * @param string $post_id
 	 */
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'draft', false );
+		$this->_trash_or_restore_event('draft', false);
 	}
 
 
@@ -1790,9 +1790,9 @@ 
 	/**
 	 * @param string $post_id
 	 */
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_delete_event( false );
+		$this->_delete_event(false);
 	}
 
 
@@ -1804,23 +1804,23 @@ 
 	 * @param  string $event_status
 	 * @param bool    $redirect_after
 	 */
-	protected function _trash_or_restore_event( $event_status = 'trash', $redirect_after = true ) {
+	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = true) {
 		//determine the event id and set to array.
-		$EVT_ID = isset( $this->_req_data['EVT_ID'] ) ? absint( $this->_req_data['EVT_ID'] ) : false;
+		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : false;
 		// loop thru events
-		if ( $EVT_ID ) {
+		if ($EVT_ID) {
 			// clean status
-			$event_status = sanitize_key( $event_status );
+			$event_status = sanitize_key($event_status);
 			// grab status
-			if ( ! empty( $event_status ) ) {
-				$success = $this->_change_event_status( $EVT_ID, $event_status );
+			if ( ! empty($event_status)) {
+				$success = $this->_change_event_status($EVT_ID, $event_status);
 			} else {
 				$success = false;
 				$msg = esc_html__(
 					'An error occurred. The event could not be moved to the trash because a valid event status was not not supplied.',
 					'event_espresso'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
 			$success = false;
@@ -1828,11 +1828,11 @@ 
 				'An error occurred. The event could not be moved to the trash because a valid event ID was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-		if ( $redirect_after ) {
-			$this->_redirect_after_action( $success, 'Event', $action, array( 'action' => 'default' ) );
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
 		}
 	}
 
@@ -1845,18 +1845,18 @@ 
 	 * @param  string $event_status
 	 * @return void
 	 */
-	protected function _trash_or_restore_events( $event_status = 'trash' ) {
+	protected function _trash_or_restore_events($event_status = 'trash') {
 		// clean status
-		$event_status = sanitize_key( $event_status );
+		$event_status = sanitize_key($event_status);
 		// grab status
-		if ( ! empty( $event_status ) ) {
+		if ( ! empty($event_status)) {
 			$success = true;
 			//determine the event id and set to array.
-			$EVT_IDs = isset( $this->_req_data['EVT_IDs'] ) ? (array) $this->_req_data['EVT_IDs'] : array();
+			$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 			// loop thru events
-			foreach ( $EVT_IDs as $EVT_ID ) {
-				if ( $EVT_ID = absint( $EVT_ID ) ) {
-					$results = $this->_change_event_status( $EVT_ID, $event_status );
+			foreach ($EVT_IDs as $EVT_ID) {
+				if ($EVT_ID = absint($EVT_ID)) {
+					$results = $this->_change_event_status($EVT_ID, $event_status);
 					$success = $results !== false ? $success : false;
 				} else {
 					$msg = sprintf(
@@ -1866,7 +1866,7 @@ 
 						),
 						$EVT_ID
 					);
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 					$success = false;
 				}
 			}
@@ -1876,12 +1876,12 @@ 
 				'An error occurred. The event could not be moved to the trash because a valid event status was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// in order to force a pluralized result message we need to send back a success status greater than 1
 		$success = $success ? 2 : false;
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-		$this->_redirect_after_action( $success, 'Events', $action, array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, 'Events', $action, array('action' => 'default'));
 	}
 
 
@@ -1894,30 +1894,30 @@ 
 	 * @param  string $event_status
 	 * @return bool
 	 */
-	private function _change_event_status( $EVT_ID = 0, $event_status = '' ) {
+	private function _change_event_status($EVT_ID = 0, $event_status = '') {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = esc_html__(
 				'An error occurred. No Event ID or an invalid Event ID was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		// clean status
-		$event_status = sanitize_key( $event_status );
+		$event_status = sanitize_key($event_status);
 		// grab status
-		if ( empty( $event_status ) ) {
+		if (empty($event_status)) {
 			$msg = esc_html__(
 				'An error occurred. No Event Status or an invalid Event Status was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// was event trashed or restored ?
-		switch ( $event_status ) {
+		switch ($event_status) {
 			case 'draft' :
 				$action = 'restored from the trash';
 				$hook = 'AHEE_event_restored_from_trash';
@@ -1931,15 +1931,15 @@ 
 				$hook = false;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $event_status );
+		$this->_cpt_model_obj->set_status($event_status);
 		$success = $this->_cpt_model_obj->save();
-		if ( $success === false ) {
-			$msg = sprintf( esc_html__( 'An error occurred. The event could not be %s.', 'event_espresso' ), $action );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ($success === false) {
+			$msg = sprintf(esc_html__('An error occurred. The event could not be %s.', 'event_espresso'), $action);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( $hook ) {
-			do_action( $hook );
+		if ($hook) {
+			do_action($hook);
 		}
 		return true;
 	}
@@ -1952,34 +1952,34 @@ 
 	 * @access protected
 	 * @param bool $redirect_after
 	 */
-	protected function _delete_event( $redirect_after = true ) {
+	protected function _delete_event($redirect_after = true) {
 		//determine the event id and set to array.
-		$EVT_ID = isset( $this->_req_data['EVT_ID'] ) ? absint( $this->_req_data['EVT_ID'] ) : null;
-		$EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID;
+		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : null;
+		$EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID;
 		// loop thru events
-		if ( $EVT_ID ) {
-			$success = $this->_permanently_delete_event( $EVT_ID );
+		if ($EVT_ID) {
+			$success = $this->_permanently_delete_event($EVT_ID);
 			// get list of events with no prices
-			$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', array() );
+			$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 			// remove this event from the list of events with no prices
-			if ( isset( $espresso_no_ticket_prices[ $EVT_ID ] ) ) {
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+			if (isset($espresso_no_ticket_prices[$EVT_ID])) {
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			}
-			update_option( 'ee_no_ticket_prices', $espresso_no_ticket_prices );
+			update_option('ee_no_ticket_prices', $espresso_no_ticket_prices);
 		} else {
 			$success = false;
 			$msg = esc_html__(
 				'An error occurred. An event could not be deleted because a valid event ID was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after ) {
+		if ($redirect_after) {
 			$this->_redirect_after_action(
 				$success,
 				'Event',
 				'deleted',
-				array( 'action' => 'default', 'status' => 'trash' )
+				array('action' => 'default', 'status' => 'trash')
 			);
 		}
 	}
@@ -1995,30 +1995,30 @@ 
 	protected function _delete_events() {
 		$success = true;
 		// get list of events with no prices
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', array() );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 		//determine the event id and set to array.
-		$EVT_IDs = isset( $this->_req_data['EVT_IDs'] ) ? (array) $this->_req_data['EVT_IDs'] : array();
+		$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 		// loop thru events
-		foreach ( $EVT_IDs as $EVT_ID ) {
-			$EVT_ID = absint( $EVT_ID );
-			if ( $EVT_ID ) {
-				$results = $this->_permanently_delete_event( $EVT_ID );
+		foreach ($EVT_IDs as $EVT_ID) {
+			$EVT_ID = absint($EVT_ID);
+			if ($EVT_ID) {
+				$results = $this->_permanently_delete_event($EVT_ID);
 				$success = $results !== false ? $success : false;
 				// remove this event from the list of events with no prices
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			} else {
 				$success = false;
 				$msg = esc_html__(
 					'An error occurred. An event could not be deleted because a valid event ID was not not supplied.',
 					'event_espresso'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
-		update_option( 'ee_no_ticket_prices', $espresso_no_ticket_prices );
+		update_option('ee_no_ticket_prices', $espresso_no_ticket_prices);
 		// in order to force a pluralized result message we need to send back a success status greater than 1
 		$success = $success ? 2 : false;
-		$this->_redirect_after_action( $success, 'Events', 'deleted', array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, 'Events', 'deleted', array('action' => 'default'));
 	}
 
 
@@ -2030,70 +2030,70 @@ 
 	 * @param  int $EVT_ID
 	 * @return bool
 	 */
-	private function _permanently_delete_event( $EVT_ID = 0 ) {
+	private function _permanently_delete_event($EVT_ID = 0) {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = esc_html__(
 				'An error occurred. No Event ID or an invalid Event ID was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		if (
 			! $this->_cpt_model_obj instanceof EE_Event
 			|| $this->_cpt_model_obj->ID() !== $EVT_ID
 		) {
-			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		}
-		if ( ! $this->_cpt_model_obj instanceof EE_Event ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_Event) {
 			return false;
 		}
 		//need to delete related tickets and prices first.
-		$datetimes = $this->_cpt_model_obj->get_many_related( 'Datetime' );
-		foreach ( $datetimes as $datetime ) {
-			$this->_cpt_model_obj->_remove_relation_to( $datetime, 'Datetime' );
-			$tickets = $datetime->get_many_related( 'Ticket' );
-			foreach ( $tickets as $ticket ) {
-				$ticket->_remove_relation_to( $datetime, 'Datetime' );
-				$ticket->delete_related_permanently( 'Price' );
+		$datetimes = $this->_cpt_model_obj->get_many_related('Datetime');
+		foreach ($datetimes as $datetime) {
+			$this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime');
+			$tickets = $datetime->get_many_related('Ticket');
+			foreach ($tickets as $ticket) {
+				$ticket->_remove_relation_to($datetime, 'Datetime');
+				$ticket->delete_related_permanently('Price');
 				$ticket->delete_permanently();
 			}
 			$datetime->delete();
 		}
 		//what about related venues or terms?
-		$venues = $this->_cpt_model_obj->get_many_related( 'Venue' );
-		foreach ( $venues as $venue ) {
-			$this->_cpt_model_obj->_remove_relation_to( $venue, 'Venue' );
+		$venues = $this->_cpt_model_obj->get_many_related('Venue');
+		foreach ($venues as $venue) {
+			$this->_cpt_model_obj->_remove_relation_to($venue, 'Venue');
 		}
 		//any attached question groups?
-		$question_groups = $this->_cpt_model_obj->get_many_related( 'Question_Group' );
-		if ( ! empty( $question_groups ) ) {
-			foreach ( $question_groups as $question_group ) {
-				$this->_cpt_model_obj->_remove_relation_to( $question_group, 'Question_Group' );
+		$question_groups = $this->_cpt_model_obj->get_many_related('Question_Group');
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $question_group) {
+				$this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group');
 			}
 		}
 		//Message Template Groups
-		$this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' );
+		$this->_cpt_model_obj->_remove_relations('Message_Template_Group');
 		/** @type EE_Term_Taxonomy[] $term_taxonomies */
 		$term_taxonomies = $this->_cpt_model_obj->term_taxonomies();
-		foreach ( $term_taxonomies as $term_taxonomy ) {
-			$this->_cpt_model_obj->remove_relation_to_term_taxonomy( $term_taxonomy );
+		foreach ($term_taxonomies as $term_taxonomy) {
+			$this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy);
 		}
 		$success = $this->_cpt_model_obj->delete_permanently();
 		// did it all go as planned ?
-		if ( $success ) {
-			$msg = sprintf( esc_html__( 'Event ID # %d has been deleted.', 'event_espresso' ), $EVT_ID );
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = sprintf(esc_html__('Event ID # %d has been deleted.', 'event_espresso'), $EVT_ID);
+			EE_Error::add_success($msg);
 		} else {
 			$msg = sprintf(
-				esc_html__( 'An error occurred. Event ID # %d could not be deleted.', 'event_espresso' ),
+				esc_html__('An error occurred. Event ID # %d could not be deleted.', 'event_espresso'),
 				$EVT_ID
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID );
+		do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID);
 		return true;
 	}
 
@@ -2106,7 +2106,7 @@ 
 	 * @return int
 	 */
 	public function total_events() {
-		$count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2120,9 +2120,9 @@ 
 	 */
 	public function total_events_draft() {
 		$where = array(
-			'status' => array( 'IN', array( 'draft', 'auto-draft' ) ),
+			'status' => array('IN', array('draft', 'auto-draft')),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2138,7 +2138,7 @@ 
 		$where = array(
 			'status' => 'trash',
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2169,12 +2169,12 @@ 
 			EE_Registry::instance()->CFG->registration->default_STS_ID,
 			$this->_template_args['reg_status_array']
 		)
-			? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID )
+			? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID)
 			: EEM_Registration::status_id_pending_payment;
-		$this->_set_add_edit_form_tags( 'update_default_event_settings' );
-		$this->_set_publish_post_box_vars( null, false, false, null, false );
+		$this->_set_add_edit_form_tags('update_default_event_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_settings.template.php',
+			EVENTS_TEMPLATE_PATH.'event_settings.template.php',
 			$this->_template_args,
 			true
 		);
@@ -2190,8 +2190,8 @@ 
 	 * @return void
 	 */
 	protected function _update_default_event_settings() {
-		EE_Config::instance()->registration->default_STS_ID = isset( $this->_req_data['default_reg_status'] )
-			? sanitize_text_field( $this->_req_data['default_reg_status'] )
+		EE_Config::instance()->registration->default_STS_ID = isset($this->_req_data['default_reg_status'])
+			? sanitize_text_field($this->_req_data['default_reg_status'])
 			: EEM_Registration::status_id_pending_payment;
 		$what = 'Default Event Settings';
 		$success = $this->_update_espresso_configuration(
@@ -2201,7 +2201,7 @@ 
 			__FUNCTION__,
 			__LINE__
 		);
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'default_event_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'default_event_settings'));
 	}
 
 
@@ -2211,20 +2211,20 @@ 
 
 
 	protected function _template_settings() {
-		$this->_admin_page_title = esc_html__( 'Template Settings (Preview)', 'event_espresso' );
+		$this->_admin_page_title = esc_html__('Template Settings (Preview)', 'event_espresso');
 		$this->_template_args['preview_img'] = '<img src="'
 		                                       . EVENTS_ASSETS_URL
 		                                       . DS
 		                                       . 'images'
 		                                       . DS
 		                                       . 'caffeinated_template_features.jpg" alt="'
-		                                       . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
+		                                       . esc_attr__('Template Settings Preview screenshot', 'event_espresso')
 		                                       . '" />';
-		$this->_template_args['preview_text'] = '<strong>' . esc_html__(
+		$this->_template_args['preview_text'] = '<strong>'.esc_html__(
 				'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.',
 				'event_espresso'
-			) . '</strong>';
-		$this->display_admin_caf_preview_page( 'template_settings_tab' );
+			).'</strong>';
+		$this->display_admin_caf_preview_page('template_settings_tab');
 	}
 
 
@@ -2236,18 +2236,18 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && ! empty( $this->_category->id ) ) {
+		if (isset($this->_category->id) && ! empty($this->_category->id)) {
 			return;
 		} //already have the category object so get out.
 		//set default category object
 		$this->_set_empty_category_object();
 		//only set if we've got an id
-		if ( ! isset( $this->_req_data['EVT_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_CAT_ID'])) {
 			return;
 		}
-		$category_id = absint( $this->_req_data['EVT_CAT_ID'] );
-		$term = get_term( $category_id, 'espresso_event_categories' );
-		if ( ! empty( $term ) ) {
+		$category_id = absint($this->_req_data['EVT_CAT_ID']);
+		$term = get_term($category_id, 'espresso_event_categories');
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -2267,9 +2267,9 @@ 
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_search_btn_label = esc_html__( 'Categories', 'event_espresso' );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_search_btn_label = esc_html__('Categories', 'event_espresso');
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 				'add_category',
 				'add_category',
 				array(),
@@ -2283,20 +2283,20 @@ 
 	/**
 	 * @param $view
 	 */
-	protected function _category_details( $view ) {
+	protected function _category_details($view) {
 		//load formatter helper
 		//load field generator helper
 		$route = $view == 'edit' ? 'update_category' : 'insert_category';
-		$this->_set_add_edit_form_tags( $route );
+		$this->_set_add_edit_form_tags($route);
 		$this->_set_category_object();
-		$id = ! empty( $this->_category->id ) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 		$delete_action = 'delete_category';
 		//custom redirect
 		$redirect = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'category_list' ),
+			array('action' => 'category_list'),
 			$this->_admin_base_url
 		);
-		$this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect);
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
 		$this->display_admin_page_with_sidebar();
@@ -2310,21 +2310,21 @@ 
 	protected function _category_details_content() {
 		$editor_args['category_desc'] = array(
 			'type'          => 'wp_editor',
-			'value'         => EEH_Formatter::admin_format_content( $this->_category->category_desc ),
+			'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class'         => 'my_editor_custom',
-			'wpeditor_args' => array( 'media_buttons' => false ),
+			'wpeditor_args' => array('media_buttons' => false),
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 		$all_terms = get_terms(
-			array( 'espresso_event_categories' ),
-			array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) )
+			array('espresso_event_categories'),
+			array('hide_empty' => 0, 'exclude' => array($this->_category->id))
 		);
 		//setup category select for term parents.
 		$category_select_values[] = array(
-			'text' => esc_html__( 'No Parent', 'event_espresso' ),
+			'text' => esc_html__('No Parent', 'event_espresso'),
 			'id'   => 0,
 		);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id'   => $term->term_id,
@@ -2338,28 +2338,28 @@ 
 		$template_args = array(
 			'category'                 => $this->_category,
 			'category_select'          => $category_select,
-			'unique_id_info_help_link' => $this->_get_help_tab_link( 'unique_id_info' ),
+			'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
 			'category_desc_editor'     => $_wp_editor['category_desc']['field'],
 			'disable'                  => '',
 			'disabled_message'         => false,
 		);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template( $template, $template_args, true );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, true);
 	}
 
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID']
+		$cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID']
 			: (array) $this->_req_data['category_id'];
-		foreach ( $cat_ids as $cat_id ) {
-			$this->_delete_category( $cat_id );
+		foreach ($cat_ids as $cat_id) {
+			$this->_delete_category($cat_id);
 		}
 		//doesn't matter what page we're coming from... we're going to the same place after delete.
 		$query_args = array(
 			'action' => 'category_list',
 		);
-		$this->_redirect_after_action( 0, '', '', $query_args );
+		$this->_redirect_after_action(0, '', '', $query_args);
 	}
 
 
@@ -2367,9 +2367,9 @@ 
 	/**
 	 * @param $cat_id
 	 */
-	protected function _delete_category( $cat_id ) {
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_event_categories' );
+	protected function _delete_category($cat_id) {
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_event_categories');
 	}
 
 
@@ -2377,18 +2377,18 @@ 
 	/**
 	 * @param $new_category
 	 */
-	protected function _insert_or_update_category( $new_category ) {
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( true );
+	protected function _insert_or_update_category($new_category) {
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(true);
 		$success = 0; //we already have a success message so lets not send another.
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id,
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '', '', $query_args, true );
+		$this->_redirect_after_action($success, '', '', $query_args, true);
 	}
 
 
@@ -2397,14 +2397,14 @@ 
 	 * @param bool $update
 	 * @return bool|mixed|string
 	 */
-	private function _insert_category( $update = false ) {
+	private function _insert_category($update = false) {
 		$cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : '';
-		$category_name = isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc = isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
-		if ( empty( $category_name ) ) {
-			$msg = esc_html__( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
+		if (empty($category_name)) {
+			$msg = esc_html__('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$term_args = array(
@@ -2413,22 +2413,22 @@ 
 			'parent'      => $category_parent,
 		);
 		//was the category_identifier input disabled?
-		if ( isset( $this->_req_data['category_identifier'] ) ) {
+		if (isset($this->_req_data['category_identifier'])) {
 			$term_args['slug'] = $this->_req_data['category_identifier'];
 		}
 		$insert_ids = $update
-			? wp_update_term( $cat_id, 'espresso_event_categories', $term_args )
-			: wp_insert_term( $category_name, 'espresso_event_categories', $term_args );
-		if ( ! is_array( $insert_ids ) ) {
+			? wp_update_term($cat_id, 'espresso_event_categories', $term_args)
+			: wp_insert_term($category_name, 'espresso_event_categories', $term_args);
+		if ( ! is_array($insert_ids)) {
 			$msg = esc_html__(
 				'An error occurred and the category has not been saved to the database.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf( esc_html__( 'The category %s was successfully saved', 'event_espresso' ), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(esc_html__('The category %s was successfully saved', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 		return $cat_id;
 	}
@@ -2441,28 +2441,28 @@ 
 	 * @param bool $count
 	 * @return \EE_Base_Class[]|int
 	 */
-	public function get_categories( $per_page = 10, $current_page = 1, $count = false ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = false) {
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ( $current_page - 1 ) * $per_page;
-		$where = array( 'taxonomy' => 'espresso_event_categories' );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_event_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name'   => array( 'LIKE', $sstr ),
-				'description' => array( 'LIKE', $sstr ),
+				'Term.name'   => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr),
 			);
 		}
 		$query_params = array(
 			$where,
-			'order_by'   => array( $orderby => $order ),
-			'limit'      => $limit . ',' . $per_page,
-			'force_join' => array( 'Term' ),
+			'order_by'   => array($orderby => $order),
+			'limit'      => $limit.','.$per_page,
+			'force_join' => array('Term'),
 		);
 		$categories = $count
-			? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' )
-			: EEM_Term_Taxonomy::instance()->get_all( $query_params );
+			? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
+			: EEM_Term_Taxonomy::instance()->get_all($query_params);
 		return $categories;
 	}
 

caffeinated/admin/extend/events/Extend_Events_Admin_Page.core.php

Doc Comments +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
 
@@ -135,7 +135,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -178,7 +178,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row

Indentation +11 added lines, -11 removed lines

@@ -284,12 +284,12 @@ 
 			);
 			$title = esc_attr__( 'Duplicate Event', 'event_espresso' );
 			$return .= '<a href="'
-			           . $href
-			           . '" title="'
-			           . $title
-			           . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'
-			           . $title
-			           . '</button>';
+					   . $href
+					   . '" title="'
+					   . $title
+					   . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'
+					   . $title
+					   . '</button>';
 		}
 		return $return;
 	}
@@ -450,11 +450,11 @@ 
 			);
 			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
 			$action_links[] = '<a href="'
-			                  . $reports_link
-			                  . '" title="'
-			                  . esc_attr__( 'View Report', 'event_espresso' )
-			                  . '"><div class="dashicons dashicons-chart-bar"></div></a>'
-			                  . "\n\t";
+							  . $reports_link
+							  . '" title="'
+							  . esc_attr__( 'View Report', 'event_espresso' )
+							  . '"><div class="dashicons dashicons-chart-bar"></div></a>'
+							  . "\n\t";
 		}
 		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
 			EE_Registry::instance()->load_helper( 'MSG_Template' );

Spacing +234 added lines, -234 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 
@@ -21,26 +21,26 @@ 
 	 *
 	 * @param bool $routing
 	 */
-	public function __construct( $routing = true ) {
-		parent::__construct( $routing );
-		if ( ! defined( 'EVENTS_CAF_TEMPLATE_PATH' ) ) {
-			define( 'EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'events/templates/' );
-			define( 'EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'events/assets/' );
-			define( 'EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'events/assets/' );
+	public function __construct($routing = true) {
+		parent::__construct($routing);
+		if ( ! defined('EVENTS_CAF_TEMPLATE_PATH')) {
+			define('EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'events/templates/');
+			define('EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'events/assets/');
+			define('EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'events/assets/');
 		}
 	}
 
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'events';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'events';
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] )
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID'])
 			? $this->_req_data['EVT_ID']
 			: 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 		//tkt_id?
-		$tkt_id = ! empty( $this->_req_data['TKT_ID'] ) && ! is_array( $this->_req_data['TKT_ID'] )
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID'])
 			? $this->_req_data['TKT_ID']
 			: 0;
 		$new_page_routes = array(
@@ -59,13 +59,13 @@ 
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id'     => $tkt_id,
 				'noheader'   => true,
-				'args'       => array( 'trash' => true ),
+				'args'       => array('trash' => true),
 			),
 			'trash_tickets'            => array(
 				'func'       => '_trash_or_restore_ticket',
 				'capability' => 'ee_delete_default_tickets',
 				'noheader'   => true,
-				'args'       => array( 'trash' => true ),
+				'args'       => array('trash' => true),
 			),
 			'restore_ticket'           => array(
 				'func'       => '_trash_or_restore_ticket',
@@ -124,7 +124,7 @@ 
 				'noheader'   => true,
 			),
 		);
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 		//partial route/config override
 		$this->_page_config['import_events']['metaboxes'] = $this->_default_espresso_metaboxes;
 		$this->_page_config['create_new']['metaboxes'][] = '_premium_event_editor_meta_boxes';
@@ -134,15 +134,15 @@ 
 		$this->_page_config['default']['list_table'] = 'Extend_Events_Admin_List_Table';
 		//add tickets tab but only if there are more than one default ticket!
 		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(
-			array( array( 'TKT_is_default' => 1 ) ),
+			array(array('TKT_is_default' => 1)),
 			'TKT_ID',
 			true
 		);
-		if ( $tkt_count > 1 ) {
+		if ($tkt_count > 1) {
 			$new_page_config = array(
 				'ticket_list_table' => array(
 					'nav'           => array(
-						'label' => esc_html__( 'Default Tickets', 'event_espresso' ),
+						'label' => esc_html__('Default Tickets', 'event_espresso'),
 						'order' => 60,
 					),
 					'list_table'    => 'Tickets_List_Table',
@@ -153,53 +153,53 @@ 
 		//template settings
 		$new_page_config['template_settings'] = array(
 			'nav'           => array(
-				'label' => esc_html__( 'Templates', 'event_espresso' ),
+				'label' => esc_html__('Templates', 'event_espresso'),
 				'order' => 30,
 			),
-			'metaboxes'     => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+			'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 			'help_tabs'     => array(
 				'general_settings_templates_help_tab' => array(
-					'title'    => esc_html__( 'Templates', 'event_espresso' ),
+					'title'    => esc_html__('Templates', 'event_espresso'),
 					'filename' => 'general_settings_templates',
 				),
 			),
-			'help_tour'     => array( 'Templates_Help_Tour' ),
+			'help_tour'     => array('Templates_Help_Tour'),
 			'require_nonce' => false,
 		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 		//add filters and actions
 		//modifying _views
 		add_filter(
 			'FHEE_event_datetime_metabox_add_additional_date_time_template',
-			array( $this, 'add_additional_datetime_button' ),
+			array($this, 'add_additional_datetime_button'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE_event_datetime_metabox_clone_button_template',
-			array( $this, 'add_datetime_clone_button' ),
+			array($this, 'add_datetime_clone_button'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE_event_datetime_metabox_timezones_template',
-			array( $this, 'datetime_timezones_template' ),
+			array($this, 'datetime_timezones_template'),
 			10,
 			2
 		);
 		//filters for event list table
-		add_filter( 'FHEE__Extend_Events_Admin_List_Table__filters', array( $this, 'list_table_filters' ), 10, 2 );
+		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array($this, 'list_table_filters'), 10, 2);
 		add_filter(
 			'FHEE__Events_Admin_List_Table__column_actions__action_links',
-			array( $this, 'extra_list_table_actions' ),
+			array($this, 'extra_list_table_actions'),
 			10,
 			2
 		);
 		//legend item
-		add_filter( 'FHEE__Events_Admin_Page___event_legend_items__items', array( $this, 'additional_legend_items' ) );
-		add_action( 'admin_init', array( $this, 'admin_init' ) );
+		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array($this, 'additional_legend_items'));
+		add_action('admin_init', array($this, 'admin_init'));
 		//heartbeat stuff
-		add_filter( 'heartbeat_received', array( $this, 'heartbeat_response' ), 10, 2 );
+		add_filter('heartbeat_received', array($this, 'heartbeat_response'), 10, 2);
 	}
 
 
@@ -215,11 +215,11 @@ 
 					'Do you really want to delete this image? Please remember to update your event to complete the removal.',
 					'event_espresso'
 				),
-				'event_starts_on'        => esc_html__( 'Event Starts on', 'event_espresso' ),
-				'event_ends_on'          => esc_html__( 'Event Ends on', 'event_espresso' ),
-				'event_datetime_actions' => esc_html__( 'Actions', 'event_espresso' ),
-				'event_clone_dt_msg'     => esc_html__( 'Clone this Event Date and Time', 'event_espresso' ),
-				'remove_event_dt_msg'    => esc_html__( 'Remove this Event Time', 'event_espresso' ),
+				'event_starts_on'        => esc_html__('Event Starts on', 'event_espresso'),
+				'event_ends_on'          => esc_html__('Event Ends on', 'event_espresso'),
+				'event_datetime_actions' => esc_html__('Actions', 'event_espresso'),
+				'event_clone_dt_msg'     => esc_html__('Clone this Event Date and Time', 'event_espresso'),
+				'remove_event_dt_msg'    => esc_html__('Remove this Event Time', 'event_espresso'),
 			)
 		);
 	}
@@ -234,12 +234,12 @@ 
 	 * @param array $data     The incoming data package.
 	 * @return array  possibly appended response.
 	 */
-	public function heartbeat_response( $response, $data ) {
+	public function heartbeat_response($response, $data) {
 		/**
 		 * check whether count of tickets is approaching the potential
 		 * limits for the server.
 		 */
-		if ( ! empty( $data['input_count'] ) ) {
+		if ( ! empty($data['input_count'])) {
 			$response['max_input_vars_check'] = EE_Registry::instance()->CFG->environment->max_input_vars_limit_check(
 				$data['input_count']
 			);
@@ -262,15 +262,15 @@ 
 	 * @param string $new_slug
 	 * @return string
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
-		$return = parent::extra_permalink_field_buttons( $return, $id, $new_title, $new_slug );
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
+		$return = parent::extra_permalink_field_buttons($return, $id, $new_title, $new_slug);
 		//make sure this is only when editing
-		if ( ! empty( $id ) ) {
+		if ( ! empty($id)) {
 			$href = EE_Admin_Page::add_query_args_and_nonce(
-				array( 'action' => 'duplicate_event', 'EVT_ID' => $id ),
+				array('action' => 'duplicate_event', 'EVT_ID' => $id),
 				$this->_admin_base_url
 			);
-			$title = esc_attr__( 'Duplicate Event', 'event_espresso' );
+			$title = esc_attr__('Duplicate Event', 'event_espresso');
 			$return .= '<a href="'
 			           . $href
 			           . '" title="'
@@ -288,19 +288,19 @@ 
 		$this->_views = array(
 			'all'     => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'All', 'event_espresso' ),
+				'label'       => esc_html__('All', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_tickets' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_tickets' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'trashed' => array(
 				'slug'        => 'trashed',
-				'label'       => esc_html__( 'Trash', 'event_espresso' ),
+				'label'       => esc_html__('Trash', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'restore_tickets' => esc_html__( 'Restore from Trash', 'event_espresso' ),
-					'delete_tickets'  => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'restore_tickets' => esc_html__('Restore from Trash', 'event_espresso'),
+					'delete_tickets'  => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			),
 		);
@@ -311,19 +311,19 @@ 
 	public function load_scripts_styles_edit() {
 		wp_register_script(
 			'ee-event-editor-heartbeat',
-			EVENTS_CAF_ASSETS_URL . 'event-editor-heartbeat.js',
-			array( 'ee_admin_js', 'heartbeat' ),
+			EVENTS_CAF_ASSETS_URL.'event-editor-heartbeat.js',
+			array('ee_admin_js', 'heartbeat'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
 		/**
 		 * load accounting js.
 		 */
-		add_filter( 'FHEE_load_accounting_js', '__return_true' );
+		add_filter('FHEE_load_accounting_js', '__return_true');
 		//styles
-		wp_enqueue_style( 'espresso-ui-theme' );
-		wp_enqueue_script( 'event_editor_js' );
-		wp_enqueue_script( 'ee-event-editor-heartbeat' );
+		wp_enqueue_style('espresso-ui-theme');
+		wp_enqueue_script('event_editor_js');
+		wp_enqueue_script('ee-event-editor-heartbeat');
 	}
 
 
@@ -333,9 +333,9 @@ 
 	 * @param $template_args
 	 * @return mixed
 	 */
-	public function add_additional_datetime_button( $template, $template_args ) {
+	public function add_additional_datetime_button($template, $template_args) {
 		return EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_add_additional_time.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_datetime_add_additional_time.template.php',
 			$template_args,
 			true
 		);
@@ -348,9 +348,9 @@ 
 	 * @param $template_args
 	 * @return mixed
 	 */
-	public function add_datetime_clone_button( $template, $template_args ) {
+	public function add_datetime_clone_button($template, $template_args) {
 		return EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_metabox_clone_button.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_datetime_metabox_clone_button.template.php',
 			$template_args,
 			true
 		);
@@ -363,9 +363,9 @@ 
 	 * @param $template_args
 	 * @return mixed
 	 */
-	public function datetime_timezones_template( $template, $template_args ) {
+	public function datetime_timezones_template($template, $template_args) {
 		return EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_timezones.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_datetime_timezones.template.php',
 			$template_args,
 			true
 		);
@@ -378,22 +378,22 @@ 
 		$new_views = array(
 			'today' => array(
 				'slug'        => 'today',
-				'label'       => esc_html__( 'Today', 'event_espresso' ),
+				'label'       => esc_html__('Today', 'event_espresso'),
 				'count'       => $this->total_events_today(),
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'month' => array(
 				'slug'        => 'month',
-				'label'       => esc_html__( 'This Month', 'event_espresso' ),
+				'label'       => esc_html__('This Month', 'event_espresso'),
 				'count'       => $this->total_events_this_month(),
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 		);
-		$this->_views = array_merge( $this->_views, $new_views );
+		$this->_views = array_merge($this->_views, $new_views);
 	}
 
 
@@ -403,7 +403,7 @@ 
 	 * @param \EE_Event $event
 	 * @return array
 	 */
-	public function extra_list_table_actions( array $action_links, \EE_Event $event ) {
+	public function extra_list_table_actions(array $action_links, \EE_Event $event) {
 		if (
 			EE_Registry::instance()->CAP->current_user_can(
 				'ee_read_registrations',
@@ -415,20 +415,20 @@ 
 				'action' => 'reports',
 				'EVT_ID' => $event->ID(),
 			);
-			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
+			$reports_link = EE_Admin_Page::add_query_args_and_nonce($reports_query_args, REG_ADMIN_URL);
 			$action_links[] = '<a href="'
 			                  . $reports_link
 			                  . '" title="'
-			                  . esc_attr__( 'View Report', 'event_espresso' )
+			                  . esc_attr__('View Report', 'event_espresso')
 			                  . '"><div class="dashicons dashicons-chart-bar"></div></a>'
 			                  . "\n\t";
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			EE_Registry::instance()->load_helper('MSG_Template');
 			$action_links[] = EEH_MSG_Template::get_message_action_link(
 				'see_notifications_for',
 				null,
-				array( 'EVT_ID' => $event->ID() )
+				array('EVT_ID' => $event->ID())
 			);
 		}
 		return $action_links;
@@ -440,7 +440,7 @@ 
 	 * @param $items
 	 * @return mixed
 	 */
-	public function additional_legend_items( $items ) {
+	public function additional_legend_items($items) {
 		if (
 			EE_Registry::instance()->CAP->current_user_can(
 				'ee_read_registrations',
@@ -449,12 +449,12 @@ 
 		) {
 			$items['reports'] = array(
 				'class' => 'dashicons dashicons-chart-bar',
-				'desc'  => esc_html__( 'Event Reports', 'event_espresso' ),
+				'desc'  => esc_html__('Event Reports', 'event_espresso'),
 			);
 		}
-		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'],
@@ -480,7 +480,7 @@ 
 	protected function _duplicate_event() {
 		// first make sure the ID for the event is in the request.
 		//  If it isn't then we need to bail and redirect back to overview list table (cause how did we get here?)
-		if ( ! isset( $this->_req_data['EVT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_ID'])) {
 			EE_Error::add_error(
 				esc_html__(
 					'In order to duplicate an event an Event ID is required.  None was given.',
@@ -490,15 +490,15 @@ 
 				__FUNCTION__,
 				__LINE__
 			);
-			$this->_redirect_after_action( false, '', '', array(), true );
+			$this->_redirect_after_action(false, '', '', array(), true);
 			return;
 		}
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
-		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
-		if ( ! $orig_event instanceof EE_Event ) {
+		$orig_event = EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']);
+		if ( ! $orig_event instanceof EE_Event) {
 			throw new EE_Error(
 				sprintf(
-					esc_html__( 'An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso' ),
+					esc_html__('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'),
 					$this->_req_data['EVT_ID']
 				)
 			);
@@ -506,56 +506,56 @@ 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
 		//original datetimes
-		$orig_datetimes = $orig_event->get_many_related( 'Datetime' );
+		$orig_datetimes = $orig_event->get_many_related('Datetime');
 		//other original relations
-		$orig_ven = $orig_event->get_many_related( 'Venue' );
+		$orig_ven = $orig_event->get_many_related('Venue');
 		//reset the ID and modify other details to make it clear this is a dupe
-		$new_event->set( 'EVT_ID', 0 );
-		$new_name = $new_event->name() . ' ' . esc_html__( '**DUPLICATE**', 'event_espresso' );
-		$new_event->set( 'EVT_name', $new_name );
+		$new_event->set('EVT_ID', 0);
+		$new_name = $new_event->name().' '.esc_html__('**DUPLICATE**', 'event_espresso');
+		$new_event->set('EVT_name', $new_name);
 		$new_event->set(
 			'EVT_slug',
 			wp_unique_post_slug(
-				sanitize_title( $orig_event->name() ),
+				sanitize_title($orig_event->name()),
 				0,
 				'publish',
 				'espresso_events',
 				0
 			)
 		);
-		$new_event->set( 'status', 'draft' );
+		$new_event->set('status', 'draft');
 		//duplicate discussion settings
-		$new_event->set( 'comment_status', $orig_event->get( 'comment_status' ) );
-		$new_event->set( 'ping_status', $orig_event->get( 'ping_status' ) );
+		$new_event->set('comment_status', $orig_event->get('comment_status'));
+		$new_event->set('ping_status', $orig_event->get('ping_status'));
 		//save the new event
 		$new_event->save();
 		//venues
-		foreach ( $orig_ven as $ven ) {
-			$new_event->_add_relation_to( $ven, 'Venue' );
+		foreach ($orig_ven as $ven) {
+			$new_event->_add_relation_to($ven, 'Venue');
 		}
 		$new_event->save();
 		//now we need to get the question group relations and handle that
 		//first primary question groups
 		$orig_primary_qgs = $orig_event->get_many_related(
 			'Question_Group',
-			array( array( 'Event_Question_Group.EQG_primary' => 1 ) )
+			array(array('Event_Question_Group.EQG_primary' => 1))
 		);
-		if ( ! empty( $orig_primary_qgs ) ) {
-			foreach ( $orig_primary_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 1 ) );
+		if ( ! empty($orig_primary_qgs)) {
+			foreach ($orig_primary_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 1));
 				}
 			}
 		}
 		//next additional attendee question groups
 		$orig_additional_qgs = $orig_event->get_many_related(
 			'Question_Group',
-			array( array( 'Event_Question_Group.EQG_primary' => 0 ) )
+			array(array('Event_Question_Group.EQG_primary' => 0))
 		);
-		if ( ! empty( $orig_additional_qgs ) ) {
-			foreach ( $orig_additional_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 0 ) );
+		if ( ! empty($orig_additional_qgs)) {
+			foreach ($orig_additional_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 0));
 				}
 			}
 		}
@@ -563,70 +563,70 @@ 
 		$new_event->save();
 		//k now that we have the new event saved we can loop through the datetimes and start adding relations.
 		$cloned_tickets = array();
-		foreach ( $orig_datetimes as $orig_dtt ) {
-			if ( ! $orig_dtt instanceof EE_Datetime ) {
+		foreach ($orig_datetimes as $orig_dtt) {
+			if ( ! $orig_dtt instanceof EE_Datetime) {
 				continue;
 			}
 			$new_dtt = clone $orig_dtt;
 			$orig_tkts = $orig_dtt->tickets();
 			//save new dtt then add to event
-			$new_dtt->set( 'DTT_ID', 0 );
-			$new_dtt->set( 'DTT_sold', 0 );
+			$new_dtt->set('DTT_ID', 0);
+			$new_dtt->set('DTT_sold', 0);
 			$new_dtt->save();
-			$new_event->_add_relation_to( $new_dtt, 'Datetime' );
+			$new_event->_add_relation_to($new_dtt, 'Datetime');
 			$new_event->save();
 			//now let's get the ticket relations setup.
-			foreach ( (array) $orig_tkts as $orig_tkt ) {
+			foreach ((array) $orig_tkts as $orig_tkt) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket ) {
+				if ( ! $orig_tkt instanceof EE_Ticket) {
 					continue;
 				}
 				//is this ticket archived?  If it is then let's skip
-				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
+				if ($orig_tkt->get('TKT_deleted')) {
 					continue;
 				}
 				// does this original ticket already exist in the clone_tickets cache?
 				//  If so we'll just use the new ticket from it.
-				if ( isset( $cloned_tickets[ $orig_tkt->ID() ] ) ) {
-					$new_tkt = $cloned_tickets[ $orig_tkt->ID() ];
+				if (isset($cloned_tickets[$orig_tkt->ID()])) {
+					$new_tkt = $cloned_tickets[$orig_tkt->ID()];
 				} else {
 					$new_tkt = clone $orig_tkt;
 					//get relations on the $orig_tkt that we need to setup.
 					$orig_prices = $orig_tkt->prices();
-					$new_tkt->set( 'TKT_ID', 0 );
-					$new_tkt->set( 'TKT_sold', 0 );
+					$new_tkt->set('TKT_ID', 0);
+					$new_tkt->set('TKT_sold', 0);
 					$new_tkt->save(); //make sure new ticket has ID.
 					//price relations on new ticket need to be setup.
-					foreach ( $orig_prices as $orig_price ) {
+					foreach ($orig_prices as $orig_price) {
 						$new_price = clone $orig_price;
-						$new_price->set( 'PRC_ID', 0 );
+						$new_price->set('PRC_ID', 0);
 						$new_price->save();
-						$new_tkt->_add_relation_to( $new_price, 'Price' );
+						$new_tkt->_add_relation_to($new_price, 'Price');
 						$new_tkt->save();
 					}
 				}
 				// k now we can add the new ticket as a relation to the new datetime
 				// and make sure its added to our cached $cloned_tickets array
 				// for use with later datetimes that have the same ticket.
-				$new_dtt->_add_relation_to( $new_tkt, 'Ticket' );
+				$new_dtt->_add_relation_to($new_tkt, 'Ticket');
 				$new_dtt->save();
-				$cloned_tickets[ $orig_tkt->ID() ] = $new_tkt;
+				$cloned_tickets[$orig_tkt->ID()] = $new_tkt;
 			}
 		}
 		//clone taxonomy information
 		$taxonomies_to_clone_with = apply_filters(
 			'FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone',
-			array( 'espresso_event_categories', 'espresso_event_type', 'post_tag' )
+			array('espresso_event_categories', 'espresso_event_type', 'post_tag')
 		);
 		//get terms for original event (notice)
-		$orig_terms = wp_get_object_terms( $orig_event->ID(), $taxonomies_to_clone_with );
+		$orig_terms = wp_get_object_terms($orig_event->ID(), $taxonomies_to_clone_with);
 		//loop through terms and add them to new event.
-		foreach ( $orig_terms as $term ) {
-			wp_set_object_terms( $new_event->ID(), $term->term_id, $term->taxonomy, true );
+		foreach ($orig_terms as $term) {
+			wp_set_object_terms($new_event->ID(), $term->term_id, $term->taxonomy, true);
 		}
-		do_action( 'AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event );
+		do_action('AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event);
 		//now let's redirect to the edit page for this duplicated event if we have a new event id.
-		if ( $new_event->ID() ) {
+		if ($new_event->ID()) {
 			$redirect_args = array(
 				'post'   => $new_event->ID(),
 				'action' => 'edit',
@@ -642,19 +642,19 @@ 
 				'action' => 'default',
 			);
 			EE_Error::add_error(
-				esc_html__( 'Not able to duplicate event.  Something went wrong.', 'event_espresso' ),
+				esc_html__('Not able to duplicate event.  Something went wrong.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
 			);
 		}
-		$this->_redirect_after_action( false, '', '', $redirect_args, true );
+		$this->_redirect_after_action(false, '', '', $redirect_args, true);
 	}
 
 
 
 	protected function _import_page() {
-		$title = esc_html__( 'Import', 'event_espresso' );
+		$title = esc_html__('Import', 'event_espresso');
 		$intro = esc_html__(
 			'If you have a previously exported Event Espresso 4 information in a Comma Separated Value (CSV) file format, you can upload the file here: ',
 			'event_espresso'
@@ -662,13 +662,13 @@ 
 		$form_url = EVENTS_ADMIN_URL;
 		$action = 'import_events';
 		$type = 'csv';
-		$this->_template_args['form'] = EE_Import::instance()->upload_form( $title, $intro, $form_url, $action, $type );
+		$this->_template_args['form'] = EE_Import::instance()->upload_form($title, $intro, $form_url, $action, $type);
 		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'sample_export_file' ),
+			array('action' => 'sample_export_file'),
 			$this->_admin_base_url
 		);
 		$content = EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'import_page.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'import_page.template.php',
 			$this->_template_args,
 			true
 		);
@@ -685,9 +685,9 @@ 
 	 * @return void
 	 */
 	protected function _import_events() {
-		require_once( EE_CLASSES . 'EE_Import.class.php' );
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		$success = EE_Import::instance()->import();
-		$this->_redirect_after_action( $success, 'Import File', 'ran', array( 'action' => 'import_page' ), true );
+		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'), true);
 	}
 
 
@@ -700,9 +700,9 @@ 
 	 * @return void
 	 */
 	protected function _events_export() {
-		if ( isset( $this->_req_data['EVT_ID'] ) ) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			$event_ids = $this->_req_data['EVT_ID'];
-		} elseif ( isset( $this->_req_data['EVT_IDs'] ) ) {
+		} elseif (isset($this->_req_data['EVT_IDs'])) {
 			$event_ids = $this->_req_data['EVT_IDs'];
 		} else {
 			$event_ids = null;
@@ -713,10 +713,10 @@ 
 			'action' => 'all_event_data',
 			'EVT_ID' => $event_ids,
 		);
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php' ) ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php' );
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 	}
@@ -735,10 +735,10 @@ 
 			'action'       => 'categories',
 			'category_ids' => $this->_req_data['EVT_CAT_ID'],
 		);
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php' ) ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php' );
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 	}
@@ -766,10 +766,10 @@ 
 			'FHEE__General_Settings_Admin_Page__template_settings__template_args',
 			$this->_template_args
 		);
-		$this->_set_add_edit_form_tags( 'update_template_settings' );
-		$this->_set_publish_post_box_vars( null, false, false, null, false );
+		$this->_set_add_edit_form_tags('update_template_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'template_settings.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'template_settings.template.php',
 			$this->_template_args,
 			true
 		);
@@ -790,9 +790,9 @@ 
 		);
 		//update custom post type slugs and detect if we need to flush rewrite rules
 		$old_slug = EE_Registry::instance()->CFG->core->event_cpt_slug;
-		EE_Registry::instance()->CFG->core->event_cpt_slug = empty( $this->_req_data['event_cpt_slug'] )
+		EE_Registry::instance()->CFG->core->event_cpt_slug = empty($this->_req_data['event_cpt_slug'])
 			? EE_Registry::instance()->CFG->core->event_cpt_slug
-			: sanitize_title_with_dashes( $this->_req_data['event_cpt_slug'] );
+			: sanitize_title_with_dashes($this->_req_data['event_cpt_slug']);
 		$what = 'Template Settings';
 		$success = $this->_update_espresso_configuration(
 			$what,
@@ -801,10 +801,10 @@ 
 			__FUNCTION__,
 			__LINE__
 		);
-		if ( EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug ) {
-			update_option( 'ee_flush_rewrite_rules', true );
+		if (EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug) {
+			update_option('ee_flush_rewrite_rules', true);
 		}
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'template_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'template_settings'));
 	}
 
 
@@ -820,8 +820,8 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			esc_html__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			esc_html__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'core'
@@ -837,8 +837,8 @@ 
 	 */
 	public function registration_options_meta_box() {
 		$yes_no_values = array(
-			array( 'id' => true, 'text' => esc_html__( 'Yes', 'event_espresso' ) ),
-			array( 'id' => false, 'text' => esc_html__( 'No', 'event_espresso' ) ),
+			array('id' => true, 'text' => esc_html__('Yes', 'event_espresso')),
+			array('id' => false, 'text' => esc_html__('No', 'event_espresso')),
 		);
 		$default_reg_status_values = EEM_Registration::reg_status_array(
 			array(
@@ -849,7 +849,7 @@ 
 			),
 			true
 		);
-		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status( false );
+		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(false);
 		$template_args['_event'] = $this->_cpt_model_obj;
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input(
@@ -883,7 +883,7 @@ 
 			$default_reg_status_values
 		);
 		EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_registration_options.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_registration_options.template.php',
 			$template_args
 		);
 	}
@@ -901,20 +901,20 @@ 
 	 * @param  array $list_table_obj the list table object
 	 * @return array                  new filters
 	 */
-	public function list_table_filters( $old_filters, $list_table_obj ) {
+	public function list_table_filters($old_filters, $list_table_obj) {
 		$filters = array();
 		//first month/year filters
 		$filters[] = $this->espresso_event_months_dropdown();
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//active status dropdown
-		if ( $status !== 'draft' ) {
+		if ($status !== 'draft') {
 			$filter[] = $this->active_status_dropdown(
-				isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : ''
+				isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : ''
 			);
 		}
 		//category filter
 		$filters[] = $this->category_dropdown();
-		return array_merge( $old_filters, $filters );
+		return array_merge($old_filters, $filters);
 	}
 
 
@@ -928,15 +928,15 @@ 
 	public function espresso_event_months_dropdown() {
 		// what we need to do is get all PRIMARY datetimes for all events to filter on.
 		// Note we need to include any other filters that are set!
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0
 			? $this->_req_data['EVT_CAT']
 			: null;
 		//active status?
-		$active_status = isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : null;
-		$cur_date = isset( $this->_req_data['month_range'] ) ? $this->_req_data['month_range'] : '';
-		return EEH_Form_Fields::generate_event_months_dropdown( $cur_date, $status, $category, $active_status );
+		$active_status = isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : null;
+		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
+		return EEH_Form_Fields::generate_event_months_dropdown($cur_date, $status, $category, $active_status);
 	}
 
 
@@ -947,18 +947,18 @@ 
 	 * @param  string $current_value whatever the current active status is
 	 * @return string
 	 */
-	public function active_status_dropdown( $current_value = '' ) {
+	public function active_status_dropdown($current_value = '') {
 		$select_name = 'active_status';
 		$values = array(
-			'none'     => esc_html__( 'Show Active/Inactive', 'event_espresso' ),
-			'active'   => esc_html__( 'Active', 'event_espresso' ),
-			'upcoming' => esc_html__( 'Upcoming', 'event_espresso' ),
-			'expired'  => esc_html__( 'Expired', 'event_espresso' ),
-			'inactive' => esc_html__( 'Inactive', 'event_espresso' ),
+			'none'     => esc_html__('Show Active/Inactive', 'event_espresso'),
+			'active'   => esc_html__('Active', 'event_espresso'),
+			'upcoming' => esc_html__('Upcoming', 'event_espresso'),
+			'expired'  => esc_html__('Expired', 'event_espresso'),
+			'inactive' => esc_html__('Inactive', 'event_espresso'),
 		);
 		$id = 'id="espresso-active-status-dropdown-filter"';
 		$class = 'wide';
-		return EEH_Form_Fields::select_input( $select_name, $values, $current_value, $id, $class );
+		return EEH_Form_Fields::select_input($select_name, $values, $current_value, $id, $class);
 	}
 
 
@@ -970,8 +970,8 @@ 
 	 * @return string html
 	 */
 	public function category_dropdown() {
-		$cur_cat = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
-		return EEH_Form_Fields::generate_event_category_dropdown( $cur_cat );
+		$cur_cat = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
+		return EEH_Form_Fields::generate_event_category_dropdown($cur_cat);
 	}
 
 
@@ -985,20 +985,20 @@ 
 	public function total_events_today() {
 		$start = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			date( 'Y-m-d' ) . ' 00:00:00',
+			date('Y-m-d').' 00:00:00',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$end = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			date( 'Y-m-d' ) . ' 23:59:59',
+			date('Y-m-d').' 23:59:59',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array( $start, $end ) ),
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end)),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1012,25 +1012,25 @@ 
 	 */
 	public function total_events_this_month() {
 		//Dates
-		$this_year_r = date( 'Y' );
-		$this_month_r = date( 'm' );
-		$days_this_month = date( 't' );
+		$this_year_r = date('Y');
+		$this_month_r = date('m');
+		$days_this_month = date('t');
 		$start = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			$this_year_r . '-' . $this_month_r . '-01 00:00:00',
+			$this_year_r.'-'.$this_month_r.'-01 00:00:00',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$end = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			$this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' 23:59:59',
+			$this_year_r.'-'.$this_month_r.'-'.$days_this_month.' 23:59:59',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array( $start, $end ) ),
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end)),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1038,7 +1038,7 @@ 
 
 	/** DEFAULT TICKETS STUFF **/
 	public function _tickets_overview_list_table() {
-		$this->_search_btn_label = esc_html__( 'Tickets', 'event_espresso' );
+		$this->_search_btn_label = esc_html__('Tickets', 'event_espresso');
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -1050,46 +1050,46 @@ 
 	 * @param bool $trashed
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_default_tickets( $per_page = 10, $count = false, $trashed = false ) {
-		$orderby = empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $this->_req_data['order'];
-		switch ( $orderby ) {
+	public function get_default_tickets($per_page = 10, $count = false, $trashed = false) {
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $this->_req_data['order'];
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
 			? $this->_req_data['paged']
 			: 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && ! empty( $this->_req_data['perpage'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $per_page;
 		$_where = array(
 			'TKT_is_default' => 1,
 			'TKT_deleted'    => $trashed,
 		);
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = array( $offset, $per_page );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'TKT_name'        => array( 'LIKE', $sstr ),
-				'TKT_description' => array( 'LIKE', $sstr ),
+				'TKT_name'        => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr),
 			);
 		}
 		$query_params = array(
@@ -1098,10 +1098,10 @@ 
 			'limit'    => $limit,
 			'group_by' => 'TKT_ID',
 		);
-		if ( $count ) {
-			return EEM_Ticket::instance()->count_deleted_and_undeleted( array( $_where ) );
+		if ($count) {
+			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
 		} else {
-			return EEM_Ticket::instance()->get_all_deleted_and_undeleted( $query_params );
+			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
 
@@ -1110,34 +1110,34 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_ticket( $trash = false ) {
+	protected function _trash_or_restore_ticket($trash = false) {
 		$success = 1;
 		$TKT = EEM_Ticket::instance();
 		//checkboxes?
-		if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID)) {
 						$success = 0;
 					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+					if ( ! $TKT->restore_by_ID($TKT_ID)) {
 						$success = 0;
 					}
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID)) {
 					$success = 0;
 				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+				if ( ! $TKT->restore_by_ID($TKT_ID)) {
 					$success = 0;
 				}
 			}
@@ -1147,7 +1147,7 @@ 
 			'action' => 'ticket_list_table',
 			'status' => $trash ? '' : 'trashed',
 		);
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1155,20 +1155,20 @@ 
 	protected function _delete_ticket() {
 		$success = 1;
 		//checkboxes?
-		if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 				$success = 0;
 			}
 		}
@@ -1178,15 +1178,15 @@ 
 			'status' => 'trashed',
 		);
 		//fail safe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted(
-			array( array( 'TKT_is_default' => 1 ) ),
+		if (EEM_Ticket::instance()->count_deleted_and_undeleted(
+			array(array('TKT_is_default' => 1)),
 			'TKT_ID',
 			true
 		)
 		) {
 			$query_args = array();
 		}
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1195,11 +1195,11 @@ 
 	 * @param int $TKT_ID
 	 * @return bool|int
 	 */
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
-		$tkt->_remove_relations( 'Datetime' );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
+		$tkt->_remove_relations('Datetime');
 		//delete all related prices first
-		$tkt->delete_related_permanently( 'Price' );
+		$tkt->delete_related_permanently('Price');
 		return $tkt->delete_permanently();
 	}
 

modules/single_page_checkout/EED_Single_Page_Checkout.module.php

Doc Comments +2 added lines, -2 removed lines

@@ -690,7 +690,7 @@ 
 	 * _get_transaction_and_cart_for_previous_visit
 	 *
 	 * @access private
-	 * 	@return mixed EE_Transaction|NULL
+	 * 	@return EE_Transaction|null EE_Transaction|NULL
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
@@ -768,7 +768,7 @@ 
 	 * 	generates a new EE_Transaction object and adds it to the $_transaction property.
 	 *
 	 * 	@access private
-	 * 	@return mixed EE_Transaction|NULL
+	 * 	@return EE_Transaction|null EE_Transaction|NULL
 	 */
 	private function _initialize_transaction() {
 		try {

Spacing +261 added lines, -261 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\domain\services\capabilities\PublicCapabilities;
 use EventEspresso\core\exceptions\InvalidEntityException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * Single Page Checkout (SPCO)
  *
@@ -50,8 +50,8 @@ 
 	 * @return EED_Single_Page_Checkout
 	 */
 	public static function instance() {
-		add_filter( 'EED_Single_Page_Checkout__SPCO_active', '__return_true' );
-		return parent::get_instance( __CLASS__ );
+		add_filter('EED_Single_Page_Checkout__SPCO_active', '__return_true');
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -96,22 +96,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		EED_Single_Page_Checkout::set_definitions();
-		if ( defined( 'DOING_AJAX' )) {
+		if (defined('DOING_AJAX')) {
 			// going to start an output buffer in case anything gets accidentally output that might disrupt our JSON response
 			ob_start();
 			EED_Single_Page_Checkout::load_request_handler();
 			EED_Single_Page_Checkout::load_reg_steps();
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 		}
 		// set ajax hooks
-		add_action( 'wp_ajax_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_nopriv_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_nopriv_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
-		add_action( 'wp_ajax_nopriv_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
+		add_action('wp_ajax_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_nopriv_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_nopriv_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
+		add_action('wp_ajax_nopriv_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @param string $ajax_action
 	 * @throws \EE_Error
 	 */
-	public static function process_ajax_request( $ajax_action ) {
-		EE_Registry::instance()->REQ->set( 'action', $ajax_action );
+	public static function process_ajax_request($ajax_action) {
+		EE_Registry::instance()->REQ->set('action', $ajax_action);
 		EED_Single_Page_Checkout::instance()->_initialize();
 	}
 
@@ -135,7 +135,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function display_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'display_spco_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('display_spco_reg_step');
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function process_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'process_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('process_reg_step');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('update_reg_step');
 	}
 
 
@@ -170,7 +170,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_checkout() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_checkout' );
+		EED_Single_Page_Checkout::process_ajax_request('update_checkout');
 	}
 
 
@@ -183,8 +183,8 @@ 
 	 */
 	public static function load_request_handler() {
 		// load core Request_Handler class
-		if ( ! isset( EE_Registry::instance()->REQ )) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! isset(EE_Registry::instance()->REQ)) {
+			EE_Registry::instance()->load_core('Request_Handler');
 		}
 	}
 
@@ -198,14 +198,14 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function set_definitions() {
-		define( 'SPCO_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'SPCO_CSS_URL', plugin_dir_url( __FILE__ ) . 'css' . DS );
-		define( 'SPCO_IMG_URL', plugin_dir_url( __FILE__ ) . 'img' . DS );
-		define( 'SPCO_JS_URL', plugin_dir_url( __FILE__ ) . 'js' . DS );
-		define( 'SPCO_INC_PATH', SPCO_BASE_PATH . 'inc' . DS );
-		define( 'SPCO_REG_STEPS_PATH', SPCO_BASE_PATH . 'reg_steps' . DS );
-		define( 'SPCO_TEMPLATES_PATH', SPCO_BASE_PATH . 'templates' . DS );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( SPCO_BASE_PATH, TRUE );
+		define('SPCO_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('SPCO_CSS_URL', plugin_dir_url(__FILE__).'css'.DS);
+		define('SPCO_IMG_URL', plugin_dir_url(__FILE__).'img'.DS);
+		define('SPCO_JS_URL', plugin_dir_url(__FILE__).'js'.DS);
+		define('SPCO_INC_PATH', SPCO_BASE_PATH.'inc'.DS);
+		define('SPCO_REG_STEPS_PATH', SPCO_BASE_PATH.'reg_steps'.DS);
+		define('SPCO_TEMPLATES_PATH', SPCO_BASE_PATH.'templates'.DS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(SPCO_BASE_PATH, TRUE);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public static function load_reg_steps() {
 		static $reg_steps_loaded = FALSE;
-		if ( $reg_steps_loaded ) {
+		if ($reg_steps_loaded) {
 			return;
 		}
 		// filter list of reg_steps
@@ -229,24 +229,24 @@ 
 			EED_Single_Page_Checkout::get_reg_steps()
 		);
 		// sort by key (order)
-		ksort( $reg_steps_to_load );
+		ksort($reg_steps_to_load);
 		// loop through folders
-		foreach ( $reg_steps_to_load as $order => $reg_step ) {
+		foreach ($reg_steps_to_load as $order => $reg_step) {
 			// we need a
-			if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+			if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 				// copy over to the reg_steps_array
-				EED_Single_Page_Checkout::$_reg_steps_array[ $order ] = $reg_step;
+				EED_Single_Page_Checkout::$_reg_steps_array[$order] = $reg_step;
 				// register custom key route for each reg step
 				// ie: step=>"slug" - this is the entire reason we load the reg steps array now
-				EE_Config::register_route( $reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step' );
+				EE_Config::register_route($reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step');
 				// add AJAX or other hooks
-				if ( isset( $reg_step['has_hooks'] ) && $reg_step['has_hooks'] ) {
+				if (isset($reg_step['has_hooks']) && $reg_step['has_hooks']) {
 					// setup autoloaders if necessary
-					if ( ! class_exists( $reg_step['class_name'] )) {
-						EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $reg_step['file_path'], TRUE );
+					if ( ! class_exists($reg_step['class_name'])) {
+						EEH_Autoloader::register_autoloaders_for_each_file_in_folder($reg_step['file_path'], TRUE);
 					}
-					if ( is_callable( $reg_step['class_name'], 'set_hooks' )) {
-						call_user_func( array( $reg_step['class_name'], 'set_hooks' ));
+					if (is_callable($reg_step['class_name'], 'set_hooks')) {
+						call_user_func(array($reg_step['class_name'], 'set_hooks'));
 					}
 				}
 			}
@@ -265,28 +265,28 @@ 
 	 */
 	public static function get_reg_steps() {
 		$reg_steps = EE_Registry::instance()->CFG->registration->reg_steps;
-		if ( empty( $reg_steps )) {
+		if (empty($reg_steps)) {
 			$reg_steps = array(
 				10 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'attendee_information',
+					'file_path' => SPCO_REG_STEPS_PATH.'attendee_information',
 					'class_name' => 'EE_SPCO_Reg_Step_Attendee_Information',
 					'slug' => 'attendee_information',
 					'has_hooks' => FALSE
 				),
 				20 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'registration_confirmation',
+					'file_path' => SPCO_REG_STEPS_PATH.'registration_confirmation',
 					'class_name' => 'EE_SPCO_Reg_Step_Registration_Confirmation',
 					'slug' => 'registration_confirmation',
 					'has_hooks' => FALSE
 				),
 				30 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'payment_options',
+					'file_path' => SPCO_REG_STEPS_PATH.'payment_options',
 					'class_name' => 'EE_SPCO_Reg_Step_Payment_Options',
 					'slug' => 'payment_options',
 					'has_hooks' => TRUE
 				),
 				999 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'finalize_registration',
+					'file_path' => SPCO_REG_STEPS_PATH.'finalize_registration',
 					'class_name' => 'EE_SPCO_Reg_Step_Finalize_Registration',
 					'slug' => 'finalize_registration',
 					'has_hooks' => FALSE
@@ -307,9 +307,9 @@ 
 	 */
 	public static function registration_checkout_for_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'display_spco_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', false );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'display_spco_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', false);
 		EED_Single_Page_Checkout::instance()->_initialize();
 		EED_Single_Page_Checkout::instance()->_display_spco_reg_form();
 		return EE_Registry::instance()->REQ->get_output();
@@ -326,15 +326,15 @@ 
 	 */
 	public static function process_registration_from_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'process_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', true );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'process_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', true);
 		EED_Single_Page_Checkout::instance()->_initialize();
-		if ( EED_Single_Page_Checkout::instance()->checkout->current_step->completed() ) {
-			$final_reg_step = end( EED_Single_Page_Checkout::instance()->checkout->reg_steps );
-			if ( $final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
-				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated( $final_reg_step );
-				if ( $final_reg_step->process_reg_step() ) {
+		if (EED_Single_Page_Checkout::instance()->checkout->current_step->completed()) {
+			$final_reg_step = end(EED_Single_Page_Checkout::instance()->checkout->reg_steps);
+			if ($final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
+				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated($final_reg_step);
+				if ($final_reg_step->process_reg_step()) {
 					$final_reg_step->set_completed();
 					EED_Single_Page_Checkout::instance()->checkout->update_txn_reg_steps_array();
 					return EED_Single_Page_Checkout::instance()->checkout->transaction;
@@ -354,11 +354,11 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public function run( $WP_Query ) {
+	public function run($WP_Query) {
 		if (
 			$WP_Query instanceof WP_Query
 			&& $WP_Query->is_main_query()
-			&& apply_filters( 'FHEE__EED_Single_Page_Checkout__run', true )
+			&& apply_filters('FHEE__EED_Single_Page_Checkout__run', true)
 		) {
 			$this->_initialize();
 		}
@@ -374,8 +374,8 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public static function init( $WP_Query ) {
-		EED_Single_Page_Checkout::instance()->run( $WP_Query );
+	public static function init($WP_Query) {
+		EED_Single_Page_Checkout::instance()->run($WP_Query);
 	}
 
 
@@ -389,34 +389,34 @@ 
 	 */
 	private function _initialize() {
 		// ensure SPCO doesn't run twice
-		if ( EED_Single_Page_Checkout::$_initialized ) {
+		if (EED_Single_Page_Checkout::$_initialized) {
 			return;
 		}
 		try {
 			// setup the EE_Checkout object
 			$this->checkout = $this->_initialize_checkout();
 			// filter checkout
-			$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout );
+			$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout);
 			// get the $_GET
 			$this->_get_request_vars();
 			// filter continue_reg
-			$this->checkout->continue_reg = apply_filters( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout );
+			$this->checkout->continue_reg = apply_filters('FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout);
 			// load the reg steps array
-			if ( ! $this->_load_and_instantiate_reg_steps() ) {
+			if ( ! $this->_load_and_instantiate_reg_steps()) {
 				EED_Single_Page_Checkout::$_initialized = true;
 				return;
 			}
 			// set the current step
-			$this->checkout->set_current_step( $this->checkout->step );
+			$this->checkout->set_current_step($this->checkout->step);
 			// and the next step
 			$this->checkout->set_next_step();
 			// was there already a valid transaction in the checkout from the session ?
-			if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+			if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 				// get transaction from db or session
 				$this->checkout->transaction = $this->checkout->reg_url_link && ! is_admin()
 					? $this->_get_transaction_and_cart_for_previous_visit()
 					: $this->_get_cart_for_current_session_and_setup_new_transaction();
-				if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+				if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 					// add some style and make it dance
 					$this->checkout->transaction = EE_Transaction::new_instance();
 					$this->add_styles_and_scripts();
@@ -424,10 +424,10 @@ 
 					return;
 				}
 				// and the registrations for the transaction
-				$this->_get_registrations( $this->checkout->transaction );
+				$this->_get_registrations($this->checkout->transaction);
 			}
 			// verify that everything has been setup correctly
-			if ( ! $this->_final_verifications() ) {
+			if ( ! $this->_final_verifications()) {
 				EED_Single_Page_Checkout::$_initialized = true;
 				return;
 			}
@@ -452,9 +452,9 @@ 
 			// set no cache headers and constants
 			EE_System::do_not_cache();
 			// add anchor
-			add_action( 'loop_start', array( $this, 'set_checkout_anchor' ), 1 );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			add_action('loop_start', array($this, 'set_checkout_anchor'), 1);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -472,20 +472,20 @@ 
 		// look in session for existing checkout
 		$checkout = EE_Registry::instance()->SSN->checkout();
 		// verify
-		if ( ! $checkout instanceof EE_Checkout ) {
+		if ( ! $checkout instanceof EE_Checkout) {
 			// instantiate EE_Checkout object for handling the properties of the current checkout process
-			$checkout = EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE  );
+			$checkout = EE_Registry::instance()->load_file(SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE);
 		} else {
-			if ( $checkout->current_step->is_final_step() && $checkout->exit_spco() === true )  {
+			if ($checkout->current_step->is_final_step() && $checkout->exit_spco() === true) {
 				$this->unlock_transaction();
-				wp_safe_redirect( $checkout->redirect_url );
+				wp_safe_redirect($checkout->redirect_url);
 				exit();
 			}
 		}
-		$checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout );
+		$checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout);
 		// verify again
-		if ( ! $checkout instanceof EE_Checkout ) {
-			throw new EE_Error( __( 'The EE_Checkout class could not be loaded.', 'event_espresso' ) );
+		if ( ! $checkout instanceof EE_Checkout) {
+			throw new EE_Error(__('The EE_Checkout class could not be loaded.', 'event_espresso'));
 		}
 		// reset anything that needs a clean slate for each request
 		$checkout->reset_for_current_request();
@@ -505,24 +505,24 @@ 
 		// load classes
 		EED_Single_Page_Checkout::load_request_handler();
 		//make sure this request is marked as belonging to EE
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 		// which step is being requested ?
-		$this->checkout->step = EE_Registry::instance()->REQ->get( 'step', $this->_get_first_step() );
+		$this->checkout->step = EE_Registry::instance()->REQ->get('step', $this->_get_first_step());
 		// which step is being edited ?
-		$this->checkout->edit_step = EE_Registry::instance()->REQ->get( 'edit_step', '' );
+		$this->checkout->edit_step = EE_Registry::instance()->REQ->get('edit_step', '');
 		// and what we're doing on the current step
-		$this->checkout->action = EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' );
+		$this->checkout->action = EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step');
 		// returning to edit ?
-		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' );
+		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link', '');
 		// or some other kind of revisit ?
-		$this->checkout->revisit = EE_Registry::instance()->REQ->get( 'revisit', FALSE );
+		$this->checkout->revisit = EE_Registry::instance()->REQ->get('revisit', FALSE);
 		// and whether or not to generate a reg form for this request
-		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get( 'generate_reg_form', TRUE ); 		// TRUE 	FALSE
+		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get('generate_reg_form', TRUE); // TRUE 	FALSE
 		// and whether or not to process a reg form submission for this request
-		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get( 'process_form_submission', FALSE ); 		// TRUE 	FALSE
+		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get('process_form_submission', FALSE); // TRUE 	FALSE
 		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step'
 			? $this->checkout->process_form_submission
-			: FALSE; 		// TRUE 	FALSE
+			: FALSE; // TRUE 	FALSE
 		// $this->_display_request_vars();
 	}
 
@@ -535,17 +535,17 @@ 
 	 * @return    void
 	 */
 	protected function _display_request_vars() {
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			return;
 		}
-		EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->step, '$this->checkout->step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->action, '$this->checkout->action', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__ );
+		EEH_Debug_Tools::printr($_REQUEST, '$_REQUEST', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->step, '$this->checkout->step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->action, '$this->checkout->action', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__);
 	}
 
 
@@ -559,8 +559,8 @@ 
 	 * @return    array
 	 */
 	private function _get_first_step() {
-		$first_step = reset( EED_Single_Page_Checkout::$_reg_steps_array );
-		return isset( $first_step['slug'] ) ? $first_step['slug'] : 'attendee_information';
+		$first_step = reset(EED_Single_Page_Checkout::$_reg_steps_array);
+		return isset($first_step['slug']) ? $first_step['slug'] : 'attendee_information';
 	}
 
 
@@ -576,27 +576,27 @@ 
 	private function _load_and_instantiate_reg_steps() {
 		// have reg_steps already been instantiated ?
 		if (
-			empty( $this->checkout->reg_steps ) ||
-			apply_filters( 'FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout )
+			empty($this->checkout->reg_steps) ||
+			apply_filters('FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout)
 		) {
 			// if not, then loop through raw reg steps array
-			foreach ( EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step ) {
-				if ( ! $this->_load_and_instantiate_reg_step( $reg_step, $order )) {
+			foreach (EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step) {
+				if ( ! $this->_load_and_instantiate_reg_step($reg_step, $order)) {
 					return false;
 				}
 			}
 			EE_Registry::instance()->CFG->registration->skip_reg_confirmation = TRUE;
 			EE_Registry::instance()->CFG->registration->reg_confirmation_last = TRUE;
 			// skip the registration_confirmation page ?
-			if ( EE_Registry::instance()->CFG->registration->skip_reg_confirmation ) {
+			if (EE_Registry::instance()->CFG->registration->skip_reg_confirmation) {
 				// just remove it from the reg steps array
-				$this->checkout->remove_reg_step( 'registration_confirmation', false );
+				$this->checkout->remove_reg_step('registration_confirmation', false);
 			} else if (
-				isset( $this->checkout->reg_steps['registration_confirmation'] )
+				isset($this->checkout->reg_steps['registration_confirmation'])
 				&& EE_Registry::instance()->CFG->registration->reg_confirmation_last
 			) {
 				// set the order to something big like 100
-				$this->checkout->set_reg_step_order( 'registration_confirmation', 100 );
+				$this->checkout->set_reg_step_order('registration_confirmation', 100);
 			}
 			// filter the array for good luck
 			$this->checkout->reg_steps = apply_filters(
@@ -606,13 +606,13 @@ 
 			// finally re-sort based on the reg step class order properties
 			$this->checkout->sort_reg_steps();
 		} else {
-			foreach ( $this->checkout->reg_steps as $reg_step ) {
+			foreach ($this->checkout->reg_steps as $reg_step) {
 				// set all current step stati to FALSE
-				$reg_step->set_is_current_step( FALSE );
+				$reg_step->set_is_current_step(FALSE);
 			}
 		}
-		if ( empty( $this->checkout->reg_steps )) {
-			EE_Error::add_error( __( 'No Reg Steps were loaded..', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($this->checkout->reg_steps)) {
+			EE_Error::add_error(__('No Reg Steps were loaded..', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 			// make reg step details available to JS
@@ -630,10 +630,10 @@ 
 	 * @param int   $order
 	 * @return bool
 	 */
-	private function _load_and_instantiate_reg_step( $reg_step = array(), $order = 0 ) {
+	private function _load_and_instantiate_reg_step($reg_step = array(), $order = 0) {
 
 		// we need a file_path, class_name, and slug to add a reg step
-		if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+		if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 			// if editing a specific step, but this is NOT that step... (and it's not the 'finalize_registration' step)
 			if (
 				$this->checkout->reg_url_link
@@ -651,26 +651,26 @@ 
 				FALSE
 			);
 			// did we gets the goods ?
-			if ( $reg_step_obj instanceof EE_SPCO_Reg_Step ) {
+			if ($reg_step_obj instanceof EE_SPCO_Reg_Step) {
 				// set reg step order based on config
-				$reg_step_obj->set_order( $order );
+				$reg_step_obj->set_order($order);
 				// add instantiated reg step object to the master reg steps array
-				$this->checkout->add_reg_step( $reg_step_obj );
+				$this->checkout->add_reg_step($reg_step_obj);
 			} else {
 				EE_Error::add_error(
-					__( 'The current step could not be set.', 'event_espresso' ),
+					__('The current step could not be set.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return false;
 			}
 		} else {
-			if ( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso' ),
-						isset( $reg_step['file_path'] ) ? $reg_step['file_path'] : '',
-						isset( $reg_step['class_name'] ) ? $reg_step['class_name'] : '',
-						isset( $reg_step['slug'] ) ? $reg_step['slug'] : '',
+						__('A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso'),
+						isset($reg_step['file_path']) ? $reg_step['file_path'] : '',
+						isset($reg_step['class_name']) ? $reg_step['class_name'] : '',
+						isset($reg_step['slug']) ? $reg_step['slug'] : '',
 						'<ul>',
 						'<li>',
 						'</li>',
@@ -694,16 +694,16 @@ 
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
 		// because the reg_url_link is present in the request, this is a return visit to SPCO, so we'll get the transaction data from the db
-		$transaction = $TXN_model->get_transaction_from_reg_url_link( $this->checkout->reg_url_link );
+		$transaction = $TXN_model->get_transaction_from_reg_url_link($this->checkout->reg_url_link);
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// and get the cart that was used for that transaction
-			$this->checkout->cart = $this->_get_cart_for_transaction( $transaction );
+			$this->checkout->cart = $this->_get_cart_for_transaction($transaction);
 			return $transaction;
 		} else {
-			EE_Error::add_error( __( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 	}
@@ -717,8 +717,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_cart_for_transaction( $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	private function _get_cart_for_transaction($transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -730,8 +730,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( EE_Transaction $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	public function get_cart_for_transaction(EE_Transaction $transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -747,17 +747,17 @@ 
 	private function _get_cart_for_current_session_and_setup_new_transaction() {
 		//  if there's no transaction, then this is the FIRST visit to SPCO
 		// so load up the cart ( passing nothing for the TXN because it doesn't exist yet )
-		$this->checkout->cart = $this->_get_cart_for_transaction( NULL );
+		$this->checkout->cart = $this->_get_cart_for_transaction(NULL);
 		// and then create a new transaction
 		$transaction = $this->_initialize_transaction();
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// save it so that we have an ID for other objects to use
 			$transaction->save();
 			// and save TXN data to the cart
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $transaction->ID() );
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($transaction->ID());
 		} else {
-			EE_Error::add_error( __( 'A Valid Transaction could not be initialized.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('A Valid Transaction could not be initialized.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $transaction;
 	}
@@ -785,8 +785,8 @@ 
 					'STS_ID'        => EEM_Transaction::failed_status_code,
 				)
 			);
-		} catch( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return NULL;
 	}
@@ -801,38 +801,38 @@ 
 	 * @return EE_Cart
 	 * @throws \EE_Error
 	 */
-	private function _get_registrations( EE_Transaction $transaction ) {
+	private function _get_registrations(EE_Transaction $transaction) {
 		// first step: grab the registrants  { : o
-		$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, true );
+		$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, true);
 		// verify registrations have been set
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// if no cached registrations, then check the db
-			$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, false );
+			$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, false);
 			// still nothing ? well as long as this isn't a revisit
-			if ( empty( $registrations ) && ! $this->checkout->revisit ) {
+			if (empty($registrations) && ! $this->checkout->revisit) {
 				// generate new registrations from scratch
-				$registrations = $this->_initialize_registrations( $transaction );
+				$registrations = $this->_initialize_registrations($transaction);
 			}
 		}
 		// sort by their original registration order
-		usort( $registrations, array( 'EED_Single_Page_Checkout', 'sort_registrations_by_REG_count' ));
+		usort($registrations, array('EED_Single_Page_Checkout', 'sort_registrations_by_REG_count'));
 		// then loop thru the array
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			// verify each registration
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// we display all attendee info for the primary registrant
-				if ( $this->checkout->reg_url_link === $registration->reg_url_link()
+				if ($this->checkout->reg_url_link === $registration->reg_url_link()
 				     && $registration->is_primary_registrant()
 				) {
 					$this->checkout->primary_revisit = true;
 					break;
-				} else if ( $this->checkout->revisit
+				} else if ($this->checkout->revisit
 				            && $this->checkout->reg_url_link !== $registration->reg_url_link()
 				) {
 					// but hide info if it doesn't belong to you
-					$transaction->clear_cache( 'Registration', $registration->ID() );
+					$transaction->clear_cache('Registration', $registration->ID());
 				}
-				$this->checkout->set_reg_status_updated( $registration->ID(), false );
+				$this->checkout->set_reg_status_updated($registration->ID(), false);
 			}
 		}
 	}
@@ -847,17 +847,17 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	private function _initialize_registrations( EE_Transaction $transaction ) {
+	private function _initialize_registrations(EE_Transaction $transaction) {
 		$att_nmbr = 0;
 		$registrations = array();
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			$this->checkout->total_ticket_count = $this->checkout->cart->all_ticket_quantity_count();
 			// now let's add the cart items to the $transaction
-			foreach ( $this->checkout->cart->get_tickets() as $line_item ) {
+			foreach ($this->checkout->cart->get_tickets() as $line_item) {
 				//do the following for each ticket of this type they selected
-				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
+				for ($x = 1; $x <= $line_item->quantity(); $x++) {
 					$att_nmbr++;
                     /** @var EventEspresso\core\services\commands\registration\CreateRegistrationCommand $CreateRegistrationCommand */
                     $CreateRegistrationCommand = EE_Registry::instance()
@@ -873,17 +873,17 @@ 
                     // override capabilities for frontend registrations
                     if ( ! is_admin()) {
                         $CreateRegistrationCommand->setCapCheck(
-	                        new PublicCapabilities( '', 'create_new_registration' )
+	                        new PublicCapabilities('', 'create_new_registration')
                         );
                     }
-					$registration = EE_Registry::instance()->BUS->execute( $CreateRegistrationCommand );
-					if ( ! $registration instanceof EE_Registration ) {
-						throw new InvalidEntityException( $registration, 'EE_Registration' );
+					$registration = EE_Registry::instance()->BUS->execute($CreateRegistrationCommand);
+					if ( ! $registration instanceof EE_Registration) {
+						throw new InvalidEntityException($registration, 'EE_Registration');
 					}
-					$registrations[ $registration->ID() ] = $registration;
+					$registrations[$registration->ID()] = $registration;
 				}
 			}
-			$registration_processor->fix_reg_final_price_rounding_issue( $transaction );
+			$registration_processor->fix_reg_final_price_rounding_issue($transaction);
 		}
 		return $registrations;
 	}
@@ -898,12 +898,12 @@ 
 	 * @param EE_Registration $reg_B
 	 * @return int
 	 */
-	public static function sort_registrations_by_REG_count( EE_Registration $reg_A, EE_Registration $reg_B ) {
+	public static function sort_registrations_by_REG_count(EE_Registration $reg_A, EE_Registration $reg_B) {
 		// this shouldn't ever happen within the same TXN, but oh well
-		if ( $reg_A->count() === $reg_B->count() ) {
+		if ($reg_A->count() === $reg_B->count()) {
 			return 0;
 		}
-		return ( $reg_A->count() > $reg_B->count() ) ? 1 : -1;
+		return ($reg_A->count() > $reg_B->count()) ? 1 : -1;
 	}
 
 
@@ -918,21 +918,21 @@ 
 	 */
 	private function _final_verifications() {
 		// filter checkout
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout);
 		//verify that current step is still set correctly
-		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step ) {
-			EE_Error::add_error( __( 'We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step) {
+			EE_Error::add_error(__('We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// if returning to SPCO, then verify that primary registrant is set
-		if ( ! empty( $this->checkout->reg_url_link )) {
+		if ( ! empty($this->checkout->reg_url_link)) {
 			$valid_registrant = $this->checkout->transaction->primary_registration();
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 			$valid_registrant = null;
-			foreach ( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) as $registration ) {
+			foreach ($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params) as $registration) {
 				if (
 					$registration instanceof EE_Registration
 					&& $registration->reg_url_link() === $this->checkout->reg_url_link
@@ -940,9 +940,9 @@ 
 					$valid_registrant = $registration;
 				}
 			}
-			if ( ! $valid_registrant instanceof EE_Registration ) {
+			if ( ! $valid_registrant instanceof EE_Registration) {
 				// hmmm... maybe we have the wrong session because the user is opening multiple tabs ?
-				if ( EED_Single_Page_Checkout::$_checkout_verified ) {
+				if (EED_Single_Page_Checkout::$_checkout_verified) {
 					// clear the session, mark the checkout as unverified, and try again
 					EE_Registry::instance()->SSN->clear_session();
 					EED_Single_Page_Checkout::$_initialized = false;
@@ -951,13 +951,13 @@ 
 					EE_Error::reset_notices();
 					return false;
 				}
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
 		// now that things have been kinda sufficiently verified,
 		// let's add the checkout to the session so that's available other systems
-		EE_Registry::instance()->SSN->set_checkout( $this->checkout );
+		EE_Registry::instance()->SSN->set_checkout($this->checkout);
 		return true;
 	}
 
@@ -972,15 +972,15 @@ 
 	 * @param bool $reinitializing
 	 * @throws \EE_Error
 	 */
-	private function _initialize_reg_steps( $reinitializing = false ) {
-		$this->checkout->set_reg_step_initiated( $this->checkout->current_step );
+	private function _initialize_reg_steps($reinitializing = false) {
+		$this->checkout->set_reg_step_initiated($this->checkout->current_step);
 		// loop thru all steps to call their individual "initialize" methods and set i18n strings for JS
-		foreach ( $this->checkout->reg_steps as $reg_step ) {
-			if ( ! $reg_step->initialize_reg_step() ) {
+		foreach ($this->checkout->reg_steps as $reg_step) {
+			if ( ! $reg_step->initialize_reg_step()) {
 				// if not initialized then maybe this step is being removed...
-				if ( ! $reinitializing && $reg_step->is_current_step() ) {
+				if ( ! $reinitializing && $reg_step->is_current_step()) {
 					// if it was the current step, then we need to start over here
-					$this->_initialize_reg_steps( true );
+					$this->_initialize_reg_steps(true);
 					return;
 				}
 				continue;
@@ -989,13 +989,13 @@ 
 			$reg_step->enqueue_styles_and_scripts();
 			// i18n
 			$reg_step->translate_js_strings();
-			if ( $reg_step->is_current_step() ) {
+			if ($reg_step->is_current_step()) {
 				// the text that appears on the reg step form submit button
 				$reg_step->set_submit_button_text();
 			}
 		}
 		// dynamically creates hook point like: AHEE__Single_Page_Checkout___initialize_reg_step__attendee_information
-		do_action( "AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step );
+		do_action("AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step);
 	}
 
 
@@ -1008,43 +1008,43 @@ 
 	 */
 	private function _check_form_submission() {
 		//does this request require the reg form to be generated ?
-		if ( $this->checkout->generate_reg_form ) {
+		if ($this->checkout->generate_reg_form) {
 			// ever heard that song by Blue Rodeo ?
 			try {
 				$this->checkout->current_step->reg_form = $this->checkout->current_step->generate_reg_form();
 				// if not displaying a form, then check for form submission
-				if ( $this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted() ) {
+				if ($this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted()) {
 					// clear out any old data in case this step is being run again
-					$this->checkout->current_step->set_valid_data( array() );
+					$this->checkout->current_step->set_valid_data(array());
 					// capture submitted form data
 					$this->checkout->current_step->reg_form->receive_form_submission(
-						apply_filters( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout )
+						apply_filters('FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout)
 					);
 					// validate submitted form data
-					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid() ) {
+					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid()) {
 						// thou shall not pass !!!
 						$this->checkout->continue_reg = FALSE;
 						// any form validation errors?
-						if ( $this->checkout->current_step->reg_form->submission_error_message() !== '' ) {
+						if ($this->checkout->current_step->reg_form->submission_error_message() !== '') {
 							$submission_error_messages = array();
 							// bad, bad, bad registrant
-							foreach( $this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error ){
-								if ( $validation_error instanceof EE_Validation_Error ) {
+							foreach ($this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error) {
+								if ($validation_error instanceof EE_Validation_Error) {
 									$submission_error_messages[] = sprintf(
-										__( '%s : %s', 'event_espresso' ),
+										__('%s : %s', 'event_espresso'),
 										$validation_error->get_form_section()->html_label_text(),
 										$validation_error->getMessage()
 									);
 								}
 							}
-							EE_Error::add_error( implode( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(implode('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 						}
 						// well not really... what will happen is we'll just get redirected back to redo the current step
 						$this->go_to_next_step();
 						return;
 					}
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -1061,22 +1061,22 @@ 
 	 */
 	private function _process_form_action() {
 		// what cha wanna do?
-		switch( $this->checkout->action ) {
+		switch ($this->checkout->action) {
 			// AJAX next step reg form
 			case 'display_spco_reg_step' :
 				$this->checkout->redirect = FALSE;
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					$this->checkout->json_response->set_reg_step_html( $this->checkout->current_step->display_reg_form() );
+				if (EE_Registry::instance()->REQ->ajax) {
+					$this->checkout->json_response->set_reg_step_html($this->checkout->current_step->display_reg_form());
 				}
 				break;
 
 			default :
 				// meh... do one of those other steps first
-				if ( ! empty( $this->checkout->action ) && is_callable( array( $this->checkout->current_step, $this->checkout->action ))) {
+				if ( ! empty($this->checkout->action) && is_callable(array($this->checkout->current_step, $this->checkout->action))) {
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__before_attendee_information__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 					// call action on current step
-					if ( call_user_func( array( $this->checkout->current_step, $this->checkout->action )) ) {
+					if (call_user_func(array($this->checkout->current_step, $this->checkout->action))) {
 						// good registrant, you get to proceed
 						if (
 							$this->checkout->current_step->success_message() !== ''
@@ -1087,7 +1087,7 @@ 
 						) {
 								EE_Error::add_success(
 									$this->checkout->current_step->success_message()
-									. '<br />' . $this->checkout->next_step->_instructions()
+									. '<br />'.$this->checkout->next_step->_instructions()
 								);
 
 						}
@@ -1095,12 +1095,12 @@ 
 						$this->_setup_redirect();
 					}
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__after_payment_options__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso' ),
+							__('The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso'),
 							$this->checkout->action,
 							$this->checkout->current_step->name()
 						),
@@ -1126,10 +1126,10 @@ 
 	public function add_styles_and_scripts() {
 		// i18n
 		$this->translate_js_strings();
-		if ( $this->checkout->admin_request ) {
-			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10 );
+		if ($this->checkout->admin_request) {
+			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles_and_scripts' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		}
 	}
 
@@ -1145,42 +1145,42 @@ 
 		EE_Registry::$i18n_js_strings['revisit'] = $this->checkout->revisit;
 		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->checkout->reg_url_link;
 		EE_Registry::$i18n_js_strings['server_error'] = __('An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['invalid_json_response'] = __( 'An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['validation_error'] = __( 'There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['invalid_json_response'] = __('An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['validation_error'] = __('There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['reg_step_error'] = __('This registration step could not be completed. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['invalid_coupon'] = __('We\'re sorry but that coupon code does not appear to be valid. If this is incorrect, please contact the site administrator.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['process_registration'] = sprintf( __( 'Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso' ), '<br/>', '<br/>' );
-		EE_Registry::$i18n_js_strings['language'] = get_bloginfo( 'language' );
+		EE_Registry::$i18n_js_strings['process_registration'] = sprintf(__('Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso'), '<br/>', '<br/>');
+		EE_Registry::$i18n_js_strings['language'] = get_bloginfo('language');
 		EE_Registry::$i18n_js_strings['EESID'] = EE_Registry::instance()->SSN->id();
 		EE_Registry::$i18n_js_strings['currency'] = EE_Registry::instance()->CFG->currency;
 		EE_Registry::$i18n_js_strings['datepicker_yearRange'] = '-150:+20';
-		EE_Registry::$i18n_js_strings['timer_years'] = __( 'years', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_months'] = __( 'months', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_weeks'] = __( 'weeks', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_days'] = __( 'days', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hours'] = __( 'hours', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minutes'] = __( 'minutes', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_seconds'] = __( 'seconds', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_year'] = __( 'year', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_month'] = __( 'month', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_week'] = __( 'week', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_day'] = __( 'day', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hour'] = __( 'hour', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minute'] = __( 'minute', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_second'] = __( 'second', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['timer_years'] = __('years', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_months'] = __('months', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_weeks'] = __('weeks', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_days'] = __('days', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hours'] = __('hours', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minutes'] = __('minutes', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_seconds'] = __('seconds', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_year'] = __('year', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_month'] = __('month', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_week'] = __('week', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_day'] = __('day', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hour'] = __('hour', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minute'] = __('minute', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_second'] = __('second', 'event_espresso');
 		EE_Registry::$i18n_js_strings['registration_expiration_notice'] = sprintf(
-			__( '%1$sWe\'re sorry, but your registration time has expired.%2$s%3$s%4$sIf you still wish to complete your registration, please return to the %5$sEvent List%6$sEvent List%7$s and reselect your tickets if available. Please except our apologies for any inconvenience this may have caused.%8$s', 'event_espresso' ),
+			__('%1$sWe\'re sorry, but your registration time has expired.%2$s%3$s%4$sIf you still wish to complete your registration, please return to the %5$sEvent List%6$sEvent List%7$s and reselect your tickets if available. Please except our apologies for any inconvenience this may have caused.%8$s', 'event_espresso'),
 			'<h4 class="important-notice">',
 			'</h4>',
 			'<br />',
 			'<p>',
-			'<a href="'. get_post_type_archive_link( 'espresso_events' ) . '" title="',
+			'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 			'">',
 			'</a>',
 			'</p>'
 		);
-		EE_Registry::$i18n_js_strings[ 'ajax_submit' ] = apply_filters( 'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true );
+		EE_Registry::$i18n_js_strings['ajax_submit'] = apply_filters('FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true);
 	}
 
 
@@ -1193,25 +1193,25 @@ 
 	 */
 	public function enqueue_styles_and_scripts() {
 		// load css
-		wp_register_style( 'single_page_checkout', SPCO_CSS_URL . 'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'single_page_checkout' );
+		wp_register_style('single_page_checkout', SPCO_CSS_URL.'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('single_page_checkout');
 		// load JS
-		wp_register_script( 'jquery_plugin', EE_THIRD_PARTY_URL . 'jquery	.plugin.min.js', array( 'jquery' ), '1.0.1', TRUE );
-		wp_register_script( 'jquery_countdown', EE_THIRD_PARTY_URL . 'jquery	.countdown.min.js', array( 'jquery_plugin' ), '2.0.2', TRUE );
-		wp_register_script( 'single_page_checkout', SPCO_JS_URL . 'single_page_checkout.js', array( 'espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'single_page_checkout' );
+		wp_register_script('jquery_plugin', EE_THIRD_PARTY_URL.'jquery	.plugin.min.js', array('jquery'), '1.0.1', TRUE);
+		wp_register_script('jquery_countdown', EE_THIRD_PARTY_URL.'jquery	.countdown.min.js', array('jquery_plugin'), '2.0.2', TRUE);
+		wp_register_script('single_page_checkout', SPCO_JS_URL.'single_page_checkout.js', array('espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('single_page_checkout');
 
 		/**
 		 * global action hook for enqueueing styles and scripts with
 		 * spco calls.
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this);
 
 		/**
 		 * dynamic action hook for enqueueing styles and scripts with spco calls.
 		 * The hook will end up being something like AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__attendee_information
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__' . $this->checkout->current_step->slug(), $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__'.$this->checkout->current_step->slug(), $this);
 
 	}
 
@@ -1226,19 +1226,19 @@ 
 	 */
 	private function _display_spco_reg_form() {
 		// if registering via the admin, just display the reg form for the current step
-		if ( $this->checkout->admin_request ) {
-			EE_Registry::instance()->REQ->add_output( $this->checkout->current_step->display_reg_form() );
+		if ($this->checkout->admin_request) {
+			EE_Registry::instance()->REQ->add_output($this->checkout->current_step->display_reg_form());
 		} else {
 			// add powered by EE msg
-			add_action( 'AHEE__SPCO__reg_form_footer', array( 'EED_Single_Page_Checkout', 'display_registration_footer' ));
+			add_action('AHEE__SPCO__reg_form_footer', array('EED_Single_Page_Checkout', 'display_registration_footer'));
 
-			$empty_cart = count( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) ) < 1 ? true : false;
+			$empty_cart = count($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params)) < 1 ? true : false;
 			$cookies_not_set_msg = '';
-			if ( $empty_cart && ! isset( $_COOKIE[ 'ee_cookie_test' ] ) ) {
+			if ($empty_cart && ! isset($_COOKIE['ee_cookie_test'])) {
 				$cookies_not_set_msg = apply_filters(
 					'FHEE__Single_Page_Checkout__display_spco_reg_form__cookies_not_set_msg',
 					sprintf(
-						__( '%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso' ),
+						__('%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso'),
 						'<div class="ee-attention">',
 						'</div>',
 						'<h6 class="important-notice">',
@@ -1258,7 +1258,7 @@ 
 					'layout_strategy' =>
 						new EE_Template_Layout(
 							array(
-								'layout_template_file' 			=> SPCO_TEMPLATES_PATH . 'registration_page_wrapper.template.php',
+								'layout_template_file' 			=> SPCO_TEMPLATES_PATH.'registration_page_wrapper.template.php',
 								'template_args' => array(
 									'empty_cart' 		=> $empty_cart,
 									'revisit' 				=> $this->checkout->revisit,
@@ -1267,8 +1267,8 @@ 
 									'empty_msg' 		=> apply_filters(
 										'FHEE__Single_Page_Checkout__display_spco_reg_form__empty_msg',
 										sprintf(
-											__( 'You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso' ),
-											'<a href="' . get_post_type_archive_link( 'espresso_events' ) . '" title="',
+											__('You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso'),
+											'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 											'">',
 											'</a>'
 										)
@@ -1276,14 +1276,14 @@ 
 									'cookies_not_set_msg' 		=> $cookies_not_set_msg,
 									'registration_time_limit' 	=> $this->checkout->get_registration_time_limit(),
 									'session_expiration' 			=>
-										gmdate( 'M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+										gmdate('M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 							)
 						)
 					)
 				)
 			);
 			// load template and add to output sent that gets filtered into the_content()
-			EE_Registry::instance()->REQ->add_output( $this->checkout->registration_form->get_html_and_js() );
+			EE_Registry::instance()->REQ->add_output($this->checkout->registration_form->get_html_and_js());
 		}
 	}
 
@@ -1297,8 +1297,8 @@ 
 	 * @internal  param string $label
 	 * @return        string
 	 */
-	public function add_extra_finalize_registration_inputs( $next_step ) {
-		if ( $next_step === 'finalize_registration' ) {
+	public function add_extra_finalize_registration_inputs($next_step) {
+		if ($next_step === 'finalize_registration') {
 			echo '<div id="spco-extra-finalize_registration-inputs-dv"></div>';
 		}
 	}
@@ -1320,13 +1320,13 @@ 
 		) {
 			add_filter(
 				'FHEE__EEH_Template__powered_by_event_espresso__url',
-				function( $url) {
-					return apply_filters( 'FHEE__EE_Front_Controller__registration_footer__url', $url );
+				function($url) {
+					return apply_filters('FHEE__EE_Front_Controller__registration_footer__url', $url);
 				}
 			);
 			echo apply_filters(
 				'FHEE__EE_Front_Controller__display_registration_footer',
-				\EEH_Template::powered_by_event_espresso( '', 'espresso-registration-footer-dv' )
+				\EEH_Template::powered_by_event_espresso('', 'espresso-registration-footer-dv')
 			);
 		}
 		return '';
@@ -1342,7 +1342,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function unlock_transaction() {
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$this->checkout->transaction->unlock();
 		}
 	}
@@ -1357,12 +1357,12 @@ 
 	 * @return 	array
 	 */
 	private function _setup_redirect() {
-		if ( $this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
 			$this->checkout->redirect = TRUE;
-			if ( empty( $this->checkout->redirect_url )) {
+			if (empty($this->checkout->redirect_url)) {
 				$this->checkout->redirect_url = $this->checkout->next_step->reg_step_url();
 			}
-			$this->checkout->redirect_url = apply_filters( 'FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout );
+			$this->checkout->redirect_url = apply_filters('FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout);
 		}
 	}
 
@@ -1376,9 +1376,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public function go_to_next_step() {
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// capture contents of output buffer we started earlier in the request, and insert into JSON response
-			$this->checkout->json_response->set_unexpected_errors( ob_get_clean() );
+			$this->checkout->json_response->set_unexpected_errors(ob_get_clean());
 		}
 		$this->unlock_transaction();
 		// just return for these conditions
@@ -1407,7 +1407,7 @@ 
 	 */
 	protected function _handle_json_response() {
 		// if this is an ajax request
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1420,7 +1420,7 @@ 
 			$this->checkout->json_response->set_registration_time_limit(
 				$this->checkout->get_registration_time_limit()
 			);
-			$this->checkout->json_response->set_payment_amount( $this->checkout->amount_owing );
+			$this->checkout->json_response->set_payment_amount($this->checkout->amount_owing);
 			// just send the ajax (
 			$json_response = apply_filters(
 				'FHEE__EE_Single_Page_Checkout__JSON_response',
@@ -1441,9 +1441,9 @@ 
 	 */
 	protected function _handle_html_redirects() {
 		// going somewhere ?
-		if ( $this->checkout->redirect && ! empty( $this->checkout->redirect_url ) ) {
+		if ($this->checkout->redirect && ! empty($this->checkout->redirect_url)) {
 			// store notices in a transient
-			EE_Error::get_notices( false, true, true );
+			EE_Error::get_notices(false, true, true);
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1453,7 +1453,7 @@ 
 			//		'headers_list'    => headers_list(),
 			//	)
 			//);
-			wp_safe_redirect( $this->checkout->redirect_url );
+			wp_safe_redirect($this->checkout->redirect_url);
 			exit();
 		}
 	}

modules/single_page_checkout/inc/EE_Checkout.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -276,7 +276,7 @@ 
 
 	/**
 	 * @param $REG_ID
-	 * @param $reg_status
+	 * @param boolean $reg_status
 	 */
 	public function set_reg_status_updated( $REG_ID, $reg_status ) {
 		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
@@ -1110,6 +1110,7 @@ 
 	 *
 	 * @param    string | int    $reg_cache_ID
 	 * @param    EE_Registration $registration
+	 * @param integer $reg_cache_ID
 	 * @return void
 	 * @throws \EE_Error
 	 */

Spacing +199 added lines, -199 removed lines

@@ -241,9 +241,9 @@ 
 		$this->reg_page_base_url = EE_Registry::instance()->CFG->core->reg_page_url();
 		$this->thank_you_page_url = EE_Registry::instance()->CFG->core->thank_you_page_url();
 		$this->cancel_page_url = EE_Registry::instance()->CFG->core->cancel_page_url();
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', TRUE );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', TRUE);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->ajax;
-		$this->reg_cache_where_params = array( 'order_by' => array( 'REG_count' => 'ASC' ));
+		$this->reg_cache_where_params = array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -254,8 +254,8 @@ 
 	 * @return boolean
 	 */
 	public function any_reg_status_updated() {
-		foreach ( $this->reg_status_updated as $reg_status ) {
-			if ( $reg_status ) {
+		foreach ($this->reg_status_updated as $reg_status) {
+			if ($reg_status) {
 				return true;
 			}
 		}
@@ -268,8 +268,8 @@ 
 	 * @param $REG_ID
 	 * @return boolean
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return isset( $this->reg_status_updated[ $REG_ID ] ) ? $this->reg_status_updated[ $REG_ID ] : false;
+	public function reg_status_updated($REG_ID) {
+		return isset($this->reg_status_updated[$REG_ID]) ? $this->reg_status_updated[$REG_ID] : false;
 	}
 
 
@@ -278,8 +278,8 @@ 
 	 * @param $REG_ID
 	 * @param $reg_status
 	 */
-	public function set_reg_status_updated( $REG_ID, $reg_status ) {
-		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
+	public function set_reg_status_updated($REG_ID, $reg_status) {
+		$this->reg_status_updated[$REG_ID] = filter_var($reg_status, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -300,7 +300,7 @@ 
 	 * can ONLY be set by the  Finalize_Registration reg step
 	 */
 	public function set_exit_spco() {
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
 			$this->exit_spco = true;
 		}
 	}
@@ -317,12 +317,12 @@ 
 	 */
 	public function reset_for_current_request() {
 		$this->process_form_submission = FALSE;
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', true );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', true);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->front_ajax;
 		$this->continue_reg = true;
 		$this->redirect = false;
 		// don't reset the cached redirect form if we're about to be asked to display it !!!
-		if ( EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' ) !== 'redirect_form' ) {
+		if (EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step') !== 'redirect_form') {
 			$this->redirect_form = '';
 		}
 		$this->redirect_url = '';
@@ -339,8 +339,8 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_obj
 	 * @return    void
 	 */
-	public function add_reg_step( EE_SPCO_Reg_Step $reg_step_obj ) {
-		$this->reg_steps[ $reg_step_obj->slug()  ] = $reg_step_obj;
+	public function add_reg_step(EE_SPCO_Reg_Step $reg_step_obj) {
+		$this->reg_steps[$reg_step_obj->slug()] = $reg_step_obj;
 	}
 
 
@@ -356,22 +356,22 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public function skip_reg_step( $reg_step_slug = '' ) {
-		$step_to_skip = $this->find_reg_step( $reg_step_slug );
-		if ( $step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step() ) {
-			$step_to_skip->set_is_current_step( false );
+	public function skip_reg_step($reg_step_slug = '') {
+		$step_to_skip = $this->find_reg_step($reg_step_slug);
+		if ($step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step()) {
+			$step_to_skip->set_is_current_step(false);
 			$step_to_skip->set_completed();
 			// advance to the next step
-			$this->set_current_step( $this->next_step->slug() );
+			$this->set_current_step($this->next_step->slug());
 			// also reset the step param in the request in case any other code references that directly
-			EE_Registry::instance()->REQ->set( 'step', $this->current_step->slug() );
+			EE_Registry::instance()->REQ->set('step', $this->current_step->slug());
 			// since we are skipping a step and setting the current step to be what was previously the next step,
 			// we need to check that the next step is now correct, and not still set to the current step.
-			if ( $this->current_step->slug() === $this->next_step->slug() ) {
+			if ($this->current_step->slug() === $this->next_step->slug()) {
 				// correctly setup the next step
 				$this->set_next_step();
 			}
-			$this->set_reg_step_initiated( $this->current_step );
+			$this->set_reg_step_initiated($this->current_step);
 		}
 	}
 
@@ -385,14 +385,14 @@ 
 	 * @param bool   $reset whether to reset reg steps after removal
 	 * @throws EE_Error
 	 */
-	public function remove_reg_step( $reg_step_slug = '', $reset = true ) {
-		unset( $this->reg_steps[ $reg_step_slug  ] );
-		if ( $this->transaction instanceof EE_Transaction ) {
+	public function remove_reg_step($reg_step_slug = '', $reset = true) {
+		unset($this->reg_steps[$reg_step_slug]);
+		if ($this->transaction instanceof EE_Transaction) {
 			// now remove reg step from TXN and save
-			$this->transaction->remove_reg_step( $reg_step_slug );
+			$this->transaction->remove_reg_step($reg_step_slug);
 			$this->transaction->save();
 		}
-		if ( $reset ) {
+		if ($reset) {
 			$this->reset_reg_steps();
 		}
 	}
@@ -407,9 +407,9 @@ 
 	 * @param int    $order
 	 * @return    void
 	 */
-	public function set_reg_step_order( $reg_step_slug = '', $order = 100 ) {
-		if ( isset( $this->reg_steps[ $reg_step_slug  ] )) {
-			$this->reg_steps[ $reg_step_slug ]->set_order( $order );
+	public function set_reg_step_order($reg_step_slug = '', $order = 100) {
+		if (isset($this->reg_steps[$reg_step_slug])) {
+			$this->reg_steps[$reg_step_slug]->set_order($order);
 		}
 	}
 
@@ -422,25 +422,25 @@ 
 	 * @param string $current_step
 	 * @return    void
 	 */
-	public function set_current_step( $current_step ) {
+	public function set_current_step($current_step) {
 		// grab what step we're on
-		$this->current_step = isset( $this->reg_steps[ $current_step ] ) ? $this->reg_steps[ $current_step ] : reset( $this->reg_steps );
+		$this->current_step = isset($this->reg_steps[$current_step]) ? $this->reg_steps[$current_step] : reset($this->reg_steps);
 		// verify instance
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step) {
 			// we don't want to repeat completed steps if this is the first time through SPCO
-			if ( $this->continue_reg && ! $this->revisit && $this->current_step->completed() ) {
+			if ($this->continue_reg && ! $this->revisit && $this->current_step->completed()) {
 				// so advance to the next step
 				$this->set_next_step();
-				if ( $this->next_step instanceof EE_SPCO_Reg_Step ) {
+				if ($this->next_step instanceof EE_SPCO_Reg_Step) {
 					// and attempt to set it as the current step
-					$this->set_current_step( $this->next_step->slug() );
+					$this->set_current_step($this->next_step->slug());
 				}
 				return;
 			}
-			$this->current_step->set_is_current_step( TRUE );
+			$this->current_step->set_is_current_step(TRUE);
 		} else {
 			EE_Error::add_error(
-				__( 'The current step could not be set.', 'event_espresso' ),
+				__('The current step could not be set.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -457,20 +457,20 @@ 
 	 */
 	public function set_next_step() {
 		// set pointer to start of array
-		reset( $this->reg_steps );
+		reset($this->reg_steps);
 		// if there is more than one step
-		if ( count( $this->reg_steps ) > 1 ) {
+		if (count($this->reg_steps) > 1) {
 			// advance to the current step and set pointer
-			while ( key( $this->reg_steps ) !== $this->current_step->slug() && key( $this->reg_steps ) !== '' ) {
-				next( $this->reg_steps );
+			while (key($this->reg_steps) !== $this->current_step->slug() && key($this->reg_steps) !== '') {
+				next($this->reg_steps);
 			}
 		}
 		// advance one more spot ( if it exists )
-		$this->next_step = next( $this->reg_steps );
+		$this->next_step = next($this->reg_steps);
 		// verify instance
-		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step  : NULL;
+		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step : NULL;
 		// then back to current step to reset
-		prev( $this->reg_steps );
+		prev($this->reg_steps);
 	}
 
 
@@ -484,8 +484,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_next_reg_step() {
-		$next = next( $this->reg_steps );
-		prev( $this->reg_steps );
+		$next = next($this->reg_steps);
+		prev($this->reg_steps);
 		return $next instanceof EE_SPCO_Reg_Step ? $next : null;
 	}
 
@@ -500,8 +500,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_prev_reg_step() {
-		$prev = prev( $this->reg_steps );
-		next( $this->reg_steps );
+		$prev = prev($this->reg_steps);
+		next($this->reg_steps);
 		return $prev instanceof EE_SPCO_Reg_Step ? $prev : null;
 	}
 
@@ -514,8 +514,8 @@ 
 	 * @return void
 	 */
 	public function sort_reg_steps() {
-		$reg_step_sorting_callback = apply_filters( 'FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback' );
-		uasort( $this->reg_steps, array( $this, $reg_step_sorting_callback ));
+		$reg_step_sorting_callback = apply_filters('FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback');
+		uasort($this->reg_steps, array($this, $reg_step_sorting_callback));
 	}
 
 
@@ -528,19 +528,19 @@ 
 	 * @param string $reg_step_slug
 	 * @return EE_SPCO_Reg_Step|null
 	 */
-	public function find_reg_step( $reg_step_slug = '' ) {
-		if ( ! empty( $reg_step_slug ) ) {
+	public function find_reg_step($reg_step_slug = '') {
+		if ( ! empty($reg_step_slug)) {
 			// copy reg step array
 			$reg_steps = $this->reg_steps;
 			// set pointer to start of array
-			reset( $reg_steps );
+			reset($reg_steps);
 			// if there is more than one step
-			if ( count( $reg_steps ) > 1 ) {
+			if (count($reg_steps) > 1) {
 				// advance to the current step and set pointer
-				while ( key( $reg_steps ) !== $reg_step_slug && key( $reg_steps ) !== '' ) {
-					next( $reg_steps );
+				while (key($reg_steps) !== $reg_step_slug && key($reg_steps) !== '') {
+					next($reg_steps);
 				}
-				return current( $reg_steps );
+				return current($reg_steps);
 			}
 		}
 		return null;
@@ -556,17 +556,17 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_B
 	 * @return int
 	 */
-	public function reg_step_sorting_callback( EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B ) {
+	public function reg_step_sorting_callback(EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B) {
 		// send finalize_registration step to the end of the array
-		if ( $reg_step_A->slug() === 'finalize_registration' ) {
+		if ($reg_step_A->slug() === 'finalize_registration') {
 			return 1;
-		} else if ( $reg_step_B->slug() === 'finalize_registration' ) {
+		} else if ($reg_step_B->slug() === 'finalize_registration') {
 			return -1;
 		}
-		if ( $reg_step_A->order() === $reg_step_B->order() ) {
+		if ($reg_step_A->order() === $reg_step_B->order()) {
 			return 0;
 		}
-		return ( $reg_step_A->order() > $reg_step_B->order() ) ? 1 : -1;
+		return ($reg_step_A->order() > $reg_step_B->order()) ? 1 : -1;
 	}
 
 
@@ -578,7 +578,7 @@ 
 	 * @param    EE_SPCO_Reg_Step $reg_step
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_initiated( EE_SPCO_Reg_Step $reg_step ) {
+	public function set_reg_step_initiated(EE_SPCO_Reg_Step $reg_step) {
 		// call set_reg_step_initiated ???
 		if (
 			// first time visiting SPCO ?
@@ -591,11 +591,11 @@ 
 			)
 		) {
 			// set the start time for this reg step
-			if ( ! $this->transaction->set_reg_step_initiated( $reg_step->slug() ) ) {
-				if ( WP_DEBUG ) {
+			if ( ! $this->transaction->set_reg_step_initiated($reg_step->slug())) {
+				if (WP_DEBUG) {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The "%1$s" registration step was not initialized properly.', 'event_espresso' ),
+							__('The "%1$s" registration step was not initialized properly.', 'event_espresso'),
 							$reg_step->name()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -614,10 +614,10 @@ 
 	 * 	@return 	void
 	 */
 	public function set_reg_step_JSON_info() {
-		EE_Registry::$i18n_js_strings[ 'reg_steps' ] = array();
+		EE_Registry::$i18n_js_strings['reg_steps'] = array();
 		// pass basic reg step data to JS
-		foreach ( $this->reg_steps as $reg_step ) {
-			EE_Registry::$i18n_js_strings[ 'reg_steps' ][] = $reg_step->slug();
+		foreach ($this->reg_steps as $reg_step) {
+			EE_Registry::$i18n_js_strings['reg_steps'][] = $reg_step->slug();
 		}
 		// reset reg step html
 //		$this->json_response->set_reg_step_html( '' );
@@ -633,7 +633,7 @@ 
 	 */
 	public function reset_reg_steps() {
 		$this->sort_reg_steps();
-		$this->set_current_step( EE_Registry::instance()->REQ->get( 'step' ));
+		$this->set_current_step(EE_Registry::instance()->REQ->get('step'));
 		$this->set_next_step();
 		// the text that appears on the reg step form submit button
 		$this->current_step->set_submit_button_text();
@@ -650,9 +650,9 @@ 
 	 */
 	public function get_registration_time_limit() {
 
-		$registration_time_limit = (float)( EE_Registry::instance()	->SSN->expiration() - time() );
+		$registration_time_limit = (float) (EE_Registry::instance()	->SSN->expiration() - time());
 		$time_limit_format = $registration_time_limit > 60 * MINUTE_IN_SECONDS ? 'H:i:s' : 'i:s';
-		$registration_time_limit = gmdate( $time_limit_format, $registration_time_limit );
+		$registration_time_limit = gmdate($time_limit_format, $registration_time_limit);
 		return apply_filters(
 			'FHEE__EE_Checkout__get_registration_time_limit__registration_time_limit',
 			$registration_time_limit
@@ -672,7 +672,7 @@ 
 		//		overpaid TXN
 		//		free TXN ( total = 0.00 )
 		// then payment required is TRUE
-		return ! ( $this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free() ) ? TRUE : FALSE;
+		return ! ($this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free()) ? TRUE : FALSE;
 	}
 
 
@@ -684,12 +684,12 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( $transaction ) {
-		$session = EE_Registry::instance()->load_core( 'Session' );
-		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn( $transaction, $session ) : null;
+	public function get_cart_for_transaction($transaction) {
+		$session = EE_Registry::instance()->load_core('Session');
+		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn($transaction, $session) : null;
 		// verify cart
-		if ( ! $cart instanceof EE_Cart ) {
-			$cart = EE_Registry::instance()->load_core( 'Cart' );
+		if ( ! $cart instanceof EE_Cart) {
+			$cart = EE_Registry::instance()->load_core('Cart');
 		}
 
 		return $cart;
@@ -705,8 +705,8 @@ 
 	 */
 	public function initialize_txn_reg_steps_array() {
 		$txn_reg_steps_array = array();
-		foreach ( $this->reg_steps as $reg_step ) {
-			$txn_reg_steps_array[ $reg_step->slug() ] = FALSE;
+		foreach ($this->reg_steps as $reg_step) {
+			$txn_reg_steps_array[$reg_step->slug()] = FALSE;
 		}
 		return $txn_reg_steps_array;
 	}
@@ -722,14 +722,14 @@ 
 	 */
 	public function update_txn_reg_steps_array() {
 		$updated = false;
-		foreach ( $this->reg_steps as $reg_step ) {
-			if ( $reg_step->completed() ) {
-				$updated = $this->transaction->set_reg_step_completed( $reg_step->slug() )
+		foreach ($this->reg_steps as $reg_step) {
+			if ($reg_step->completed()) {
+				$updated = $this->transaction->set_reg_step_completed($reg_step->slug())
 					? true
 					: $updated;
 			}
 		}
-		if ( $updated ) {
+		if ($updated) {
 			$this->transaction->save();
 		}
 		return $updated;
@@ -745,14 +745,14 @@ 
 	 * @throws \EE_Error
 	 */
 	public function stash_transaction_and_checkout() {
-		if ( ! $this->revisit ) {
+		if ( ! $this->revisit) {
 			$this->update_txn_reg_steps_array();
 		}
 		$this->track_transaction_and_registration_status_updates();
 		// save all data to the db, but suppress errors
 		//$this->save_all_data( FALSE );
 		// cache the checkout in the session
-		EE_Registry::instance()->SSN->set_checkout( $this );
+		EE_Registry::instance()->SSN->set_checkout($this);
 	}
 
 
@@ -767,15 +767,15 @@ 
 	 */
 	public function track_transaction_and_registration_status_updates() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// has there been a TXN status change during this checkout?
 			$this->txn_status_updated = $this->transaction->txn_status_updated();
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $registration ) {
-				if ( $registration_processor->reg_status_updated( $registration->ID() ) ) {
-					$this->set_reg_status_updated( $registration->ID(), true );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $registration) {
+				if ($registration_processor->reg_status_updated($registration->ID())) {
+					$this->set_reg_status_updated($registration->ID(), true);
 				}
 			}
 		}
@@ -796,7 +796,7 @@ 
 	 * @return    bool
 	 * @throws \EE_Error
 	 */
-	public function visit_allows_processing_of_this_registration( EE_Registration $registration ) {
+	public function visit_allows_processing_of_this_registration(EE_Registration $registration) {
 		return ! $this->revisit
 		       || $this->primary_revisit
 		       || (
@@ -829,18 +829,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function save_all_data( $show_errors = TRUE ) {
+	public function save_all_data($show_errors = TRUE) {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// save to ensure that TXN has ID
 			$this->transaction->save();
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as  $registration ) {
-				$this->_save_registration( $registration, $show_errors );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as  $registration) {
+				$this->_save_registration($registration, $show_errors);
 			}
 		} else {
-			if ( $show_errors ) {
-				EE_Error::add_error( __( 'A valid Transaction was not found when attempting to save your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ($show_errors) {
+				EE_Error::add_error(__('A valid Transaction was not found when attempting to save your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -857,32 +857,32 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration( $registration, $show_errors = TRUE  ) {
+	private function _save_registration($registration, $show_errors = TRUE) {
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// should this registration be processed during this visit ?
-			if ( $this->visit_allows_processing_of_this_registration( $registration ) ) {
+			if ($this->visit_allows_processing_of_this_registration($registration)) {
 				//set TXN ID
-				if ( ! $registration->transaction_ID() ) {
-					$registration->set_transaction_id( $this->transaction->ID() );
+				if ( ! $registration->transaction_ID()) {
+					$registration->set_transaction_id($this->transaction->ID());
 				}
 				// verify and save the attendee
-				$this->_save_registration_attendee( $registration, $show_errors );
+				$this->_save_registration_attendee($registration, $show_errors);
 				// save answers to reg form questions
-				$this->_save_registration_answers( $registration, $show_errors );
+				$this->_save_registration_answers($registration, $show_errors);
 				// save changes
 				$registration->save();
 				// update txn cache
-				if ( ! $this->transaction->update_cache_after_object_save( 'Registration', $registration )) {
-					if ( $show_errors ) {
-						EE_Error::add_error( __( 'The newly saved Registration object could not be cached on the Transaction.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+				if ( ! $this->transaction->update_cache_after_object_save('Registration', $registration)) {
+					if ($show_errors) {
+						EE_Error::add_error(__('The newly saved Registration object could not be cached on the Transaction.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
-					__( 'An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso' ),
+					__('An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -899,25 +899,25 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration_attendee( $registration, $show_errors = TRUE ) {
-		if ( $registration->attendee() instanceof EE_Attendee ) {
+	private function _save_registration_attendee($registration, $show_errors = TRUE) {
+		if ($registration->attendee() instanceof EE_Attendee) {
 			// save so that ATT has ID
 			$registration->attendee()->save();
-			if ( ! $registration->update_cache_after_object_save( 'Attendee', $registration->attendee() ) ) {
-				if ( $show_errors ) {
+			if ( ! $registration->update_cache_after_object_save('Attendee', $registration->attendee())) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'The newly saved Attendee object could not be cached on the registration.', 'event_espresso' ),
+						__('The newly saved Attendee object could not be cached on the registration.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
 					sprintf(
 						'%1$s||%1$s $attendee = %2$s',
-						__( 'Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso' ),
-						var_export( $registration->attendee(), true )
+						__('Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso'),
+						var_export($registration->attendee(), true)
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -935,25 +935,25 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration_answers( $registration, $show_errors = TRUE ) {
+	private function _save_registration_answers($registration, $show_errors = TRUE) {
 		// now save the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				$answer->set_registration( $registration->ID() );
+			if ($answer instanceof EE_Answer) {
+				$answer->set_registration($registration->ID());
 				$answer->save();
-				if ( ! $registration->update_cache_after_object_save( 'Answer', $answer, $cache_key )) {
-					if ( $show_errors ) {
+				if ( ! $registration->update_cache_after_object_save('Answer', $answer, $cache_key)) {
+					if ($show_errors) {
 						EE_Error::add_error(
-							__( 'The newly saved Answer object could not be cached on the registration.', 'event_espresso' ),
+							__('The newly saved Answer object could not be cached on the registration.', 'event_espresso'),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					}
 				}
 			} else {
-				if ( $show_errors ) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
@@ -972,7 +972,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function refresh_all_entities( $from_db = false ) {
+	public function refresh_all_entities($from_db = false) {
 		$from_db = $this->current_step->is_final_step() || $this->action === 'process_gateway_response'
 			? true
 			: $from_db;
@@ -996,11 +996,11 @@ 
 	 */
 	protected function refresh_from_db() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// pull fresh TXN data from the db
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db( $this->transaction->ID() );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db($this->transaction->ID());
 			// update EE_Checkout's cached primary_attendee object
-			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db( $this->transaction );
+			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db($this->transaction);
 			// update EE_Checkout's cached payment object
 			$payment = $this->transaction->last_payment();
 			$this->payment = $payment instanceof EE_Payment ? $payment : $this->payment;
@@ -1008,9 +1008,9 @@ 
 			$payment_method = $this->payment instanceof EE_Payment ? $this->payment->payment_method() : null;
 			$this->payment_method = $payment_method instanceof EE_Payment_Method ? $payment_method : $this->payment_method;
 			//now refresh the cart, based on the TXN
-			$this->cart = $this->get_cart_for_transaction( $this->transaction );
+			$this->cart = $this->get_cart_for_transaction($this->transaction);
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return TRUE;
@@ -1025,21 +1025,21 @@ 
 	 * @return  EE_Attendee | null
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_primary_attendee_obj_from_db( EE_Transaction $transaction ) {
+	protected function _refresh_primary_attendee_obj_from_db(EE_Transaction $transaction) {
 
 		$primary_attendee_obj = null;
 		// grab the saved registrations from the transaction
-		foreach ( $transaction->registrations( $this->reg_cache_where_params, true ) as $registration ) {
+		foreach ($transaction->registrations($this->reg_cache_where_params, true) as $registration) {
 			// verify object
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				$attendee = $registration->attendee();
 				// verify object && maybe cache primary_attendee_obj ?
-				if ( $attendee instanceof EE_Attendee&& $registration->is_primary_registrant() ) {
+				if ($attendee instanceof EE_Attendee && $registration->is_primary_registrant()) {
 					$primary_attendee_obj = $attendee;
 				}
 			} else {
 				EE_Error::add_error(
-						__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+						__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1060,43 +1060,43 @@ 
 	 */
 	protected function refresh_entity_map() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// never cache payment info
-			$this->transaction->clear_cache( 'Payment' );
+			$this->transaction->clear_cache('Payment');
 			// is the Payment Options Reg Step completed ?
-			if ( $this->transaction->reg_step_completed( 'payment_options' ) ) {
+			if ($this->transaction->reg_step_completed('payment_options')) {
 				// then check for payments and update TXN accordingly
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				$transaction_payments->calculate_total_payments_and_update_status( $this->transaction );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				$transaction_payments->calculate_total_payments_and_update_status($this->transaction);
 			}
 			// grab the saved registrations from the transaction
 			foreach (
-				$this->transaction->registrations( $this->reg_cache_where_params ) as $reg_cache_ID => $registration
+				$this->transaction->registrations($this->reg_cache_where_params) as $reg_cache_ID => $registration
 			) {
-				$this->_refresh_registration( $reg_cache_ID, $registration );
+				$this->_refresh_registration($reg_cache_ID, $registration);
 			}
 			// make sure our cached TXN is added to the model entity mapper
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with( $this->transaction->ID(), $this->transaction );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with($this->transaction->ID(), $this->transaction);
 
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify and update the cart because inaccurate totals are not so much fun
-		if ( $this->cart instanceof EE_Cart ) {
+		if ($this->cart instanceof EE_Cart) {
 			$grand_total = $this->cart->get_grand_total();
-			if ( $grand_total instanceof EE_Line_Item && $grand_total->ID() ) {
+			if ($grand_total instanceof EE_Line_Item && $grand_total->ID()) {
 				$grand_total->recalculate_total_including_taxes();
 				$grand_total = $grand_total->get_model()->refresh_entity_map_with(
 					$this->cart->get_grand_total()->ID(),
 					$this->cart->get_grand_total()
 				);
 			}
-			if ( $grand_total instanceof EE_Line_Item ) {
-				$this->cart = EE_Cart::instance( $grand_total );
+			if ($grand_total instanceof EE_Line_Item) {
+				$this->cart = EE_Cart::instance($grand_total);
 			} else {
-				EE_Error::add_error( __( 'A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -1113,19 +1113,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration( $reg_cache_ID, $registration ) {
+	protected function _refresh_registration($reg_cache_ID, $registration) {
 
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// update the entity mapper attendee
-			$this->_refresh_registration_attendee( $registration );
+			$this->_refresh_registration_attendee($registration);
 			// update the entity mapper answers for reg form questions
-			$this->_refresh_registration_answers( $registration );
+			$this->_refresh_registration_answers($registration);
 			// make sure the cached registration is added to the model entity mapper
-			$registration->get_model()->refresh_entity_map_with( $reg_cache_ID, $registration );
+			$registration->get_model()->refresh_entity_map_with($reg_cache_ID, $registration);
 		} else {
 			EE_Error::add_error(
-				__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+				__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1140,15 +1140,15 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration_attendee( $registration ) {
+	protected function _refresh_registration_attendee($registration) {
 
 		$attendee = $registration->attendee();
 		// verify object
-		if ( $attendee instanceof EE_Attendee && $attendee->ID() ) {
+		if ($attendee instanceof EE_Attendee && $attendee->ID()) {
 			// make sure the cached attendee is added to the model entity mapper
-			$registration->attendee()->get_model()->refresh_entity_map_with( $attendee->ID(), $attendee );
+			$registration->attendee()->get_model()->refresh_entity_map_with($attendee->ID(), $attendee);
 			// maybe cache primary_attendee_obj ?
-			if ( $registration->is_primary_registrant() ) {
+			if ($registration->is_primary_registrant()) {
 				$this->primary_attendee_obj = $attendee;
 			}
 		}
@@ -1163,19 +1163,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration_answers( $registration ) {
+	protected function _refresh_registration_answers($registration) {
 
 		// now update the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				if ( $answer->ID() ) {
+			if ($answer instanceof EE_Answer) {
+				if ($answer->ID()) {
 					// make sure the cached answer is added to the model entity mapper
-					$answer->get_model()->refresh_entity_map_with( $answer->ID(), $answer );
+					$answer->get_model()->refresh_entity_map_with($answer->ID(), $answer);
 				}
 			} else {
 				EE_Error::add_error(
-					__( 'An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+					__('An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1190,7 +1190,7 @@ 
 	 * this will reinstate the EE_Checkout object on each EE_SPCO_Reg_Step object
 	 */
 	public function __wakeup() {
-		foreach ( $this->reg_steps as $reg_step ) {
+		foreach ($this->reg_steps as $reg_step) {
 			$reg_step->checkout = $this;
 		}
 	}
@@ -1207,12 +1207,12 @@ 
 	 * @param bool   $display_request
 	 * @throws \EE_Error
 	 */
-	public function log( $class = '', $func = '', $line = '', $info = array(), $display_request = false ) {
+	public function log($class = '', $func = '', $line = '', $info = array(), $display_request = false) {
 		$disabled = true;
-		if ( WP_DEBUG && ! $disabled ) {
-			$debug_data = get_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), array() );
+		if (WP_DEBUG && ! $disabled) {
+			$debug_data = get_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), array());
 			$default_data = array(
-				$class 		=> $func . '() : ' . $line,
+				$class 		=> $func.'() : '.$line,
 				'request->step' 		=> $this->step,
 				'request->action' 	=> $this->action,
 				'current_step->slug' => $this->current_step instanceof EE_SPCO_Reg_Step ?
@@ -1224,24 +1224,24 @@ 
 				'reg_url_link' => $this->reg_url_link,
 				'REQ' => $display_request ? $_REQUEST : '',
 			);
-			if ( $this->transaction instanceof EE_Transaction ) {
-				$default_data[ 'TXN_status' ] 		= $this->transaction->status_ID();
-				$default_data[ 'TXN_reg_steps' ] 	= $this->transaction->reg_steps();
-				foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $REG_ID => $registration ) {
-					$default_data[ 'registrations' ][ $REG_ID ] = $registration->status_ID();
+			if ($this->transaction instanceof EE_Transaction) {
+				$default_data['TXN_status'] = $this->transaction->status_ID();
+				$default_data['TXN_reg_steps'] = $this->transaction->reg_steps();
+				foreach ($this->transaction->registrations($this->reg_cache_where_params) as $REG_ID => $registration) {
+					$default_data['registrations'][$REG_ID] = $registration->status_ID();
 				}
-				if ( $this->transaction->ID() ) {
-					$TXN_ID = 'EE_Transaction: ' . $this->transaction->ID();
+				if ($this->transaction->ID()) {
+					$TXN_ID = 'EE_Transaction: '.$this->transaction->ID();
 					// don't serialize objects
-					$info = $this->_strip_objects( $info );
-					if ( ! isset( $debug_data[ $TXN_ID ] ) ) {
-						$debug_data[ $TXN_ID ] = array();
+					$info = $this->_strip_objects($info);
+					if ( ! isset($debug_data[$TXN_ID])) {
+						$debug_data[$TXN_ID] = array();
 					}
-					$debug_data[ $TXN_ID ][ microtime() ] = array_merge(
+					$debug_data[$TXN_ID][microtime()] = array_merge(
 						$default_data,
 						$info
 					);
-					update_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), $debug_data );
+					update_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), $debug_data);
 				}
 			}
 		}
@@ -1254,23 +1254,23 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public function _strip_objects( $info = array() ) {
-		foreach ( (array)$info as $key => $value ) {
-			if ( is_array( $value )) {
-				$info[ $key ] = $this->_strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : 0;
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+	public function _strip_objects($info = array()) {
+		foreach ((array) $info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = $this->_strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : 0;
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Doc Comments +1 added lines

@@ -91,6 +91,7 @@
 	 * @param EE_Registration $registration
 	 * @param EE_Question     $question
 	 * @param mixed EE_Answer|NULL      $answer
+	 * @param EE_Answer $answer
 	 * @return EE_Form_Input_Base
 	 */
 	public function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){

Spacing +229 added lines, -230 removed lines

@@ -41,21 +41,21 @@ 
 	 * @access    public
 	 * @param    EE_Checkout $checkout
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'attendee_information';
 		$this->_name = __('Attendee Information', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
 		$this->set_instructions(
-			__( 'Please answer the following registration questions before proceeding.', 'event_espresso' )
+			__('Please answer the following registration questions before proceeding.', 'event_espresso')
 		);
 	}
 
 
 
 	public function translate_js_strings() {
-		EE_Registry::$i18n_js_strings['required_field'] = __( ' is a required question.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['required_field'] = __(' is a required question.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['required_multi_field'] = __(
 			' is a required question. Please enter a value for at least one of the options.',
 			'event_espresso'
@@ -115,7 +115,7 @@ 
 		// calculate taxes
 		$Line_Item_Display->display_line_item(
 			$this->checkout->cart->get_grand_total(),
-			array( 'set_tax_rate' => true )
+			array('set_tax_rate' => true)
 		);
 		/** @var $subsections EE_Form_Section_Proper[] */
 		$subsections = array(
@@ -127,51 +127,51 @@ 
 			'ticket_count' 	=> array()
 		);
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		if ( $registrations ) {
-			foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
 				// can this registration be processed during this visit ?
 				if (
 					$registration instanceof EE_Registration
-					&& $this->checkout->visit_allows_processing_of_this_registration( $registration )
+					&& $this->checkout->visit_allows_processing_of_this_registration($registration)
 				) {
-					$subsections[ $registration->reg_url_link() ] = $this->_registrations_reg_form( $registration );
-					if ( ! $this->checkout->admin_request ) {
-						$template_args['registrations'][ $registration->reg_url_link() ] = $registration;
-						$template_args['ticket_count'][ $registration->ticket()->ID() ] = isset(
-							$template_args['ticket_count'][ $registration->ticket()->ID() ]
+					$subsections[$registration->reg_url_link()] = $this->_registrations_reg_form($registration);
+					if ( ! $this->checkout->admin_request) {
+						$template_args['registrations'][$registration->reg_url_link()] = $registration;
+						$template_args['ticket_count'][$registration->ticket()->ID()] = isset(
+							$template_args['ticket_count'][$registration->ticket()->ID()]
 						)
-							? $template_args['ticket_count'][ $registration->ticket()->ID() ] + 1
+							? $template_args['ticket_count'][$registration->ticket()->ID()] + 1
 							: 1;
 						$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs(
 							$this->checkout->cart->get_grand_total(),
 							'Ticket',
-							array( $registration->ticket()->ID() )
+							array($registration->ticket()->ID())
 						);
-						$ticket_line_item = is_array( $ticket_line_item )
-							? reset( $ticket_line_item )
+						$ticket_line_item = is_array($ticket_line_item)
+							? reset($ticket_line_item)
 							: $ticket_line_item;
-						$template_args['ticket_line_item'][ $registration->ticket()->ID() ] = $Line_Item_Display->display_line_item(
+						$template_args['ticket_line_item'][$registration->ticket()->ID()] = $Line_Item_Display->display_line_item(
 							$ticket_line_item
 						);
 					}
-					if ( $registration->is_primary_registrant() ) {
+					if ($registration->is_primary_registrant()) {
 						$primary_registrant = $registration->reg_url_link();
 					}
 				}
 			}
 			// print_copy_info ?
-			if ( $primary_registrant && ! $this->checkout->admin_request && count( $registrations ) > 1 ) {
+			if ($primary_registrant && ! $this->checkout->admin_request && count($registrations) > 1) {
 				// TODO: add admin option for toggling copy attendee info, then use that value to change $this->_print_copy_info
 				$copy_options['spco_copy_attendee_chk'] = $this->_print_copy_info
 					? $this->_copy_attendee_info_form()
 					: $this->_auto_copy_attendee_info();
 				// generate hidden input
 				if (
-					isset( $subsections[ $primary_registrant ] )
-				     && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
+					isset($subsections[$primary_registrant])
+				     && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper
 				) {
-					$subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false );
+					$subsections[$primary_registrant]->add_subsections($copy_options, 'primary_registrant', false);
 				}
 			}
 
@@ -183,8 +183,7 @@ 
 				'html_id' 					=> $this->reg_form_name(),
 				'subsections' 			=> $subsections,
 				'layout_strategy'		=> $this->checkout->admin_request ?
-					new EE_Div_Per_Section_Layout() :
-					new EE_Template_Layout(
+					new EE_Div_Per_Section_Layout() : new EE_Template_Layout(
 						array(
 							'layout_template_file' 	=> $this->_template, // layout_template
 							'template_args' 				=> $template_args
@@ -202,11 +201,11 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _registrations_reg_form( EE_Registration $registration ) {
+	private function _registrations_reg_form(EE_Registration $registration) {
 		static $attendee_nmbr = 1;
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
+			'html_id'         => 'ee-registration-'.$registration->reg_url_link(),
 			'html_class'      => 'ee-reg-form-attendee-dv',
 			'html_style'      => $this->checkout->admin_request
 				? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
@@ -215,24 +214,24 @@ 
 			'layout_strategy' => new EE_Fieldset_Section_Layout(
 				array(
 					'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text',
-					'legend_text'  => sprintf( __( 'Attendee %d', 'event_espresso' ), $attendee_nmbr )
+					'legend_text'  => sprintf(__('Attendee %d', 'event_espresso'), $attendee_nmbr)
 				)
 			)
 		);
 		// verify that registration has valid event
-		if ( $registration->event() instanceof EE_Event ) {
+		if ($registration->event() instanceof EE_Event) {
 			$query_params = array(
 				array(
 					'Event.EVT_ID' => $registration->event()->ID(),
 					'Event_Question_Group.EQG_primary' => $registration->count() === 1 ? true : false
 				),
-				'order_by'=>array( 'QSG_order'=>'ASC' )
+				'order_by'=>array('QSG_order'=>'ASC')
 			);
-			$question_groups = $registration->event()->question_groups( $query_params );
-			if ( $question_groups ) {
-				foreach ( $question_groups as $question_group ) {
-					if ( $question_group instanceof EE_Question_Group ) {
-						$form_args['subsections'][ $question_group->identifier() ] = $this->_question_group_reg_form(
+			$question_groups = $registration->event()->question_groups($query_params);
+			if ($question_groups) {
+				foreach ($question_groups as $question_group) {
+					if ($question_group instanceof EE_Question_Group) {
+						$form_args['subsections'][$question_group->identifier()] = $this->_question_group_reg_form(
 							$registration,
 							$question_group
 						);
@@ -245,10 +244,10 @@ 
 				// if we have question groups for additional attendees, then display the copy options
 				$this->_print_copy_info = $attendee_nmbr > 1 ? true : $this->_print_copy_info;
 			} else {
-				$form_args['subsections'][ 'attendee_info_not_required_' . $registration->reg_url_link(
-				) ] = new EE_Form_Section_HTML(
+				$form_args['subsections']['attendee_info_not_required_'.$registration->reg_url_link(
+				)] = new EE_Form_Section_HTML(
 					EEH_Template::locate_template(
-						SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_not_required.template.php',
+						SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_not_required.template.php',
 						apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args',
 							array()
@@ -267,12 +266,12 @@ 
 
 			}
 		}
-		if ( $registration->is_primary_registrant() ) {
+		if ($registration->is_primary_registrant()) {
 			// generate hidden input
-			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs( $registration );
+			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs($registration);
 		}
 		$attendee_nmbr++;
-		return new EE_Form_Section_Proper( $form_args );
+		return new EE_Form_Section_Proper($form_args);
 	}
 
 
@@ -293,7 +292,7 @@ 
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
-				'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'html_id' => 'additional-attendee-reg-info-'.$registration->reg_url_link(),
 				'default' => $additional_attendee_reg_info
 			)
 		);
@@ -307,26 +306,26 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _question_group_reg_form( EE_Registration $registration, EE_Question_Group $question_group ){
+	private function _question_group_reg_form(EE_Registration $registration, EE_Question_Group $question_group) {
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id'         => 'ee-reg-form-qstn-grp-' . $question_group->identifier(),
+			'html_id'         => 'ee-reg-form-qstn-grp-'.$question_group->identifier(),
 			'html_class'      => $this->checkout->admin_request
 				? 'form-table ee-reg-form-qstn-grp-dv'
 				: 'ee-reg-form-qstn-grp-dv',
-			'html_label_id'   => 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl',
+			'html_label_id'   => 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl',
 			'subsections'     => array(
-				'reg_form_qstn_grp_hdr' => $this->_question_group_header( $question_group )
+				'reg_form_qstn_grp_hdr' => $this->_question_group_header($question_group)
 			),
 			'layout_strategy' => $this->checkout->admin_request
 				? new EE_Admin_Two_Column_Layout()
 				: new EE_Div_Per_Section_Layout()
 		);
 		// where params
-		$query_params = array( 'QST_deleted' => 0 );
+		$query_params = array('QST_deleted' => 0);
 		// don't load admin only questions on the frontend
-		if ( ! $this->checkout->admin_request ) {
-			$query_params['QST_admin_only'] = array( '!=', true );
+		if ( ! $this->checkout->admin_request) {
+			$query_params['QST_admin_only'] = array('!=', true);
 		}
 		$questions = $question_group->get_many_related(
 			'Question',
@@ -348,10 +347,10 @@ 
 			)
 		);
 		// loop thru questions
-		foreach ( $questions as $question ) {
-			if( $question instanceof EE_Question ){
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
 				$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-				$form_args['subsections'][ $identifier ] = $this->reg_form_question( $registration, $question );
+				$form_args['subsections'][$identifier] = $this->reg_form_question($registration, $question);
 			}
 		}
 		$form_args['subsections'] = apply_filters(
@@ -372,7 +371,7 @@ 
 			)
 		);
 //		d( $form_args );
-		$question_group_reg_form = new EE_Form_Section_Proper( $form_args );
+		$question_group_reg_form = new EE_Form_Section_Proper($form_args);
 		return apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
 			$question_group_reg_form,
@@ -389,11 +388,11 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return 	EE_Form_Section_HTML
 	 */
-	private function _question_group_header( EE_Question_Group $question_group ){
+	private function _question_group_header(EE_Question_Group $question_group) {
 		$html = '';
 		// group_name
-		if ( $question_group->show_group_name() && $question_group->name() !== '' ) {
-			if ( $this->checkout->admin_request ) {
+		if ($question_group->show_group_name() && $question_group->name() !== '') {
+			if ($this->checkout->admin_request) {
 				$html .= EEH_HTML::br();
 				$html .= EEH_HTML::h3(
 					$question_group->name(),
@@ -407,7 +406,7 @@ 
 			}
 		}
 		// group_desc
-		if ( $question_group->show_group_desc() && $question_group->desc() !== '' ) {
+		if ($question_group->show_group_desc() && $question_group->desc() !== '') {
 			$html .= EEH_HTML::p(
 				$question_group->desc(),
 				'',
@@ -417,7 +416,7 @@ 
 			);
 
 		}
-		return new EE_Form_Section_HTML( $html );
+		return new EE_Form_Section_HTML($html);
 	}
 
 
@@ -427,7 +426,7 @@ 
 	 * @return    EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _copy_attendee_info_form(){
+	private function _copy_attendee_info_form() {
 		// array of params to pass to parent constructor
 		return new EE_Form_Section_Proper(
 			array(
@@ -456,7 +455,7 @@ 
 	private function _auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
 			EEH_Template::locate_template(
-				SPCO_REG_STEPS_PATH . $this->_slug . DS . '_auto_copy_attendee_info.template.php',
+				SPCO_REG_STEPS_PATH.$this->_slug.DS.'_auto_copy_attendee_info.template.php',
 				apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args',
 					array()
@@ -480,32 +479,32 @@ 
 		$copy_attendee_info_inputs = array();
 		$prev_ticket = NULL;
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			// for all  attendees other than the primary attendee
-			if ( $registration instanceof EE_Registration && ! $registration->is_primary_registrant() ) {
+			if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
 				// if this is a new ticket OR if this is the very first additional attendee after the primary attendee
-				if ( $registration->ticket()->ID() !== $prev_ticket ) {
+				if ($registration->ticket()->ID() !== $prev_ticket) {
 					$item_name = $registration->ticket()->name();
 					$item_name .= $registration->ticket()->description() !== ''
-						? ' - ' . $registration->ticket()->description()
+						? ' - '.$registration->ticket()->description()
 						: '';
-					$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ] = new EE_Form_Section_HTML(
-						'<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+					$copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']'] = new EE_Form_Section_HTML(
+						'<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>'
 					);
 					$prev_ticket = $registration->ticket()->ID();
 				}
 
-				$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ] = new
+				$copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']'] = new
 				EE_Checkbox_Multi_Input(
 					array(
 						$registration->ID() => sprintf(
-							__( 'Attendee #%s', 'event_espresso' ),
+							__('Attendee #%s', 'event_espresso'),
 							$registration->count()
 						)
 					),
 					array(
-						'html_id'                 => 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+						'html_id'                 => 'spco-copy-attendee-chk-'.$registration->reg_url_link(),
 						'html_class'              => 'spco-copy-attendee-chk ee-do-not-validate',
 						'display_html_label_text' => false
 					)
@@ -525,7 +524,7 @@ 
 	 * @return    EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	private function _additional_primary_registrant_inputs( EE_Registration $registration ){
+	private function _additional_primary_registrant_inputs(EE_Registration $registration) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
@@ -544,7 +543,7 @@ 
 	 * @return    EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	public function reg_form_question( EE_Registration $registration, EE_Question $question ){
+	public function reg_form_question(EE_Registration $registration, EE_Question $question) {
 
 		// if this question was for an attendee detail, then check for that answer
 		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value(
@@ -553,32 +552,32 @@ 
 		);
 		$answer = $answer_value === null
 			? EEM_Answer::instance()->get_one(
-				array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) )
+				array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()))
 			)
 			: null;
 		// if NOT returning to edit an existing registration
 		// OR if this question is for an attendee property
 		// OR we still don't have an EE_Answer object
-		if( $answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link() ) {
+		if ($answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link()) {
 			// create an EE_Answer object for storing everything in
-			$answer = EE_Answer::new_instance ( array(
+			$answer = EE_Answer::new_instance(array(
 				'QST_ID'=> $question->ID(),
 				'REG_ID'=> $registration->ID()
 			));
 		}
 		// verify instance
-		if( $answer instanceof EE_Answer ){
-			if ( ! empty( $answer_value )) {
-				$answer->set( 'ANS_value', $answer_value );
+		if ($answer instanceof EE_Answer) {
+			if ( ! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
 			}
-			$answer->cache( 'Question', $question );
+			$answer->cache('Question', $question);
 			//remember system ID had a bug where sometimes it could be null
-			$answer_cache_id =$question->is_system_question()
-				? $question->system_ID() . '-' . $registration->reg_url_link()
-				: $question->ID() . '-' . $registration->reg_url_link();
-			$registration->cache( 'Answer', $answer, $answer_cache_id );
+			$answer_cache_id = $question->is_system_question()
+				? $question->system_ID().'-'.$registration->reg_url_link()
+				: $question->ID().'-'.$registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
 		}
-		return $this->_generate_question_input( $registration, $question, $answer );
+		return $this->_generate_question_input($registration, $question, $answer);
 
 	}
 
@@ -591,46 +590,46 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	private function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 		$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-		$this->_required_questions[ $identifier ] = $question->required() ? true : false;
+		$this->_required_questions[$identifier] = $question->required() ? true : false;
 		add_filter(
 			'FHEE__EE_Question__generate_form_input__country_options',
-			array( $this, 'use_cached_countries_for_form_input' ),
+			array($this, 'use_cached_countries_for_form_input'),
 			10,
 			4
 		);
 		add_filter(
 			'FHEE__EE_Question__generate_form_input__state_options',
-			array( $this, 'use_cached_states_for_form_input' ),
+			array($this, 'use_cached_states_for_form_input'),
 			10,
 			4
 		);
 		$input_constructor_args = array(
-			'html_name'     => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-			'html_id'       => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-			'html_class'    => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-			'html_label_id' => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_name'     => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+			'html_id'       => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+			'html_class'    => 'ee-reg-qstn ee-reg-qstn-'.$identifier,
+			'html_label_id' => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
 			'html_label_class'	=> 'ee-reg-qstn',
 		);
-		$input_constructor_args['html_label_id'] 	.= '-lbl';
-		if ( $answer instanceof EE_Answer && $answer->ID() ) {
-			$input_constructor_args[ 'html_name' ] .= '[' . $answer->ID() . ']';
-			$input_constructor_args[ 'html_id' ] .= '-' . $answer->ID();
-			$input_constructor_args[ 'html_label_id' ] .= '-' . $answer->ID();
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		if ($answer instanceof EE_Answer && $answer->ID()) {
+			$input_constructor_args['html_name'] .= '['.$answer->ID().']';
+			$input_constructor_args['html_id'] .= '-'.$answer->ID();
+			$input_constructor_args['html_label_id'] .= '-'.$answer->ID();
 		}
-		$form_input =  $question->generate_form_input(
+		$form_input = $question->generate_form_input(
 			$registration,
 			$answer,
 			$input_constructor_args
 		);
 		remove_filter(
 			'FHEE__EE_Question__generate_form_input__country_options',
-			array( $this, 'use_cached_countries_for_form_input' )
+			array($this, 'use_cached_countries_for_form_input')
 		);
 		remove_filter(
 			'FHEE__EE_Question__generate_form_input__state_options',
-			array( $this, 'use_cached_states_for_form_input' )
+			array($this, 'use_cached_states_for_form_input')
 		);
 		return $form_input;
 	}
@@ -652,22 +651,22 @@ 
 		\EE_Registration $registration = null,
 		\EE_Answer $answer = null
 	) {
-		$country_options = array( '' => '' );
+		$country_options = array('' => '');
 		// get possibly cached list of countries
 		$countries = $this->checkout->action === 'process_reg_step'
 			? EEM_Country::instance()->get_all_countries()
 			: EEM_Country::instance()->get_all_active_countries();
-		if ( ! empty( $countries )) {
-			foreach( $countries as $country ){
-				if ( $country instanceof EE_Country ) {
-					$country_options[ $country->ID() ] = $country->name();
+		if ( ! empty($countries)) {
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$country_options[$country->ID()] = $country->name();
 				}
 			}
 		}
-		if( $question instanceof EE_Question
-			&& $registration instanceof EE_Registration ) {
+		if ($question instanceof EE_Question
+			&& $registration instanceof EE_Registration) {
 			$answer = EEM_Answer::instance()->get_one(
-				array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) )
+				array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()))
 			);
 		} else {
 			$answer = EE_Answer::new_instance();
@@ -700,14 +699,14 @@ 
 		\EE_Registration $registration = null,
 		\EE_Answer $answer = null
 	) {
-		$state_options = array( '' => array( '' => ''));
+		$state_options = array('' => array('' => ''));
 		$states = $this->checkout->action === 'process_reg_step'
 			? EEM_State::instance()->get_all_states()
 			: EEM_State::instance()->get_all_active_states();
-		if ( ! empty( $states )) {
-			foreach( $states as $state ){
-				if ( $state instanceof EE_State ) {
-					$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+		if ( ! empty($states)) {
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$state_options[$state->country()->name()][$state->ID()] = $state->name();
 				}
 			}
 		}
@@ -735,24 +734,24 @@ 
 	 * @throws \EE_Error
 	 */
 	public function process_reg_step() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab validated data from form
 		$valid_data = $this->checkout->current_step->valid_data();
 		// EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
 		// EEH_Debug_Tools::printr( $valid_data, '$valid_data', __FILE__, __LINE__ );
 		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-		if ( empty( $valid_data ))  {
+		if (empty($valid_data)) {
 			EE_Error::add_error(
-				__( 'No valid question responses were received.', 'event_espresso' ),
+				__('No valid question responses were received.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
 			);
 			return false;
 		}
-		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg ) {
+		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
 			EE_Error::add_error(
-				__( 'A valid transaction could not be initiated for processing your registrations.', 'event_espresso' ),
+				__('A valid transaction could not be initiated for processing your registrations.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -760,11 +759,11 @@ 
 			return false;
 		}
 		// get cached registrations
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
 		// verify we got the goods
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			EE_Error::add_error(
-				__( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ),
+				__('Your form data could not be applied to any valid registrations.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -772,15 +771,15 @@ 
 			return false;
 		}
 		// extract attendee info from form data and save to model objects
-		$registrations_processed = $this->_process_registrations( $registrations, $valid_data );
+		$registrations_processed = $this->_process_registrations($registrations, $valid_data);
 		// if first pass thru SPCO,
 		// then let's check processed registrations against the total number of tickets in the cart
-		if ( $registrations_processed === false ) {
+		if ($registrations_processed === false) {
 			// but return immediately if the previous step exited early due to errors
 			return false;
-		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count ) {
+		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
 			// generate a correctly translated string for all possible singular/plural combinations
-			if ( $this->checkout->total_ticket_count === 1 && $registrations_processed !== 1 ) {
+			if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
 				$error_msg = sprintf(
 					__(
 						'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
@@ -789,7 +788,7 @@ 
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
-			} else if ( $this->checkout->total_ticket_count !== 1 && $registrations_processed === 1 ) {
+			} else if ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
 				$error_msg = sprintf(
 					__(
 						'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
@@ -808,17 +807,17 @@ 
 					$registrations_processed
 				);
 			}
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// mark this reg step as completed
 		$this->set_completed();
 		$this->_set_success_message(
-			__( 'The Attendee Information Step has been successfully completed.', 'event_espresso' )
+			__('The Attendee Information Step has been successfully completed.', 'event_espresso')
 		);
 		//do action in case a plugin wants to do something with the data submitted in step 1.
 		//passes EE_Single_Page_Checkout, and it's posted data
-		do_action( 'AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data );
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
 		return true;
 	}
 
@@ -832,9 +831,9 @@ 
 	 * @return boolean | int
 	 * @throws \EE_Error
 	 */
-	private function _process_registrations( $registrations = array(), $valid_data = array() ) {
+	private function _process_registrations($registrations = array(), $valid_data = array()) {
 		// load resources and set some defaults
-		EE_Registry::instance()->load_model( 'Attendee' );
+		EE_Registry::instance()->load_model('Attendee');
 		// holder for primary registrant attendee object
 		$this->checkout->primary_attendee_obj = NULL;
 		// array for tracking reg form data for the primary registrant
@@ -851,9 +850,9 @@ 
 		// attendee counter
 		$att_nmbr = 0;
 		// grab the saved registrations from the transaction
-		foreach ( $registrations  as $registration ) {
+		foreach ($registrations  as $registration) {
 			// verify EE_Registration object
-			if ( ! $registration instanceof EE_Registration ) {
+			if ( ! $registration instanceof EE_Registration) {
 				EE_Error::add_error(
 					__(
 						'An invalid Registration object was discovered when attempting to process your registration information.',
@@ -868,12 +867,12 @@ 
 			/** @var string $reg_url_link */
 			$reg_url_link = $registration->reg_url_link();
 			// reg_url_link exists ?
-			if ( ! empty( $reg_url_link ) ) {
+			if ( ! empty($reg_url_link)) {
 				// should this registration be processed during this visit ?
-				if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
+				if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
 					// if NOT revisiting, then let's save the registration now,
 					// so that we have a REG_ID to use when generating other objects
-					if ( ! $this->checkout->revisit ) {
+					if ( ! $this->checkout->revisit) {
 						$registration->save();
 					}
 					/**
@@ -883,7 +882,7 @@ 
 					 * @var bool   if true is returned by the plugin then the
 					 *      		registration processing is halted.
 					 */
-					if ( apply_filters(
+					if (apply_filters(
 						'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
 						false,
 						$att_nmbr,
@@ -891,38 +890,38 @@ 
 						$registrations,
 						$valid_data,
 						$this
-					) ) {
+					)) {
 						return false;
 					}
 
 					// Houston, we have a registration!
 					$att_nmbr++;
-					$this->_attendee_data[ $reg_url_link ] = array();
+					$this->_attendee_data[$reg_url_link] = array();
 					// grab any existing related answer objects
 					$this->_registration_answers = $registration->answers();
 					// unset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] );
-					if ( isset( $valid_data[ $reg_url_link ] ) ) {
+					if (isset($valid_data[$reg_url_link])) {
 						// do we need to copy basic info from primary attendee ?
-						$copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] )
-						                && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0
+						$copy_primary = isset($valid_data[$reg_url_link]['additional_attendee_reg_info'])
+						                && absint($valid_data[$reg_url_link]['additional_attendee_reg_info']) === 0
 							? true
 							: false;
 						// filter form input data for this registration
-						$valid_data[ $reg_url_link ] = (array)apply_filters(
+						$valid_data[$reg_url_link] = (array) apply_filters(
 							'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-							$valid_data[ $reg_url_link ]
+							$valid_data[$reg_url_link]
 						);
 						// EEH_Debug_Tools::printr( $valid_data[ $reg_url_link ], '$valid_data[ $reg_url_link ]', __FILE__, __LINE__ );
-						if ( isset( $valid_data['primary_attendee'] )) {
-							$primary_registrant['line_item_id'] =  ! empty( $valid_data['primary_attendee'] )
+						if (isset($valid_data['primary_attendee'])) {
+							$primary_registrant['line_item_id'] = ! empty($valid_data['primary_attendee'])
 								? $valid_data['primary_attendee']
 								: false;
-							unset( $valid_data['primary_attendee'] );
+							unset($valid_data['primary_attendee']);
 						}
 						// now loop through our array of valid post data && process attendee reg forms
-						foreach ( $valid_data[ $reg_url_link ] as $form_section => $form_inputs ) {
-							if ( ! in_array( $form_section, $non_input_form_sections )) {
-								foreach ( $form_inputs as $form_input => $input_value ) {
+						foreach ($valid_data[$reg_url_link] as $form_section => $form_inputs) {
+							if ( ! in_array($form_section, $non_input_form_sections)) {
+								foreach ($form_inputs as $form_input => $input_value) {
 									// \EEH_Debug_Tools::printr( $input_value, $form_input, __FILE__, __LINE__ );
 									// check for critical inputs
 									if (
@@ -936,16 +935,16 @@ 
 									// store a bit of data about the primary attendee
 									if (
 										$att_nmbr === 1
-										&& ! empty( $input_value )
+										&& ! empty($input_value)
 										&& $reg_url_link === $primary_registrant['line_item_id']
 									) {
-										$primary_registrant[ $form_input ] = $input_value;
+										$primary_registrant[$form_input] = $input_value;
 									} else if (
 										$copy_primary
 										&& $input_value === null
-										&& isset( $primary_registrant[ $form_input ] )
+										&& isset($primary_registrant[$form_input])
 									) {
-										$input_value = $primary_registrant[ $form_input ];
+										$input_value = $primary_registrant[$form_input];
 									}
 									// now attempt to save the input data
 									if (
@@ -987,55 +986,55 @@ 
 						// have we met before?
 						$attendee = $this->_find_existing_attendee(
 							$registration,
-							$this->_attendee_data[ $reg_url_link ]
+							$this->_attendee_data[$reg_url_link]
 						);
 						// did we find an already existing record for this attendee ?
-						if ( $attendee instanceof EE_Attendee ) {
+						if ($attendee instanceof EE_Attendee) {
 							$attendee = $this->_update_existing_attendee_data(
 								$attendee,
-								$this->_attendee_data[ $reg_url_link ]
+								$this->_attendee_data[$reg_url_link]
 							);
 						} else {
 							// ensure critical details are set for additional attendees
-							$this->_attendee_data[ $reg_url_link ] = $att_nmbr > 1
+							$this->_attendee_data[$reg_url_link] = $att_nmbr > 1
 								? $this->_copy_critical_attendee_details_from_primary_registrant(
-									$this->_attendee_data[ $reg_url_link ]
+									$this->_attendee_data[$reg_url_link]
 								)
-								: $this->_attendee_data[ $reg_url_link ];
+								: $this->_attendee_data[$reg_url_link];
 							$attendee = $this->_create_new_attendee(
 								$registration,
-								$this->_attendee_data[ $reg_url_link ]
+								$this->_attendee_data[$reg_url_link]
 							);
 						}
 						// who's #1 ?
-						if ( $att_nmbr === 1 ) {
+						if ($att_nmbr === 1) {
 							$this->checkout->primary_attendee_obj = $attendee;
 						}
 					}
 					// EEH_Debug_Tools::printr( $attendee, '$attendee', __FILE__, __LINE__ );
 					// add relation to registration, set attendee ID, and cache attendee
-					$this->_associate_attendee_with_registration( $registration, $attendee );
+					$this->_associate_attendee_with_registration($registration, $attendee);
 					// \EEH_Debug_Tools::printr( $registration, '$registration', __FILE__, __LINE__ );
-					if ( ! $registration->attendee() instanceof EE_Attendee ) {
-						EE_Error::add_error( sprintf( __( 'Registration %s has an invalid or missing Attendee object.', 'event_espresso' ), $reg_url_link ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! $registration->attendee() instanceof EE_Attendee) {
+						EE_Error::add_error(sprintf(__('Registration %s has an invalid or missing Attendee object.', 'event_espresso'), $reg_url_link), __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 					/** @type EE_Registration_Processor $registration_processor */
-					$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+					$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 					// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-					$registration_processor->toggle_incomplete_registration_status_to_default( $registration, false );
+					$registration_processor->toggle_incomplete_registration_status_to_default($registration, false);
 					// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
 					$this->checkout->transaction->toggle_failed_transaction_status();
 					// if we've gotten this far, then let's save what we have
 					$registration->save();
 					// add relation between TXN and registration
-					$this->_associate_registration_with_transaction( $registration );
+					$this->_associate_registration_with_transaction($registration);
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
-				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			} else {
+				EE_Error::add_error(__('An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// remove malformed data
-				unset( $valid_data[ $reg_url_link ] );
+				unset($valid_data[$reg_url_link]);
 				return false;
 			}
 
@@ -1064,26 +1063,26 @@ 
 		// \EEH_Debug_Tools::printr( $input_value, '$input_value', __FILE__, __LINE__ );
 		// allow for plugins to hook in and do their own processing of the form input.
 		// For plugins to bypass normal processing here, they just need to return a boolean value.
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
 			false,
 			$registration,
 			$form_input,
 			$input_value,
 			$this
-		) ) {
+		)) {
 			return true;
 		}
 		// $answer_cache_id is the key used to find the EE_Answer we want
 		$answer_cache_id = $this->checkout->reg_url_link
 			? $form_input
-			: $form_input . '-' . $registration->reg_url_link();
-		$answer_is_obj = isset( $this->_registration_answers[ $answer_cache_id ] )
-		                 && $this->_registration_answers[ $answer_cache_id ] instanceof EE_Answer
+			: $form_input.'-'.$registration->reg_url_link();
+		$answer_is_obj = isset($this->_registration_answers[$answer_cache_id])
+		                 && $this->_registration_answers[$answer_cache_id] instanceof EE_Answer
 			? true
 			: false;
 		//rename form_inputs if they are EE_Attendee properties
-		switch( (string)$form_input ) {
+		switch ((string) $form_input) {
 
 			case 'state' :
 			case 'STA_ID' :
@@ -1098,32 +1097,32 @@ 
 				break;
 
 			default :
-				$ATT_input = 'ATT_' . $form_input;
+				$ATT_input = 'ATT_'.$form_input;
 				//EEH_Debug_Tools::printr( $ATT_input, '$ATT_input', __FILE__, __LINE__ );
-				$attendee_property = EEM_Attendee::instance()->has_field( $ATT_input ) ? true : false;
-				$form_input = $attendee_property ? 'ATT_' . $form_input : $form_input;
+				$attendee_property = EEM_Attendee::instance()->has_field($ATT_input) ? true : false;
+				$form_input = $attendee_property ? 'ATT_'.$form_input : $form_input;
 		}
 		// EEH_Debug_Tools::printr( $answer_cache_id, '$answer_cache_id', __FILE__, __LINE__ );
 		// EEH_Debug_Tools::printr( $attendee_property, '$attendee_property', __FILE__, __LINE__ );
 		// EEH_Debug_Tools::printr( $answer_is_obj, '$answer_is_obj', __FILE__, __LINE__ );
 		// if this form input has a corresponding attendee property
-		if ( $attendee_property ) {
-			$this->_attendee_data[ $registration->reg_url_link() ][ $form_input ] = $input_value;
-			if ( $answer_is_obj ) {
+		if ($attendee_property) {
+			$this->_attendee_data[$registration->reg_url_link()][$form_input] = $input_value;
+			if ($answer_is_obj) {
 				// and delete the corresponding answer since we won't be storing this data in that object
-				$registration->_remove_relation_to( $this->_registration_answers[ $answer_cache_id ], 'Answer' );
-				$this->_registration_answers[ $answer_cache_id ]->delete_permanently();
+				$registration->_remove_relation_to($this->_registration_answers[$answer_cache_id], 'Answer');
+				$this->_registration_answers[$answer_cache_id]->delete_permanently();
 			}
 			return true;
-		} elseif ( $answer_is_obj ) {
+		} elseif ($answer_is_obj) {
 			// save this data to the answer object
-			$this->_registration_answers[ $answer_cache_id ]->set_value( $input_value );
-			$result = $this->_registration_answers[ $answer_cache_id ]->save();
+			$this->_registration_answers[$answer_cache_id]->set_value($input_value);
+			$result = $this->_registration_answers[$answer_cache_id]->save();
 			return $result !== false ? true : false;
 		} else {
-			foreach ( $this->_registration_answers as $answer ) {
-				if ( $answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id ) {
-					$answer->set_value( $input_value );
+			foreach ($this->_registration_answers as $answer) {
+				if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
+					$answer->set_value($input_value);
 					$result = $answer->save();
 					return $result !== false ? true : false;
 				}
@@ -1145,15 +1144,15 @@ 
 		$form_input = '',
 		$input_value = ''
 	) {
-		if ( empty( $input_value ) ) {
+		if (empty($input_value)) {
 			// if the form input isn't marked as being required, then just return
-			if ( ! isset( $this->_required_questions[ $form_input ] ) || ! $this->_required_questions[ $form_input ] ) {
+			if ( ! isset($this->_required_questions[$form_input]) || ! $this->_required_questions[$form_input]) {
 				return true;
 			}
-			switch ( $form_input ) {
+			switch ($form_input) {
 				case 'fname' :
 					EE_Error::add_error(
-						__( 'First Name is a required value.', 'event_espresso' ),
+						__('First Name is a required value.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1162,7 +1161,7 @@ 
 					break;
 				case 'lname' :
 					EE_Error::add_error(
-						__( 'Last Name is a required value.', 'event_espresso' ),
+						__('Last Name is a required value.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1171,7 +1170,7 @@ 
 					break;
 				case 'email' :
 					EE_Error::add_error(
-						__( 'Please enter a valid email address.', 'event_espresso' ),
+						__('Please enter a valid email address.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1204,21 +1203,21 @@ 
 	 * @param array           $attendee_data
 	 * @return boolean
 	 */
-	private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _find_existing_attendee(EE_Registration $registration, $attendee_data = array()) {
 		$existing_attendee = null;
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		$ATT_fname = isset( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_fname'] )
+		$ATT_fname = isset($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_fname'])
 			? $attendee_data['ATT_fname']
 			: '';
-		$ATT_lname = isset( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_lname'] )
+		$ATT_lname = isset($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_lname'])
 			? $attendee_data['ATT_lname']
 			: '';
-		$ATT_email = isset( $attendee_data['ATT_email'] ) && ! empty( $attendee_data['ATT_email'] )
+		$ATT_email = isset($attendee_data['ATT_email']) && ! empty($attendee_data['ATT_email'])
 			? $attendee_data['ATT_email']
 			: '';
 		// but only if those have values
-		if ( $ATT_fname && $ATT_lname && $ATT_email ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $ATT_fname,
 				'ATT_lname' => $ATT_lname,
 				'ATT_email' => $ATT_email
@@ -1242,13 +1241,13 @@ 
 	 * @return \EE_Attendee
 	 * @throws \EE_Error
 	 */
-	private function _update_existing_attendee_data( EE_Attendee $existing_attendee, $attendee_data = array() ) {
+	private function _update_existing_attendee_data(EE_Attendee $existing_attendee, $attendee_data = array()) {
 		// first remove fname, lname, and email from attendee data
-		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// now loop thru what's left and add to attendee CPT
-		foreach ( $attendee_data as $property_name => $property_value ) {
-			if ( ! in_array( $property_name, $dont_set ) && EEM_Attendee::instance()->has_field( $property_name )) {
-				$existing_attendee->set( $property_name, $property_value );
+		foreach ($attendee_data as $property_name => $property_value) {
+			if ( ! in_array($property_name, $dont_set) && EEM_Attendee::instance()->has_field($property_name)) {
+				$existing_attendee->set($property_name, $property_value);
 			}
 		}
 		// better save that now
@@ -1266,11 +1265,11 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _associate_attendee_with_registration( EE_Registration $registration, EE_Attendee $attendee ) {
+	private function _associate_attendee_with_registration(EE_Registration $registration, EE_Attendee $attendee) {
 		// add relation to attendee
-		$registration->_add_relation_to( $attendee, 'Attendee' );
-		$registration->set_attendee_id( $attendee->ID() );
-		$registration->update_cache_after_object_save( 'Attendee', $attendee );
+		$registration->_add_relation_to($attendee, 'Attendee');
+		$registration->set_attendee_id($attendee->ID());
+		$registration->update_cache_after_object_save('Attendee', $attendee);
 	}
 
 
@@ -1282,10 +1281,10 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _associate_registration_with_transaction( EE_Registration $registration ) {
+	private function _associate_registration_with_transaction(EE_Registration $registration) {
 		// add relation to attendee
-		$this->checkout->transaction->_add_relation_to( $registration, 'Registration' );
-		$this->checkout->transaction->update_cache_after_object_save( 'Registration', $registration );
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
 	}
 
 
@@ -1298,14 +1297,14 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	private function _copy_critical_attendee_details_from_primary_registrant( $attendee_data = array() ) {
+	private function _copy_critical_attendee_details_from_primary_registrant($attendee_data = array()) {
 		// bare minimum critical details include first name, last name, email address
-		$critical_attendee_details = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$critical_attendee_details = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// add address info to critical details?
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
 			false
-		) ) {
+		)) {
 			$address_details = array(
 				'ATT_address',
 				'ATT_address2',
@@ -1315,13 +1314,13 @@ 
 				'ATT_zip',
 				'ATT_phone'
 			);
-			$critical_attendee_details = array_merge( $critical_attendee_details, $address_details );
+			$critical_attendee_details = array_merge($critical_attendee_details, $address_details);
 		}
-		foreach ( $critical_attendee_details as $critical_attendee_detail ) {
-			if ( ! isset( $attendee_data[ $critical_attendee_detail ] )
-			     || empty( $attendee_data[ $critical_attendee_detail ] )
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if ( ! isset($attendee_data[$critical_attendee_detail])
+			     || empty($attendee_data[$critical_attendee_detail])
 			) {
-				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get(
+				$attendee_data[$critical_attendee_detail] = $this->checkout->primary_attendee_obj->get(
 					$critical_attendee_detail
 				);
 			}
@@ -1339,11 +1338,11 @@ 
 	 * @return \EE_Attendee
 	 * @throws \EE_Error
 	 */
-	private function _create_new_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _create_new_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// create new attendee object
-		$new_attendee = EE_Attendee::new_instance( $attendee_data );
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
 		// set author to event creator
-		$new_attendee->set( 'ATT_author', $registration->event()->wp_user() );
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
 		$new_attendee->save();
 		return $new_attendee;
 	}
@@ -1360,7 +1359,7 @@ 
 	 */
 	public function update_reg_step() {
 		// save everything
-		if ( $this->process_reg_step() ) {
+		if ($this->process_reg_step()) {
 			$this->checkout->redirect = true;
 			$this->checkout->redirect_url = add_query_arg(
 				array(
@@ -1369,7 +1368,7 @@ 
 				),
 				$this->checkout->thank_you_page_url
 			);
-			$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 			return true;
 		}
 		return false;

core/EE_Payment_Processor.core.php

Spacing +128 added lines, -128 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -41,7 +41,7 @@ 
 	 *@access private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
+		do_action('AHEE__EE_Payment_Processor__construct');
 	}
 
 
@@ -80,7 +80,7 @@ 
 		$update_txn = true,
 		$cancel_url = ''
 	) {
-		if( (float)$amount < 0 ) {
+		if ((float) $amount < 0) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -93,33 +93,33 @@ 
 			);
 		}
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $cancel_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $cancel_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -135,11 +135,11 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type \EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
+		if ( ! $primary_reg instanceof EE_Registration) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -150,7 +150,7 @@ 
 				)
 			);
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -187,92 +187,92 @@ 
 		$update_txn = true,
 		$separate_IPN_request = true
 	) {
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		$_req_data = $this->_remove_unusable_characters_from_array( (array)$_req_data );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
+		EE_Registry::instance()->load_model('Change_Log');
+		$_req_data = $this->_remove_unusable_characters_from_array((array) $_req_data);
+		EE_Processor_Base::set_IPN($separate_IPN_request);
 		$obj_for_log = null;
-		if( $transaction instanceof EE_Transaction ){
+		if ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-			if( $payment_method instanceof EE_Payment_Method ) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				$obj_for_log = EEM_Payment::instance()->get_one(
 					array(
-						array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ),
-						'order_by' => array( 'PAY_timestamp' => 'desc' )
+						array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()),
+						'order_by' => array('PAY_timestamp' => 'desc')
 					)
 				);
 			}
-		} else if( $payment_method instanceof EE_Payment ) {
+		} else if ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
 		}
 		$log = EEM_Change_Log::instance()->log(
 			EEM_Change_Log::type_gateway,
-			array( 'IPN data received' => $_req_data ),
+			array('IPN data received' => $_req_data),
 			$obj_for_log
 		);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-						$payment = $payment_method->type_obj()->handle_ipn( $_req_data, $transaction );
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
 						$log->set_object($payment);
 				} else {
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_payment_methods = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_payment_methods as $active_payment_method ){
-					try{
-						$payment = $active_payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_payment_methods as $active_payment_method) {
+					try {
+						$payment = $active_payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						$payment_method = $active_payment_method;
 						EEM_Change_Log::instance()->log(
 							EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment
 						);
 						break;
-					} catch( EE_Error $e ) {
+					} catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
-					__( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ),
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					__('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -287,10 +287,10 @@ 
 	 * @param  array $request_data
 	 * @return array
 	 */
-	protected function _remove_unusable_characters_from_array( array $request_data ) {
+	protected function _remove_unusable_characters_from_array(array $request_data) {
 		$return_data = array();
-		foreach( $request_data as $key => $value ) {
-			$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+		foreach ($request_data as $key => $value) {
+			$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 		}
 		return $return_data;
 	}
@@ -302,8 +302,8 @@ 
 	 * @param string $request_data
 	 * @return string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		return preg_replace( '/[^[:print:]]/', '', $request_data );
+	protected function _remove_unusable_characters($request_data) {
+		return preg_replace('/[^[:print:]]/', '', $request_data);
 	}
 
 
@@ -325,13 +325,13 @@ 
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO,
 	 *                                      to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -354,9 +354,9 @@ 
 		EE_Payment $payment_to_refund,
 		$refund_info = array()
 	) {
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->type_obj()->process_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -397,12 +397,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -412,38 +412,38 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
-				if(
+			if ($payment instanceof EE_Payment && $payment->ID()) {
+				if (
 					$payment->payment_method() instanceof EE_Payment_Method
 					&& $payment->payment_method()->type_obj() instanceof EE_PMT_Base
-				){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+				) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved()
 					? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful'
 					: $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' );
+			do_action($do_action, $transaction, $payment);
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action');
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -463,25 +463,25 @@ 
 		$registrations = array()
 	) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
 			$registrations = $transaction->registrations(
 				array(
 					array(
 						// only these reg statuses can receive payments
-						'STS_ID'           => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-						'REG_final_price'  => array( '!=', 0 ),
-						'REG_final_price*' => array( '!=', 'REG_paid', true ),
+						'STS_ID'           => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+						'REG_final_price'  => array('!=', 0),
+						'REG_final_price*' => array('!=', 'REG_paid', true),
 					)
 				)
 			);
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 		// todo: break out the following logic into a separate strategy class
@@ -493,28 +493,28 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$available_payment_amount = abs($payment->amount());
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
-		if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) {
+		if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ),
-					EEH_Template::format_currency( $available_payment_amount ),
-					implode( ', ',  array_keys( $registrations ) ),
+					__('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'),
+					EEH_Template::format_currency($available_payment_amount),
+					implode(', ', array_keys($registrations)),
 					'<br/>',
-					EEH_Template::format_currency( $payment->amount() )
+					EEH_Template::format_currency($payment->amount())
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -532,17 +532,17 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount -= $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -558,19 +558,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -587,21 +587,21 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = (float)abs( $available_refund_amount );
+			$available_refund_amount = (float) abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, (float)$registration->paid() );
+			$refund_amount = min($available_refund_amount, (float) $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount -= $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = (float)abs( $refund_amount ) * -1;
+			$refund_amount = (float) abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -620,53 +620,53 @@ 
 	 * @param bool           $IPN
 	 * @throws \EE_Error
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = 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');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction->reg_step_completed( 'payment_options' );
+		$payment_options_step_completed = $transaction->reg_step_completed('payment_options');
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
 			$payment_options_step_completed = $transaction->set_reg_step_completed(
 				'payment_options'
 			);
 		}
 		// maybe update status, but don't save transaction just yet
-		$transaction->update_status_based_on_total_paid( false );
+		$transaction->update_status_based_on_total_paid(false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction->reg_step_completed( 'finalize_registration' );
+		$finalized = $transaction->reg_step_completed('finalize_registration');
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction->set_reg_step_initiated( 'finalize_registration' );
+			$finalized = $transaction->set_reg_step_initiated('finalize_registration');
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		$payment_method = $payment->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method ) {
+		if ($payment_method instanceof EE_Payment_Method) {
 			$payment_method_type_obj = $payment_method->type_obj();
-			if ( $payment_method_type_obj instanceof EE_PMT_Base ) {
+			if ($payment_method_type_obj instanceof EE_PMT_Base) {
 				$gateway = $payment_method_type_obj->get_gateway();
-				if ( $gateway instanceof EE_Gateway ){
+				if ($gateway instanceof EE_Gateway) {
 					$gateway->log(
 						array(
-							'message'               => __( 'Post Payment Transaction Details', 'event_espresso' ),
+							'message'               => __('Post Payment Transaction Details', 'event_espresso'),
 							'transaction'           => $transaction->model_field_array(),
 							'finalized'             => $finalized,
 							'IPN'                   => $IPN,

core/business/EE_Transaction_Processor.class.php

Spacing +86 added lines, -86 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Processor
@@ -50,10 +50,10 @@ 
 	 * @param array $registration_query_params
 	 *@return EE_Transaction_Processor instance
 	 */
-	public static function instance( $registration_query_params = array() ) {
+	public static function instance($registration_query_params = array()) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Processor ) {
-			self::$_instance = new self( $registration_query_params );
+		if ( ! self::$_instance instanceof EE_Transaction_Processor) {
+			self::$_instance = new self($registration_query_params);
 		}
 		return self::$_instance;
 	}
@@ -63,9 +63,9 @@ 
 	/**
 	 * @param array $registration_query_params
 	 */
-	private function __construct( $registration_query_params = array() ) {
+	private function __construct($registration_query_params = array()) {
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access private
 	 * @param array $registration_query_params
 	 */
-	private function _set_registration_query_params( $registration_query_params ) {
-		$this->_registration_query_params = ! empty( $registration_query_params ) ? $registration_query_params : array( 'order_by' => array( 'REG_count' => 'ASC' ));
+	private function _set_registration_query_params($registration_query_params) {
+		$this->_registration_query_params = ! empty($registration_query_params) ? $registration_query_params : array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -104,10 +104,10 @@ 
 		);
 		// send messages
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		$registration_processor->trigger_registration_update_notifications(
 			$transaction->primary_registration(),
-			array( 'manually_updated' 	=> true )
+			array('manually_updated' 	=> true)
 		);
 		do_action(
 			'AHEE__EE_Transaction_Processor__manually_update_registration_statuses',
@@ -194,13 +194,13 @@ 
 		$registration_query_params = array()
 	) {
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// get final reg step status
 		$finalized = $transaction->final_reg_step_completed();
 		// if the 'finalize_registration' step has been initiated (has a timestamp)
 		// but has not yet been fully completed (TRUE)
-		if ( is_int( $finalized ) && $finalized !== false && $finalized !== true ) {
-			$transaction->set_reg_step_completed( 'finalize_registration' );
+		if (is_int($finalized) && $finalized !== false && $finalized !== true) {
+			$transaction->set_reg_step_completed('finalize_registration');
 			$finalized = true;
 		}
 		$transaction->save();
@@ -223,7 +223,7 @@ 
 
 		// send messages
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		$registration_processor->trigger_registration_update_notifications(
 			$transaction->primary_registration(),
 			$update_params
@@ -254,22 +254,22 @@ 
 		$update_txn = true
 	) {
 		// these reg statuses should not be considered in any calculations involving monies owing
-		$closed_reg_statuses = ! empty( $closed_reg_statuses ) ? $closed_reg_statuses : EEM_Registration::closed_reg_statuses();
-		if ( in_array( $registration->status_ID(), $closed_reg_statuses ) ) {
+		$closed_reg_statuses = ! empty($closed_reg_statuses) ? $closed_reg_statuses : EEM_Registration::closed_reg_statuses();
+		if (in_array($registration->status_ID(), $closed_reg_statuses)) {
 			return false;
 		}
 		try {
-			$transaction = $this->get_transaction_for_registration( $registration );
+			$transaction = $this->get_transaction_for_registration($registration);
 			$ticket_line_item = $this->get_ticket_line_item_for_transaction_registration(
 				$transaction,
 				$registration
 			);
 			// un-cancel the ticket
-			$success = EEH_Line_Item::reinstate_canceled_ticket_line_item( $ticket_line_item );
-		} catch ( EE_Error $e ) {
+			$success = EEH_Line_Item::reinstate_canceled_ticket_line_item($ticket_line_item);
+		} catch (EE_Error $e) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The Ticket Line Item for Registration %1$d could not be reinstated because :%2$s%3$s', 'event_espresso' ),
+					__('The Ticket Line Item for Registration %1$d could not be reinstated because :%2$s%3$s', 'event_espresso'),
 					$registration->ID(),
 					'<br />',
 					$e->getMessage()
@@ -278,7 +278,7 @@ 
 			);
 			return false;
 		}
-		if ( $update_txn ) {
+		if ($update_txn) {
 			return $transaction->save() ? $success : false;
 		}
 		return $success;
@@ -302,18 +302,18 @@ 
 		$update_txn = true
 	) {
 		// these reg statuses should not be considered in any calculations involving monies owing
-		$closed_reg_statuses = ! empty( $closed_reg_statuses ) ? $closed_reg_statuses : EEM_Registration::closed_reg_statuses();
-		if ( ! in_array( $registration->status_ID(), $closed_reg_statuses ) ) {
+		$closed_reg_statuses = ! empty($closed_reg_statuses) ? $closed_reg_statuses : EEM_Registration::closed_reg_statuses();
+		if ( ! in_array($registration->status_ID(), $closed_reg_statuses)) {
 			return false;
 		}
 		try {
-			$transaction = $this->get_transaction_for_registration( $registration );
-			$ticket_line_item = $this->get_ticket_line_item_for_transaction_registration( $transaction, $registration );
-			EEH_Line_Item::cancel_ticket_line_item( $ticket_line_item );
-		} catch ( EE_Error $e ) {
+			$transaction = $this->get_transaction_for_registration($registration);
+			$ticket_line_item = $this->get_ticket_line_item_for_transaction_registration($transaction, $registration);
+			EEH_Line_Item::cancel_ticket_line_item($ticket_line_item);
+		} catch (EE_Error $e) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The Ticket Line Item for Registration %1$d could not be cancelled because :%2$s%3$s', 'event_espresso' ),
+					__('The Ticket Line Item for Registration %1$d could not be cancelled because :%2$s%3$s', 'event_espresso'),
 					$registration->ID(),
 					'<br />',
 					$e->getMessage()
@@ -322,7 +322,7 @@ 
 			);
 			return false;
 		}
-		if ( $update_txn ) {
+		if ($update_txn) {
 			return $transaction->save() ? true : false;
 		}
 		return true;
@@ -338,12 +338,12 @@ 
 	 * @return 	EE_Transaction
 	 * @throws 	EE_Error
 	 */
-	public function get_transaction_for_registration( EE_Registration $registration ) {
+	public function get_transaction_for_registration(EE_Registration $registration) {
 		$transaction = $registration->transaction();
-		if ( ! $transaction instanceof EE_Transaction ) {
+		if ( ! $transaction instanceof EE_Transaction) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The Transaction for Registration %1$d was not found or is invalid.', 'event_espresso' ),
+					__('The Transaction for Registration %1$d was not found or is invalid.', 'event_espresso'),
 					$registration->ID()
 				)
 			);
@@ -366,16 +366,16 @@ 
 		EE_Transaction $transaction,
 		EE_Registration $registration
 	) {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
+		EE_Registry::instance()->load_helper('Line_Item');
 		$ticket_line_item = EEM_Line_Item::instance()->get_ticket_line_item_for_transaction(
 			$transaction->ID(),
 			$registration->ticket_ID()
 		);
-		if ( ! $ticket_line_item instanceof EE_Line_Item ) {
+		if ( ! $ticket_line_item instanceof EE_Line_Item) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The Line Item for Transaction %1$d and Ticket %2$d was not found or is invalid.',
-						'event_espresso' ),
+					__('The Line Item for Transaction %1$d and Ticket %2$d was not found or is invalid.',
+						'event_espresso'),
 					$transaction->ID(),
 					$registration->ticket_ID()
 				)
@@ -408,22 +408,22 @@ 
 		$update_txn = true
 	) {
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// these reg statuses should not be considered in any calculations involving monies owing
-		$closed_reg_statuses = ! empty( $closed_reg_statuses ) ? $closed_reg_statuses : EEM_Registration::closed_reg_statuses();
+		$closed_reg_statuses = ! empty($closed_reg_statuses) ? $closed_reg_statuses : EEM_Registration::closed_reg_statuses();
 		// loop through cached registrations
-		foreach ( $transaction->registrations( $this->_registration_query_params ) as $registration ) {
+		foreach ($transaction->registrations($this->_registration_query_params) as $registration) {
 			if (
 				$registration instanceof EE_Registration
-				&& ! in_array( $registration->status_ID(), $closed_reg_statuses )
+				&& ! in_array($registration->status_ID(), $closed_reg_statuses)
 			) {
 				return false;
 			}
 		}
-		if ( in_array( $new_TXN_status, EEM_Transaction::txn_status_array() ) ) {
-			$transaction->set_status( $new_TXN_status );
+		if (in_array($new_TXN_status, EEM_Transaction::txn_status_array())) {
+			$transaction->set_status($new_TXN_status);
 		}
-		if ( $update_txn ) {
+		if ($update_txn) {
 			return $transaction->save() ? true : false;
 		}
 		return true;
@@ -452,22 +452,22 @@ 
 	) {
 		$response = false;
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		// check that method exists
-		if ( ! method_exists( $registration_processor, $method_name )) {
-			throw new EE_Error( __( 'Method does not exist.', 'event_espresso' ));
+		if ( ! method_exists($registration_processor, $method_name)) {
+			throw new EE_Error(__('Method does not exist.', 'event_espresso'));
 		}
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// loop through cached registrations
-		foreach ( $transaction->registrations( $this->_registration_query_params ) as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
-				if ( $additional_param ) {
-					$response = $registration_processor->{$method_name}( $registration, $additional_param )
+		foreach ($transaction->registrations($this->_registration_query_params) as $registration) {
+			if ($registration instanceof EE_Registration) {
+				if ($additional_param) {
+					$response = $registration_processor->{$method_name}($registration, $additional_param)
 						? true
 						: $response;
 				} else {
-					$response = $registration_processor->{$method_name}( $registration )
+					$response = $registration_processor->{$method_name}($registration)
 						? true
 						: $response;
 				}
@@ -494,28 +494,28 @@ 
 	public function set_transaction_payment_method_based_on_registration_statuses(
 		EE_Registration $edited_registration
 	) {
-		if ( $edited_registration instanceof EE_Registration ) {
+		if ($edited_registration instanceof EE_Registration) {
 			$transaction = $edited_registration->transaction();
-			if ( $transaction instanceof EE_Transaction ) {
+			if ($transaction instanceof EE_Transaction) {
 				$all_not_approved = true;
-				foreach ( $transaction->registrations() as $registration ) {
-					if ( $registration instanceof EE_Registration ) {
+				foreach ($transaction->registrations() as $registration) {
+					if ($registration instanceof EE_Registration) {
 						// if any REG != "Not Approved" then toggle to false
 						$all_not_approved = $registration->is_not_approved() ? $all_not_approved : false;
 					}
 				}
 				// if ALL Registrations are "Not Approved"
-				if ( $all_not_approved ) {
-					$transaction->set_payment_method_ID( null );
+				if ($all_not_approved) {
+					$transaction->set_payment_method_ID(null);
 					$transaction->save();
 				} else {
 					$available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 						$transaction,
 						EEM_Payment_Method::scope_cart
 					);
-					if ( ! empty( $available_payment_methods ) ) {
+					if ( ! empty($available_payment_methods)) {
 						$PMD_ID = 0;
-						foreach ( $available_payment_methods as $available_payment_method ) {
+						foreach ($available_payment_methods as $available_payment_method) {
 							if (
 								$available_payment_method instanceof EE_Payment_Method
 							    && $available_payment_method->open_by_default()
@@ -524,22 +524,22 @@ 
 								break;
 							}
 						}
-						if ( ! $PMD_ID ) {
-							$first_payment_method = reset( $available_payment_methods );
-							if ( $first_payment_method instanceof EE_Payment_Method ) {
+						if ( ! $PMD_ID) {
+							$first_payment_method = reset($available_payment_methods);
+							if ($first_payment_method instanceof EE_Payment_Method) {
 								$PMD_ID = $first_payment_method->ID();
 							} else {
 								EE_Error::add_error(
-									__( 'A valid Payment Method could not be determined. Please ensure that at least one Payment Method is activated.', 'event_espresso' ),
+									__('A valid Payment Method could not be determined. Please ensure that at least one Payment Method is activated.', 'event_espresso'),
 									__FILE__, __LINE__, __FUNCTION__
 								);
 							}
 						}
-						$transaction->set_payment_method_ID( $PMD_ID );
+						$transaction->set_payment_method_ID($PMD_ID);
 						$transaction->save();
 					} else {
 						EE_Error::add_error(
-							__( 'Please activate at least one Payment Method in order for things to operate correctly.', 'event_espresso' ),
+							__('Please activate at least one Payment Method in order for things to operate correctly.', 'event_espresso'),
 							__FILE__, __LINE__, __FUNCTION__
 						);
 					}
@@ -576,7 +576,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -586,7 +586,7 @@ 
 			'4.9.12'
 		);
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -615,7 +615,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -659,7 +659,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed( EE_Transaction $transaction ) {
+	public function all_reg_steps_completed(EE_Transaction $transaction) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -686,7 +686,7 @@ 
 	 * @param string         $exception
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except( EE_Transaction $transaction, $exception = '' ) {
+	public function all_reg_steps_completed_except(EE_Transaction $transaction, $exception = '') {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -696,7 +696,7 @@ 
 			'4.9.12',
 			'5.0.0'
 		);
-		return $transaction->all_reg_steps_completed_except( $exception );
+		return $transaction->all_reg_steps_completed_except($exception);
 	}
 
 
@@ -712,7 +712,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except_final_step( EE_Transaction $transaction ) {
+	public function all_reg_steps_completed_except_final_step(EE_Transaction $transaction) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -739,7 +739,7 @@ 
 	 * @param string         $reg_step_slug
 	 * @return boolean | int
 	 */
-	public function reg_step_completed( EE_Transaction $transaction, $reg_step_slug ) {
+	public function reg_step_completed(EE_Transaction $transaction, $reg_step_slug) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -749,7 +749,7 @@ 
 			'4.9.12',
 			'5.0.0'
 		);
-		return $transaction->reg_step_completed( $reg_step_slug );
+		return $transaction->reg_step_completed($reg_step_slug);
 	}
 
 
@@ -765,7 +765,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean | int
 	 */
-	public function final_reg_step_completed( EE_Transaction $transaction ) {
+	public function final_reg_step_completed(EE_Transaction $transaction) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -791,7 +791,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_initiated( EE_Transaction $transaction, $reg_step_slug ) {
+	public function set_reg_step_initiated(EE_Transaction $transaction, $reg_step_slug) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -801,7 +801,7 @@ 
 			'4.9.12',
 			'5.0.0'
 		);
-		return $transaction->set_reg_step_initiated( $reg_step_slug );
+		return $transaction->set_reg_step_initiated($reg_step_slug);
 	}
 
 
@@ -817,7 +817,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_completed( EE_Transaction $transaction, $reg_step_slug ) {
+	public function set_reg_step_completed(EE_Transaction $transaction, $reg_step_slug) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -827,7 +827,7 @@ 
 			'4.9.12',
 			'5.0.0'
 		);
-		return $transaction->set_reg_step_completed( $reg_step_slug );
+		return $transaction->set_reg_step_completed($reg_step_slug);
 	}
 
 
@@ -843,7 +843,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_not_completed( EE_Transaction $transaction, $reg_step_slug ) {
+	public function set_reg_step_not_completed(EE_Transaction $transaction, $reg_step_slug) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -853,7 +853,7 @@ 
 			'4.9.12',
 			'5.0.0'
 		);
-		return $transaction->set_reg_step_not_completed( $reg_step_slug );
+		return $transaction->set_reg_step_not_completed($reg_step_slug);
 	}
 
 
@@ -870,7 +870,7 @@ 
 	 * @param string          $reg_step_slug
 	 * @return void
 	 */
-	public function remove_reg_step( EE_Transaction $transaction, $reg_step_slug ) {
+	public function remove_reg_step(EE_Transaction $transaction, $reg_step_slug) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -880,7 +880,7 @@ 
 			'4.9.12',
 			'5.0.0'
 		);
-		$transaction->remove_reg_step( $reg_step_slug );
+		$transaction->remove_reg_step($reg_step_slug);
 	}
 
 
@@ -896,7 +896,7 @@ 
 	 * @return    boolean
 	 * @throws \EE_Error
 	 */
-	public function toggle_failed_transaction_status( EE_Transaction $transaction ) {
+	public function toggle_failed_transaction_status(EE_Transaction $transaction) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -920,7 +920,7 @@ 
 	 * @param  EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function toggle_abandoned_transaction_status( EE_Transaction $transaction ) {
+	public function toggle_abandoned_transaction_status(EE_Transaction $transaction) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(