eventespresso / event-espresso-core

modules/single_page_checkout/inc/EE_Checkout.class.php

Doc Comments +2 added lines, -1 removed lines

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

Indentation +28 added lines, -28 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 {
 
 	/**
@@ -250,9 +250,9 @@ 
 		$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(
-		    0 => array( 'REG_deleted' => false ),
-		    'order_by' => array( 'REG_count' => 'ASC' )
-        );
+			0 => array( 'REG_deleted' => false ),
+			'order_by' => array( 'REG_count' => 'ASC' )
+		);
 	}
 
 
@@ -807,10 +807,10 @@ 
 	 */
 	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()
-		       )
+			   || $this->primary_revisit
+			   || (
+				   $this->revisit && $this->reg_url_link === $registration->reg_url_link()
+			   )
 			? true
 			: false;
 	}
@@ -1202,16 +1202,16 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-    public function __sleep()
-    {
-	    if ( $this->primary_attendee_obj instanceof EE_Attendee && $this->primary_attendee_obj->ID() ) {
-		    $this->primary_attendee_obj = $this->primary_attendee_obj->ID();
-	    }        // remove the reg form and the checkout
-	    if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
-		    $this->transaction = $this->transaction->ID();
-	    }        // remove the reg form and the checkout
-        return array_diff( array_keys( get_object_vars( $this ) ), array( 'billing_form', 'registration_form' ) );
-    }
+	public function __sleep()
+	{
+		if ( $this->primary_attendee_obj instanceof EE_Attendee && $this->primary_attendee_obj->ID() ) {
+			$this->primary_attendee_obj = $this->primary_attendee_obj->ID();
+		}        // remove the reg form and the checkout
+		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+			$this->transaction = $this->transaction->ID();
+		}        // remove the reg form and the checkout
+		return array_diff( array_keys( get_object_vars( $this ) ), array( 'billing_form', 'registration_form' ) );
+	}
 
 
 	/**

Spacing +207 added lines, -207 removed lines

@@ -247,11 +247,11 @@ 
 		$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(
-		    0 => array( 'REG_deleted' => false ),
-		    'order_by' => array( 'REG_count' => 'ASC' )
+		    0 => array('REG_deleted' => false),
+		    'order_by' => array('REG_count' => 'ASC')
         );
 	}
 
@@ -263,8 +263,8 @@ 
 	 * @return boolean
 	 */
 	public function any_reg_status_updated() {
-		foreach ( $this->reg_status_updated as $reg_status ) {
-			if ( $reg_status ) {
+		foreach ($this->reg_status_updated as $reg_status) {
+			if ($reg_status) {
 				return true;
 			}
 		}
@@ -277,8 +277,8 @@ 
 	 * @param $REG_ID
 	 * @return boolean
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return isset( $this->reg_status_updated[ $REG_ID ] ) ? $this->reg_status_updated[ $REG_ID ] : false;
+	public function reg_status_updated($REG_ID) {
+		return isset($this->reg_status_updated[$REG_ID]) ? $this->reg_status_updated[$REG_ID] : false;
 	}
 
 
@@ -287,8 +287,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);
 	}
 
 
@@ -309,7 +309,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;
 		}
 	}
@@ -326,12 +326,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 = '';
@@ -348,8 +348,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;
 	}
 
 
@@ -365,22 +365,22 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public function skip_reg_step( $reg_step_slug = '' ) {
-		$step_to_skip = $this->find_reg_step( $reg_step_slug );
-		if ( $step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step() ) {
-			$step_to_skip->set_is_current_step( false );
+	public function skip_reg_step($reg_step_slug = '') {
+		$step_to_skip = $this->find_reg_step($reg_step_slug);
+		if ($step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step()) {
+			$step_to_skip->set_is_current_step(false);
 			$step_to_skip->set_completed();
 			// advance to the next step
-			$this->set_current_step( $this->next_step->slug() );
+			$this->set_current_step($this->next_step->slug());
 			// also reset the step param in the request in case any other code references that directly
-			EE_Registry::instance()->REQ->set( 'step', $this->current_step->slug() );
+			EE_Registry::instance()->REQ->set('step', $this->current_step->slug());
 			// since we are skipping a step and setting the current step to be what was previously the next step,
 			// we need to check that the next step is now correct, and not still set to the current step.
-			if ( $this->current_step->slug() === $this->next_step->slug() ) {
+			if ($this->current_step->slug() === $this->next_step->slug()) {
 				// correctly setup the next step
 				$this->set_next_step();
 			}
-			$this->set_reg_step_initiated( $this->current_step );
+			$this->set_reg_step_initiated($this->current_step);
 		}
 	}
 
@@ -394,14 +394,14 @@ 
 	 * @param bool   $reset whether to reset reg steps after removal
 	 * @throws EE_Error
 	 */
-	public function remove_reg_step( $reg_step_slug = '', $reset = true ) {
-		unset( $this->reg_steps[ $reg_step_slug  ] );
-		if ( $this->transaction instanceof EE_Transaction ) {
+	public function remove_reg_step($reg_step_slug = '', $reset = true) {
+		unset($this->reg_steps[$reg_step_slug]);
+		if ($this->transaction instanceof EE_Transaction) {
 			// now remove reg step from TXN and save
-			$this->transaction->remove_reg_step( $reg_step_slug );
+			$this->transaction->remove_reg_step($reg_step_slug);
 			$this->transaction->save();
 		}
-		if ( $reset ) {
+		if ($reset) {
 			$this->reset_reg_steps();
 		}
 	}
@@ -416,9 +416,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);
 		}
 	}
 
@@ -431,25 +431,25 @@ 
 	 * @param string $current_step
 	 * @return    void
 	 */
-	public function set_current_step( $current_step ) {
+	public function set_current_step($current_step) {
 		// grab what step we're on
-		$this->current_step = isset( $this->reg_steps[ $current_step ] ) ? $this->reg_steps[ $current_step ] : reset( $this->reg_steps );
+		$this->current_step = isset($this->reg_steps[$current_step]) ? $this->reg_steps[$current_step] : reset($this->reg_steps);
 		// verify instance
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step) {
 			// we don't want to repeat completed steps if this is the first time through SPCO
-			if ( $this->continue_reg && ! $this->revisit && $this->current_step->completed() ) {
+			if ($this->continue_reg && ! $this->revisit && $this->current_step->completed()) {
 				// so advance to the next step
 				$this->set_next_step();
-				if ( $this->next_step instanceof EE_SPCO_Reg_Step ) {
+				if ($this->next_step instanceof EE_SPCO_Reg_Step) {
 					// and attempt to set it as the current step
-					$this->set_current_step( $this->next_step->slug() );
+					$this->set_current_step($this->next_step->slug());
 				}
 				return;
 			}
-			$this->current_step->set_is_current_step( TRUE );
+			$this->current_step->set_is_current_step(TRUE);
 		} else {
 			EE_Error::add_error(
-				__( 'The current step could not be set.', 'event_espresso' ),
+				__('The current step could not be set.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -466,20 +466,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);
 	}
 
 
@@ -493,8 +493,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;
 	}
 
@@ -509,8 +509,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;
 	}
 
@@ -523,8 +523,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));
 	}
 
 
@@ -537,19 +537,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;
@@ -565,17 +565,17 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_B
 	 * @return int
 	 */
-	public function reg_step_sorting_callback( EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B ) {
+	public function reg_step_sorting_callback(EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B) {
 		// send finalize_registration step to the end of the array
-		if ( $reg_step_A->slug() === 'finalize_registration' ) {
+		if ($reg_step_A->slug() === 'finalize_registration') {
 			return 1;
-		} else if ( $reg_step_B->slug() === 'finalize_registration' ) {
+		} else if ($reg_step_B->slug() === 'finalize_registration') {
 			return -1;
 		}
-		if ( $reg_step_A->order() === $reg_step_B->order() ) {
+		if ($reg_step_A->order() === $reg_step_B->order()) {
 			return 0;
 		}
-		return ( $reg_step_A->order() > $reg_step_B->order() ) ? 1 : -1;
+		return ($reg_step_A->order() > $reg_step_B->order()) ? 1 : -1;
 	}
 
 
@@ -587,7 +587,7 @@ 
 	 * @param    EE_SPCO_Reg_Step $reg_step
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_initiated( EE_SPCO_Reg_Step $reg_step ) {
+	public function set_reg_step_initiated(EE_SPCO_Reg_Step $reg_step) {
 		// call set_reg_step_initiated ???
 		if (
 			// first time visiting SPCO ?
@@ -600,11 +600,11 @@ 
 			)
 		) {
 			// set the start time for this reg step
-			if ( ! $this->transaction->set_reg_step_initiated( $reg_step->slug() ) ) {
-				if ( WP_DEBUG ) {
+			if ( ! $this->transaction->set_reg_step_initiated($reg_step->slug())) {
+				if (WP_DEBUG) {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The "%1$s" registration step was not initialized properly.', 'event_espresso' ),
+							__('The "%1$s" registration step was not initialized properly.', 'event_espresso'),
 							$reg_step->name()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -623,10 +623,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( '' );
@@ -642,7 +642,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();
@@ -659,9 +659,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 = date( $time_limit_format, $registration_time_limit );
+		$registration_time_limit = date($time_limit_format, $registration_time_limit);
 		return apply_filters(
 			'FHEE__EE_Checkout__get_registration_time_limit__registration_time_limit',
 			$registration_time_limit
@@ -681,7 +681,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;
 	}
 
 
@@ -693,12 +693,12 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( $transaction ) {
-		$session = EE_Registry::instance()->load_core( 'Session' );
-		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn( $transaction, $session ) : null;
+	public function get_cart_for_transaction($transaction) {
+		$session = EE_Registry::instance()->load_core('Session');
+		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn($transaction, $session) : null;
 		// verify cart
-		if ( ! $cart instanceof EE_Cart ) {
-			$cart = EE_Registry::instance()->load_core( 'Cart' );
+		if ( ! $cart instanceof EE_Cart) {
+			$cart = EE_Registry::instance()->load_core('Cart');
 		}
 
 		return $cart;
@@ -714,8 +714,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;
 	}
@@ -731,14 +731,14 @@ 
 	 */
 	public function update_txn_reg_steps_array() {
 		$updated = false;
-		foreach ( $this->reg_steps as $reg_step ) {
-			if ( $reg_step->completed() ) {
-				$updated = $this->transaction->set_reg_step_completed( $reg_step->slug() )
+		foreach ($this->reg_steps as $reg_step) {
+			if ($reg_step->completed()) {
+				$updated = $this->transaction->set_reg_step_completed($reg_step->slug())
 					? true
 					: $updated;
 			}
 		}
-		if ( $updated ) {
+		if ($updated) {
 			$this->transaction->save();
 		}
 		return $updated;
@@ -754,14 +754,14 @@ 
 	 * @throws \EE_Error
 	 */
 	public function stash_transaction_and_checkout() {
-		if ( ! $this->revisit ) {
+		if ( ! $this->revisit) {
 			$this->update_txn_reg_steps_array();
 		}
 		$this->track_transaction_and_registration_status_updates();
 		// save all data to the db, but suppress errors
 		//$this->save_all_data( FALSE );
 		// cache the checkout in the session
-		EE_Registry::instance()->SSN->set_checkout( $this );
+		EE_Registry::instance()->SSN->set_checkout($this);
 	}
 
 
@@ -776,15 +776,15 @@ 
 	 */
 	public function track_transaction_and_registration_status_updates() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// has there been a TXN status change during this checkout?
 			$this->txn_status_updated = $this->transaction->txn_status_updated();
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $registration ) {
-				if ( $registration_processor->reg_status_updated( $registration->ID() ) ) {
-					$this->set_reg_status_updated( $registration->ID(), true );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $registration) {
+				if ($registration_processor->reg_status_updated($registration->ID())) {
+					$this->set_reg_status_updated($registration->ID(), true);
 				}
 			}
 		}
@@ -805,7 +805,7 @@ 
 	 * @return    bool
 	 * @throws \EE_Error
 	 */
-	public function visit_allows_processing_of_this_registration( EE_Registration $registration ) {
+	public function visit_allows_processing_of_this_registration(EE_Registration $registration) {
 		return ! $this->revisit
 		       || $this->primary_revisit
 		       || (
@@ -838,18 +838,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function save_all_data( $show_errors = TRUE ) {
+	public function save_all_data($show_errors = TRUE) {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// save to ensure that TXN has ID
 			$this->transaction->save();
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as  $registration ) {
-				$this->_save_registration( $registration, $show_errors );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as  $registration) {
+				$this->_save_registration($registration, $show_errors);
 			}
 		} else {
-			if ( $show_errors ) {
-				EE_Error::add_error( __( 'A valid Transaction was not found when attempting to save your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ($show_errors) {
+				EE_Error::add_error(__('A valid Transaction was not found when attempting to save your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -866,32 +866,32 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration( $registration, $show_errors = TRUE  ) {
+	private function _save_registration($registration, $show_errors = TRUE) {
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// should this registration be processed during this visit ?
-			if ( $this->visit_allows_processing_of_this_registration( $registration ) ) {
+			if ($this->visit_allows_processing_of_this_registration($registration)) {
 				//set TXN ID
-				if ( ! $registration->transaction_ID() ) {
-					$registration->set_transaction_id( $this->transaction->ID() );
+				if ( ! $registration->transaction_ID()) {
+					$registration->set_transaction_id($this->transaction->ID());
 				}
 				// verify and save the attendee
-				$this->_save_registration_attendee( $registration, $show_errors );
+				$this->_save_registration_attendee($registration, $show_errors);
 				// save answers to reg form questions
-				$this->_save_registration_answers( $registration, $show_errors );
+				$this->_save_registration_answers($registration, $show_errors);
 				// save changes
 				$registration->save();
 				// update txn cache
-				if ( ! $this->transaction->update_cache_after_object_save( 'Registration', $registration )) {
-					if ( $show_errors ) {
-						EE_Error::add_error( __( 'The newly saved Registration object could not be cached on the Transaction.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+				if ( ! $this->transaction->update_cache_after_object_save('Registration', $registration)) {
+					if ($show_errors) {
+						EE_Error::add_error(__('The newly saved Registration object could not be cached on the Transaction.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
-					__( 'An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso' ),
+					__('An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -908,25 +908,25 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration_attendee( $registration, $show_errors = TRUE ) {
-		if ( $registration->attendee() instanceof EE_Attendee ) {
+	private function _save_registration_attendee($registration, $show_errors = TRUE) {
+		if ($registration->attendee() instanceof EE_Attendee) {
 			// save so that ATT has ID
 			$registration->attendee()->save();
-			if ( ! $registration->update_cache_after_object_save( 'Attendee', $registration->attendee() ) ) {
-				if ( $show_errors ) {
+			if ( ! $registration->update_cache_after_object_save('Attendee', $registration->attendee())) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'The newly saved Attendee object could not be cached on the registration.', 'event_espresso' ),
+						__('The newly saved Attendee object could not be cached on the registration.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
 					sprintf(
 						'%1$s||%1$s $attendee = %2$s',
-						__( 'Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso' ),
-						var_export( $registration->attendee(), true )
+						__('Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso'),
+						var_export($registration->attendee(), true)
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -944,25 +944,25 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration_answers( $registration, $show_errors = TRUE ) {
+	private function _save_registration_answers($registration, $show_errors = TRUE) {
 		// now save the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				$answer->set_registration( $registration->ID() );
+			if ($answer instanceof EE_Answer) {
+				$answer->set_registration($registration->ID());
 				$answer->save();
-				if ( ! $registration->update_cache_after_object_save( 'Answer', $answer, $cache_key )) {
-					if ( $show_errors ) {
+				if ( ! $registration->update_cache_after_object_save('Answer', $answer, $cache_key)) {
+					if ($show_errors) {
 						EE_Error::add_error(
-							__( 'The newly saved Answer object could not be cached on the registration.', 'event_espresso' ),
+							__('The newly saved Answer object could not be cached on the registration.', 'event_espresso'),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					}
 				}
 			} else {
-				if ( $show_errors ) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
@@ -981,7 +981,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function refresh_all_entities( $from_db = false ) {
+	public function refresh_all_entities($from_db = false) {
 		$from_db = $this->current_step->is_final_step() || $this->action === 'process_gateway_response'
 			? true
 			: $from_db;
@@ -1005,11 +1005,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;
@@ -1017,9 +1017,9 @@ 
 			$payment_method = $this->payment instanceof EE_Payment ? $this->payment->payment_method() : null;
 			$this->payment_method = $payment_method instanceof EE_Payment_Method ? $payment_method : $this->payment_method;
 			//now refresh the cart, based on the TXN
-			$this->cart = $this->get_cart_for_transaction( $this->transaction );
+			$this->cart = $this->get_cart_for_transaction($this->transaction);
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return TRUE;
@@ -1034,21 +1034,21 @@ 
 	 * @return  EE_Attendee | null
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_primary_attendee_obj_from_db( EE_Transaction $transaction ) {
+	protected function _refresh_primary_attendee_obj_from_db(EE_Transaction $transaction) {
 
 		$primary_attendee_obj = null;
 		// grab the saved registrations from the transaction
-		foreach ( $transaction->registrations( $this->reg_cache_where_params, true ) as $registration ) {
+		foreach ($transaction->registrations($this->reg_cache_where_params, true) as $registration) {
 			// verify object
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				$attendee = $registration->attendee();
 				// verify object && maybe cache primary_attendee_obj ?
-				if ( $attendee instanceof EE_Attendee&& $registration->is_primary_registrant() ) {
+				if ($attendee instanceof EE_Attendee && $registration->is_primary_registrant()) {
 					$primary_attendee_obj = $attendee;
 				}
 			} else {
 				EE_Error::add_error(
-						__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+						__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1069,43 +1069,43 @@ 
 	 */
 	protected function refresh_entity_map() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// never cache payment info
-			$this->transaction->clear_cache( 'Payment' );
+			$this->transaction->clear_cache('Payment');
 			// is the Payment Options Reg Step completed ?
-			if ( $this->transaction->reg_step_completed( 'payment_options' ) ) {
+			if ($this->transaction->reg_step_completed('payment_options')) {
 				// then check for payments and update TXN accordingly
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				$transaction_payments->calculate_total_payments_and_update_status( $this->transaction );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				$transaction_payments->calculate_total_payments_and_update_status($this->transaction);
 			}
 			// grab the saved registrations from the transaction
 			foreach (
-				$this->transaction->registrations( $this->reg_cache_where_params ) as $reg_cache_ID => $registration
+				$this->transaction->registrations($this->reg_cache_where_params) as $reg_cache_ID => $registration
 			) {
-				$this->_refresh_registration( $reg_cache_ID, $registration );
+				$this->_refresh_registration($reg_cache_ID, $registration);
 			}
 			// make sure our cached TXN is added to the model entity mapper
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with( $this->transaction->ID(), $this->transaction );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with($this->transaction->ID(), $this->transaction);
 
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify and update the cart because inaccurate totals are not so much fun
-		if ( $this->cart instanceof EE_Cart ) {
+		if ($this->cart instanceof EE_Cart) {
 			$grand_total = $this->cart->get_grand_total();
-			if ( $grand_total instanceof EE_Line_Item && $grand_total->ID() ) {
+			if ($grand_total instanceof EE_Line_Item && $grand_total->ID()) {
 				$grand_total->recalculate_total_including_taxes();
 				$grand_total = $grand_total->get_model()->refresh_entity_map_with(
 					$this->cart->get_grand_total()->ID(),
 					$this->cart->get_grand_total()
 				);
 			}
-			if ( $grand_total instanceof EE_Line_Item ) {
-				$this->cart = EE_Cart::instance( $grand_total );
+			if ($grand_total instanceof EE_Line_Item) {
+				$this->cart = EE_Cart::instance($grand_total);
 			} else {
-				EE_Error::add_error( __( 'A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -1122,19 +1122,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration( $reg_cache_ID, $registration ) {
+	protected function _refresh_registration($reg_cache_ID, $registration) {
 
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// update the entity mapper attendee
-			$this->_refresh_registration_attendee( $registration );
+			$this->_refresh_registration_attendee($registration);
 			// update the entity mapper answers for reg form questions
-			$this->_refresh_registration_answers( $registration );
+			$this->_refresh_registration_answers($registration);
 			// make sure the cached registration is added to the model entity mapper
-			$registration->get_model()->refresh_entity_map_with( $reg_cache_ID, $registration );
+			$registration->get_model()->refresh_entity_map_with($reg_cache_ID, $registration);
 		} else {
 			EE_Error::add_error(
-				__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+				__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1149,15 +1149,15 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration_attendee( $registration ) {
+	protected function _refresh_registration_attendee($registration) {
 
 		$attendee = $registration->attendee();
 		// verify object
-		if ( $attendee instanceof EE_Attendee && $attendee->ID() ) {
+		if ($attendee instanceof EE_Attendee && $attendee->ID()) {
 			// make sure the cached attendee is added to the model entity mapper
-			$registration->attendee()->get_model()->refresh_entity_map_with( $attendee->ID(), $attendee );
+			$registration->attendee()->get_model()->refresh_entity_map_with($attendee->ID(), $attendee);
 			// maybe cache primary_attendee_obj ?
-			if ( $registration->is_primary_registrant() ) {
+			if ($registration->is_primary_registrant()) {
 				$this->primary_attendee_obj = $attendee;
 			}
 		}
@@ -1172,19 +1172,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration_answers( $registration ) {
+	protected function _refresh_registration_answers($registration) {
 
 		// now update the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				if ( $answer->ID() ) {
+			if ($answer instanceof EE_Answer) {
+				if ($answer->ID()) {
 					// make sure the cached answer is added to the model entity mapper
-					$answer->get_model()->refresh_entity_map_with( $answer->ID(), $answer );
+					$answer->get_model()->refresh_entity_map_with($answer->ID(), $answer);
 				}
 			} else {
 				EE_Error::add_error(
-					__( 'An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+					__('An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1204,13 +1204,13 @@ 
 	 */
     public function __sleep()
     {
-	    if ( $this->primary_attendee_obj instanceof EE_Attendee && $this->primary_attendee_obj->ID() ) {
+	    if ($this->primary_attendee_obj instanceof EE_Attendee && $this->primary_attendee_obj->ID()) {
 		    $this->primary_attendee_obj = $this->primary_attendee_obj->ID();
 	    }        // remove the reg form and the checkout
-	    if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+	    if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 		    $this->transaction = $this->transaction->ID();
 	    }        // remove the reg form and the checkout
-        return array_diff( array_keys( get_object_vars( $this ) ), array( 'billing_form', 'registration_form' ) );
+        return array_diff(array_keys(get_object_vars($this)), array('billing_form', 'registration_form'));
     }
 
 
@@ -1220,15 +1220,15 @@ 
 	 * this will reinstate the EE_Checkout object on each EE_SPCO_Reg_Step object
 	 */
 	public function __wakeup() {
-		if ( ! $this->primary_attendee_obj instanceof EE_Attendee && absint( $this->primary_attendee_obj ) !== 0 ) {
+		if ( ! $this->primary_attendee_obj instanceof EE_Attendee && absint($this->primary_attendee_obj) !== 0) {
 			// $this->primary_attendee_obj is actually just an ID, so use it to get the object from the db
-			$this->primary_attendee_obj = EEM_Attendee::instance()->get_one_by_ID( $this->primary_attendee_obj );
+			$this->primary_attendee_obj = EEM_Attendee::instance()->get_one_by_ID($this->primary_attendee_obj);
 		}
-		if ( ! $this->transaction instanceof EE_Transaction && absint( $this->transaction ) !== 0 ) {
+		if ( ! $this->transaction instanceof EE_Transaction && absint($this->transaction) !== 0) {
 			// $this->transaction is actually just an ID, so use it to get the object from the db
-			$this->transaction = EEM_Transaction::instance()->get_one_by_ID( $this->transaction );
+			$this->transaction = EEM_Transaction::instance()->get_one_by_ID($this->transaction);
 		}
-		foreach ( $this->reg_steps as $reg_step ) {
+		foreach ($this->reg_steps as $reg_step) {
 			$reg_step->checkout = $this;
 		}
 	}
@@ -1245,12 +1245,12 @@ 
 	 * @param bool   $display_request
 	 * @throws \EE_Error
 	 */
-	public function log( $class = '', $func = '', $line = '', $info = array(), $display_request = false ) {
+	public function log($class = '', $func = '', $line = '', $info = array(), $display_request = false) {
 		$disabled = true;
-		if ( WP_DEBUG && ! $disabled ) {
-			$debug_data = get_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), array() );
+		if (WP_DEBUG && ! $disabled) {
+			$debug_data = get_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), array());
 			$default_data = array(
-				$class 		=> $func . '() : ' . $line,
+				$class 		=> $func.'() : '.$line,
 				'request->step' 		=> $this->step,
 				'request->action' 	=> $this->action,
 				'current_step->slug' => $this->current_step instanceof EE_SPCO_Reg_Step ?
@@ -1262,24 +1262,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);
 				}
 			}
 		}
@@ -1292,23 +1292,23 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public function _strip_objects( $info = array() ) {
-		foreach ( (array)$info as $key => $value ) {
-			if ( is_array( $value )) {
-				$info[ $key ] = $this->_strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : 0;
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+	public function _strip_objects($info = array()) {
+		foreach ((array) $info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = $this->_strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : 0;
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 

core/domain/services/registration/CancelRegistrationService.php

Indentation +35 added lines, -35 removed lines

@@ -4,7 +4,7 @@ 
 use EventEspresso\core\domain\services\ticket\CancelTicketLineItemService;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -21,22 +21,22 @@ 
 class CancelRegistrationService
 {
 
-    /**
-     * @var CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    private $cancel_ticket_line_item_service;
+	/**
+	 * @var CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	private $cancel_ticket_line_item_service;
 
 
 
-    /**
-     * Command constructor
-     *
-     * @param CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
-    {
-        $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
+	{
+		$this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
+	}
 
 
 
@@ -44,27 +44,27 @@ 
 	 * @param \EE_Registration $registration
 	 * @param bool             $cancel_ticket_line_item
 	 */
-    public function cancelRegistrationAndTicketLineItem(\EE_Registration $registration, $cancel_ticket_line_item = true)
-    {
-        // first cancel the original line item for the registration's ticket
-	    if ( $cancel_ticket_line_item ) {
-		    $this->cancel_ticket_line_item_service->forRegistration( $registration );
-	    }
-        $this->cancelRegistrationOnly($registration);
-    }
-
-
-
-    /**
-     * @param \EE_Registration $registration
-     * @throws \EE_Error
-     */
-    public function cancelRegistrationOnly(\EE_Registration $registration)
-    {
-        // now cancel the registration itself
-        $registration->set_status(\EEM_Registration::status_id_cancelled);
-        $registration->save();
-    }
+	public function cancelRegistrationAndTicketLineItem(\EE_Registration $registration, $cancel_ticket_line_item = true)
+	{
+		// first cancel the original line item for the registration's ticket
+		if ( $cancel_ticket_line_item ) {
+			$this->cancel_ticket_line_item_service->forRegistration( $registration );
+		}
+		$this->cancelRegistrationOnly($registration);
+	}
+
+
+
+	/**
+	 * @param \EE_Registration $registration
+	 * @throws \EE_Error
+	 */
+	public function cancelRegistrationOnly(\EE_Registration $registration)
+	{
+		// now cancel the registration itself
+		$registration->set_status(\EEM_Registration::status_id_cancelled);
+		$registration->save();
+	}
 
 
 

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
     public function cancelRegistrationAndTicketLineItem(\EE_Registration $registration, $cancel_ticket_line_item = true)
     {
         // first cancel the original line item for the registration's ticket
-	    if ( $cancel_ticket_line_item ) {
-		    $this->cancel_ticket_line_item_service->forRegistration( $registration );
+	    if ($cancel_ticket_line_item) {
+		    $this->cancel_ticket_line_item_service->forRegistration($registration);
 	    }
         $this->cancelRegistrationOnly($registration);
     }

admin_pages/registrations/templates/reg_admin_details_header.template.php

Spacing +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <div style="float:right">
-	<?php printf( __( 'View %1$sRegistrations%4$s /  %2$sTransactions%4$s for this %3$sevent%4$s.', 'event_espresso' ), '<a href="' . $filtered_registrations_link . '">', '<a href="' . $filtered_transactions_link . '">', '<a href="' . $event_link . '">', '</a>' );?>
+	<?php printf(__('View %1$sRegistrations%4$s /  %2$sTransactions%4$s for this %3$sevent%4$s.', 'event_espresso'), '<a href="'.$filtered_registrations_link.'">', '<a href="'.$filtered_transactions_link.'">', '<a href="'.$event_link.'">', '</a>'); ?>
 </div>
-<h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo $previous_registration . '&nbsp;'; echo __( 'Registration # ', 'event_espresso' ) . $reg_nmbr['value']; echo '&nbsp;' . $next_registration; ?></h3>
-<h2 id="reg-admin-reg-details-reg-date-hdr"><?php echo $reg_datetime['value'];?></h2>
+<h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo $previous_registration.'&nbsp;'; echo __('Registration # ', 'event_espresso').$reg_nmbr['value']; echo '&nbsp;'.$next_registration; ?></h3>
+<h2 id="reg-admin-reg-details-reg-date-hdr"><?php echo $reg_datetime['value']; ?></h2>
 
-<?php if ( $registration->group_size() > 1 ) : ?>
-	<a id="scroll-to-other-attendees" class="scroll-to" href="#other-attendees"><?php echo __( 'Scroll to Other Registrations in the Same Transaction', 'event_espresso' );?></a>
+<?php if ($registration->group_size() > 1) : ?>
+	<a id="scroll-to-other-attendees" class="scroll-to" href="#other-attendees"><?php echo __('Scroll to Other Registrations in the Same Transaction', 'event_espresso'); ?></a>
 <?php endif; ?>
 
-<?php do_action( 'AHEE__reg_status_change_buttons__after_header', $REG_ID ); ?>
+<?php do_action('AHEE__reg_status_change_buttons__after_header', $REG_ID); ?>
 

core/libraries/messages/defaults/default/html_receipt_content.template.php

Spacing +28 added lines, -28 removed lines

@@ -23,15 +23,15 @@ 
 			</td>
 			<td>
 				<div id="invoice-info">
-					<h2 id="invoice-hdr"><?php _e( 'Order Confirmation', 'event_espresso' ) ?></h2>
+					<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso') ?></h2>
 
-					<h3 id="invoice-date"><?php _e( 'Date:', 'event_espresso' ) ?>
+					<h3 id="invoice-date"><?php _e('Date:', 'event_espresso') ?>
 						<span class="plain-text">[PRIMARY_REGISTRANT_REGISTRATION_DATE]</span></h3>
 
-					<h3 id="invoice-txn-id"><?php _e( 'Transaction ID:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso') ?>
 						<span class="plain-text">[TXN_ID]</span></h3>
 
-					<h3 id="invoice-txn-status"><?php _e( 'Status:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso') ?>
 						<span class="[TXN_STATUS_ID] plain-text">[TXN_STATUS]</span></h3>
 				</div>
 			</td>
@@ -41,15 +41,15 @@ 
 		[EVENT_LIST]
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Additional Charges/Discounts", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Additional Charges/Discounts", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Quantity', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Unit Price', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Total', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Quantity', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Unit Price', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Total', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -60,15 +60,15 @@ 
 		</table>
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Taxes", 'event_espresso' ) ?></h3>
-		<p><?php printf( __( '%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso' ), '<strong>', '</strong>' ); ?></p>
+		<h3 class="section-title"><?php _e("Taxes", 'event_espresso') ?></h3>
+		<p><?php printf(__('%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 		<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="event_th item_c"><?php _e( 'Rate', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Tax Amount', '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>
@@ -79,19 +79,19 @@ 
 		</table>
 	</div>
 	<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf( __( "Grand Total: %s", "event_espresso" ), '[TOTAL_COST]' ); ?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), '[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>
 		<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><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>
-					<th><?php _e( 'Amount', 'event_espresso' ); ?></th>
+					<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></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>
+					<th><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -105,21 +105,21 @@ 
 			<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 _e('Total Paid', 'event_espresso') ?></td>
 					<td class="item_r">[TOTAL_AMOUNT_PAID]</td>
 				</tr>
 				<tr class="total_tr odd">
 					<td colspan="4">&nbsp;</td>
-					<td class="total" id="total_currency"><?php _e( 'Amount Owed:', 'event_espresso' ); ?></td>
+					<td class="total" id="total_currency"><?php _e('Amount Owed:', 'event_espresso'); ?></td>
 					<td class="total">[TOTAL_OWING]</td>
 				</tr>
 			</tfoot>
 		</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">
-			<h2><?php _e( "Venue Details:", "event_espresso" ); ?></h2>
+			<h2><?php _e("Venue Details:", "event_espresso"); ?></h2>
 			<table class="venue-list">
 				<tr class="venue-details">
 					<td class="venue-details-part venue-address-dv">

modules/gateways/Invoice/lib/invoice_functions.php

Spacing +4 added lines, -4 removed lines

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

core/data_migration_scripts/EE_DMS_Unknown_1_0_0.core.php

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 use EventEspresso\core\services\database\TableManager;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -20,7 +20,7 @@ 
  */
 /**
  */
-class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * Returns whether or not this data migration script can operate on the given version of the database.
@@ -47,11 +47,11 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_migration_stages = array();
 		$this->_pretty_name = __("Fatal Uncatchable Error Occurred", "event_espresso");
 //		dd($this);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 	public function migration_page_hooks() {
 

core/data_migration_scripts/EE_Data_Migration_Script_Base.core.php

Spacing +117 added lines, -117 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 use EventEspresso\core\services\database\TableManager;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -124,14 +124,14 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
-		$this->_migration_stages = (array) apply_filters('FHEE__'.get_class($this).'__construct__migration_stages',$this->_migration_stages);
-		foreach($this->_migration_stages as $migration_stage){
-			if ( $migration_stage instanceof EE_Data_Migration_Script_Stage ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
+		$this->_migration_stages = (array) apply_filters('FHEE__'.get_class($this).'__construct__migration_stages', $this->_migration_stages);
+		foreach ($this->_migration_stages as $migration_stage) {
+			if ($migration_stage instanceof EE_Data_Migration_Script_Stage) {
 				$migration_stage->_construct_finalize($this);
 			}
 		}
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -140,7 +140,7 @@ 
 	 * Place to add hooks and filters for tweaking the migrations page, in order
 	 * to customize it
 	 */
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 		//by default none are added because we normally like the default look of the migration page
 	}
 
@@ -155,9 +155,9 @@ 
 	 * @param int|string $new_pk eg posts.ID
 	 * @return void
 	 */
-	public function set_mapping($old_table,$old_pk,$new_table,$new_pk){
+	public function set_mapping($old_table, $old_pk, $new_table, $new_pk) {
 		//make sure it has the needed keys
-		if( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])){
+		if ( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])) {
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
 		$this->_mappings[$old_table][$new_table][$old_pk] = $new_pk;
@@ -173,9 +173,9 @@ 
 	 * @param string $new_table with wpdb prefix (wp_). Eg: wp_posts
 	 * @return mixed the primary key on the new table
 	 */
-	public function get_mapping_new_pk($old_table,$old_pk,$new_table){
-		if( ! isset($this->_mappings[$old_table]) ||
-			! isset($this->_mappings[$old_table][$new_table])){
+	public function get_mapping_new_pk($old_table, $old_pk, $new_table) {
+		if ( ! isset($this->_mappings[$old_table]) ||
+			! isset($this->_mappings[$old_table][$new_table])) {
 			//try fetching the option
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
@@ -192,15 +192,15 @@ 
 	 * @param mixed $new_pk
 	 * @return mixed
 	 */
-	public function get_mapping_old_pk($old_table,$new_table,$new_pk){
-		if( ! isset($this->_mappings[$old_table]) ||
-			! isset($this->_mappings[$old_table][$new_table])){
+	public function get_mapping_old_pk($old_table, $new_table, $new_pk) {
+		if ( ! isset($this->_mappings[$old_table]) ||
+			! isset($this->_mappings[$old_table][$new_table])) {
 			//try fetching the option
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
-		if(isset($this->_mappings[$old_table][$new_table])){
+		if (isset($this->_mappings[$old_table][$new_table])) {
 			$new_pk_to_old_pk = array_flip($this->_mappings[$old_table][$new_table]);
-			if(isset($new_pk_to_old_pk[$new_pk])){
+			if (isset($new_pk_to_old_pk[$new_pk])) {
 				return $new_pk_to_old_pk[$new_pk];
 			}
 		}
@@ -215,8 +215,8 @@ 
 	 * @param string $new_table_name
 	 * @return array
 	 */
-	protected function _get_mapping_option($old_table_name,$new_table_name){
-		$option =  get_option($this->_get_mapping_option_name($old_table_name, $new_table_name),array());
+	protected function _get_mapping_option($old_table_name, $new_table_name) {
+		$option = get_option($this->_get_mapping_option_name($old_table_name, $new_table_name), array());
 		return $option;
 	}
 
@@ -229,9 +229,9 @@ 
 	 * @param array $mapping_array
 	 * @return boolean success of updating option
 	 */
-	protected function _set_mapping_option($old_table_name,$new_table_name,$mapping_array){
+	protected function _set_mapping_option($old_table_name, $new_table_name, $mapping_array) {
 //		echo "set mapping for $old_table_name $new_table_name".count($mapping_array)."<br>";
-		$success =  update_option($this->_get_mapping_option_name($old_table_name, $new_table_name),$mapping_array);
+		$success = update_option($this->_get_mapping_option_name($old_table_name, $new_table_name), $mapping_array);
 		return $success;
 	}
 
@@ -243,12 +243,12 @@ 
 	 * @param string $new_table_name
 	 * @return string
 	 */
-	protected function _get_mapping_option_name($old_table_name,$new_table_name){
+	protected function _get_mapping_option_name($old_table_name, $new_table_name) {
 		global $wpdb;
-		$old_table_name_sans_wp = str_replace($wpdb->prefix,"",$old_table_name);
-		$new_table_name_sans_wp = str_replace($wpdb->prefix,"",$new_table_name);
+		$old_table_name_sans_wp = str_replace($wpdb->prefix, "", $old_table_name);
+		$new_table_name_sans_wp = str_replace($wpdb->prefix, "", $new_table_name);
 		$migrates_to = EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this));
-		return substr( EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix . $migrates_to [ 'slug' ] . '_' . $migrates_to[ 'version' ] . '_' . $old_table_name_sans_wp . '_' . $new_table_name_sans_wp, 0, 64 );
+		return substr(EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix.$migrates_to ['slug'].'_'.$migrates_to['version'].'_'.$old_table_name_sans_wp.'_'.$new_table_name_sans_wp, 0, 64);
 	}
 
 
@@ -265,10 +265,10 @@ 
 	 * 99% until the function "migration_step" returns EE_Data_Migration_Script_Base::status_complete.
 	 * @return int
 	 */
-	protected function _count_records_to_migrate(){
+	protected function _count_records_to_migrate() {
 		$count = 0;
-		foreach($this->stages() as $stage){
-			$count+= $stage->count_records_to_migrate();
+		foreach ($this->stages() as $stage) {
+			$count += $stage->count_records_to_migrate();
 		}
 		return $count;
 	}
@@ -280,10 +280,10 @@ 
 	 * by just setting a transient and updating it after each migration_step
 	 * @return int
 	 */
-	public function count_records_migrated(){
+	public function count_records_migrated() {
 		$count = 0;
-		foreach($this->stages() as $stage){
-			$count+= $stage->count_records_migrated();
+		foreach ($this->stages() as $stage) {
+			$count += $stage->count_records_migrated();
 		}
 		$this->_records_migrated = $count;
 		return $count;
@@ -297,24 +297,24 @@ 
 	 * @throws EE_Error
 	 * @throws Exception
 	 */
-	public function migration_step($num_records_to_migrate_limit){
+	public function migration_step($num_records_to_migrate_limit) {
 		//reset the feedback message
 		$this->_feedback_message = '';
 		//if we haven't yet done the 1st schema changes, do them now. buffer any output
 		$this->_maybe_do_schema_changes(true);
 
-		$num_records_actually_migrated =0;
+		$num_records_actually_migrated = 0;
 		$records_migrated_per_stage = array();
 		//setup the 'stage' variable, which should hold the last run stage of the migration  (or none at all if nothing runs)
 		$stage = null;
 		//get the next stage that isn't complete
-		foreach($this->stages() as $stage){
-			if( $stage->get_status() == EE_Data_Migration_Manager::status_continue){
-				try{
+		foreach ($this->stages() as $stage) {
+			if ($stage->get_status() == EE_Data_Migration_Manager::status_continue) {
+				try {
 					$records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated);
 					$num_records_actually_migrated += $records_migrated_during_stage;
 					$records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage;
-				}catch(Exception $e){
+				} catch (Exception $e) {
 					//yes if we catch an exception here, we consider that migration stage borked.
 					$stage->set_status(EE_Data_Migration_Manager::status_fatal_error);
 					$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
@@ -322,7 +322,7 @@ 
 					throw $e;
 				}
 				//check that the migration stage didn't mark itself as having a fatal error
-				if($stage->is_broken()){
+				if ($stage->is_broken()) {
 					$this->set_broken();
 					throw new EE_Error($stage->get_last_error());
 				}
@@ -330,24 +330,24 @@ 
 			//once we've migrated all the number we intended to (possibly from different stages), stop migrating
 			//or if we had a fatal error
 			//or if the current script stopped early- its not done, but it's done all it thinks we should do on this step
-			if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()){
+			if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()) {
 				break;
 			}
 		}
 		//check if we're all done this data migration...
 		//which is indicated by being done early AND the last stage claims to be done
-		if($stage == NULL){
+		if ($stage == NULL) {
 			//this migration script apparently has NO stages... which is super weird, but whatever
 			$this->set_completed();
 			$this->_maybe_do_schema_changes(false);
-		}else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
+		} else if ($num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()) {
 			//apparently we're done, because we couldn't migrate the number we intended to
 			$this->set_completed();
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 			//do schema changes for after the migration now
 			//first double-check we haven't already done this
 			$this->_maybe_do_schema_changes(false);
-		}else{
+		} else {
 			//update feedback message, keeping in mind that we show them with the most recent at the top
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 		}
@@ -361,12 +361,12 @@ 
 	 * @param array $records_migrated_per_stage KEYS are pretty names for each stage; values are the count of records migrated from that stage
 	 * @return void
 	 */
-	private function _update_feedback_message($records_migrated_per_stage){
+	private function _update_feedback_message($records_migrated_per_stage) {
 		$feedback_message_array = array();
-		foreach($records_migrated_per_stage as $migration_stage_name => $num_records_migrated){
-			$feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"),$num_records_migrated,$migration_stage_name) ;
+		foreach ($records_migrated_per_stage as $migration_stage_name => $num_records_migrated) {
+			$feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"), $num_records_migrated, $migration_stage_name);
 		}
-		$this->_feedback_message .= implode("<br>",$feedback_message_array);
+		$this->_feedback_message .= implode("<br>", $feedback_message_array);
 	}
 
 
@@ -378,27 +378,27 @@ 
 	 * @throws Exception
 	 * @return void
 	 */
-	private function _maybe_do_schema_changes($before = true){
+	private function _maybe_do_schema_changes($before = true) {
 		//so this property will be either _schema_changes_after_migration_ran or _schema_changes_before_migration_ran
-		$property_name = '_schema_changes_'. ($before ? 'before' : 'after').'_migration_ran';
-		if ( ! $this->{$property_name} ){
-			try{
+		$property_name = '_schema_changes_'.($before ? 'before' : 'after').'_migration_ran';
+		if ( ! $this->{$property_name} ) {
+			try {
 				ob_start();
-				if($before){
+				if ($before) {
 					$this->schema_changes_before_migration();
-				}else{
+				} else {
 					$this->schema_changes_after_migration();
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}catch(Exception $e){
+			} catch (Exception $e) {
 				$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
 				throw $e;
 			}
 			//record that we've done these schema changes
 			$this->{$property_name} = true;
 			//if there were any warnings etc, record them as non-fatal errors
-			if( $output ){
+			if ($output) {
 				//there were some warnings
 				$this->_errors[] = $output;
 			}
@@ -425,9 +425,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_is_new_in_this_version($table_name,$table_definition_sql,$engine_string='ENGINE=InnoDB '){
+	protected function _table_is_new_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=InnoDB ') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_is_new_in_this_version_' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  true ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(true));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_is_new_in_this_version_' . $table_name  );
 	}
 
@@ -441,9 +441,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_is_changed_in_this_version($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
+	protected function _table_is_changed_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_is_changed_in_this_version' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_is_changed_in_this_version' . $table_name  );
 	}
 
@@ -454,8 +454,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _old_table_exists( $table_name ) {
-		return $this->_get_table_analysis()->tableExists( $table_name );
+	protected function _old_table_exists($table_name) {
+		return $this->_get_table_analysis()->tableExists($table_name);
 	}
 
 
@@ -465,8 +465,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _delete_table_if_empty( $table_name ) {
-		return EEH_Activation::delete_db_table_if_empty( $table_name );
+	protected function _delete_table_if_empty($table_name) {
+		return EEH_Activation::delete_db_table_if_empty($table_name);
 	}
 
 
@@ -485,9 +485,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_should_exist_previously($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
+	protected function _table_should_exist_previously($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_should_exist_previously' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name );
 	}
 
@@ -502,13 +502,13 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_has_not_changed_since_previous( $table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
-		if( $this->_currently_migrating() ) {
+	protected function _table_has_not_changed_since_previous($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
+		if ($this->_currently_migrating()) {
 			//if we're doing a migration, and this table apparently already exists, then we don't need do anything right?
 //			EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name );
 			return;
 		}
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 	}
 
 	/**
@@ -518,7 +518,7 @@ 
 	protected function _currently_migrating() {
 		//we want to know if we are currently performing a migration. We could just believe what was set on the _migrating property, but let's double-check (ie the script should apply and we should be in MM)
 		return $this->_migrating &&
-					$this->can_migrate_from_version( EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set() ) &&
+					$this->can_migrate_from_version(EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set()) &&
 					EE_Maintenance_Mode::instance()->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance;
 	}
 
@@ -529,17 +529,17 @@ 
 	 * @param boolean $table_is_new
 	 * @return boolean
 	 */
-	protected function _pre_existing_table_should_be_dropped( $table_is_new ) {
-		if( $table_is_new ) {
-			if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation  || $this->_currently_migrating() ){
+	protected function _pre_existing_table_should_be_dropped($table_is_new) {
+		if ($table_is_new) {
+			if ($this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation || $this->_currently_migrating()) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
-		}else{
-			if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){
+		} else {
+			if (in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(), array(EE_System::req_type_new_activation))) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -552,12 +552,12 @@ 
 	 * @param string $engine_string
 	 * @param boolean $drop_pre_existing_tables
 	 */
-	private function _create_table_and_catch_errors( $table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE ){
-		try{
-			EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables);
-		}catch( EE_Error $e ) {
-			$message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString();
-			$this->add_error( $message  );
+	private function _create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE) {
+		try {
+			EEH_Activation::create_table($table_name, $table_definition_sql, $engine_string, $drop_pre_existing_tables);
+		} catch (EE_Error $e) {
+			$message = $e->getMessage().'<br>Stack Trace:'.$e->getTraceAsString();
+			$this->add_error($message);
 			$this->_feedback_message .= $message;
 		}
 	}
@@ -569,15 +569,15 @@ 
 	 * @return int one of EE_System::_req_type_* constants
 	 * @throws EE_Error
 	 */
-	private function _get_req_type_for_plugin_corresponding_to_this_dms(){
-		if($this->slug() == 'Core'){
+	private function _get_req_type_for_plugin_corresponding_to_this_dms() {
+		if ($this->slug() == 'Core') {
 			return EE_System::instance()->detect_req_type();
-		}else{//it must be for an addon
+		} else {//it must be for an addon
 			$addon_name = $this->slug();
-			if( EE_Registry::instance()->get_addon_by_name($addon_name)){
+			if (EE_Registry::instance()->get_addon_by_name($addon_name)) {
 				return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type();
-			}else{
-				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ;
+			} else {
+				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"), $this->slug(), $addon_name, implode(",", array_keys(EE_Registry::instance()->get_addons_by_name()))));
 			}
 		}
 	}
@@ -588,13 +588,13 @@ 
 	 * returns an array of strings describing errors by all the script's stages
 	 * @return array
 	 */
-	public function get_errors(){
+	public function get_errors() {
 		$all_errors = $this->_errors;
-		if( ! is_array($all_errors)){
+		if ( ! is_array($all_errors)) {
 			$all_errors = array();
 		}
-		foreach($this->stages() as $stage){
-			$all_errors = array_merge($stage->get_errors(),$all_errors);
+		foreach ($this->stages() as $stage) {
+			$all_errors = array_merge($stage->get_errors(), $all_errors);
 		}
 		return $all_errors;
 	}
@@ -605,8 +605,8 @@ 
 	 * Indicates whether or not this migration script should continue
 	 * @return boolean
 	 */
-	public function can_continue(){
-		return in_array($this->get_status(),  EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script);
+	public function can_continue() {
+		return in_array($this->get_status(), EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script);
 	}
 
 
@@ -618,8 +618,8 @@ 
 	 * get ordered by the indexes
 	 * @return EE_Data_Migration_Script_Stage[]
 	 */
-	protected function stages(){
-		$stages = apply_filters( 'FHEE__'.get_class($this).'__stages',$this->_migration_stages );
+	protected function stages() {
+		$stages = apply_filters('FHEE__'.get_class($this).'__stages', $this->_migration_stages);
 		ksort($stages);
 		return $stages;
 	}
@@ -631,7 +631,7 @@ 
 	 * can be displayed to the user
 	 * @return string
 	 */
-	public function get_feedback_message(){
+	public function get_feedback_message() {
 		return $this->_feedback_message;
 	}
 
@@ -643,16 +643,16 @@ 
 	 * possible that this class is defined when it goes to sleep, but NOT available when it
 	 * awakes (eg, this class is part of an addon that is deactivated at some point).
 	 */
-	public function properties_as_array(){
+	public function properties_as_array() {
 		$properties = parent::properties_as_array();
 		$properties['_migration_stages'] = array();
-		foreach($this->_migration_stages as $migration_stage_priority => $migration_stage_class){
+		foreach ($this->_migration_stages as $migration_stage_priority => $migration_stage_class) {
 			$properties['_migration_stages'][$migration_stage_priority] = $migration_stage_class->properties_as_array();
 		}
 		unset($properties['_mappings']);
 
-		foreach($this->_mappings as $old_table_name => $mapping_to_new_table){
-			foreach($mapping_to_new_table as $new_table_name => $mapping){
+		foreach ($this->_mappings as $old_table_name => $mapping_to_new_table) {
+			foreach ($mapping_to_new_table as $new_table_name => $mapping) {
 				$this->_set_mapping_option($old_table_name, $new_table_name, $mapping);
 			}
 		}
@@ -667,19 +667,19 @@ 
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
 	 * @return void
 	 */
-	public function instantiate_from_array_of_properties($array_of_properties){
+	public function instantiate_from_array_of_properties($array_of_properties) {
 		$stages_properties_arrays = $array_of_properties['_migration_stages'];
 		unset($array_of_properties['_migration_stages']);
 		unset($array_of_properties['class']);
-		foreach($array_of_properties as $property_name => $property_value){
+		foreach ($array_of_properties as $property_name => $property_value) {
 			$this->{$property_name} = $property_value;
 		}
 		//_migration_stages are already instantiated, but have only default data
-		foreach($this->_migration_stages as $stage){
-			$stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage),$stages_properties_arrays);
+		foreach ($this->_migration_stages as $stage) {
+			$stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage), $stages_properties_arrays);
 			//SO, if we found the stage data that was saved, use it. Otherwise, I guess the stage is new? (maybe added by
 			//an addon? Unlikely... not sure why it wouldn't exist, but if it doesn't just treat it like it was never started yet)
-			if($stage_data){
+			if ($stage_data) {
 				$stage->instantiate_from_array_of_properties($stage_data);
 			}
 		}
@@ -695,9 +695,9 @@ 
 	 * @param array $migration_stage_data_arrays
 	 * @return null
 	 */
-	private function _find_migration_stage_data_with_classname($classname,$migration_stage_data_arrays){
-		foreach($migration_stage_data_arrays as $migration_stage_data_array){
-			if(isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname){
+	private function _find_migration_stage_data_with_classname($classname, $migration_stage_data_arrays) {
+		foreach ($migration_stage_data_arrays as $migration_stage_data_array) {
+			if (isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname) {
 				return $migration_stage_data_array;
 			}
 		}
@@ -713,8 +713,8 @@ 
 	 * @return array where the first key is the plugin's slug, the 2nd is the version of that plugin
 	 * that will be updated to. Eg array('Core','4.1.0')
 	 */
-	public final function migrates_to_version(){
-		return EE_Data_Migration_Manager::instance()->script_migrates_to_version( get_class( $this ) );
+	public final function migrates_to_version() {
+		return EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this));
 	}
 
 
@@ -726,10 +726,10 @@ 
 	 * Or 'Core' for core (non-addon).
 	 * @return string
 	 */
-	public function slug(){
+	public function slug() {
 		$migrates_to_version_info = $this->migrates_to_version();
 		//the slug is the first part of the array
-		return $migrates_to_version_info[ 'slug' ];
+		return $migrates_to_version_info['slug'];
 	}
 
 
@@ -743,7 +743,7 @@ 
 	 * the database up so it can run), then you can set "A" to priority 3 or something.
 	 * @return int
 	 */
-	public function priority(){
+	public function priority() {
 		return $this->_priority;
 	}
 
@@ -756,18 +756,18 @@ 
 	 * @param boolean $migrating
 	 * @return void
 	 */
-	public function set_migrating( $migrating = TRUE ){
+	public function set_migrating($migrating = TRUE) {
 		$this->_migrating = $migrating;
 	}
 
 	/**
 	 * Marks that we think this migration class can continue to migrate
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		parent::reattempt();
 		//also, we want to reattempt any stages that were marked as borked
-		foreach( $this->stages() as $stage ) {
-			if( $stage->is_broken() ) {
+		foreach ($this->stages() as $stage) {
+			if ($stage->is_broken()) {
 				$stage->reattempt();
 			}
 		}

Braces +11 added lines, -11 removed lines

@@ -314,7 +314,7 @@ 
 					$records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated);
 					$num_records_actually_migrated += $records_migrated_during_stage;
 					$records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage;
-				}catch(Exception $e){
+				} catch(Exception $e){
 					//yes if we catch an exception here, we consider that migration stage borked.
 					$stage->set_status(EE_Data_Migration_Manager::status_fatal_error);
 					$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
@@ -340,14 +340,14 @@ 
 			//this migration script apparently has NO stages... which is super weird, but whatever
 			$this->set_completed();
 			$this->_maybe_do_schema_changes(false);
-		}else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
+		} else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
 			//apparently we're done, because we couldn't migrate the number we intended to
 			$this->set_completed();
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 			//do schema changes for after the migration now
 			//first double-check we haven't already done this
 			$this->_maybe_do_schema_changes(false);
-		}else{
+		} else{
 			//update feedback message, keeping in mind that we show them with the most recent at the top
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 		}
@@ -386,12 +386,12 @@ 
 				ob_start();
 				if($before){
 					$this->schema_changes_before_migration();
-				}else{
+				} else{
 					$this->schema_changes_after_migration();
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
 				throw $e;
 			}
@@ -533,13 +533,13 @@ 
 		if( $table_is_new ) {
 			if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation  || $this->_currently_migrating() ){
 				return true;
-			}else{
+			} else{
 				return false;
 			}
-		}else{
+		} else{
 			if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){
 				return true;
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -555,7 +555,7 @@ 
 	private function _create_table_and_catch_errors( $table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE ){
 		try{
 			EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables);
-		}catch( EE_Error $e ) {
+		} catch( EE_Error $e ) {
 			$message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString();
 			$this->add_error( $message  );
 			$this->_feedback_message .= $message;
@@ -572,11 +572,11 @@ 
 	private function _get_req_type_for_plugin_corresponding_to_this_dms(){
 		if($this->slug() == 'Core'){
 			return EE_System::instance()->detect_req_type();
-		}else{//it must be for an addon
+		} else{//it must be for an addon
 			$addon_name = $this->slug();
 			if( EE_Registry::instance()->get_addon_by_name($addon_name)){
 				return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type();
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ;
 			}
 		}

core/db_classes/EE_Taxes.class.php

Spacing +27 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -38,21 +38,21 @@ 
 	 * @return float             total taxes to apply to ticket.
 	 * @throws \EE_Error
 	 */
-	public static function get_total_taxes_for_admin( EE_Ticket $ticket ) {
+	public static function get_total_taxes_for_admin(EE_Ticket $ticket) {
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) ) {
+		if ( ! $ticket->get('TKT_taxable')) {
 			return $tax;
 		}
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
-		$subtotal = self::get_subtotal_for_admin( $ticket );
+		$subtotal = self::get_subtotal_for_admin($ticket);
 		//get taxes
 		$taxes = self::get_taxes_for_admin();
 		//apply taxes to subtotal
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			//assuming taxes are not cumulative
-			$total_tax += $subtotal * $tax->get( 'PRC_amount' ) / 100;
+			$total_tax += $subtotal * $tax->get('PRC_amount') / 100;
 		}
 		return $total_tax;
 	}
@@ -68,8 +68,8 @@ 
 	 */
 	public static function get_total_taxes_percentage() {
 		$total_tax_percent = 0;
-		foreach ( self::get_taxes_for_admin() as $tax_price ) {
-			$total_tax_percent += $tax_price->get( 'PRC_amount' );
+		foreach (self::get_taxes_for_admin() as $tax_price) {
+			$total_tax_percent += $tax_price->get('PRC_amount');
 		}
 		return $total_tax_percent;
 	}
@@ -81,11 +81,11 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public static function get_subtotal_for_admin( EE_Ticket $ticket ) {
+	public static function get_subtotal_for_admin(EE_Ticket $ticket) {
 		$TKT_ID = $ticket->ID();
-		return isset( self::$_subtotal[ $TKT_ID ] )
-			? self::$_subtotal[ $TKT_ID ]
-			: self::_get_subtotal_for_admin( $ticket );
+		return isset(self::$_subtotal[$TKT_ID])
+			? self::$_subtotal[$TKT_ID]
+			: self::_get_subtotal_for_admin($ticket);
 	}
 
 
@@ -97,37 +97,37 @@ 
 	 * @return float     subtotal calculated from all EE_Price[] on Ticket.
 	 * @throws \EE_Error
 	 */
-	private static function _get_subtotal_for_admin( EE_Ticket $ticket ) {
+	private static function _get_subtotal_for_admin(EE_Ticket $ticket) {
 		$subtotal = 0;
 		//get all prices
 		$prices = $ticket->get_many_related(
 			'Price',
 			array(
 				'default_where_conditions' => 'none',
-				'order_by'                 => array( 'PRC_order' => 'ASC' ),
+				'order_by'                 => array('PRC_order' => 'ASC'),
 			)
 		);
 		//let's loop through them (base price is always the first item)
-		foreach ( $prices as $price ) {
-			if ( $price instanceof EE_Price ) {
+		foreach ($prices as $price) {
+			if ($price instanceof EE_Price) {
 				$price_type = $price->type_obj();
-				if ( $price_type instanceof EE_Price_Type ) {
-					switch ( $price->type_obj()->base_type() ) {
+				if ($price_type instanceof EE_Price_Type) {
+					switch ($price->type_obj()->base_type()) {
 						case 1: // base price
 						case 3: // surcharges
-							$subtotal += $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100
-								: $price->get( 'PRC_amount' );
+							$subtotal += $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100
+								: $price->get('PRC_amount');
 							break;
 						case 2: // discounts
-							$subtotal -= $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100
-								: $price->get( 'PRC_amount' );
+							$subtotal -= $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100
+								: $price->get('PRC_amount');
 							break;
 					}
 				}
 			}
 		}
 		$TKT_ID = $ticket->ID();
-		self::$_subtotal = array( $TKT_ID => $subtotal );
+		self::$_subtotal = array($TKT_ID => $subtotal);
 		return $subtotal;
 	}
 
@@ -140,9 +140,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function get_taxes_for_admin() {
-		if ( empty( self::$_default_taxes ) ) {
-			self::$_default_taxes = EE_Registry::instance()->load_model( 'Price' )->get_all(
-				array( array( 'Price_Type.PBT_ID' => 4 ) )
+		if (empty(self::$_default_taxes)) {
+			self::$_default_taxes = EE_Registry::instance()->load_model('Price')->get_all(
+				array(array('Price_Type.PBT_ID' => 4))
 			);
 		}
 		return self::$_default_taxes;

payment_methods/Paypal_Standard/help_tabs/payment_methods_overview_paypalstandard.help_tab.php

Spacing +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <p><strong><?php _e('PayPal Standard', 'event_espresso'); ?></strong></p>
-<p><span class="required"><?php _e('Please Note! This gateway has been deprecated and replaced with the PayPal Express payment method. ', 'event_espresso'); ?> <?php printf( __('If you still want to use this gateway, please follow the directions to %1$sactivate it here%2$s.', 'event_espresso'), "<a href='https://eventespresso.com/wiki/paypal-standard-payment-gateway/#deprecated' target='_blank'>", '</a>'); ?></span></p>
+<p><span class="required"><?php _e('Please Note! This gateway has been deprecated and replaced with the PayPal Express payment method. ', 'event_espresso'); ?> <?php printf(__('If you still want to use this gateway, please follow the directions to %1$sactivate it here%2$s.', 'event_espresso'), "<a href='https://eventespresso.com/wiki/paypal-standard-payment-gateway/#deprecated' target='_blank'>", '</a>'); ?></span></p>
 <p>
 <?php _e('Adjust the settings for the PayPal Standard payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso' ), "<a href='https://www.paypal.com/multicurrency' target='_blank'>","</a>" ); ?>
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso'), "<a href='https://www.paypal.com/multicurrency' target='_blank'>", "</a>"); ?>
 </p>
 <p><strong><?php _e('PayPal Standard Settings', 'event_espresso'); ?></strong></p>
 <ul>
@@ -22,18 +22,18 @@ 
 </li>
 <li>
 <strong><?php _e('PayPal Calculates Taxes', 'event_espresso'); ?></strong><br />
-<?php printf( __('If set to "Yes", we will indicate to PayPal that it should calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>' ); ?><br/>
-<?php _e( 'Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso' );?>
+<?php printf(__('If set to "Yes", we will indicate to PayPal that it should calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>'); ?><br/>
+<?php _e('Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('PayPal Calculates Shipping', 'event_espresso'); ?></strong><br />
 <?php _e('Similar to the "PayPal Calculates Taxes" setting, if this is set to "Yes", we will indicate to PayPal that it should calculate the shipping on each payment (if there are multiple payments for a single transaction, PayPal is permitted to add shipping charges to each payment.)', 'event_espresso'); ?><br/>
-<?php _e( 'Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso' );?>
+<?php _e('Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso'); ?>
 <li>
-<strong><?php _e( 'Notes Regarding Paypal Taxes and Shipping', 'event_espresso' );?></strong><br/>
-<?php _e( 'If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso' );?><br/>
-<?php _e( 'However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso' );?><br/>
-<?php _e( 'Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso' );?>
+<strong><?php _e('Notes Regarding Paypal Taxes and Shipping', 'event_espresso'); ?></strong><br/>
+<?php _e('If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso'); ?><br/>
+<?php _e('However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso'); ?><br/>
+<?php _e('Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Shipping Address Options', 'event_espresso'); ?></strong><br />