eventespresso / event-espresso-core

modules/single_page_checkout/inc/EE_SPCO_JSON_Response.php

Indentation +11 added lines, -11 removed lines

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

Spacing +40 added lines, -40 removed lines

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

modules/single_page_checkout/inc/EE_SPCO_Reg_Step_Registration_Confirmation.class.php

Indentation +11 added lines, -11 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -20,10 +20,10 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return 	\EE_SPCO_Reg_Step_Registration_Confirmation
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'registration_confirmation';
 		$this->_name = __('Registration Confirmation', 'event_espresso');
-		$this->_template = SPCO_TEMPLATES_PATH . 'registration_page_confirmation.template.php';
+		$this->_template = SPCO_TEMPLATES_PATH.'registration_page_confirmation.template.php';
 		$this->checkout = $checkout;
 	}
 
@@ -49,7 +49,7 @@ 
 	 * @return string
 	 */
 	public function generate_reg_form() {
-		EE_Registry::instance()->REQ->add_output( 'generate_reg_form' );
+		EE_Registry::instance()->REQ->add_output('generate_reg_form');
 	}
 
 

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 
 
 	/**
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function process_reg_step() {
 		return true;
@@ -64,7 +64,7 @@ 
 
 
 	/**
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function update_reg_step() {
 		return true;

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

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

payment_methods/Admin_Only/EE_PMT_Admin_Only.pm.php

Indentation +10 added lines, -10 removed lines

@@ -2,16 +2,16 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- *
- * EE_PMT_Admin_Only.
- * These payment methods really shouldn't be shown on frontend and contain nearly no functionality.
- * They should just be used admin-side for recording payments like Cash, Check, etc.
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- */
+	 *
+	 * EE_PMT_Admin_Only.
+	 * These payment methods really shouldn't be shown on frontend and contain nearly no functionality.
+	 * They should just be used admin-side for recording payments like Cash, Check, etc.
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 */
 class EE_PMT_Admin_Only extends EE_PMT_Base{
 
 

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  *
@@ -12,7 +12,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_PMT_Admin_Only extends EE_PMT_Base{
+class EE_PMT_Admin_Only extends EE_PMT_Base {
 
 
 
@@ -34,7 +34,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 

Braces +2 added lines, -1 removed lines

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

payment_methods/Bank/templates/bank_payment_details_content.template.php

Indentation +21 added lines, -21 removed lines

@@ -3,27 +3,27 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.3
- *
- * ------------------------------------------------------------------------
- *
- * bank_payment_overview_content
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.3
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * bank_payment_overview_content
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 ?><div class="event-display-boxes">
 			<h4 id="page_title" class="payment_type_title section-heading"><?php echo $page_title ?></h4>
 				<p class="instruct"><?php echo wpautop( $payment_instructions ) ?></p>

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -26,7 +26,7 @@ 
  */
 ?><div class="event-display-boxes">
 			<h4 id="page_title" class="payment_type_title section-heading"><?php echo $page_title ?></h4>
-				<p class="instruct"><?php echo wpautop( $payment_instructions ) ?></p>
+				<p class="instruct"><?php echo wpautop($payment_instructions) ?></p>
 		</div>
 <?php
 // End of file bank_payment_overview_content.template.php
\ No newline at end of file

Braces +2 added lines, -1 removed lines

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

payment_methods/Check/EE_PMT_Check.pm.php

Braces +3 added lines, -2 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -69,7 +70,7 @@ 
 				$default_address .=  $state ? $state->name() . '<br />' : '';
 				$default_address .= $country ? $country->name(). '<br />' : '';
 				$default_address .= $organization->zip != '' ? $organization->get_pretty( 'zip' ) : '';
-			}else{
+			} else{
 				$default_address = 'unknown';
 				$organization_name = 'unknown';
 			}

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Check extends EE_PMT_Base{
+class EE_PMT_Check extends EE_PMT_Base {
 
 
 	/**
@@ -34,7 +34,7 @@ 
 	 */
 	public function __construct($pm_instance = NULL) {
 		$this->_pretty_name = __("Check", 'event_espresso');
-		$this->_default_description = __( 'After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso' );
+		$this->_default_description = __('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
 		parent::__construct($pm_instance);
 		$this->_default_button_url = $this->file_url().'lib'.DS.'check-logo.png';
 	}
@@ -46,7 +46,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -57,41 +57,41 @@ 
 	 * @return EE_Form_Section_Proper
 	 */
 	public function generate_new_settings_form() {
-			if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance){
+			if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 				$organization = EE_Registry::instance()->CFG->organization;
-				$organization_name = $organization->get_pretty( 'name' );
-				$default_address = $organization->address_1 != '' ? $organization->get_pretty( 'address_1' ) . '<br />' : '';
-				$default_address .= $organization->address_2 != '' ? $organization->get_pretty( 'address_2' ) . '<br />' : '';
-				$default_address .= $organization->city != '' ? $organization->get_pretty( 'city' ) : '';
-				$default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $organization->STA_ID );
-				$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $organization->CNT_ISO ) ;
-				$default_address .=  $state ? $state->name() . '<br />' : '';
-				$default_address .= $country ? $country->name(). '<br />' : '';
-				$default_address .= $organization->zip != '' ? $organization->get_pretty( 'zip' ) : '';
-			}else{
+				$organization_name = $organization->get_pretty('name');
+				$default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1').'<br />' : '';
+				$default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2').'<br />' : '';
+				$default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
+				$default_address .= ($organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+				$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO);
+				$default_address .= $state ? $state->name().'<br />' : '';
+				$default_address .= $country ? $country->name().'<br />' : '';
+				$default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
+			} else {
 				$default_address = 'unknown';
 				$organization_name = 'unknown';
 			}
 			return new EE_Payment_Method_Form(array(
 			'extra_meta_inputs'=>array(
 				'check_title'=> new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>  __("Check/Money Order Payments", 'event_espresso'),
 				)),
 				'payment_instructions'=>new EE_Text_Area_Input(array(
-					'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=> __("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 				)),
 				'payable_to'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>$organization_name
 				)),
 				'address_to_send_payment'=>new EE_Text_Area_Input(array(
-					'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>$default_address,
-					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 				)),
 			),
 			'exclude'=>array('PMD_debug_mode')
@@ -105,7 +105,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('Check Settings', 'event_espresso'),
@@ -122,7 +122,7 @@ 
 	 * Other gateways may want to override this, such as offline gateways.
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
+	public function payment_overview_content(EE_Payment $payment) {
 		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
 		$template_vars = array_merge(
 						array(
@@ -135,7 +135,7 @@ 
 							),
 						$extra_meta_for_payment_method);
 		return EEH_Template::locate_template(
-				'payment_methods' . DS . 'Check'. DS . 'templates'.DS.'check_payment_details_content.template.php',
+				'payment_methods'.DS.'Check'.DS.'templates'.DS.'check_payment_details_content.template.php',
 				$template_vars
 				);
 	}

payment_methods/Check/templates/check_payment_details_content.template.php

Indentation +21 added lines, -21 removed lines

@@ -3,27 +3,27 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.3
- *
- * ------------------------------------------------------------------------
- *
- * check_payment_details_content
- *
- * @package			Event Espresso
- * @subpackage		
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.3
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * check_payment_details_content
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 ?>
 		<div class="event-display-boxes">
 			<h4 id="check_title" class="payment_type_title section-heading"><?php echo $check_title ?></h4>

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -1 removed lines

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

payment_methods/Invoice/templates/invoice_payment_details_content.template.php

Indentation +21 added lines, -21 removed lines

@@ -3,27 +3,27 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.3
- *
- * ------------------------------------------------------------------------
- *
- * invoice_payment_details_content
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.3
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * invoice_payment_details_content
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 ?>
 <div class="event-display-boxes">
 	<?php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -27,10 +27,10 @@ 
 ?>
 <div class="event-display-boxes">
 	<?php
-	if ( ! empty( $page_title )) {
-		echo '<h4 id="invoice_title" class="payment_type_title section-heading">' . stripslashes_deep( $page_title ) . '</h4>';
+	if ( ! empty($page_title)) {
+		echo '<h4 id="invoice_title" class="payment_type_title section-heading">'.stripslashes_deep($page_title).'</h4>';
 	}
-	if ( ! empty( $invoice_url )) {
+	if ( ! empty($invoice_url)) {
 		?>
 		<p>
 			<a href="<?php echo $invoice_url; ?>" class="ee-button-lnk inline-button ee-invoice-lnk" target="_blank">
@@ -40,10 +40,10 @@ 
 		<?php
 
 		if (isset($page_confirmation_text)) {
-			echo '<div class="event-messages ui-state-highlight"><span class="ui-icon ui-icon-alert"></span><p class="instruct">' . stripslashes_deep($page_confirmation_text) . '</p></div>';
+			echo '<div class="event-messages ui-state-highlight"><span class="ui-icon ui-icon-alert"></span><p class="instruct">'.stripslashes_deep($page_confirmation_text).'</p></div>';
 		}
 
-		if ( ! empty( $page_extra_info )) {
+		if ( ! empty($page_extra_info)) {
 			?>
 			<div class="address-block">
 				<?php echo wpautop(stripslashes_deep($page_extra_info)); ?>

Braces +2 added lines, -1 removed lines

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