eventespresso / event-espresso-core

caffeinated/modules/recaptcha_invisible/InvisibleRecaptcha.php

Spacing +8 added lines, -8 removed lines

@@ -135,11 +135,11 @@ 
         static $previous_recaptcha_response = array();
         $grecaptcha_response = $request->getRequestParam('g-recaptcha-response');
         // if this token has already been verified, then return previous response
-        if (isset($previous_recaptcha_response[ $grecaptcha_response ])) {
-            return $previous_recaptcha_response[ $grecaptcha_response ];
+        if (isset($previous_recaptcha_response[$grecaptcha_response])) {
+            return $previous_recaptcha_response[$grecaptcha_response];
         }
         // still here but no g-recaptcha-response ? - verification failed
-        if (! $grecaptcha_response) {
+        if ( ! $grecaptcha_response) {
             EE_Error::add_error(
                 sprintf(
                     /* translators: 1: missing parameter */
@@ -158,7 +158,7 @@ 
             return false;
         }
         // will update to true if everything passes
-        $previous_recaptcha_response[ $grecaptcha_response ] = false;
+        $previous_recaptcha_response[$grecaptcha_response] = false;
         $response                                            = wp_safe_remote_post(
             InvisibleRecaptcha::URL_GOOGLE_RECAPTCHA_API,
             array(
@@ -175,16 +175,16 @@ 
         }
         $results = json_decode(wp_remote_retrieve_body($response), true);
         if (filter_var($results['success'], FILTER_VALIDATE_BOOLEAN) !== true) {
-            $errors   = array_map(
+            $errors = array_map(
                 array($this, 'getErrorCode'),
                 $results['error-codes']
             );
             if (isset($results['challenge_ts'])) {
-                $errors[] = 'challenge timestamp: ' . $results['challenge_ts'] . '.';
+                $errors[] = 'challenge timestamp: '.$results['challenge_ts'].'.';
             }
             $this->generateError(implode(' ', $errors), true);
         }
-        $previous_recaptcha_response[ $grecaptcha_response ] = true;
+        $previous_recaptcha_response[$grecaptcha_response] = true;
         add_action('shutdown', array($this, 'setSessionData'));
         return true;
     }
@@ -225,7 +225,7 @@ 
             'bad-request'            => 'The request is invalid or malformed.',
             'timeout-or-duplicate'   => 'The request took too long to be sent or was a duplicate of a previous request.',
         );
-        return isset($error_codes[ $error_code ]) ? $error_codes[ $error_code ] : '';
+        return isset($error_codes[$error_code]) ? $error_codes[$error_code] : '';
     }
 
 

Indentation +240 added lines, -240 removed lines

@@ -27,270 +27,270 @@
 class InvisibleRecaptcha
 {
 
-    const URL_GOOGLE_RECAPTCHA_API          = 'https://www.google.com/recaptcha/api/siteverify';
+	const URL_GOOGLE_RECAPTCHA_API          = 'https://www.google.com/recaptcha/api/siteverify';
 
-    const SESSION_DATA_KEY_RECAPTCHA_PASSED = 'recaptcha_passed';
+	const SESSION_DATA_KEY_RECAPTCHA_PASSED = 'recaptcha_passed';
 
-    /**
-     * @var EE_Registration_Config $config
-     */
-    private $config;
+	/**
+	 * @var EE_Registration_Config $config
+	 */
+	private $config;
 
-    /**
-     * @var EE_Session $session
-     */
-    private $session;
+	/**
+	 * @var EE_Session $session
+	 */
+	private $session;
 
-    /**
-     * @var boolean $recaptcha_passed
-     */
-    private $recaptcha_passed;
+	/**
+	 * @var boolean $recaptcha_passed
+	 */
+	private $recaptcha_passed;
 
 
-    /**
-     * InvisibleRecaptcha constructor.
-     *
-     * @param EE_Registration_Config $registration_config
-     * @param EE_Session             $session
-     */
-    public function __construct(EE_Registration_Config $registration_config, EE_Session $session = null)
-    {
-        $this->config = $registration_config;
-        $this->session = $session;
-    }
+	/**
+	 * InvisibleRecaptcha constructor.
+	 *
+	 * @param EE_Registration_Config $registration_config
+	 * @param EE_Session             $session
+	 */
+	public function __construct(EE_Registration_Config $registration_config, EE_Session $session = null)
+	{
+		$this->config = $registration_config;
+		$this->session = $session;
+	}
 
 
-    /**
-     * @return boolean
-     */
-    public function useInvisibleRecaptcha()
-    {
-        return $this->session instanceof EE_Session
-               && $this->config->use_captcha
-               && $this->config->recaptcha_theme === 'invisible';
-    }
+	/**
+	 * @return boolean
+	 */
+	public function useInvisibleRecaptcha()
+	{
+		return $this->session instanceof EE_Session
+			   && $this->config->use_captcha
+			   && $this->config->recaptcha_theme === 'invisible';
+	}
 
 
-    /**
-     * @param array $input_settings
-     * @return EE_Invisible_Recaptcha_Input
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws DomainException
-     */
-    public function getInput(array $input_settings = array())
-    {
-        return new EE_Invisible_Recaptcha_Input(
-            $input_settings,
-            $this->config
-        );
-    }
+	/**
+	 * @param array $input_settings
+	 * @return EE_Invisible_Recaptcha_Input
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 */
+	public function getInput(array $input_settings = array())
+	{
+		return new EE_Invisible_Recaptcha_Input(
+			$input_settings,
+			$this->config
+		);
+	}
 
 
-    /**
-     * @param array $input_settings
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws DomainException
-     */
-    public function getInputHtml(array $input_settings = array())
-    {
-        return $this->getInput($input_settings)->get_html_for_input();
-    }
+	/**
+	 * @param array $input_settings
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 */
+	public function getInputHtml(array $input_settings = array())
+	{
+		return $this->getInput($input_settings)->get_html_for_input();
+	}
 
 
-    /**
-     * @param EE_Form_Section_Proper $form
-     * @param array                  $input_settings
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public function addToFormSection(EE_Form_Section_Proper $form, array $input_settings = array())
-    {
-        $form->add_subsections(
-            array(
-                'espresso_recaptcha' => $this->getInput($input_settings),
-            ),
-            null,
-            false
-        );
-    }
+	/**
+	 * @param EE_Form_Section_Proper $form
+	 * @param array                  $input_settings
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public function addToFormSection(EE_Form_Section_Proper $form, array $input_settings = array())
+	{
+		$form->add_subsections(
+			array(
+				'espresso_recaptcha' => $this->getInput($input_settings),
+			),
+			null,
+			false
+		);
+	}
 
 
-    /**
-     * @param RequestInterface $request
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws RuntimeException
-     */
-    public function verifyToken(RequestInterface $request)
-    {
-        static $previous_recaptcha_response = array();
-        $grecaptcha_response = $request->getRequestParam('g-recaptcha-response');
-        // if this token has already been verified, then return previous response
-        if (isset($previous_recaptcha_response[ $grecaptcha_response ])) {
-            return $previous_recaptcha_response[ $grecaptcha_response ];
-        }
-        // still here but no g-recaptcha-response ? - verification failed
-        if (! $grecaptcha_response) {
-            EE_Error::add_error(
-                sprintf(
-                    /* translators: 1: missing parameter */
-                    esc_html__(
-                        // @codingStandardsIgnoreStart
-                        'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Missing "%1$s". Please try again.',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    'g-recaptcha-response'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        // will update to true if everything passes
-        $previous_recaptcha_response[ $grecaptcha_response ] = false;
-        $response                                            = wp_safe_remote_post(
-            InvisibleRecaptcha::URL_GOOGLE_RECAPTCHA_API,
-            array(
-                'body' => array(
-                    'secret'   => $this->config->recaptcha_privatekey,
-                    'response' => $grecaptcha_response,
-                    'remoteip' => $request->ipAddress(),
-                ),
-            )
-        );
-        if ($response instanceof WP_Error) {
-            $this->generateError($response->get_error_messages());
-            return false;
-        }
-        $results = json_decode(wp_remote_retrieve_body($response), true);
-        if (filter_var($results['success'], FILTER_VALIDATE_BOOLEAN) !== true) {
-            $errors   = array_map(
-                array($this, 'getErrorCode'),
-                $results['error-codes']
-            );
-            if (isset($results['challenge_ts'])) {
-                $errors[] = 'challenge timestamp: ' . $results['challenge_ts'] . '.';
-            }
-            $this->generateError(implode(' ', $errors), true);
-        }
-        $previous_recaptcha_response[ $grecaptcha_response ] = true;
-        add_action('shutdown', array($this, 'setSessionData'));
-        return true;
-    }
+	/**
+	 * @param RequestInterface $request
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws RuntimeException
+	 */
+	public function verifyToken(RequestInterface $request)
+	{
+		static $previous_recaptcha_response = array();
+		$grecaptcha_response = $request->getRequestParam('g-recaptcha-response');
+		// if this token has already been verified, then return previous response
+		if (isset($previous_recaptcha_response[ $grecaptcha_response ])) {
+			return $previous_recaptcha_response[ $grecaptcha_response ];
+		}
+		// still here but no g-recaptcha-response ? - verification failed
+		if (! $grecaptcha_response) {
+			EE_Error::add_error(
+				sprintf(
+					/* translators: 1: missing parameter */
+					esc_html__(
+						// @codingStandardsIgnoreStart
+						'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Missing "%1$s". Please try again.',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					'g-recaptcha-response'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		// will update to true if everything passes
+		$previous_recaptcha_response[ $grecaptcha_response ] = false;
+		$response                                            = wp_safe_remote_post(
+			InvisibleRecaptcha::URL_GOOGLE_RECAPTCHA_API,
+			array(
+				'body' => array(
+					'secret'   => $this->config->recaptcha_privatekey,
+					'response' => $grecaptcha_response,
+					'remoteip' => $request->ipAddress(),
+				),
+			)
+		);
+		if ($response instanceof WP_Error) {
+			$this->generateError($response->get_error_messages());
+			return false;
+		}
+		$results = json_decode(wp_remote_retrieve_body($response), true);
+		if (filter_var($results['success'], FILTER_VALIDATE_BOOLEAN) !== true) {
+			$errors   = array_map(
+				array($this, 'getErrorCode'),
+				$results['error-codes']
+			);
+			if (isset($results['challenge_ts'])) {
+				$errors[] = 'challenge timestamp: ' . $results['challenge_ts'] . '.';
+			}
+			$this->generateError(implode(' ', $errors), true);
+		}
+		$previous_recaptcha_response[ $grecaptcha_response ] = true;
+		add_action('shutdown', array($this, 'setSessionData'));
+		return true;
+	}
 
 
-    /**
-     * @param string $error_response
-     * @param bool   $show_errors
-     * @return void
-     * @throws RuntimeException
-     */
-    public function generateError($error_response = '', $show_errors = false)
-    {
-        throw new RuntimeException(
-            sprintf(
-                esc_html__(
-                    'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. %1$s %2$s Please try again.',
-                    'event_espresso'
-                ),
-                '<br />',
-                $show_errors || current_user_can('manage_options') ? $error_response : ''
-            )
-        );
-    }
+	/**
+	 * @param string $error_response
+	 * @param bool   $show_errors
+	 * @return void
+	 * @throws RuntimeException
+	 */
+	public function generateError($error_response = '', $show_errors = false)
+	{
+		throw new RuntimeException(
+			sprintf(
+				esc_html__(
+					'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. %1$s %2$s Please try again.',
+					'event_espresso'
+				),
+				'<br />',
+				$show_errors || current_user_can('manage_options') ? $error_response : ''
+			)
+		);
+	}
 
 
-    /**
-     * @param string $error_code
-     * @return string
-     */
-    public function getErrorCode(&$error_code)
-    {
-        $error_codes = array(
-            'missing-input-secret'   => 'The secret parameter is missing.',
-            'invalid-input-secret'   => 'The secret parameter is invalid or malformed.',
-            'missing-input-response' => 'The response parameter is missing.',
-            'invalid-input-response' => 'The response parameter is invalid or malformed.',
-            'bad-request'            => 'The request is invalid or malformed.',
-            'timeout-or-duplicate'   => 'The request took too long to be sent or was a duplicate of a previous request.',
-        );
-        return isset($error_codes[ $error_code ]) ? $error_codes[ $error_code ] : '';
-    }
+	/**
+	 * @param string $error_code
+	 * @return string
+	 */
+	public function getErrorCode(&$error_code)
+	{
+		$error_codes = array(
+			'missing-input-secret'   => 'The secret parameter is missing.',
+			'invalid-input-secret'   => 'The secret parameter is invalid or malformed.',
+			'missing-input-response' => 'The response parameter is missing.',
+			'invalid-input-response' => 'The response parameter is invalid or malformed.',
+			'bad-request'            => 'The request is invalid or malformed.',
+			'timeout-or-duplicate'   => 'The request took too long to be sent or was a duplicate of a previous request.',
+		);
+		return isset($error_codes[ $error_code ]) ? $error_codes[ $error_code ] : '';
+	}
 
 
-    /**
-     * @return array
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function getLocalizedVars()
-    {
-        return (array) apply_filters(
-            'FHEE__EventEspresso_caffeinated_modules_recaptcha_invisible_InvisibleRecaptcha__getLocalizedVars__localized_vars',
-            array(
-                'siteKey'          => $this->config->recaptcha_publickey,
-                'recaptcha_passed' => $this->recaptchaPassed(),
-                'wp_debug'         => WP_DEBUG,
-                'disable_submit'   => defined('EE_EVENT_QUEUE_BASE_URL'),
-                'failed_message'   => esc_html__(
-                    'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Please try again.',
-                    'event_espresso'
-                )
-            )
-        );
-    }
+	/**
+	 * @return array
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function getLocalizedVars()
+	{
+		return (array) apply_filters(
+			'FHEE__EventEspresso_caffeinated_modules_recaptcha_invisible_InvisibleRecaptcha__getLocalizedVars__localized_vars',
+			array(
+				'siteKey'          => $this->config->recaptcha_publickey,
+				'recaptcha_passed' => $this->recaptchaPassed(),
+				'wp_debug'         => WP_DEBUG,
+				'disable_submit'   => defined('EE_EVENT_QUEUE_BASE_URL'),
+				'failed_message'   => esc_html__(
+					'We\'re sorry but an attempt to verify the form\'s reCAPTCHA has failed. Please try again.',
+					'event_espresso'
+				)
+			)
+		);
+	}
 
 
-    /**
-     * @return boolean
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function recaptchaPassed()
-    {
-        if ($this->recaptcha_passed !== null) {
-            return $this->recaptcha_passed;
-        }
-        // logged in means you have already passed a turing test of sorts
-        if ($this->useInvisibleRecaptcha() === false || is_user_logged_in()) {
-            $this->recaptcha_passed = true;
-            return $this->recaptcha_passed;
-        }
-        // was test already passed?
-        $this->recaptcha_passed = filter_var(
-            $this->session->get_session_data(
-                InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED
-            ),
-            FILTER_VALIDATE_BOOLEAN
-        );
-        return $this->recaptcha_passed;
-    }
+	/**
+	 * @return boolean
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function recaptchaPassed()
+	{
+		if ($this->recaptcha_passed !== null) {
+			return $this->recaptcha_passed;
+		}
+		// logged in means you have already passed a turing test of sorts
+		if ($this->useInvisibleRecaptcha() === false || is_user_logged_in()) {
+			$this->recaptcha_passed = true;
+			return $this->recaptcha_passed;
+		}
+		// was test already passed?
+		$this->recaptcha_passed = filter_var(
+			$this->session->get_session_data(
+				InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED
+			),
+			FILTER_VALIDATE_BOOLEAN
+		);
+		return $this->recaptcha_passed;
+	}
 
 
-    /**
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function setSessionData()
-    {
-        if ($this->session instanceof EE_Session) {
-            $this->session->set_session_data([InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED => true]);
-        }
-    }
+	/**
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function setSessionData()
+	{
+		if ($this->session instanceof EE_Session) {
+			$this->session->set_session_data([InvisibleRecaptcha::SESSION_DATA_KEY_RECAPTCHA_PASSED => true]);
+		}
+	}
 }

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_attendees.dmsstage.php

Indentation +636 added lines, -636 removed lines

@@ -183,647 +183,647 @@
  */
 class EE_DMS_4_1_0_attendees extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_attendee_cpt_table;
-    private $_new_attendee_meta_table;
-    private $_new_reg_table;
-    private $_new_transaction_table;
-    private $_new_payment_table;
-    private $_new_line_table;
-    private $_old_mer_table;
-    private $_new_ticket_table;
-    private $_new_ticket_datetime_table;
-    private $_new_datetime_table;
-    private $_new_datetime_ticket_table;
-    private $_new_price_table;
-    private $_new_ticket_price_table;
-    /**
-     * Rememebrs whether or not the mer table exists
-     * @var boolean
-     */
-    private $_mer_tables_exist = null;
-
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Attendees", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "events_attendee";
-        // Only select the event status column from the event table.
-        $this->select_expression = 'att.*, e.event_status';
-        // Only select attendees for events that aren't deleted.
-        $this->_extra_where_sql = 'AS att
+	private $_new_attendee_cpt_table;
+	private $_new_attendee_meta_table;
+	private $_new_reg_table;
+	private $_new_transaction_table;
+	private $_new_payment_table;
+	private $_new_line_table;
+	private $_old_mer_table;
+	private $_new_ticket_table;
+	private $_new_ticket_datetime_table;
+	private $_new_datetime_table;
+	private $_new_datetime_ticket_table;
+	private $_new_price_table;
+	private $_new_ticket_price_table;
+	/**
+	 * Rememebrs whether or not the mer table exists
+	 * @var boolean
+	 */
+	private $_mer_tables_exist = null;
+
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Attendees", "event_espresso");
+		$this->_old_table = $wpdb->prefix . "events_attendee";
+		// Only select the event status column from the event table.
+		$this->select_expression = 'att.*, e.event_status';
+		// Only select attendees for events that aren't deleted.
+		$this->_extra_where_sql = 'AS att
             INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_old_mer_table = $wpdb->prefix . "events_multi_event_registration_id_group";
-        $this->_new_attendee_cpt_table = $wpdb->posts;
-        $this->_new_attendee_meta_table = $wpdb->prefix . "esp_attendee_meta";
-        $this->_new_reg_table = $wpdb->prefix . "esp_registration";
-        $this->_new_transaction_table = $wpdb->prefix . "esp_transaction";
-        $this->_new_payment_table = $wpdb->prefix . "esp_payment";
-        $this->_new_line_table = $wpdb->prefix . "esp_line_item";
-        $this->_new_ticket_table = $wpdb->prefix . "esp_ticket";
-        $this->_new_ticket_datetime_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_datetime_table = $wpdb->prefix . "esp_datetime";
-        $this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_price_table = $wpdb->prefix . "esp_price";
-        $this->_new_ticket_price_table = $wpdb->prefix . "esp_ticket_price";
-        parent::__construct();
-    }
-
-    protected function _migrate_old_row($old_row)
-    {
-        // first check if there's already a new attendee with similar characteristics
-        $new_att_id = $this->_find_attendee_cpt_matching($old_row);
-        if (!$new_att_id) {
-            $new_att_id = $this->_insert_new_attendee_cpt($old_row);
-            if (!$new_att_id) {
-                // if we couldnt even make an attendee, abandon all hope
-                return false;
-            }
-            $new_att_meta_id = $this->_insert_attendee_meta_row($old_row, $new_att_id);
-            if ($new_att_meta_id) {
-                $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_meta_table, $new_att_meta_id);
-            }
-        }
-        $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_cpt_table, $new_att_id);
-
-        $txn_id = $this->_insert_new_transaction($old_row);
-        if (!$txn_id) {
-            // if we couldnt make the transaction, also abandon all hope
-            return false;
-        }
-        $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_transaction_table, $txn_id);
-        $pay_id = $this->_insert_new_payment($old_row, $txn_id);
-        if ($pay_id) {
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_payment_table, $pay_id);
-        }
-
-
-        // even if there was no payment, we can go ahead with adding the reg
-        $new_regs = $this->_insert_new_registrations($old_row, $new_att_id, $txn_id);
-        if ($new_regs) {
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_reg_table, $new_regs);
-        }
-    }
-
-    /**
-     * Checks if there's already an attendee CPT in the db that has the same
-     * first and last name, and email. If so, returns its ID as an int.
-     * @global type $wpdb
-     * @param array $old_attendee
-     * @return int
-     */
-    private function _find_attendee_cpt_matching($old_attendee)
-    {
-        global $wpdb;
-        $existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . $this->_new_attendee_cpt_table . " AS cpt INNER JOIN " . $this->_new_attendee_meta_table . " AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1", $old_attendee['fname'], $old_attendee['lname'], $old_attendee['email']));
-        return intval($existing_attendee_id);
-    }
-
-    private function _insert_new_attendee_cpt($old_attendee)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'post_title' => stripslashes($old_attendee['fname'] . " " . $old_attendee['lname']),// ATT_full_name
-            'post_content' => '',// ATT_bio
-            'post_name' => sanitize_title($old_attendee['fname'] . "-" . $old_attendee['lname']),// ATT_slug
-            'post_date' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),// ATT_created
-            'post_excerpt' => '',// ATT_short_bio
-            'post_modified' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),// ATT_modified
-            'post_author' => 0,// ATT_author
-            'post_parent' => 0,// ATT_parent
-            'post_type' => 'espresso_attendees',// post_type
-            'post_status' => 'publish'// status
-        );
-        $datatypes = array(
-            '%s',// ATT_full_name
-            '%s',// ATT_bio
-            '%s',// ATT_slug
-            '%s',// ATT_created
-            '%s',// ATT_short_bio
-            '%s',// ATT_modified
-            '%d',// ATT_author
-            '%d',// ATT_parent
-            '%s',// post_type
-            '%s',// status
-        );
-        $success = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $datatypes);
-        if (!$success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
-
-    private function _insert_attendee_meta_row($old_attendee, $new_attendee_cpt_id)
-    {
-        global $wpdb;
-        // get the state and country ids from the old row
-        try {
-            $new_country = $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
-            $new_country_iso = $new_country['CNT_ISO'];
-        } catch (EE_Error $exception) {
-            $new_country_iso = $this->get_migration_script()->get_default_country_iso();
-        }
-        try {
-            $new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']), $new_country_iso);
-            $new_state_id = $new_state['STA_ID'];
-        } catch (EE_Error $exception) {
-            $new_state_id = 0;
-        }
-        $cols_n_values = array(
-            'ATT_ID' => $new_attendee_cpt_id,
-            'ATT_fname' => stripslashes($old_attendee['fname']),
-            'ATT_lname' => stripslashes($old_attendee['lname']),
-            'ATT_address' => stripslashes($old_attendee['address']),
-            'ATT_address2' => stripslashes($old_attendee['address2']),
-            'ATT_city' => stripslashes($old_attendee['city']),
-            'STA_ID' => $new_state_id,
-            'CNT_ISO' => $new_country_iso,
-            'ATT_zip' => stripslashes($old_attendee['zip']),
-            'ATT_email' => stripslashes($old_attendee['email']),
-            'ATT_phone' => stripslashes($old_attendee['phone']),
-        );
-        $datatypes = array(
-            '%d',// ATT_ID
-            '%s',// ATT_fname
-            '%s',// ATT_lname
-            '%s',// ATT_address
-            '%s',// ATT_address2
-            '%s',// ATT_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// ATT_zip
-            '%s',// ATT_email
-            '%s',// ATT_phone
-        );
-        $success = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $datatypes);
-        if (!$success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_meta_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
-
-    /**
-     * Note: we don't necessarily create a new transaction for each attendee row.
-     * Only if the old attendee 'is_primary' is true; otherwise we find the old attendee row that
-     * 'is_primary' and has the same 'txn_id', then we return ITS new transaction id
-     * @global type $wpdb
-     * @param type $old_attendee
-     * @return int new transaction id
-     */
-    private function _insert_new_transaction($old_attendee)
-    {
-        global $wpdb;
-
-        // first: let's check for an existing transaction for this old attendee
-        if (intval($old_attendee['is_primary'])) {// primary attendee, so create txn
-            $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table);
-        } else { // non-primary attendee, so find its primary attendee's transaction
-            $primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . $this->_old_table . " WHERE is_primary=1 and registration_id=%s", $old_attendee['registration_id']));
-            if (!$primary_attendee_old_id) {
-                $primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
-                $primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : null;
-            }
-            $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($primary_attendee_old_id), $this->_new_transaction_table);
-            if (!$txn_id) {
-                $this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"), $this->_json_encode($old_attendee), $primary_attendee_old_id));
-                $txn_id = 0;
-            }
-        }
-        // if there isn't yet a transaction row for this, create one
-        // (so even if it was a non-primary attendee with no EE3 primary attendee,
-        // it ought to have SOME transaction, so we'll make one)
-        if (!$txn_id) {
-            // maps 3.1 payment stati onto 4.1 transaction stati
-            $txn_status_mapping = array(
-                'Completed' => 'TCM',
-                'Pending' => 'TIN',
-                'Payment Declined' => 'TIN',
-                'Incomplete' => 'TIN',
-                'Not Completed' => 'TIN',
-                'Cancelled' => 'TIN',
-                'Declined' => 'TIN'
-            );
-            $STS_ID = isset($txn_status_mapping[ $old_attendee['payment_status'] ]) ? $txn_status_mapping[ $old_attendee['payment_status'] ] : 'TIN';
-            $cols_n_values = array(
-                'TXN_timestamp' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
-                'TXN_total' => floatval($old_attendee['total_cost']),
-                'TXN_paid' => floatval($old_attendee['amount_pd']),
-                'STS_ID' => $STS_ID,
-                'TXN_hash_salt' => $old_attendee['hashSalt']
-            );
-            $datatypes = array(
-                '%s',// TXN_timestamp
-                '%f',// TXN_total
-                '%f',// TXN_paid
-                '%s',// STS_ID
-                '%s',// TXN_hash_salt
-            );
-            $success = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $datatypes);
-            if (!$success) {
-                $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_transaction_table, $cols_n_values, $datatypes));
-                return 0;
-            }
-            $txn_id = $wpdb->insert_id;
-        }
-
-        return $txn_id;
-    }
-
-    /**
-     * Detects if the MER tables exist
-     * @global type $wpdb
-     * @return boolean
-     */
-    private function _mer_tables_exist()
-    {
-        if ($this->_mer_tables_exist === null) {
-            global $wpdb;
-
-            if ($wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table) {
-                $this->_mer_tables_exist = false;
-            } else {
-                $this->_mer_tables_exist = true;
-            }
-        }
-        return $this->_mer_tables_exist;
-    }
-
-    /**
-     * Gets the 4.1 registration's status given the 3.1 attendee row. We consider
-     * whether the event required pre-approval or not,a dn the 4.1 payment status.
-     * @global type $wpdb
-     * @param type $old_attendee_row
-     * @return string
-     */
-    private function _get_reg_status_for_old_payment_status($old_attendee_row)
-    {
-        // need event default reg status and if pre_approval was required
-        global $wpdb;
-        $event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM " . $wpdb->prefix . "events_detail WHERE id = %d", $old_attendee_row['event_id']));
-        return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
-            $old_attendee_row['payment_status'],
-            intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve'])
-        );
-    }
-
-    /**
-     * Adds however many rgistrations are indicated by the old attendee's QUANTITY field,
-     * and returns an array of their IDs
-     * @global type $wpdb
-     * @param array $old_attendee
-     * @param int $new_attendee_id
-     * @param int $new_txn_id
-     * @return array of new registratio ids
-     */
-    private function _insert_new_registrations($old_attendee, $new_attendee_id, $new_txn_id)
-    {
-        global $wpdb;
-
-        $STS_ID = $this->_get_reg_status_for_old_payment_status($old_attendee);
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . 'events_detail', $old_attendee['event_id'], $wpdb->posts);
-        if (!$new_event_id) {
-            $this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"), $old_attendee['event_id'], $this->_json_encode($old_attendee)));
-        }
-
-        $ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
-        if (!$ticket_id) {
-            $ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
-            $this->add_error(sprintf(__('Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso'), $old_attendee['id'], $new_event_id, $ticket_id));
-        }
-        $regs_on_this_row = intval($old_attendee['quantity']);
-        $new_regs = array();
-        // 4 cases we need to account for:
-        // 1 old attendee_details row with a quantity of X (no mer)
-        // Y old attendee_details rows with a quantity of 1 (no mer) joined by their common registration_id
-        // Y old attendee_details rows with a quantity of x (because of mer)
-        // Y old attendee_details rows with a quantity of 1 (because of mer) joined by wp_events_multi_event_registration_id_group
-        for ($count = 1; $count <= $regs_on_this_row; $count++) {
-            // sum regs on older rows
-            $regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee, true);
-            $cols_n_values = array(
-                'EVT_ID' => $new_event_id,
-                'ATT_ID' => $new_attendee_id,
-                'TXN_ID' => $new_txn_id,
-                'TKT_ID' => $ticket_id,
-                'STS_ID' => $STS_ID,
-                'REG_date' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
-                'REG_final_price' => $old_attendee['final_price'],
-                'REG_session' => substr($old_attendee['attendee_session'], 0, 44),
-                'REG_code' => sanitize_key($old_attendee['registration_id']),
-                'REG_url_link' => sanitize_key($old_attendee['registration_id'] . '-' . $count),
-                'REG_count' => $regs_on_this_event_and_txn + $count,
-                'REG_group_size' => $this->_sum_old_attendees_on_old_txn($old_attendee, false),
-                'REG_att_is_going' => true,
-                'REG_deleted' => false
-            );
-            $datatypes = array(
-                '%d',// EVT_ID
-                '%d',// ATT_ID
-                '%d',// TXN_ID
-                '%d',// TKT_ID
-                '%s',// STS_ID
-                '%s',// REG_date
-                '%f',// REG_final_price
-                '%s',// REG_session
-                '%s',// REG_code
-                '%s',// REG_url_link
-                '%d',// REG_count
-                '%d',// REG_group_size
-                '%d',// REG_att_is_going
-                '%d',// REG_deleted
-            );
-            $success = $wpdb->insert($this->_new_reg_table, $cols_n_values, $datatypes);
-            if (!$success) {
-                $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
-                return 0;
-            }
-            $cols_n_values['REG_ID'] = $wpdb->insert_id;
-            $new_regs[] = $wpdb->insert_id;
-        }
-        $this->_add_regs_to_ticket_and_datetimes($ticket_id, count($new_regs), $STS_ID);
-        return $new_regs;
-    }
-
-    /**
-     * Increments the sold values on the ticket and its related datetimes by the amount sold,
-     * which should be done directly after adding the rows. Yes this means we're constantly incrementing
-     * the sold amounts as we go, and is less efficient than a single big query,
-     * but its safer because we KNOW these regs have been added, rather than inferring
-     * that they WILL be added (because the attendees stage runs nearly last during
-     * the migration script)
-     * @param type $new_ticket_id
-     * @param type $sold
-     * @param type $STS_ID
-     * @return boolean whether they were successfully updated or not
-     */
-    protected function _add_regs_to_ticket_and_datetimes($new_ticket_id, $quantity_sold, $STS_ID)
-    {
-        if ($STS_ID != 'RAP') {
-            return true;
-        }
-        global $wpdb;
-        $success = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d", $quantity_sold, $new_ticket_id));
-        if ($success) {
-            // get the ticket's datetimes, and increment them too
-            $success_update_dateimtes = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} TKT
+		$this->_old_mer_table = $wpdb->prefix . "events_multi_event_registration_id_group";
+		$this->_new_attendee_cpt_table = $wpdb->posts;
+		$this->_new_attendee_meta_table = $wpdb->prefix . "esp_attendee_meta";
+		$this->_new_reg_table = $wpdb->prefix . "esp_registration";
+		$this->_new_transaction_table = $wpdb->prefix . "esp_transaction";
+		$this->_new_payment_table = $wpdb->prefix . "esp_payment";
+		$this->_new_line_table = $wpdb->prefix . "esp_line_item";
+		$this->_new_ticket_table = $wpdb->prefix . "esp_ticket";
+		$this->_new_ticket_datetime_table = $wpdb->prefix . "esp_datetime_ticket";
+		$this->_new_datetime_table = $wpdb->prefix . "esp_datetime";
+		$this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
+		$this->_new_price_table = $wpdb->prefix . "esp_price";
+		$this->_new_ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+		parent::__construct();
+	}
+
+	protected function _migrate_old_row($old_row)
+	{
+		// first check if there's already a new attendee with similar characteristics
+		$new_att_id = $this->_find_attendee_cpt_matching($old_row);
+		if (!$new_att_id) {
+			$new_att_id = $this->_insert_new_attendee_cpt($old_row);
+			if (!$new_att_id) {
+				// if we couldnt even make an attendee, abandon all hope
+				return false;
+			}
+			$new_att_meta_id = $this->_insert_attendee_meta_row($old_row, $new_att_id);
+			if ($new_att_meta_id) {
+				$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_meta_table, $new_att_meta_id);
+			}
+		}
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_cpt_table, $new_att_id);
+
+		$txn_id = $this->_insert_new_transaction($old_row);
+		if (!$txn_id) {
+			// if we couldnt make the transaction, also abandon all hope
+			return false;
+		}
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_transaction_table, $txn_id);
+		$pay_id = $this->_insert_new_payment($old_row, $txn_id);
+		if ($pay_id) {
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_payment_table, $pay_id);
+		}
+
+
+		// even if there was no payment, we can go ahead with adding the reg
+		$new_regs = $this->_insert_new_registrations($old_row, $new_att_id, $txn_id);
+		if ($new_regs) {
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_reg_table, $new_regs);
+		}
+	}
+
+	/**
+	 * Checks if there's already an attendee CPT in the db that has the same
+	 * first and last name, and email. If so, returns its ID as an int.
+	 * @global type $wpdb
+	 * @param array $old_attendee
+	 * @return int
+	 */
+	private function _find_attendee_cpt_matching($old_attendee)
+	{
+		global $wpdb;
+		$existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . $this->_new_attendee_cpt_table . " AS cpt INNER JOIN " . $this->_new_attendee_meta_table . " AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1", $old_attendee['fname'], $old_attendee['lname'], $old_attendee['email']));
+		return intval($existing_attendee_id);
+	}
+
+	private function _insert_new_attendee_cpt($old_attendee)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'post_title' => stripslashes($old_attendee['fname'] . " " . $old_attendee['lname']),// ATT_full_name
+			'post_content' => '',// ATT_bio
+			'post_name' => sanitize_title($old_attendee['fname'] . "-" . $old_attendee['lname']),// ATT_slug
+			'post_date' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),// ATT_created
+			'post_excerpt' => '',// ATT_short_bio
+			'post_modified' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),// ATT_modified
+			'post_author' => 0,// ATT_author
+			'post_parent' => 0,// ATT_parent
+			'post_type' => 'espresso_attendees',// post_type
+			'post_status' => 'publish'// status
+		);
+		$datatypes = array(
+			'%s',// ATT_full_name
+			'%s',// ATT_bio
+			'%s',// ATT_slug
+			'%s',// ATT_created
+			'%s',// ATT_short_bio
+			'%s',// ATT_modified
+			'%d',// ATT_author
+			'%d',// ATT_parent
+			'%s',// post_type
+			'%s',// status
+		);
+		$success = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $datatypes);
+		if (!$success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
+
+	private function _insert_attendee_meta_row($old_attendee, $new_attendee_cpt_id)
+	{
+		global $wpdb;
+		// get the state and country ids from the old row
+		try {
+			$new_country = $this->get_migration_script()->get_or_create_country(stripslashes($old_attendee['country_id']));
+			$new_country_iso = $new_country['CNT_ISO'];
+		} catch (EE_Error $exception) {
+			$new_country_iso = $this->get_migration_script()->get_default_country_iso();
+		}
+		try {
+			$new_state = $this->get_migration_script()->get_or_create_state(stripslashes($old_attendee['state']), $new_country_iso);
+			$new_state_id = $new_state['STA_ID'];
+		} catch (EE_Error $exception) {
+			$new_state_id = 0;
+		}
+		$cols_n_values = array(
+			'ATT_ID' => $new_attendee_cpt_id,
+			'ATT_fname' => stripslashes($old_attendee['fname']),
+			'ATT_lname' => stripslashes($old_attendee['lname']),
+			'ATT_address' => stripslashes($old_attendee['address']),
+			'ATT_address2' => stripslashes($old_attendee['address2']),
+			'ATT_city' => stripslashes($old_attendee['city']),
+			'STA_ID' => $new_state_id,
+			'CNT_ISO' => $new_country_iso,
+			'ATT_zip' => stripslashes($old_attendee['zip']),
+			'ATT_email' => stripslashes($old_attendee['email']),
+			'ATT_phone' => stripslashes($old_attendee['phone']),
+		);
+		$datatypes = array(
+			'%d',// ATT_ID
+			'%s',// ATT_fname
+			'%s',// ATT_lname
+			'%s',// ATT_address
+			'%s',// ATT_address2
+			'%s',// ATT_city
+			'%d',// STA_ID
+			'%s',// CNT_ISO
+			'%s',// ATT_zip
+			'%s',// ATT_email
+			'%s',// ATT_phone
+		);
+		$success = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $datatypes);
+		if (!$success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_meta_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
+
+	/**
+	 * Note: we don't necessarily create a new transaction for each attendee row.
+	 * Only if the old attendee 'is_primary' is true; otherwise we find the old attendee row that
+	 * 'is_primary' and has the same 'txn_id', then we return ITS new transaction id
+	 * @global type $wpdb
+	 * @param type $old_attendee
+	 * @return int new transaction id
+	 */
+	private function _insert_new_transaction($old_attendee)
+	{
+		global $wpdb;
+
+		// first: let's check for an existing transaction for this old attendee
+		if (intval($old_attendee['is_primary'])) {// primary attendee, so create txn
+			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table);
+		} else { // non-primary attendee, so find its primary attendee's transaction
+			$primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . $this->_old_table . " WHERE is_primary=1 and registration_id=%s", $old_attendee['registration_id']));
+			if (!$primary_attendee_old_id) {
+				$primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
+				$primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : null;
+			}
+			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($primary_attendee_old_id), $this->_new_transaction_table);
+			if (!$txn_id) {
+				$this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"), $this->_json_encode($old_attendee), $primary_attendee_old_id));
+				$txn_id = 0;
+			}
+		}
+		// if there isn't yet a transaction row for this, create one
+		// (so even if it was a non-primary attendee with no EE3 primary attendee,
+		// it ought to have SOME transaction, so we'll make one)
+		if (!$txn_id) {
+			// maps 3.1 payment stati onto 4.1 transaction stati
+			$txn_status_mapping = array(
+				'Completed' => 'TCM',
+				'Pending' => 'TIN',
+				'Payment Declined' => 'TIN',
+				'Incomplete' => 'TIN',
+				'Not Completed' => 'TIN',
+				'Cancelled' => 'TIN',
+				'Declined' => 'TIN'
+			);
+			$STS_ID = isset($txn_status_mapping[ $old_attendee['payment_status'] ]) ? $txn_status_mapping[ $old_attendee['payment_status'] ] : 'TIN';
+			$cols_n_values = array(
+				'TXN_timestamp' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
+				'TXN_total' => floatval($old_attendee['total_cost']),
+				'TXN_paid' => floatval($old_attendee['amount_pd']),
+				'STS_ID' => $STS_ID,
+				'TXN_hash_salt' => $old_attendee['hashSalt']
+			);
+			$datatypes = array(
+				'%s',// TXN_timestamp
+				'%f',// TXN_total
+				'%f',// TXN_paid
+				'%s',// STS_ID
+				'%s',// TXN_hash_salt
+			);
+			$success = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $datatypes);
+			if (!$success) {
+				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_transaction_table, $cols_n_values, $datatypes));
+				return 0;
+			}
+			$txn_id = $wpdb->insert_id;
+		}
+
+		return $txn_id;
+	}
+
+	/**
+	 * Detects if the MER tables exist
+	 * @global type $wpdb
+	 * @return boolean
+	 */
+	private function _mer_tables_exist()
+	{
+		if ($this->_mer_tables_exist === null) {
+			global $wpdb;
+
+			if ($wpdb->get_var("SHOW TABLES LIKE '{$this->_old_mer_table}'") != $this->_old_mer_table) {
+				$this->_mer_tables_exist = false;
+			} else {
+				$this->_mer_tables_exist = true;
+			}
+		}
+		return $this->_mer_tables_exist;
+	}
+
+	/**
+	 * Gets the 4.1 registration's status given the 3.1 attendee row. We consider
+	 * whether the event required pre-approval or not,a dn the 4.1 payment status.
+	 * @global type $wpdb
+	 * @param type $old_attendee_row
+	 * @return string
+	 */
+	private function _get_reg_status_for_old_payment_status($old_attendee_row)
+	{
+		// need event default reg status and if pre_approval was required
+		global $wpdb;
+		$event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM " . $wpdb->prefix . "events_detail WHERE id = %d", $old_attendee_row['event_id']));
+		return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
+			$old_attendee_row['payment_status'],
+			intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve'])
+		);
+	}
+
+	/**
+	 * Adds however many rgistrations are indicated by the old attendee's QUANTITY field,
+	 * and returns an array of their IDs
+	 * @global type $wpdb
+	 * @param array $old_attendee
+	 * @param int $new_attendee_id
+	 * @param int $new_txn_id
+	 * @return array of new registratio ids
+	 */
+	private function _insert_new_registrations($old_attendee, $new_attendee_id, $new_txn_id)
+	{
+		global $wpdb;
+
+		$STS_ID = $this->_get_reg_status_for_old_payment_status($old_attendee);
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . 'events_detail', $old_attendee['event_id'], $wpdb->posts);
+		if (!$new_event_id) {
+			$this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"), $old_attendee['event_id'], $this->_json_encode($old_attendee)));
+		}
+
+		$ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
+		if (!$ticket_id) {
+			$ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
+			$this->add_error(sprintf(__('Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso'), $old_attendee['id'], $new_event_id, $ticket_id));
+		}
+		$regs_on_this_row = intval($old_attendee['quantity']);
+		$new_regs = array();
+		// 4 cases we need to account for:
+		// 1 old attendee_details row with a quantity of X (no mer)
+		// Y old attendee_details rows with a quantity of 1 (no mer) joined by their common registration_id
+		// Y old attendee_details rows with a quantity of x (because of mer)
+		// Y old attendee_details rows with a quantity of 1 (because of mer) joined by wp_events_multi_event_registration_id_group
+		for ($count = 1; $count <= $regs_on_this_row; $count++) {
+			// sum regs on older rows
+			$regs_on_this_event_and_txn = $this->_sum_old_attendees_on_old_txn($old_attendee, true);
+			$cols_n_values = array(
+				'EVT_ID' => $new_event_id,
+				'ATT_ID' => $new_attendee_id,
+				'TXN_ID' => $new_txn_id,
+				'TKT_ID' => $ticket_id,
+				'STS_ID' => $STS_ID,
+				'REG_date' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
+				'REG_final_price' => $old_attendee['final_price'],
+				'REG_session' => substr($old_attendee['attendee_session'], 0, 44),
+				'REG_code' => sanitize_key($old_attendee['registration_id']),
+				'REG_url_link' => sanitize_key($old_attendee['registration_id'] . '-' . $count),
+				'REG_count' => $regs_on_this_event_and_txn + $count,
+				'REG_group_size' => $this->_sum_old_attendees_on_old_txn($old_attendee, false),
+				'REG_att_is_going' => true,
+				'REG_deleted' => false
+			);
+			$datatypes = array(
+				'%d',// EVT_ID
+				'%d',// ATT_ID
+				'%d',// TXN_ID
+				'%d',// TKT_ID
+				'%s',// STS_ID
+				'%s',// REG_date
+				'%f',// REG_final_price
+				'%s',// REG_session
+				'%s',// REG_code
+				'%s',// REG_url_link
+				'%d',// REG_count
+				'%d',// REG_group_size
+				'%d',// REG_att_is_going
+				'%d',// REG_deleted
+			);
+			$success = $wpdb->insert($this->_new_reg_table, $cols_n_values, $datatypes);
+			if (!$success) {
+				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
+				return 0;
+			}
+			$cols_n_values['REG_ID'] = $wpdb->insert_id;
+			$new_regs[] = $wpdb->insert_id;
+		}
+		$this->_add_regs_to_ticket_and_datetimes($ticket_id, count($new_regs), $STS_ID);
+		return $new_regs;
+	}
+
+	/**
+	 * Increments the sold values on the ticket and its related datetimes by the amount sold,
+	 * which should be done directly after adding the rows. Yes this means we're constantly incrementing
+	 * the sold amounts as we go, and is less efficient than a single big query,
+	 * but its safer because we KNOW these regs have been added, rather than inferring
+	 * that they WILL be added (because the attendees stage runs nearly last during
+	 * the migration script)
+	 * @param type $new_ticket_id
+	 * @param type $sold
+	 * @param type $STS_ID
+	 * @return boolean whether they were successfully updated or not
+	 */
+	protected function _add_regs_to_ticket_and_datetimes($new_ticket_id, $quantity_sold, $STS_ID)
+	{
+		if ($STS_ID != 'RAP') {
+			return true;
+		}
+		global $wpdb;
+		$success = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} SET TKT_sold=TKT_sold+%d WHERE TKT_ID=%d", $quantity_sold, $new_ticket_id));
+		if ($success) {
+			// get the ticket's datetimes, and increment them too
+			$success_update_dateimtes = $wpdb->query($wpdb->prepare("UPDATE {$this->_new_ticket_table} TKT
 				INNER JOIN {$this->_new_ticket_datetime_table} as DTK ON TKT.TKT_ID = DTK.TKT_ID
 				INNER JOIN {$this->_new_datetime_table} as DTT ON DTK.DTT_ID = DTT.DTT_ID
 				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d", $quantity_sold, $new_ticket_id));
-            if (!$success_update_dateimtes) {
-                $this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
-            }
-        } else {
-            $this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
-        }
-        return true;
-    }
-
-    /**
-     * Makes a best guess at which ticket is the one the attendee purchased.
-     * Obviously, the old attendee's event_id narrows it down quite a bit;
-     * then the old attendee's orig_price and event_time, and price_option can uniquely identify the ticket
-     * however, if we don't find an exact match, see if any of those conditions match;
-     * and lastly if none of that works, just use the first ticket for the event we find
-     * @param array $old_attendee
-     */
-    private function _try_to_find_new_ticket_id($old_attendee, $new_event_id)
-    {
-        global $wpdb;
-        $tickets_table = $this->_new_ticket_table;
-        $datetime_tickets_table = $this->_new_ticket_datetime_table;
-        $datetime_table = $this->_new_datetime_table;
-
-        $old_att_price_option = $old_attendee['price_option'];
-        $old_att_price = floatval($old_attendee['orig_price']);
-
-        $old_att_start_date = $old_attendee['start_date'];
-        $old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-        $old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
-        // add all conditions to an array from which we can SHIFT conditions off in order to widen our search
-        // the most important condition should be last, as it will be array_shift'ed off last
-        $conditions = array(
-            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime),// times match?
-            $wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price),// prices match?
-            $wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option),// names match?
-            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
-        );
-        $select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
+			if (!$success_update_dateimtes) {
+				$this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
+			}
+		} else {
+			$this->add_error(sprintf(__("Could not update ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
+		}
+		return true;
+	}
+
+	/**
+	 * Makes a best guess at which ticket is the one the attendee purchased.
+	 * Obviously, the old attendee's event_id narrows it down quite a bit;
+	 * then the old attendee's orig_price and event_time, and price_option can uniquely identify the ticket
+	 * however, if we don't find an exact match, see if any of those conditions match;
+	 * and lastly if none of that works, just use the first ticket for the event we find
+	 * @param array $old_attendee
+	 */
+	private function _try_to_find_new_ticket_id($old_attendee, $new_event_id)
+	{
+		global $wpdb;
+		$tickets_table = $this->_new_ticket_table;
+		$datetime_tickets_table = $this->_new_ticket_datetime_table;
+		$datetime_table = $this->_new_datetime_table;
+
+		$old_att_price_option = $old_attendee['price_option'];
+		$old_att_price = floatval($old_attendee['orig_price']);
+
+		$old_att_start_date = $old_attendee['start_date'];
+		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
+		$old_att_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
+		// add all conditions to an array from which we can SHIFT conditions off in order to widen our search
+		// the most important condition should be last, as it will be array_shift'ed off last
+		$conditions = array(
+			$wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime),// times match?
+			$wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price),// prices match?
+			$wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option),// names match?
+			$wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+		);
+		$select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
 			$datetime_tickets_table ON $tickets_table.TKT_ID = $datetime_tickets_table.TKT_ID INNER JOIN
 			$datetime_table ON $datetime_tickets_table.DTT_ID = $datetime_table.DTT_ID";
-        // start running queries, widening search each time by removing a condition
-        do {
-            $full_query = $select_and_join_part . " WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
-            $ticket_id_found = $wpdb->get_var($full_query);
-            array_shift($conditions);
-        } while (!$ticket_id_found && $conditions);
-        return $ticket_id_found;
-    }
-
-    /**
-     * If we couldn't find a 4.1 ticket for a 3.1 attendee row, this function creates one;
-     * and it also tries to find a datetime that works, and a inserts a price, and associates
-     * the new ticket to that datetime and price.
-     * @return int ticket id
-     */
-    private function _insert_new_ticket_because_none_found($old_attendee, $new_event_id)
-    {
-        global $wpdb;
-        $old_att_price_option = $old_attendee['price_option'];
-        $old_att_price = floatval($old_attendee['orig_price']);
-
-        $old_att_start_date = $old_attendee['start_date'];
-        $old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-        $old_att_start_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
-
-
-        // insert new datetime unless we find one
-        $datetime_id = $wpdb->get_var($wpdb->prepare("SELECT DTT_ID FROM " . $this->_new_datetime_table . " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id), ARRAY_A);
-        if (!$datetime_id) {
-            $old_att_end_date = $old_attendee['start_date'];
-            $old_att_end_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
-            $old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_end_date $old_att_end_time:00");
-            $wpdb->insert(
-                $this->_new_datetime_table,
-                array(
-                    'EVT_ID' => $new_event_id,
-                    'DTT_EVT_start' => $old_att_start_datetime,
-                    'DTT_EVT_end' => $old_att_end_datetime,
-                    'DTT_deleted' => true
-                ),
-                array(
-                    '%d',// EVT_ID
-                    '%s',// DTT_EVT_start
-                    '%s',// DTT_EVT_end
-                    '%d',// DTT_deleted
-                )
-            );
-            $datetime_id = $wpdb->insert_id;
-        }
-
-        // insert new ticket
-        $success = $wpdb->insert(
-            $wpdb->prefix . 'esp_ticket',
-            array(
-                'TKT_name' => $old_att_price_option,
-                'TKT_qty' => -1,
-                'TKT_price' => $old_att_price,
-                'TKT_start_date' => $old_att_start_datetime,// we really have no clue what the time should be, but at least it was available when they attended
-                'TKT_end_date' => $old_att_end_datetime,
-
-            ),
-            array(
-                '%s',// name
-                '%d',// qty
-                '%d',// price
-                '%s',// start_date
-                '%s',// end_date
-            )
-        );
-        $ticket_id = $wpdb->insert_id;
-        // associate the ticket with the datetime we found earlier
-        $wpdb->insert(
-            $this->_new_datetime_ticket_table,
-            array(
-                'DTT_ID' => $datetime_id,
-                'TKT_ID' => $ticket_id
-            ),
-            array(
-                '%d',// DTT_ID
-                '%d',// TKT_ID
-            )
-        );
-        // insert new price
-        $wpdb->insert(
-            $this->_new_price_table,
-            array(
-                'PRC_amount' => $old_att_price,
-                'PRT_ID' => EE_DMS_4_1_0_prices::price_type_base,
-                'PRC_name' => $old_att_price_option,
-                'PRC_deleted' => true
-            ),
-            array(
-                '%d',// PRC_amount
-                '%d',// PRT_ID
-                '%s',// PRC_name
-                '%d',// PRC_deleted
-            )
-        );
-        $price_id = $wpdb->insert_id;
-        // associate the price to the ticket
-        $wpdb->insert(
-            $this->_new_ticket_price_table,
-            array(
-                'TKT_ID' => $ticket_id,
-                'PRC_ID' => $price_id
-            ),
-            array(
-                '%d',// TKT_ID
-                '%d',// PRC_ID
-            )
-        );
-        return $ticket_id;
-    }
-
-    /**
-     * Counts all the registrations on this transaction. If $count_only_older is TRUE then returns the number added SO FAR (ie,
-     * only considers attendee rows with an ID less than this one's), but if $count_only_older is FALSe returns ALL
-     * @global type $wpdb
-     * @param array $old_attendee_row
-     * @param boolean $count_only_older true if you want the running count (ie, the total up to this row), and false if you want ALL
-     * @return int
-     */
-    private function _sum_old_attendees_on_old_txn($old_attendee_row, $count_only_older = false)
-    {
-        global $wpdb;
-        $count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
-        $count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM " . $this->_old_table . " WHERE registration_id=%s $count_only_older_sql", $old_attendee_row['registration_id'])));
-
-        if ($this->_mer_tables_exist()) {
-            // if MER exists, then its a little tricky.
-            // when users registered by adding items to the cart, and it was a
-            // group registration requiring additional attendee INFO, then the attendee rows
-            // DO NOT have the same registration_id (although they probably should have)
-            // they are related just like MER attendee rows are related, through the MER group table
-            // BUT we want to count all the MER attendee rows for the same registration
-            $primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee_row['registration_id']);
-
-            $count_using_mer_table = $wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM {$this->_old_table} att INNER JOIN {$this->_old_mer_table} mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql", $old_attendee_row['event_id'], $primary_attendee['registration_id']));
-            $count = max($count_using_mer_table, $count);
-        }
-        return $count;
-    }
-
-    private function _insert_new_payment($old_attendee, $new_txn_id)
-    {
-        global $wpdb;
-        // Only add a payment for primary attendees. Important note: partial payments were marked as "Pending".
-        // Also, an offline payment had blank status (ie, "").
-        $old_pay_stati_indicating_no_payment = array('', 'Incomplete', 'Not Completed');
-        // if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
-        if (intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && !in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)) {
-            $pay_status_mapping = array(
-                'Completed' => 'PAP',
-                'Payment Declined' => 'PDC',
-                'Cancelled' => 'PCN',
-                'Declined' => 'PDC'
-            );
-            $by_admin = $old_attendee['payment'] == 'Admin';
-            $STS_ID = isset($pay_status_mapping[ $old_attendee['payment_status'] ]) ? $pay_status_mapping[ $old_attendee['payment_status'] ] : 'PFL';// IE, if we don't recognize the status, assume payment failed
-            $cols_n_values = array(
-                'TXN_ID' => $new_txn_id,
-                'STS_ID' => $STS_ID,
-                'PAY_timestamp' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
-                'PAY_method' => 'CART',
-                'PAY_amount' => $old_attendee['amount_pd'],
-                // 'txn_type' was used both for the gateway's name, and for other payment notes.
-                'PAY_gateway' => $old_attendee['txn_type'],
-                'PAY_extra_accntng' => $old_attendee['txn_type'],
-                'PAY_gateway_response' => '',
-                'PAY_txn_id_chq_nmbr' => substr($old_attendee['txn_id'], 0, 32),
-                'PAY_via_admin' => $by_admin,
-                'PAY_details' => $old_attendee['transaction_details']
-            );
-            $datatypes = array(
-                '%d',// TXN_Id
-                '%s',// STS_ID
-                '%s',// PAY_timestamp
-                '%s',// PAY_method
-                '%f',// PAY_amount
-                '%s',// PAY_gateway
-                '%s',// PAY_gateway_response
-                '%s',// PAY_txn_id_chq_nmbr
-                '%d',// PAY_via_admin
-                '%s',// PAY_details
-            );
-            $success = $wpdb->insert($this->_new_payment_table, $cols_n_values, $datatypes);
-            if (!$success) {
-                $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
-                return 0;
-            }
-            $new_id = $wpdb->insert_id;
-            return $new_id;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * If MER is active, if you want ot fin dthe other registrations on that attendee row
-     * @global type $wpdb
-     * @param type $old_registration_id
-     * @return array
-     */
-    private function _find_mer_primary_attendee_using_mer_tables($old_registration_id)
-    {
-        if (!$this->_mer_tables_exist()) {
-            return false;
-        }
-        global $wpdb;
-        $old_att_for_primary_reg = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$this->_old_mer_table} AS mer INNER JOIN {$this->_old_table} AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1", $old_registration_id), ARRAY_A);
-        return $old_att_for_primary_reg;
-    }
+		// start running queries, widening search each time by removing a condition
+		do {
+			$full_query = $select_and_join_part . " WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
+			$ticket_id_found = $wpdb->get_var($full_query);
+			array_shift($conditions);
+		} while (!$ticket_id_found && $conditions);
+		return $ticket_id_found;
+	}
+
+	/**
+	 * If we couldn't find a 4.1 ticket for a 3.1 attendee row, this function creates one;
+	 * and it also tries to find a datetime that works, and a inserts a price, and associates
+	 * the new ticket to that datetime and price.
+	 * @return int ticket id
+	 */
+	private function _insert_new_ticket_because_none_found($old_attendee, $new_event_id)
+	{
+		global $wpdb;
+		$old_att_price_option = $old_attendee['price_option'];
+		$old_att_price = floatval($old_attendee['orig_price']);
+
+		$old_att_start_date = $old_attendee['start_date'];
+		$old_att_start_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
+		$old_att_start_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_start_date $old_att_start_time:00");
+
+
+		// insert new datetime unless we find one
+		$datetime_id = $wpdb->get_var($wpdb->prepare("SELECT DTT_ID FROM " . $this->_new_datetime_table . " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id), ARRAY_A);
+		if (!$datetime_id) {
+			$old_att_end_date = $old_attendee['start_date'];
+			$old_att_end_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
+			$old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_end_date $old_att_end_time:00");
+			$wpdb->insert(
+				$this->_new_datetime_table,
+				array(
+					'EVT_ID' => $new_event_id,
+					'DTT_EVT_start' => $old_att_start_datetime,
+					'DTT_EVT_end' => $old_att_end_datetime,
+					'DTT_deleted' => true
+				),
+				array(
+					'%d',// EVT_ID
+					'%s',// DTT_EVT_start
+					'%s',// DTT_EVT_end
+					'%d',// DTT_deleted
+				)
+			);
+			$datetime_id = $wpdb->insert_id;
+		}
+
+		// insert new ticket
+		$success = $wpdb->insert(
+			$wpdb->prefix . 'esp_ticket',
+			array(
+				'TKT_name' => $old_att_price_option,
+				'TKT_qty' => -1,
+				'TKT_price' => $old_att_price,
+				'TKT_start_date' => $old_att_start_datetime,// we really have no clue what the time should be, but at least it was available when they attended
+				'TKT_end_date' => $old_att_end_datetime,
+
+			),
+			array(
+				'%s',// name
+				'%d',// qty
+				'%d',// price
+				'%s',// start_date
+				'%s',// end_date
+			)
+		);
+		$ticket_id = $wpdb->insert_id;
+		// associate the ticket with the datetime we found earlier
+		$wpdb->insert(
+			$this->_new_datetime_ticket_table,
+			array(
+				'DTT_ID' => $datetime_id,
+				'TKT_ID' => $ticket_id
+			),
+			array(
+				'%d',// DTT_ID
+				'%d',// TKT_ID
+			)
+		);
+		// insert new price
+		$wpdb->insert(
+			$this->_new_price_table,
+			array(
+				'PRC_amount' => $old_att_price,
+				'PRT_ID' => EE_DMS_4_1_0_prices::price_type_base,
+				'PRC_name' => $old_att_price_option,
+				'PRC_deleted' => true
+			),
+			array(
+				'%d',// PRC_amount
+				'%d',// PRT_ID
+				'%s',// PRC_name
+				'%d',// PRC_deleted
+			)
+		);
+		$price_id = $wpdb->insert_id;
+		// associate the price to the ticket
+		$wpdb->insert(
+			$this->_new_ticket_price_table,
+			array(
+				'TKT_ID' => $ticket_id,
+				'PRC_ID' => $price_id
+			),
+			array(
+				'%d',// TKT_ID
+				'%d',// PRC_ID
+			)
+		);
+		return $ticket_id;
+	}
+
+	/**
+	 * Counts all the registrations on this transaction. If $count_only_older is TRUE then returns the number added SO FAR (ie,
+	 * only considers attendee rows with an ID less than this one's), but if $count_only_older is FALSe returns ALL
+	 * @global type $wpdb
+	 * @param array $old_attendee_row
+	 * @param boolean $count_only_older true if you want the running count (ie, the total up to this row), and false if you want ALL
+	 * @return int
+	 */
+	private function _sum_old_attendees_on_old_txn($old_attendee_row, $count_only_older = false)
+	{
+		global $wpdb;
+		$count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
+		$count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM " . $this->_old_table . " WHERE registration_id=%s $count_only_older_sql", $old_attendee_row['registration_id'])));
+
+		if ($this->_mer_tables_exist()) {
+			// if MER exists, then its a little tricky.
+			// when users registered by adding items to the cart, and it was a
+			// group registration requiring additional attendee INFO, then the attendee rows
+			// DO NOT have the same registration_id (although they probably should have)
+			// they are related just like MER attendee rows are related, through the MER group table
+			// BUT we want to count all the MER attendee rows for the same registration
+			$primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee_row['registration_id']);
+
+			$count_using_mer_table = $wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM {$this->_old_table} att INNER JOIN {$this->_old_mer_table} mer ON att.registration_id = mer.registration_id WHERE att.event_id=%d AND mer.primary_registration_id = %s $count_only_older_sql", $old_attendee_row['event_id'], $primary_attendee['registration_id']));
+			$count = max($count_using_mer_table, $count);
+		}
+		return $count;
+	}
+
+	private function _insert_new_payment($old_attendee, $new_txn_id)
+	{
+		global $wpdb;
+		// Only add a payment for primary attendees. Important note: partial payments were marked as "Pending".
+		// Also, an offline payment had blank status (ie, "").
+		$old_pay_stati_indicating_no_payment = array('', 'Incomplete', 'Not Completed');
+		// if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
+		if (intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && !in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)) {
+			$pay_status_mapping = array(
+				'Completed' => 'PAP',
+				'Payment Declined' => 'PDC',
+				'Cancelled' => 'PCN',
+				'Declined' => 'PDC'
+			);
+			$by_admin = $old_attendee['payment'] == 'Admin';
+			$STS_ID = isset($pay_status_mapping[ $old_attendee['payment_status'] ]) ? $pay_status_mapping[ $old_attendee['payment_status'] ] : 'PFL';// IE, if we don't recognize the status, assume payment failed
+			$cols_n_values = array(
+				'TXN_ID' => $new_txn_id,
+				'STS_ID' => $STS_ID,
+				'PAY_timestamp' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
+				'PAY_method' => 'CART',
+				'PAY_amount' => $old_attendee['amount_pd'],
+				// 'txn_type' was used both for the gateway's name, and for other payment notes.
+				'PAY_gateway' => $old_attendee['txn_type'],
+				'PAY_extra_accntng' => $old_attendee['txn_type'],
+				'PAY_gateway_response' => '',
+				'PAY_txn_id_chq_nmbr' => substr($old_attendee['txn_id'], 0, 32),
+				'PAY_via_admin' => $by_admin,
+				'PAY_details' => $old_attendee['transaction_details']
+			);
+			$datatypes = array(
+				'%d',// TXN_Id
+				'%s',// STS_ID
+				'%s',// PAY_timestamp
+				'%s',// PAY_method
+				'%f',// PAY_amount
+				'%s',// PAY_gateway
+				'%s',// PAY_gateway_response
+				'%s',// PAY_txn_id_chq_nmbr
+				'%d',// PAY_via_admin
+				'%s',// PAY_details
+			);
+			$success = $wpdb->insert($this->_new_payment_table, $cols_n_values, $datatypes);
+			if (!$success) {
+				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
+				return 0;
+			}
+			$new_id = $wpdb->insert_id;
+			return $new_id;
+		} else {
+			return 0;
+		}
+	}
+
+	/**
+	 * If MER is active, if you want ot fin dthe other registrations on that attendee row
+	 * @global type $wpdb
+	 * @param type $old_registration_id
+	 * @return array
+	 */
+	private function _find_mer_primary_attendee_using_mer_tables($old_registration_id)
+	{
+		if (!$this->_mer_tables_exist()) {
+			return false;
+		}
+		global $wpdb;
+		$old_att_for_primary_reg = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$this->_old_mer_table} AS mer INNER JOIN {$this->_old_table} AS att ON mer.primary_registration_id = att.registration_id WHERE mer.registration_id=%s LIMIT 1", $old_registration_id), ARRAY_A);
+		return $old_att_for_primary_reg;
+	}
 }

Spacing +124 added lines, -124 removed lines

@@ -206,26 +206,26 @@ 
     {
         global $wpdb;
         $this->_pretty_name = __("Attendees", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "events_attendee";
+        $this->_old_table = $wpdb->prefix."events_attendee";
         // Only select the event status column from the event table.
         $this->select_expression = 'att.*, e.event_status';
         // Only select attendees for events that aren't deleted.
         $this->_extra_where_sql = 'AS att
-            INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id=e.id
+            INNER JOIN ' . $wpdb->prefix.'events_detail AS e ON att.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_old_mer_table = $wpdb->prefix . "events_multi_event_registration_id_group";
+        $this->_old_mer_table = $wpdb->prefix."events_multi_event_registration_id_group";
         $this->_new_attendee_cpt_table = $wpdb->posts;
-        $this->_new_attendee_meta_table = $wpdb->prefix . "esp_attendee_meta";
-        $this->_new_reg_table = $wpdb->prefix . "esp_registration";
-        $this->_new_transaction_table = $wpdb->prefix . "esp_transaction";
-        $this->_new_payment_table = $wpdb->prefix . "esp_payment";
-        $this->_new_line_table = $wpdb->prefix . "esp_line_item";
-        $this->_new_ticket_table = $wpdb->prefix . "esp_ticket";
-        $this->_new_ticket_datetime_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_datetime_table = $wpdb->prefix . "esp_datetime";
-        $this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
-        $this->_new_price_table = $wpdb->prefix . "esp_price";
-        $this->_new_ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+        $this->_new_attendee_meta_table = $wpdb->prefix."esp_attendee_meta";
+        $this->_new_reg_table = $wpdb->prefix."esp_registration";
+        $this->_new_transaction_table = $wpdb->prefix."esp_transaction";
+        $this->_new_payment_table = $wpdb->prefix."esp_payment";
+        $this->_new_line_table = $wpdb->prefix."esp_line_item";
+        $this->_new_ticket_table = $wpdb->prefix."esp_ticket";
+        $this->_new_ticket_datetime_table = $wpdb->prefix."esp_datetime_ticket";
+        $this->_new_datetime_table = $wpdb->prefix."esp_datetime";
+        $this->_new_datetime_ticket_table = $wpdb->prefix."esp_datetime_ticket";
+        $this->_new_price_table = $wpdb->prefix."esp_price";
+        $this->_new_ticket_price_table = $wpdb->prefix."esp_ticket_price";
         parent::__construct();
     }
 
@@ -233,9 +233,9 @@ 
     {
         // first check if there's already a new attendee with similar characteristics
         $new_att_id = $this->_find_attendee_cpt_matching($old_row);
-        if (!$new_att_id) {
+        if ( ! $new_att_id) {
             $new_att_id = $this->_insert_new_attendee_cpt($old_row);
-            if (!$new_att_id) {
+            if ( ! $new_att_id) {
                 // if we couldnt even make an attendee, abandon all hope
                 return false;
             }
@@ -247,7 +247,7 @@ 
         $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_attendee_cpt_table, $new_att_id);
 
         $txn_id = $this->_insert_new_transaction($old_row);
-        if (!$txn_id) {
+        if ( ! $txn_id) {
             // if we couldnt make the transaction, also abandon all hope
             return false;
         }
@@ -275,7 +275,7 @@ 
     private function _find_attendee_cpt_matching($old_attendee)
     {
         global $wpdb;
-        $existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . $this->_new_attendee_cpt_table . " AS cpt INNER JOIN " . $this->_new_attendee_meta_table . " AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1", $old_attendee['fname'], $old_attendee['lname'], $old_attendee['email']));
+        $existing_attendee_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_new_attendee_cpt_table." AS cpt INNER JOIN ".$this->_new_attendee_meta_table." AS meta ON cpt.ID = meta.ATT_ID WHERE meta.ATT_fname = %s AND meta.ATT_lname = %s AND meta.ATT_email = %s LIMIT 1", $old_attendee['fname'], $old_attendee['lname'], $old_attendee['email']));
         return intval($existing_attendee_id);
     }
 
@@ -283,31 +283,31 @@ 
     {
         global $wpdb;
         $cols_n_values = array(
-            'post_title' => stripslashes($old_attendee['fname'] . " " . $old_attendee['lname']),// ATT_full_name
-            'post_content' => '',// ATT_bio
-            'post_name' => sanitize_title($old_attendee['fname'] . "-" . $old_attendee['lname']),// ATT_slug
-            'post_date' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),// ATT_created
-            'post_excerpt' => '',// ATT_short_bio
-            'post_modified' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),// ATT_modified
-            'post_author' => 0,// ATT_author
-            'post_parent' => 0,// ATT_parent
-            'post_type' => 'espresso_attendees',// post_type
+            'post_title' => stripslashes($old_attendee['fname']." ".$old_attendee['lname']), // ATT_full_name
+            'post_content' => '', // ATT_bio
+            'post_name' => sanitize_title($old_attendee['fname']."-".$old_attendee['lname']), // ATT_slug
+            'post_date' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']), // ATT_created
+            'post_excerpt' => '', // ATT_short_bio
+            'post_modified' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']), // ATT_modified
+            'post_author' => 0, // ATT_author
+            'post_parent' => 0, // ATT_parent
+            'post_type' => 'espresso_attendees', // post_type
             'post_status' => 'publish'// status
         );
         $datatypes = array(
-            '%s',// ATT_full_name
-            '%s',// ATT_bio
-            '%s',// ATT_slug
-            '%s',// ATT_created
-            '%s',// ATT_short_bio
-            '%s',// ATT_modified
-            '%d',// ATT_author
-            '%d',// ATT_parent
-            '%s',// post_type
-            '%s',// status
+            '%s', // ATT_full_name
+            '%s', // ATT_bio
+            '%s', // ATT_slug
+            '%s', // ATT_created
+            '%s', // ATT_short_bio
+            '%s', // ATT_modified
+            '%d', // ATT_author
+            '%d', // ATT_parent
+            '%s', // post_type
+            '%s', // status
         );
         $success = $wpdb->insert($this->_new_attendee_cpt_table, $cols_n_values, $datatypes);
-        if (!$success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -345,20 +345,20 @@ 
             'ATT_phone' => stripslashes($old_attendee['phone']),
         );
         $datatypes = array(
-            '%d',// ATT_ID
-            '%s',// ATT_fname
-            '%s',// ATT_lname
-            '%s',// ATT_address
-            '%s',// ATT_address2
-            '%s',// ATT_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// ATT_zip
-            '%s',// ATT_email
-            '%s',// ATT_phone
+            '%d', // ATT_ID
+            '%s', // ATT_fname
+            '%s', // ATT_lname
+            '%s', // ATT_address
+            '%s', // ATT_address2
+            '%s', // ATT_city
+            '%d', // STA_ID
+            '%s', // CNT_ISO
+            '%s', // ATT_zip
+            '%s', // ATT_email
+            '%s', // ATT_phone
         );
         $success = $wpdb->insert($this->_new_attendee_meta_table, $cols_n_values, $datatypes);
-        if (!$success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_meta_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -382,13 +382,13 @@ 
         if (intval($old_attendee['is_primary'])) {// primary attendee, so create txn
             $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($old_attendee['id']), $this->_new_transaction_table);
         } else { // non-primary attendee, so find its primary attendee's transaction
-            $primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . $this->_old_table . " WHERE is_primary=1 and registration_id=%s", $old_attendee['registration_id']));
-            if (!$primary_attendee_old_id) {
+            $primary_attendee_old_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".$this->_old_table." WHERE is_primary=1 and registration_id=%s", $old_attendee['registration_id']));
+            if ( ! $primary_attendee_old_id) {
                 $primary_attendee = $this->_find_mer_primary_attendee_using_mer_tables($old_attendee['registration_id']);
                 $primary_attendee_old_id = is_array($primary_attendee) ? $primary_attendee['id'] : null;
             }
             $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, intval($primary_attendee_old_id), $this->_new_transaction_table);
-            if (!$txn_id) {
+            if ( ! $txn_id) {
                 $this->add_error(sprintf(__("Could not find primary attendee's new transaction. Current attendee is: %s, we think the 3.1 primary attendee for it has id %d, but there's no 4.1 transaction for that primary attendee id.", "event_espresso"), $this->_json_encode($old_attendee), $primary_attendee_old_id));
                 $txn_id = 0;
             }
@@ -396,7 +396,7 @@ 
         // if there isn't yet a transaction row for this, create one
         // (so even if it was a non-primary attendee with no EE3 primary attendee,
         // it ought to have SOME transaction, so we'll make one)
-        if (!$txn_id) {
+        if ( ! $txn_id) {
             // maps 3.1 payment stati onto 4.1 transaction stati
             $txn_status_mapping = array(
                 'Completed' => 'TCM',
@@ -407,7 +407,7 @@ 
                 'Cancelled' => 'TIN',
                 'Declined' => 'TIN'
             );
-            $STS_ID = isset($txn_status_mapping[ $old_attendee['payment_status'] ]) ? $txn_status_mapping[ $old_attendee['payment_status'] ] : 'TIN';
+            $STS_ID = isset($txn_status_mapping[$old_attendee['payment_status']]) ? $txn_status_mapping[$old_attendee['payment_status']] : 'TIN';
             $cols_n_values = array(
                 'TXN_timestamp' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, $old_attendee['date']),
                 'TXN_total' => floatval($old_attendee['total_cost']),
@@ -416,14 +416,14 @@ 
                 'TXN_hash_salt' => $old_attendee['hashSalt']
             );
             $datatypes = array(
-                '%s',// TXN_timestamp
-                '%f',// TXN_total
-                '%f',// TXN_paid
-                '%s',// STS_ID
-                '%s',// TXN_hash_salt
+                '%s', // TXN_timestamp
+                '%f', // TXN_total
+                '%f', // TXN_paid
+                '%s', // STS_ID
+                '%s', // TXN_hash_salt
             );
             $success = $wpdb->insert($this->_new_transaction_table, $cols_n_values, $datatypes);
-            if (!$success) {
+            if ( ! $success) {
                 $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_transaction_table, $cols_n_values, $datatypes));
                 return 0;
             }
@@ -463,7 +463,7 @@ 
     {
         // need event default reg status and if pre_approval was required
         global $wpdb;
-        $event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM " . $wpdb->prefix . "events_detail WHERE id = %d", $old_attendee_row['event_id']));
+        $event_required_pre_approval = $wpdb->get_var($wpdb->prepare("SELECT require_pre_approval FROM ".$wpdb->prefix."events_detail WHERE id = %d", $old_attendee_row['event_id']));
         return $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
             $old_attendee_row['payment_status'],
             intval($event_required_pre_approval) && intval($old_attendee_row['pre_approve'])
@@ -484,13 +484,13 @@ 
         global $wpdb;
 
         $STS_ID = $this->_get_reg_status_for_old_payment_status($old_attendee);
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . 'events_detail', $old_attendee['event_id'], $wpdb->posts);
-        if (!$new_event_id) {
+        $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix.'events_detail', $old_attendee['event_id'], $wpdb->posts);
+        if ( ! $new_event_id) {
             $this->add_error(sprintf(__("Could not find NEW event CPT ID for old event '%d' on old attendee %s", "event_espresso"), $old_attendee['event_id'], $this->_json_encode($old_attendee)));
         }
 
         $ticket_id = $this->_try_to_find_new_ticket_id($old_attendee, $new_event_id);
-        if (!$ticket_id) {
+        if ( ! $ticket_id) {
             $ticket_id = $this->_insert_new_ticket_because_none_found($old_attendee, $new_event_id);
             $this->add_error(sprintf(__('Could not find a ticket for old attendee with id %d for new event %d, so created a new ticket with id %d', 'event_espresso'), $old_attendee['id'], $new_event_id, $ticket_id));
         }
@@ -514,30 +514,30 @@ 
                 'REG_final_price' => $old_attendee['final_price'],
                 'REG_session' => substr($old_attendee['attendee_session'], 0, 44),
                 'REG_code' => sanitize_key($old_attendee['registration_id']),
-                'REG_url_link' => sanitize_key($old_attendee['registration_id'] . '-' . $count),
+                'REG_url_link' => sanitize_key($old_attendee['registration_id'].'-'.$count),
                 'REG_count' => $regs_on_this_event_and_txn + $count,
                 'REG_group_size' => $this->_sum_old_attendees_on_old_txn($old_attendee, false),
                 'REG_att_is_going' => true,
                 'REG_deleted' => false
             );
             $datatypes = array(
-                '%d',// EVT_ID
-                '%d',// ATT_ID
-                '%d',// TXN_ID
-                '%d',// TKT_ID
-                '%s',// STS_ID
-                '%s',// REG_date
-                '%f',// REG_final_price
-                '%s',// REG_session
-                '%s',// REG_code
-                '%s',// REG_url_link
-                '%d',// REG_count
-                '%d',// REG_group_size
-                '%d',// REG_att_is_going
-                '%d',// REG_deleted
+                '%d', // EVT_ID
+                '%d', // ATT_ID
+                '%d', // TXN_ID
+                '%d', // TKT_ID
+                '%s', // STS_ID
+                '%s', // REG_date
+                '%f', // REG_final_price
+                '%s', // REG_session
+                '%s', // REG_code
+                '%s', // REG_url_link
+                '%d', // REG_count
+                '%d', // REG_group_size
+                '%d', // REG_att_is_going
+                '%d', // REG_deleted
             );
             $success = $wpdb->insert($this->_new_reg_table, $cols_n_values, $datatypes);
-            if (!$success) {
+            if ( ! $success) {
                 $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_reg_table, $cols_n_values, $datatypes));
                 return 0;
             }
@@ -573,7 +573,7 @@ 
 				INNER JOIN {$this->_new_ticket_datetime_table} as DTK ON TKT.TKT_ID = DTK.TKT_ID
 				INNER JOIN {$this->_new_datetime_table} as DTT ON DTK.DTT_ID = DTT.DTT_ID
 				SET DTT.DTT_sold = DTT.DTT_sold + %d WHERE TKT.TKT_ID = %d", $quantity_sold, $new_ticket_id));
-            if (!$success_update_dateimtes) {
+            if ( ! $success_update_dateimtes) {
                 $this->add_error(sprintf(__("Could not update datetimes related to ticket with ID %d's TKT_sold by %d because %s", "event_espresso"), $new_ticket_id, $quantity_sold, $wpdb->last_error));
             }
         } else {
@@ -606,20 +606,20 @@ 
         // add all conditions to an array from which we can SHIFT conditions off in order to widen our search
         // the most important condition should be last, as it will be array_shift'ed off last
         $conditions = array(
-            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime),// times match?
-            $wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price),// prices match?
-            $wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option),// names match?
-            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+            $wpdb->prepare("$datetime_table.DTT_EVT_start = %s", $old_att_datetime), // times match?
+            $wpdb->prepare("$tickets_table.TKT_price = %f", $old_att_price), // prices match?
+            $wpdb->prepare("$tickets_table.TKT_name = %s", $old_att_price_option), // names match?
+            $wpdb->prepare("$datetime_table.EVT_ID = %d", $new_event_id), // events match?
         );
         $select_and_join_part = "SELECT $tickets_table.TKT_ID FROM $tickets_table INNER JOIN
 			$datetime_tickets_table ON $tickets_table.TKT_ID = $datetime_tickets_table.TKT_ID INNER JOIN
 			$datetime_table ON $datetime_tickets_table.DTT_ID = $datetime_table.DTT_ID";
         // start running queries, widening search each time by removing a condition
         do {
-            $full_query = $select_and_join_part . " WHERE " . implode(" AND ", $conditions) . " LIMIT 1";
+            $full_query = $select_and_join_part." WHERE ".implode(" AND ", $conditions)." LIMIT 1";
             $ticket_id_found = $wpdb->get_var($full_query);
             array_shift($conditions);
-        } while (!$ticket_id_found && $conditions);
+        }while ( ! $ticket_id_found && $conditions);
         return $ticket_id_found;
     }
 
@@ -641,8 +641,8 @@ 
 
 
         // insert new datetime unless we find one
-        $datetime_id = $wpdb->get_var($wpdb->prepare("SELECT DTT_ID FROM " . $this->_new_datetime_table . " WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id), ARRAY_A);
-        if (!$datetime_id) {
+        $datetime_id = $wpdb->get_var($wpdb->prepare("SELECT DTT_ID FROM ".$this->_new_datetime_table." WHERE DTT_EVT_start=%s AND EVT_ID=%d LIMIT 1", $old_att_start_datetime, $new_event_id), ARRAY_A);
+        if ( ! $datetime_id) {
             $old_att_end_date = $old_attendee['start_date'];
             $old_att_end_time = $this->get_migration_script()->convertTimeFromAMPM($old_attendee['event_time']);
             $old_att_end_datetime = $this->get_migration_script()->convert_date_string_to_utc($this, $old_attendee, "$old_att_end_date $old_att_end_time:00");
@@ -655,10 +655,10 @@ 
                     'DTT_deleted' => true
                 ),
                 array(
-                    '%d',// EVT_ID
-                    '%s',// DTT_EVT_start
-                    '%s',// DTT_EVT_end
-                    '%d',// DTT_deleted
+                    '%d', // EVT_ID
+                    '%s', // DTT_EVT_start
+                    '%s', // DTT_EVT_end
+                    '%d', // DTT_deleted
                 )
             );
             $datetime_id = $wpdb->insert_id;
@@ -666,21 +666,21 @@ 
 
         // insert new ticket
         $success = $wpdb->insert(
-            $wpdb->prefix . 'esp_ticket',
+            $wpdb->prefix.'esp_ticket',
             array(
                 'TKT_name' => $old_att_price_option,
                 'TKT_qty' => -1,
                 'TKT_price' => $old_att_price,
-                'TKT_start_date' => $old_att_start_datetime,// we really have no clue what the time should be, but at least it was available when they attended
+                'TKT_start_date' => $old_att_start_datetime, // we really have no clue what the time should be, but at least it was available when they attended
                 'TKT_end_date' => $old_att_end_datetime,
 
             ),
             array(
-                '%s',// name
-                '%d',// qty
-                '%d',// price
-                '%s',// start_date
-                '%s',// end_date
+                '%s', // name
+                '%d', // qty
+                '%d', // price
+                '%s', // start_date
+                '%s', // end_date
             )
         );
         $ticket_id = $wpdb->insert_id;
@@ -692,8 +692,8 @@ 
                 'TKT_ID' => $ticket_id
             ),
             array(
-                '%d',// DTT_ID
-                '%d',// TKT_ID
+                '%d', // DTT_ID
+                '%d', // TKT_ID
             )
         );
         // insert new price
@@ -706,10 +706,10 @@ 
                 'PRC_deleted' => true
             ),
             array(
-                '%d',// PRC_amount
-                '%d',// PRT_ID
-                '%s',// PRC_name
-                '%d',// PRC_deleted
+                '%d', // PRC_amount
+                '%d', // PRT_ID
+                '%s', // PRC_name
+                '%d', // PRC_deleted
             )
         );
         $price_id = $wpdb->insert_id;
@@ -721,8 +721,8 @@ 
                 'PRC_ID' => $price_id
             ),
             array(
-                '%d',// TKT_ID
-                '%d',// PRC_ID
+                '%d', // TKT_ID
+                '%d', // PRC_ID
             )
         );
         return $ticket_id;
@@ -740,7 +740,7 @@ 
     {
         global $wpdb;
         $count_only_older_sql = $count_only_older ? $wpdb->prepare(" AND id<%d", $old_attendee_row['id']) : '';
-        $count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM " . $this->_old_table . " WHERE registration_id=%s $count_only_older_sql", $old_attendee_row['registration_id'])));
+        $count = intval($wpdb->get_var($wpdb->prepare("SELECT SUM(quantity) FROM ".$this->_old_table." WHERE registration_id=%s $count_only_older_sql", $old_attendee_row['registration_id'])));
 
         if ($this->_mer_tables_exist()) {
             // if MER exists, then its a little tricky.
@@ -764,7 +764,7 @@ 
         // Also, an offline payment had blank status (ie, "").
         $old_pay_stati_indicating_no_payment = array('', 'Incomplete', 'Not Completed');
         // if this is for a primary 3.1 attendee which WASN'T free and has a completed, cancelled, or declined payment...
-        if (intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && !in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)) {
+        if (intval($old_attendee['is_primary']) && floatval($old_attendee['total_cost']) && ! in_array($old_attendee['payment_status'], $old_pay_stati_indicating_no_payment)) {
             $pay_status_mapping = array(
                 'Completed' => 'PAP',
                 'Payment Declined' => 'PDC',
@@ -772,7 +772,7 @@ 
                 'Declined' => 'PDC'
             );
             $by_admin = $old_attendee['payment'] == 'Admin';
-            $STS_ID = isset($pay_status_mapping[ $old_attendee['payment_status'] ]) ? $pay_status_mapping[ $old_attendee['payment_status'] ] : 'PFL';// IE, if we don't recognize the status, assume payment failed
+            $STS_ID = isset($pay_status_mapping[$old_attendee['payment_status']]) ? $pay_status_mapping[$old_attendee['payment_status']] : 'PFL'; // IE, if we don't recognize the status, assume payment failed
             $cols_n_values = array(
                 'TXN_ID' => $new_txn_id,
                 'STS_ID' => $STS_ID,
@@ -788,19 +788,19 @@ 
                 'PAY_details' => $old_attendee['transaction_details']
             );
             $datatypes = array(
-                '%d',// TXN_Id
-                '%s',// STS_ID
-                '%s',// PAY_timestamp
-                '%s',// PAY_method
-                '%f',// PAY_amount
-                '%s',// PAY_gateway
-                '%s',// PAY_gateway_response
-                '%s',// PAY_txn_id_chq_nmbr
-                '%d',// PAY_via_admin
-                '%s',// PAY_details
+                '%d', // TXN_Id
+                '%s', // STS_ID
+                '%s', // PAY_timestamp
+                '%s', // PAY_method
+                '%f', // PAY_amount
+                '%s', // PAY_gateway
+                '%s', // PAY_gateway_response
+                '%s', // PAY_txn_id_chq_nmbr
+                '%d', // PAY_via_admin
+                '%s', // PAY_details
             );
             $success = $wpdb->insert($this->_new_payment_table, $cols_n_values, $datatypes);
-            if (!$success) {
+            if ( ! $success) {
                 $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_attendee, $this->_new_attendee_cpt_table, $cols_n_values, $datatypes));
                 return 0;
             }
@@ -819,7 +819,7 @@ 
      */
     private function _find_mer_primary_attendee_using_mer_tables($old_registration_id)
     {
-        if (!$this->_mer_tables_exist()) {
+        if ( ! $this->_mer_tables_exist()) {
             return false;
         }
         global $wpdb;

core/services/commands/CommandHandlerInterface.php

Indentation +19 added lines, -19 removed lines

@@ -8,24 +8,24 @@
  */
 interface CommandHandlerInterface
 {
-    /**
-     * verifies that the supplied command is the correct class for the handler.
-     *
-     * !!! IMPORTANT !!!
-     * Must return $this (ie: the handler itself)
-     * as the CommandBus utilizes method chaining
-     *
-     * @param CommandInterface $command
-     * @return CommandHandlerInterface
-     * @since 4.9.80.p
-     */
-    public function verify(CommandInterface $command);
+	/**
+	 * verifies that the supplied command is the correct class for the handler.
+	 *
+	 * !!! IMPORTANT !!!
+	 * Must return $this (ie: the handler itself)
+	 * as the CommandBus utilizes method chaining
+	 *
+	 * @param CommandInterface $command
+	 * @return CommandHandlerInterface
+	 * @since 4.9.80.p
+	 */
+	public function verify(CommandInterface $command);
 
-    /**
-     * Performs the command handler's logic.
-     *
-     * @param CommandInterface $command
-     * @return mixed
-     */
-    public function handle(CommandInterface $command);
+	/**
+	 * Performs the command handler's logic.
+	 *
+	 * @param CommandInterface $command
+	 * @return mixed
+	 */
+	public function handle(CommandInterface $command);
 }

core/services/json/JsonSerializableAndUnserializable.php

Indentation +14 added lines, -14 removed lines

@@ -15,21 +15,21 @@
  */
 interface JsonSerializableAndUnserializable
 {
-    /**
-     * Creates a simple PHP array or stdClass from this object's properties, which can be easily serialized using
-     * wp_json_serialize().
-     * @since 4.9.80.p
-     * @return mixed
-     */
-    public function toJsonSerializableData();
+	/**
+	 * Creates a simple PHP array or stdClass from this object's properties, which can be easily serialized using
+	 * wp_json_serialize().
+	 * @since 4.9.80.p
+	 * @return mixed
+	 */
+	public function toJsonSerializableData();
 
-    /**
-     * Initializes this object from data
-     * @since 4.9.80.p
-     * @param mixed $data
-     * @return boolean success
-     */
-    public function fromJsonSerializedData($data);
+	/**
+	 * Initializes this object from data
+	 * @since 4.9.80.p
+	 * @param mixed $data
+	 * @return boolean success
+	 */
+	public function fromJsonSerializedData($data);
 }
 // End of file JsonSerializableAndUnserializable.php
 // Location: EventEspresso\core\services\json/JsonSerializableAndUnserializable.php

core/services/request/files/FileSubmissionInterface.php

Indentation +31 added lines, -31 removed lines

@@ -15,37 +15,37 @@
 interface FileSubmissionInterface
 {
 
-    /**
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * @return string
-     */
-    public function getType();
-
-    /**
-     * @return int
-     */
-    public function getSize();
-
-    /**
-     * @return string
-     */
-    public function getTmpFile();
-
-    /**
-     * Should just return the filename.
-     * @since 4.9.80.p
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * @return string
-     */
-    public function getErrorCode();
+	/**
+	 * @return string
+	 */
+	public function getName();
+
+	/**
+	 * @return string
+	 */
+	public function getType();
+
+	/**
+	 * @return int
+	 */
+	public function getSize();
+
+	/**
+	 * @return string
+	 */
+	public function getTmpFile();
+
+	/**
+	 * Should just return the filename.
+	 * @since 4.9.80.p
+	 * @return string
+	 */
+	public function __toString();
+
+	/**
+	 * @return string
+	 */
+	public function getErrorCode();
 }
 // End of file FileSubmissionInterface.php
 // Location: EventEspresso\core\services\request\files/FileSubmissionInterface.php

core/services/options/JsonWpOptionSerializableInterface.php

Indentation +7 added lines, -7 removed lines

@@ -17,13 +17,13 @@
  */
 interface JsonWpOptionSerializableInterface extends JsonSerializableAndUnserializable
 {
-    /**
-     * Gets the value to use for wp_options.option_name. Note this is not static, so it can use object properties to
-     * determine what option name to use.
-     * @since 4.9.80.p
-     * @return string
-     */
-    public function getWpOptionName();
+	/**
+	 * Gets the value to use for wp_options.option_name. Note this is not static, so it can use object properties to
+	 * determine what option name to use.
+	 * @since 4.9.80.p
+	 * @return string
+	 */
+	public function getWpOptionName();
 }
 // End of file JsonWpOptionSerializableInterface.php
 // Location: EventEspresso\core\services\options/JsonWpOptionSerializableInterface.php

core/domain/Domain.php

Spacing +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
      */
     private function setCaffeinated()
     {
-        $this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
-            && is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
+        $this->caffeinated = ( ! defined('EE_DECAF') || EE_DECAF !== true)
+            && is_readable($this->pluginPath().'caffeinated/brewing_regular.php');
     }
 
 

Indentation +66 added lines, -66 removed lines

@@ -15,70 +15,70 @@
  */
 class Domain extends DomainBase implements CaffeinatedInterface
 {
-    /**
-     * URL path component used to denote an API request
-     */
-    const API_NAMESPACE = 'ee/v';
-
-    const ASSET_NAMESPACE = 'eventespresso';
-
-    const TEXT_DOMAIN = 'event_espresso';
-
-    /**
-     * Slug used for the context where a registration status is changed from a manual trigger in the Registration Admin
-     * Page ui.
-     */
-    const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN
-        = 'manual_registration_status_change_from_registration_admin';
-
-    const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN_NOTIFY
-        = 'manual_registration_status_change_from_registration_admin_and_notify';
-
-
-    /**
-     * Whether or not EE core is the full premium version.
-     * @since 4.9.59.p
-     * @var bool
-     */
-    private $caffeinated;
-
-
-    public function __construct(FilePath $plugin_file, Version $version)
-    {
-        parent::__construct($plugin_file, $version);
-        $this->setCaffeinated();
-    }
-
-    /**
-     * Whether or not EE core is the full premium version.
-     * @since 4.9.59.p
-     * @return bool
-     */
-    public function isCaffeinated()
-    {
-        return $this->caffeinated;
-    }
-
-
-    /**
-     * Setter for $is_caffeinated property.
-     * @since 4.9.59.p
-     */
-    private function setCaffeinated()
-    {
-        $this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
-            && is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
-    }
-
-
-    /**
-     * This should be used everywhere the Event Espresso brand name is referenced in public facing interfaces
-     * to allow for filtering the brand.
-     *
-     * @return string
-     */
-    public static function brandName()
-    {
-        return (string) apply_filters('FHEE__EventEspresso_core_domain_Domain__brandName', 'Event Espresso');
-    }
+	/**
+	 * URL path component used to denote an API request
+	 */
+	const API_NAMESPACE = 'ee/v';
+
+	const ASSET_NAMESPACE = 'eventespresso';
+
+	const TEXT_DOMAIN = 'event_espresso';
+
+	/**
+	 * Slug used for the context where a registration status is changed from a manual trigger in the Registration Admin
+	 * Page ui.
+	 */
+	const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN
+		= 'manual_registration_status_change_from_registration_admin';
+
+	const CONTEXT_REGISTRATION_STATUS_CHANGE_REGISTRATION_ADMIN_NOTIFY
+		= 'manual_registration_status_change_from_registration_admin_and_notify';
+
+
+	/**
+	 * Whether or not EE core is the full premium version.
+	 * @since 4.9.59.p
+	 * @var bool
+	 */
+	private $caffeinated;
+
+
+	public function __construct(FilePath $plugin_file, Version $version)
+	{
+		parent::__construct($plugin_file, $version);
+		$this->setCaffeinated();
+	}
+
+	/**
+	 * Whether or not EE core is the full premium version.
+	 * @since 4.9.59.p
+	 * @return bool
+	 */
+	public function isCaffeinated()
+	{
+		return $this->caffeinated;
+	}
+
+
+	/**
+	 * Setter for $is_caffeinated property.
+	 * @since 4.9.59.p
+	 */
+	private function setCaffeinated()
+	{
+		$this->caffeinated = (! defined('EE_DECAF') || EE_DECAF !== true)
+			&& is_readable($this->pluginPath() . 'caffeinated/brewing_regular.php');
+	}
+
+
+	/**
+	 * This should be used everywhere the Event Espresso brand name is referenced in public facing interfaces
+	 * to allow for filtering the brand.
+	 *
+	 * @return string
+	 */
+	public static function brandName()
+	{
+		return (string) apply_filters('FHEE__EventEspresso_core_domain_Domain__brandName', 'Event Espresso');
+	}
 }

payment_methods/Invoice/templates/invoice_settings_header_display.template.php

Indentation +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
         <td>
             <span class="description">
                 <?php _e(
-                    "The following settings affect the content and/or appearance of the downloadable PDF invoice.",
-                    'event_espresso'
-                ); ?></span>
+					"The following settings affect the content and/or appearance of the downloadable PDF invoice.",
+					'event_espresso'
+				); ?></span>
         </td>
     </tr>
 </table>
\ No newline at end of file

payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php

Indentation +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
         <td>
             <span class="description">
                 <?php _e(
-                    "The following settings affect the functioning of the Invoice gateway.",
-                    'event_espresso'
-                ); ?></span>
+					"The following settings affect the functioning of the Invoice gateway.",
+					'event_espresso'
+				); ?></span>
         </td>
     </tr>
 </table>
\ No newline at end of file