eventespresso / event-espresso-core

modules/feeds/templates/espresso_venues_feed.template.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * This template will display venue details for your RSS feed
- *
- * @ package		Event Espresso
- * @ author		Seth Shoultes
- * @ copyright	(c) 2008-2013 Event Espresso  All Rights Reserved.
- * @ license		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link			http://www.eventespresso.com
- * @ version		4+
- */
+  * This template will display venue details for your RSS feed
+  *
+  * @ package		Event Espresso
+  * @ author		Seth Shoultes
+  * @ copyright	(c) 2008-2013 Event Espresso  All Rights Reserved.
+  * @ license		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+  * @ link			http://www.eventespresso.com
+  * @ version		4+
+  */
  ?>
 <p><?php  _e( 'Organizer Name: ', 'event_espresso' ) . espresso_organization_name( $VNU_ID ); ?><br/>
 <?php  _e( 'Organizer Email: ', 'event_espresso' ) . espresso_organization_email( $VNU_ID ); ?><br/>

Spacing +7 added lines, -7 removed lines

@@ -10,11 +10,11 @@
  * @ version		4+
  */
  ?>
-<p><?php  _e( 'Organizer Name: ', 'event_espresso' ) . espresso_organization_name( $VNU_ID ); ?><br/>
-<?php  _e( 'Organizer Email: ', 'event_espresso' ) . espresso_organization_email( $VNU_ID ); ?><br/>
-<?php  _e( 'Venue Phone: ', 'event_espresso' ) . espresso_venue_phone( $VNU_ID ); ?></p>
-<p><?php  _e( 'Categories: ', 'event_espresso' ) . espresso_venue_categories( $VNU_ID );?></p>
-<p><?php  _e( 'Address: ', 'event_espresso' ) . espresso_venue_address( $VNU_ID );?></p>
-<p><?php  _e( 'Website: ', 'event_espresso' ) . espresso_venue_website( $VNU_ID );?></p>
-<p><?php  echo __( 'Description: ', 'event_espresso' )  . $venue_description; ?></p><br/>
+<p><?php  _e('Organizer Name: ', 'event_espresso').espresso_organization_name($VNU_ID); ?><br/>
+<?php  _e('Organizer Email: ', 'event_espresso').espresso_organization_email($VNU_ID); ?><br/>
+<?php  _e('Venue Phone: ', 'event_espresso').espresso_venue_phone($VNU_ID); ?></p>
+<p><?php  _e('Categories: ', 'event_espresso').espresso_venue_categories($VNU_ID); ?></p>
+<p><?php  _e('Address: ', 'event_espresso').espresso_venue_address($VNU_ID); ?></p>
+<p><?php  _e('Website: ', 'event_espresso').espresso_venue_website($VNU_ID); ?></p>
+<p><?php  echo __('Description: ', 'event_espresso').$venue_description; ?></p><br/>
  
\ No newline at end of file

modules/gateways/Invoice/lib/Invoice.class.php

Braces +10 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 		//Get the CSS file
 		if( isset( $themes[ $theme_requested ] ) ) {
 			$template_args['invoice_css'] = $themes[ $theme_requested ];
-		}else{
+		} else{
 			$template_args['invoice_css'] = $this->invoice_payment_method->get_extra_meta( 'legacy_invoice_css', TRUE, 'simple.css' );
 		}
 
@@ -78,7 +78,7 @@ 
 		$attendee_state = $primary_attendee->state_obj();
 		if($attendee_state){
 			$attendee_state_name = $attendee_state->name();
-		}else{
+		} else{
 			$attendee_state_name = '';
 		}
 		$template_args['attendee_state'] = $attendee_state_name;
@@ -149,7 +149,7 @@ 
 			$EE->load_helper( 'Venue_View' );
 //			d($template_args);
 			$template_args['download_link'] = $this->registration->receipt_url('download');
-		}else{
+		} else{
 			//it's just an invoice we're accessing
 			$template_args['download_link'] = $this->registration->invoice_url('download');
 		}
@@ -165,7 +165,7 @@ 
 		$template_header = EEH_Template::locate_template( $templates_relative_path . 'invoice_header.template.php', $template_args, TRUE, TRUE );
 		if(isset($_GET['receipt'])){
 			$template_body = EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', $template_args, TRUE, TRUE );
-		}else{
+		} else{
 			$template_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', $template_args, TRUE, TRUE );
 		}
 
@@ -190,7 +190,7 @@ 
 		//Create the PDF
 		if(array_key_exists('html',$_GET)){
 			echo $content;
-		}else{
+		} else{
 			//only load dompdf if nobody else has yet...
 			if( ! defined('DOMPDF_DIR')){
 				define('DOMPDF_ENABLE_REMOTE', TRUE);
@@ -214,7 +214,7 @@ 
 	function check_if_any_line_items_have_a_description(EE_Line_Item $line_item){
 		if($line_item->desc()){
 			return true;
-		}else{
+		} else{
 			foreach($line_item->children() as $child_line_item){
 				if($this->check_if_any_line_items_have_a_description($child_line_item)){
 					return true;
@@ -258,7 +258,7 @@ 
 		$org_state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $EE->CFG->organization->STA_ID );
 		if($org_state){
 			$org_state_name = $org_state->name();
-		}else{
+		} else{
 			$org_state_name = '';
 		}
 		$ReplaceValues = array(
@@ -285,8 +285,9 @@ 
 	public function espressoLoadData($items) {
 		$lines = $items;
 		$data = array();
-		foreach ($lines as $line)
-			$data[] = explode(';', chop($line));
+		foreach ($lines as $line) {
+					$data[] = explode(';', chop($line));
+		}
 
 		return $data;
 	}

Spacing +79 added lines, -79 removed lines

@@ -21,23 +21,23 @@ 
 	private $EE;
 	public function __construct($url_link = 0) {
 
-		if ( $this->registration = EE_Registry::instance()->load_model( 'Registration' )->get_registration_for_reg_url_link( $url_link)) {
+		if ($this->registration = EE_Registry::instance()->load_model('Registration')->get_registration_for_reg_url_link($url_link)) {
 			$this->transaction = $this->registration->transaction();
 
-			$payment_settings = EE_Config::instance()->gateway->payment_settings;//get_user_meta(EE_Registry::instance()->CFG->wp_user, 'payment_settings', TRUE);
-			$this->invoice_payment_method = EEM_Payment_Method::instance()->get_one_of_type( 'Invoice' );
+			$payment_settings = EE_Config::instance()->gateway->payment_settings; //get_user_meta(EE_Registry::instance()->CFG->wp_user, 'payment_settings', TRUE);
+			$this->invoice_payment_method = EEM_Payment_Method::instance()->get_one_of_type('Invoice');
 		} else {
-			EE_Error::add_error( __( 'Your request appears to be missing some required data, and no information for your transaction could be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Your request appears to be missing some required data, and no information for your transaction could be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 	}
 
-	public function send_invoice( $download = FALSE ) {
+	public function send_invoice($download = FALSE) {
 		$template_args = array();
 		$EE = EE_Registry::instance();
 
 		//allow the request to override the default theme defined in the invoice settings
-		$theme_requested = ( isset( $_REQUEST['theme'] ) && $_REQUEST['theme'] > 0 && $_REQUEST['theme'] < 8 ) ? absint( $_REQUEST['theme'] ) : null;
+		$theme_requested = (isset($_REQUEST['theme']) && $_REQUEST['theme'] > 0 && $_REQUEST['theme'] < 8) ? absint($_REQUEST['theme']) : null;
 		$themes = array(
 										1 => "simple.css",
 										2 => "bauhaus.css",
@@ -48,26 +48,26 @@ 
 										7 => "union.css"
 									);
 		//Get the CSS file
-		if( isset( $themes[ $theme_requested ] ) ) {
-			$template_args['invoice_css'] = $themes[ $theme_requested ];
-		}else{
-			$template_args['invoice_css'] = $this->invoice_payment_method->get_extra_meta( 'legacy_invoice_css', TRUE, 'simple.css' );
+		if (isset($themes[$theme_requested])) {
+			$template_args['invoice_css'] = $themes[$theme_requested];
+		} else {
+			$template_args['invoice_css'] = $this->invoice_payment_method->get_extra_meta('legacy_invoice_css', TRUE, 'simple.css');
 		}
 
-		if (is_dir(EVENT_ESPRESSO_GATEWAY_DIR . '/invoice')) {
-			$template_args['base_url'] = EVENT_ESPRESSO_GATEWAY_URL . 'Invoice/lib/templates/';
+		if (is_dir(EVENT_ESPRESSO_GATEWAY_DIR.'/invoice')) {
+			$template_args['base_url'] = EVENT_ESPRESSO_GATEWAY_URL.'Invoice/lib/templates/';
 		} else {
-			$template_args['base_url'] = EE_GATEWAYS . '/Invoice/lib/templates/';
+			$template_args['base_url'] = EE_GATEWAYS.'/Invoice/lib/templates/';
 		}
 		$primary_attendee = $this->transaction->primary_registration()->attendee();
 
-		$template_args['organization'] = $EE->CFG->organization->get_pretty( 'name' );
-		$template_args['street'] = empty( $EE->CFG->organization->address_2 ) ? $EE->CFG->organization->get_pretty( 'address_1' ) : $EE->CFG->organization->get_pretty( 'address_1' ) . '<br>' . $EE->CFG->organization->get_pretty( 'address_2' );
-		$template_args['city'] = $EE->CFG->organization->get_pretty( 'city' );
-		$template_args['state'] = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $EE->CFG->organization->STA_ID );
-		$template_args['country'] = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $EE->CFG->organization->CNT_ISO );
-		$template_args['zip'] = $EE->CFG->organization->get_pretty( 'zip' );
-		$template_args['email'] = $EE->CFG->organization->get_pretty( 'email' );
+		$template_args['organization'] = $EE->CFG->organization->get_pretty('name');
+		$template_args['street'] = empty($EE->CFG->organization->address_2) ? $EE->CFG->organization->get_pretty('address_1') : $EE->CFG->organization->get_pretty('address_1').'<br>'.$EE->CFG->organization->get_pretty('address_2');
+		$template_args['city'] = $EE->CFG->organization->get_pretty('city');
+		$template_args['state'] = EE_Registry::instance()->load_model('State')->get_one_by_ID($EE->CFG->organization->STA_ID);
+		$template_args['country'] = EE_Registry::instance()->load_model('Country')->get_one_by_ID($EE->CFG->organization->CNT_ISO);
+		$template_args['zip'] = $EE->CFG->organization->get_pretty('zip');
+		$template_args['email'] = $EE->CFG->organization->get_pretty('email');
 
 		$template_args['registration_code'] = $this->registration->reg_code();
 		$template_args['registration_date'] = $this->registration->date();
@@ -76,9 +76,9 @@ 
 		$template_args['attendee_address2'] = $primary_attendee->address2();
 		$template_args['attendee_city'] = $primary_attendee->city();
 		$attendee_state = $primary_attendee->state_obj();
-		if($attendee_state){
+		if ($attendee_state) {
 			$attendee_state_name = $attendee_state->name();
-		}else{
+		} else {
 			$attendee_state_name = '';
 		}
 		$template_args['attendee_state'] = $attendee_state_name;
@@ -102,9 +102,9 @@ 
 		if ($template_args['amount_pd'] != $template_args['total_cost']) {
 			//$template_args['net_total'] = $this->espressoInvoiceTotals( __('SubTotal', 'event_espresso'), $this->transaction->total());//$this->session_data['cart']['REG']['sub_total']);
 			$tax_items = $this->transaction->tax_items();
-			if(!empty($tax_items) ){
+			if ( ! empty($tax_items)) {
 				foreach ($tax_items as $tax) {
-					$template_args['net_total'] .= $this->espressoInvoiceTotals( $tax->name(), $tax->total());
+					$template_args['net_total'] .= $this->espressoInvoiceTotals($tax->name(), $tax->total());
 				}
 			}
 
@@ -114,30 +114,30 @@ 
 			} else {
 				$text = __('Extra', 'event_espresso');
 			}
-			$template_args['discount'] = $this->espressoInvoiceTotals( $text, $difference );
+			$template_args['discount'] = $this->espressoInvoiceTotals($text, $difference);
 		}
 
 		$template_args['currency_symbol'] = $EE->CFG->currency->sign;
-		$template_args['template_payment_instructions'] = wpautop(stripslashes_deep(html_entity_decode($this->invoice_payment_method->get_extra_meta( 'pdf_instructions', TRUE ), ENT_QUOTES)));
-		$template_args['shameless_plug'] = apply_filters( 'FHEE_Invoice__send_invoice__shameless_plug',true );
-		if(isset($_GET['receipt'])){
+		$template_args['template_payment_instructions'] = wpautop(stripslashes_deep(html_entity_decode($this->invoice_payment_method->get_extra_meta('pdf_instructions', TRUE), ENT_QUOTES)));
+		$template_args['shameless_plug'] = apply_filters('FHEE_Invoice__send_invoice__shameless_plug', true);
+		if (isset($_GET['receipt'])) {
 			//receipt-specific stuff
 			$events_for_txn = EEM_Event::instance()->get_all(array(array('Registration.TXN_ID'=>$this->transaction->ID())));
 			$ticket_line_items_per_event = array();
 			$registrations_per_line_item = array();
 			$venues_for_events = array();
-			foreach($events_for_txn as $event_id => $event){
-				$line_items_for_this_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$event_id,'TXN_ID'=>$this->transaction->ID())));
+			foreach ($events_for_txn as $event_id => $event) {
+				$line_items_for_this_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$event_id, 'TXN_ID'=>$this->transaction->ID())));
 				$ticket_line_items_per_event[$event_id] = $line_items_for_this_event;
-				foreach($line_items_for_this_event as $line_item_id => $line_item){
+				foreach ($line_items_for_this_event as $line_item_id => $line_item) {
 					$ticket = $line_item->ticket();
-					$registrations_for_this_ticket = EEM_Registration::instance()->get_all(array(array('TKT_ID'=>$ticket->ID(),'TXN_ID'=>$this->transaction->ID())));
+					$registrations_for_this_ticket = EEM_Registration::instance()->get_all(array(array('TKT_ID'=>$ticket->ID(), 'TXN_ID'=>$this->transaction->ID())));
 					$registrations_per_line_item[$line_item_id] = $registrations_for_this_ticket;
 				}
 				$venues_for_events = array_merge($venues_for_events, $event->venues());
 			}
-			$tax_total_line_item = EEM_Line_Item::instance()->get_one(array(array('TXN_ID'=>$this->transaction->ID(),'LIN_type'=>  EEM_Line_Item::type_tax_sub_total)));
-			$questions_to_skip = array(EEM_Attendee::system_question_fname,EEM_Attendee::system_question_lname,  EEM_Attendee::system_question_email);
+			$tax_total_line_item = EEM_Line_Item::instance()->get_one(array(array('TXN_ID'=>$this->transaction->ID(), 'LIN_type'=>  EEM_Line_Item::type_tax_sub_total)));
+			$questions_to_skip = array(EEM_Attendee::system_question_fname, EEM_Attendee::system_question_lname, EEM_Attendee::system_question_email);
 
 
 			$template_args['events_for_txn'] = $events_for_txn;
@@ -146,10 +146,10 @@ 
 			$template_args['venues_for_events'] = $venues_for_events;
 			$template_args['tax_total_line_item'] = $tax_total_line_item;
 			$template_args['questions_to_skip'] = $questions_to_skip;
-			$EE->load_helper( 'Venue_View' );
+			$EE->load_helper('Venue_View');
 //			d($template_args);
 			$template_args['download_link'] = $this->registration->receipt_url('download');
-		}else{
+		} else {
 			//it's just an invoice we're accessing
 			$template_args['download_link'] = $this->registration->invoice_url('download');
 		}
@@ -157,51 +157,51 @@ 
 
 
 		//require helpers
-		$EE->load_helper( 'Formatter' );
+		$EE->load_helper('Formatter');
 
 		//Get the HTML as an object
 		EE_Registry::instance()->load_helper('Template');
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-		$template_header = EEH_Template::locate_template( $templates_relative_path . 'invoice_header.template.php', $template_args, TRUE, TRUE );
-		if(isset($_GET['receipt'])){
-			$template_body = EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', $template_args, TRUE, TRUE );
-		}else{
-			$template_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', $template_args, TRUE, TRUE );
+		$template_header = EEH_Template::locate_template($templates_relative_path.'invoice_header.template.php', $template_args, TRUE, TRUE);
+		if (isset($_GET['receipt'])) {
+			$template_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', $template_args, TRUE, TRUE);
+		} else {
+			$template_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', $template_args, TRUE, TRUE);
 		}
 
 
-		$template_footer = EEH_Template::locate_template( $templates_relative_path . 'invoice_footer.template.php', $template_args, TRUE, TRUE );
+		$template_footer = EEH_Template::locate_template($templates_relative_path.'invoice_footer.template.php', $template_args, TRUE, TRUE);
 
-		$copies =  ! empty( $_REQUEST['copies'] ) ? $_REQUEST['copies'] : 1;
+		$copies = ! empty($_REQUEST['copies']) ? $_REQUEST['copies'] : 1;
 
 		$content = $this->espresso_replace_invoice_shortcodes($template_header);
-		for( $x = 1; $x <= $copies; $x++ ) {
+		for ($x = 1; $x <= $copies; $x++) {
 			$content .= $this->espresso_replace_invoice_shortcodes($template_body);
 		}
 		$content .= $this->espresso_replace_invoice_shortcodes($template_footer);
 
 		//Check if debugging or mobile is set
-		if (!empty($_REQUEST['html'])) {
+		if ( ! empty($_REQUEST['html'])) {
 			echo $content;
 			exit(0);
 		}
-		$invoice_name = $template_args['organization'] . ' ' . __('Invoice #', 'event_espresso') . $template_args['registration_code'] . __(' for ', 'event_espresso') . $template_args['name'];
-		$invoice_name = str_replace( ' ', '_', $invoice_name );
+		$invoice_name = $template_args['organization'].' '.__('Invoice #', 'event_espresso').$template_args['registration_code'].__(' for ', 'event_espresso').$template_args['name'];
+		$invoice_name = str_replace(' ', '_', $invoice_name);
 		//Create the PDF
-		if(array_key_exists('html',$_GET)){
+		if (array_key_exists('html', $_GET)) {
 			echo $content;
-		}else{
+		} else {
 			//only load dompdf if nobody else has yet...
-			if( ! defined('DOMPDF_DIR')){
+			if ( ! defined('DOMPDF_DIR')) {
 				define('DOMPDF_ENABLE_REMOTE', TRUE);
 				define('DOMPDF_ENABLE_JAVASCRIPT', FALSE);
 				define('DOMPDF_ENABLE_CSS_FLOAT', TRUE);
-				require_once(EE_THIRD_PARTY . 'dompdf/dompdf_config.inc.php');
+				require_once(EE_THIRD_PARTY.'dompdf/dompdf_config.inc.php');
 			}
 			$dompdf = new DOMPDF();
 			$dompdf->load_html($content);
 			$dompdf->render();
-			$dompdf->stream($invoice_name . ".pdf", array( 'Attachment' => $download ));
+			$dompdf->stream($invoice_name.".pdf", array('Attachment' => $download));
 		}
 		exit(0);
 	}
@@ -211,12 +211,12 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return boolean
 	 */
-	function check_if_any_line_items_have_a_description(EE_Line_Item $line_item){
-		if($line_item->desc()){
+	function check_if_any_line_items_have_a_description(EE_Line_Item $line_item) {
+		if ($line_item->desc()) {
 			return true;
-		}else{
-			foreach($line_item->children() as $child_line_item){
-				if($this->check_if_any_line_items_have_a_description($child_line_item)){
+		} else {
+			foreach ($line_item->children() as $child_line_item) {
+				if ($this->check_if_any_line_items_have_a_description($child_line_item)) {
 					return true;
 				}
 			}
@@ -226,14 +226,14 @@ 
 	}
 
 //Perform the shortcode replacement
-	function espresso_replace_invoice_shortcodes( $content ) {
+	function espresso_replace_invoice_shortcodes($content) {
 
 		$EE = EE_Registry::instance();
 		//Create the logo
-		$invoice_logo_url = $this->invoice_payment_method->get_extra_meta('pdf_logo_image', TRUE,  $EE->CFG->organization->logo_url );
-		if (!empty($invoice_logo_url)) {
+		$invoice_logo_url = $this->invoice_payment_method->get_extra_meta('pdf_logo_image', TRUE, $EE->CFG->organization->logo_url);
+		if ( ! empty($invoice_logo_url)) {
 			$image_size = getimagesize($invoice_logo_url);
-			$invoice_logo_image = '<img class="logo screen" src="' . $invoice_logo_url . '" ' . $image_size[3] . ' alt="logo" /> ';
+			$invoice_logo_image = '<img class="logo screen" src="'.$invoice_logo_url.'" '.$image_size[3].' alt="logo" /> ';
 		} else {
 			$invoice_logo_image = '';
 		}
@@ -255,28 +255,28 @@ 
 				"[instructions]",
 		);
 		$primary_attendee = $this->transaction->primary_registration()->attendee();
-		$org_state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $EE->CFG->organization->STA_ID );
-		if($org_state){
+		$org_state = EE_Registry::instance()->load_model('State')->get_one_by_ID($EE->CFG->organization->STA_ID);
+		if ($org_state) {
 			$org_state_name = $org_state->name();
-		}else{
+		} else {
 			$org_state_name = '';
 		}
 		$ReplaceValues = array(
-				$EE->CFG->organization->get_pretty( 'name' ),
+				$EE->CFG->organization->get_pretty('name'),
 				$this->registration->reg_code(),
 				$this->transaction->ID(),
 				$primary_attendee->full_name(),
-				(is_dir(EVENT_ESPRESSO_GATEWAY_DIR . '/invoice')) ? EVENT_ESPRESSO_GATEWAY_URL . 'Invoice/lib/templates/' : EE_GATEWAYS_URL . 'Invoice/lib/templates/',
-				$this->registration->invoice_url(),//home_url() . '/?download_invoice=true&amp;id=' . $this->registration->reg_url_link(),
+				(is_dir(EVENT_ESPRESSO_GATEWAY_DIR.'/invoice')) ? EVENT_ESPRESSO_GATEWAY_URL.'Invoice/lib/templates/' : EE_GATEWAYS_URL.'Invoice/lib/templates/',
+				$this->registration->invoice_url(), //home_url() . '/?download_invoice=true&amp;id=' . $this->registration->reg_url_link(),
 				$invoice_logo_image,
-				empty( $EE->CFG->organization->address_2 ) ? $EE->CFG->organization->get_pretty( 'address_1' ) : $EE->CFG->organization->get_pretty( 'address_1' ) . '<br>' . $EE->CFG->organization->get_pretty( 'address_2' ),
-				$EE->CFG->organization->get_pretty( 'city' ),
+				empty($EE->CFG->organization->address_2) ? $EE->CFG->organization->get_pretty('address_1') : $EE->CFG->organization->get_pretty('address_1').'<br>'.$EE->CFG->organization->get_pretty('address_2'),
+				$EE->CFG->organization->get_pretty('city'),
 				$org_state_name,
-				$EE->CFG->organization->get_pretty( 'zip' ),
-				$EE->CFG->organization->get_pretty( 'email' ),
+				$EE->CFG->organization->get_pretty('zip'),
+				$EE->CFG->organization->get_pretty('email'),
 				$EE->CFG->organization->vat,
-				$this->registration->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) ),
-				$this->invoice_payment_method->get_extra_meta( 'pdf_instructions', TRUE ),
+				$this->registration->get_i18n_datetime('REG_date', get_option('date_format')),
+				$this->invoice_payment_method->get_extra_meta('pdf_instructions', TRUE),
 		);
 
 		return str_replace($SearchValues, $ReplaceValues, $content);
@@ -299,12 +299,12 @@ 
 		if ($total_cost < 0) {
 			$total_cost = (-1) * $total_cost;
 		}
-		$find = array( ' ' );
-		$replace = array( '-' );
-		$row_id = strtolower( str_replace( $find, $replace, $text ));
+		$find = array(' ');
+		$replace = array('-');
+		$row_id = strtolower(str_replace($find, $replace, $text));
 		$html .= '<tr id="'.$row_id.'-tr"><td colspan="4">&nbsp;</td>';
-		$html .= '<td class="item_r">' . $text . '</td>';
-		$html .= '<td class="item_r">' . $total_cost . '</td>';
+		$html .= '<td class="item_r">'.$text.'</td>';
+		$html .= '<td class="item_r">'.$total_cost.'</td>';
 		$html .= '</tr>';
 		return $html;
 	}

modules/gateways/Invoice/lib/invoice_functions.php

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 //Returns an array of available template files
 function espresso_invoice_template_files($class_file) {
 	// read our template dir and build an array of files
-	$dhandle = opendir(dirname($class_file) . '/lib/templates/css/'); //If the template files have been moved to the uploads folder
+	$dhandle = opendir(dirname($class_file).'/lib/templates/css/'); //If the template files have been moved to the uploads folder
 	//} else return FALSE;
 
 	$files = array();
@@ -33,8 +33,8 @@ 
 }
 
 //Checks to see if the invoice is selected
-function espresso_invoice_is_selected($input_item, $selected='') {
-	if ( $input_item == $option_selections ) {
+function espresso_invoice_is_selected($input_item, $selected = '') {
+	if ($input_item == $option_selections) {
 		return 'selected="selected"';
 	} else {
 		return '';

modules/gateways/Invoice/lib/templates/invoice_body.template.php

Switch Indentation +3 added lines, -3 removed lines

@@ -154,12 +154,12 @@
 							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
 						</tr>
 						<?php break;
-					case EEM_Line_Item::type_tax:
-							?>
+						case EEM_Line_Item::type_tax:
+								?>
 						<tr class="item sub-item tax-total">
 							<td class="item_l"><?php echo $line_item->name(); ?></td>
 							<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
-							<td colspan="2" class="item_c"><?php echo $line_item->percent(); ?>%</td>
+								<td colspan="2" class="item_c"><?php echo $line_item->percent(); ?>%</td>
 
 							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
 						</tr><?php break;

Spacing +43 added lines, -43 removed lines

@@ -45,13 +45,13 @@ 
 					</div>
 					 <!--#client-details vcard-->
 
-		<h2><?php _e("Purchases",'event_espresso')?></h2>
+		<h2><?php _e("Purchases", 'event_espresso')?></h2>
 		<table class="invoice-amount">
 
 			<thead>
 				<tr class="header_row">
 					<th class="left ticket_th"><?php _e('Item', 'event_espresso'); ?></th>
-					<?php if ($show_line_item_description){?><th class="left event_th"><?php _e('Description', 'event_espresso'); ?></th><?php }?>
+					<?php if ($show_line_item_description) {?><th class="left event_th"><?php _e('Description', 'event_espresso'); ?></th><?php }?>
 					<th class="quantity_th"><?php _e('Qty', 'event_espresso'); ?></th>
 					<th class="left event_th"><?php _e('Price', 'event_espresso'); ?></th>
 					<th class="subtotal_th item_r"><?php _e('Total', 'event_espresso'); ?></th>
@@ -65,56 +65,56 @@ 
 				 * @param EE_Line_Item $line_item
 				 * @param boolean $odd for indicating whether to style this line item as an 'odd' or 'even'
 				 */
-				function ee_invoice_display_line_item(EE_Line_Item $line_item, $show_line_item_description, $odd = false){
-					switch($line_item->type()){
+				function ee_invoice_display_line_item(EE_Line_Item $line_item, $show_line_item_description, $odd = false) {
+					switch ($line_item->type()) {
 						case EEM_Line_Item::type_total:
-							foreach($line_item->children() as $child_line_item){
-								ee_invoice_display_line_item($child_line_item,$show_line_item_description);
+							foreach ($line_item->children() as $child_line_item) {
+								ee_invoice_display_line_item($child_line_item, $show_line_item_description);
 								}?>
 							<tr><td colspan="<?php echo $show_line_item_description ? 5 : 4 ?>"><hr></td></tr>
 							<tr class="total_tr odd">
 								<td colspan="<?php echo $show_line_item_description ? 2 : 1 ?>">&nbsp;</td>
 								<td colspan="2" class="total" id="total_currency"><?php _e('Total', 'event_espresso'); ?></td>
-								<td class="total"><?php echo $line_item->total_no_code();?></td>
+								<td class="total"><?php echo $line_item->total_no_code(); ?></td>
 							</tr>
 						<?php break;
 
 
 						case EEM_Line_Item::type_sub_total:
-							foreach($line_item->children() as $child_line_item){
+							foreach ($line_item->children() as $child_line_item) {
 							//$odd = !$odd;
-								ee_invoice_display_line_item($child_line_item,$show_line_item_description,$odd);
+								ee_invoice_display_line_item($child_line_item, $show_line_item_description, $odd);
 							}?>
 							<tr class="total_tr odd">
 								<td colspan="<?php echo $show_line_item_description ? 2 : 1 ?>">&nbsp;</td>
 								<td colspan="2" class="total" id="total_currency"><?php _e('Sub-Total', 'event_espresso'); ?></td>
-								<td class="total"><?php echo $line_item->total_no_code();?></td>
+								<td class="total"><?php echo $line_item->total_no_code(); ?></td>
 							</tr>
 						<?php break;
 
 
 						case EEM_Line_Item::type_tax_sub_total:
-							foreach($line_item->children() as $child_line_item){
-								$odd = !$odd;
+							foreach ($line_item->children() as $child_line_item) {
+								$odd = ! $odd;
 								ee_invoice_display_line_item($child_line_item, $show_line_item_description, $odd);
 							}?>
 							<tr class="total_tr odd">
 								<td colspan="<?php echo $show_line_item_description ? 2 : 1 ?>">&nbsp;</td>
 								<td colspan="2" class="total" id="total_currency"><?php _e('Tax Total', 'event_espresso'); ?></td>
-								<td class="total"><?php echo $line_item->total_no_code();?></td>
+								<td class="total"><?php echo $line_item->total_no_code(); ?></td>
 							</tr>
 						<?php break;
 
 
 						case EEM_Line_Item::type_line_item:
 							$subitems = $line_item->children();
-							$has_subitems  = count($subitems) > 1 ;
-							if($has_subitems){
+							$has_subitems = count($subitems) > 1;
+							if ($has_subitems) {
 							?>
-							<tr class="item <?php echo $odd ?   'odd' : ''; ?>">
+							<tr class="item <?php echo $odd ? 'odd' : ''; ?>">
 								<td class="item_l"><?php echo $line_item->name() ?></td>
-								<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
-								<td class="item_l"><?php echo $line_item->quantity();?></td>
+								<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+								<td class="item_l"><?php echo $line_item->quantity(); ?></td>
 
 								<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 
@@ -122,15 +122,15 @@ 
 								<?php //<td class="item_l"><?php  $datetimes_strings = array(); foreach($datetimes as $datetime){ $datetimes_strings[]= $datetime->start_date_and_time();} echo implode(", ",$datetimes_strings); ?>
 							</tr>
 							<?php
-								if( $has_subitems ){
-									foreach($line_item->children() as $child_line_item){
-										ee_invoice_display_line_item($child_line_item,$show_line_item_description, $odd);
+								if ($has_subitems) {
+									foreach ($line_item->children() as $child_line_item) {
+										ee_invoice_display_line_item($child_line_item, $show_line_item_description, $odd);
 									}
 								}
-							}else{//no subitems - just show this line item ?>
-								<tr class="item <?php echo $odd ?   'odd' : ''; ?>">
+							} else {//no subitems - just show this line item ?>
+								<tr class="item <?php echo $odd ? 'odd' : ''; ?>">
 									<td class="item_l"><?php echo $line_item->name()?></td>
-									<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+									<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
 									<td class="item_l"><?php echo $line_item->quantity()?></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"> <?php echo $line_item->total_no_code(); echo $line_item->is_taxable() ? '*' : ''?> </td>
@@ -143,32 +143,32 @@ 
 							?>
 						<tr class="item subitem-row">
 							<td class="item_l subitem"><?php echo $line_item->name(); ?></td>
-							<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+							<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
 							<?php if ($line_item->is_percent()) { ?>
 									<td></td>
-									<td class="item_c"><?php echo $line_item->percent();?>%</td>
-							<?php }else{//flat discount/surcharge ?>
+									<td class="item_c"><?php echo $line_item->percent(); ?>%</td>
+							<?php } else {//flat discount/surcharge ?>
 									<td></td>
-									<td class="item_c"><?php echo $line_item->unit_price_no_code();?></td>
+									<td class="item_c"><?php echo $line_item->unit_price_no_code(); ?></td>
 							<?php } ?>
-							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
+							<td class="item_r"><?php echo $line_item->total_no_code(); ?></td>
 						</tr>
 						<?php break;
 					case EEM_Line_Item::type_tax:
 							?>
 						<tr class="item sub-item tax-total">
 							<td class="item_l"><?php echo $line_item->name(); ?></td>
-							<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+							<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
 							<td colspan="2" class="item_c"><?php echo $line_item->percent(); ?>%</td>
 
-							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
+							<td class="item_r"><?php echo $line_item->total_no_code(); ?></td>
 						</tr><?php break;
 					}
 				}
-				$c=false;
+				$c = false;
 				/* @var $transaction EE_Transaction */
 				$total_line_item = $transaction->total_line_item();
-				ee_invoice_display_line_item($total_line_item,$show_line_item_description);
+				ee_invoice_display_line_item($total_line_item, $show_line_item_description);
 				/* foreach($transaction->registrations() as $registration){
 					 ?>
 					<tr class="item <?php echo ($c = !$c) ? ' odd' : ''; ?>">
@@ -183,13 +183,13 @@ 
 			</tbody>
 
 		</table>
-		<p><?php _e("* taxable items", "event_espresso");?></p>
-		<h2><?php _e("Payments",'event_espresso')?></h2>
+		<p><?php _e("* taxable items", "event_espresso"); ?></p>
+		<h2><?php _e("Payments", 'event_espresso')?></h2>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
 					<th ><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
-					<th class='left datetime_th'><?php _e("Date",'event_espresso')?></th>
+					<th class='left datetime_th'><?php _e("Date", 'event_espresso')?></th>
 					<th ><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
 					<th ><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
 					<th ><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
@@ -199,29 +199,29 @@ 
 			<tbody>
 				<?php
 				$c = false;
-				if(!empty($payments)){
+				if ( ! empty($payments)) {
 
-					foreach($payments as $payment){
+					foreach ($payments as $payment) {
 						/* @var $payment EE_Payment */?>
-					<tr class='item <?php echo (($c = !$c) ? ' odd' : '')?>'>
+					<tr class='item <?php echo (($c = ! $c) ? ' odd' : '')?>'>
 						<td><?php $payment->e('PAY_gateway')?></td>
 						<td><?php echo $payment->timestamp('D M j, Y')?></td>
 						<td><?php $payment->e('PAY_txn_id_chq_nmbr')?></td>
 						<td><?php $payment->e('PAY_po_number')?></td>
 						<td><?php $payment->e_pretty_status()?></td>
-						<td class='item_r'><?php echo EEH_Template::format_currency($payment->amount());?></td>
+						<td class='item_r'><?php echo EEH_Template::format_currency($payment->amount()); ?></td>
 					</tr>
 					<?php }
-				}else{?>
+				} else {?>
 					<tr class='item'>
-						<td class='aln-cntr' colspan=6><?php _e("No approved payments have been received",'event_espresso')?></td>
+						<td class='aln-cntr' colspan=6><?php _e("No approved payments have been received", 'event_espresso')?></td>
 					</tr>
 				<?php }
 ?>
 			</tbody>
 			<tfoot>
 				<tr class='total_tr'><td colspan="4"></td>
-					<td class="item_r"><?php _e('Total Paid','event_espresso')?></td>
+					<td class="item_r"><?php _e('Total Paid', 'event_espresso')?></td>
 					<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd)?> </td>
 				</tr>
 				<?php //echo $discount; ?>

Braces +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
 										ee_invoice_display_line_item($child_line_item,$show_line_item_description, $odd);
 									}
 								}
-							}else{//no subitems - just show this line item ?>
+							} else{//no subitems - just show this line item ?>
 								<tr class="item <?php echo $odd ?   'odd' : ''; ?>">
 									<td class="item_l"><?php echo $line_item->name()?></td>
 									<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
@@ -147,7 +147,7 @@ 
 							<?php if ($line_item->is_percent()) { ?>
 									<td></td>
 									<td class="item_c"><?php echo $line_item->percent();?>%</td>
-							<?php }else{//flat discount/surcharge ?>
+							<?php } else{//flat discount/surcharge ?>
 									<td></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code();?></td>
 							<?php } ?>
@@ -212,7 +212,7 @@ 
 						<td class='item_r'><?php echo EEH_Template::format_currency($payment->amount());?></td>
 					</tr>
 					<?php }
-				}else{?>
+				} else{?>
 					<tr class='item'>
 						<td class='aln-cntr' colspan=6><?php _e("No approved payments have been received",'event_espresso')?></td>
 					</tr>

modules/gateways/Invoice/lib/templates/invoice_header.template.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 <!-- Base Stylesheet do not change or remove -->
 <link rel="stylesheet" type="text/css" href="[base_url]base.css" media="screen" />
 <!-- Print Style Sheet -->
-<link rel="stylesheet" type="text/css" href="[base_url]css/print/<?php echo str_replace('.css', '',$invoice_css); ?>_print.css" media="print" />
+<link rel="stylesheet" type="text/css" href="[base_url]css/print/<?php echo str_replace('.css', '', $invoice_css); ?>_print.css" media="print" />
 <!-- Primary Style Sheet -->
 <link rel="stylesheet" type="text/css" href="[base_url]css/<?php echo $invoice_css; ?>" />
 <!-- Make sure the buttons don't print -->

modules/gateways/Invoice/lib/templates/receipt_body.template.php

Braces +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 								</tr>
-								<?php }else{?>
+								<?php } else{?>
 									<tr class="item">
 										<td class="aln-left"><?php echo $line_item->name().$taxable_html?></td>
 										<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
@@ -237,7 +237,7 @@ 
 							<td class='item_r'><?php echo $payment->amount_no_code()?></td>
 						</tr>
 						<?php }
-					}else{?>
+					} else{?>
 						<tr class='item'>
 							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.",'event_espresso')?> </td>
 						</tr>

Spacing +64 added lines, -64 removed lines

@@ -36,53 +36,53 @@ 
 						<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso')?></h2>
 						<h3 id="invoice-date"><?php _e('Date:', 'event_espresso')?> <span class="plain-text">[registration_date]</span></h3>
 						<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso')?> <span class="plain-text">[transaction_id]</span></h3>
-						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status();?></span></h3>
+						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status(); ?></span></h3>
 					</div>
 				</td>
 			</tr>
 		</table>
 		<div class="events">
-		<?php foreach($events_for_txn as $event_id => $event){
-			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png';?>"><?php _e("Event Name:","event_espresso")?> <span class="plain-text"><?php echo $event->name();?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
-			<?php if (strlen($event->description()>1)){?><p class="event-description"><?php $event->description()?></p><?php }?>
+		<?php foreach ($events_for_txn as $event_id => $event) {
+			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png'; ?>"><?php _e("Event Name:", "event_espresso")?> <span class="plain-text"><?php echo $event->name(); ?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
+			<?php if (strlen($event->description() > 1)) {?><p class="event-description"><?php $event->description()?></p><?php }?>
 			<ul class="tickets-per-event">
-			<?php foreach($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item){
+			<?php foreach ($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item) {
 				$ticket = $line_item->ticket();
-				$taxable_html = $ticket->taxable() ? '*': '';
+				$taxable_html = $ticket->taxable() ? '*' : '';
 				$subitems = $line_item->children();
-				$ticket_uses = $ticket->get_pretty('TKT_uses',  __("any", "event_espresso"));
+				$ticket_uses = $ticket->get_pretty('TKT_uses', __("any", "event_espresso"));
 			?>
 				<li class="event-ticket">
 					<div class="ticket-details">
 						<table class="invoice-amount">
 							<thead>
 								<tr class="header_row">
-									<th class="name-column"><?php _e("Ticket", "event_espresso");?></th>
-									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Quantity", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Price", "event_espresso");?></th>
-									<th class="number-column item_r"><?php _e("Total", "event_espresso");?></th>
+									<th class="name-column"><?php _e("Ticket", "event_espresso"); ?></th>
+									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Quantity", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Price", "event_espresso"); ?></th>
+									<th class="number-column item_r"><?php _e("Total", "event_espresso"); ?></th>
 								</tr>
 							</thead>
 							<tbody>
-								<?php if( count($subitems) < 2){?>
+								<?php if (count($subitems) < 2) {?>
 								<tr class="item">
 									<td><?php echo $line_item->name().$taxable_html?></td>
-									<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+									<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 									<td class="item_c"><?php echo $line_item->quantity()?></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 								</tr>
-								<?php }else{?>
+								<?php } else {?>
 									<tr class="item">
 										<td class="aln-left"><?php echo $line_item->name().$taxable_html?></td>
-										<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+										<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 										<td class="item_c"><?php echo $line_item->quantity()?></td>
 										<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
-									<?php foreach($subitems as $sub_line_item){
-										$is_percent = $sub_line_item->is_percent();?>
+									<?php foreach ($subitems as $sub_line_item) {
+										$is_percent = $sub_line_item->is_percent(); ?>
 										<tr class="subitem-row">
 											<td class="subitem"><?php echo $sub_line_item->name()?></td>
 											<td colspan="2"><?php echo $sub_line_item->desc()?></td>
@@ -93,7 +93,7 @@ 
 									<?php } ?>
 									<tr class="total_tr odd">
 										<td colspan="4"></td>
-										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso");?></td>
+										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso"); ?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
 								<?php }?>
@@ -104,22 +104,22 @@ 
 					<div class="reg-details-for-ticket">
 						<div class="ticket-time-and-place-details">
 							<div class="ticket-time-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png';?>"><?php echo _n("Date/Time:","Dates/Times:",count($ticket->datetimes()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png'; ?>"><?php echo _n("Date/Time:", "Dates/Times:", count($ticket->datetimes()), "event_espresso"); ?></h4>
 								<ul class="event-dates">
-									<?php foreach($ticket->datetimes_ordered() as $datetime){
+									<?php foreach ($ticket->datetimes_ordered() as $datetime) {
 										/* @var $datetime EE_Datetime */ ?>
 									<li><?php
-										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '' ;
-										echo sprintf(__("%s - %s (%s)", "event_espresso"),$datetime->start_date_and_time(),$datetime->end_date_and_time(),$datetime->get_timezone());
+										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '';
+										echo sprintf(__("%s - %s (%s)", "event_espresso"), $datetime->start_date_and_time(), $datetime->end_date_and_time(), $datetime->get_timezone());
 										echo $datetime->description() ? '<p class="ticket-note">'.$datetime->description().'</p>' : '' ?></li>
 									<?php }?>
 								</ul>
 							</div>
-							<?php if ($event->venues()){?>
+							<?php if ($event->venues()) {?>
 							<div class="ticket-place-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png';?>"><?php echo _n("Venue:","Venues:",count($event->venues()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png'; ?>"><?php echo _n("Venue:", "Venues:", count($event->venues()), "event_espresso"); ?></h4>
 								<ul class="event-venues">
-									<?php foreach($event->venues() as $venue){?>
+									<?php foreach ($event->venues() as $venue) {?>
 									<li><?php echo $venue->name()?> <span class="small-text">[ <a href='<?php echo $venue->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></li>
 									<?php } ?>
 								</ul>
@@ -127,34 +127,34 @@ 
 							<?php }?>
 						</div>
 						<div class="ticket-registrations-area">
-							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png';?>"><?php echo __("Registration Details", "event_espresso");?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
+							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png'; ?>"><?php echo __("Registration Details", "event_espresso"); ?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
 							<ul class="ticket-registrations-list">
-								<?php foreach($registrations_per_line_item[$line_item_id] as $registration){
+								<?php foreach ($registrations_per_line_item[$line_item_id] as $registration) {
 									/* @var $registration EE_Registration */
 									$attendee = $registration->attendee();
-									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC')));?>
+									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC'))); ?>
 								<li class="ticket-registration">
 									<table class="registration-details">
 										<tr class="odd">
-											<th><?php echo 	_e("Registration Code:", "event_espresso");?></th>
-											<td><?php echo $registration->reg_code();?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
+											<th><?php echo 	_e("Registration Code:", "event_espresso"); ?></th>
+											<td><?php echo $registration->reg_code(); ?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
 										</tr>
 										<?php
-										foreach($event->question_groups() as $question_group){
-											?><tr><th><?php $question_group->e('QSG_name');?></th><td></td></tr><?php
+										foreach ($event->question_groups() as $question_group) {
+											?><tr><th><?php $question_group->e('QSG_name'); ?></th><td></td></tr><?php
 											$has_personal_info = false;
-											foreach($question_group->questions() as $question){
-												if( in_array($question->system_ID(),$questions_to_skip)){
+											foreach ($question_group->questions() as $question) {
+												if (in_array($question->system_ID(), $questions_to_skip)) {
 													$has_personal_info = true;
 													continue;
 												}
 												?><tr>
 														<th><?php echo $question->display_text()?></th>
-														<td><?php echo $registration->answer_value_to_question($question);?></td>
+														<td><?php echo $registration->answer_value_to_question($question); ?></td>
 												</tr><?php
 											}
-											if($has_personal_info){
-												?><tr><th><?php	_e('Attendee', 'event_espresso');?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"),$attendee->full_name(),$attendee->email())?></td></tr><?php
+											if ($has_personal_info) {
+												?><tr><th><?php	_e('Attendee', 'event_espresso'); ?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"), $attendee->full_name(), $attendee->email())?></td></tr><?php
 											}
 										}
 										?>
@@ -171,21 +171,21 @@ 
 		<?php }?>
 		</div>
 		<div class="taxes">
-			<?php if ($tax_total_line_item && $tax_total_line_item->children()){?>
-				<h3 class="section-title"><?php _e("Taxes",'event_espresso')?></h3>
+			<?php if ($tax_total_line_item && $tax_total_line_item->children()) {?>
+				<h3 class="section-title"><?php _e("Taxes", 'event_espresso')?></h3>
 				<table class="invoice-amount">
 
 					<thead>
 						<tr class="header_row">
-							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso");?></th>
-							<th class="left"><?php _e('Description', 'event_espresso');?></th>
+							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+							<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
 							<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
 							<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
 						<?php
-						foreach($tax_total_line_item->children() as $child_tax){?>
+						foreach ($tax_total_line_item->children() as $child_tax) {?>
 						<tr>
 							<td><?php echo $child_tax->name()?></td>
 							<td><?php echo $child_tax->desc()?></td>
@@ -195,26 +195,26 @@ 
 						<?php } ?>
 						<tr class="total_tr odd">
 							<td class="total_tr" colspan="2"></td>
-							<td class="total"><?php	_e("Tax Total:", "event_espresso");?></td>
+							<td class="total"><?php	_e("Tax Total:", "event_espresso"); ?></td>
 							<td class="item_r"><?php echo $tax_total_line_item->total_no_code()?></td>
 						</tr>
 					</tbody>
 
 				</table>
 			<?php }?>
-			<p><?php _e("* taxable items", "event_espresso");?></p>
+			<p><?php _e("* taxable items", "event_espresso"); ?></p>
 		</div>
 		<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"),EEH_Template::format_currency($total_cost));?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), EEH_Template::format_currency($total_cost)); ?></h2>
 		</div>
 		<div class="payment-dv">
-			<h3 class="section-title"><?php _e("Payments",'event_espresso')?></h3>
+			<h3 class="section-title"><?php _e("Payments", 'event_espresso')?></h3>
 			<p>[instructions]</p>
 			<table class="invoice-amount">
 				<thead>
 					<tr class="header_row">
 						<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
-						<th class='left datetime_th'><?php _e("Date",'event_espresso')?></th>
+						<th class='left datetime_th'><?php _e("Date", 'event_espresso')?></th>
 						<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
@@ -224,11 +224,11 @@ 
 				<tbody>
 					<?php
 					$c = false;
-					if(!empty($payments)){
+					if ( ! empty($payments)) {
 
-						foreach($payments as $payment){
+						foreach ($payments as $payment) {
 							/* @var $payment EE_Payment */?>
-						<tr class='item <?php echo (($c = !$c) ? ' odd' : '')?>'>
+						<tr class='item <?php echo (($c = ! $c) ? ' odd' : '')?>'>
 							<td><?php $payment->e('PAY_gateway')?></td>
 							<td><?php echo $payment->timestamp()?></td>
 							<td><?php $payment->e('PAY_txn_id_chq_nmbr')?></td>
@@ -237,17 +237,17 @@ 
 							<td class='item_r'><?php echo $payment->amount_no_code()?></td>
 						</tr>
 						<?php }
-					}else{?>
+					} else {?>
 						<tr class='item'>
-							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.",'event_espresso')?> </td>
+							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.", 'event_espresso')?> </td>
 						</tr>
 					<?php }
-					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if($amount_owed){?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso");}?></a></td></tr>
+					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if ($amount_owed) {?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso"); }?></a></td></tr>
 				</tbody>
 				<tfoot>
 					<tr class='total_tr'><td colspan="4">&nbsp;</td>
-						<td class="item_r"><?php _e('Total Paid','event_espresso')?></td>
-						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd,false,false)?> </td>
+						<td class="item_r"><?php _e('Total Paid', 'event_espresso')?></td>
+						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd, false, false)?> </td>
 					</tr>
 					<?php //echo $discount; ?>
 					<tr class="total_tr odd">
@@ -259,20 +259,20 @@ 
 			</table>
 		</div>
 		<div class="additional-info-dv">
-			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso");?></h3>
+			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 			<div class="additional-info">
-				<?php if($venues_for_events){?>
-				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso",count($venues_for_events));?></h2>
+				<?php if ($venues_for_events) {?>
+				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso", count($venues_for_events)); ?></h2>
 				<table class="venue-list">
-					<?php foreach($venues_for_events as $venue){?>
+					<?php foreach ($venues_for_events as $venue) {?>
 						<tr class="venue-details">
 							<td class="venue-details-part venue-address-dv">
 								<h3><a href='<?php echo $venue->get_permalink()?>'><?php
 									echo $venue->name()
 								?></a></h3>
 								<p><?php echo $venue->description()?></p>
-								<?php echo  EEH_Address::format($venue);?></td>
-							<?php if($venue->enable_for_gmap()){?>
+								<?php echo  EEH_Address::format($venue); ?></td>
+							<?php if ($venue->enable_for_gmap()) {?>
 								<td class="venue-details-part venue-image-dv"><?php echo EEH_Venue_View::espresso_google_static_map($venue)?></td>
 							<?php } ?>
 						</tr>
@@ -280,9 +280,9 @@ 
 				</table>
 				<?php } ?>
 
-				<?php if($shameless_plug){?>
+				<?php if ($shameless_plug) {?>
 				<div class='aln-cntr'><?php
-					printf(__("Powered by %sEvent Espresso %s", "event_espresso"),"<a href='https://eventespresso.com'>","</a>");
+					printf(__("Powered by %sEvent Espresso %s", "event_espresso"), "<a href='https://eventespresso.com'>", "</a>");
 				?></div>
 				<?php } ?>
 			</div>

modules/invoice/EED_Invoice.module.php

Spacing +14 added lines, -14 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Invoice
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( 'download_invoice', 'EED_Invoice', 'download_invoice' );
-		EE_Config::register_route( 'launch_invoice', 'EED_Invoice', 'launch_invoice' );
+		EE_Config::register_route('download_invoice', 'EED_Invoice', 'download_invoice');
+		EE_Config::register_route('launch_invoice', 'EED_Invoice', 'launch_invoice');
 	}
 
 
@@ -63,12 +63,12 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
-		if ( is_readable( EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php' )) {
-			require_once( EE_MODULES . 'gateways/Invoice/lib/Invoice.class.php' );
+	public function run($WP) {
+		if (is_readable(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php')) {
+			require_once(EE_MODULES.'gateways/Invoice/lib/Invoice.class.php');
 		} else {
-			$msg = __( 'The Invoice.class.php file could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('The Invoice.class.php file could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 //		add_filter( 'FHEE_load_ee_config', '__return_true' );
 //		add_filter( 'FHEE_run_EE_wp', '__return_true' );
@@ -89,9 +89,9 @@ 
 	 */
 	public function launch_invoice() {
 		$this->run(null);
-		if ( EE_Registry::instance()->REQ->is_set( 'id' )) {
-			$id = sanitize_key( EE_Registry::instance()->REQ->get( 'id' ));
-			$invoice = new Invoice( $id );
+		if (EE_Registry::instance()->REQ->is_set('id')) {
+			$id = sanitize_key(EE_Registry::instance()->REQ->get('id'));
+			$invoice = new Invoice($id);
 			$invoice->send_invoice();
 		}
 	}
@@ -106,11 +106,11 @@ 
 	 */
 	public function download_invoice() {
 		$this->run(null);
-		if ( EE_Registry::instance()->REQ->is_set( 'id' )) {
-			$id = sanitize_key( EE_Registry::instance()->REQ->get( 'id' ));
+		if (EE_Registry::instance()->REQ->is_set('id')) {
+			$id = sanitize_key(EE_Registry::instance()->REQ->get('id'));
 			$invoice = new Invoice($_REQUEST['id']);
 			// send invoice but force download
-			$invoice->send_invoice( TRUE );
+			$invoice->send_invoice(TRUE);
 		}
 	}
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

modules/single_page_checkout/inc/EE_Checkout.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_Checkout
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_Checkout
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_Checkout {
 
 	/**

Doc Comments +5 added lines, -4 removed lines

@@ -251,7 +251,7 @@ 
 
 	/**
 	 * returns true if ANY reg status was updated during checkout
-	 * @return array
+	 * @return boolean
 	 */
 	public function any_reg_status_updated() {
 		foreach ( $this->reg_status_updated as $reg_status ) {
@@ -276,7 +276,7 @@ 
 
 	/**
 	 * @param $REG_ID
-	 * @param $reg_status
+	 * @param boolean $reg_status
 	 */
 	public function set_reg_status_updated( $REG_ID, $reg_status ) {
 		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
@@ -620,7 +620,7 @@ 
 	 * 	reset_reg_steps
 	 *
 	 * 	@access public
-	 * 	@return 	bool
+	 * 	@return 	boolean|null
 	 */
 	public function reset_reg_steps() {
 		$this->sort_reg_steps();
@@ -733,7 +733,7 @@ 
 	 * 	stores whether any updates were made to the TXN or it's related registrations
 	 *
 	 * 	@access public
-	 * 	@return 	bool
+	 * 	@return 	boolean|null
 	 */
 	public function track_transaction_and_registration_status_updates() {
 		// verify the transaction
@@ -1081,6 +1081,7 @@ 
 	 *
 	 * @param 	string | int 	$reg_cache_ID
 	 * @param 	EE_Registration 	$registration
+	 * @param integer $reg_cache_ID
 	 * @return void
 	 */
 	protected function _refresh_registration( $reg_cache_ID, $registration ) {

Spacing +205 added lines, -205 removed lines

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

modules/single_page_checkout/inc/EE_SPCO_JSON_Response.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_JSON_Response
- *
- * Description
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since		 	   $VID:$
- *
- */
+  *
+  * Class EE_SPCO_JSON_Response
+  *
+  * Description
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since		 	   $VID:$
+  *
+  */
 class EE_SPCO_JSON_Response {
 
 	/**

Spacing +41 added lines, -41 removed lines

@@ -107,71 +107,71 @@ 
 	public function __toString() {
 		$JSON_response = array();
 		// grab notices
-		$notices = EE_Error::get_notices( FALSE );
-		$this->set_attention( isset( $notices['attention'] ) ? $notices['attention'] : '' );
-		$this->set_errors( isset( $notices['errors'] ) ? $notices['errors'] : '' );
-		$this->set_success( isset( $notices['success'] ) ? $notices['success'] : '' );
+		$notices = EE_Error::get_notices(FALSE);
+		$this->set_attention(isset($notices['attention']) ? $notices['attention'] : '');
+		$this->set_errors(isset($notices['errors']) ? $notices['errors'] : '');
+		$this->set_success(isset($notices['success']) ? $notices['success'] : '');
 		// add notices to JSON response, but only if they exist
-		if ( $this->attention() ) {
+		if ($this->attention()) {
 			$JSON_response['attention'] = $this->attention();
 		}
-		if ( $this->errors() ) {
+		if ($this->errors()) {
 			$JSON_response['errors'] = $this->errors();
 		}
-		if ( $this->unexpected_errors() ) {
+		if ($this->unexpected_errors()) {
 			$JSON_response['unexpected_errors'] = $this->unexpected_errors();
 		}
-		if ( $this->success() ) {
+		if ($this->success()) {
 			$JSON_response['success'] = $this->success();
 		}
 		// but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
-		if ( ! isset( $JSON_response[ 'attention' ] ) && ! isset( $JSON_response[ 'errors' ] ) && ! isset( $JSON_response[ 'success' ] ) ) {
+		if ( ! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
 			$JSON_response['success'] = null;
 		}
 		// set redirect_url, IF it exists
-		if ( $this->redirect_url() ) {
+		if ($this->redirect_url()) {
 			$JSON_response['redirect_url'] = $this->redirect_url();
 		}
 		// set registration_time_limit, IF it exists
-		if ( $this->registration_time_limit() ) {
+		if ($this->registration_time_limit()) {
 			$JSON_response['registration_time_limit'] = $this->registration_time_limit();
 		}
 		// set payment_amount, IF it exists
-		if ( $this->payment_amount() !== null ) {
-			$JSON_response[ 'payment_amount' ] = $this->payment_amount();
+		if ($this->payment_amount() !== null) {
+			$JSON_response['payment_amount'] = $this->payment_amount();
 		}
 		// grab generic return data
 		$return_data = $this->return_data();
 		// add billing form validation rules
-		if ( $this->validation_rules() ) {
+		if ($this->validation_rules()) {
 			$return_data['validation_rules'] = $this->validation_rules();
 		}
 		// set reg_step_html, IF it exists
-		if ( $this->reg_step_html() ) {
+		if ($this->reg_step_html()) {
 			$return_data['reg_step_html'] = $this->reg_step_html();
 		}
 		// set method of payment, IF it exists
-		if ( $this->method_of_payment() ) {
+		if ($this->method_of_payment()) {
 			$return_data['method_of_payment'] = $this->method_of_payment();
 		}
 		// set "plz_select_method_of_payment" message, IF it exists
-		if ( $this->plz_select_method_of_payment() ) {
+		if ($this->plz_select_method_of_payment()) {
 			$return_data['plz_select_method_of_payment'] = $this->plz_select_method_of_payment();
 		}
 		// set redirect_form, IF it exists
-		if ( $this->redirect_form() ) {
+		if ($this->redirect_form()) {
 			$return_data['redirect_form'] = $this->redirect_form();
 		}
 		// and finally, add return_data array to main JSON response array, IF it contains anything
 		// why did we add some of the above properties to the return data array?
 		// because it is easier and cleaner in the Javascript to deal with this way
-		if ( ! empty( $return_data )) {
+		if ( ! empty($return_data)) {
 			$JSON_response['return_data'] = $return_data;
 		}
 		// filter final array
-		$JSON_response = apply_filters( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response );
+		$JSON_response = apply_filters('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response);
 		// return encoded array
-		return json_encode( $JSON_response );
+		return json_encode($JSON_response);
 	}
 
 
@@ -179,7 +179,7 @@ 
 	/**
 	 * @param string $attention
 	 */
-	public function set_attention( $attention ) {
+	public function set_attention($attention) {
 		$this->_attention = $attention;
 	}
 
@@ -197,7 +197,7 @@ 
 	/**
 	 * @param string $errors
 	 */
-	public function set_errors( $errors ) {
+	public function set_errors($errors) {
 		$this->_errors = $errors;
 	}
 
@@ -224,7 +224,7 @@ 
 	/**
 	 * @param string $unexpected_errors
 	 */
-	public function set_unexpected_errors( $unexpected_errors ) {
+	public function set_unexpected_errors($unexpected_errors) {
 		$this->_unexpected_errors = $unexpected_errors;
 	}
 
@@ -233,7 +233,7 @@ 
 	/**
 	 * @param string $success
 	 */
-	public function set_success( $success ) {
+	public function set_success($success) {
 		$this->_success = $success;
 	}
 
@@ -251,7 +251,7 @@ 
 	/**
 	 * @param string $method_of_payment
 	 */
-	public function set_method_of_payment( $method_of_payment ) {
+	public function set_method_of_payment($method_of_payment) {
 		$this->_method_of_payment = $method_of_payment;
 	}
 
@@ -278,9 +278,9 @@ 
 	/**
 	 * @param float $payment_amount
 	 */
-	public function set_payment_amount( $payment_amount ) {
-		EE_Registry::instance()->load_helper( 'Money' );
-		$this->_payment_amount = EEH_Money::convert_to_float_from_localized_money( $payment_amount );
+	public function set_payment_amount($payment_amount) {
+		EE_Registry::instance()->load_helper('Money');
+		$this->_payment_amount = EEH_Money::convert_to_float_from_localized_money($payment_amount);
 	}
 
 
@@ -288,7 +288,7 @@ 
 	/**
 	 * @param string $next_step_html
 	 */
-	public function set_reg_step_html( $next_step_html ) {
+	public function set_reg_step_html($next_step_html) {
 		$this->_reg_step_html = $next_step_html;
 	}
 
@@ -306,7 +306,7 @@ 
 	/**
 	 * @param string $redirect_form
 	 */
-	public function set_redirect_form( $redirect_form ) {
+	public function set_redirect_form($redirect_form) {
 		$this->_redirect_form = $redirect_form;
 	}
 
@@ -316,7 +316,7 @@ 
 	 * @return string
 	 */
 	public function redirect_form() {
-		return ! empty( $this->_redirect_form ) ? $this->_redirect_form : FALSE;
+		return ! empty($this->_redirect_form) ? $this->_redirect_form : FALSE;
 	}
 
 
@@ -324,7 +324,7 @@ 
 	/**
 	 * @param string $plz_select_method_of_payment
 	 */
-	public function set_plz_select_method_of_payment( $plz_select_method_of_payment ) {
+	public function set_plz_select_method_of_payment($plz_select_method_of_payment) {
 		$this->_plz_select_method_of_payment = $plz_select_method_of_payment;
 	}
 
@@ -342,7 +342,7 @@ 
 	/**
 	 * @param string $redirect_url
 	 */
-	public function set_redirect_url( $redirect_url ) {
+	public function set_redirect_url($redirect_url) {
 		$this->_redirect_url = $redirect_url;
 	}
 
@@ -369,7 +369,7 @@ 
 	/**
 	 * @param string $registration_time_limit
 	 */
-	public function set_registration_time_limit( $registration_time_limit ) {
+	public function set_registration_time_limit($registration_time_limit) {
 		$this->_registration_time_limit = $registration_time_limit;
 	}
 
@@ -378,8 +378,8 @@ 
 	/**
 	 * @param array $return_data
 	 */
-	public function set_return_data( $return_data ) {
-		$this->_return_data = array_merge( $this->_return_data, $return_data );
+	public function set_return_data($return_data) {
+		$this->_return_data = array_merge($this->_return_data, $return_data);
 	}
 
 
@@ -396,9 +396,9 @@ 
 	/**
 	 * @param array $validation_rules
 	 */
-	public function add_validation_rules( $validation_rules = array() ) {
-		if ( is_array( $validation_rules ) && ! empty( $validation_rules )) {
-			$this->_validation_rules = array_merge( $this->_validation_rules, $validation_rules );
+	public function add_validation_rules($validation_rules = array()) {
+		if (is_array($validation_rules) && ! empty($validation_rules)) {
+			$this->_validation_rules = array_merge($this->_validation_rules, $validation_rules);
 		}
 	}
 
@@ -408,7 +408,7 @@ 
 	 * @return array | bool
 	 */
 	public function validation_rules() {
-		return ! empty( $this->_validation_rules ) ? $this->_validation_rules : FALSE;
+		return ! empty($this->_validation_rules) ? $this->_validation_rules : FALSE;
 	}