eventespresso / event-espresso-core

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

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Attendee_Information
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Attendee_Information
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Attendee_Information extends EE_SPCO_Reg_Step {
 
 	/**

Braces +2 added lines, -2 removed lines

@@ -507,7 +507,7 @@ 
 			case EEM_Question::QST_type_text :
 				if( $identifier == 'email' ){
 					return new EE_Email_Input( $input_constructor_args );
-				}else{
+				} else{
 					return new EE_Text_Input( $input_constructor_args );
 				}
 				break;
@@ -792,7 +792,7 @@ 
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
+			} 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 ] );

Doc Comments +2 added lines, -1 removed lines

@@ -348,7 +348,7 @@ 
 	 * _auto_copy_attendee_info
 	 *
 	 * @access public
-	 * @return 	EE_Form_Section_Proper
+	 * @return 	EE_Form_Section_HTML
 	 */
 	private function _auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
@@ -462,6 +462,7 @@ 
 	 * @param EE_Registration $registration
 	 * @param EE_Question     $question
 	 * @param mixed EE_Answer|NULL      $answer
+	 * @param EE_Answer $answer
 	 * @return EE_Form_Input_Base
 	 */
 	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){

Spacing +261 added lines, -262 removed lines

@@ -37,13 +37,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Attendee_Information
 	 */
-	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'));
+		$this->set_instructions(__('Please answer the following registration questions before proceeding.', 'event_espresso'));
 	}
 
 
@@ -52,7 +52,7 @@ 
 		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');
 		EE_Registry::$i18n_js_strings['answer_required_questions'] = __('Please answer all required questions correctly before proceeding.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf( __('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>' );
+		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(__('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>');
 		EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = __('An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['enter_valid_email'] = __('You must enter a valid email address.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = __('You must enter a valid email address and answer all other required questions before you can proceed.', 'event_espresso');
@@ -85,7 +85,7 @@ 
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		$Line_Item_Display = new EE_Line_Item_Display();
 		// calculate taxes
-		$Line_Item_Display->display_line_item( $this->checkout->cart->get_grand_total(), array( 'set_tax_rate' => true ) );
+		$Line_Item_Display->display_line_item($this->checkout->cart->get_grand_total(), array('set_tax_rate' => true));
 		EE_Registry::instance()->load_helper('Line_Item');
 		/** @var $subsections EE_Form_Section_Proper[] */
 		$subsections = array(
@@ -97,33 +97,33 @@ 
 			'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 ) {
-				if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
 					// can this registration be processed during this visit ?
-					if ( $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() ] ) ? $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() ) );
-							$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( $ticket_line_item );
+					if ($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()]) ? $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()));
+							$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($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 && count( $registrations ) > 1 && ! $this->checkout->admin_request ) {
+			if ($primary_registrant && count($registrations) > 1 && ! $this->checkout->admin_request) {
 				// 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 ) {
-					$subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false );
+				if (isset($subsections[$primary_registrant]) && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper) {
+					$subsections[$primary_registrant]->add_subsections($copy_options, 'primary_registrant', false);
 				}
 			}
 
@@ -135,8 +135,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
@@ -153,61 +152,61 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Form_Section_Proper
 	 */
-	private function _registrations_reg_form( EE_Registration $registration ) {
-		EE_Registry::instance()->load_helper( 'Template' );
+	private function _registrations_reg_form(EE_Registration $registration) {
+		EE_Registry::instance()->load_helper('Template');
 		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;' : '',
 			'subsections' 		=> array(),
 			'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( $registration, $question_group );
+			$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);
 						// add hidden input
-						$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration );
+						$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration);
 					}
 				}
 				// 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',
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()),
+						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()),
 						TRUE,
 						TRUE
 					)
 				);
 				// add hidden input
-				$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration, FALSE );
+				$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration, FALSE);
 			}
 		}
-		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);
 	}
 
 
@@ -220,11 +219,11 @@ 
 	 * @param bool  $additional_attendee_reg_info
 	 * @return    EE_Form_Input_Base
 	 */
-	private function _additional_attendee_reg_info_input( EE_Registration $registration, $additional_attendee_reg_info = TRUE ){
+	private function _additional_attendee_reg_info_input(EE_Registration $registration, $additional_attendee_reg_info = TRUE) {
 		// 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
 			)
 		);
@@ -237,22 +236,22 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return EE_Form_Section_Proper
 	 */
-	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',
@@ -264,21 +263,21 @@ 
 			)
 		);
 		// filter for additional content before questions
-		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this));
 		// 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( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this );
+		$form_args['subsections'] = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this);
 
 		// filter for additional content after questions
-		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this));
 //		d( $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, $registration, $question_group, $this );
+		$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, $registration, $question_group, $this);
 	}
 
 
@@ -288,12 +287,12 @@ 
 	 * @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 ($question_group->show_group_name() && $question_group->name() != '') {
 			EE_Registry::instance()->load_helper('HTML');
-			if ( $this->checkout->admin_request ) {
+			if ($this->checkout->admin_request) {
 				$html .= EEH_HTML::br();
 				$html .= EEH_HTML::h3(
 					$question_group->name(),
@@ -307,7 +306,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(),
 				'',
@@ -315,7 +314,7 @@ 
 			);
 
 		}
-		return new EE_Form_Section_HTML( $html );
+		return new EE_Form_Section_HTML($html);
 	}
 
 
@@ -324,14 +323,14 @@ 
 	 * @access public
 	 * @return 	EE_Form_Section_Proper
 	 */
-	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(
 				'subsections' 			=> $this->_copy_attendee_info_inputs(),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 			=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'copy_attendee_info.template.php', // layout_template
+						'layout_template_file' 			=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'copy_attendee_info.template.php', // layout_template
 						'begin_template_file' 			=> NULL,
 						'input_template_file' 				=> NULL,
 						'subsection_template_file' 	=> NULL,
@@ -353,8 +352,8 @@ 
 	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',
-				apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
+				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()),
 				TRUE,
 				TRUE
 			)
@@ -373,25 +372,25 @@ 
 		$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() : '';
-					$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>'
+					$item_name .= $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>'
 					);
 					$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'), $registration->count() )),
+					array($registration->ID() => sprintf(__('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
 					)
@@ -410,7 +409,7 @@ 
 	 * @param EE_Registration $registration
 	 * @return    EE_Form_Input_Base
 	 */
-	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(
@@ -428,31 +427,31 @@ 
 	 * @param EE_Question     $question
 	 * @return 	EE_Form_Input_Base
 	 */
-	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( $registration, $question->system_ID() );
+		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value($registration, $question->system_ID());
 		$answer = $answer_value === null
-				? EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() )	) )
+				? EEM_Answer::instance()->get_one(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( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer ) {
+		if ( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer) {
 			// 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_id =$question->system_ID() != NULL ? $question->system_ID() . '-' . $registration->reg_url_link() : $question->ID() . '-' . $registration->reg_url_link();
-			$registration->cache( 'Answer', $answer, $answer_cache_id );
+			$answer->cache('Question', $question);
+			$answer_cache_id = $question->system_ID() != NULL ? $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);
 
 	}
 
@@ -464,7 +463,7 @@ 
 	 * @param mixed EE_Answer|NULL      $answer
 	 * @return EE_Form_Input_Base
 	 */
-	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	private function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 		//		d( $registration );
 		//		d( $question );
 		//		d( $answer );
@@ -487,29 +486,29 @@ 
 		$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
 
 		$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_name' 			=> 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+			'html_id' 					=> 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+			'html_class' 			=> 'ee-reg-qstn ee-reg-qstn-'.$identifier,
 			'required' 				=> $question->required() ? TRUE : FALSE,
-			'html_label_id'		=> 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_label_id'		=> 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
 			'html_label_class'	=> 'ee-reg-qstn',
 			'html_label_text'		=> $question->display_text(),
 			'required_validation_error_message' => $question->required_text()
 		);
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer ) {
-			if ( $answer->ID() ) {
-				$input_constructor_args['html_name'] 		.= '[' . $answer->ID() . ']';
-				$input_constructor_args['html_id'] 				.= '-' . $answer->ID();
-				$input_constructor_args['html_label_id'] 	.= '-' . $answer->ID();
+		if ($answer instanceof EE_Answer) {
+			if ($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['default'] = $answer->value();
 		}
 		//add "-lbl" to the end of the label id
-		$input_constructor_args['html_label_id'] 	.= '-lbl';
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $question->system_ID() );
-		if( EEM_Question::instance()->question_type_is_in_category(  $question->type(), 'text' ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy( 
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($question->system_ID());
+		if (EEM_Question::instance()->question_type_is_in_category($question->type(), 'text')) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy( 
 				null, 
 				min( 
 					$max_max_for_question, 
@@ -517,83 +516,83 @@ 
 				) 
 			);
 		}
-		$input_constructor_args = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__input_constructor_args',
+		$input_constructor_args = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__input_constructor_args',
 				$input_constructor_args,
 				$registration,
 				$question,
 				$answer
 				);
 
-		$this->_required_questions[ $identifier ] = $question->required() ? true : false;
+		$this->_required_questions[$identifier] = $question->required() ? true : false;
 
-		switch ( $question->type() ) {
+		switch ($question->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				if( $identifier == 'email' ){
-					return new EE_Email_Input( $input_constructor_args );
-				}else{
-					return new EE_Text_Input( $input_constructor_args );
+				if ($identifier == 'email') {
+					return new EE_Email_Input($input_constructor_args);
+				} else {
+					return new EE_Text_Input($input_constructor_args);
 				}
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				return new EE_Text_Area_Input( $input_constructor_args );
+				return new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				return new EE_Radio_Button_Input( $question->options(), $input_constructor_args );
+				return new EE_Radio_Button_Input($question->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				return new EE_Select_Input( $question->options(), $input_constructor_args );
+				return new EE_Select_Input($question->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
-				$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();
 						}
 					}
 				}
-				$state_options = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', $state_options, $this, $registration, $question, $answer );
-				return new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$state_options = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', $state_options, $this, $registration, $question, $answer);
+				return new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
-				$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();
 						}
 					}
 				}
-				$country_options = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', $country_options, $this, $registration, $question, $answer );
-				return new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$country_options = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', $country_options, $this, $registration, $question, $answer);
+				return new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				return new EE_Checkbox_Multi_Input( $question->options(), $input_constructor_args );
+				return new EE_Checkbox_Multi_Input($question->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				return new EE_Datepicker_Input( $input_constructor_args );
+				return new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$input =  new EE_Text_Area_Input( $input_constructor_args );
-				$input->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$input = new EE_Text_Area_Input($input_constructor_args);
+				$input->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				return $input;
 			// fallback
 			default :
-				$default_input = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__default', null, $question->type(), $question, $input_constructor_args );
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				$default_input = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__default', null, $question->type(), $question, $input_constructor_args);
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				return $default_input;
 		}
@@ -618,65 +617,65 @@ 
 	 */
 	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 ))  {
-			EE_Error::add_error( __('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($valid_data)) {
+			EE_Error::add_error(__('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		//EEH_Debug_Tools::printr( $this->checkout->transaction, '$this->checkout->transaction', __FILE__, __LINE__ );
-		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' ), __FILE__, __FUNCTION__, __LINE__ );
+		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'), __FILE__, __FUNCTION__, __LINE__);
 			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 )) {
-			EE_Error::add_error( __( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations)) {
+			EE_Error::add_error(__('Your form data could not be applied to any valid registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			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', 'event_espresso' ),
+					__('There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$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', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 			} else {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$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' ));
+		$this->_set_success_message(__('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;
 
 	}
@@ -690,9 +689,9 @@ 
 	 * @param array             $valid_data
 	 * @return boolean | int
 	 */
-	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
@@ -709,19 +708,19 @@ 
 		// 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 ) {
-				EE_Error::add_error( __( 'An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ( ! $registration instanceof EE_Registration) {
+				EE_Error::add_error(__('An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 			$reg_url_link = $registration->reg_url_link();
 			// reg_url_link exists ?
-			if ( $reg_url_link ) {
+			if ($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();
 					}
 
@@ -732,41 +731,41 @@ 
 					 * @var bool   if TRUE is returned by the plugin then the
 					 *      		registration processing is halted.
 					 */
-					if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this ) ) {
+					if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $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();
 					// 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 ? TRUE : FALSE;
+						$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 ] = apply_filters( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[ $reg_url_link ] );
+						$valid_data[$reg_url_link] = apply_filters('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $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'] ) ? $valid_data['primary_attendee'] : FALSE;
-							unset( $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']);
 						}
 						// 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) {
 									// check for critical inputs
-									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email( $form_input, $input_value )) {
+									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email($form_input, $input_value)) {
 										return FALSE;
 									}
 									// store a bit of data about the primary attendee
-									if ( $att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty( $input_value )) {
-										$primary_registrant[ $form_input ] = $input_value;
-									} else if ( $copy_primary && isset( $primary_registrant[ $form_input ] ) && $input_value == NULL ) {
-										$input_value = $primary_registrant[ $form_input ];
+									if ($att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty($input_value)) {
+										$primary_registrant[$form_input] = $input_value;
+									} else if ($copy_primary && isset($primary_registrant[$form_input]) && $input_value == NULL) {
+										$input_value = $primary_registrant[$form_input];
 									}
 									// now attempt to save the input data
-									if ( ! $this->_save_registration_form_input( $registration, $form_input, $input_value ))  {
-										EE_Error::add_error( sprintf( __( 'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso' ), $form_input, $input_value ), __FILE__, __FUNCTION__, __LINE__ );
+									if ( ! $this->_save_registration_form_input($registration, $form_input, $input_value)) {
+										EE_Error::add_error(sprintf(__('Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso'), $form_input, $input_value), __FILE__, __FUNCTION__, __LINE__);
 										return FALSE;
 									}
 								}
@@ -775,51 +774,51 @@ 
 					}
 					//EEH_Debug_Tools::printr( $this->_attendee_data, '$this->_attendee_data', __FILE__, __LINE__ );
 					// this registration does not require additional attendee information ?
-					if ( $copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+					if ($copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 						// just copy the primary registrant
 						$attendee = $this->checkout->primary_attendee_obj;
 					} else {
 						// have we met before?
-						$attendee = $this->_find_existing_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+						$attendee = $this->_find_existing_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						// did we find an already existing record for this attendee ?
-						if ( $attendee instanceof EE_Attendee ) {
-							$attendee = $this->_update_existing_attendee_data( $attendee, $this->_attendee_data[ $reg_url_link ] );
+						if ($attendee instanceof EE_Attendee) {
+							$attendee = $this->_update_existing_attendee_data($attendee, $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->_copy_critical_attendee_details_from_primary_registrant( $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] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant($this->_attendee_data[$reg_url_link]) : $this->_attendee_data[$reg_url_link];
+							$attendee = $this->_create_new_attendee($registration, $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 );
-					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__ );
+					$this->_associate_attendee_with_registration($registration, $attendee);
+					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);
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-					$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+					$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 					// 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;
 			}
 
@@ -837,22 +836,22 @@ 
 	 * @param string           	$input_value
 	 * @return boolean
 	 */
-	private function _save_registration_form_input( EE_Registration $registration, $form_input = '', $input_value = '' ) {
+	private function _save_registration_form_input(EE_Registration $registration, $form_input = '', $input_value = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '()</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
 		//EEH_Debug_Tools::printr( $form_input, '$form_input', __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( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this)) {
 			return TRUE;
 		}
 
 		// grab related answer objects
 		$answers = $registration->answers();
 		// $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( $answers[ $answer_cache_id ] ) && $answers[ $answer_cache_id ] instanceof EE_Answer ? TRUE : FALSE;
+		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input.'-'.$registration->reg_url_link();
+		$answer_is_obj = isset($answers[$answer_cache_id]) && $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' :
@@ -867,33 +866,33 @@ 
 				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( $input_value, '$input_value', __FILE__, __LINE__ );
 		//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( $answers[ $answer_cache_id ], 'Answer' );
-				$answers[ $answer_cache_id ]->delete_permanently();
+				$registration->_remove_relation_to($answers[$answer_cache_id], 'Answer');
+				$answers[$answer_cache_id]->delete_permanently();
 			}
 			return TRUE;
-		} elseif ( $answer_is_obj ) {
+		} elseif ($answer_is_obj) {
 			// save this data to the answer object
-			$answers[ $answer_cache_id ]->set_value( $input_value );
-			$result = $answers[ $answer_cache_id ]->save();
+			$answers[$answer_cache_id]->set_value($input_value);
+			$result = $answers[$answer_cache_id]->save();
 			return $result !== false ? true : false;
 		} else {
-			foreach ( $answers as $answer ) {
-				if ( $answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id ) {
-					$answer->set_value( $input_value );
+			foreach ($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;
 				}
@@ -911,33 +910,33 @@ 
 	 * @param string $input_value
 	 * @return boolean
 	 */
-	private function _verify_critical_attendee_details_are_set_and_validate_email( $form_input = '', $input_value = '' ) {
-		if ( empty( $input_value )) {
+	private function _verify_critical_attendee_details_are_set_and_validate_email($form_input = '', $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' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('First Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'lname' :
-					EE_Error::add_error( __( 'Last Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Last Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'email' :
-					EE_Error::add_error( __( 'Email Address is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Email Address is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 			}
-		} else if ( $form_input === 'email' ) {
+		} else if ($form_input === 'email') {
 			// clean the email address
-			$valid_email = sanitize_email( $input_value );
+			$valid_email = sanitize_email($input_value);
 			// check if it matches
-			if ( $input_value != $valid_email ) {
+			if ($input_value != $valid_email) {
 				// whoops!!!
-				EE_Error::add_error( __( 'Please enter a valid email address.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('Please enter a valid email address.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 		}
@@ -965,14 +964,14 @@ 
 	 * @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()) {
 		// 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'] ) ? $attendee_data['ATT_fname'] : '';
-		$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'] ) ? $attendee_data['ATT_email'] : '';
+		$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']) ? $attendee_data['ATT_lname'] : '';
+		$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
@@ -980,7 +979,7 @@ 
 		} else {
 			$existing_attendee = NULL;
 		}
-		return apply_filters( 'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data );
+		return apply_filters('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data);
 	}
 
 
@@ -992,13 +991,13 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	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
@@ -1015,11 +1014,11 @@ 
 	 * @param EE_Attendee     $attendee
 	 * @return void
 	 */
-	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);
 	}
 
 
@@ -1030,10 +1029,10 @@ 
 	 * @param EE_Registration $registration
 	 * @return void
 	 */
-	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);
 	}
 
 
@@ -1045,17 +1044,17 @@ 
 	 * @param array $attendee_data
 	 * @return array
 	 */
-	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( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE )) {
-			$address_details = array( 'ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone' );
-			$critical_attendee_details = array_merge( $critical_attendee_details, $address_details );
+		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', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone');
+			$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 ] )) {
-				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get( $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($critical_attendee_detail);
 			}
 		}
 		return $attendee_data;
@@ -1070,11 +1069,11 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	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;
 	}
@@ -1090,7 +1089,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(
@@ -1099,7 +1098,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;

modules/single_page_checkout/reg_steps/attendee_information/attendee_info_not_required.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 	<p class="spco-attendee-info-not-required-pg smaller-text lt-grey-text">
-		<?php echo apply_filters( 'FHEE__registration_page_attendee_information__attendee_info_not_required_pg', __( 'This ticket type does not require any information for additional attendees, so attendee #1\'s information will be used for its registration purposes.', 'event_espresso' ));?>
+		<?php echo apply_filters('FHEE__registration_page_attendee_information__attendee_info_not_required_pg', __('This ticket type does not require any information for additional attendees, so attendee #1\'s information will be used for its registration purposes.', 'event_espresso')); ?>
 	</p>

modules/single_page_checkout/reg_steps/attendee_information/auto_copy_attendee_info.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 	<p id="spco-auto-copy-attendee-pg" class="smaller-text lt-grey-text">
-		<?php echo apply_filters( 'FHEE__registration_page_attendee_information__auto_copy_attendee_pg', __('The above information will be used for any additional tickets/attendees.', 'event_espresso' ));?>
+		<?php echo apply_filters('FHEE__registration_page_attendee_information__auto_copy_attendee_pg', __('The above information will be used for any additional tickets/attendees.', 'event_espresso')); ?>
 	</p>
\ No newline at end of file

modules/single_page_checkout/reg_steps/attendee_information/copy_attendee_info.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,15 +1,15 @@ 
 <div id="spco-copy-attendee-dv" class="hide-if-no-js">
 
 	<p class="spco-copy-all-attendee-pg">
-		<label class="ee-checkbox-label-before ee-checkbox-label-wide"><?php  _e('Use Attendee #1\'s information for ALL attendees', 'event_espresso');?>
+		<label class="ee-checkbox-label-before ee-checkbox-label-wide"><?php  _e('Use Attendee #1\'s information for ALL attendees', 'event_espresso'); ?>
 			<input id="spco-copy-all-attendee-chk" class="spco-copy-all-attendee-chk ee-do-not-validate" type="checkbox" value="copy-all">
 		</label>
 	</p>
 
-	<p class="spco-copy-attendee-pg"><?php echo apply_filters(  'FHEE__registration_page_attendee_information__copy_attendee_pg', sprintf( __('This option allows you to use the above information for all additional attendee question fields. %sPlease note:%s some events may have additional questions that you may still be required to answer in order to complete your registration.', 'event_espresso'), '<strong>', '</strong>' )); ?></p>
+	<p class="spco-copy-attendee-pg"><?php echo apply_filters('FHEE__registration_page_attendee_information__copy_attendee_pg', sprintf(__('This option allows you to use the above information for all additional attendee question fields. %sPlease note:%s some events may have additional questions that you may still be required to answer in order to complete your registration.', 'event_espresso'), '<strong>', '</strong>')); ?></p>
 
-	<a id="display-more-attendee-copy-options" class="display-the-hidden smaller-text float-right" rel="more-attendee-copy-options" ><span class="dashicons dashicons-arrow-right"></span><?php  _e('advanced copy options', 'event_espresso');?></a>
-	<a id="hide-more-attendee-copy-options" class="hide-the-displayed smaller-text float-right" rel="more-attendee-copy-options" style="display: none;"><span class="dashicons dashicons-arrow-down"></span><?php  _e('basic copy options', 'event_espresso');?></a>
+	<a id="display-more-attendee-copy-options" class="display-the-hidden smaller-text float-right" rel="more-attendee-copy-options" ><span class="dashicons dashicons-arrow-right"></span><?php  _e('advanced copy options', 'event_espresso'); ?></a>
+	<a id="hide-more-attendee-copy-options" class="hide-the-displayed smaller-text float-right" rel="more-attendee-copy-options" style="display: none;"><span class="dashicons dashicons-arrow-down"></span><?php  _e('basic copy options', 'event_espresso'); ?></a>
 
 	<div id="more-attendee-copy-options-dv" class="" style="display: none;">
 
@@ -17,7 +17,7 @@ 
 			<?php _e('Only copy the above information to the following selected additional attendees.', 'event_espresso'); ?>
 		</p>
 
-		<?php foreach ( $spco_copy_attendee_chk as $spco_copy_chk ) { echo $spco_copy_chk; } ?>
+		<?php foreach ($spco_copy_attendee_chk as $spco_copy_chk) { echo $spco_copy_chk; } ?>
 
 	</div>
 	<div class="clear-float"></div>

modules/single_page_checkout/reg_steps/finalize_registration/EE_SPCO_Reg_Step_Finalize_Registration.class.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Finalize_Registration
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Finalize_Registration
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Finalize_Registration extends EE_SPCO_Reg_Step {
 
 	/**

Spacing +32 added lines, -32 removed lines

@@ -20,7 +20,7 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return 	\EE_SPCO_Reg_Step_Finalize_Registration
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'finalize_registration';
 		$this->_name = __('Finalize Registration', 'event_espresso');
 		$this->_submit_button_text = $this->_name;
@@ -47,9 +47,9 @@ 
 	public function initialize_reg_step() {
 
 		// there's actually no reg form to process if this is the final step
-		if ( $this->is_current_step() ) {
+		if ($this->is_current_step()) {
 			$this->checkout->step = $_REQUEST['step'] = $this->slug();
-			$this->checkout->action = $_REQUEST[ 'action' ] = 'process_reg_step';
+			$this->checkout->action = $_REQUEST['action'] = 'process_reg_step';
 			$this->checkout->generate_reg_form = false;
 		}
 
@@ -72,7 +72,7 @@ 
 	 */
 	public function process_reg_step() {
 		// ensure all data gets refreshed from the db
-		$this->checkout->refresh_all_entities( true );
+		$this->checkout->refresh_all_entities(true);
 		// ensures that all details and statuses for transaction, registration, and payments are updated
 		$txn_update_params = $this->_finalize_transaction();
 		// DEBUG LOG
@@ -86,16 +86,16 @@ 
 		//	)
 		//);
 		// set a hook point
-		do_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', $this->checkout, $txn_update_params );
+		do_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', $this->checkout, $txn_update_params);
 		// check if transaction has a primary registrant and that it has a related Attendee object
-		if ( $this->checkout->transaction_has_primary_registrant() ) {
+		if ($this->checkout->transaction_has_primary_registrant()) {
 			// setup URL for redirect
 			$this->checkout->redirect_url = add_query_arg(
-				array( 'e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link() ),
+				array('e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()),
 				$this->checkout->thank_you_page_url
 			);
 		} else {
-			EE_Error::add_error( __( 'A valid Primary Registration for this Transaction could not be found.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->checkout->redirect = false;
 			$this->checkout->continue_reg = false;
 			return false;
@@ -103,8 +103,8 @@ 
 		// you don't have to go home but you can't stay here !
 		$this->checkout->redirect = true;
 		$this->checkout->continue_reg = true;
-		$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
-		if ( ! ( $this->checkout->payment_method instanceof EE_Payment_Method && $this->checkout->payment_method->is_off_site() ) ) {
+		$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
+		if ( ! ($this->checkout->payment_method instanceof EE_Payment_Method && $this->checkout->payment_method->is_off_site())) {
 			// mark this reg step as completed
 			$this->checkout->current_step->set_completed();
 		}
@@ -121,43 +121,43 @@ 
 	 */
 	protected function _finalize_transaction() {
 		/** @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 in txn processor
-		$transaction_processor->set_revisit( $this->checkout->revisit );
+		$transaction_processor->set_revisit($this->checkout->revisit);
 		// at this point we'll consider a TXN to not have been abandoned
-		$transaction_processor->toggle_abandoned_transaction_status( $this->checkout->transaction );
-		if ( $this->checkout->cart instanceof EE_Cart ) {
+		$transaction_processor->toggle_abandoned_transaction_status($this->checkout->transaction);
+		if ($this->checkout->cart instanceof EE_Cart) {
 			// save TXN data to the cart
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $this->checkout->transaction->ID() );
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($this->checkout->transaction->ID());
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $this->checkout->transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($this->checkout->transaction, false);
 		// If the selected method of payment used an off-site gateway...
-		if ( $this->checkout->payment_method instanceof EE_Payment_Method ) {
-			$is_revisit = filter_var( $this->checkout->revisit, FILTER_VALIDATE_BOOLEAN );
-			if ( $this->checkout->payment_method instanceof EE_Payment_Method && $this->checkout->payment_method->is_off_site() ) {
-				$gateway= $this->checkout->payment_method->type_obj()->get_gateway();
-				if ( $gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request() ) {
+		if ($this->checkout->payment_method instanceof EE_Payment_Method) {
+			$is_revisit = filter_var($this->checkout->revisit, FILTER_VALIDATE_BOOLEAN);
+			if ($this->checkout->payment_method instanceof EE_Payment_Method && $this->checkout->payment_method->is_off_site()) {
+				$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
+				if ($gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request()) {
 					// do NOT trigger notifications because it was already done during the IPN
-					remove_all_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications' );
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 );
-				} else if ( ! $is_revisit ) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+					remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications');
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
+				} else if ( ! $is_revisit) {
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 				}
 			} else if (
 				// if SPCO revisit and TXN status has changed due to a payment
-				$is_revisit && ( $this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated() )
+				$is_revisit && ($this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated())
 			) {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
-			} else if ( ! $is_revisit ) {
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
+			} else if ( ! $is_revisit) {
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 		}
 		// this will result in the base session properties getting saved to the TXN_Session_data field
-		$this->checkout->transaction->set_txn_session_data( EE_Registry::instance()->SSN->get_session_data( null, true ));
+		$this->checkout->transaction->set_txn_session_data(EE_Registry::instance()->SSN->get_session_data(null, true));
 
 		// update the TXN if payment conditions have changed
 		return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
@@ -174,7 +174,7 @@ 
 	 * @return boolean
 	 */
 	public function update_reg_step() {
-		EE_Error::doing_it_wrong( __CLASS__ . '::' . __FILE__, __( 'Can not call update_reg_step() on the Finalize Registration reg step.', 'event_espresso'), '4.6.0' );
+		EE_Error::doing_it_wrong(__CLASS__.'::'.__FILE__, __('Can not call update_reg_step() on the Finalize Registration reg step.', 'event_espresso'), '4.6.0');
 	 }
 
 

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	/**
 	 * Applies all teh individual item validation strategies on each item in the array
 	 * @param array $normalized_value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function validate($normalized_value) {
 		if( is_array($normalized_value)){

modules/single_page_checkout/reg_steps/payment_options/EE_SPCO_Reg_Step_Payment_Options.class.php

Indentation +26 added lines, -26 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Payment_Options
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Payment_Options
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Payment_Options extends EE_SPCO_Reg_Step {
 
 	/**
@@ -740,13 +740,13 @@ 
 			return FALSE;
 		}
 		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
-            EE_Error::add_success(
-                apply_filters(
-                    'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                    sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
-                )
-            );
-        }
+			EE_Error::add_success(
+				apply_filters(
+					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
+					sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
+				)
+			);
+		}
 		// now generate billing form for selected method of payment
 		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method, FALSE );
 		// fill form with attendee info if applicable
@@ -778,14 +778,14 @@ 
 		$billing_form = $payment_method->type_obj()->billing_form( $this->checkout->transaction, array( 'amount_owing' => $this->checkout->amount_owing ) );
 		if ( $billing_form instanceof EE_Billing_Info_Form ) {
 			if ( EE_Registry::instance()->REQ->is_set( 'payment_method' )) {
-                if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
-                    EE_Error::add_success(
-                        apply_filters(
-                            'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                            sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
-                        )
-                    );
-                }
+				if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
+					EE_Error::add_success(
+						apply_filters(
+							'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
+							sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
+						)
+					);
+				}
 			}
 			return apply_filters(
 				'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',

Braces +2 added lines, -2 removed lines

@@ -1214,9 +1214,9 @@
 						$form_section = $validation_error->get_form_section();
 						if( $form_section instanceof EE_Form_Input_Base ){
 							$label = $form_section->html_label_text();
-						}elseif( $form_section instanceof EE_Form_Section_Base ){
+						} elseif( $form_section instanceof EE_Form_Section_Base ){
 							$label = $form_section->name();
-						}else{
+						} else{
 							$label = __( 'Validation Error', 'event_espresso' );
 						}
 						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage() );

Doc Comments +12 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
 
 
 	/**
-	 * @param null $line_item_display
+	 * @param EE_Line_Item_Display $line_item_display
 	 */
 	public function set_line_item_display( $line_item_display ) {
 		$this->line_item_display = $line_item_display;
@@ -180,7 +180,7 @@ 
 
 
 	/**
-	 * @return bool
+	 * @return EE_Form_Section_Proper
 	 */
 	public function generate_reg_form() {
 		EE_Registry::instance()->load_helper( 'HTML' );
@@ -537,6 +537,7 @@ 
 	 *    _apply_registration_payments_to_amount_owing
 	 *
 	 * @access    protected
+	 * @param EE_Base_Class[] $registrations
 	 * @return    void
 	 */
 	protected function _apply_registration_payments_to_amount_owing( $registrations ) {
@@ -754,7 +755,7 @@ 
 	 * get_billing_form_html_for_payment_method
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
@@ -874,7 +875,7 @@ 
 	 * switch_payment_method
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function switch_payment_method() {
 		if ( ! $this->_verify_payment_method_is_set() ) {
@@ -1041,7 +1042,7 @@ 
 
 	/**
 	 * process_reg_step
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function process_reg_step() {
 		// how have they chosen to pay?
@@ -1117,7 +1118,7 @@ 
 	 *    update_reg_step
 	 *    this is the final step after a user  revisits the site to retry a payment
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function update_reg_step() {
 		$success = TRUE;
@@ -1399,7 +1400,7 @@ 
 	 *
 	 * 	@access 	private
 	 * 	@type 	EE_Payment_Method $payment_method
-	 * 	@return 	mixed	EE_Payment | boolean
+	 * 	@return 	EE_Payment|null	EE_Payment | boolean
 	 */
 	private function _attempt_payment( EE_Payment_Method $payment_method ) {
 		$payment =NULL;
@@ -1601,6 +1602,7 @@ 
 	 * @access private
 	 * @type    EE_Payment $payment
 	 * @param string $payment_occurs
+	 * @param EE_Payment|null $payment
 	 * @return bool
 	 * @throws \EE_Error
 	 */
@@ -1707,7 +1709,7 @@ 
 	 * 		or present the payment options again
 	 *
 	 * @access private
-	 * @return EE_Payment | FALSE
+	 * @return boolean | FALSE
 	 */
 	public function process_gateway_response() {
 		$payment = null;
@@ -1768,7 +1770,7 @@ 
 	 * _validate_return
 	 *
 	 * @access private
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function _validate_offsite_return() {
 		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
@@ -1835,7 +1837,7 @@ 
 	 *
 	 * @access private
 	 * @param \EE_Registration $primary_registrant
-	 * @return bool
+	 * @return false|null
 	 */
 	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
 		if ( ! $primary_registrant instanceof EE_Registration ) {

Spacing +370 added lines, -370 removed lines

@@ -28,15 +28,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_filter( 'FHEE__SPCO__EE_Line_Item_Filter_Collection', array( 'EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters' ) );
-		add_action( 'wp_ajax_switch_spco_billing_form', array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' ));
-		add_action( 'wp_ajax_nopriv_switch_spco_billing_form', array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' ));
-		add_action( 'wp_ajax_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ));
-		add_action( 'wp_ajax_nopriv_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ));
-		add_action( 'wp_ajax_get_transaction_details_for_gateways', array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' ) );
-		add_action( 'wp_ajax_nopriv_get_transaction_details_for_gateways', array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+		add_filter('FHEE__SPCO__EE_Line_Item_Filter_Collection', array('EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters'));
+		add_action('wp_ajax_switch_spco_billing_form', array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form'));
+		add_action('wp_ajax_nopriv_switch_spco_billing_form', array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form'));
+		add_action('wp_ajax_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
+		add_action('wp_ajax_nopriv_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
+		add_action('wp_ajax_get_transaction_details_for_gateways', array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details'));
+		add_action('wp_ajax_nopriv_get_transaction_details_for_gateways', array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
-		add_filter( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array( 'EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method' ), 10, 1 );
+		add_filter('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array('EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method'), 10, 1);
 	}
 
 
@@ -45,7 +45,7 @@ 
 	 * 	ajax switch_spco_billing_form
 	 */
 	public static function switch_spco_billing_form() {
-		EED_Single_Page_Checkout::process_ajax_request( 'switch_payment_method' );
+		EED_Single_Page_Checkout::process_ajax_request('switch_payment_method');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * 	ajax save_payer_details
 	 */
 	public static function save_payer_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'save_payer_details_via_ajax' );
+		EED_Single_Page_Checkout::process_ajax_request('save_payer_details_via_ajax');
 	}
 
 
@@ -63,7 +63,7 @@ 
 	 * 	ajax get_transaction_details
 	 */
 	public static function get_transaction_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'get_transaction_details_for_gateways' );
+		EED_Single_Page_Checkout::process_ajax_request('get_transaction_details_for_gateways');
 	}
 
 
@@ -91,13 +91,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Payment_Options
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'payment_options';
 		$this->_name = __('Payment Options', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'payment_options_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'payment_options_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
-		$this->set_instructions( __('Please select a method of payment and provide any necessary billing information before proceeding.', 'event_espresso'));
+		$this->set_instructions(__('Please select a method of payment and provide any necessary billing information before proceeding.', 'event_espresso'));
 	}
 
 
@@ -114,7 +114,7 @@ 
 	/**
 	 * @param null $line_item_display
 	 */
-	public function set_line_item_display( $line_item_display ) {
+	public function set_line_item_display($line_item_display) {
 		$this->line_item_display = $line_item_display;
 	}
 
@@ -125,9 +125,9 @@ 
 	 * @return void
 	 */
 	public function translate_js_strings() {
-		EE_Registry::$i18n_js_strings['no_payment_method'] = __( 'Please select a method of payment in order to continue.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'A valid method of payment could not be determined. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['forwarding_to_offsite'] = __( 'Forwarding to Secure Payment Provider.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['no_payment_method'] = __('Please select a method of payment in order to continue.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('A valid method of payment could not be determined. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['forwarding_to_offsite'] = __('Forwarding to Secure Payment Provider.', 'event_espresso');
 	}
 
 
@@ -156,20 +156,20 @@ 
 			// 	$ 0.00 transactions (no payment required)
 			! $this->checkout->payment_required()
 			// but do NOT remove if current action being called belongs to this reg step
-			&& ! is_callable( array( $this, $this->checkout->action ) )
+			&& ! is_callable(array($this, $this->checkout->action))
 			&& ! $this->completed()
 		) {
 			// and if so, then we no longer need the Payment Options step
-			if ( $this->is_current_step() ) {
+			if ($this->is_current_step()) {
 				$this->checkout->generate_reg_form = false;
 			}
-			$this->checkout->remove_reg_step( $this->_slug );
+			$this->checkout->remove_reg_step($this->_slug);
 			// DEBUG LOG
 			//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
 			return false;
 		}
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		// get all active payment methods
 		$this->checkout->available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 			$this->checkout->transaction, EEM_Payment_Method::scope_cart
@@ -183,7 +183,7 @@ 
 	 * @return bool
 	 */
 	public function generate_reg_form() {
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('HTML');
 		// reset in case someone changes their mind
 		$this->_reset_selected_method_of_payment();
 		// set some defaults
@@ -194,15 +194,15 @@ 
 		$sold_out_events = array();
 		$reg_count = 0;
 		// loop thru registrations to gather info
-		$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) {
 			/** @var $registration EE_Registration */
 			$reg_count++;
 			// if returning registrant is Approved then do NOT do this
-			if ( ! ( $this->checkout->revisit && $registration->status_ID() == EEM_Registration::status_id_approved )) {
-				if ( $registration->event()->is_sold_out() || $registration->event()->is_sold_out( true )) {
+			if ( ! ($this->checkout->revisit && $registration->status_ID() == EEM_Registration::status_id_approved)) {
+				if ($registration->event()->is_sold_out() || $registration->event()->is_sold_out(true)) {
 					// add event to list of events that are sold out
-					$sold_out_events[ $registration->event()->ID() ] = $registration->event();
+					$sold_out_events[$registration->event()->ID()] = $registration->event();
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__sold_out_event',
 						$registration->event(),
@@ -210,9 +210,9 @@ 
 					);
 				}
 				// event requires admin approval
-				if ( $registration->status_ID() == EEM_Registration::status_id_not_approved ) {
+				if ($registration->status_ID() == EEM_Registration::status_id_not_approved) {
 					// add event to list of events with pre-approval reg status
-					$registrations_requiring_pre_approval[ $registration->ID() ] = $registration;
+					$registrations_requiring_pre_approval[$registration->ID()] = $registration;
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_pre_approval',
 						$registration->event(),
@@ -221,29 +221,29 @@ 
 				}
 			}
 			// are they allowed to pay now and is there monies owing?
-			if ( $registration->owes_monies_and_can_pay() ) {
-				$registrations_requiring_payment[ $registration->ID() ] = $registration;
+			if ($registration->owes_monies_and_can_pay()) {
+				$registrations_requiring_payment[$registration->ID()] = $registration;
 				do_action(
 					'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_payment',
 					$registration->event(),
 					$this
 				);
-			} else if ( ! $this->checkout->revisit && $registration->status_ID() != EEM_Registration::status_id_not_approved && $registration->ticket()->is_free()  ) {
-				$registrations_for_free_events[ $registration->event()->ID() ] = $registration;
+			} else if ( ! $this->checkout->revisit && $registration->status_ID() != EEM_Registration::status_id_not_approved && $registration->ticket()->is_free()) {
+				$registrations_for_free_events[$registration->event()->ID()] = $registration;
 			}
 		}
 		$subsections = array();
 		// now decide which template to load
-		if ( ! empty( $sold_out_events )) {
-			$subsections['sold_out_events'] = $this->_sold_out_events( $sold_out_events );
+		if ( ! empty($sold_out_events)) {
+			$subsections['sold_out_events'] = $this->_sold_out_events($sold_out_events);
 		}
-		if ( ! empty( $registrations_requiring_pre_approval )) {
-			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval( $registrations_requiring_pre_approval );
+		if ( ! empty($registrations_requiring_pre_approval)) {
+			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval($registrations_requiring_pre_approval);
 		}
-		if ( ! empty( $registrations_for_free_events ) ) {
-			$subsections[ 'no_payment_required' ] = $this->_no_payment_required( $registrations_for_free_events );
+		if ( ! empty($registrations_for_free_events)) {
+			$subsections['no_payment_required'] = $this->_no_payment_required($registrations_for_free_events);
 		}
-		if ( ! empty( $registrations_requiring_payment ) ) {
+		if ( ! empty($registrations_requiring_payment)) {
 			// autoload Line_Item_Display classes
 			EEH_Autoloader::register_line_item_filter_autoloaders();
 			$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
@@ -254,17 +254,17 @@ 
 				$this->checkout->cart->get_grand_total()
 			);
 			$filtered_line_item_tree = $line_item_filter_processor->process();
-			if ( $this->checkout->amount_owing > 0 ) {
+			if ($this->checkout->amount_owing > 0) {
 				EEH_Autoloader::register_line_item_display_autoloaders();
-				$this->set_line_item_display( new EE_Line_Item_Display( 'spco' ) );
-				$subsections[ 'payment_options' ] = $this->_display_payment_options(
+				$this->set_line_item_display(new EE_Line_Item_Display('spco'));
+				$subsections['payment_options'] = $this->_display_payment_options(
 					$this->line_item_display->display_line_item(
 						$filtered_line_item_tree,
-						array( 'registrations' => $registrations )
+						array('registrations' => $registrations)
 					)
 				);
 				$this->checkout->amount_owing = $filtered_line_item_tree->total();
-				$this->_apply_registration_payments_to_amount_owing( $registrations );
+				$this->_apply_registration_payments_to_amount_owing($registrations);
 			}
 		} else {
 			$this->_hide_reg_step_submit_button_if_revisit();
@@ -297,7 +297,7 @@ 
 	 * @param \EE_Line_Item_Filter_Collection $line_item_filter_collection
 	 * @return \EE_Line_Item_Filter_Collection
 	 */
-	public static function add_spco_line_item_filters( EE_Line_Item_Filter_Collection $line_item_filter_collection ) {
+	public static function add_spco_line_item_filters(EE_Line_Item_Filter_Collection $line_item_filter_collection) {
 		$line_item_filter_collection->add(
 			new EE_Billable_Line_Item_Filter(
 				EE_Registry::instance()->SSN->checkout()->transaction->registrations(
@@ -305,7 +305,7 @@ 
 				)
 			)
 		);
-		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
+		$line_item_filter_collection->add(new EE_Non_Zero_Line_Item_Filter());
 		return $line_item_filter_collection;
 	}
 
@@ -319,8 +319,8 @@ 
 	 * @return void
 	 */
 	protected function _hide_reg_step_submit_button_if_revisit() {
-		if ( $this->checkout->revisit ) {
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string' );
+		if ($this->checkout->revisit) {
+			add_filter('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string');
 		}
 	}
 
@@ -331,12 +331,12 @@ 
 	 * @param \EE_Event[] $sold_out_events_array
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _sold_out_events( $sold_out_events_array = array() ) {
+	private function _sold_out_events($sold_out_events_array = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'events_sold_out';
 		$sold_out_events = '';
-		foreach ( $sold_out_events_array as $sold_out_event ) {
-			$sold_out_events .= EEH_HTML::li( EEH_HTML::span( $sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text' ));
+		foreach ($sold_out_events_array as $sold_out_event) {
+			$sold_out_events .= EEH_HTML::li(EEH_HTML::span($sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text'));
 		}
 		return new EE_Form_Section_Proper(
 			array(
@@ -348,14 +348,14 @@ 
 				),
 				'layout_strategy'		=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'sold_out_events.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'sold_out_events.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
 								'sold_out_events' 			=> $sold_out_events,
 								'sold_out_events_msg' 	=> apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__sold_out_events_msg',
-									__( 'It appears that the event you were about to make a payment for has sold out since you first registered. If you have already made a partial payment towards this event, please contact the event administrator for a refund.', 'event_espresso' )
+									__('It appears that the event you were about to make a payment for has sold out since you first registered. If you have already made a partial payment towards this event, please contact the event administrator for a refund.', 'event_espresso')
 								)
 							)
 						)
@@ -372,14 +372,14 @@ 
 	 * @param array $registrations_requiring_pre_approval
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _registrations_requiring_pre_approval( $registrations_requiring_pre_approval = array()) {
+	private function _registrations_requiring_pre_approval($registrations_requiring_pre_approval = array()) {
 		$events_requiring_pre_approval = '';
-		foreach ( $registrations_requiring_pre_approval as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->event() instanceof EE_Event ) {
-				$events_requiring_pre_approval[ $registration->event()->ID() ] = EEH_HTML::li(
-					EEH_HTML::span( '', '', 'dashicons dashicons-marker ee-icon-size-16 orange-text'
+		foreach ($registrations_requiring_pre_approval as $registration) {
+			if ($registration instanceof EE_Registration && $registration->event() instanceof EE_Event) {
+				$events_requiring_pre_approval[$registration->event()->ID()] = EEH_HTML::li(
+					EEH_HTML::span('', '', 'dashicons dashicons-marker ee-icon-size-16 orange-text'
 					)
-					. EEH_HTML::span( $registration->event()->name(), '', 'orange-text' )
+					. EEH_HTML::span($registration->event()->name(), '', 'orange-text')
 				);
 			}
 		}
@@ -391,14 +391,14 @@ 
 				),
 				'layout_strategy'		=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'events_requiring_pre_approval.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'events_requiring_pre_approval.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
-								'events_requiring_pre_approval' 			=> implode( '', $events_requiring_pre_approval ),
+								'events_requiring_pre_approval' 			=> implode('', $events_requiring_pre_approval),
 								'events_requiring_pre_approval_msg' 	=> apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___events_requiring_pre_approval__events_requiring_pre_approval_msg',
-									__( 'The following events do not require payment at this time and will not be billed during this transaction. Billing will only occur after the attendee has been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso' )
+									__('The following events do not require payment at this time and will not be billed during this transaction. Billing will only occur after the attendee has been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso')
 								)
 							)
 						),
@@ -416,7 +416,7 @@ 
 	 * @param \EE_Event[] $registrations_for_free_events
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _no_payment_required( $registrations_for_free_events = array() ) {
+	private function _no_payment_required($registrations_for_free_events = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'no_payment_required';
 		// generate no_payment_required form
@@ -428,7 +428,7 @@ 
 				),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'no_payment_required.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'no_payment_required.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___no_payment_required__template_args',
 							array(
@@ -436,7 +436,7 @@ 
 								'registrations' => array(),
 								'ticket_count' 	=> array(),
 								'registrations_for_free_events' 	=> $registrations_for_free_events,
-								'no_payment_required_msg' => EEH_HTML::p( __( 'This is a free event, so no billing will occur.', 'event_espresso' ))
+								'no_payment_required_msg' => EEH_HTML::p(__('This is a free event, so no billing will occur.', 'event_espresso'))
 							)
 						),
 					)
@@ -453,7 +453,7 @@ 
 	 * @param string $transaction_details
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _display_payment_options( $transaction_details = '' ) {
+	private function _display_payment_options($transaction_details = '') {
 		// has method_of_payment been set by no-js user?
 		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment();
 		// build payment options form
@@ -465,20 +465,20 @@ 
 						'before_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__before_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy'	=> new EE_Div_Per_Section_Layout() )
+								array('layout_strategy'	=> new EE_Div_Per_Section_Layout())
 							)
 						),
 						'payment_options' => $this->_setup_payment_options(),
 						'after_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__after_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy'	=> new EE_Div_Per_Section_Layout() )
+								array('layout_strategy'	=> new EE_Div_Per_Section_Layout())
 							)
 						),
 						'default_hidden_inputs' => $this->reg_step_hidden_inputs(),
-						'extra_hidden_inputs' 	=> $this->_extra_hidden_inputs( FALSE )
+						'extra_hidden_inputs' 	=> $this->_extra_hidden_inputs(FALSE)
 					),
-					'layout_strategy'	=> new EE_Template_Layout( array(
+					'layout_strategy'	=> new EE_Template_Layout(array(
 							'layout_template_file' 	=> $this->_template,
 							'template_args'  				=> apply_filters(
 								'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__template_args',
@@ -502,11 +502,11 @@ 
 	 * @param bool $no_payment_required
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _extra_hidden_inputs( $no_payment_required = TRUE ) {
+	private function _extra_hidden_inputs($no_payment_required = TRUE) {
 
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id' 				=> 'ee-' . $this->slug() . '-extra-hidden-inputs',
+				'html_id' 				=> 'ee-'.$this->slug().'-extra-hidden-inputs',
 				'layout_strategy'	=> new EE_Div_Per_Section_Layout(),
 				'subsections' 		=> array(
 					'spco_no_payment_required' => new EE_Hidden_Input(
@@ -539,16 +539,16 @@ 
 	 * @access    protected
 	 * @return    void
 	 */
-	protected function _apply_registration_payments_to_amount_owing( $registrations ) {
+	protected function _apply_registration_payments_to_amount_owing($registrations) {
 		$payments = array();
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) {
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) {
 				$payments = $payments + $registration->registration_payments();
 			}
 		}
-		if ( ! empty( $payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( $payment instanceof EE_Registration_Payment ) {
+		if ( ! empty($payments)) {
+			foreach ($payments as $payment) {
+				if ($payment instanceof EE_Registration_Payment) {
 					$this->checkout->amount_owing -= $payment->amount();
 				}
 			}
@@ -563,9 +563,9 @@ 
 	 * @param 	bool $force_reset
 	 * @return 	void
 	 */
-	private function _reset_selected_method_of_payment( $force_reset = FALSE ) {
-		$reset_payment_method = $force_reset ? TRUE : sanitize_text_field( EE_Registry::instance()->REQ->get( 'reset_payment_method', FALSE ));
-		if ( $reset_payment_method ) {
+	private function _reset_selected_method_of_payment($force_reset = FALSE) {
+		$reset_payment_method = $force_reset ? TRUE : sanitize_text_field(EE_Registry::instance()->REQ->get('reset_payment_method', FALSE));
+		if ($reset_payment_method) {
 			$this->checkout->selected_method_of_payment = NULL;
 			$this->checkout->payment_method = NULL;
 			$this->checkout->billing_form = NULL;
@@ -584,9 +584,9 @@ 
 	 * @param string $selected_method_of_payment
 	 * 	@return 		EE_Billing_Info_Form
 	 */
-	private function _save_selected_method_of_payment( $selected_method_of_payment = '' ) {
-		$selected_method_of_payment = ! empty( $selected_method_of_payment ) ? $selected_method_of_payment : $this->checkout->selected_method_of_payment;
-		EE_Registry::instance()->SSN->set_session_data( array( 'selected_method_of_payment' => $selected_method_of_payment ));
+	private function _save_selected_method_of_payment($selected_method_of_payment = '') {
+		$selected_method_of_payment = ! empty($selected_method_of_payment) ? $selected_method_of_payment : $this->checkout->selected_method_of_payment;
+		EE_Registry::instance()->SSN->set_session_data(array('selected_method_of_payment' => $selected_method_of_payment));
 	}
 
 
@@ -599,40 +599,40 @@ 
 		// load payment method classes
 		$this->checkout->available_payment_methods = $this->_get_available_payment_methods();
 		// switch up header depending on number of available payment methods
-		$payment_method_header = count( $this->checkout->available_payment_methods ) > 1
-			? apply_filters( 'FHEE__registration_page_payment_options__method_of_payment_hdr', __( 'Please Select Your Method of Payment', 'event_espresso' ))
-			: apply_filters( 'FHEE__registration_page_payment_options__method_of_payment_hdr', __( 'Method of Payment', 'event_espresso' ));
+		$payment_method_header = count($this->checkout->available_payment_methods) > 1
+			? apply_filters('FHEE__registration_page_payment_options__method_of_payment_hdr', __('Please Select Your Method of Payment', 'event_espresso'))
+			: apply_filters('FHEE__registration_page_payment_options__method_of_payment_hdr', __('Method of Payment', 'event_espresso'));
 		$available_payment_methods = array(
 			// display the "Payment Method" header
 			'payment_method_header' => new EE_Form_Section_HTML(
-				EEH_HTML::h4 ( $payment_method_header, 'method-of-payment-hdr' )
+				EEH_HTML::h4($payment_method_header, 'method-of-payment-hdr')
 			)
 		);
 		// the list of actual payment methods ( invoice, paypal, etc ) in a  ( slug => HTML )  format
 		$available_payment_method_options = array();
 		$default_payment_method_option = array();
 		// additional instructions to be displayed and hidden below payment methods (adding a clearing div to start)
-		$payment_methods_billing_info = array( new EE_Form_Section_HTML( EEH_HTML::div ( '<br />', '', '', 'clear:both;' )));
+		$payment_methods_billing_info = array(new EE_Form_Section_HTML(EEH_HTML::div('<br />', '', '', 'clear:both;')));
 		// loop through payment methods
-		foreach( $this->checkout->available_payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$payment_method_button = EEH_HTML::img( $payment_method->button_url(), $payment_method->name(), 'spco-payment-method-' . $payment_method->slug() . '-btn-img', 'spco-payment-method-btn-img' );
+		foreach ($this->checkout->available_payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$payment_method_button = EEH_HTML::img($payment_method->button_url(), $payment_method->name(), 'spco-payment-method-'.$payment_method->slug().'-btn-img', 'spco-payment-method-btn-img');
 				// check if any payment methods are set as default
 				// if payment method is already selected OR nothing is selected and this payment method should be open_by_default
-				if (( $this->checkout->selected_method_of_payment == $payment_method->slug() ) || ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default() )) {
+				if (($this->checkout->selected_method_of_payment == $payment_method->slug()) || ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default())) {
 					$this->checkout->selected_method_of_payment = $payment_method->slug();
 					$this->_save_selected_method_of_payment();
-					$default_payment_method_option[ $payment_method->slug() ] =  $payment_method_button;
+					$default_payment_method_option[$payment_method->slug()] = $payment_method_button;
 				} else {
-					$available_payment_method_options[ $payment_method->slug() ] =  $payment_method_button;
+					$available_payment_method_options[$payment_method->slug()] = $payment_method_button;
 				}
-				$payment_methods_billing_info[ $payment_method->slug() . '-info' ] = $this->_payment_method_billing_info( $payment_method );
+				$payment_methods_billing_info[$payment_method->slug().'-info'] = $this->_payment_method_billing_info($payment_method);
 			}
 		}
 		// prepend available_payment_method_options with default_payment_method_option so that it appears first in list of PMs
 		$available_payment_method_options = $default_payment_method_option + $available_payment_method_options;
 		// now generate the actual form  inputs
-		$available_payment_methods['available_payment_methods'] = $this->_available_payment_method_inputs( $available_payment_method_options );
+		$available_payment_methods['available_payment_methods'] = $this->_available_payment_method_inputs($available_payment_method_options);
 		$available_payment_methods = $available_payment_methods + $payment_methods_billing_info;
 
 		// build the available payment methods form
@@ -652,19 +652,19 @@ 
 	 * @return EE_Payment_Method[]
 	 */
 	protected function _get_available_payment_methods() {
-		if ( ! empty( $this->checkout->available_payment_methods )) {
+		if ( ! empty($this->checkout->available_payment_methods)) {
 			return $this->checkout->available_payment_methods;
 		}
 		$available_payment_methods = array();
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		/** @type EEM_Payment_Method $EEM_Payment_Method */
 		$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
 		// get all active payment methods
-		$payment_methods = $EEM_Payment_Method->get_all_for_transaction( $this->checkout->transaction, EEM_Payment_Method::scope_cart );
-		foreach ( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$available_payment_methods[ $payment_method->slug() ] = $payment_method;
+		$payment_methods = $EEM_Payment_Method->get_all_for_transaction($this->checkout->transaction, EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$available_payment_methods[$payment_method->slug()] = $payment_method;
 			}
 		}
 		return $available_payment_methods;
@@ -680,14 +680,14 @@ 
 	 * @param 	array $available_payment_method_options
 	 * @return 	\EE_Form_Section_Proper
 	 */
-	private function _available_payment_method_inputs( $available_payment_method_options = array() ) {
+	private function _available_payment_method_inputs($available_payment_method_options = array()) {
 		// generate inputs
 		return new EE_Form_Section_Proper(
 			array(
 				'html_id' 				=> 'ee-available-payment-method-inputs',
 				'layout_strategy'	=> new EE_Div_Per_Section_Layout(),
 				'subsections' 		=> array(
-					'' => new EE_Radio_Button_Input (
+					'' => new EE_Radio_Button_Input(
 						$available_payment_method_options,
 						array(
 							'html_name' 				=> 'selected_method_of_payment',
@@ -711,36 +711,36 @@ 
 	 * @param 	EE_Payment_Method $payment_method
 	 * @return 	\EE_Form_Section_Proper
 	 */
-	private function _payment_method_billing_info( EE_Payment_Method $payment_method ) {
+	private function _payment_method_billing_info(EE_Payment_Method $payment_method) {
 		$currently_selected = $this->checkout->selected_method_of_payment == $payment_method->slug() ? TRUE : FALSE;
 		// generate the billing form for payment method
-		$billing_form = $currently_selected ? $this->_get_billing_form_for_payment_method( $payment_method ) : new EE_Form_Section_HTML();
+		$billing_form = $currently_selected ? $this->_get_billing_form_for_payment_method($payment_method) : new EE_Form_Section_HTML();
 		$this->checkout->billing_form = $currently_selected ? $billing_form : $this->checkout->billing_form;
 		// it's all in the details
-		$info_html = EEH_HTML::h3 ( __( 'Important information regarding your payment', 'event_espresso' ), '', 'spco-payment-method-hdr' );
+		$info_html = EEH_HTML::h3(__('Important information regarding your payment', 'event_espresso'), '', 'spco-payment-method-hdr');
 		// add some info regarding the step, either from what's saved in the admin, or a default string depending on whether the PM has a billing form or not
-		if ( $payment_method->description() ) {
+		if ($payment_method->description()) {
 			$payment_method_info = $payment_method->description();
-		} elseif ( $billing_form instanceof EE_Billing_Info_Form ) {
-			$payment_method_info = sprintf( __( 'Please provide the following billing information, then click the "%1$s" button below in order to proceed.', 'event_espresso' ), $this->submit_button_text() );
+		} elseif ($billing_form instanceof EE_Billing_Info_Form) {
+			$payment_method_info = sprintf(__('Please provide the following billing information, then click the "%1$s" button below in order to proceed.', 'event_espresso'), $this->submit_button_text());
 		} else {
-			$payment_method_info = sprintf( __( 'Please click the "%1$s" button below in order to proceed.', 'event_espresso' ), $this->submit_button_text() );
+			$payment_method_info = sprintf(__('Please click the "%1$s" button below in order to proceed.', 'event_espresso'), $this->submit_button_text());
 		}
-		$info_html .= EEH_HTML::p (
-			apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___payment_method_billing_info__payment_method_info', $payment_method_info ),
+		$info_html .= EEH_HTML::p(
+			apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options___payment_method_billing_info__payment_method_info', $payment_method_info),
 			'',
 			'spco-payment-method-desc ee-attention'
 		);
 
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id' 					=> 'spco-payment-method-info-' . $payment_method->slug(),
+				'html_id' 					=> 'spco-payment-method-info-'.$payment_method->slug(),
 				'html_class' 			=> 'spco-payment-method-info-dv',
 				// only display the selected or default PM
 				'html_style' 			=> $currently_selected ? '' : 'display:none;',
 				'layout_strategy'		=> new EE_Div_Per_Section_Layout(),
 				'subsections' 			=> array(
-					'info' 					=> new EE_Form_Section_HTML( $info_html ),
+					'info' 					=> new EE_Form_Section_HTML($info_html),
 					'billing_form' 		=> $currently_selected ? $billing_form : new EE_Form_Section_HTML()
 				)
 			)
@@ -758,12 +758,12 @@ 
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( TRUE );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(TRUE);
 		$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			return FALSE;
 		}
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
             EE_Error::add_success(
                 apply_filters(
                     'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -772,20 +772,20 @@ 
             );
         }
 		// now generate billing form for selected method of payment
-		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		$payment_method_billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		// fill form with attendee info if applicable
-		if ( $payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant() ) {
-			$payment_method_billing_form->populate_from_attendee( $this->checkout->transaction->primary_registration()->attendee() );
+		if ($payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant()) {
+			$payment_method_billing_form->populate_from_attendee($this->checkout->transaction->primary_registration()->attendee());
 		}
 		// and debug content
-		if ( $payment_method_billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$payment_method_billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings( $payment_method_billing_form );
+		if ($payment_method_billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base) {
+			$payment_method_billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings($payment_method_billing_form);
 		}
 		$billing_info = $payment_method_billing_form instanceof EE_Form_Section_Proper ? $payment_method_billing_form->get_html() : '';
-		$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $billing_info ));
+		$this->checkout->json_response->set_return_data(array('payment_method_info' => $billing_info));
 		// localize validation rules for main form
 		$this->checkout->current_step->reg_form->localize_validation_rules();
-		$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+		$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		return TRUE;
 	}
 
@@ -798,15 +798,15 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return \EE_Billing_Info_Form
 	 */
-	private function _get_billing_form_for_payment_method( EE_Payment_Method $payment_method ) {
-		$billing_form = $payment_method->type_obj()->billing_form( $this->checkout->transaction, array( 'amount_owing' => $this->checkout->amount_owing ) );
-		if ( $billing_form instanceof EE_Billing_Info_Form ) {
-			if ( EE_Registry::instance()->REQ->is_set( 'payment_method' )) {
-                if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
+	private function _get_billing_form_for_payment_method(EE_Payment_Method $payment_method) {
+		$billing_form = $payment_method->type_obj()->billing_form($this->checkout->transaction, array('amount_owing' => $this->checkout->amount_owing));
+		if ($billing_form instanceof EE_Billing_Info_Form) {
+			if (EE_Registry::instance()->REQ->is_set('payment_method')) {
+                if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
                     EE_Error::add_success(
                         apply_filters(
                             'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                            sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
+                            sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $payment_method->name())
                         )
                     );
                 }
@@ -831,27 +831,27 @@ 
 	 * @param string 		$request_param
 	 * @return NULL|string
 	 */
-	private function _get_selected_method_of_payment( $required = FALSE, $request_param = 'selected_method_of_payment' ) {
+	private function _get_selected_method_of_payment($required = FALSE, $request_param = 'selected_method_of_payment') {
 		// is selected_method_of_payment set in the request ?
-		$selected_method_of_payment = EE_Registry::instance()->REQ->get( $request_param, FALSE );
-		if ( $selected_method_of_payment ) {
+		$selected_method_of_payment = EE_Registry::instance()->REQ->get($request_param, FALSE);
+		if ($selected_method_of_payment) {
 			// sanitize it
-			$selected_method_of_payment = is_array( $selected_method_of_payment ) ? array_shift( $selected_method_of_payment ) : $selected_method_of_payment;
-			$selected_method_of_payment = sanitize_text_field( $selected_method_of_payment );
+			$selected_method_of_payment = is_array($selected_method_of_payment) ? array_shift($selected_method_of_payment) : $selected_method_of_payment;
+			$selected_method_of_payment = sanitize_text_field($selected_method_of_payment);
 			// store it in the session so that it's available for all subsequent requests including AJAX
-			$this->_save_selected_method_of_payment( $selected_method_of_payment );
+			$this->_save_selected_method_of_payment($selected_method_of_payment);
 		} else {
 			// or is is set in the session ?
-			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data( 'selected_method_of_payment' );
+			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data('selected_method_of_payment');
 		}
 		// do ya really really gotta have it?
-		if ( empty( $selected_method_of_payment ) && $required ) {
+		if (empty($selected_method_of_payment) && $required) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The selected method of payment could not be determined.%sPlease ensure that you have selected one before proceeding.%sIf you continue to experience difficulties, then refresh your browser and try again, or contact %s for assistance.', 'event_espresso' ),
+					__('The selected method of payment could not be determined.%sPlease ensure that you have selected one before proceeding.%sIf you continue to experience difficulties, then refresh your browser and try again, or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -877,37 +877,37 @@ 
 	 * @return string
 	 */
 	public function switch_payment_method() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return FALSE;
 		}
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-					sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $this->checkout->payment_method->name() )
+					sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
 				)
 			);
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		}
 		// fill form with attendee info if applicable
-		if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant() ) {
-			$this->checkout->billing_form->populate_from_attendee( $this->checkout->transaction->primary_registration()->attendee() );
+		if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant()) {
+			$this->checkout->billing_form->populate_from_attendee($this->checkout->transaction->primary_registration()->attendee());
 		}
 		// and debug content
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings( $this->checkout->billing_form );
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base) {
+			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings($this->checkout->billing_form);
 		}
 		// get html and validation rules for form
-		if ( $this->checkout->billing_form instanceof EE_Form_Section_Proper ) {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $this->checkout->billing_form->get_html() ));
+		if ($this->checkout->billing_form instanceof EE_Form_Section_Proper) {
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => $this->checkout->billing_form->get_html()));
 			// localize validation rules for main form
-			$this->checkout->billing_form->localize_validation_rules( TRUE );
-			$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+			$this->checkout->billing_form->localize_validation_rules(TRUE);
+			$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		} else {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => '' ));
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => ''));
 		}
 		//prevents advancement to next step
 		$this->checkout->continue_reg = FALSE;
@@ -922,12 +922,12 @@ 
 	 */
 	protected function _verify_payment_method_is_set() {
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( empty( $this->checkout->selected_method_of_payment )) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			// how have they chosen to pay?
-			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( TRUE );
+			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(TRUE);
 		}
 		// verify payment method
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			// get payment method for selected method of payment
 			$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
 		}
@@ -947,23 +947,23 @@ 
 	 * @return void
 	 */
 	public function save_payer_details_via_ajax() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return;
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		}
 		// generate primary attendee from payer info if applicable
 		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			$attendee = $this->_create_attendee_from_request_data();
-			if ( $attendee instanceof EE_Attendee ) {
-				foreach ( $this->checkout->transaction->registrations() as $registration ) {
-					if ( $registration->is_primary_registrant() ) {
+			if ($attendee instanceof EE_Attendee) {
+				foreach ($this->checkout->transaction->registrations() as $registration) {
+					if ($registration->is_primary_registrant()) {
 						$this->checkout->primary_attendee_obj = $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);
 					}
 				}
 			}
@@ -976,56 +976,56 @@ 
 	 * uses info from alternate GET or POST data (such as AJAX) to create a new attendee
 	 * @return \EE_Attendee
 	 */
-	protected function _create_attendee_from_request_data(){
+	protected function _create_attendee_from_request_data() {
 		// get State ID
-		$STA_ID = ! empty( $_REQUEST['state'] ) ? sanitize_text_field( $_REQUEST['state'] ) : '';
-		if ( ! empty( $STA_ID )) {
+		$STA_ID = ! empty($_REQUEST['state']) ? sanitize_text_field($_REQUEST['state']) : '';
+		if ( ! empty($STA_ID)) {
 			// can we get state object from name ?
-			EE_Registry::instance()->load_model( 'State' );
-			$state = EEM_State::instance()->get_col( array( array( 'STA_name' => $STA_ID ), 'limit' => 1), 'STA_ID' );
-			$STA_ID = is_array( $state ) && ! empty( $state ) ? reset( $state ) : $STA_ID;
+			EE_Registry::instance()->load_model('State');
+			$state = EEM_State::instance()->get_col(array(array('STA_name' => $STA_ID), 'limit' => 1), 'STA_ID');
+			$STA_ID = is_array($state) && ! empty($state) ? reset($state) : $STA_ID;
 		}
 		// get Country ISO
-		$CNT_ISO = ! empty( $_REQUEST['country'] ) ? sanitize_text_field( $_REQUEST['country'] ) : '';
-		if ( ! empty( $CNT_ISO )) {
+		$CNT_ISO = ! empty($_REQUEST['country']) ? sanitize_text_field($_REQUEST['country']) : '';
+		if ( ! empty($CNT_ISO)) {
 			// can we get country object from name ?
-			EE_Registry::instance()->load_model( 'Country' );
-			$country = EEM_Country::instance()->get_col( array( array( 'CNT_name' => $CNT_ISO ), 'limit' => 1), 'CNT_ISO' );
-			$CNT_ISO = is_array( $country ) && ! empty( $country ) ? reset( $country ) : $CNT_ISO;
+			EE_Registry::instance()->load_model('Country');
+			$country = EEM_Country::instance()->get_col(array(array('CNT_name' => $CNT_ISO), 'limit' => 1), 'CNT_ISO');
+			$CNT_ISO = is_array($country) && ! empty($country) ? reset($country) : $CNT_ISO;
 		}
 		// grab attendee data
 		$attendee_data = array(
-			'ATT_fname' 		=> ! empty( $_REQUEST['first_name'] ) ? sanitize_text_field( $_REQUEST['first_name'] ) : '',
-			'ATT_lname' 		=> ! empty( $_REQUEST['last_name'] ) ? sanitize_text_field( $_REQUEST['last_name'] ) : '',
-			'ATT_email' 		=> ! empty( $_REQUEST['email'] ) ? sanitize_email( $_REQUEST['email'] ) : '',
-			'ATT_address' 		=> ! empty( $_REQUEST['address'] ) ? sanitize_text_field( $_REQUEST['address'] ) : '',
-			'ATT_address2' 	=> ! empty( $_REQUEST['address2'] ) ? sanitize_text_field( $_REQUEST['address2'] ) : '',
-			'ATT_city' 			=> ! empty( $_REQUEST['city'] ) ? sanitize_text_field( $_REQUEST['city'] ) : '',
+			'ATT_fname' 		=> ! empty($_REQUEST['first_name']) ? sanitize_text_field($_REQUEST['first_name']) : '',
+			'ATT_lname' 		=> ! empty($_REQUEST['last_name']) ? sanitize_text_field($_REQUEST['last_name']) : '',
+			'ATT_email' 		=> ! empty($_REQUEST['email']) ? sanitize_email($_REQUEST['email']) : '',
+			'ATT_address' 		=> ! empty($_REQUEST['address']) ? sanitize_text_field($_REQUEST['address']) : '',
+			'ATT_address2' 	=> ! empty($_REQUEST['address2']) ? sanitize_text_field($_REQUEST['address2']) : '',
+			'ATT_city' 			=> ! empty($_REQUEST['city']) ? sanitize_text_field($_REQUEST['city']) : '',
 			'STA_ID' 				=> $STA_ID,
 			'CNT_ISO' 			=> $CNT_ISO,
-			'ATT_zip' 				=> ! empty( $_REQUEST['zip'] ) ? sanitize_text_field( $_REQUEST['zip'] ) : '',
-			'ATT_phone' 		=> ! empty( $_REQUEST['phone'] ) ? sanitize_text_field( $_REQUEST['phone'] ) : '',
+			'ATT_zip' 				=> ! empty($_REQUEST['zip']) ? sanitize_text_field($_REQUEST['zip']) : '',
+			'ATT_phone' 		=> ! empty($_REQUEST['phone']) ? sanitize_text_field($_REQUEST['phone']) : '',
 		);
 		// validate the email address since it is the most important piece of info
-		if ( empty( $attendee_data['ATT_email'] ) || $attendee_data['ATT_email'] != $_REQUEST['email'] ) {
-			EE_Error::add_error( __( 'An invalid email address was submitted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($attendee_data['ATT_email']) || $attendee_data['ATT_email'] != $_REQUEST['email']) {
+			EE_Error::add_error(__('An invalid email address was submitted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		if ( ! empty( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_email'] ) ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ( ! empty($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_email'])) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $attendee_data['ATT_fname'],
 				'ATT_lname' => $attendee_data['ATT_lname'],
 				'ATT_email' => $attendee_data['ATT_email']
 			));
-			if ( $existing_attendee instanceof EE_Attendee ) {
+			if ($existing_attendee instanceof EE_Attendee) {
 				return $existing_attendee;
 			}
 		}
 		// no existing attendee? kk let's create a new one
 		// kinda lame, but we need a first and last name to create an attendee, so use the email address if those don't exist
-		$attendee_data['ATT_fname'] = ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : $attendee_data['ATT_email'];
-		$attendee_data['ATT_lname'] = ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : $attendee_data['ATT_email'];
-		return EE_Attendee::new_instance( $attendee_data );
+		$attendee_data['ATT_fname'] = ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : $attendee_data['ATT_email'];
+		$attendee_data['ATT_lname'] = ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : $attendee_data['ATT_email'];
+		return EE_Attendee::new_instance($attendee_data);
 	}
 
 
@@ -1045,22 +1045,22 @@ 
 	 */
 	public function process_reg_step() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free() ? 'no_payment_required' : $this->_get_selected_method_of_payment( TRUE );
+		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free() ? 'no_payment_required' : $this->_get_selected_method_of_payment(TRUE);
 		// choose your own adventure based on method_of_payment
-		switch(  $this->checkout->selected_method_of_payment ) {
+		switch ($this->checkout->selected_method_of_payment) {
 
 			case 'events_sold_out' :
 				$this->checkout->redirect = TRUE;
 				$this->checkout->redirect_url = $this->checkout->cancel_page_url;
-				$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+				$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 				// mark this reg step as completed
 				$this->set_completed();
 				return FALSE;
 				break;
 
 			case 'payments_closed' :
-				if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success', false ) ) {
-					EE_Error::add_success( __( 'no payment required at this time.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success', false)) {
+					EE_Error::add_success(__('no payment required at this time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 				// mark this reg step as completed
 				$this->set_completed();
@@ -1068,8 +1068,8 @@ 
 				break;
 
 			case 'no_payment_required' :
-				if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success', false ) ) {
-					EE_Error::add_success( __( 'no payment required.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success', false)) {
+					EE_Error::add_success(__('no payment required.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 				// mark this reg step as completed
 				$this->set_completed();
@@ -1078,9 +1078,9 @@ 
 
 			default:
 				$payment_successful = $this->_process_payment();
-				if ( $payment_successful ) {
+				if ($payment_successful) {
 					$this->checkout->continue_reg = true;
-					$this->_maybe_set_completed( $this->checkout->payment_method );
+					$this->_maybe_set_completed($this->checkout->payment_method);
 				} else {
 					$this->checkout->continue_reg = false;
 				}
@@ -1098,8 +1098,8 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return void
 	 */
-	protected function _maybe_set_completed( EE_Payment_Method $payment_method ) {
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+	protected function _maybe_set_completed(EE_Payment_Method $payment_method) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				break;
 			case EE_PMT_Base::onsite :
@@ -1122,15 +1122,15 @@ 
 	public function update_reg_step() {
 		$success = TRUE;
 		// if payment required
-		if ( $this->checkout->transaction->total() > 0 ) {
-			do_action ('AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway', $this->checkout->transaction );
+		if ($this->checkout->transaction->total() > 0) {
+			do_action('AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway', $this->checkout->transaction);
 			// attempt payment via payment method
 			$success = $this->process_reg_step();
 		}
-		if ( $success && ! $this->checkout->redirect ) {
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $this->checkout->transaction->ID() );
+		if ($success && ! $this->checkout->redirect) {
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($this->checkout->transaction->ID());
 			 // set return URL
-			$this->checkout->redirect_url = add_query_arg( array( 'e_reg_url_link' => $this->checkout->reg_url_link ), $this->checkout->thank_you_page_url );
+			$this->checkout->redirect_url = add_query_arg(array('e_reg_url_link' => $this->checkout->reg_url_link), $this->checkout->thank_you_page_url);
 		}
 		return $success;
 	}
@@ -1150,24 +1150,24 @@ 
 		// clear any previous errors related to not selecting a payment method
 //		EE_Error::overwrite_errors();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment )) {
-			$this->checkout->json_response->set_plz_select_method_of_payment( __( 'Please select a method of payment before proceeding.', 'event_espresso' ));
+		if (empty($this->checkout->selected_method_of_payment)) {
+			$this->checkout->json_response->set_plz_select_method_of_payment(__('Please select a method of payment before proceeding.', 'event_espresso'));
 			return FALSE;
 		}
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			return FALSE;
 		}
 		// setup billing form
-		if ( $this->checkout->payment_method->is_on_site() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->is_on_site()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 			// bad billing form ?
-			if ( ! $this->_billing_form_is_valid() ) {
+			if ( ! $this->_billing_form_is_valid()) {
 				return FALSE;
 			}
 		}
 		// ensure primary registrant has been fully processed
-		if ( ! $this->_setup_primary_registrant_prior_to_payment() ) {
+		if ( ! $this->_setup_primary_registrant_prior_to_payment()) {
 			return FALSE;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
@@ -1175,24 +1175,24 @@ 
 		// in case a registrant leaves to an Off-Site Gateway and never returns, we want to approve any registrations for events with a default reg status of Approved
 		//$transaction_processor->toggle_registration_statuses_for_default_approved_events( $this->checkout->transaction, $this->checkout->reg_cache_where_params );
 		// attempt payment
-		$payment = $this->_attempt_payment( $this->checkout->payment_method );
+		$payment = $this->_attempt_payment($this->checkout->payment_method);
 		// process results
-		$payment = $this->_validate_payment( $payment );
-		$payment = $this->_post_payment_processing( $payment );
+		$payment = $this->_validate_payment($payment);
+		$payment = $this->_post_payment_processing($payment);
 		// verify payment
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			// store that for later
 			$this->checkout->payment = $payment;
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
-			if ( $payment->status() == EEM_Payment::status_id_approved || $payment->status() == EEM_Payment::status_id_pending ) {
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
+			if ($payment->status() == EEM_Payment::status_id_approved || $payment->status() == EEM_Payment::status_id_pending) {
 				return true;
 			} else {
 				return false;
 			}
-		} else if ( $payment === true ) {
+		} else if ($payment === true) {
 			// please note that offline payment methods will NOT make a payment,
 			// but instead just mark themselves as the PMD_ID on the transaction, and return true
 			$this->checkout->payment = $payment;
@@ -1211,10 +1211,10 @@ 
 	 * @return bool
 	 */
 	public function redirect_form() {
-		$payment_method_billing_info = $this->_payment_method_billing_info( $this->_get_payment_method_for_selected_method_of_payment() );
+		$payment_method_billing_info = $this->_payment_method_billing_info($this->_get_payment_method_for_selected_method_of_payment());
 		$html = $payment_method_billing_info->get_html_and_js();
 		$html .= $this->checkout->redirect_form;
-		EE_Registry::instance()->REQ->add_output( $html );
+		EE_Registry::instance()->REQ->add_output($html);
 		return TRUE;
 	}
 
@@ -1227,36 +1227,36 @@ 
 	 * @return bool
 	 */
 	private function _billing_form_is_valid() {
-		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form()) {
 			return TRUE;
 		}
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form ) {
-			if ( $this->checkout->billing_form->was_submitted() ) {
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form) {
+			if ($this->checkout->billing_form->was_submitted()) {
 				$this->checkout->billing_form->receive_form_submission();
-				if ( $this->checkout->billing_form->is_valid() ) {
+				if ($this->checkout->billing_form->is_valid()) {
 					return TRUE;
 				}
 				$validation_errors = $this->checkout->billing_form->get_validation_errors_accumulated();
 				$error_strings = array();
-				foreach( $validation_errors as $validation_error ){
-					if( $validation_error instanceof EE_Validation_Error ){
+				foreach ($validation_errors as $validation_error) {
+					if ($validation_error instanceof EE_Validation_Error) {
 						$form_section = $validation_error->get_form_section();
-						if( $form_section instanceof EE_Form_Input_Base ){
+						if ($form_section instanceof EE_Form_Input_Base) {
 							$label = $form_section->html_label_text();
-						}elseif( $form_section instanceof EE_Form_Section_Base ){
+						}elseif ($form_section instanceof EE_Form_Section_Base) {
 							$label = $form_section->name();
-						}else{
-							$label = __( 'Validation Error', 'event_espresso' );
+						} else {
+							$label = __('Validation Error', 'event_espresso');
 						}
-						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage() );
+						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage());
 					}
 				}
-				EE_Error::add_error( sprintf( __( 'One or more billing form inputs are invalid and require correction before proceeding. %1$s %2$s', 'event_espresso' ), '<br/>', implode( '<br/>', $error_strings )  ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('One or more billing form inputs are invalid and require correction before proceeding. %1$s %2$s', 'event_espresso'), '<br/>', implode('<br/>', $error_strings)), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				EE_Error::add_error( __( 'The billing form was not submitted or something prevented it\'s submission.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('The billing form was not submitted or something prevented it\'s submission.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
-			EE_Error::add_error( __( 'The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return FALSE;
 	}
@@ -1274,9 +1274,9 @@ 
 	 */
 		private function _setup_primary_registrant_prior_to_payment() {
 			// check if transaction has a primary registrant and that it has a related Attendee object
-			if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+			if ( ! $this->checkout->transaction_has_primary_registrant()) {
 				// need to at least gather some primary registrant data before attempting payment
-				if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && ! $this->_capture_primary_registration_data_from_billing_form() ) {
+				if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && ! $this->_capture_primary_registration_data_from_billing_form()) {
 					return FALSE;
 				}
 			}
@@ -1284,13 +1284,13 @@ 
 			// grab the primary_registration object
 			$primary_registration = $this->checkout->transaction->primary_registration();
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// at this point we'll consider a TXN to not have been failed
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 			// save the TXN ( which clears cached copy of primary_registration)
 			$this->checkout->transaction->save();
 			// grab TXN ID and save it to the primary_registration
-			$primary_registration->set_transaction_id( $this->checkout->transaction->ID() );
+			$primary_registration->set_transaction_id($this->checkout->transaction->ID());
 			// save what we have so far
 			$primary_registration->save();
 			return TRUE;
@@ -1307,41 +1307,41 @@ 
 		private function _capture_primary_registration_data_from_billing_form() {
 			// convert billing form data into an attendee
 			$this->checkout->primary_attendee_obj = $this->checkout->billing_form->create_attendee_from_billing_form_data();
-			if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+			if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The billing form details could not be used for attendee details due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The billing form details could not be used for attendee details 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 FALSE;
 			}
 			$primary_registration = $this->checkout->transaction->primary_registration();
-			if ( ! $primary_registration instanceof EE_Registration ) {
+			if ( ! $primary_registration instanceof EE_Registration) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The primary registrant for this transaction could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The primary registrant for this transaction 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 FALSE;
 			}
-			if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' ) instanceof EE_Attendee ) {
+			if ( ! $primary_registration->_add_relation_to($this->checkout->primary_attendee_obj, 'Attendee') instanceof EE_Attendee) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The primary registrant could not be associated with this transaction due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The primary registrant could not be associated with this transaction 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 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( $primary_registration );
+			$registration_processor->toggle_incomplete_registration_status_to_default($primary_registration);
 
 			return TRUE;
 		}
@@ -1357,35 +1357,35 @@ 
 	 */
 		private function _get_payment_method_for_selected_method_of_payment() {
 			// get EE_Payment_Method object
-			if ( isset( $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ] )) {
-				$payment_method = $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ];
+			if (isset($this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment])) {
+				$payment_method = $this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment];
 			} else {
 				// load EEM_Payment_Method
-				EE_Registry::instance()->load_model( 'Payment_Method' );
+				EE_Registry::instance()->load_model('Payment_Method');
 				/** @type EEM_Payment_Method $EEM_Payment_Method */
 				$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
-				$payment_method = $EEM_Payment_Method->get_one_by_slug( $this->checkout->selected_method_of_payment );
+				$payment_method = $EEM_Payment_Method->get_one_by_slug($this->checkout->selected_method_of_payment);
 			}
 			// verify $payment_method
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				// not a payment
 				EE_Error::add_error(
 					sprintf(
-						__( 'The selected method of payment could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The selected method of payment 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;
 			}
 			// and verify it has a valid Payment_Method Type object
-			if ( ! $payment_method->type_obj() instanceof EE_PMT_Base ) {
+			if ( ! $payment_method->type_obj() instanceof EE_PMT_Base) {
 				// not a payment
 				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;
@@ -1404,30 +1404,30 @@ 
 	 * 	@type 	EE_Payment_Method $payment_method
 	 * 	@return 	mixed	EE_Payment | boolean
 	 */
-	private function _attempt_payment( EE_Payment_Method $payment_method ) {
-		$payment =NULL;
+	private function _attempt_payment(EE_Payment_Method $payment_method) {
+		$payment = NULL;
 		$this->checkout->transaction->save();
-		$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-		if ( ! $payment_processor instanceof EE_Payment_Processor ) {
+		$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+		if ( ! $payment_processor instanceof EE_Payment_Processor) {
 			return FALSE;
 		}
 		try {
-			$payment_processor->set_revisit( $this->checkout->revisit );
+			$payment_processor->set_revisit($this->checkout->revisit);
 			// generate payment object
 			$payment = $payment_processor->process_payment(
 				$payment_method,
 				$this->checkout->transaction,
 				$this->checkout->amount_owing,
 				$this->checkout->billing_form,
-				$this->_get_return_url( $payment_method ),
+				$this->_get_return_url($payment_method),
 				'CART',
 				$this->checkout->admin_request,
 				TRUE,
 				$this->reg_step_url()
 			);
 
-		} catch( Exception $e ) {
-			$this->_handle_payment_processor_exception( $e );
+		} catch (Exception $e) {
+			$this->_handle_payment_processor_exception($e);
 		}
 		return $payment;
 	}
@@ -1441,12 +1441,12 @@ 
 	 * @param \Exception $e
 	 * @return void
 	 */
-	protected function _handle_payment_processor_exception( Exception $e ) {
+	protected function _handle_payment_processor_exception(Exception $e) {
 		EE_Error::add_error(
 			sprintf(
-				__( 'The payment could not br processed due to a technical issue.%1$sPlease try again or contact %2$s for assistance.||The following Exception was thrown in %4$s on line %5$s:%1$s%3$s', 'event_espresso' ),
+				__('The payment could not br processed due to a technical issue.%1$sPlease try again or contact %2$s for assistance.||The following Exception was thrown in %4$s on line %5$s:%1$s%3$s', 'event_espresso'),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' ),
+				EE_Registry::instance()->CFG->organization->get_pretty('email'),
 				$e->getMessage(),
 				$e->getFile(),
 				$e->getLine()
@@ -1463,9 +1463,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	protected function _get_return_url( EE_Payment_Method $payment_method ) {
+	protected function _get_return_url(EE_Payment_Method $payment_method) {
 		$return_url = '';
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 
 			case EE_PMT_Base::offsite :
 				$return_url = add_query_arg(
@@ -1496,27 +1496,27 @@ 
 	 * @param EE_Payment $payment
 	 * @return EE_Payment | FALSE
 	 */
-	private function _validate_payment( $payment = NULL ) {
-		if (  $this->checkout->payment_method->is_off_line() ) {
+	private function _validate_payment($payment = NULL) {
+		if ($this->checkout->payment_method->is_off_line()) {
 			return TRUE;
 		}
 		// verify payment object
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->status() != EEM_Payment::status_id_approved
 				&& $payment->status() != EEM_Payment::status_id_pending
 				&& $payment->status() != EEM_Payment::status_id_cancelled
 				&& $payment->gateway_response() != ''
 			) {
-				EE_Error::add_error( $payment->gateway_response(), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($payment->gateway_response(), __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment was not generated due to a technical issue.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso' ),
+					__('A valid payment was not generated due to a technical issue.%1$sPlease try again or contact %2$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 FALSE;
@@ -1533,23 +1533,23 @@ 
 	 * @param EE_Payment $payment
 	 * @return bool
 	 */
-	private function _post_payment_processing( $payment = NULL ) {
+	private function _post_payment_processing($payment = NULL) {
 		// On-Site payment?
-		if ( $this->checkout->payment_method->is_on_site() ) {
-			if ( ! $this->_process_payment_status( $payment, EE_PMT_Base::onsite )) {
+		if ($this->checkout->payment_method->is_on_site()) {
+			if ( ! $this->_process_payment_status($payment, EE_PMT_Base::onsite)) {
 				//$this->_setup_redirect_for_next_step();
 				$this->checkout->continue_reg = false;
 			}
 			// Off-Site payment?
-		} else if ( $this->checkout->payment_method->is_off_site() ) {
+		} else if ($this->checkout->payment_method->is_off_site()) {
 			// if a payment object was made and it specifies a redirect url, then we'll setup that redirect info
-			if ( $payment instanceof EE_Payment && $payment->redirect_url() ){
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()' );
+			if ($payment instanceof EE_Payment && $payment->redirect_url()) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()');
 				$this->checkout->redirect = TRUE;
 				$this->checkout->redirect_form = $payment->redirect_form();
-				$this->checkout->redirect_url = $this->reg_step_url( 'redirect_form' );
+				$this->checkout->redirect_url = $this->reg_step_url('redirect_form');
 				// set JSON response
-				$this->checkout->json_response->set_redirect_form( $this->checkout->redirect_form );
+				$this->checkout->json_response->set_redirect_form($this->checkout->redirect_form);
 				// set cron job for finalizing the TXN
 				// in case the user does not return from the off-site gateway
 				EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
@@ -1557,21 +1557,21 @@ 
 					$this->checkout->transaction->ID()
 				);
 				// and lastly, let's bump the payment status to pending
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 				$payment->save();
 			} else {
 				// not a payment
 				$this->checkout->continue_reg = false;
 				EE_Error::add_error(
 					sprintf(
-						__( 'It appears the Off Site Payment Method was not configured properly.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('It appears the Off Site Payment Method was not configured properly.%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__
 				);
 			}
 			// Off-Line payment?
-		} else if ( $payment === TRUE ) {
+		} else if ($payment === TRUE) {
 			//$this->_setup_redirect_for_next_step();
 			return TRUE;
 		} else {
@@ -1607,65 +1607,65 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _process_payment_status( $payment, $payment_occurs = EE_PMT_Base::offline ) {
+	private function _process_payment_status($payment, $payment_occurs = EE_PMT_Base::offline) {
 		// off-line payment? carry on
-		if ( $payment_occurs == EE_PMT_Base::offline ) {
+		if ($payment_occurs == EE_PMT_Base::offline) {
 			return true;
 		}
 		// verify payment validity
-		if ( $payment instanceof EE_Payment ) {
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()' );
+		if ($payment instanceof EE_Payment) {
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()');
 			$msg = $payment->gateway_response();
 			// check results
-			switch ( $payment->status() ) {
+			switch ($payment->status()) {
 
 				// good payment
 				case EEM_Payment::status_id_approved :
-					EE_Error::add_success( __( 'Your payment was processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success(__('Your payment was processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return TRUE;
 					break;
 
 				// slow payment
 				case EEM_Payment::status_id_pending :
-					if ( empty( $msg )) {
-						$msg = __( 'Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.', 'event_espresso' );
+					if (empty($msg)) {
+						$msg = __('Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.', 'event_espresso');
 					}
-					EE_Error::add_success( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success($msg, __FILE__, __FUNCTION__, __LINE__);
 					return TRUE;
 					break;
 
 				// don't wanna payment
 				case EEM_Payment::status_id_cancelled :
-					if ( empty( $msg )) {
+					if (empty($msg)) {
 						$msg = _n(
 							'Payment cancelled. Please try again.',
 							'Payment cancelled. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 
 				// not enough payment
 				case EEM_Payment::status_id_declined :
-					if ( empty( $msg )) {
+					if (empty($msg)) {
 						$msg = _n(
 							'We\'re sorry but your payment was declined. Please try again.',
 							'We\'re sorry but your payment was declined. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 
 				// bad payment
 				case EEM_Payment::status_id_failed :
-					if ( ! empty( $msg ) ) {
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! empty($msg)) {
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 					// default to error below
@@ -1675,14 +1675,14 @@ 
 		}
 		// off-site payment gateway responses are too unreliable, so let's just assume that
 		// the payment processing is just running slower than the registrant's request
-		if ( $payment_occurs == EE_PMT_Base::offsite ) {
+		if ($payment_occurs == EE_PMT_Base::offsite) {
 			return true;
 		}
 		EE_Error::add_error(
 				sprintf(
-					__( 'Your payment could not be processed successfully due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('Your payment could not be processed successfully 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__
 			);
@@ -1715,13 +1715,13 @@ 
 	public function process_gateway_response() {
 		$payment = null;
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			$this->checkout->continue_reg = false;
 			return false;
 		}
-		if ( ! $this->checkout->payment_method->is_off_site() ) {
+		if ( ! $this->checkout->payment_method->is_off_site()) {
 			return false;
 		}
 		$this->_validate_offsite_return();
@@ -1735,23 +1735,23 @@ 
 		//	true
 		//);
 		// verify TXN
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
-			if ( ! $gateway instanceof EE_Offsite_Gateway ) {
+			if ( ! $gateway instanceof EE_Offsite_Gateway) {
 				$this->checkout->continue_reg = false;
 				return false;
 			}
-			$payment = $this->_process_off_site_payment( $gateway );
-			$payment = $this->_process_cancelled_payments( $payment );
-			$payment = $this->_validate_payment( $payment );
+			$payment = $this->_process_off_site_payment($gateway);
+			$payment = $this->_process_cancelled_payments($payment);
+			$payment = $this->_validate_payment($payment);
 			// if payment was not declined by the payment gateway or cancelled by the registrant
-			if ( $this->_process_payment_status( $payment, EE_PMT_Base::offsite ) ) {
+			if ($this->_process_payment_status($payment, EE_PMT_Base::offsite)) {
 				//$this->_setup_redirect_for_next_step();
 				// store that for later
 				$this->checkout->payment = $payment;
 				// mark this reg step as completed, as long as gateway doesn't use a separate IPN request,
 				// because we will complete this step during the IPN processing then
-				if ( $gateway instanceof EE_Offsite_Gateway && ! $gateway->uses_separate_IPN_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && ! $gateway->uses_separate_IPN_request()) {
 					$this->set_completed();
 				}
 				return true;
@@ -1774,19 +1774,19 @@ 
 	 * @return bool
 	 */
 	private function _validate_offsite_return() {
-		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
-		if ( $TXN_ID != $this->checkout->transaction->ID() ) {
+		$TXN_ID = (int) EE_Registry::instance()->REQ->get('spco_txn', 0);
+		if ($TXN_ID != $this->checkout->transaction->ID()) {
 			// Houston... we might have a problem
 			$invalid_TXN = false;
 			// first gather some info
-			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 			$primary_registrant = $valid_TXN instanceof EE_Transaction ? $valid_TXN->primary_registration() : null;
 			// let's start by retrieving the cart for this TXN
-			$cart = $this->checkout->get_cart_for_transaction( $this->checkout->transaction );
-			if ( $cart instanceof EE_Cart ) {
+			$cart = $this->checkout->get_cart_for_transaction($this->checkout->transaction);
+			if ($cart instanceof EE_Cart) {
 				// verify that the current cart has tickets
 				$tickets = $cart->get_tickets();
-				if ( empty( $tickets ) ) {
+				if (empty($tickets)) {
 					$invalid_TXN = true;
 				}
 			} else {
@@ -1794,39 +1794,39 @@ 
 			}
 			$valid_TXN_SID = $primary_registrant instanceof EE_Registration ? $primary_registrant->session_ID() : null;
 			// validate current Session ID and compare against valid TXN session ID
-			if ( EE_Session::instance()->id() === null ) {
+			if (EE_Session::instance()->id() === null) {
 				$invalid_TXN = true;
-			} else if ( EE_Session::instance()->id() === $valid_TXN_SID ) {
+			} else if (EE_Session::instance()->id() === $valid_TXN_SID) {
 				// WARNING !!!
 				// this could be PayPal sending back duplicate requests (ya they do that)
 				// or it **could** mean someone is simply registering AGAIN after having just done so
 				// so now we need to determine if this current TXN looks valid or not
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 				// has this step even been started ?
-				if ( $transaction_processor->reg_step_completed( $this->checkout->transaction, $this->slug() === false )
+				if ($transaction_processor->reg_step_completed($this->checkout->transaction, $this->slug() === false)
 				) {
 					// really? you're half way through this reg step, but you never started it ?
 					$invalid_TXN = true;
 				}
 			}
-			if ( $invalid_TXN ) {
+			if ($invalid_TXN) {
 				// is the valid TXN completed ?
-				if ( $valid_TXN instanceof EE_Transaction ) {
+				if ($valid_TXN instanceof EE_Transaction) {
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// has this step even been started ?
-					$reg_step_completed = $transaction_processor->reg_step_completed( $valid_TXN, $this->slug() );
-					if ( $reg_step_completed !== false && $reg_step_completed !== true ) {
+					$reg_step_completed = $transaction_processor->reg_step_completed($valid_TXN, $this->slug());
+					if ($reg_step_completed !== false && $reg_step_completed !== true) {
 						// so it **looks** like this is a double request from PayPal
 						// so let's try to pick up where we left off
 						$this->checkout->transaction = $valid_TXN;
-						$this->checkout->refresh_all_entities( true );
+						$this->checkout->refresh_all_entities(true);
 						return;
 					}
 				}
 				// you appear to be lost?
-				$this->_redirect_wayward_request( $primary_registrant );
+				$this->_redirect_wayward_request($primary_registrant);
 			}
 		}
 	}
@@ -1840,16 +1840,16 @@ 
 	 * @param \EE_Registration $primary_registrant
 	 * @return bool
 	 */
-	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+	private function _redirect_wayward_request(EE_Registration $primary_registrant) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			// try redirecting based on the current TXN
 			$primary_registrant = $this->checkout->transaction instanceof EE_Transaction ? $this->checkout->transaction->primary_registration() : null;
-			if ( ! $primary_registrant instanceof EE_Registration ) {
+			if ( ! $primary_registrant instanceof EE_Registration) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'Invalid information was received from the Off-Site Payment Processor and your Transaction details could not be retrieved from the database.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso' ),
+						__('Invalid information was received from the Off-Site Payment Processor and your Transaction details could not be retrieved from the database.%1$sPlease try again or contact %2$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__
 				);
@@ -1877,16 +1877,16 @@ 
 	 * @param \EE_Offsite_Gateway $gateway
 	 * @return \EE_Payment
 	 */
-	private function _process_off_site_payment( EE_Offsite_Gateway $gateway ) {
+	private function _process_off_site_payment(EE_Offsite_Gateway $gateway) {
 		try {
 			// if gateway uses_separate_IPN_request, then we don't have to process the IPN manually
-			if ( $gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request() ) {
+			if ($gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request()) {
 				$payment = $this->checkout->transaction->last_payment();
 				//$payment_source = 'last_payment';
 			} else {
 				// get payment details and process results
 				/** @type EE_Payment_Processor $payment_processor */
-				$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+				$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 				$payment = $payment_processor->process_ipn(
 					$_REQUEST,
 					$this->checkout->transaction,
@@ -1896,14 +1896,14 @@ 
 				);
 				//$payment_source = 'process_ipn';
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			// let's just eat the exception and try to move on using any previously set payment info
 			$payment = $this->checkout->transaction->last_payment();
 			//$payment_source = 'last_payment after Exception';
 			// but if we STILL don't have a payment object
-			if ( ! $payment instanceof EE_Payment ) {
+			if ( ! $payment instanceof EE_Payment) {
 				// then we'll object ! ( not object like a thing... but object like what a lawyer says ! )
-				$this->_handle_payment_processor_exception( $e );
+				$this->_handle_payment_processor_exception($e);
 			}
 		}
 		// DEBUG LOG
@@ -1927,13 +1927,13 @@ 
 	 * @param EE_Payment $payment
 	 * @return EE_Payment | FALSE
 	 */
-	private function _process_cancelled_payments( $payment = NULL ) {
+	private function _process_cancelled_payments($payment = NULL) {
 		if (
-			isset( $_REQUEST[ 'ee_cancel_payment' ] )
+			isset($_REQUEST['ee_cancel_payment'])
 			&& $payment instanceof EE_Payment
 			&& $payment->status() == EEM_Payment::status_id_failed
 		) {
-			$payment->set_status( EEM_Payment::status_id_cancelled );
+			$payment->set_status(EEM_Payment::status_id_cancelled);
 		}
 		return $payment;
 	}
@@ -1950,23 +1950,23 @@ 
 	public function get_transaction_details_for_gateways() {
 		$txn_details = array();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$txn_details = array(
-				'error' => __( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				'error' => __('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 		}
 		// get EE_Payment_Method object
 		if (
-			empty( $txn_details ) &&
+			empty($txn_details) &&
 			! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()
 		) {
 			$txn_details = array(
 				'selected_method_of_payment' => $this->checkout->selected_method_of_payment,
-				'error' => __( 'A valid Payment Method could not be determined.', 'event_espresso' )
+				'error' => __('A valid Payment Method could not be determined.', 'event_espresso')
 			);
 		}
-		if ( empty( $txn_details ) && $this->checkout->transaction instanceof EE_Transaction ) {
-			$return_url = $this->_get_return_url( $this->checkout->payment_method );
+		if (empty($txn_details) && $this->checkout->transaction instanceof EE_Transaction) {
+			$return_url = $this->_get_return_url($this->checkout->payment_method);
 			$txn_details = array(
 				'TXN_ID'        			=> $this->checkout->transaction->ID(),
 				'TXN_timestamp' 	=> $this->checkout->transaction->datetime(),
@@ -1977,7 +1977,7 @@ 
 				'PMD_ID'        			=> $this->checkout->transaction->payment_method_ID(),
 				'payment_amount' => $this->checkout->amount_owing,
 				'return_url' 				=> $return_url,
-				'cancel_url' 				=> add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				'cancel_url' 				=> add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				'notify_url' 				=> EE_Config::instance()->core->txn_page_url(
 					array(
 						'e_reg_url_link'    			=> $this->checkout->transaction->primary_registration()->reg_url_link(),
@@ -1986,7 +1986,7 @@ 
 				)
 			);
 		}
-		echo json_encode( $txn_details );
+		echo json_encode($txn_details);
 		exit();
 	}
 

modules/single_page_checkout/reg_steps/payment_options/events_requiring_pre_approval.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 
-	<h4><span class="orange-text"><?php _e('Important Notice: Events Requiring Pre-Approval', 'event_espresso');?></span></h4>
+	<h4><span class="orange-text"><?php _e('Important Notice: Events Requiring Pre-Approval', 'event_espresso'); ?></span></h4>
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
 		<?php echo $events_requiring_pre_approval_msg; ?>
 	</p>
 	<ul id="spco-pre-approval-events-ul"><?php echo $events_requiring_pre_approval; ?></ul>
 
-	<?php echo $default_hidden_inputs;  ?>
-	<?php echo $extra_hidden_inputs;  ?>
+	<?php echo $default_hidden_inputs; ?>
+	<?php echo $extra_hidden_inputs; ?>
 
 	<!--	<input id="reg-page-selected-method-of-payment" type="hidden" value="payments_closed" name="selected_method_of_payment">-->
 <!--	<input type="hidden" id="reg-page-no-payment-required-payment_options" name="_reg-page-no-payment-required" value="1" />-->

modules/single_page_checkout/reg_steps/payment_options/no_payment_required.template.php

Spacing +6 added lines, -6 removed lines

@@ -1,22 +1,22 @@
 <?php
-if( is_array( $registrations_for_free_events ) && ! empty( $registrations_for_free_events ) ) {
+if (is_array($registrations_for_free_events) && ! empty($registrations_for_free_events)) {
 	echo apply_filters(
 		'FHEE__registration_page_payment_options__no_payment_required_hdr',
 		sprintf(
-			__( '%1$sNo Payment Required%2$s', 'event_espresso' ),
+			__('%1$sNo Payment Required%2$s', 'event_espresso'),
 			'<h6>',
 			'</h6>'
 		)
 	);
-	foreach ( $registrations_for_free_events as $registration_for_free_event ) {
-		if ( $registration_for_free_event instanceof EE_Registration && $registration_for_free_event->ticket()->is_free() ) {
-			if ( $registration_for_free_event->event() instanceof EE_Event ) {
+	foreach ($registrations_for_free_events as $registration_for_free_event) {
+		if ($registration_for_free_event instanceof EE_Registration && $registration_for_free_event->ticket()->is_free()) {
+			if ($registration_for_free_event->event() instanceof EE_Event) {
 				?>
 				<p>
 					<?php echo apply_filters(
 						'FHEE__registration_page_payment_options__no_payment_required_pg',
 						sprintf(
-							__( '"%1$s" for "%2$s" is free, so no payment is required and no billing will occur.', 'event_espresso' ),
+							__('"%1$s" for "%2$s" is free, so no payment is required and no billing will occur.', 'event_espresso'),
 							$registration_for_free_event->ticket()->name(),
 							$registration_for_free_event->event()->name()
 						)

modules/single_page_checkout/reg_steps/payment_options/sold_out_events.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 
-	<h4 class="ee-status sold-out"><b><?php _e('Sold Out', 'event_espresso');?></b></h4>
+	<h4 class="ee-status sold-out"><b><?php _e('Sold Out', 'event_espresso'); ?></b></h4>
 	<ul id="spco-sold-out-events-ul"><?php echo $sold_out_events; ?></ul>
-	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso');?></h6>
+	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso'); ?></h6>
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
 		<?php echo $sold_out_events_msg; ?>
 	</p>
 
-	<?php echo $default_hidden_inputs;  ?>
-	<?php echo $extra_hidden_inputs;  ?>
+	<?php echo $default_hidden_inputs; ?>
+	<?php echo $extra_hidden_inputs; ?>