eventespresso / event-espresso-core

public/Espresso_Arabica_2014/loop-espresso_event_attendees.php

Spacing +7 added lines, -7 removed lines

@@ -15,27 +15,27 @@
  * @type bool       $show_gravatar  whether to show gravatar or not.
  */
 
-$no_attendees_message =  apply_filters( 'FHEE__loop-espresso_attendees-shortcode__template__no_attendees_message', __('No Attendees Yet', 'event_espresso' ) );
+$no_attendees_message = apply_filters('FHEE__loop-espresso_attendees-shortcode__template__no_attendees_message', __('No Attendees Yet', 'event_espresso'));
 
 
 ?>
 
 <div class="event-attendees">
-	<?php do_action( 'AHEE__loop-espresso_event_attendees__before', $contacts, $event, $datetime, $ticket, $show_gravatar ); ?>
-	<?php if ( $contacts ) : ?>
+	<?php do_action('AHEE__loop-espresso_event_attendees__before', $contacts, $event, $datetime, $ticket, $show_gravatar); ?>
+	<?php if ($contacts) : ?>
 		<ul class="event-attendees-list">
-			<?php foreach( $contacts as $contact ) :
-				EEH_Template::get_template_part( 'content', 'espresso_event_attendees', array( 
+			<?php foreach ($contacts as $contact) :
+				EEH_Template::get_template_part('content', 'espresso_event_attendees', array( 
 					'contact'       => $contact, 
 					'event'         => $event,
 					'datetime'      => $datetime,
 					'ticket'        => $ticket,
 					'show_gravatar' => $show_gravatar 
-				) );
+				));
 				endforeach; ?>
 		</ul>
 	<?php else : ?>
 		<p><?php echo $no_attendees_message; ?></p>
 	<?php endif; ?>
-	<?php do_action( 'AHEE__loop-espresso_event_attendees__after', $contacts, $event, $datetime, $ticket, $show_gravatar ); ?>
+	<?php do_action('AHEE__loop-espresso_event_attendees__after', $contacts, $event, $datetime, $ticket, $show_gravatar); ?>
 </div>
\ No newline at end of file

core/libraries/shortcodes/EE_Organization_Shortcodes.lib.php

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');
 
 /**
@@ -58,96 +58,96 @@ 
 			'[CO_GOOGLE_URL]' => esc_html__('Link to organization Google page', 'event_espresso'),
 			'[CO_LINKEDIN_URL]' => esc_html__('Link to organization LinkedIn page', 'event_espresso'),
 			'[CO_INSTAGRAM_URL]' => esc_html__('Link to organization Instagram page', 'event_espresso'),
-			'[CO_TAX_NUMBER_*]' => sprintf( esc_html__('This is the shortcode used for displaying any tax number for the company.  %1$sNote: This is a special dynamic shortcode.%2$s You can use the "prefix" parameter to indicate what the prefix for this tax number is.  It defaults to "VAT/Tax Number:".  To change this prefix you do the following format for this shortcode:  [CO_TAX_NUMBER_* prefix="GST: "] and that will output: GST: 12345t56.  Also take note that if you have NO number in your settings, the prefix is not output either.', 'event_espresso' ),'<strong>','</strong>')
+			'[CO_TAX_NUMBER_*]' => sprintf(esc_html__('This is the shortcode used for displaying any tax number for the company.  %1$sNote: This is a special dynamic shortcode.%2$s You can use the "prefix" parameter to indicate what the prefix for this tax number is.  It defaults to "VAT/Tax Number:".  To change this prefix you do the following format for this shortcode:  [CO_TAX_NUMBER_* prefix="GST: "] and that will output: GST: 12345t56.  Also take note that if you have NO number in your settings, the prefix is not output either.', 'event_espresso'), '<strong>', '</strong>')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[COMPANY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('name');
 				break;
 
 			case '[CO_ADD1]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
 				break;
 
 			case '[CO_ADD2]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
 				break;
 
 			case '[CO_CITY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'city' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('city');
 				break;
 
 			case '[CO_STATE]' :
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( EE_Registry::instance()->CFG->organization->STA_ID );
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID(EE_Registry::instance()->CFG->organization->STA_ID);
 				return $state->name();
 				break;
 
 			case '[CO_ZIP]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'zip' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('zip');
 				break;
 
 			case '[CO_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			case '[CO_PHONE]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'phone' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('phone');
 				break;
 
 			case '[CO_LOGO]' :
-				return '<img src="' . EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) . '" id="headerImage" />';
+				return '<img src="'.EE_Registry::instance()->CFG->organization->get_pretty('logo_url').'" id="headerImage" />';
 				break;
 
 			case '[CO_LOGO_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 				break;
 
 			case '[CO_FACEBOOK_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 				break;
 
 			case '[CO_TWITTER_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 				break;
 
 			case '[CO_PINTEREST_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 				break;
 
 			case '[CO_LINKEDIN_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 				break;
 
 			case '[CO_GOOGLE_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('google');
 				break;
 
 			case '[CO_INSTAGRAM_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 				break;
 
 		}
 
 		//also allow for parameter shortcode
-		if ( strpos( $shortcode, '[CO_TAX_NUMBER_*' ) !== FALSE ) {
+		if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== FALSE) {
 			//first see if there is any company tax number set and bail early if not
 			$tax_number = EE_Registry::instance()->CFG->organization->vat;
-			if ( empty( $tax_number ) ) {
+			if (empty($tax_number)) {
 				return '';
 			}
 
 			//see if there are any attributes.
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
+			$attrs = $this->_get_shortcode_attrs($shortcode);
 
 			//set custom attrs if present (or default)
-			$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
-			return $prefix . $tax_number;
+			$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
+			return $prefix.$tax_number;
 		}
 
 		return '';

core/libraries/shortcodes/EE_Email_Shortcodes.lib.php

Spacing +29 added lines, -29 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,19 +43,19 @@ 
 		$this->description = esc_html__('All shortcodes related to emails', 'event_espresso');
 		$this->_shortcodes = array(
 			'[SITE_ADMIN_EMAIL]' => esc_html__('Will be replaced with the admin email for the site that Event Espresso is installed on', 'event_espresso'),
-			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => sprintf( esc_html__('This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.', 'event_espresso'),'<strong>','</strong>' ),
-			'[EVENT_AUTHOR_EMAIL]' => sprintf( esc_html__('This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).', 'event_espresso'), '[EVENT_AUTHOR_FORMATTED_EMAIL]' ),
-			'[CO_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso' ),
+			'[EVENT_AUTHOR_FORMATTED_EMAIL]' => sprintf(esc_html__('This will be replaced with a properly formatted list of Event Creator emails for the events in a registration. %1$sNOTE:%2$s If the event author has not filled out their WordPress user profile then the organization name will be used as the "From" name.', 'event_espresso'), '<strong>', '</strong>'),
+			'[EVENT_AUTHOR_EMAIL]' => sprintf(esc_html__('This is the same as %1$s shortcode except it is just a list of emails (not fancy headers).', 'event_espresso'), '[EVENT_AUTHOR_FORMATTED_EMAIL]'),
+			'[CO_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso'),
 			'[CO_EMAIL]' => esc_html__('This will parse to the email address only for the organization set in Your Organization Settings.', 'event_espresso'),
-			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso' ),
+			'[ESPRESSO_ADMIN_FORMATTED_EMAIL]' => esc_html__('This parses to the formatted email address of the organization name set in Your Organization Settings. "My Organization &lt;myorg@email.com&gt;"', 'event_espresso'),
 			'[ESPRESSO_ADMIN_EMAIL]' => esc_html__('This parses to the email address only for the organization set in Your Organization Settings page.', 'event_espresso')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[SITE_ADMIN_EMAIL]' :
 				return $this->_get_site_admin_email();
@@ -66,17 +66,17 @@ 
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
-				return $this->_get_event_admin_emails( FALSE );
+				return $this->_get_event_admin_emails(FALSE);
 				break;
 
 			case '[CO_FORMATTED_EMAIL]' :
 			case '[ESPRESSO_ADMIN_FORMATTED_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) . '>';
+				return EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.EE_Registry::instance()->CFG->organization->get_pretty('email').'>';
 				break;
 
 			case '[CO_EMAIL]' :
 			case '[ESPRESSO_ADMIN_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			default :
@@ -98,12 +98,12 @@ 
 	}
 
 
-	private function _get_event_admin_emails( $fancy_headers = TRUE ) {
+	private function _get_event_admin_emails($fancy_headers = TRUE) {
 
-		if ( !empty( $this->_data->admin_email ) ) {
-			if ( ! $fancy_headers )
+		if ( ! empty($this->_data->admin_email)) {
+			if ( ! $fancy_headers)
 				return $this->_data->admin_email;
-			return !empty( $this->_data->fname ) ? $this->_data->fname . ' ' . $this->_data->lname . ' <' . $this->_data->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $this->_data->admin_email . '>';
+			return ! empty($this->_data->fname) ? $this->_data->fname.' '.$this->_data->lname.' <'.$this->_data->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$this->_data->admin_email.'>';
 		}
 
 		//k this shortcode has been used else where.  Since we don't know what particular event this is for, let's loop through the events and get an array of event admins for the events.  We'll return the formatted list of admin emails and let the messenger make sure we only pick one if this is for a field that can only have ONE!.
@@ -111,18 +111,18 @@ 
 		$admin_email = array();
 
 		//loop through events and set the list of event_ids to retrieve so we can do ONE query.
-		foreach ( $this->_data->events as $event ) {
+		foreach ($this->_data->events as $event) {
 			$ids[] = $event['ID'];
 		}
 
 		//get all the events
-		$events = EE_Registry::instance()->load_model('Event')->get_all( array(array('EVT_ID' => array('IN', $ids ) ) ) );
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array(array('EVT_ID' => array('IN', $ids))));
 
 		//now loop through each event and setup the details
 		$admin_details = array();
 		$cnt = 0;
-		foreach ( $events as $event ) {
-			$user = get_userdata($event->get('EVT_wp_user') );
+		foreach ($events as $event) {
+			$user = get_userdata($event->get('EVT_wp_user'));
 			$admin_details[$cnt] = new stdClass();
 			$admin_details[$cnt]->email = $user->user_email;
 			$admin_details[$cnt]->first_name = $user->user_firstname;
@@ -131,28 +131,28 @@ 
 		}
 
 		//results?
-		if ( empty($admin_details) || !is_array($admin_details) ) {
+		if (empty($admin_details) || ! is_array($admin_details)) {
 			$msg[] = esc_html__('The admin details could not be retrieved from the database.', 'event_espresso');
-			$msg[] = sprintf( esc_html__('Query: %s', 'event_espresso'), $sql );
-			$msg[] = sprintf( esc_html__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, TRUE) );
-			$msg[] = sprintf( esc_html__('Event IDS: %s', 'event_espresso'), var_export($ids, TRUE) );
-			$msg[] = sprintf( esc_html__('Query Results: %s', 'event_espresso'), var_export($admin_details) );
-			do_action( 'AHEE_log', __FILE__, __FUNCTION__, implode( PHP_EOL, $msg ), 'shortcode_parser' );
+			$msg[] = sprintf(esc_html__('Query: %s', 'event_espresso'), $sql);
+			$msg[] = sprintf(esc_html__('Events Data: %s', 'event_espresso'), var_export($this->_data->events, TRUE));
+			$msg[] = sprintf(esc_html__('Event IDS: %s', 'event_espresso'), var_export($ids, TRUE));
+			$msg[] = sprintf(esc_html__('Query Results: %s', 'event_espresso'), var_export($admin_details));
+			do_action('AHEE_log', __FILE__, __FUNCTION__, implode(PHP_EOL, $msg), 'shortcode_parser');
 		}
 
-		foreach ( $admin_details as $admin ) {
+		foreach ($admin_details as $admin) {
 			//only add an admin email if it is present.
-			if ( empty( $admin->email ) || $admin->email == '' ) continue;
+			if (empty($admin->email) || $admin->email == '') continue;
 
-			if ( ! $fancy_headers ) {
+			if ( ! $fancy_headers) {
 				$admin_email[] = $admin->email;
 				continue;
 			}
 
-			$admin_email[] = !empty( $admin->first_name ) ? $admin->first_name . ' ' . $admin->last_name . ' <' . $admin->email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . ' <' . $admin->email . '>';
+			$admin_email[] = ! empty($admin->first_name) ? $admin->first_name.' '.$admin->last_name.' <'.$admin->email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').' <'.$admin->email.'>';
 		}
 
-		$admin_email = implode( ',', $admin_email );
+		$admin_email = implode(',', $admin_email);
 		return $admin_email;
 	}
 

core/libraries/shortcodes/EE_Transaction_Shortcodes.lib.php

Spacing +140 added lines, -140 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -42,25 +42,25 @@ 
 		$this->_shortcodes = array(
 			'[TXN_ID]' => esc_html__('The transaction id for the purchase.', 'event_espresso'),
 			'[PAYMENT_URL]' => esc_html__('This is a link to make a payment for the event', 'event_espresso'),
-			'[PAYMENT_LINK_IF_NEEDED_*]' => esc_html__('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:', 'event_espresso') . '<ul>'
-				. '<li>' . sprintf( esc_html__('%sclass:%s This can be used to indicate css class is given to the containing css element (default is "callout").', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
+			'[PAYMENT_LINK_IF_NEEDED_*]' => esc_html__('This is a special dynamic shortcode that allows one to insert a payment link conditional on there being amount owing on the transaction. Three params are available on this shortcode:', 'event_espresso').'<ul>'
+				. '<li>'.sprintf(esc_html__('%sclass:%s This can be used to indicate css class is given to the containing css element (default is "callout").', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%scustom_text:%s This should be a sprintf format text string (with %%s for where the hyperlink tags go) that is used for the generated link text (The default is "You can %%smake a payment here »%%s.)', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%scontainer_tag:%s Use this to indicate what container tag you want surrounding the payment link (default is "p").', 'event_espresso'), '<strong>', '</strong>').'</li>'
 				. '</ul>',
-			'[PAYMENT_DUE_DATE_*]' => esc_html__( 'This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:', 'event_espresso' )
+			'[PAYMENT_DUE_DATE_*]' => esc_html__('This is a special dynamic shortcode that allows one to output a payment due date.  It will only result in a date shown if there is money owing.  Three parameters are available on this shortcode:', 'event_espresso')
 				. '<ul>'
-				. '<li>' . sprintf( esc_html__( '%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__( '%sdays_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>'
-				. '<li>' . sprintf( esc_html__( '%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"', 'event_espresso' ), '<strong>', '</strong>' ) . '</li>',
+				. '<li>'.sprintf(esc_html__('%sformat:%s This is used to indicate what format the date is in.  Default is whatever is set as date formats for your website.', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%sdays_until_due:%s This is the number of days form the transaction creation date that the payment is due.  Defaults to 30.', 'event_espresso'), '<strong>', '</strong>').'</li>'
+				. '<li>'.sprintf(esc_html__('%sprefix_text:%s You can use this to indicate what text will prefix the date string.  Defaults to "Payment in full due by:"', 'event_espresso'), '<strong>', '</strong>').'</li>',
 			'[INVOICE_LINK]' => esc_html__('This is a full html link to the invoice', 'event_espresso'),
 			'[INVOICE_URL]' => esc_html__('This is just the url for the invoice', 'event_espresso'),
 			'[INVOICE_LOGO_URL]' => esc_html__('This returns the url for the logo uploaded via the invoice settings page.', 'event_espresso'),
 			'[INVOICE_LOGO]' => esc_html__('This returns the logo uploaded via the invoice settings page wrapped in img_tags and with a "logo screen" classes. The image size is also set in the img tags automatically to match the uploaded logo.', 'event_espresso'),
 			'[INVOICE_PAYEE_NAME]' => esc_html__('This will parse to either: the value of the "Company Name" field in the invoice payment method settings; if that is blank, then the value of the Company Name in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
-			'[INVOICE_PAYEE_ADDRESS]' => esc_html__('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYMENT_INSTRUCTIONS]' => esc_html__('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page', 'event_espresso' ),
-			'[INVOICE_PAYEE_EMAIL]' => esc_html__('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso' ),
-			'[INVOICE_PAYEE_TAX_NUMBER_*]' => sprintf( esc_html__('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: %1$s[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]%2$s and that will ouptut: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.', 'event_espresso' ), '<code>', '</code>' ),
+			'[INVOICE_PAYEE_ADDRESS]' => esc_html__('This will parse to either: the value of the "Company Address" field in the invoice payment method settings; if that is blank, then the value of the Company Address in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYMENT_INSTRUCTIONS]' => esc_html__('This will parse to the value of the "Payment Instructions" field found on the Invoice payment methods settings page', 'event_espresso'),
+			'[INVOICE_PAYEE_EMAIL]' => esc_html__('This will parse to either: the value of the "Company Email" field in the invoice payment method settings; if that is blank, then the value of the Company Email in the "Your Organization Settings", if that is blank then an empty string.', 'event_espresso'),
+			'[INVOICE_PAYEE_TAX_NUMBER_*]' => sprintf(esc_html__('This will parse to either: the value of the "Company Tax Number" field in the invoice payment method settings; if that is blank, then the value of the Company Tax Number in the "Your Organization Settings", if that is blank then an empty string. Note this is also a special dynamic shortcode. You can use the "prefix" parameter to indicate what text you want to use as a prefix before this tax number.  It defaults to "VAT/Tax Number:". To change this prefix you do the following format for this shortcode: %1$s[INVOICE_PAYEE_TAX_NUMBER_* prefix="GST:"]%2$s and that will ouptut: GST: 12345t56.  If you have no tax number in your settings, then no prefix will be output either.', 'event_espresso'), '<code>', '</code>'),
 			'[TOTAL_COST]' => esc_html__('The total cost for the transaction', 'event_espresso'),
 			'[TXN_STATUS]' => esc_html__('The transaction status for the transaction.', 'event_espresso'),
 			'[TXN_STATUS_ID]' => esc_html__('The ID representing the transaction status as saved in the db.  This tends to be useful for including with css classes for styling certain statuses differently from others.', 'event_espresso'),
@@ -71,52 +71,52 @@ 
 			'[TOTAL_OWING]' => esc_html__('The total owing on a transaction with no attributes.', 'event_espresso'),
 			'[TXN_SUBTOTAL]' => esc_html__('The subtotal for all txn line items.', 'event_espresso'),
 			'[TXN_TAX_SUBTOTAL]' => esc_html__('The subtotal for all tax line items.', 'event_espresso'),
-			'[OWING_STATUS_MESSAGE_*]' => esc_html__('A dynamic shortcode for adjusting how total oweing gets shown. The acceptable attributes on the shortcode are:', 'event_espresso') . '<p></ul>' .
-				'<li><strong>still_owing</strong>:' . esc_html__('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount oweing). The default is:', 'event_espresso' ) . sprintf( esc_html__( '%sPlease make a payment.%s', 'event_espresso'),  '<a href="[PAYMENT_URL]" class="noPrint">', '</a>' ) . '</li>' .
-				'<li><strong>none_owing</strong>:' . esc_html__('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total oweing.', 'event_espresso') . '</li></ul></p>',
+			'[OWING_STATUS_MESSAGE_*]' => esc_html__('A dynamic shortcode for adjusting how total oweing gets shown. The acceptable attributes on the shortcode are:', 'event_espresso').'<p></ul>'.
+				'<li><strong>still_owing</strong>:'.esc_html__('If the transaction is not paid in full, then whatever is set for this attribute is shown (otherwise its just the amount oweing). The default is:', 'event_espresso').sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'), '<a href="[PAYMENT_URL]" class="noPrint">', '</a>').'</li>'.
+				'<li><strong>none_owing</strong>:'.esc_html__('If the transaction is paid in full, then you can indicate how this gets displayed.  Note, that it defaults to just be the total oweing.', 'event_espresso').'</li></ul></p>',
 			'[TXN_TOTAL_TICKETS]' => esc_html__('The total number of all tickets purchased in a transaction', 'event_espresso'),
-			'[TKT_QTY_PURCHASED]' => sprintf( esc_html__('The total number of all tickets purchased in a transaction. %1$sNOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.%2$s', 'event_espresso'), '<strong>', '</strong>' ),
+			'[TKT_QTY_PURCHASED]' => sprintf(esc_html__('The total number of all tickets purchased in a transaction. %1$sNOTE: This shortcode is good to use in the "[TICKET_LIST]" field but has been deprecated from all other contexts in favor of the more explicit [TXN_TOTAL_TICKETS] shortcode.%2$s', 'event_espresso'), '<strong>', '</strong>'),
 			'[TRANSACTION_ADMIN_URL]' => esc_html__('The url to the admin page for this transaction', 'event_espresso'),
 			'[RECEIPT_URL]' => esc_html__('This parses to the generated url for retrieving the receipt for the transaction', 'event_espresso'),
-			'[INVOICE_RECEIPT_SWITCHER_URL]' => esc_html__( 'This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.', 'event_espresso'),
-			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf( esc_html__( 'The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.', 'event_espresso' ), '<code>', '</code>' )
+			'[INVOICE_RECEIPT_SWITCHER_URL]' => esc_html__('This parses to the url that will switch to the receipt if an invoice is displayed, and switch to the invoice if receipt is displayed. If a message type OTHER than invoice or receipt is displayed then this will just return the url for the invoice. If the related message type is not active  then will parse to an empty string.', 'event_espresso'),
+			'[INVOICE_RECEIPT_SWITCHER_BUTTON]' => sprintf(esc_html__('The same as %1$s[INVOICE_RECEIPT_SWITCHER_URL]%2$s except this returns the html for a button linked to the invoice or receipt.', 'event_espresso'), '<code>', '</code>')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		//attempt to get the transaction.  Since this is potentially used in more fields, we may have to look in the _extra_data for the transaction.
 		$transaction = $this->_data->txn instanceof EE_Transaction ? $this->_data->txn : null;
-		$transaction = ! $transaction instanceof EE_Transaction && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn: $transaction;
+		$transaction = ! $transaction instanceof EE_Transaction && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->txn : $transaction;
 
 		//payment
 		$payment = $this->_data->payment instanceof EE_Payment ? $this->_data->payment : null;
-		$payment = ! $payment instanceof EE_Payment && is_array( $this->_extra_data ) &&  isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment: $payment;
+		$payment = ! $payment instanceof EE_Payment && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->payment : $payment;
 
 
-		if ( ! $transaction instanceof EE_Transaction )
+		if ( ! $transaction instanceof EE_Transaction)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TXN_ID]' :
 				return $transaction->ID();
 				break;
 
 			case '[PAYMENT_URL]' :
 				$payment_url = $transaction->payment_overview_url();
-				return empty( $payment_url ) ? esc_html__( 'http://dummypaymenturlforpreview.com', 'event_espresso') : $payment_url;
+				return empty($payment_url) ? esc_html__('http://dummypaymenturlforpreview.com', 'event_espresso') : $payment_url;
 				break;
 
 			case '[INVOICE_LINK]' :
 				$invoice_url = $transaction->invoice_url();
-				$invoice_url = empty( $invoice_url ) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
-				return sprintf( esc_html__('%sClick here for Invoice%s', 'event_espresso'), '<a href="' . $invoice_url . '">', '</a>' );
+				$invoice_url = empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return sprintf(esc_html__('%sClick here for Invoice%s', 'event_espresso'), '<a href="'.$invoice_url.'">', '</a>');
 				break; /**/
 
 			case '[INVOICE_URL]' :
 				$invoice_url = $transaction->invoice_url();
-				return empty( $invoice_url ) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
+				return empty($invoice_url) ? 'http://dummyinvoicelinksforpreview.com' : $invoice_url;
 				break;
 
 			case '[INVOICE_LOGO_URL]' :
@@ -124,7 +124,7 @@ 
 				break;
 
 			case '[INVOICE_LOGO]' :
-				return $this->_get_invoice_logo( TRUE );
+				return $this->_get_invoice_logo(TRUE);
 				break;
 
 			case '[INVOICE_PAYEE_NAME]' :
@@ -146,18 +146,18 @@ 
 
 			case "[TOTAL_COST]" :
 				$total = $transaction->total();
-				return ! empty($total) ? EEH_Template::format_currency( $total ) : '';
+				return ! empty($total) ? EEH_Template::format_currency($total) : '';
 				break;
 
 			case "[PAYMENT_STATUS]" :
 				$status = $transaction->pretty_status();
-				return !empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
+				return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
 				break; /**/
 
 			// note the [payment_status] shortcode is kind of misleading because payment status might be different from txn status so I'm adding this here for clarity.
 			case "[TXN_STATUS]" :
 				$status = $transaction->pretty_status();
-				return !empty( $status ) ? $status : esc_html__('Unknown', 'event_espresso');
+				return ! empty($status) ? $status : esc_html__('Unknown', 'event_espresso');
 				break;
 
 			case "[TXN_STATUS_ID]" :
@@ -165,21 +165,21 @@ 
 				break;
 
 			case "[PAYMENT_GATEWAY]" :
-				return $this->_get_payment_gateway( $transaction );
+				return $this->_get_payment_gateway($transaction);
 				break;
 
 			case "[AMOUNT_PAID]" :
 				$amount = $payment instanceof EE_Payment ? $payment->amount() : 0;
-				return EEH_Template::format_currency( $amount );
+				return EEH_Template::format_currency($amount);
 				break;
 
 			case "[TOTAL_AMOUNT_PAID]" :
-				return EEH_Template::format_currency( $transaction->paid() );
+				return EEH_Template::format_currency($transaction->paid());
 				break;
 
 			case "[TOTAL_OWING]" :
 				$total_owing = $transaction->remaining();
-				return EEH_Template::format_currency( $total_owing );
+				return EEH_Template::format_currency($total_owing);
 				break;
 
 			case "[TXN_SUBTOTAL]" :
@@ -187,7 +187,7 @@ 
 				break;
 
 			case "[TXN_TAX_SUBTOTAL]" :
-				return EEH_Template::format_currency($this->_get_subtotal( TRUE ));
+				return EEH_Template::format_currency($this->_get_subtotal(TRUE));
 				break;
 
 			case "[TKT_QTY_PURCHASED]" :
@@ -196,9 +196,9 @@ 
 				break;
 
 			case "[TRANSACTION_ADMIN_URL]" :
-				require_once EE_CORE . 'admin/EE_Admin_Page.core.php';
-				$query_args = array( 'page' => 'espresso_transactions', 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID() );
-				$url = EE_Admin_Page::add_query_args_and_nonce( $query_args, admin_url('admin.php') );
+				require_once EE_CORE.'admin/EE_Admin_Page.core.php';
+				$query_args = array('page' => 'espresso_transactions', 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID());
+				$url = EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php'));
 				return $url;
 				break;
 
@@ -206,14 +206,14 @@ 
 				//get primary_registration
 				$reg = $this->_data->primary_reg_obj;
 
-				if ( ! $reg instanceof EE_Registration ) {
+				if ( ! $reg instanceof EE_Registration) {
 					return '';
 				}
 				return $reg->receipt_url();
 				break;
 
 			case "[INVOICE_RECEIPT_SWITCHER_URL]" :
-				return $this->_get_invoice_receipt_switcher( FALSE );
+				return $this->_get_invoice_receipt_switcher(FALSE);
 				break;
 
 			case "[INVOICE_RECEIPT_SWITCHER_BUTTON]" :
@@ -223,20 +223,20 @@ 
 
 		}
 
-		if ( strpos( $shortcode, '[OWING_STATUS_MESSAGE_*' ) !== FALSE ) {
-			return $this->_get_custom_total_oweing( $shortcode );
+		if (strpos($shortcode, '[OWING_STATUS_MESSAGE_*') !== FALSE) {
+			return $this->_get_custom_total_oweing($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*' ) !== FALSE ) {
-			return $this->_get_invoice_payee_tax_number( $shortcode );
+		if (strpos($shortcode, '[INVOICE_PAYEE_TAX_NUMBER_*') !== FALSE) {
+			return $this->_get_invoice_payee_tax_number($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[PAYMENT_LINK_IF_NEEDED_*' ) !== FALSE ) {
-			return $this->_get_payment_link_if_needed( $shortcode );
+		if (strpos($shortcode, '[PAYMENT_LINK_IF_NEEDED_*') !== FALSE) {
+			return $this->_get_payment_link_if_needed($shortcode);
 		}
 
-		if ( strpos( $shortcode, '[PAYMENT_DUE_DATE_*' ) !== false ) {
-			return $this->_get_payment_due_date( $shortcode, $transaction );
+		if (strpos($shortcode, '[PAYMENT_DUE_DATE_*') !== false) {
+			return $this->_get_payment_due_date($shortcode, $transaction);
 		}
 
 		return '';
@@ -253,19 +253,19 @@ 
 	 *
 	 * @return string parsed.
 	 */
-	private function _get_custom_total_oweing( $shortcode ) {
-		$valid_shortcodes = array( 'transaction' );
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+	private function _get_custom_total_oweing($shortcode) {
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//ensure default is set.
 		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction ? $addressee->txn->remaining() : 0;
 
-		if ( $total_owing > 0 ) {
-			$owing_content = ! empty( $attrs['still_owing'] ) ? $attrs['still_owing'] : sprintf( esc_html__( '%sPlease make a payment.%s', 'event_espresso'),  '<a href="[PAYMENT_URL]" class="noPrint">', '</a>' );
-			$owing_content = $this->_shortcode_helper->parse_message_template( $owing_content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+		if ($total_owing > 0) {
+			$owing_content = ! empty($attrs['still_owing']) ? $attrs['still_owing'] : sprintf(esc_html__('%sPlease make a payment.%s', 'event_espresso'), '<a href="[PAYMENT_URL]" class="noPrint">', '</a>');
+			$owing_content = $this->_shortcode_helper->parse_message_template($owing_content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
 		} else {
-			$owing_content = !empty( $attrs['none_owing']) ? $attrs['none_owing'] : '';
+			$owing_content = ! empty($attrs['none_owing']) ? $attrs['none_owing'] : '';
 		}
 
 		return $owing_content;
@@ -273,8 +273,8 @@ 
 
 
 
-	private function _get_payment_gateway( $transaction ) {
-		$pm = $this->_get_payment_method( $transaction );
+	private function _get_payment_gateway($transaction) {
+		$pm = $this->_get_payment_method($transaction);
 		return $pm instanceof EE_Payment_Method ? $pm->name() : '';
 	}
 
@@ -289,37 +289,37 @@ 
 	 *
 	 * @return string url or html
 	 */
-	private function _get_invoice_logo( $img_tags = FALSE ) {
+	private function _get_invoice_logo($img_tags = FALSE) {
 		//try to get the invoice payment method's logo for this transaction image first
 		$pm = $this->_get_payment_method();
-		if ( $pm instanceof EE_Payment_Method ){
-			$invoice_logo_url = $pm->get_extra_meta( 'pdf_logo_image', TRUE );
-		}else{
+		if ($pm instanceof EE_Payment_Method) {
+			$invoice_logo_url = $pm->get_extra_meta('pdf_logo_image', TRUE);
+		} else {
 			$invoice_logo_url = NULL;
 		}
-		if( empty( $invoice_logo_url ) ){
+		if (empty($invoice_logo_url)) {
 			$invoice_logo_url = EE_Registry::instance()->CFG->organization->logo_url;
 		}
 
-		if ( empty( $invoice_logo_url ) ) {
+		if (empty($invoice_logo_url)) {
 			return '';
 		}
 
-		if ( ! $img_tags ) {
+		if ( ! $img_tags) {
 			return $invoice_logo_url;
 		}
 
 		//image tags have been requested.
-		$image_size = getimagesize( $invoice_logo_url );
+		$image_size = getimagesize($invoice_logo_url);
 		
 		//if image is wider than 200px, set the wideth to 200
-		if ( $image_size[0] > 300 ) {
+		if ($image_size[0] > 300) {
 			$image_width = 300;
-		}else{
+		} else {
 			$image_width = $image_size[0];
 		}
 
-		return '<img class="logo screen" src="' . $invoice_logo_url . '" width="' . $image_width . '" alt="logo" />';
+		return '<img class="logo screen" src="'.$invoice_logo_url.'" width="'.$image_width.'" alt="logo" />';
 	}
 
 
@@ -336,26 +336,26 @@ 
 	private function _get_invoice_payee_name() {
 		$payee_name = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_name = $pm->get_extra_meta( 'pdf_payee_name', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_name = $pm->get_extra_meta('pdf_payee_name', TRUE);
 		}
-		$payee_name = empty( $payee_name ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) : $payee_name;
+		$payee_name = empty($payee_name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : $payee_name;
 		return $payee_name;
 	}
 
 	/**
 	 * gets the payment method for this transaction. Otherwise gets a default one.
 	 */
-	private function _get_payment_method( $transaction = null ){
-		if( $transaction instanceof EE_Transaction ) {
+	private function _get_payment_method($transaction = null) {
+		if ($transaction instanceof EE_Transaction) {
 			$payment_method = $transaction->payment_method();
-			if ( empty( $payment_method ) ) {
-				return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
+			if (empty($payment_method)) {
+				return apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 			}
 			return $payment_method;
-		}else{
+		} else {
 			//get the first payment method we can find
-			return apply_filters( 'FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
+			return apply_filters('FHEE__EE_Transaction_Shortcodes__get_payment_method__default', EEM_Payment_Method::instance()->get_one_of_type('Invoice'));
 		}
 	}
 
@@ -372,10 +372,10 @@ 
 	private function _get_invoice_payee_email() {
 		$payee_email = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_email = $pm->get_extra_meta( 'pdf_payee_email', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_email = $pm->get_extra_meta('pdf_payee_email', TRUE);
 		}
-		$payee_email = empty( $payee_email ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) : $payee_email;
+		$payee_email = empty($payee_email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : $payee_email;
 		return $payee_email;
 	}
 
@@ -391,24 +391,24 @@ 
 	 *
 	 * @return string
 	 */
-	private function _get_invoice_payee_tax_number( $shortcode ) {
+	private function _get_invoice_payee_tax_number($shortcode) {
 		$payee_tax_number = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_tax_number = $pm->get_extra_meta( 'pdf_payee_tax_number', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_tax_number = $pm->get_extra_meta('pdf_payee_tax_number', TRUE);
 		}
-		$payee_tax_number = empty( $payee_tax_number ) ? EE_Registry::instance()->CFG->organization->vat : $payee_tax_number;
+		$payee_tax_number = empty($payee_tax_number) ? EE_Registry::instance()->CFG->organization->vat : $payee_tax_number;
 
-		if ( empty( $payee_tax_number ) ) {
+		if (empty($payee_tax_number)) {
 			return '';
 		}
 
 		//any attributes?
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//prefix?
-		$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : esc_html__( 'VAT/Tax Number: ', 'event_espresso' );
-		return $prefix . $payee_tax_number;
+		$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
+		return $prefix.$payee_tax_number;
 	}
 
 
@@ -425,22 +425,22 @@ 
 	private function _get_invoice_payee_address() {
 		$payee_address = NULL;
 		$pm = $this->_get_payment_method();
-		if( $pm instanceof EE_Payment_Method ){
-			$payee_address = $pm->get_extra_meta( 'pdf_payee_address', TRUE );
+		if ($pm instanceof EE_Payment_Method) {
+			$payee_address = $pm->get_extra_meta('pdf_payee_address', TRUE);
 		}
-		if ( empty( $payee_address ) ) {
+		if (empty($payee_address)) {
 			$organization = EE_Registry::instance()->CFG->organization;
-			$payee_address = $organization->get_pretty( 'address_1' ) . '<br>';
-			$payee_address .= !empty( $organization->address_2 ) ? $organization->get_pretty( 'address_2' ) . '<br>' : '';
-			$payee_address .= $organization->get_pretty( 'city' ) . '<br>';
+			$payee_address = $organization->get_pretty('address_1').'<br>';
+			$payee_address .= ! empty($organization->address_2) ? $organization->get_pretty('address_2').'<br>' : '';
+			$payee_address .= $organization->get_pretty('city').'<br>';
 
 			//state
-			$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $organization->STA_ID );
-			$payee_address .= $state instanceof EE_State ? $state->name()  : '';
+			$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+			$payee_address .= $state instanceof EE_State ? $state->name() : '';
 
 			//Country
-			$payee_address .= ! empty( $organization->CNT_ISO ) ? ', ' . $organization->CNT_ISO . '<br>' : '';
-			$payee_address .= ! empty( $organization->zip ) ? $organization->zip : '';
+			$payee_address .= ! empty($organization->CNT_ISO) ? ', '.$organization->CNT_ISO.'<br>' : '';
+			$payee_address .= ! empty($organization->zip) ? $organization->zip : '';
 		}
 		return $payee_address;
 	}
@@ -458,7 +458,7 @@ 
 	private function _get_invoice_payment_instructions() {
 		$instructions = NULL;
 		$pm = $this->_get_payment_method();
-		return ( $pm instanceof EE_Payment_Method ) ? $pm->get_extra_meta( 'pdf_instructions', TRUE) : '';
+		return ($pm instanceof EE_Payment_Method) ? $pm->get_extra_meta('pdf_instructions', TRUE) : '';
 	}
 
 
@@ -472,27 +472,27 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_invoice_receipt_switcher( $button = TRUE ) {
+	protected function _get_invoice_receipt_switcher($button = TRUE) {
 		$reg = $this->_data->primary_reg_obj;
-		$message_type = isset( $this->_extra_data['message_type'] ) ? $this->_extra_data['message_type'] : '';
-		if ( ! $reg instanceof EE_Registration || empty( $message_type ) ) {
+		$message_type = isset($this->_extra_data['message_type']) ? $this->_extra_data['message_type'] : '';
+		if ( ! $reg instanceof EE_Registration || empty($message_type)) {
 			return '';
 		}
 
-		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type  ? true : false;
-		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type ? esc_html__('View Invoice', 'event_espresso' ) : esc_html__( 'Switch to Invoice', 'event_espresso' );
-		$switch_to_label = ! $switch_to_invoice ? esc_html__( 'Switch to Receipt', 'event_espresso' ) : $switch_to_label;
+		$switch_to_invoice = ! $message_type instanceof EE_Invoice_message_type ? true : false;
+		$switch_to_label = $switch_to_invoice && ! $message_type instanceof EE_Receipt_message_type ? esc_html__('View Invoice', 'event_espresso') : esc_html__('Switch to Invoice', 'event_espresso');
+		$switch_to_label = ! $switch_to_invoice ? esc_html__('Switch to Receipt', 'event_espresso') : $switch_to_label;
 		$switch_to_url = $switch_to_invoice ? $reg->invoice_url() : $reg->receipt_url();
 
-		if ( ! $button ) {
+		if ( ! $button) {
 			return $switch_to_url;
 		}
 
-		if ( ! empty( $switch_to_url ) ) {
+		if ( ! empty($switch_to_url)) {
 
 			return  '
-	<form method="post" action="' . $switch_to_url . '" >
-		<input class="print_button" type="submit" value="' . $switch_to_label . '" />
+	<form method="post" action="' . $switch_to_url.'" >
+		<input class="print_button" type="submit" value="' . $switch_to_label.'" />
 	</form>
 			';
 		}
@@ -512,11 +512,11 @@ 
 	 *
 	 * @return string
 	 */
-	private function _get_receipt_url( EE_Transaction $transaction ) {
+	private function _get_receipt_url(EE_Transaction $transaction) {
 		//get primary_registration
 		$reg = $this->_data->primary_reg_obj;
 
-		if ( ! $reg instanceof EE_Registration ) {
+		if ( ! $reg instanceof EE_Registration) {
 			return '';
 		}
 
@@ -532,10 +532,10 @@ 
 	 *
 	 * @return int
 	 */
-	private function _get_subtotal( $tax = FALSE ) {
-		$grand_total = isset( $this->_data->grand_total_line_item ) ? $this->_data->grand_total_line_item : NULL;
+	private function _get_subtotal($tax = FALSE) {
+		$grand_total = isset($this->_data->grand_total_line_item) ? $this->_data->grand_total_line_item : NULL;
 
-		if ( ! $grand_total instanceof EE_Line_Item ) {
+		if ( ! $grand_total instanceof EE_Line_Item) {
 			return 0;
 		}
 
@@ -554,26 +554,26 @@ 
 	 *
 	 * @return string parsed.
 	 */
-	private function _get_payment_link_if_needed( $shortcode ) {
-		$valid_shortcodes = array( 'transaction' );
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
+	private function _get_payment_link_if_needed($shortcode) {
+		$valid_shortcodes = array('transaction');
+		$attrs = $this->_get_shortcode_attrs($shortcode);
 
 		//ensure default is set.
 		$addressee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$total_owing = $addressee instanceof EE_Messages_Addressee && $addressee->txn instanceof EE_Transaction ? $addressee->txn->remaining() : 0;
 
-		if ( $total_owing > 0 ) {
-			$class = isset( $attrs['class'] ) ? $attrs['class'] : 'callout';
-			$custom_text = isset( $attrs['custom_text'] ) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
-			$container_tag = isset( $attrs['container_tag'] ) ? $attrs['container_tag'] : 'p';
-			$opening_tag = ! empty( $container_tag ) ? '<' . $container_tag : '';
-			$opening_tag .= ! empty( $opening_tag ) && !empty( $class ) ? ' class="' . $class . '"' : $opening_tag;
-			$opening_tag .= !empty( $opening_tag ) ? '>' : $opening_tag;
-			$closing_tag = ! empty( $container_tag ) ? '</' . $container_tag .'>' : '';
-			$content = $opening_tag . sprintf( $custom_text, '<a href="[PAYMENT_URL]">', '</a>' ) . $closing_tag;
+		if ($total_owing > 0) {
+			$class = isset($attrs['class']) ? $attrs['class'] : 'callout';
+			$custom_text = isset($attrs['custom_text']) ? $attrs['custom_text'] : 'You can %smake a payment here »%s.';
+			$container_tag = isset($attrs['container_tag']) ? $attrs['container_tag'] : 'p';
+			$opening_tag = ! empty($container_tag) ? '<'.$container_tag : '';
+			$opening_tag .= ! empty($opening_tag) && ! empty($class) ? ' class="'.$class.'"' : $opening_tag;
+			$opening_tag .= ! empty($opening_tag) ? '>' : $opening_tag;
+			$closing_tag = ! empty($container_tag) ? '</'.$container_tag.'>' : '';
+			$content = $opening_tag.sprintf($custom_text, '<a href="[PAYMENT_URL]">', '</a>').$closing_tag;
 
 			//we need to re run this string through the parser to catch any shortcodes that are in it.
-			$owing_content = $this->_shortcode_helper->parse_message_template( $content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+			$owing_content = $this->_shortcode_helper->parse_message_template($content, $addressee, $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
 		} else {
 			return '';
 		}
@@ -593,31 +593,31 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return string
 	 */
-	protected function _get_payment_due_date( $shortcode, EE_Transaction $transaction ) {
+	protected function _get_payment_due_date($shortcode, EE_Transaction $transaction) {
 		//if transaction is paid in full then we can just return an empty string
-		if ( $transaction->remaining() === 0 ) {
+		if ($transaction->remaining() === 0) {
 			return '';
 		}
 
-		$attrs = $this->_get_shortcode_attrs( $shortcode );
-		$format = isset( $attrs['format'] ) ? $attrs['format'] : get_option( 'date_format' );
-		$days_until_due = isset( $attrs['days_until_due'] ) ? (int) $attrs['days_until_due'] : 30;
-		$prefix_text = isset( $attrs['prefix_text'] ) ? $attrs['prefix_text'] : esc_html__( 'Payment in full due by: ', 'event_espresso' );
-		$transaction_created = $transaction->get_DateTime_object( 'TXN_timestamp' );
+		$attrs = $this->_get_shortcode_attrs($shortcode);
+		$format = isset($attrs['format']) ? $attrs['format'] : get_option('date_format');
+		$days_until_due = isset($attrs['days_until_due']) ? (int) $attrs['days_until_due'] : 30;
+		$prefix_text = isset($attrs['prefix_text']) ? $attrs['prefix_text'] : esc_html__('Payment in full due by: ', 'event_espresso');
+		$transaction_created = $transaction->get_DateTime_object('TXN_timestamp');
 
 		//setup date due:
 		try {
-			if ( $transaction_created instanceof DateTime ) {
-				$date_due = $transaction_created->add( new DateInterval( 'P' . $days_until_due . 'D' ) )->format( $format );
+			if ($transaction_created instanceof DateTime) {
+				$date_due = $transaction_created->add(new DateInterval('P'.$days_until_due.'D'))->format($format);
 			} else {
 				throw new Exception();
 			}
-		} catch( Exception $e ) {
+		} catch (Exception $e) {
 			//format was likely invalid.
 			$date_due = 'Unable to calculate date due, likely the format string is invalid.';
 		}
 
-		return $prefix_text . $date_due;
+		return $prefix_text.$date_due;
 	}
 
 } //end EE_Transaction Shortcodes library

caffeinated/admin/new/pricing/espresso_events_Pricing_Hooks.class.php

Indentation +6 added lines, -6 removed lines

@@ -959,12 +959,12 @@
 			'dtt_sold' => $default ? '0' : $dtt->get('DTT_sold'),
 			'clone_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
 			'trash_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0  ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable',
-		    'reg_list_url' => $default || ! $dtt->event() instanceof \EE_Event
-                ? ''
-                : EE_Admin_Page::add_query_args_and_nonce(
-                    array( 'event_id' => $dtt->event()->ID(), 'datetime_id' => $dtt->ID() ),
-                    REG_ADMIN_URL
-                )
+			'reg_list_url' => $default || ! $dtt->event() instanceof \EE_Event
+				? ''
+				: EE_Admin_Page::add_query_args_and_nonce(
+					array( 'event_id' => $dtt->event()->ID(), 'datetime_id' => $dtt->ID() ),
+					REG_ADMIN_URL
+				)
 		);
 
 		$template_args['show_trash'] = count( $all_dtts ) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';

Spacing +382 added lines, -382 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -54,7 +54,7 @@ 
 		$this->_name = 'pricing';
 
 		//capability check
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_default_prices', 'advanced_ticket_datetime_metabox' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_default_prices', 'advanced_ticket_datetime_metabox')) {
 			return;
 		}
 
@@ -62,14 +62,14 @@ 
 		//if we were going to add our own metaboxes we'd use the below.
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'pricing_metabox',
 				'label' => __('Event Tickets & Datetimes', 'event_espresso'),
 				'priority' => 'high',
 				'context' => 'normal'
 				),
 
-			);/**/
+			); /**/
 
 		$this->_remove_metaboxes = array(
 			0 => array(
@@ -88,24 +88,24 @@ 
 		 *
 		 * @var array  Expected an array returned with 'date' and 'time' keys.
 		 */
-		$this->_date_format_strings = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
+		$this->_date_format_strings = apply_filters('FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
 			));
 
 		//validate
-		$this->_date_format_strings['date'] = isset( $this->_date_format_strings['date'] ) ? $this->_date_format_strings['date'] : null;
-		$this->_date_format_strings['time'] = isset( $this->_date_format_strings['time'] ) ? $this->_date_format_strings['time'] : null;
+		$this->_date_format_strings['date'] = isset($this->_date_format_strings['date']) ? $this->_date_format_strings['date'] : null;
+		$this->_date_format_strings['time'] = isset($this->_date_format_strings['time']) ? $this->_date_format_strings['time'] : null;
 
 		//validate format strings
-		$format_validation = EEH_DTT_Helper::validate_format_string( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
-		if ( is_array( $format_validation ) ) {
-			$msg = '<p>' . sprintf( __( 'The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso' ), $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ) . '</p><ul>';
-			foreach ( $format_validation as $error ) {
-				$msg .= '<li>' . $error . '</li>';
+		$format_validation = EEH_DTT_Helper::validate_format_string($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
+		if (is_array($format_validation)) {
+			$msg = '<p>'.sprintf(__('The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso'), $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']).'</p><ul>';
+			foreach ($format_validation as $error) {
+				$msg .= '<li>'.$error.'</li>';
 			}
-			$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
-			EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
+			EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_date_format_strings = array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
@@ -116,60 +116,60 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'ee-tickets-datetimes-css' => array(
-					'url' => PRICING_ASSETS_URL . 'event-tickets-datetimes.css',
+					'url' => PRICING_ASSETS_URL.'event-tickets-datetimes.css',
 					'type' => 'css'
 					),
 				'ee-dtt-ticket-metabox' => array(
-					'url' => PRICING_ASSETS_URL . 'ee-datetime-ticket-metabox.js',
+					'url' => PRICING_ASSETS_URL.'ee-datetime-ticket-metabox.js',
 					'depends' => array('ee-datepicker', 'ee-dialog', 'underscore')
 					)
 				),
 			'deregisters' => array(
-				'event-editor-css' => array('type' => 'css' ),
+				'event-editor-css' => array('type' => 'css'),
 				'event-datetime-metabox' => array('type' => 'js')
 				),
 			'enqueues' => array(
-				'ee-tickets-datetimes-css' => array( 'edit', 'create_new' ),
-				'ee-dtt-ticket-metabox' => array( 'edit', 'create_new' )
+				'ee-tickets-datetimes-css' => array('edit', 'create_new'),
+				'ee-dtt-ticket-metabox' => array('edit', 'create_new')
 				),
 			'localize' => array(
 				'ee-dtt-ticket-metabox' => array(
 					'DTT_TRASH_BLOCK' => array(
 						'main_warning' => __('The Datetime you are attempting to trash is the only datetime selected for the following ticket(s):', 'event_espresso'),
 						'after_warning' => __('In order to trash this datetime you must first make sure the above ticket(s) are assigned to other datetimes.', 'event_espresso'),
-						'cancel_button' => '<button class="button-secondary ee-modal-cancel">' . __('Cancel', 'event_espresso') . '</button>',
+						'cancel_button' => '<button class="button-secondary ee-modal-cancel">'.__('Cancel', 'event_espresso').'</button>',
 						'single_warning_from_tkt' => __('The Datetime you are attempting to unassign from this ticket is the only remaining datetime for this ticket. Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
 						'single_warning_from_dtt' => __('The ticket you are attempting to unassign from this datetime cannot be unassigned because the datetime is the only remaining datetime for the ticket.  Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
-						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button>'
+						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button>'
 						),
 					'DTT_ERROR_MSG' => array(
 						'no_ticket_name' => __('General Admission', 'event_espresso'),
-						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button></div>'
+						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button></div>'
 						),
 					'DTT_OVERSELL_WARNING' => array(
 						'datetime_ticket' => __('You cannot add this ticket to this datetime because it has a sold amount that is greater than the amount of spots remaining for this datetime.', 'event_espresso'),
 						'ticket_datetime' => __('You cannot add this datetime to this ticket because the ticket has a sold amount that is greater than the amount of spots remaining on the datetime.', 'event_espresso')
 						),
-					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats( $this->_date_format_strings['date'], $this->_date_format_strings['time'] ),
-					'DTT_START_OF_WEEK' => array( 'dayValue' => (int) get_option( 'start_of_week' ) )
+					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats($this->_date_format_strings['date'], $this->_date_format_strings['time']),
+					'DTT_START_OF_WEEK' => array('dayValue' => (int) get_option('start_of_week'))
 					)
 				)
 			);
 
 
-		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array( $this, 'autosave_handling' ), 10 );
-		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'caf_updates' ), 10 );
+		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array($this, 'autosave_handling'), 10);
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'caf_updates'), 10);
 	}
 
 
 
-	public function caf_updates( $update_callbacks ) {
-		foreach ( $update_callbacks as $key => $callback ) {
-			if ( $callback[1] == '_default_tickets_update' )
-				unset( $update_callbacks[$key] );
+	public function caf_updates($update_callbacks) {
+		foreach ($update_callbacks as $key => $callback) {
+			if ($callback[1] == '_default_tickets_update')
+				unset($update_callbacks[$key]);
 		}
 
-		$update_callbacks[] = array( $this, 'dtt_and_tickets_caf_update' );
+		$update_callbacks[] = array($this, 'dtt_and_tickets_caf_update');
 		return $update_callbacks;
 	}
 
@@ -182,11 +182,11 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	public function dtt_and_tickets_caf_update( $evtobj, $data ) {
+	public function dtt_and_tickets_caf_update($evtobj, $data) {
 		//first we need to start with datetimes cause they are the "root" items attached to events.
-		$saved_dtts = $this->_update_dtts( $evtobj, $data );
+		$saved_dtts = $this->_update_dtts($evtobj, $data);
 		//next tackle the tickets (and prices?)
-		$this->_update_tkts( $evtobj, $saved_dtts, $data );
+		$this->_update_tkts($evtobj, $saved_dtts, $data);
 	}
 
 
@@ -197,41 +197,41 @@ 
 	 * @param  array    	$data    the request data from the form
 	 * @return EE_Datetime[]
 	 */
-	protected function _update_dtts( $evt_obj, $data ) {
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+	protected function _update_dtts($evt_obj, $data) {
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_dtt_ids = array();
 		$saved_dtt_objs = array();
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
 			$dtt = array_map(
-				function( $datetime_data ) {
-					return is_array( $datetime_data ) ? $datetime_data : trim( $datetime_data );
+				function($datetime_data) {
+					return is_array($datetime_data) ? $datetime_data : trim($datetime_data);
 				},
 				$dtt
 			);
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID' 			=> ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL,
-				'DTT_name' 			=> ! empty( $dtt['DTT_name'] ) ? $dtt['DTT_name'] : '',
-				'DTT_description' 	=> ! empty( $dtt['DTT_description'] ) ? $dtt['DTT_description'] : '',
+				'DTT_ID' 			=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
+				'DTT_name' 			=> ! empty($dtt['DTT_name']) ? $dtt['DTT_name'] : '',
+				'DTT_description' 	=> ! empty($dtt['DTT_description']) ? $dtt['DTT_description'] : '',
 				'DTT_EVT_start' 	=> $dtt['DTT_EVT_start'],
 				'DTT_EVT_end' 		=> $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' 	=> empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt[ 'DTT_reg_limit' ],
-				'DTT_order' 		=> ! isset( $dtt['DTT_order'] ) ? $row : $dtt['DTT_order'],
+				'DTT_reg_limit' 	=> empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_order' 		=> ! isset($dtt['DTT_order']) ? $row : $dtt['DTT_order'],
 			);
 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 
-			if ( !empty( $dtt['DTT_ID'] ) ) {
-				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) )->get_one_by_ID($dtt['DTT_ID'] );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone))->get_one_by_ID($dtt['DTT_ID']);
 
 				//set date and time format according to what is set in this class.
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
 
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 
 				// make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.
@@ -239,24 +239,24 @@ 
 				$saved_dtt_ids[$DTM->ID()] = $DTM->ID();
 
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values, $timezone ), FALSE, FALSE );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values, $timezone), FALSE, FALSE);
 
 				//reset date and times to match the format
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
-				foreach( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 
 
 			$DTM->save();
-			$DTM = $evt_obj->_add_relation_to( $DTM, 'Datetime' );
+			$DTM = $evt_obj->_add_relation_to($DTM, 'Datetime');
 			$evt_obj->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end') ) {
-				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start') );
+			if ($DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end')) {
+				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start'));
 				$DTM = EEH_DTT_Helper::date_time_add($DTM, 'DTT_EVT_end', 'days');
 				$DTM->save();
 			}
@@ -271,25 +271,25 @@ 
 		}
 
 		//now we need to REMOVE any dtts that got deleted.  Keep in mind that this process will only kick in for DTT's that don't have any DTT_sold on them. So its safe to permanently delete at this point.
-		$old_datetimes = explode(',', $data['datetime_IDs'] );
+		$old_datetimes = explode(',', $data['datetime_IDs']);
 		$old_datetimes = $old_datetimes[0] == '' ? array() : $old_datetimes;
 
-		if ( is_array( $old_datetimes ) ) {
-			$dtts_to_delete = array_diff( $old_datetimes, $saved_dtt_ids );
-			foreach ( $dtts_to_delete as $id ) {
-				$id = absint( $id );
-				if ( empty( $id ) )
+		if (is_array($old_datetimes)) {
+			$dtts_to_delete = array_diff($old_datetimes, $saved_dtt_ids);
+			foreach ($dtts_to_delete as $id) {
+				$id = absint($id);
+				if (empty($id))
 					continue;
 
 				$dtt_to_remove = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($id);
 
 				//remove tkt relationships.
 				$related_tickets = $dtt_to_remove->get_many_related('Ticket');
-				foreach ( $related_tickets as $tkt ) {
+				foreach ($related_tickets as $tkt) {
 					$dtt_to_remove->_remove_relation_to($tkt, 'Ticket');
 				}
 
-				$evt_obj->_remove_relation_to( $id, 'Datetime' );
+				$evt_obj->_remove_relation_to($id, 'Datetime');
 				$dtt_to_remove->refresh_cache_of_related_objects();
 
 			}
@@ -310,85 +310,85 @@ 
 	 * @param  array            $data       incoming request data
 	 * @return EE_Ticket[]
 	 */
-	protected function _update_tkts( $evtobj, $saved_dtts, $data ) {
+	protected function _update_tkts($evtobj, $saved_dtts, $data) {
 
 		$new_tkt = null;
 		$new_default = null;
 		//stripslashes because WP filtered the $_POST ($data) array to add slashes
 		$data = stripslashes_deep($data);
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_tickets = $dtts_on_existing = array();
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
 
 		//load money helper
 
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
+		foreach ($data['edit_tickets'] as $row => $tkt) {
 
 			$update_prices = $create_new_TKT = FALSE;
 
 			//figure out what dtts were added to the ticket and what dtts were removed from the ticket in the session.
 
-			$starting_tkt_dtt_rows = explode(',',$data['starting_ticket_datetime_rows'][$row]);
-			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row] );
+			$starting_tkt_dtt_rows = explode(',', $data['starting_ticket_datetime_rows'][$row]);
+			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row]);
 			$dtts_added = array_diff($tkt_dtt_rows, $starting_tkt_dtt_rows);
 			$dtts_removed = array_diff($starting_tkt_dtt_rows, $tkt_dtt_rows);
 
 			// trim inputs to ensure any excess whitespace is removed.
 			$tkt = array_map(
-				function( $ticket_data ) {
-					return is_array( $ticket_data ) ? $ticket_data : trim( $ticket_data );
+				function($ticket_data) {
+					return is_array($ticket_data) ? $ticket_data : trim($ticket_data);
 				},
 				$tkt
 			);
 
 			//note we are doing conversions to floats here instead of allowing EE_Money_Field to handle because we're doing calcs prior to using the models.
 			//note incoming ['TKT_price'] value is already in standard notation (via js).
-			$ticket_price = isset( $tkt['TKT_price'] ) ?  round ( (float) $tkt['TKT_price'], 3 ) : 0;
+			$ticket_price = isset($tkt['TKT_price']) ? round((float) $tkt['TKT_price'], 3) : 0;
 
 			//note incoming base price needs converted from localized value.
-			$base_price = isset( $tkt['TKT_base_price'] ) ? EEH_Money::convert_to_float_from_localized_money( $tkt['TKT_base_price'] ) : 0;
+			$base_price = isset($tkt['TKT_base_price']) ? EEH_Money::convert_to_float_from_localized_money($tkt['TKT_base_price']) : 0;
 			//if ticket price == 0 and $base_price != 0 then ticket price == base_price
 			$ticket_price = $ticket_price === 0 && $base_price !== 0 ? $base_price : $ticket_price;
-			$base_price_id = isset( $tkt['TKT_base_price_ID'] ) ? $tkt['TKT_base_price_ID'] : 0;
+			$base_price_id = isset($tkt['TKT_base_price_ID']) ? $tkt['TKT_base_price_ID'] : 0;
 
 			$price_rows = is_array($data['edit_prices']) && isset($data['edit_prices'][$row]) ? $data['edit_prices'][$row] : array();
 
 			$now = null;
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//lets' use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				/**
 				 * set the TKT_end_date to the first datetime attached to the ticket.
 				 */
-				$first_dtt = $saved_dtts[reset( $tkt_dtt_rows )];
-				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time( $this->_date_format_strings['date'] . ' ' . $this->_date_format_string['time'] );
+				$first_dtt = $saved_dtts[reset($tkt_dtt_rows)];
+				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time($this->_date_format_strings['date'].' '.$this->_date_format_string['time']);
 			}
 
 			$TKT_values = array(
-				'TKT_ID' 			=> ! empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL,
-				'TTM_ID' 			=> ! empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name' 			=> ! empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' 	=> ! empty( $tkt['TKT_description'] ) && $tkt['TKT_description'] != __('You can modify this description', 'event_espresso') ? $tkt['TKT_description'] : '',
+				'TKT_ID' 			=> ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL,
+				'TTM_ID' 			=> ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name' 			=> ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' 	=> ! empty($tkt['TKT_description']) && $tkt['TKT_description'] != __('You can modify this description', 'event_espresso') ? $tkt['TKT_description'] : '',
 				'TKT_start_date' 	=> $tkt['TKT_start_date'],
 				'TKT_end_date' 		=> $tkt['TKT_end_date'],
-				'TKT_qty' 			=> ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt[ 'TKT_qty' ],
-				'TKT_uses' 			=> ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt['TKT_uses'],
-				'TKT_min' 			=> empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max' 			=> empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty' 			=> ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses' 			=> ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min' 			=> empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max' 			=> empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row' 			=> $row,
-				'TKT_order' 		=> isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : 0,
-				'TKT_taxable' 		=> ! empty( $tkt['TKT_taxable'] ) ? 1 : 0,
-				'TKT_required' 		=> ! empty( $tkt['TKT_required'] ) ? 1 : 0,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : 0,
+				'TKT_taxable' 		=> ! empty($tkt['TKT_taxable']) ? 1 : 0,
+				'TKT_required' 		=> ! empty($tkt['TKT_required']) ? 1 : 0,
 				'TKT_price' 		=> $ticket_price
 			);
 
 
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$update_prices = TRUE;
@@ -400,21 +400,21 @@ 
 			// but DID have it's items modified.
 			// keep in mind that if the TKT has been sold (and we have changed pricing information),
 			// then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-			if ( absint( $TKT_values['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $timezone ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+			if (absint($TKT_values['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($timezone))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					// are there any registrations using this ticket ?
 					$tickets_sold = $TKT->count_related(
 						'Registration',
-						array( array(
-								'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) )
-						) )
+						array(array(
+								'STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))
+						))
 					);
 					//set ticket formats
-					$TKT->set_date_format( $this->_date_format_strings['date'] );
-					$TKT->set_time_format( $this->_date_format_strings['time'] );
+					$TKT->set_date_format($this->_date_format_strings['date']);
+					$TKT->set_time_format($this->_date_format_strings['time']);
 
 					// let's just check the total price for the existing ticket
 					// and determine if it matches the new total price.
@@ -424,17 +424,17 @@ 
 							? TRUE : FALSE;
 
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field === 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field === 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
-						$new_tkt = $this->_duplicate_ticket( $TKT, $price_rows, $ticket_price, $base_price, $base_price_id );
+					if ($create_new_TKT) {
+						$new_tkt = $this->_duplicate_ticket($TKT, $price_rows, $ticket_price, $base_price, $base_price_id);
 					}
 				}
 
@@ -443,12 +443,12 @@ 
 				$TKT = EE_Ticket::new_instance(
 					$TKT_values,
 					$timezone,
-					array( $this->_date_format_strings[ 'date' ], $this->_date_format_strings[ 'time' ]  )
+					array($this->_date_format_strings['date'], $this->_date_format_strings['time'])
 				);
-				if ( $TKT instanceof EE_Ticket ) {
+				if ($TKT instanceof EE_Ticket) {
 					// make sure ticket has an ID of setting relations won't work
 					$TKT->save();
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					$update_prices = TRUE;
 				}
 			}
@@ -456,37 +456,37 @@ 
 			//$TKT->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) {
-				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 			}
 
 			//let's make sure the base price is handled
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( array(), $TKT, $update_prices, $base_price, $base_price_id ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket(array(), $TKT, $update_prices, $base_price, $base_price_id) : $TKT;
 
 			//add/update price_modifiers
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( $price_rows, $TKT, $update_prices ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket($price_rows, $TKT, $update_prices) : $TKT;
 
 			//need to make sue that the TKT_price is accurate after saving the prices.
 			$TKT->ensure_TKT_Price_correct();
 
 			//handle CREATING a default tkt from the incoming tkt but ONLY if this isn't an autosave.
-			if ( ! defined('DOING_AUTOSAVE' ) ) {
-				if ( !empty($tkt['TKT_is_default_selector'] ) ) {
+			if ( ! defined('DOING_AUTOSAVE')) {
+				if ( ! empty($tkt['TKT_is_default_selector'])) {
 					$update_prices = TRUE;
 					$new_default = clone $TKT;
-					$new_default->set( 'TKT_ID', 0 );
-					$new_default->set( 'TKT_is_default', 1 );
-					$new_default->set( 'TKT_row', 1 );
-					$new_default->set( 'TKT_price', $ticket_price );
+					$new_default->set('TKT_ID', 0);
+					$new_default->set('TKT_is_default', 1);
+					$new_default->set('TKT_row', 1);
+					$new_default->set('TKT_price', $ticket_price);
 					//remove any dtt relations cause we DON'T want dtt relations attached (note this is just removing the cached relations in the object)
 					$new_default->_remove_relations('Datetime');
 					//todo we need to add the current attached prices as new prices to the new default ticket.
-					$new_default = $this->_add_prices_to_ticket( $price_rows, $new_default, $update_prices );
+					$new_default = $this->_add_prices_to_ticket($price_rows, $new_default, $update_prices);
 					//don't forget the base price!
-					$new_default = $this->_add_prices_to_ticket( array(), $new_default, $update_prices, $base_price, $base_price_id );
+					$new_default = $this->_add_prices_to_ticket(array(), $new_default, $update_prices, $base_price, $base_price_id);
 					$new_default->save();
-					do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data );
+					do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data);
 				}
 			}
 
@@ -497,19 +497,19 @@ 
 			//let's assign any tickets that have been setup to the saved_tickets tracker
 			//save existing TKT
 			$TKT->save();
-			if ( $create_new_TKT && $new_tkt instanceof EE_Ticket ) {
+			if ($create_new_TKT && $new_tkt instanceof EE_Ticket) {
 				//save new TKT
 				$new_tkt->save();
 				//add new ticket to array
-				$saved_tickets[ $new_tkt->ID() ] = $new_tkt;
+				$saved_tickets[$new_tkt->ID()] = $new_tkt;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data);
 
 			} else {
 				//add tkt to saved tkts
-				$saved_tickets[ $TKT->ID() ] = $TKT;
+				$saved_tickets[$TKT->ID()] = $TKT;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data);
 			}
 
 		}
@@ -519,22 +519,22 @@ 
 		// (i.e. autosaves are happening and then in between autosaves the user trashes a ticket).
 		// Or a draft event was saved and in the process of editing a ticket is trashed.
 		// No sense in keeping all the related data in the db!
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys($saved_tickets) );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
 
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 
 			//get the ticket for this id
 			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
 
 			//if this tkt is a default tkt we leave it alone cause it won't be attached to the datetime
-			if ( $tkt_to_remove->get('TKT_is_default') )
+			if ($tkt_to_remove->get('TKT_is_default'))
 				continue;
 
 			// if this tkt has any registrations attached so then we just ARCHIVE
 			// because we don't actually permanently delete these tickets.
-			if ( $tkt_to_remove->count_related('Registration') > 0 ) {
+			if ($tkt_to_remove->count_related('Registration') > 0) {
 				$tkt_to_remove->delete();
 				continue;
 			}
@@ -543,7 +543,7 @@ 
 			// (remember this process can ONLY kick off if there are NO tkts_sold)
 			$dtts = $tkt_to_remove->get_many_related('Datetime');
 
-			foreach( $dtts as $dtt ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -551,7 +551,7 @@ 
 			// tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
 			$tkt_to_remove->delete_related_permanently('Price');
 
-			do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove );
+			do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove);
 
 			// finally let's delete this ticket
 			// (which should not be blocked at this point b/c we've removed all our relationships)
@@ -583,39 +583,39 @@ 
 		// and removing the ticket from datetimes it got removed from.
 
 		// first let's add datetimes
-		if ( ! empty( $added_datetimes ) && is_array( $added_datetimes ) ) {
-			foreach ( $added_datetimes as $row_id ) {
+		if ( ! empty($added_datetimes) && is_array($added_datetimes)) {
+			foreach ($added_datetimes as $row_id) {
 				$row_id = (int) $row_id;
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_add_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_add_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to add that to the DTT sold because this DTT is getting added.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->increase_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->increase_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// then remove datetimes
-		if ( ! empty( $removed_datetimes ) && is_array( $removed_datetimes ) ) {
-			foreach ( $removed_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
+		if ( ! empty($removed_datetimes) && is_array($removed_datetimes)) {
+			foreach ($removed_datetimes as $row_id) {
+				$row_id = (int) $row_id;
 				// its entirely possible that a datetime got deleted (instead of just removed from relationship.
 				// So make sure we skip over this if the dtt isn't in the $saved_datetimes array)
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_remove_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_remove_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to remove it's sold from the DTT_sold.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->decrease_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->decrease_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// cap ticket qty by datetime reg limits
-		$ticket->set_qty( min( $ticket->qty(), $ticket->qty( 'reg_limit' ) ) );
+		$ticket->set_qty(min($ticket->qty(), $ticket->qty('reg_limit')));
 		return $ticket;
 	}
 
@@ -636,39 +636,39 @@ 
 		EE_Ticket $ticket,
 		$price_rows = array(),
 		$ticket_price = 0,
-		$base_price = 0 ,
+		$base_price = 0,
 		$base_price_id = 0
 	) {
 
 		// create new ticket that's a copy of the existing
 		// except a new id of course (and not archived)
 		// AND has the new TKT_price associated with it.
-		$new_ticket = clone( $ticket );
-		$new_ticket->set( 'TKT_ID', 0 );
-		$new_ticket->set( 'TKT_deleted', 0 );
-		$new_ticket->set( 'TKT_price', $ticket_price );
-		$new_ticket->set( 'TKT_sold', 0 );
+		$new_ticket = clone($ticket);
+		$new_ticket->set('TKT_ID', 0);
+		$new_ticket->set('TKT_deleted', 0);
+		$new_ticket->set('TKT_price', $ticket_price);
+		$new_ticket->set('TKT_sold', 0);
 		// let's get a new ID for this ticket
 		$new_ticket->save();
 		// we also need to make sure this new ticket gets the same datetime attachments as the archived ticket
-		$datetimes_on_existing = $ticket->get_many_related( 'Datetime' );
+		$datetimes_on_existing = $ticket->get_many_related('Datetime');
 		$new_ticket = $this->_update_ticket_datetimes(
 			$new_ticket,
 			$datetimes_on_existing,
-			array_keys( $datetimes_on_existing )
+			array_keys($datetimes_on_existing)
 		);
 
 		// $ticket will get archived later b/c we are NOT adding it to the saved_tickets array.
 		// if existing $ticket has sold amount, then we need to adjust the qty for the new TKT to = the remaining
 		// available.
-		if ( $ticket->sold() > 0 ) {
+		if ($ticket->sold() > 0) {
 			$new_qty = $ticket->qty() - $ticket->sold();
-			$new_ticket->set_qty( $new_qty );
+			$new_ticket->set_qty($new_qty);
 		}
 		//now we update the prices just for this ticket
-		$new_ticket = $this->_add_prices_to_ticket( $price_rows, $new_ticket, true );
+		$new_ticket = $this->_add_prices_to_ticket($price_rows, $new_ticket, true);
 		//and we update the base price
-		$new_ticket = $this->_add_prices_to_ticket( array(), $new_ticket, true, $base_price, $base_price_id );
+		$new_ticket = $this->_add_prices_to_ticket(array(), $new_ticket, true, $base_price, $base_price_id);
 		return $new_ticket;
 	}
 
@@ -688,7 +688,7 @@ 
 	 * @param int|bool 		$base_price_id  if present then this is the base_price_id being updated.
 	 * @return EE_Ticket
 	 */
-	protected function  _add_prices_to_ticket( $prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE ) {
+	protected function  _add_prices_to_ticket($prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE) {
 
 		//let's just get any current prices that may exist on the given ticket so we can remove any prices that got trashed in this session.
 		$current_prices_on_ticket = $base_price !== FALSE ? $ticket->base_price(TRUE) : $ticket->price_modifiers();
@@ -696,7 +696,7 @@ 
 		$updated_prices = array();
 
 		// if $base_price ! FALSE then updating a base price.
-		if ( $base_price !== FALSE ) {
+		if ($base_price !== FALSE) {
 			$prices[1] = array(
 				'PRC_ID' => $new_prices || $base_price_id === 1 ? NULL : $base_price_id,
 				'PRT_ID' => 1,
@@ -707,47 +707,47 @@ 
 		}
 
 		//possibly need to save tkt
-		if ( ! $ticket->ID() )
+		if ( ! $ticket->ID())
 			$ticket->save();
 
-		foreach ( $prices as $row => $prc ) {
-			$prt_id = !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL;
-			if ( empty($prt_id) )
+		foreach ($prices as $row => $prc) {
+			$prt_id = ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL;
+			if (empty($prt_id))
 				continue; //prices MUST have a price type id.
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
 				'PRT_ID' => $prt_id,
-				'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => false, //make sure we set PRC_is_default to false for all ticket saves from event_editor
 				'PRC_order' => $row
 				);
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE);
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 			}
 			$PRC->save();
 			$prcid = $PRC->ID();
 			$updated_prices[$prcid] = $PRC;
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 
 		//now let's remove any prices that got removed from the ticket
-		if ( !empty ( $current_prices_on_ticket ) ) {
+		if ( ! empty ($current_prices_on_ticket)) {
 			$current = array_keys($current_prices_on_ticket);
 			$updated = array_keys($updated_prices);
 			$prices_to_remove = array_diff($current, $updated);
-			if ( !empty( $prices_to_remove ) ) {
-				foreach ( $prices_to_remove as $prc_id ) {
+			if ( ! empty($prices_to_remove)) {
+				foreach ($prices_to_remove as $prc_id) {
 					$p = $current_prices_on_ticket[$prc_id];
-					$ticket->_remove_relation_to( $p, 'Price' );
+					$ticket->_remove_relation_to($p, 'Price');
 
 					//delete permanently the price
 					$p->delete_permanently();
@@ -760,7 +760,7 @@ 
 
 
 
-	public function autosave_handling( $event_admin_obj ) {
+	public function autosave_handling($event_admin_obj) {
 		return $event_admin_obj; //doing nothing for the moment.
 		//todo when I get to this remember that I need to set the template args on the $event_admin_obj (use the set_template_args() method)
 
@@ -794,12 +794,12 @@ 
 
 		//default main template args
 		$main_template_args = array(
-			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
+			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
 			'existing_datetime_ids' => '',
 			'total_dtt_rows' => 1,
-			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'datetime_rows' => '',
-			'show_tickets_container' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
+			'show_tickets_container' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
 			'ticket_rows' => '',
 			'existing_ticket_ids' => '',
 			'total_ticket_rows' => 1,
@@ -809,7 +809,7 @@ 
 
 		$timezone = $evtobj instanceof EE_Event ? $evtobj->timezone_string() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
@@ -817,8 +817,8 @@ 
 		 * 3. For each ticket get related prices
 		 */
 
-		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) );
-		$times = $DTM->get_all_event_dates( $evtID );
+		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone));
+		$times = $DTM->get_all_event_dates($evtID);
 
 
 
@@ -826,31 +826,31 @@ 
 
 		/** @see https://events.codebasehq.com/projects/event-espresso/tickets/9486 for why we are counting $dttrow and then setting that on the Datetime object */
 		$dttrow = 1;
-		foreach ( $times as $time ) {
+		foreach ($times as $time) {
 			$dttid = $time->get('DTT_ID');
-			$time->set( 'DTT_order', $dttrow );
+			$time->set('DTT_order', $dttrow);
 			$existing_datetime_ids[] = $dttid;
 
 			//tickets attached
-			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array( array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC' ) ) ) : array();
+			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array(array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC'))) : array();
 
 			//if there are no related tickets this is likely a new event OR autodraft
 			// event so we need to generate the default tickets because dtts
 			// ALWAYS have at least one related ticket!!.  EXCEPT, we dont' do this if there is already more than one
 			// datetime on the event.
-			if ( empty ( $related_tickets ) && count( $times ) < 2 ) {
+			if (empty ($related_tickets) && count($times) < 2) {
 				$related_tickets = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
 
 				//this should be ordered by TKT_ID, so let's grab the first default ticket (which will be the main default) and ensure it has any default prices added to it (but do NOT save).
 				$default_prices = EEM_Price::instance()->get_all_default_prices();
 
-				$main_default_ticket = reset( $related_tickets );
-				if ( $main_default_ticket instanceof EE_Ticket ) {
-					foreach ( $default_prices as $default_price ) {
-						if ( $default_price->is_base_price() ) {
+				$main_default_ticket = reset($related_tickets);
+				if ($main_default_ticket instanceof EE_Ticket) {
+					foreach ($default_prices as $default_price) {
+						if ($default_price->is_base_price()) {
 							continue;
 						}
-						$main_default_ticket->cache( 'Price', $default_price );
+						$main_default_ticket->cache('Price', $default_price);
 					}
 				}
 			}
@@ -859,11 +859,11 @@ 
 			//we can't actually setup rows in this loop yet cause we don't know all the unique tickets for this event yet (tickets are linked through all datetimes). So we're going to temporarily cache some of that information.
 
 			//loop through and setup the ticket rows and make sure the order is set.
-			foreach ( $related_tickets as $ticket ) {
+			foreach ($related_tickets as $ticket) {
 				$tktid = $ticket->get('TKT_ID');
 				$tktrow = $ticket->get('TKT_row');
 				//we only want unique tickets in our final display!!
-				if ( !in_array( $tktid, $existing_ticket_ids ) ) {
+				if ( ! in_array($tktid, $existing_ticket_ids)) {
 					$existing_ticket_ids[] = $tktid;
 					$all_tickets[] = $ticket;
 				}
@@ -872,57 +872,57 @@ 
 				$datetime_tickets[$dttid][] = $tktrow;
 
 				//temporary cache of this datetime info for this ticket for later processing of ticket rows.
-				if ( !isset( $ticket_datetimes[$tktid] ) || ! in_array( $dttrow, $ticket_datetimes[$tktid] ) )
+				if ( ! isset($ticket_datetimes[$tktid]) || ! in_array($dttrow, $ticket_datetimes[$tktid]))
 					$ticket_datetimes[$tktid][] = $dttrow;
 			}
 			$dttrow++;
 		}
 
-		$main_template_args['total_ticket_rows'] = count( $existing_ticket_ids );
-		$main_template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
-		$main_template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
+		$main_template_args['total_ticket_rows'] = count($existing_ticket_ids);
+		$main_template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
+		$main_template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 
 		//sort $all_tickets by order
-		usort( $all_tickets, function( $a, $b ) {
+		usort($all_tickets, function($a, $b) {
 			$a_order = (int) $a->get('TKT_order');
 			$b_order = (int) $b->get('TKT_order');
-			if ( $a_order == $b_order ) {
+			if ($a_order == $b_order) {
 				return 0;
 			}
-			return ( $a_order < $b_order ) ? -1 : 1;
+			return ($a_order < $b_order) ? -1 : 1;
 		});
 
 		//k NOW we have all the data we need for setting up the dtt rows and ticket rows so we start our dtt loop again.
 		$dttrow = 1;
-		foreach ( $times as $time ) {
-			$main_template_args['datetime_rows'] .= $this->_get_datetime_row( $dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times );
+		foreach ($times as $time) {
+			$main_template_args['datetime_rows'] .= $this->_get_datetime_row($dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times);
 			$dttrow++;
 		}
 
 		//then loop through all tickets for the ticket rows.
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$main_template_args['ticket_rows'] .= $this->_get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets );
+		foreach ($all_tickets as $ticket) {
+			$main_template_args['ticket_rows'] .= $this->_get_ticket_row($tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets);
 			$tktrow++;
 		}
 
 		$main_template_args['ticket_js_structure'] = $this->_get_ticket_js_structure($times, $all_tickets);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php';
-		EEH_Template::display_template( $template, $main_template_args );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_metabox_main.template.php';
+		EEH_Template::display_template($template, $main_template_args);
 		return;
 	}
 
 
 
-	protected function _get_datetime_row( $dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array() ) {
+	protected function _get_datetime_row($dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array()) {
 
 		$dtt_display_template_args = array(
-			'dtt_edit_row' => $this->_get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ),
-			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ),
+			'dtt_edit_row' => $this->_get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts),
+			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default),
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_row_wrapper.template.php';
-		return EEH_Template::display_template( $template, $dtt_display_template_args, TRUE);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_row_wrapper.template.php';
+		return EEH_Template::display_template($template, $dtt_display_template_args, TRUE);
 	}
 
 
@@ -940,7 +940,7 @@ 
 	 *
 	 * @return string Generated edit row.
 	 */
-	protected function _get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ) {
+	protected function _get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts) {
 
 		// if the incoming $dtt object is NOT an instance of EE_Datetime then force default to true.
 		$default = ! $dtt instanceof EE_Datetime ? true : false;
@@ -948,36 +948,36 @@ 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
 			'event_datetimes_name' => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
-			'edit_dtt_expanded' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
+			'edit_dtt_expanded' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
 			'DTT_ID' => $default ? '' : $dtt->ID(),
 			'DTT_name' => $default ? '' : $dtt->name(),
 			'DTT_description' => $default ? '' : $dtt->description(),
-			'DTT_EVT_start' => $default ? '' : $dtt->start_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_EVT_end' => $default ? '' : $dtt->end_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit','input'),
+			'DTT_EVT_start' => $default ? '' : $dtt->start_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_EVT_end' => $default ? '' : $dtt->end_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit', 'input'),
 			'DTT_order' => $default ? 'DTTNUM' : $dttrow,
 			'dtt_sold' => $default ? '0' : $dtt->get('DTT_sold'),
-			'clone_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
-			'trash_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0  ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable',
+			'clone_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
+			'trash_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable',
 		    'reg_list_url' => $default || ! $dtt->event() instanceof \EE_Event
                 ? ''
                 : EE_Admin_Page::add_query_args_and_nonce(
-                    array( 'event_id' => $dtt->event()->ID(), 'datetime_id' => $dtt->ID() ),
+                    array('event_id' => $dtt->event()->ID(), 'datetime_id' => $dtt->ID()),
                     REG_ADMIN_URL
                 )
 		);
 
-		$template_args['show_trash'] = count( $all_dtts ) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['show_trash'] = count($all_dtts) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//allow filtering of template args at this point.
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_edit_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_edit_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ) {
+	protected function _get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default) {
 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
@@ -985,47 +985,47 @@ 
 			'DTT_description' => $default ? '' : $dtt->description(),
 			'datetime_tickets_list' => $default ? '<li class="hidden"></li>' : '',
 			'show_tickets_row' => ' style="display:none;"', //$default || $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? ' style="display:none;"' : '',
-			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'DTT_ID' => $default ? '' : $dtt->ID()
 			);
 
 		//need to setup the list items (but only if this isnt' a default skeleton setup)
-		if ( !$default ) {
+		if ( ! $default) {
 			$tktrow = 1;
-			foreach ( $all_tickets as $ticket ) {
-				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default );
+			foreach ($all_tickets as $ticket) {
+				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default);
 				$tktrow++;
 			}
 		}
 
 		//filter template args at this point
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_attached_tickets_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_attached_tickets_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default ) {
-		$tktid = !empty( $ticket ) ? $ticket->ID() : 0;
-		$dtt_tkts = $dtt instanceof EE_Datetime && isset( $datetime_tickets[$dtt->ID()] ) ? $datetime_tickets[$dtt->ID()] : array();
+	protected function _get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default) {
+		$tktid = ! empty($ticket) ? $ticket->ID() : 0;
+		$dtt_tkts = $dtt instanceof EE_Datetime && isset($datetime_tickets[$dtt->ID()]) ? $datetime_tickets[$dtt->ID()] : array();
 
-		$displayrow = !empty( $ticket ) ? $ticket->get('TKT_row') : 0;
+		$displayrow = ! empty($ticket) ? $ticket->get('TKT_row') : 0;
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
-			'tkt_row' => $default && empty( $ticket ) ? 'TICKETNUM' : $tktrow,
+			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'datetime_ticket_checked' => in_array($displayrow, $dtt_tkts) ? ' checked="checked"' : '',
 			'ticket_selected' => in_array($displayrow, $dtt_tkts) ? ' ticket-selected' : '',
-			'TKT_name' => $default && empty( $ticket ) ? 'TKTNAME' : $ticket->get('TKT_name'),
-			'tkt_status_class' => ( $default && empty( $ticket ) ) || $this->_is_creating_event ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status(),
+			'TKT_name' => $default && empty($ticket) ? 'TKTNAME' : $ticket->get('TKT_name'),
+			'tkt_status_class' => ($default && empty($ticket)) || $this->_is_creating_event ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status(),
 			);
 
 		//filter template args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_dtt_tickets_list.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_dtt_tickets_list.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1047,37 +1047,37 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	protected function _get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array() ) {
+	protected function _get_ticket_row($tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array()) {
 
 		//if $ticket is not an instance of EE_Ticket then force default to true.
-		$default =  ! $ticket instanceof EE_Ticket ? true : false;
+		$default = ! $ticket instanceof EE_Ticket ? true : false;
 
-		$prices = ! empty( $ticket ) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC') ) ) : array();
+		$prices = ! empty($ticket) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC'))) : array();
 
 		//if there is only one price (which would be the base price) or NO prices and this ticket is a default ticket, let's just make sure there are no cached default prices on
 		//the object.  This is done by not including any query_params.
-		if ( $ticket instanceof EE_Ticket && $ticket->is_default() && ( count( $prices ) === 1  || empty( $prices ) ) ) {
-			$prices = $ticket->get_many_related( 'Price' );
+		if ($ticket instanceof EE_Ticket && $ticket->is_default() && (count($prices) === 1 || empty($prices))) {
+			$prices = $ticket->get_many_related('Price');
 		}
 
 		// check if we're dealing with a default ticket in which case we don't want any starting_ticket_datetime_row values set (otherwise there won't be any new relationships created for tickets based off of the default ticket).  This will future proof in case there is ever any behaviour change between what the primary_key defaults to.
-		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default') ) ? TRUE : FALSE;
+		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default')) ? TRUE : FALSE;
 
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 
 		$ticket_subtotal = $default ? 0 : $ticket->get_ticket_subtotal();
-		$base_price = $default ? NULL :  $ticket->base_price();
+		$base_price = $default ? NULL : $ticket->base_price();
 		$count_price_mods = EEM_Price::instance()->get_all_default_prices(TRUE);
 
 		//breaking out complicated condition for ticket_status
-		if ( $default ) {
-			$ticket_status_class = ' tkt-status-' . EE_Ticket::onsale;
+		if ($default) {
+			$ticket_status_class = ' tkt-status-'.EE_Ticket::onsale;
 		} else {
-			$ticket_status_class =  $ticket->is_default() ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status();
+			$ticket_status_class = $ticket->is_default() ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status();
 		}
 
 		//breaking out complicated condition for TKT_taxable
-		if ( $default ) {
+		if ($default) {
 			$TKT_taxable = '';
 		} else {
 			$TKT_taxable = $ticket->get('TKT_taxable') ? ' checked="checked"' : '';
@@ -1092,19 +1092,19 @@ 
 			'edit_tkt_expanded' => '',
 			'edit_tickets_name' => $default ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_name' => $default ? '' : $ticket->get('TKT_name'),
-			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time']  ),
-			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
+			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
 			'TKT_price' => $default ? '' : EEH_Template::format_currency($ticket->get_ticket_total_with_taxes(), FALSE, FALSE),
 			'TKT_price_code' => EE_Registry::instance()->CFG->currency->code,
 			'TKT_price_amount' => $default ? 0 : $ticket_subtotal,
-			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty','symbol'),
-			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty','input'),
-			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses','input'),
-			'TKT_min' => $default ? '' : ( $ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min') ),
-			'TKT_max' => $default ? '' :  $ticket->get_pretty('TKT_max','input'),
+			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty', 'symbol'),
+			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty', 'input'),
+			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses', 'input'),
+			'TKT_min' => $default ? '' : ($ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min')),
+			'TKT_max' => $default ? '' : $ticket->get_pretty('TKT_max', 'input'),
 			'TKT_sold' => $default ? 0 : $ticket->tickets_sold('ticket'),
-			'TKT_registrations' => $default ? 0 : $ticket->count_registrations( array( array( 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) ) ) ),
+			'TKT_registrations' => $default ? 0 : $ticket->count_registrations(array(array('STS_ID' => array('!=', EEM_Registration::status_id_incomplete)))),
 			'TKT_ID' => $default ? 0 : $ticket->get('TKT_ID'),
 			'TKT_description' => $default ? '' : $ticket->get('TKT_description'),
 			'TKT_is_default' => $default ? 0 : $ticket->get('TKT_is_default'),
@@ -1113,99 +1113,99 @@ 
 			'ticket_price_rows' => '',
 			'TKT_base_price' => $default || ! $base_price instanceof EE_Price ? '' : $base_price->get_pretty('PRC_amount', 'localized_float'),
 			'TKT_base_price_ID' => $default || ! $base_price instanceof EE_Price ? 0 : $base_price->ID(),
-			'show_price_modifier' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) ? '' : ' style="display:none;"',
-			'show_price_mod_button' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) || ( !$default && $ticket->get('TKT_deleted') ) ? ' style="display:none;"' : '',
+			'show_price_modifier' => count($prices) > 1 || ($default && $count_price_mods > 0) ? '' : ' style="display:none;"',
+			'show_price_mod_button' => count($prices) > 1 || ($default && $count_price_mods > 0) || ( ! $default && $ticket->get('TKT_deleted')) ? ' style="display:none;"' : '',
 			'total_price_rows' => count($prices) > 1 ? count($prices) : 1,
 			'ticket_datetimes_list' => $default ? '<li class="hidden"></li>' : '',
 			'starting_ticket_datetime_rows' => $default || $default_dtt ? '' : implode(',', $tkt_dtts),
 			'ticket_datetime_rows' => $default ? '' : implode(',', $tkt_dtts),
-			'existing_ticket_price_ids' => $default, '', implode(',', array_keys( $prices) ),
+			'existing_ticket_price_ids' => $default, '', implode(',', array_keys($prices)),
 			'ticket_template_id' => $default ? 0 : $ticket->get('TTM_ID'),
 			'TKT_taxable' => $TKT_taxable,
 			'display_subtotal' => $ticket instanceof EE_Ticket && $ticket->get('TKT_taxable') ? '' : ' style="display:none"',
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE ),
+			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE),
 			'TKT_subtotal_amount' => $ticket_subtotal,
-			'tax_rows' => $this->_get_tax_rows( $tktrow, $ticket ),
-			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE: FALSE,
+			'tax_rows' => $this->_get_tax_rows($tktrow, $ticket),
+			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE : FALSE,
 			'ticket_archive_class' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? ' ticket-archived' : '',
 			'trash_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? 'ee-lock-icon ' : 'trash-icon dashicons dashicons-post-trash clickable',
 			'clone_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? '' : 'clone-icon ee-icon ee-icon-clone clickable'
 			);
 
-		$template_args['trash_hidden'] = count( $all_tickets ) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['trash_hidden'] = count($all_tickets) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
-			$template_args['TKT_start_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , current_time('timestamp'));
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['TKT_start_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], current_time('timestamp'));
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL;
 
-			if ( !empty( $earliest_dtt ) ) {
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			} else {
 				//default so let's just use what's been set for the default date-time which is 30 days from now.
-				$template_args['TKT_end_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , mktime(24, 0, 0, date("m"), date("d") + 29, date("Y") )  );
+				$template_args['TKT_end_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], mktime(24, 0, 0, date("m"), date("d") + 29, date("Y")));
 			}
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
 		//generate ticket_datetime items
-		if ( ! $default ) {
+		if ( ! $default) {
 			$dttrow = 1;
-			foreach ( $all_dtts as $dtt ) {
-				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default );
+			foreach ($all_dtts as $dtt) {
+				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default);
 				$dttrow++;
 			}
 		}
 
 		$prcrow = 1;
-		foreach ( $prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($prices as $price) {
+			if ($price->is_base_price()) {
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $prices ) > 1 && $prcrow === 1 ) || count( $prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $prices ) > 1 && count( $prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create );
+			$show_trash = (count($prices) > 1 && $prcrow === 1) || count($prices) === 1 ? FALSE : TRUE;
+			$show_create = count($prices) > 1 && count($prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create);
 			$prcrow++;
 		}
 
 		//filter $template_args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
 
 
-	protected function _get_tax_rows( $tktrow, $ticket ) {
+	protected function _get_tax_rows($tktrow, $ticket) {
 		$tax_rows = '';
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_tax_row.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_tax_row.template.php';
 		$template_args = array();
-		$taxes = empty( $ticket ) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
-		foreach ( $taxes as $tax ) {
-			$tax_added = $this->_get_tax_added( $tax, $ticket );
+		$taxes = empty($ticket) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
+		foreach ($taxes as $tax) {
+			$tax_added = $this->_get_tax_added($tax, $ticket);
 			$template_args = array(
-				'display_tax' => !empty( $ticket ) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
+				'display_tax' => ! empty($ticket) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
 				'tax_id' => $tax->ID(),
 				'tkt_row' => $tktrow,
 				'tax_label' => $tax->get('PRC_name'),
 				'tax_added' => $tax_added,
-				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE ),
+				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE),
 				'tax_amount' => $tax->get('PRC_amount')
 				);
-			$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event  );
-			$tax_rows .= EEH_Template::display_template( $template, $template_args, TRUE );
+			$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event);
+			$tax_rows .= EEH_Template::display_template($template, $template_args, TRUE);
 		}
 
 
@@ -1213,81 +1213,81 @@ 
 	}
 
 
-	protected function _get_tax_added( EE_Price $tax, $ticket ) {
-		$subtotal = empty( $ticket ) ? 0 : $ticket->get_ticket_subtotal();
+	protected function _get_tax_added(EE_Price $tax, $ticket) {
+		$subtotal = empty($ticket) ? 0 : $ticket->get_ticket_subtotal();
 		return $subtotal * $tax->get('PRC_amount') / 100;
 	}
 
 
 
 
-	protected function _get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE ) {
-		$send_disabled = !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
+	protected function _get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE) {
+		$send_disabled = ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
 		$template_args = array(
 			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
 			'edit_prices_name' => $default && empty($price) ? 'PRICENAMEATTR' : 'edit_prices',
-			'price_type_selector' => $default && empty( $price ) ? $this->_get_base_price_template( $tktrow, $prcrow, $price, $default ) : $this->_get_price_type_selector( $tktrow, $prcrow, $price, $default, $send_disabled ),
+			'price_type_selector' => $default && empty($price) ? $this->_get_base_price_template($tktrow, $prcrow, $price, $default) : $this->_get_price_type_selector($tktrow, $prcrow, $price, $default, $send_disabled),
 			'PRC_ID' => $default && empty($price) ? 0 : $price->ID(),
 			'PRC_is_default' => $default && empty($price) ? 0 : $price->get('PRC_is_default'),
 			'PRC_name' => $default && empty($price) ? '' : $price->get('PRC_name'),
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
 			'show_plus_or_minus' => $default && empty($price) ? '' : ' style="display:none;"',
-			'show_plus' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
-			'show_minus' => $default && empty( $price ) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
-			'show_currency_symbol' => $default && empty( $price ) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : '' ),
-			'PRC_amount' => $default && empty( $price ) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
-			'show_percentage' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_percent() ? '' : ' style="display:none;"' ),
+			'show_plus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
+			'show_minus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
+			'show_currency_symbol' => $default && empty($price) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : ''),
+			'PRC_amount' => $default && empty($price) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
+			'show_percentage' => $default && empty($price) ? ' style="display:none;"' : ($price->is_percent() ? '' : ' style="display:none;"'),
 			'show_trash_icon' => $show_trash ? '' : ' style="display:none;"',
 			'show_create_button' => $show_create ? '' : ' style="display:none;"',
-			'PRC_desc' => $default && empty( $price ) ? '' : $price->get('PRC_desc'),
-			'disabled' => !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE
+			'PRC_desc' => $default && empty($price) ? '' : $price->get('PRC_desc'),
+			'disabled' => ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE
 			);
 
-	$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event );
+	$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_price_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_price_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_price_type_selector( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		if ( $price->is_base_price() ) {
-			return $this->_get_base_price_template( $tktrow, $prcrow, $price, $default );
+	protected function _get_price_type_selector($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		if ($price->is_base_price()) {
+			return $this->_get_base_price_template($tktrow, $prcrow, $price, $default);
 		} else {
-			return $this->_get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled );
+			return $this->_get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled);
 		}
 
 	}
 
 
-	protected function _get_base_price_template( $tktrow, $prcrow, $price, $default ) {
+	protected function _get_base_price_template($tktrow, $prcrow, $price, $default) {
 		$template_args = array(
 				'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-				'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-				'PRT_ID' => $default && empty( $price ) ? 1 : $price->get('PRT_ID'),
+				'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+				'PRT_ID' => $default && empty($price) ? 1 : $price->get('PRT_ID'),
 				'PRT_name' => __('Price', 'event_espresso'),
 				'price_selected_operator' => '+',
 				'price_selected_is_percent' => 0
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_type_base.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_type_base.template.php';
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event);
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		$select_name = $default && empty( $price ) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices[' . $tktrow . '][' . $prcrow . '][PRT_ID]';
-		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array( array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3' ) ) ) );
-		$price_option_span_template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_option_span.template.php';
-		$all_price_types = $default && empty( $price ) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso')) ) : array();
-		$selected_price_type_id = $default && empty( $price ) ? 0 : $price->type();
+	protected function _get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		$select_name = $default && empty($price) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices['.$tktrow.']['.$prcrow.'][PRT_ID]';
+		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array(array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3'))));
+		$price_option_span_template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_option_span.template.php';
+		$all_price_types = $default && empty($price) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso'))) : array();
+		$selected_price_type_id = $default && empty($price) ? 0 : $price->type();
 		$price_option_spans = '';
 		//setup pricetypes for selector
-		foreach ( $price_types as $price_type ) {
+		foreach ($price_types as $price_type) {
 			$all_price_types[] = array(
 				'id' => $price_type->ID(),
 				'text' => $price_type->get('PRT_name'),
@@ -1299,50 +1299,50 @@ 
 				'PRT_operator' => $price_type->is_discount() ? '-' : '+',
 				'PRT_is_percent' => $price_type->get('PRT_is_percent') ? 1 : 0
 				);
-			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE );
+			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE);
 		}
 
-		$select_params = $disabled ? 'style="width:auto;" disabled'  : 'style="width:auto;"';
+		$select_params = $disabled ? 'style="width:auto;" disabled' : 'style="width:auto;"';
 		$main_name = $select_name;
-		$select_name = $disabled ? 'archive_price[' . $tktrow . '][' . $prcrow . '][PRT_ID]' : $main_name;
+		$select_name = $disabled ? 'archive_price['.$tktrow.']['.$prcrow.'][PRT_ID]' : $main_name;
 
 		$template_args = array(
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-			'price_modifier_selector' => EEH_Form_Fields::select_input( $select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID' ),
+			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+			'price_modifier_selector' => EEH_Form_Fields::select_input($select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID'),
 			'main_name' => $main_name,
 			'selected_price_type_id' => $selected_price_type_id,
 			'price_option_spans' => $price_option_spans,
-			'price_selected_operator' => $default && empty( $price ) ? '' : ( $price->is_discount() ? '-' : '+' ),
-			'price_selected_is_percent' => $default && empty( $price ) ? '' : ( $price->is_percent() ? 1 : 0 ),
+			'price_selected_operator' => $default && empty($price) ? '' : ($price->is_discount() ? '-' : '+'),
+			'price_selected_is_percent' => $default && empty($price) ? '' : ($price->is_percent() ? 1 : 0),
 			'disabled' => $disabled
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_modifier_selector.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_modifier_selector.template.php';
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default ) {
-		$dttid = !empty($dtt) ? $dtt->ID() : 0;
-		$displayrow = !empty($dtt) ? $dtt->get('DTT_order') : 0;
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+	protected function _get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default) {
+		$dttid = ! empty($dtt) ? $dtt->ID() : 0;
+		$displayrow = ! empty($dtt) ? $dtt->get('DTT_order') : 0;
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 		$template_args = array(
-			'dtt_row' => $default && empty( $dtt ) ? 'DTTNUM' : $dttrow,
+			'dtt_row' => $default && empty($dtt) ? 'DTTNUM' : $dttrow,
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'ticket_datetime_selected' => in_array( $displayrow, $tkt_dtts ) ? ' ticket-selected' : '',
-			'ticket_datetime_checked' => in_array( $displayrow, $tkt_dtts ) ? ' checked="checked"' : '',
-			'DTT_name' => $default && empty( $dtt ) ? 'DTTNAME' : $dtt->get_dtt_display_name( TRUE ),
+			'ticket_datetime_selected' => in_array($displayrow, $tkt_dtts) ? ' ticket-selected' : '',
+			'ticket_datetime_checked' => in_array($displayrow, $tkt_dtts) ? ' checked="checked"' : '',
+			'DTT_name' => $default && empty($dtt) ? 'DTTNAME' : $dtt->get_dtt_display_name(TRUE),
 			'tkt_status_class' => '',
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event );
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_datetimes_list_item.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_datetimes_list_item.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1350,53 +1350,53 @@ 
 	protected function _get_ticket_js_structure($all_dtts, $all_tickets) {
 		$template_args = array(
 			'default_datetime_edit_row' => $this->_get_dtt_edit_row('DTTNUM', NULL, TRUE, $all_dtts),
-			'default_ticket_row' => $this->_get_ticket_row( 'TICKETNUM', NULL, array(), array(), TRUE),
-			'default_price_row' => $this->_get_ticket_price_row( 'TICKETNUM', 'PRICENUM', NULL, TRUE, NULL ),
+			'default_ticket_row' => $this->_get_ticket_row('TICKETNUM', NULL, array(), array(), TRUE),
+			'default_price_row' => $this->_get_ticket_price_row('TICKETNUM', 'PRICENUM', NULL, TRUE, NULL),
 			'default_price_rows' => '',
 			'default_base_price_amount' => 0,
 			'default_base_price_name' => '',
 			'default_base_price_description' => '',
-			'default_price_modifier_selector_row' => $this->_get_price_modifier_template( 'TICKETNUM', 'PRICENUM', NULL, TRUE ),
-			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row( 'DTTNUM', NULL, array(), array(), TRUE ),
+			'default_price_modifier_selector_row' => $this->_get_price_modifier_template('TICKETNUM', 'PRICENUM', NULL, TRUE),
+			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row('DTTNUM', NULL, array(), array(), TRUE),
 			'existing_available_datetime_tickets_list' => '',
 			'existing_available_ticket_datetimes_list' => '',
-			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE ),
-			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE )
+			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE),
+			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE)
 			);
 
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( 'DTTNUM', $tktrow, NULL, $ticket, array(), TRUE );
+		foreach ($all_tickets as $ticket) {
+			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item('DTTNUM', $tktrow, NULL, $ticket, array(), TRUE);
 			$tktrow++;
 		}
 
 
 		$dttrow = 1;
-		foreach ( $all_dtts as $dtt ) {
-			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE );
+		foreach ($all_dtts as $dtt) {
+			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE);
 			$dttrow++;
 		}
 
 		$default_prices = EE_Registry::instance()->load_model('Price')->get_all_default_prices();
 		$prcrow = 1;
-		foreach ( $default_prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($default_prices as $price) {
+			if ($price->is_base_price()) {
 				$template_args['default_base_price_amount'] = $price->get_pretty('PRC_amount', 'localized_float');
 				$template_args['default_base_price_name'] = $price->get('PRC_name');
 				$template_args['default_base_price_description'] = $price->get('PRC_desc');
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $default_prices ) > 1 && $prcrow === 1 ) || count( $default_prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $default_prices ) > 1 && count( $default_prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['default_price_rows'] .= $this->_get_ticket_price_row( 'TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create );
+			$show_trash = (count($default_prices) > 1 && $prcrow === 1) || count($default_prices) === 1 ? FALSE : TRUE;
+			$show_create = count($default_prices) > 1 && count($default_prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['default_price_rows'] .= $this->_get_ticket_price_row('TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create);
 			$prcrow++;
 		}
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_js_structure.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_js_structure.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 

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

Spacing +10 added lines, -10 removed lines

@@ -8,34 +8,34 @@
 ?>
 
 	<h4 id="reg-page-totals-hdr" class="">
-		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count;?>
+		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count; ?>
 	</h4>
 
 	<div class="spco-payment-info-dv">
 		<table id="spco-payment-info-table">
 			<thead>
 				<tr>
-					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso');?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso');?></th>
-					<th scope="col" width="5%" class="jst-cntr"><?php _e( 'Qty', 'event_espresso' ); ?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso');?></th>
-					<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_thead_row_end' ); ?>
+					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso'); ?></th>
+					<th scope="col" width="5%" class="jst-cntr"><?php _e('Qty', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso'); ?></th>
+					<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_thead_row_end'); ?>
 				</tr>
 			</thead>
 			<tbody>
-			<?php echo $transaction_details;?>
-			<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_tbody_end' ); ?>
+			<?php echo $transaction_details; ?>
+			<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_tbody_end'); ?>
 			</tbody>
 		</table>
 	</div>
 	<div class="clear-float"> </div>
 
-	<?php  echo $before_payment_options;  ?>
+	<?php  echo $before_payment_options; ?>
 
 	<div id="methods-of-payment">
 		<?php echo $payment_options; ?>
 	</div>
 	<!-- end #methods-of-payment -->
 
-	<?php  echo $after_payment_options;  ?>
+	<?php  echo $after_payment_options; ?>
 

espresso.php

Spacing +93 added lines, -93 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('ABSPATH')) {
+	exit('No direct script access allowed');
 }
 /*
   Plugin Name:		Event Espresso
@@ -41,7 +41,7 @@ 
  *
  */
 
-if ( function_exists( 'espresso_version' ) ) {
+if (function_exists('espresso_version')) {
 
 	/**
 	 *    espresso_duplicate_plugin_error
@@ -50,12 +50,12 @@ 
 	function espresso_duplicate_plugin_error() {
 		?>
 		<div class="error">
-			<p><?php _e( 'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso' ); ?></p>
+			<p><?php _e('Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso'); ?></p>
 		</div>
 		<?php
-		espresso_deactivate_plugin( plugin_basename( __FILE__ ) );
+		espresso_deactivate_plugin(plugin_basename(__FILE__));
 	}
-	add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 );
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
 
@@ -66,103 +66,103 @@ 
 	 * @return string
 	 */
 	function espresso_version() {
-		return apply_filters( 'FHEE__espresso__espresso_version', '4.9.8.rc.011' );
+		return apply_filters('FHEE__espresso__espresso_version', '4.9.8.rc.011');
 	}
 
 	// define versions
-	define( 'EVENT_ESPRESSO_VERSION', espresso_version() );
-	define( 'EE_MIN_WP_VER_REQUIRED', '4.1' );
-	define( 'EE_MIN_WP_VER_RECOMMENDED', '4.4.2' );
-	define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' );
-	define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.44' );
-	define( 'EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - ' . EVENT_ESPRESSO_VERSION );
-	define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ );
+	define('EVENT_ESPRESSO_VERSION', espresso_version());
+	define('EE_MIN_WP_VER_REQUIRED', '4.1');
+	define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.0');
+	define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
+	define('EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - '.EVENT_ESPRESSO_VERSION);
+	define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 	//used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-	if ( ! defined( 'DS' ) ) {
-		define( 'DS', '/' );
+	if ( ! defined('DS')) {
+		define('DS', '/');
 	}
-	if ( ! defined( 'PS' ) ) {
-		define( 'PS', PATH_SEPARATOR );
+	if ( ! defined('PS')) {
+		define('PS', PATH_SEPARATOR);
 	}
-	if ( ! defined( 'SP' ) ) {
-		define( 'SP', ' ' );
+	if ( ! defined('SP')) {
+		define('SP', ' ');
 	}
-	if ( ! defined( 'EENL' ) ) {
-		define( 'EENL', "\n" );
+	if ( ! defined('EENL')) {
+		define('EENL', "\n");
 	}
-	define( 'EE_SUPPORT_EMAIL', 'support@eventespresso.com' );
+	define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 	// define the plugin directory and URL
-	define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ) );
+	define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 	// main root folder paths
-	define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS );
-	define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS );
-	define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS );
-	define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS );
-	define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS );
-	define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS );
-	define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS );
-	define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS );
+	define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+	define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+	define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+	define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+	define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+	define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+	define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+	define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 	// core system paths
-	define( 'EE_ADMIN', EE_CORE . 'admin' . DS );
-	define( 'EE_CPTS', EE_CORE . 'CPTs' . DS );
-	define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS );
-	define( 'EE_INTERFACES', EE_CORE . 'interfaces' . DS );
-	define( 'EE_BUSINESS', EE_CORE . 'business' . DS );
-	define( 'EE_MODELS', EE_CORE . 'db_models' . DS );
-	define( 'EE_HELPERS', EE_CORE . 'helpers' . DS );
-	define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS );
-	define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS );
-	define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS );
-	define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS );
-	define( 'EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS );
+	define('EE_ADMIN', EE_CORE.'admin'.DS);
+	define('EE_CPTS', EE_CORE.'CPTs'.DS);
+	define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+	define('EE_INTERFACES', EE_CORE.'interfaces'.DS);
+	define('EE_BUSINESS', EE_CORE.'business'.DS);
+	define('EE_MODELS', EE_CORE.'db_models'.DS);
+	define('EE_HELPERS', EE_CORE.'helpers'.DS);
+	define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+	define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+	define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+	define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+	define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 	// gateways
-	define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS );
-	define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS );
+	define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+	define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 	// asset URL paths
-	define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS );
-	define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS );
-	define( 'EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS );
-	define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS );
-	define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' );
-	define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/' );
+	define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+	define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+	define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+	define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+	define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+	define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 	// define upload paths
 	$uploads = wp_upload_dir();
 	// define the uploads directory and URL
-	define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS );
-	define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS );
+	define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+	define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 	// define the templates directory and URL
-	define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'templates' . DS );
-	define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'templates' . DS );
+	define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+	define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 	// define the gateway directory and URL
-	define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'gateways' . DS );
-	define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'gateways' . DS );
+	define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+	define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 	// languages folder/path
-	define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS );
-	define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS );
+	define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+	define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 	//check for dompdf fonts in uploads
-	if ( file_exists( EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ) {
-		define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS );
+	if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+		define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 	}
 	//ajax constants
-	define( 'EE_FRONT_AJAX', isset( $_REQUEST[ 'ee_front_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_front_ajax' ] ) ? true : false );
-	define( 'EE_ADMIN_AJAX', isset( $_REQUEST[ 'ee_admin_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_admin_ajax' ] ) ? true : false );
+	define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false);
+	define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false);
 	//just a handy constant occasionally needed for finding values representing infinity in the DB
 	//you're better to use this than its straight value (currently -1) in case you ever
 	//want to change its default value! or find when -1 means infinity
-	define( 'EE_INF_IN_DB', -1 );
-	define( 'EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX );
-	define( 'EE_DEBUG', false );
+	define('EE_INF_IN_DB', -1);
+	define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
+	define('EE_DEBUG', false);
 
 	/**
 	 *    espresso_plugin_activation
 	 *    adds a wp-option to indicate that EE has been activated via the WP admin plugins page
 	 */
 	function espresso_plugin_activation() {
-		update_option( 'ee_espresso_activation', true );
+		update_option('ee_espresso_activation', true);
 	}
-	register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' );
+	register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
 
 
@@ -176,7 +176,7 @@ 
 		//	}
 		//
 	}
-	register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+	register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -186,15 +186,15 @@ 
 	 */
 	function espresso_load_error_handling() {
 		// load debugging tools
-		if ( WP_DEBUG === true && is_readable( EE_HELPERS . 'EEH_Debug_Tools.helper.php' ) ) {
-			require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' );
+		if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
 			EEH_Debug_Tools::instance();
 		}
 		// load error handling
-		if ( is_readable( EE_CORE . 'EE_Error.core.php' ) ) {
-			require_once( EE_CORE . 'EE_Error.core.php' );
+		if (is_readable(EE_CORE.'EE_Error.core.php')) {
+			require_once(EE_CORE.'EE_Error.core.php');
 		} else {
-			wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ) );
+			wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso'));
 		}
 	}
 
@@ -208,25 +208,25 @@ 
 	 * @param    string $full_path_to_file
 	 * @throws    EE_Error
 	 */
-	function espresso_load_required( $classname, $full_path_to_file ) {
+	function espresso_load_required($classname, $full_path_to_file) {
 		static $error_handling_loaded = false;
-		if ( ! $error_handling_loaded ) {
+		if ( ! $error_handling_loaded) {
 			espresso_load_error_handling();
 			$error_handling_loaded = true;
 		}
-		if ( is_readable( $full_path_to_file ) ) {
-			require_once( $full_path_to_file );
+		if (is_readable($full_path_to_file)) {
+			require_once($full_path_to_file);
 		} else {
-			throw new EE_Error ( sprintf(
-				__( 'The %s class file could not be located or is not readable due to file permissions.', 'event_espresso' ),
+			throw new EE_Error(sprintf(
+				__('The %s class file could not be located or is not readable due to file permissions.', 'event_espresso'),
 				$classname
-			) );
+			));
 		}
 	}
 
-	espresso_load_required( 'EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php' );
-	espresso_load_required( 'EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php' );
-	espresso_load_required( 'EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php' );
+	espresso_load_required('EEH_Base', EE_CORE.'helpers'.DS.'EEH_Base.helper.php');
+	espresso_load_required('EEH_File', EE_CORE.'helpers'.DS.'EEH_File.helper.php');
+	espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php');
 	new EE_Bootstrap();
 
 
@@ -235,7 +235,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_deactivate_plugin' ) ) {
+if ( ! function_exists('espresso_deactivate_plugin')) {
 	/**
 	*    deactivate_plugin
 	* usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
@@ -244,11 +244,11 @@ 
 	* @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
 	* @return    void
 	*/
-	function espresso_deactivate_plugin( $plugin_basename = '' ) {
-		if ( ! function_exists( 'deactivate_plugins' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	function espresso_deactivate_plugin($plugin_basename = '') {
+		if ( ! function_exists('deactivate_plugins')) {
+			require_once(ABSPATH.'wp-admin/includes/plugin.php');
 		}
-		unset( $_GET[ 'activate' ], $_REQUEST[ 'activate' ] );
-		deactivate_plugins( $plugin_basename );
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
 	}
 }