eventespresso / event-espresso-core

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 = esc_html__("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 = esc_html__("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(esc_html__("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(esc_html__("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(esc_html__('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(esc_html__("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(esc_html__("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(esc_html__('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(esc_html__("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(esc_html__("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(esc_html__("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(esc_html__("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 = esc_html__("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(esc_html__("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(esc_html__("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(esc_html__('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(esc_html__("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/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_org_options.dmsstage.php

Spacing +31 added lines, -31 removed lines

@@ -110,8 +110,8 @@ 
         $old_org_options = get_option('events_organization_settings');
         foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
             // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+            if (isset($old_org_options[$option_name])) {
+                $this->_handle_org_option($option_name, $old_org_options[$option_name]);
             }
             if ($option_name == 'surcharge') {
                 $this->_insert_new_global_surcharge_price($old_org_options);
@@ -120,7 +120,7 @@ 
         }
 
         $success = EE_Config::instance()->update_espresso_config(false, true);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(sprintf(esc_html__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
             EE_Error::overwrite_errors();
         }
@@ -176,24 +176,24 @@ 
                 $c->organization->email = $value;
                 break;
             case 'default_payment_status':
-                $c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
+                $c->registration->default_STS_ID = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
                 break;
             case 'organization_country':
                 $iso = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
                 $c->organization->CNT_ISO = $iso;
                 $country_row = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
+                if ( ! $country_row) {
                     $this->add_error(sprintf(esc_html__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
                 }
                 // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
-                $c->currency->name = $country_row['CNT_cur_single'];    // Dollar
-                $c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
-                $c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
-                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
-                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-                $c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+                $c->currency->code = $country_row['CNT_cur_code']; // currency code: USD, CAD, EUR
+                $c->currency->name = $country_row['CNT_cur_single']; // Dollar
+                $c->currency->plural = $country_row['CNT_cur_plural']; // Dollars
+                $c->currency->sign = $country_row['CNT_cur_sign']; // currency sign: $
+                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN); // currency sign before or after: $TRUE  or  FALSE$
+                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc']; // decimal places: 2 = 0.00  3 = 0.000
+                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk']; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+                $c->currency->thsnds = $country_row['CNT_cur_thsnds']; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
   //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
   //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
   //            $c->currency->sign = $value;break;
@@ -298,18 +298,18 @@ 
 
         );
         $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
+            '%d', // PRT_ID
+            '%f', // PRT_amount
+            '%s', // PRC_name
+            '%d', // PRC_is_default
+            '%d', // PRC_overrides
+            '%d', // PRC_order
+            '%d', // PRC_deleted
+            '%d', // PRC_parent
         );
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_table = $wpdb->prefix."esp_price";
         $success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
                 'org_options',
                 array(
@@ -339,8 +339,8 @@ 
       'payment_message',
       'message',
       'default_payment_status',
-      'surcharge',// unused?
-      'country_id',// unused?
+      'surcharge', // unused?
+      'country_id', // unused?
       'organization_country',
 //    'currency_symbol',
       'expire_on_registration_end',
@@ -352,13 +352,13 @@ 
       'show_pending_payment_options',
       'show_reg_footer',
       'skip_confirmation_page',
-      'allow_mer_discounts',// no equiv
-      'allow_mer_vouchers',// no equiv
+      'allow_mer_discounts', // no equiv
+      'allow_mer_vouchers', // no equiv
       'display_short_description_in_event_list',
       'display_description_on_multi_reg_page',
       'display_address_in_event_list',
       'display_address_in_regform',
-      'use_custom_post_types',// no equiv
+      'use_custom_post_types', // no equiv
       'display_ical_download',
       'display_featured_image',
       'themeroller',
@@ -377,11 +377,11 @@ 
       'espresso_dashboard_widget',
       'time_reg_limit',
 //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-      'use_personnel_manager',// no equiv
+      'use_personnel_manager', // no equiv
       'use_event_timezones',
       'full_logging',
-      'surcharge_type',// unused
-      'surcharge_text',// unused
+      'surcharge_type', // unused
+      'surcharge_text', // unused
       'affiliate_id',
       'site_license_key',
     );

Indentation +270 added lines, -270 removed lines

@@ -102,286 +102,286 @@
  */
 class EE_DMS_4_1_0_org_options extends EE_Data_Migration_Script_Stage
 {
-    public function _migration_step($num_items = 50)
-    {
+	public function _migration_step($num_items = 50)
+	{
 
-        $items_actually_migrated = 0;
-        $old_org_options = get_option('events_organization_settings');
-        foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
-            // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
-            }
-            if ($option_name == 'surcharge') {
-                $this->_insert_new_global_surcharge_price($old_org_options);
-            }
-            $items_actually_migrated++;
-        }
+		$items_actually_migrated = 0;
+		$old_org_options = get_option('events_organization_settings');
+		foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
+			// only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
+			if (isset($old_org_options[ $option_name ])) {
+				$this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+			}
+			if ($option_name == 'surcharge') {
+				$this->_insert_new_global_surcharge_price($old_org_options);
+			}
+			$items_actually_migrated++;
+		}
 
-        $success = EE_Config::instance()->update_espresso_config(false, true);
-        if (! $success) {
-            $this->add_error(sprintf(esc_html__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
-            EE_Error::overwrite_errors();
-        }
-        EE_Network_Config::instance()->update_config(false, false);
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            // we may have added new pages and this might be necessary
-            flush_rewrite_rules();
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        $count_of_options_to_migrate = count($this->_org_options_we_know_how_to_migrate);
-        return $count_of_options_to_migrate;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__("Organization Options/Config", "event_espresso");
-        $this->_org_options_we_know_how_to_migrate = apply_filters('FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate', $this->_org_options_we_know_how_to_migrate);
-        parent::__construct();
-    }
+		$success = EE_Config::instance()->update_espresso_config(false, true);
+		if (! $success) {
+			$this->add_error(sprintf(esc_html__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
+			EE_Error::overwrite_errors();
+		}
+		EE_Network_Config::instance()->update_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			// we may have added new pages and this might be necessary
+			flush_rewrite_rules();
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		$count_of_options_to_migrate = count($this->_org_options_we_know_how_to_migrate);
+		return $count_of_options_to_migrate;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__("Organization Options/Config", "event_espresso");
+		$this->_org_options_we_know_how_to_migrate = apply_filters('FHEE__EE_DMS_4_1_0_org_options__org_options_we_know_how_to_migrate', $this->_org_options_we_know_how_to_migrate);
+		parent::__construct();
+	}
 
-    private function _handle_org_option($option_name, $value)
-    {
-        $c = EE_Config::instance();
-        $cn = EE_Network_Config::instance();
-        switch ($option_name) {
-            case 'organization':
-                $c->organization->name = $value;
-                break;
-            case 'organization_street1':
-                $c->organization->address_1 = $value;
-                break;
-            case 'organization_street2':
-                $c->organization->address_2 = $value;
-                break;
-            case 'organization_city':
-                $c->organization->city = $value;
-                break;
-            case 'organization_state':
-                try {
-                    $state = $this->get_migration_script()->get_or_create_state($value);
-                    $state_id = $state['STA_ID'];
-                    $c->organization->STA_ID = $state_id;
-                } catch (EE_Error $e) {
-                }
-                break;
-            case 'organization_zip':
-                $c->organization->zip = $value;
-                break;
-            case 'contact_email':
-                $c->organization->email = $value;
-                break;
-            case 'default_payment_status':
-                $c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
-                break;
-            case 'organization_country':
-                $iso = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
-                $c->organization->CNT_ISO = $iso;
-                $country_row = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
-                    $this->add_error(sprintf(esc_html__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
-                }
-                // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
-                $c->currency->name = $country_row['CNT_cur_single'];    // Dollar
-                $c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
-                $c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
-                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
-                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-                $c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+	private function _handle_org_option($option_name, $value)
+	{
+		$c = EE_Config::instance();
+		$cn = EE_Network_Config::instance();
+		switch ($option_name) {
+			case 'organization':
+				$c->organization->name = $value;
+				break;
+			case 'organization_street1':
+				$c->organization->address_1 = $value;
+				break;
+			case 'organization_street2':
+				$c->organization->address_2 = $value;
+				break;
+			case 'organization_city':
+				$c->organization->city = $value;
+				break;
+			case 'organization_state':
+				try {
+					$state = $this->get_migration_script()->get_or_create_state($value);
+					$state_id = $state['STA_ID'];
+					$c->organization->STA_ID = $state_id;
+				} catch (EE_Error $e) {
+				}
+				break;
+			case 'organization_zip':
+				$c->organization->zip = $value;
+				break;
+			case 'contact_email':
+				$c->organization->email = $value;
+				break;
+			case 'default_payment_status':
+				$c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
+				break;
+			case 'organization_country':
+				$iso = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
+				$c->organization->CNT_ISO = $iso;
+				$country_row = $this->get_migration_script()->get_or_create_country($iso);
+				if (! $country_row) {
+					$this->add_error(sprintf(esc_html__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
+				}
+				// can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
+				$c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
+				$c->currency->name = $country_row['CNT_cur_single'];    // Dollar
+				$c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
+				$c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
+				$c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
+				$c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
+				$c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
   //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
   //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
   //            $c->currency->sign = $value;break;
-            case 'show_pending_payment_options':
-                $c->registration->show_pending_payment_options = ($value == 'Y');
-                break;
-            case 'display_address_in_regform':
-                $c->template_settings->display_address_in_regform = ($value == 'Y');
-                break;
-            case 'default_logo_url':
-                $c->organization->logo_url = $value;
-                break;
-            case 'event_page_id':
-                // also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
-                // to ESPRESSO_THANK_YOU
-                $reg_page_post = get_post($value);
-                $reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]", "[ESPRESSO_CHECKOUT]", $reg_page_post->post_content);
-                wp_update_post($reg_page_post);
-                $c->core->reg_page_id = $value;
-                break;
-            case 'return_url':
-                // also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
-                // to ESPRESSO_THANK_YOU
-                $thank_you_page_post = get_post($value);
-                $thank_you_page_post->post_content = str_replace("[ESPRESSO_PAYMENTS]", "[ESPRESSO_THANK_YOU]", $thank_you_page_post->post_content);
-                wp_update_post($thank_you_page_post);
-                $c->core->thank_you_page_id = $value;
-                break;
-            case 'cancel_return':
-                $c->core->cancel_page_id = $value;
+			case 'show_pending_payment_options':
+				$c->registration->show_pending_payment_options = ($value == 'Y');
+				break;
+			case 'display_address_in_regform':
+				$c->template_settings->display_address_in_regform = ($value == 'Y');
+				break;
+			case 'default_logo_url':
+				$c->organization->logo_url = $value;
+				break;
+			case 'event_page_id':
+				// also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				// to ESPRESSO_THANK_YOU
+				$reg_page_post = get_post($value);
+				$reg_page_post->post_content = str_replace("[ESPRESSO_EVENTS]", "[ESPRESSO_CHECKOUT]", $reg_page_post->post_content);
+				wp_update_post($reg_page_post);
+				$c->core->reg_page_id = $value;
+				break;
+			case 'return_url':
+				// also, find that post, and changes the shortcode in it from ESPRESSO_PAYMENTS
+				// to ESPRESSO_THANK_YOU
+				$thank_you_page_post = get_post($value);
+				$thank_you_page_post->post_content = str_replace("[ESPRESSO_PAYMENTS]", "[ESPRESSO_THANK_YOU]", $thank_you_page_post->post_content);
+				wp_update_post($thank_you_page_post);
+				$c->core->thank_you_page_id = $value;
+				break;
+			case 'cancel_return':
+				$c->core->cancel_page_id = $value;
 
-                break;
-            case 'notify_url':
-                $c->core->txn_page_id = $value;
-                break;
-            case 'use_captcha':
-                $c->registration->use_captcha = ($value == 'Y');
-                break;
-            case 'recaptcha_publickey':
-                $c->registration->recaptcha_publickey = $value;
-                break;
-            case 'recaptcha_privatekey':
-                $c->registration->recaptcha_privatekey = $value;
-                break;
-            case 'recaptcha_theme':
-                $c->registration->recaptcha_theme = $value;
-                break;
-            case 'recaptcha_width':
-                $c->registration->recaptcha_width = $value;
-                break;
-            case 'recaptcha_language':
-                $c->registration->recaptcha_language = $value;
-                break;
-            case 'espresso_dashboard_widget':
-                $c->admin->use_dashboard_widget = ($value == 'Y');
-                break;
-            case 'use_personnel_manager':
-                $c->admin->use_personnel_manager = ($value == 'Y');
-                break;
-            case 'use_event_timezones':
-                $c->admin->use_event_timezones = ($value == 'Y');
-                break;
-            case 'affiliate_id':
-                $c->admin->affiliate_id = $value;
-                break;
-            case 'site_license_key':
-                $cn->core->site_license_key = $value;
-                break;
-            default:
-                do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
-        }
-    }
+				break;
+			case 'notify_url':
+				$c->core->txn_page_id = $value;
+				break;
+			case 'use_captcha':
+				$c->registration->use_captcha = ($value == 'Y');
+				break;
+			case 'recaptcha_publickey':
+				$c->registration->recaptcha_publickey = $value;
+				break;
+			case 'recaptcha_privatekey':
+				$c->registration->recaptcha_privatekey = $value;
+				break;
+			case 'recaptcha_theme':
+				$c->registration->recaptcha_theme = $value;
+				break;
+			case 'recaptcha_width':
+				$c->registration->recaptcha_width = $value;
+				break;
+			case 'recaptcha_language':
+				$c->registration->recaptcha_language = $value;
+				break;
+			case 'espresso_dashboard_widget':
+				$c->admin->use_dashboard_widget = ($value == 'Y');
+				break;
+			case 'use_personnel_manager':
+				$c->admin->use_personnel_manager = ($value == 'Y');
+				break;
+			case 'use_event_timezones':
+				$c->admin->use_event_timezones = ($value == 'Y');
+				break;
+			case 'affiliate_id':
+				$c->admin->affiliate_id = $value;
+				break;
+			case 'site_license_key':
+				$cn->core->site_license_key = $value;
+				break;
+			default:
+				do_action('AHEE__EE_DMS_4_1_0__handle_org_option', $option_name, $value);
+		}
+	}
 
-    /**
-     * Creates a 4.1 member price discount
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
-    private function _insert_new_global_surcharge_price($org_options)
-    {
-        $amount = floatval($org_options['surcharge']);
-        // dont createa a price if the surcharge is 0
-        if ($amount <= .01) {
-            return 0;
-        }
-        if ($org_options['surcharge_type'] == 'flat_rate') {
-            $price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
-        } else {
-            $price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
-        }
-        global $wpdb;
-        $cols_n_values = array(
-            'PRT_ID' => $price_type,
-            'PRC_amount' => $amount,
-            'PRC_name' =>  $org_options['surcharge_text'],
-            'PRC_is_default' => true,
-            'PRC_overrides' => false,
-            'PRC_order' => 100,
-            'PRC_deleted' => false,
-            'PRC_parent' => null
+	/**
+	 * Creates a 4.1 member price discount
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
+	private function _insert_new_global_surcharge_price($org_options)
+	{
+		$amount = floatval($org_options['surcharge']);
+		// dont createa a price if the surcharge is 0
+		if ($amount <= .01) {
+			return 0;
+		}
+		if ($org_options['surcharge_type'] == 'flat_rate') {
+			$price_type = EE_DMS_4_1_0_prices::price_type_flat_surcharge;
+		} else {
+			$price_type = EE_DMS_4_1_0_prices::price_type_percent_surcharge;
+		}
+		global $wpdb;
+		$cols_n_values = array(
+			'PRT_ID' => $price_type,
+			'PRC_amount' => $amount,
+			'PRC_name' =>  $org_options['surcharge_text'],
+			'PRC_is_default' => true,
+			'PRC_overrides' => false,
+			'PRC_order' => 100,
+			'PRC_deleted' => false,
+			'PRC_parent' => null
 
-        );
-        $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
-        );
-        $price_table = $wpdb->prefix . "esp_price";
-        $success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
-                'org_options',
-                array(
-                        'surcharge' => $org_options['surcharge'],
-                        'surcharge_type' => $org_options['surcharge_type'],
-                        'surcharge_text' => $org_options['surcharge_text']),
-                $price_table,
-                $cols_n_values,
-                $datatypes
-            ));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+		);
+		$datatypes = array(
+			'%d',// PRT_ID
+			'%f',// PRT_amount
+			'%s',// PRC_name
+			'%d',// PRC_is_default
+			'%d',// PRC_overrides
+			'%d',// PRC_order
+			'%d',// PRC_deleted
+			'%d',// PRC_parent
+		);
+		$price_table = $wpdb->prefix . "esp_price";
+		$success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
+				'org_options',
+				array(
+						'surcharge' => $org_options['surcharge'],
+						'surcharge_type' => $org_options['surcharge_type'],
+						'surcharge_text' => $org_options['surcharge_text']),
+				$price_table,
+				$cols_n_values,
+				$datatypes
+			));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    protected $_org_options_we_know_how_to_migrate = array(
-      'organization',
-      'organization_street1',
-      'organization_street2',
-      'organization_city',
-      'organization_state',
-      'organization_zip',
-      'contact_email',
-      'default_mail',
-      'payment_subject',
-      'payment_message',
-      'message',
-      'default_payment_status',
-      'surcharge',// unused?
-      'country_id',// unused?
-      'organization_country',
+	protected $_org_options_we_know_how_to_migrate = array(
+	  'organization',
+	  'organization_street1',
+	  'organization_street2',
+	  'organization_city',
+	  'organization_state',
+	  'organization_zip',
+	  'contact_email',
+	  'default_mail',
+	  'payment_subject',
+	  'payment_message',
+	  'message',
+	  'default_payment_status',
+	  'surcharge',// unused?
+	  'country_id',// unused?
+	  'organization_country',
 //    'currency_symbol',
-      'expire_on_registration_end',
-      'email_before_payment',
-      'email_fancy_headers',
-      'enable_default_style',
-      'event_ssl_active',
-      'selected_style',
-      'show_pending_payment_options',
-      'show_reg_footer',
-      'skip_confirmation_page',
-      'allow_mer_discounts',// no equiv
-      'allow_mer_vouchers',// no equiv
-      'display_short_description_in_event_list',
-      'display_description_on_multi_reg_page',
-      'display_address_in_event_list',
-      'display_address_in_regform',
-      'use_custom_post_types',// no equiv
-      'display_ical_download',
-      'display_featured_image',
-      'themeroller',
-      'default_logo_url',
-      'event_page_id',
-      'return_url',
-      'cancel_return',
-      'notify_url',
-      'events_in_dashboard',
-      'use_captcha',
-      'recaptcha_publickey',
-      'recaptcha_privatekey',
-      'recaptcha_theme',
-      'recaptcha_width',
-      'recaptcha_language',
-      'espresso_dashboard_widget',
-      'time_reg_limit',
+	  'expire_on_registration_end',
+	  'email_before_payment',
+	  'email_fancy_headers',
+	  'enable_default_style',
+	  'event_ssl_active',
+	  'selected_style',
+	  'show_pending_payment_options',
+	  'show_reg_footer',
+	  'skip_confirmation_page',
+	  'allow_mer_discounts',// no equiv
+	  'allow_mer_vouchers',// no equiv
+	  'display_short_description_in_event_list',
+	  'display_description_on_multi_reg_page',
+	  'display_address_in_event_list',
+	  'display_address_in_regform',
+	  'use_custom_post_types',// no equiv
+	  'display_ical_download',
+	  'display_featured_image',
+	  'themeroller',
+	  'default_logo_url',
+	  'event_page_id',
+	  'return_url',
+	  'cancel_return',
+	  'notify_url',
+	  'events_in_dashboard',
+	  'use_captcha',
+	  'recaptcha_publickey',
+	  'recaptcha_privatekey',
+	  'recaptcha_theme',
+	  'recaptcha_width',
+	  'recaptcha_language',
+	  'espresso_dashboard_widget',
+	  'time_reg_limit',
 //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-      'use_personnel_manager',// no equiv
-      'use_event_timezones',
-      'full_logging',
-      'surcharge_type',// unused
-      'surcharge_text',// unused
-      'affiliate_id',
-      'site_license_key',
-    );
+	  'use_personnel_manager',// no equiv
+	  'use_event_timezones',
+	  'full_logging',
+	  'surcharge_type',// unused
+	  'surcharge_text',// unused
+	  'affiliate_id',
+	  'site_license_key',
+	);
 }

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

Indentation +111 added lines, -111 removed lines

@@ -40,119 +40,119 @@
  */
 class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    /**
-     * Keeps track of whether or not we've already added a system question group,
-     * in order to avoid adding more than 1 (basically, in 3.1 this would happen
-     * with the Roles & Permissions addon, because each user had their own set of
-     * question groups and questions),
-     * @var boolean
-     */
-    private $_already_got_system_question_group_1 = false;
-    public function _migration_step($num_items = 50)
-    {
+	private $_old_table;
+	private $_new_table;
+	/**
+	 * Keeps track of whether or not we've already added a system question group,
+	 * in order to avoid adding more than 1 (basically, in 3.1 this would happen
+	 * with the Roles & Permissions addon, because each user had their own set of
+	 * question groups and questions),
+	 * @var boolean
+	 */
+	private $_already_got_system_question_group_1 = false;
+	public function _migration_step($num_items = 50)
+	{
 
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_group) {
-            $new_id = $this->_insert_new_question_group($question_group);
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_group) {
+			$new_id = $this->_insert_new_question_group($question_group);
 
-            $this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_qst_group";
-        $this->_new_table = $wpdb->prefix . "esp_question_group";
-        $this->_pretty_name = esc_html__("Question Groups", "event_espresso");
-        parent::__construct();
-    }
+			$this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_qst_group";
+		$this->_new_table = $wpdb->prefix . "esp_question_group";
+		$this->_pretty_name = esc_html__("Question Groups", "event_espresso");
+		parent::__construct();
+	}
 
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_question_group
-     * @return int
-     */
-    private function _insert_new_question_group($old_question_group)
-    {
-        global $wpdb;
-        // try to guess what the QST_system int should be... finding the Personal info system
-        // question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
-        // could be easily removed.
-        if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
-            $guess_at_system_number = 1;
-        } elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== false) {
-            $guess_at_system_number = 2;
-        } else {
-            $guess_at_system_number = 0;
-        }
-        // if the question group wasn't made by the normal admin,
-        // we'd like to keep track of who made it
-        if (intval($old_question_group['wp_user']) != 1) {
-            $username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM " . $wpdb->users . " WHERE ID = %d", $old_question_group['wp_user']));
-            $identifier = $old_question_group['group_identifier'] . "-by-" . $username;
-        } else {
-            $identifier = $old_question_group['group_identifier'];
-        }
-        $cols_n_values = array(
-            'QSG_name' => stripslashes($old_question_group['group_name']),
-            'QSG_identifier' => $identifier,
-            'QSG_desc' => stripslashes($old_question_group['group_description']),
-            'QSG_order' => $old_question_group['group_order'],
-            'QSG_show_group_name' => $old_question_group['show_group_name'],
-            'QSG_show_group_desc' => $old_question_group['show_group_description'],
-            'QSG_system' => $guess_at_system_number,
-            'QSG_deleted' => false
-        );
-        $datatypes = array(
-            '%s',// QSG_name
-            '%s',// QSG_identifier
-            '%s',// QSG_desc
-            '%d',// QSG_order
-            '%d',// QSG_show_group_name
-            '%d',// QSG_show_group_desc
-            '%d',// QSG_system
-            '%d',// QSG_deleted
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_question_group
+	 * @return int
+	 */
+	private function _insert_new_question_group($old_question_group)
+	{
+		global $wpdb;
+		// try to guess what the QST_system int should be... finding the Personal info system
+		// question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
+		// could be easily removed.
+		if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
+			$guess_at_system_number = 1;
+		} elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== false) {
+			$guess_at_system_number = 2;
+		} else {
+			$guess_at_system_number = 0;
+		}
+		// if the question group wasn't made by the normal admin,
+		// we'd like to keep track of who made it
+		if (intval($old_question_group['wp_user']) != 1) {
+			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM " . $wpdb->users . " WHERE ID = %d", $old_question_group['wp_user']));
+			$identifier = $old_question_group['group_identifier'] . "-by-" . $username;
+		} else {
+			$identifier = $old_question_group['group_identifier'];
+		}
+		$cols_n_values = array(
+			'QSG_name' => stripslashes($old_question_group['group_name']),
+			'QSG_identifier' => $identifier,
+			'QSG_desc' => stripslashes($old_question_group['group_description']),
+			'QSG_order' => $old_question_group['group_order'],
+			'QSG_show_group_name' => $old_question_group['show_group_name'],
+			'QSG_show_group_desc' => $old_question_group['show_group_description'],
+			'QSG_system' => $guess_at_system_number,
+			'QSG_deleted' => false
+		);
+		$datatypes = array(
+			'%s',// QSG_name
+			'%s',// QSG_identifier
+			'%s',// QSG_desc
+			'%d',// QSG_order
+			'%d',// QSG_show_group_name
+			'%d',// QSG_show_group_desc
+			'%d',// QSG_system
+			'%d',// QSG_deleted
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 
-    /**
-     * Checks if we've already added a system question 1 to the new question groups table
-     * @global type $wpdb
-     * @return boolean
-     */
-    private function _already_got_system_question_group_1()
-    {
-        if (! $this->_already_got_system_question_group_1) {
-            // check the db
-            global $wpdb;
-            $exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
-            if (intval($exists) > 0) {
-                $this->_already_got_system_question_group_1 = true;
-            }
-        }
-        return $this->_already_got_system_question_group_1;
-    }
+	/**
+	 * Checks if we've already added a system question 1 to the new question groups table
+	 * @global type $wpdb
+	 * @return boolean
+	 */
+	private function _already_got_system_question_group_1()
+	{
+		if (! $this->_already_got_system_question_group_1) {
+			// check the db
+			global $wpdb;
+			$exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
+			if (intval($exists) > 0) {
+				$this->_already_got_system_question_group_1 = true;
+			}
+		}
+		return $this->_already_got_system_question_group_1;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -71,14 +71,14 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
         return $count;
     }
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_qst_group";
-        $this->_new_table = $wpdb->prefix . "esp_question_group";
+        $this->_old_table = $wpdb->prefix."events_qst_group";
+        $this->_new_table = $wpdb->prefix."esp_question_group";
         $this->_pretty_name = esc_html__("Question Groups", "event_espresso");
         parent::__construct();
     }
@@ -105,8 +105,8 @@ 
         // if the question group wasn't made by the normal admin,
         // we'd like to keep track of who made it
         if (intval($old_question_group['wp_user']) != 1) {
-            $username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM " . $wpdb->users . " WHERE ID = %d", $old_question_group['wp_user']));
-            $identifier = $old_question_group['group_identifier'] . "-by-" . $username;
+            $username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
+            $identifier = $old_question_group['group_identifier']."-by-".$username;
         } else {
             $identifier = $old_question_group['group_identifier'];
         }
@@ -121,17 +121,17 @@ 
             'QSG_deleted' => false
         );
         $datatypes = array(
-            '%s',// QSG_name
-            '%s',// QSG_identifier
-            '%s',// QSG_desc
-            '%d',// QSG_order
-            '%d',// QSG_show_group_name
-            '%d',// QSG_show_group_desc
-            '%d',// QSG_system
-            '%d',// QSG_deleted
+            '%s', // QSG_name
+            '%s', // QSG_identifier
+            '%s', // QSG_desc
+            '%d', // QSG_order
+            '%d', // QSG_show_group_name
+            '%d', // QSG_show_group_desc
+            '%d', // QSG_system
+            '%d', // QSG_deleted
         );
         $success = $wpdb->insert($this->_new_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_question_group, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -145,7 +145,7 @@ 
      */
     private function _already_got_system_question_group_1()
     {
-        if (! $this->_already_got_system_question_group_1) {
+        if ( ! $this->_already_got_system_question_group_1) {
             // check the db
             global $wpdb;
             $exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");

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

Indentation +114 added lines, -114 removed lines

@@ -57,119 +57,119 @@
  */
 class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    private $_option_table;
-    public function _migration_step($num_items = 50)
-    {
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_row) {
-            $new_id = $this->_insert_new_question($question_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
-        return $count;
-    }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Questions", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "events_question";
-        $this->_new_table = $wpdb->prefix . "esp_question";
-        $this->_option_table = $wpdb->prefix . "esp_question_option";
-        parent::__construct();
-    }
-    private function _insert_new_question($old_question)
-    {
-        global $wpdb;
-        // if this pretends to be a 'system' question, check if we already have a
-        // system question for that string. If so, pretend THAT new question
-        // is what we just isnerted
-        if ($old_question['system_name']) {
-            $id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
-            if ($id_of_new_system_question) {
-                return $id_of_new_system_question;
-            }
-            // ok so this must be the first one. Carry on.
-        }
+	private $_old_table;
+	private $_new_table;
+	private $_option_table;
+	public function _migration_step($num_items = 50)
+	{
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_row) {
+			$new_id = $this->_insert_new_question($question_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+		return $count;
+	}
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Questions", "event_espresso");
+		$this->_old_table = $wpdb->prefix . "events_question";
+		$this->_new_table = $wpdb->prefix . "esp_question";
+		$this->_option_table = $wpdb->prefix . "esp_question_option";
+		parent::__construct();
+	}
+	private function _insert_new_question($old_question)
+	{
+		global $wpdb;
+		// if this pretends to be a 'system' question, check if we already have a
+		// system question for that string. If so, pretend THAT new question
+		// is what we just isnerted
+		if ($old_question['system_name']) {
+			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
+			if ($id_of_new_system_question) {
+				return $id_of_new_system_question;
+			}
+			// ok so this must be the first one. Carry on.
+		}
 
-        $cols_n_values = array(
-            'QST_display_text' => stripslashes($old_question['question']),
-            'QST_admin_label' => $old_question['system_name'] ? $old_question['system_name'] : sanitize_title($old_question['question']),
-            'QST_system' => (string) $old_question['system_name'],
-            'QST_type' => $old_question['question_type'],
-            'QST_required' => 'Y' == $old_question['required'],
-            'QST_required_text' => stripslashes($old_question['required_text']),
-            'QST_order' => $old_question['sequence'],
-            'QST_admin_only' => 'Y' == $old_question['admin_only'],
-            'QST_wp_user' => $old_question['wp_user'],
-            'QST_deleted' => false
-        );
-        $datatypes = array(
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        // now take care of posisbly adding question options
-        if (in_array($old_question['question_type'], array('DROPDOWN','SINGLE','MULTIPLE'))) {
-            $options = explode(",", $old_question['response']);
-            foreach ($options as $option) {
-                $this->_insert_question_option($option, $new_id);
-            }
-        }
-        return $new_id;
-    }
-    /**
-     * Adds a question option to the db
-     * @global type $wpdb
-     * @param string $option
-     * @param int $question_id
-     * @return int
-     */
-    private function _insert_question_option($option, $question_id)
-    {
-        $option = trim($option);
-        global $wpdb;
-        $cols_n_values = array(
-            'QST_ID' => $question_id,
-            'QSO_value' => $option,
-            'QSO_deleted' => false
-        );
-        $datatypes = array(
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
-        );
-        $success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option' => $option,'new_question_id' => $question_id), $this->_option_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+		$cols_n_values = array(
+			'QST_display_text' => stripslashes($old_question['question']),
+			'QST_admin_label' => $old_question['system_name'] ? $old_question['system_name'] : sanitize_title($old_question['question']),
+			'QST_system' => (string) $old_question['system_name'],
+			'QST_type' => $old_question['question_type'],
+			'QST_required' => 'Y' == $old_question['required'],
+			'QST_required_text' => stripslashes($old_question['required_text']),
+			'QST_order' => $old_question['sequence'],
+			'QST_admin_only' => 'Y' == $old_question['admin_only'],
+			'QST_wp_user' => $old_question['wp_user'],
+			'QST_deleted' => false
+		);
+		$datatypes = array(
+			'%s',// QST_display_text
+			'%s',// QST-admin_label
+			'%s',// QST_system
+			'%s',// QST_type
+			'%d',// QST_required
+			'%s',// QST_required_text
+			'%d',// QST_order
+			'%d',// QST_admin_only
+			'%d',// QST_wp_user
+			'%d',// QST_deleted
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		// now take care of posisbly adding question options
+		if (in_array($old_question['question_type'], array('DROPDOWN','SINGLE','MULTIPLE'))) {
+			$options = explode(",", $old_question['response']);
+			foreach ($options as $option) {
+				$this->_insert_question_option($option, $new_id);
+			}
+		}
+		return $new_id;
+	}
+	/**
+	 * Adds a question option to the db
+	 * @global type $wpdb
+	 * @param string $option
+	 * @param int $question_id
+	 * @return int
+	 */
+	private function _insert_question_option($option, $question_id)
+	{
+		$option = trim($option);
+		global $wpdb;
+		$cols_n_values = array(
+			'QST_ID' => $question_id,
+			'QSO_value' => $option,
+			'QSO_deleted' => false
+		);
+		$datatypes = array(
+			'%d',// QST_ID
+			'%s',// QSO_value
+			'%d',// QSO_deleted
+		);
+		$success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option' => $option,'new_question_id' => $question_id), $this->_option_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -79,16 +79,16 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
         return $count;
     }
     public function __construct()
     {
         global $wpdb;
         $this->_pretty_name = esc_html__("Questions", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "events_question";
-        $this->_new_table = $wpdb->prefix . "esp_question";
-        $this->_option_table = $wpdb->prefix . "esp_question_option";
+        $this->_old_table = $wpdb->prefix."events_question";
+        $this->_new_table = $wpdb->prefix."esp_question";
+        $this->_option_table = $wpdb->prefix."esp_question_option";
         parent::__construct();
     }
     private function _insert_new_question($old_question)
@@ -118,25 +118,25 @@ 
             'QST_deleted' => false
         );
         $datatypes = array(
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
+            '%s', // QST_display_text
+            '%s', // QST-admin_label
+            '%s', // QST_system
+            '%s', // QST_type
+            '%d', // QST_required
+            '%s', // QST_required_text
+            '%d', // QST_order
+            '%d', // QST_admin_only
+            '%d', // QST_wp_user
+            '%d', // QST_deleted
         );
         $success = $wpdb->insert($this->_new_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_question, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }
         $new_id = $wpdb->insert_id;
         // now take care of posisbly adding question options
-        if (in_array($old_question['question_type'], array('DROPDOWN','SINGLE','MULTIPLE'))) {
+        if (in_array($old_question['question_type'], array('DROPDOWN', 'SINGLE', 'MULTIPLE'))) {
             $options = explode(",", $old_question['response']);
             foreach ($options as $option) {
                 $this->_insert_question_option($option, $new_id);
@@ -161,13 +161,13 @@ 
             'QSO_deleted' => false
         );
         $datatypes = array(
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
+            '%d', // QST_ID
+            '%s', // QSO_value
+            '%d', // QSO_deleted
         );
         $success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option' => $option,'new_question_id' => $question_id), $this->_option_table, $cols_n_values, $datatypes));
+        if ( ! $success) {
+            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option' => $option, 'new_question_id' => $question_id), $this->_option_table, $cols_n_values, $datatypes));
             return 0;
         }
         return $wpdb->insert_id;

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Registration_Payments.dmsstage.php

Spacing +14 added lines, -14 removed lines

@@ -24,10 +24,10 @@ 
         global $wpdb;
         $this->_pretty_name = esc_html__('Registration Payment Record Generation', 'event_espresso');
         // define tables
-        $this->_old_table                                   = $wpdb->prefix . 'esp_transaction';
-        $this->_payment_table                       = $wpdb->prefix . 'esp_payment';
-        $this->_registration_table                  = $wpdb->prefix . 'esp_registration';
-        $this->_registration_payment_table  = $wpdb->prefix . 'esp_registration_payment';
+        $this->_old_table = $wpdb->prefix.'esp_transaction';
+        $this->_payment_table                       = $wpdb->prefix.'esp_payment';
+        $this->_registration_table                  = $wpdb->prefix.'esp_registration';
+        $this->_registration_payment_table = $wpdb->prefix.'esp_registration_payment';
         // build SQL WHERE clauses
         $this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
         parent::__construct();
@@ -44,7 +44,7 @@ 
         /** @type WPDB $wpdb */
         global $wpdb;
         $TXN_ID = absint($transaction['TXN_ID']);
-        if (! $TXN_ID) {
+        if ( ! $TXN_ID) {
             $this->add_error(
                 sprintf(
                     esc_html__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
@@ -136,12 +136,12 @@ 
         $available_payment_amount = $payment->PAY_amount;
         foreach ($registrations as $REG_ID => $registration) {
             // nothing left, then we are done here?
-            if (! $available_payment_amount > 0) {
+            if ( ! $available_payment_amount > 0) {
                 break;
             }
             // ensure REG_final_price has a valid value, and skip if it turns out to be zero
             $registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
-            if (! $registration->REG_final_price > 0) {
+            if ( ! $registration->REG_final_price > 0) {
                 continue;
             }
             // because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
@@ -153,7 +153,7 @@ 
             $registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
             // calculate amount owing, and skip if it turns out to be zero
             $owing = $registration->REG_final_price - $registration->REG_paid;
-            if (! $owing > 0) {
+            if ( ! $owing > 0) {
                 continue;
             }
             // don't allow payment amount to exceed the available payment amount, OR the amount owing
@@ -185,8 +185,8 @@ 
         global $wpdb;
         $success = $wpdb->insert(
             $this->_registration_payment_table,
-            array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
-            array( '%f' )   // data format
+            array('REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount,), // data
+            array('%f')   // data format
         );
         if ($success === false) {
             $this->add_error(
@@ -216,10 +216,10 @@ 
         global $wpdb;
         $success = $wpdb->update(
             $this->_registration_table,
-            array( 'REG_paid' => $REG_paid ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
+            array('REG_paid' => $REG_paid), // data
+            array('REG_ID' => $REG_ID), // where
+            array('%f'), // data format
+            array('%d')  // where format
         );
         if ($success === false) {
             $this->add_error(

Indentation +221 added lines, -221 removed lines

@@ -11,225 +11,225 @@
  */
 class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table
 {
-    protected $_payment_table;
-
-    protected $_registration_table;
-
-    protected $_registration_payment_table;
-
-    public function __construct()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Registration Payment Record Generation', 'event_espresso');
-        // define tables
-        $this->_old_table                                   = $wpdb->prefix . 'esp_transaction';
-        $this->_payment_table                       = $wpdb->prefix . 'esp_payment';
-        $this->_registration_table                  = $wpdb->prefix . 'esp_registration';
-        $this->_registration_payment_table  = $wpdb->prefix . 'esp_registration_payment';
-        // build SQL WHERE clauses
-        $this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
-        parent::__construct();
-    }
-
-
-
-    /**
-     * @param array $transaction
-     * @return void
-     */
-    protected function _migrate_old_row($transaction)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $TXN_ID = absint($transaction['TXN_ID']);
-        if (! $TXN_ID) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
-                    $TXN_ID,
-                    $wpdb->last_error
-                )
-            );
-            return;
-        }
-        // get all payments for the TXN
-        $payments = $this->_get_payments($TXN_ID);
-        if (empty($payments)) {
-            return;
-        }
-        // then the registrants
-        $registrations = $this->_get_registrations($TXN_ID);
-        if (empty($registrations)) {
-            return;
-        }
-        // now loop thru each payment and apply it to each of the registrations
-        foreach ($payments as $PAY_ID => $payment) {
-            if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
-                $this->_process_registration_payments($payment, $registrations);
-            }
-        }
-    }
-
-
-
-    /**
-     * _get_registrations
-     *
-     * @param int $TXN_ID
-     * @return array
-     */
-    protected function _get_registrations($TXN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
-        return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
-    }
-
-
-
-    /**
-     * _get_payments
-     *
-     * @param int $TXN_ID
-     * @return array
-     */
-    protected function _get_payments($TXN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
-    }
-
-
-
-    /**
-     * _get_possibly_updated_REG_paid
-     *
-     * @param int $REG_ID
-     * @return array
-     */
-    protected function _get_possibly_updated_REG_paid($REG_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
-    }
-
-
-
-    /**
-     * _process_registration_payments
-     *
-     * basically a copy of the "Sequential Registration Payment Application Strategy"  logic
-     * currently in EE_Payment_Processor::process_registration_payments()
-     *
-     * @param stdClass $payment
-     * @param array $registrations
-     * @return bool
-     */
-    protected function _process_registration_payments($payment, $registrations = array())
-    {
-        // how much is available to apply to registrations?
-        $available_payment_amount = $payment->PAY_amount;
-        foreach ($registrations as $REG_ID => $registration) {
-            // nothing left, then we are done here?
-            if (! $available_payment_amount > 0) {
-                break;
-            }
-            // ensure REG_final_price has a valid value, and skip if it turns out to be zero
-            $registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
-            if (! $registration->REG_final_price > 0) {
-                continue;
-            }
-            // because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
-            $possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
-            if (is_float($possibly_updated_REG_paid)) {
-                $registration->REG_paid = $possibly_updated_REG_paid;
-            }
-            // and ensure REG_paid has a valid value
-            $registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
-            // calculate amount owing, and skip if it turns out to be zero
-            $owing = $registration->REG_final_price - $registration->REG_paid;
-            if (! $owing > 0) {
-                continue;
-            }
-            // don't allow payment amount to exceed the available payment amount, OR the amount owing
-            $payment_amount = min($available_payment_amount, $owing);
-            // update $available_payment_amount
-            $available_payment_amount = $available_payment_amount - $payment_amount;
-            // add relation between registration and payment and set amount
-            if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
-                // calculate and set new REG_paid
-                $registration->REG_paid = $registration->REG_paid + $payment_amount;
-                $this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
-            }
-        }
-    }
-
-
-
-    /**
-     * _insert_registration_payment
-     *
-     * @param int $REG_ID
-     * @param int $PAY_ID
-     * @param float $PAY_amount
-     * @return bool
-     */
-    protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $success = $wpdb->insert(
-            $this->_registration_payment_table,
-            array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
-            array( '%f' )   // data format
-        );
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
-                    $REG_ID,
-                    $wpdb->last_error
-                )
-            );
-            return false;
-        }
-        return true;
-    }
-
-
-
-    /**
-     * _update_registration_paid
-     *
-     * @param int $REG_ID
-     * @param float $REG_paid
-     * @return bool
-     */
-    protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $success = $wpdb->update(
-            $this->_registration_table,
-            array( 'REG_paid' => $REG_paid ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
-        );
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
-                    $REG_ID,
-                    $wpdb->last_error
-                )
-            );
-            return false;
-        }
-        return true;
-    }
+	protected $_payment_table;
+
+	protected $_registration_table;
+
+	protected $_registration_payment_table;
+
+	public function __construct()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Registration Payment Record Generation', 'event_espresso');
+		// define tables
+		$this->_old_table                                   = $wpdb->prefix . 'esp_transaction';
+		$this->_payment_table                       = $wpdb->prefix . 'esp_payment';
+		$this->_registration_table                  = $wpdb->prefix . 'esp_registration';
+		$this->_registration_payment_table  = $wpdb->prefix . 'esp_registration_payment';
+		// build SQL WHERE clauses
+		$this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * @param array $transaction
+	 * @return void
+	 */
+	protected function _migrate_old_row($transaction)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$TXN_ID = absint($transaction['TXN_ID']);
+		if (! $TXN_ID) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
+					$TXN_ID,
+					$wpdb->last_error
+				)
+			);
+			return;
+		}
+		// get all payments for the TXN
+		$payments = $this->_get_payments($TXN_ID);
+		if (empty($payments)) {
+			return;
+		}
+		// then the registrants
+		$registrations = $this->_get_registrations($TXN_ID);
+		if (empty($registrations)) {
+			return;
+		}
+		// now loop thru each payment and apply it to each of the registrations
+		foreach ($payments as $PAY_ID => $payment) {
+			if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
+				$this->_process_registration_payments($payment, $registrations);
+			}
+		}
+	}
+
+
+
+	/**
+	 * _get_registrations
+	 *
+	 * @param int $TXN_ID
+	 * @return array
+	 */
+	protected function _get_registrations($TXN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
+		return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
+	}
+
+
+
+	/**
+	 * _get_payments
+	 *
+	 * @param int $TXN_ID
+	 * @return array
+	 */
+	protected function _get_payments($TXN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
+	}
+
+
+
+	/**
+	 * _get_possibly_updated_REG_paid
+	 *
+	 * @param int $REG_ID
+	 * @return array
+	 */
+	protected function _get_possibly_updated_REG_paid($REG_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
+	}
+
+
+
+	/**
+	 * _process_registration_payments
+	 *
+	 * basically a copy of the "Sequential Registration Payment Application Strategy"  logic
+	 * currently in EE_Payment_Processor::process_registration_payments()
+	 *
+	 * @param stdClass $payment
+	 * @param array $registrations
+	 * @return bool
+	 */
+	protected function _process_registration_payments($payment, $registrations = array())
+	{
+		// how much is available to apply to registrations?
+		$available_payment_amount = $payment->PAY_amount;
+		foreach ($registrations as $REG_ID => $registration) {
+			// nothing left, then we are done here?
+			if (! $available_payment_amount > 0) {
+				break;
+			}
+			// ensure REG_final_price has a valid value, and skip if it turns out to be zero
+			$registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
+			if (! $registration->REG_final_price > 0) {
+				continue;
+			}
+			// because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
+			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
+			if (is_float($possibly_updated_REG_paid)) {
+				$registration->REG_paid = $possibly_updated_REG_paid;
+			}
+			// and ensure REG_paid has a valid value
+			$registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
+			// calculate amount owing, and skip if it turns out to be zero
+			$owing = $registration->REG_final_price - $registration->REG_paid;
+			if (! $owing > 0) {
+				continue;
+			}
+			// don't allow payment amount to exceed the available payment amount, OR the amount owing
+			$payment_amount = min($available_payment_amount, $owing);
+			// update $available_payment_amount
+			$available_payment_amount = $available_payment_amount - $payment_amount;
+			// add relation between registration and payment and set amount
+			if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
+				// calculate and set new REG_paid
+				$registration->REG_paid = $registration->REG_paid + $payment_amount;
+				$this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
+			}
+		}
+	}
+
+
+
+	/**
+	 * _insert_registration_payment
+	 *
+	 * @param int $REG_ID
+	 * @param int $PAY_ID
+	 * @param float $PAY_amount
+	 * @return bool
+	 */
+	protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$success = $wpdb->insert(
+			$this->_registration_payment_table,
+			array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
+			array( '%f' )   // data format
+		);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
+					$REG_ID,
+					$wpdb->last_error
+				)
+			);
+			return false;
+		}
+		return true;
+	}
+
+
+
+	/**
+	 * _update_registration_paid
+	 *
+	 * @param int $REG_ID
+	 * @param float $REG_paid
+	 * @return bool
+	 */
+	protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$success = $wpdb->update(
+			$this->_registration_table,
+			array( 'REG_paid' => $REG_paid ),  // data
+			array( 'REG_ID' => $REG_ID ),  // where
+			array( '%f' ),   // data format
+			array( '%d' )  // where format
+		);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
+					$REG_ID,
+					$wpdb->last_error
+				)
+			);
+			return false;
+		}
+		return true;
+	}
 }

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price.dmsstage.php

Spacing +10 added lines, -10 removed lines

@@ -22,9 +22,9 @@ 
         global $wpdb;
         $this->_pretty_name = esc_html__('Registration Final Price Tax Calculations', 'event_espresso');
         // define tables
-        $this->_old_table               = $wpdb->prefix . 'esp_registration';
-        $this->_ticket_table            = $wpdb->prefix . 'esp_ticket';
-        $this->_line_item_table     = $wpdb->prefix . 'esp_line_item';
+        $this->_old_table               = $wpdb->prefix.'esp_registration';
+        $this->_ticket_table            = $wpdb->prefix.'esp_ticket';
+        $this->_line_item_table = $wpdb->prefix.'esp_line_item';
         parent::__construct();
     }
 
@@ -109,7 +109,7 @@ 
         /** @type WPDB $wpdb */
         global $wpdb;
         // ensure all required values are present
-        if (! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
+        if ( ! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
             $this->add_error(
                 sprintf(
                     esc_html__('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
@@ -124,7 +124,7 @@ 
         }
         // get tax subtotal
         $tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
-        if (! $tax_subtotal_line_item_ID) {
+        if ( ! $tax_subtotal_line_item_ID) {
             $this->add_error(
                 sprintf(
                     esc_html__('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
@@ -191,7 +191,7 @@ 
         if (is_array($taxes) && ! empty($taxes)) {
             $total_taxes = 0;
             foreach ($taxes as $tax) {
-                $total_taxes += $final_price * ( $tax->LIN_percent / 100 );
+                $total_taxes += $final_price * ($tax->LIN_percent / 100);
             }
             $final_price += $total_taxes;
             $this->_update_registration_final_price($REG_ID, $final_price);
@@ -213,10 +213,10 @@ 
         global $wpdb;
         $success = $wpdb->update(
             $this->_old_table,
-            array( 'REG_final_price' => $REG_final_price ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
+            array('REG_final_price' => $REG_final_price), // data
+            array('REG_ID' => $REG_ID), // where
+            array('%f'), // data format
+            array('%d')  // where format
         );
         if ($success === false) {
             $this->add_error(

Indentation +200 added lines, -200 removed lines

@@ -11,73 +11,73 @@ 
  */
 class EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price extends EE_Data_Migration_Script_Stage_Table
 {
-    protected $_ticket_table;
-
-    protected $_line_item_table;
-
-    public function __construct()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Registration Final Price Tax Calculations', 'event_espresso');
-        // define tables
-        $this->_old_table               = $wpdb->prefix . 'esp_registration';
-        $this->_ticket_table            = $wpdb->prefix . 'esp_ticket';
-        $this->_line_item_table     = $wpdb->prefix . 'esp_line_item';
-        parent::__construct();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    protected function _get_rest_of_sql_for_query()
-    {
-        $SQL = "FROM {$this->_old_table} AS reg ";
-        $SQL .= "JOIN {$this->_ticket_table} as tkt ON reg.TKT_ID = tkt.TKT_ID ";
-        $SQL .= "JOIN {$this->_line_item_table} as line ON reg.TXN_ID = line.TXN_ID ";
-        $SQL .= "WHERE tkt.TKT_taxable = 1 ";
-        $SQL .= "AND line.LIN_code = 'total' ";
-        $SQL .= "AND reg.REG_final_price > 0 ";
-        return $SQL;
-    }
-
-
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     * @return int
-     */
-    public function _count_records_to_migrate()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT count( reg.REG_ID ) ";
-        $SQL .= $this->_get_rest_of_sql_for_query();
-        $count = $wpdb->get_var($SQL);
-        return $count;
-    }
-
-
-
-    /**
-     * Gets data for all registrations with taxable tickets in the esp_line_item table
-     * @global wpdb $wpdb
-     * @param int $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     */
-    protected function _get_rows($limit)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $SQL = "SELECT reg.REG_ID,  reg.REG_final_price, line.LIN_ID ";
-        $SQL .= $this->_get_rest_of_sql_for_query();
-        $SQL .= $wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
-
-        // produces something like:
-        /*
+	protected $_ticket_table;
+
+	protected $_line_item_table;
+
+	public function __construct()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Registration Final Price Tax Calculations', 'event_espresso');
+		// define tables
+		$this->_old_table               = $wpdb->prefix . 'esp_registration';
+		$this->_ticket_table            = $wpdb->prefix . 'esp_ticket';
+		$this->_line_item_table     = $wpdb->prefix . 'esp_line_item';
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	protected function _get_rest_of_sql_for_query()
+	{
+		$SQL = "FROM {$this->_old_table} AS reg ";
+		$SQL .= "JOIN {$this->_ticket_table} as tkt ON reg.TKT_ID = tkt.TKT_ID ";
+		$SQL .= "JOIN {$this->_line_item_table} as line ON reg.TXN_ID = line.TXN_ID ";
+		$SQL .= "WHERE tkt.TKT_taxable = 1 ";
+		$SQL .= "AND line.LIN_code = 'total' ";
+		$SQL .= "AND reg.REG_final_price > 0 ";
+		return $SQL;
+	}
+
+
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 * @return int
+	 */
+	public function _count_records_to_migrate()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT count( reg.REG_ID ) ";
+		$SQL .= $this->_get_rest_of_sql_for_query();
+		$count = $wpdb->get_var($SQL);
+		return $count;
+	}
+
+
+
+	/**
+	 * Gets data for all registrations with taxable tickets in the esp_line_item table
+	 * @global wpdb $wpdb
+	 * @param int $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 */
+	protected function _get_rows($limit)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$SQL = "SELECT reg.REG_ID,  reg.REG_final_price, line.LIN_ID ";
+		$SQL .= $this->_get_rest_of_sql_for_query();
+		$SQL .= $wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+
+		// produces something like:
+		/*
             SELECT
               reg.REG_ID,
               reg.REG_final_price,
@@ -94,137 +94,137 @@ 
             LIMIT 1, 50
          */
 
-        return $wpdb->get_results($SQL, ARRAY_A);
-    }
-
-
-
-    /**
-     * @param array $row
-     * @return void
-     */
-    protected function _migrate_old_row($row)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        // ensure all required values are present
-        if (! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
-                    '<br />',
-                    isset($row['REG_ID']) ? $row['REG_ID'] : '',
-                    isset($row['REG_final_price']) ? $row['REG_final_price'] : '',
-                    isset($row['LIN_ID']) ? $row['LIN_ID'] : '',
-                    $wpdb->last_error
-                )
-            );
-            return;
-        }
-        // get tax subtotal
-        $tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
-        if (! $tax_subtotal_line_item_ID) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
-                    $wpdb->last_error
-                )
-            );
-            return;
-        }
-        // now get taxes
-        $taxes = $this->_get_tax_amounts($tax_subtotal_line_item_ID);
-        // apply taxes to registration final price
-        $this->_apply_taxes($row['REG_ID'], $row['REG_final_price'], $taxes);
-    }
-
-
-
-    /**
-     * _get_tax_subtotal
-     *
-     * @param int $LIN_ID
-     * @return int
-     */
-    protected function _get_line_item_ID_for_tax_subtotal($LIN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT LIN_ID ";
-        $SQL .= "FROM {$this->_line_item_table} ";
-        $SQL .= "WHERE LIN_parent = %d ";
-        $SQL .= "AND LIN_code = 'taxes'";
-        return $wpdb->get_var($wpdb->prepare($SQL, $LIN_ID));
-    }
-
-
-
-    /**
-     * _get_tax_subtotal
-     *
-     * @param int $LIN_ID
-     * @return array
-     */
-    protected function _get_tax_amounts($LIN_ID)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $SQL = "SELECT LIN_percent ";
-        $SQL .= "FROM {$this->_line_item_table} ";
-        $SQL .= "WHERE LIN_parent = %d";
-        return $wpdb->get_results($wpdb->prepare($SQL, $LIN_ID), OBJECT_K);
-    }
-
-
-
-    /**
-     * _apply_taxes
-     *
-     * @param int $REG_ID
-     * @param float $final_price
-     * @param array $taxes
-     * @return void
-     */
-    protected function _apply_taxes($REG_ID = 0, $final_price = 0.00, $taxes = array())
-    {
-        if (is_array($taxes) && ! empty($taxes)) {
-            $total_taxes = 0;
-            foreach ($taxes as $tax) {
-                $total_taxes += $final_price * ( $tax->LIN_percent / 100 );
-            }
-            $final_price += $total_taxes;
-            $this->_update_registration_final_price($REG_ID, $final_price);
-        }
-    }
-
-
-
-    /**
-     * _update_registration_final_price
-     *
-     * @param int $REG_ID
-     * @param float $REG_final_price
-     * @return void
-     */
-    protected function _update_registration_final_price($REG_ID = 0, $REG_final_price = 0.00)
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $success = $wpdb->update(
-            $this->_old_table,
-            array( 'REG_final_price' => $REG_final_price ),  // data
-            array( 'REG_ID' => $REG_ID ),  // where
-            array( '%f' ),   // data format
-            array( '%d' )  // where format
-        );
-        if ($success === false) {
-            $this->add_error(
-                sprintf(
-                    esc_html__('Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso'),
-                    $REG_ID,
-                    $wpdb->last_error
-                )
-            );
-        }
-    }
+		return $wpdb->get_results($SQL, ARRAY_A);
+	}
+
+
+
+	/**
+	 * @param array $row
+	 * @return void
+	 */
+	protected function _migrate_old_row($row)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		// ensure all required values are present
+		if (! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
+					'<br />',
+					isset($row['REG_ID']) ? $row['REG_ID'] : '',
+					isset($row['REG_final_price']) ? $row['REG_final_price'] : '',
+					isset($row['LIN_ID']) ? $row['LIN_ID'] : '',
+					$wpdb->last_error
+				)
+			);
+			return;
+		}
+		// get tax subtotal
+		$tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
+		if (! $tax_subtotal_line_item_ID) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
+					$wpdb->last_error
+				)
+			);
+			return;
+		}
+		// now get taxes
+		$taxes = $this->_get_tax_amounts($tax_subtotal_line_item_ID);
+		// apply taxes to registration final price
+		$this->_apply_taxes($row['REG_ID'], $row['REG_final_price'], $taxes);
+	}
+
+
+
+	/**
+	 * _get_tax_subtotal
+	 *
+	 * @param int $LIN_ID
+	 * @return int
+	 */
+	protected function _get_line_item_ID_for_tax_subtotal($LIN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT LIN_ID ";
+		$SQL .= "FROM {$this->_line_item_table} ";
+		$SQL .= "WHERE LIN_parent = %d ";
+		$SQL .= "AND LIN_code = 'taxes'";
+		return $wpdb->get_var($wpdb->prepare($SQL, $LIN_ID));
+	}
+
+
+
+	/**
+	 * _get_tax_subtotal
+	 *
+	 * @param int $LIN_ID
+	 * @return array
+	 */
+	protected function _get_tax_amounts($LIN_ID)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$SQL = "SELECT LIN_percent ";
+		$SQL .= "FROM {$this->_line_item_table} ";
+		$SQL .= "WHERE LIN_parent = %d";
+		return $wpdb->get_results($wpdb->prepare($SQL, $LIN_ID), OBJECT_K);
+	}
+
+
+
+	/**
+	 * _apply_taxes
+	 *
+	 * @param int $REG_ID
+	 * @param float $final_price
+	 * @param array $taxes
+	 * @return void
+	 */
+	protected function _apply_taxes($REG_ID = 0, $final_price = 0.00, $taxes = array())
+	{
+		if (is_array($taxes) && ! empty($taxes)) {
+			$total_taxes = 0;
+			foreach ($taxes as $tax) {
+				$total_taxes += $final_price * ( $tax->LIN_percent / 100 );
+			}
+			$final_price += $total_taxes;
+			$this->_update_registration_final_price($REG_ID, $final_price);
+		}
+	}
+
+
+
+	/**
+	 * _update_registration_final_price
+	 *
+	 * @param int $REG_ID
+	 * @param float $REG_final_price
+	 * @return void
+	 */
+	protected function _update_registration_final_price($REG_ID = 0, $REG_final_price = 0.00)
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$success = $wpdb->update(
+			$this->_old_table,
+			array( 'REG_final_price' => $REG_final_price ),  // data
+			array( 'REG_ID' => $REG_ID ),  // where
+			array( '%f' ),   // data format
+			array( '%d' )  // where format
+		);
+		if ($success === false) {
+			$this->add_error(
+				sprintf(
+					esc_html__('Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso'),
+					$REG_ID,
+					$wpdb->last_error
+				)
+			);
+		}
+	}
 }

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_datetime_fields.dmsstage.php

Indentation +43 added lines, -43 removed lines

@@ -8,49 +8,49 @@
 
 class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table
 {
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Datetime Fields", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "esp_datetime";
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Datetime Fields", "event_espresso");
+		$this->_old_table = $wpdb->prefix . "esp_datetime";
+		parent::__construct();
+	}
 
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach question_group_question entry with this QST_ID, we want to set its
-        // QSG_order equal to this question's QST_order
-        global $wpdb;
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach question_group_question entry with this QST_ID, we want to set its
+		// QSG_order equal to this question's QST_order
+		global $wpdb;
 
-        $updated = $wpdb->update(
-            $this->_old_table,
-            array(
-                'DTT_name' => '',
-                'DTT_description' => '',
-            ),
-            array(
-                'DTT_ID' => $old_row['DTT_ID'],
-            ),
-            array(
-                '%s',// DTT_name,
-                '%s',// DTT_description
-            ),
-            array(
-                '%d',// DTT_ID
-            )
-        );
-        if (false === $updated) {
-            $this->add_error(
-                sprintf(
-                    esc_html__(
-                        "Error in updating table %s setting DTT_name = '' and DTT_description = '' where DTT_ID = %d",
-                        'event_espresso'
-                    ),
-                    $this->_old_table,
-                    $old_row['QST_ID']
-                )
-            );
-        }
-        // nothing to map really
-    }
+		$updated = $wpdb->update(
+			$this->_old_table,
+			array(
+				'DTT_name' => '',
+				'DTT_description' => '',
+			),
+			array(
+				'DTT_ID' => $old_row['DTT_ID'],
+			),
+			array(
+				'%s',// DTT_name,
+				'%s',// DTT_description
+			),
+			array(
+				'%d',// DTT_ID
+			)
+		);
+		if (false === $updated) {
+			$this->add_error(
+				sprintf(
+					esc_html__(
+						"Error in updating table %s setting DTT_name = '' and DTT_description = '' where DTT_ID = %d",
+						'event_espresso'
+					),
+					$this->_old_table,
+					$old_row['QST_ID']
+				)
+			);
+		}
+		// nothing to map really
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__("Datetime Fields", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "esp_datetime";
+        $this->_old_table = $wpdb->prefix."esp_datetime";
         parent::__construct();
     }
 
@@ -32,11 +32,11 @@ 
                 'DTT_ID' => $old_row['DTT_ID'],
             ),
             array(
-                '%s',// DTT_name,
-                '%s',// DTT_description
+                '%s', // DTT_name,
+                '%s', // DTT_description
             ),
             array(
-                '%d',// DTT_ID
+                '%d', // DTT_ID
             )
         );
         if (false === $updated) {

core/data_migration_scripts/4_2_0_stages/EE_DMS_4_2_0_question_group_questions.dmsstage.php

Indentation +38 added lines, -38 removed lines

@@ -6,42 +6,42 @@
 
 class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_qgq_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__("Question Group Questions", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "esp_question";
-        $this->_qgq_table = $wpdb->prefix . "esp_question_group_question";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // foreach question_group_question entry with this QST_ID, we want to set its
-        // QSG_order equal to this question's QST_order
-        global $wpdb;
-        $updated = $wpdb->update(
-            $this->_qgq_table,
-            array('QGQ_order' => $old_row['QST_order']),
-            array('QST_ID' => $old_row['QST_ID']),
-            array('%d',// QGQ_order
-                    ),
-            array('%d',// QST_ID
-                    )
-        );
-        if (false === $updated) {
-            $this->add_error(
-                sprintf(
-                    esc_html__(
-                        "Error in updating table %s setting QGQ_order = %d where QST_ID = %d",
-                        'event_espresso'
-                    ),
-                    $this->_qgq_table,
-                    $old_row['QST_order'],
-                    $old_row['QST_ID']
-                )
-            );
-        }
-        // nothing to map really
-    }
+	private $_qgq_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__("Question Group Questions", "event_espresso");
+		$this->_old_table = $wpdb->prefix . "esp_question";
+		$this->_qgq_table = $wpdb->prefix . "esp_question_group_question";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// foreach question_group_question entry with this QST_ID, we want to set its
+		// QSG_order equal to this question's QST_order
+		global $wpdb;
+		$updated = $wpdb->update(
+			$this->_qgq_table,
+			array('QGQ_order' => $old_row['QST_order']),
+			array('QST_ID' => $old_row['QST_ID']),
+			array('%d',// QGQ_order
+					),
+			array('%d',// QST_ID
+					)
+		);
+		if (false === $updated) {
+			$this->add_error(
+				sprintf(
+					esc_html__(
+						"Error in updating table %s setting QGQ_order = %d where QST_ID = %d",
+						'event_espresso'
+					),
+					$this->_qgq_table,
+					$old_row['QST_order'],
+					$old_row['QST_ID']
+				)
+			);
+		}
+		// nothing to map really
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -11,8 +11,8 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__("Question Group Questions", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "esp_question";
-        $this->_qgq_table = $wpdb->prefix . "esp_question_group_question";
+        $this->_old_table = $wpdb->prefix."esp_question";
+        $this->_qgq_table = $wpdb->prefix."esp_question_group_question";
         parent::__construct();
     }
     protected function _migrate_old_row($old_row)
@@ -24,9 +24,9 @@ 
             $this->_qgq_table,
             array('QGQ_order' => $old_row['QST_order']),
             array('QST_ID' => $old_row['QST_ID']),
-            array('%d',// QGQ_order
+            array('%d', // QGQ_order
                     ),
-            array('%d',// QST_ID
+            array('%d', // QST_ID
                     )
         );
         if (false === $updated) {

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_question_types.dmsstage.php

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__('Question Types', 'event_espresso');
-        $this->_old_table = $wpdb->prefix . 'esp_question';
+        $this->_old_table = $wpdb->prefix.'esp_question';
         $this->_question_type_conversions = array(
             'MULTIPLE'          => 'CHECKBOX',
             'SINGLE'                => 'RADIO_BTN'
@@ -34,7 +34,7 @@ 
         // rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
         // so we need to include both the migrated rows as well as the non-migrated rows
         $QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
-        $this->_extra_where_sql = "WHERE QST_type IN ('" . implode("', '", $QST_types_to_count) . "')" ;
+        $this->_extra_where_sql = "WHERE QST_type IN ('".implode("', '", $QST_types_to_count)."')";
         parent::__construct();
     }
 
@@ -45,15 +45,15 @@ 
     protected function _migrate_old_row($question)
     {
         global $wpdb;
-        if ($question['QST_ID'] && isset($this->_question_type_conversions[ $question['QST_type'] ])) {
+        if ($question['QST_ID'] && isset($this->_question_type_conversions[$question['QST_type']])) {
             $success = $wpdb->update(
                 $this->_old_table,
-                array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
+                array('QST_type' => $this->_question_type_conversions[$question['QST_type']]), // data
+                array('QST_ID' => $question['QST_ID']), // where
+                array('%s'), // data format
+                array('%d')  // where format
             );
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error(
                     sprintf(
                         esc_html__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),

Indentation +49 added lines, -49 removed lines

@@ -11,57 +11,57 @@
  */
 class EE_DMS_4_6_0_question_types extends EE_Data_Migration_Script_Stage_Table
 {
-    protected $_question_type_conversions = array();
+	protected $_question_type_conversions = array();
 
 
 
-    /**
-     * Just initializes the status of the migration
-     *
-     * @return EE_DMS_4_6_0_question_types
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Question Types', 'event_espresso');
-        $this->_old_table = $wpdb->prefix . 'esp_question';
-        $this->_question_type_conversions = array(
-            'MULTIPLE'          => 'CHECKBOX',
-            'SINGLE'                => 'RADIO_BTN'
-        );
-        // when fetching rows, because we automatically use a limit and offset
-        // rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
-        // so we need to include both the migrated rows as well as the non-migrated rows
-        $QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
-        $this->_extra_where_sql = "WHERE QST_type IN ('" . implode("', '", $QST_types_to_count) . "')" ;
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 *
+	 * @return EE_DMS_4_6_0_question_types
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Question Types', 'event_espresso');
+		$this->_old_table = $wpdb->prefix . 'esp_question';
+		$this->_question_type_conversions = array(
+			'MULTIPLE'          => 'CHECKBOX',
+			'SINGLE'                => 'RADIO_BTN'
+		);
+		// when fetching rows, because we automatically use a limit and offset
+		// rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
+		// so we need to include both the migrated rows as well as the non-migrated rows
+		$QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
+		$this->_extra_where_sql = "WHERE QST_type IN ('" . implode("', '", $QST_types_to_count) . "')" ;
+		parent::__construct();
+	}
 
-    /**
-     * @param array $question an associative array where keys are column names and values are their values.
-     * @return null
-     */
-    protected function _migrate_old_row($question)
-    {
-        global $wpdb;
-        if ($question['QST_ID'] && isset($this->_question_type_conversions[ $question['QST_type'] ])) {
-            $success = $wpdb->update(
-                $this->_old_table,
-                array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ),  // data
-                array( 'QST_ID' => $question['QST_ID'] ),  // where
-                array( '%s' ),   // data format
-                array( '%d' )  // where format
-            );
-            if (! $success) {
-                $this->add_error(
-                    sprintf(
-                        esc_html__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
-                        wp_json_encode($question['QST_type']),
-                        $question['QST_ID'],
-                        $wpdb->last_error
-                    )
-                );
-            }
-        }
-    }
+	/**
+	 * @param array $question an associative array where keys are column names and values are their values.
+	 * @return null
+	 */
+	protected function _migrate_old_row($question)
+	{
+		global $wpdb;
+		if ($question['QST_ID'] && isset($this->_question_type_conversions[ $question['QST_type'] ])) {
+			$success = $wpdb->update(
+				$this->_old_table,
+				array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ),  // data
+				array( 'QST_ID' => $question['QST_ID'] ),  // where
+				array( '%s' ),   // data format
+				array( '%d' )  // where format
+			);
+			if (! $success) {
+				$this->add_error(
+					sprintf(
+						esc_html__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_type']),
+						$question['QST_ID'],
+						$wpdb->last_error
+					)
+				);
+			}
+		}
+	}
 }